From 37432ec0d234af859f17aa08a53e9d94f20ed9cb Mon Sep 17 00:00:00 2001 From: DieMyst Date: Thu, 10 Dec 2020 16:37:53 +0300 Subject: [PATCH] use big script, send script in relay on start --- src/AirScripts/GetAll.elm | 9 ++++++--- src/Route.elm | 6 ++---- src/Utils/Utils.elm | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/AirScripts/GetAll.elm b/src/AirScripts/GetAll.elm index 21f5aab..c8d1cc3 100644 --- a/src/AirScripts/GetAll.elm +++ b/src/AirScripts/GetAll.elm @@ -96,9 +96,12 @@ air peerId relayId peers = askRelay = \innerAir -> - par - askRelaySchema - innerAir + seq + (callBI "relayId" ( "op", "identity" ) [] Nothing) + (par + askRelaySchema + innerAir + ) askPeers = \innerAir -> diff --git a/src/Route.elm b/src/Route.elm index 8632843..fd47cca 100644 --- a/src/Route.elm +++ b/src/Route.elm @@ -56,14 +56,12 @@ routeView model route = getAllCmd : String -> String -> List String -> Cmd msg getAllCmd peerId relayId knownPeers = Cmd.batch - [ sendAir (GetAll.askRelayScript peerId relayId) - , sendAir (GetAll.askPeersScript peerId relayId knownPeers) - , sendAir (GetAll.findAndAskNeighboursScript peerId relayId) + [ sendAir (GetAll.air peerId relayId knownPeers) ] routeCommand : Model -> Route -> Cmd msg -routeCommand m r = +routeCommand m _ = if m.isInitialized then Cmd.none diff --git a/src/Utils/Utils.elm b/src/Utils/Utils.elm index d8694cd..baab6a1 100644 --- a/src/Utils/Utils.elm +++ b/src/Utils/Utils.elm @@ -15,6 +15,7 @@ instancesText num = else Html.text (strNum ++ " instances") + servicesText : Int -> Html msg servicesText num = let @@ -25,4 +26,4 @@ servicesText num = Html.text (strNum ++ " service") else - Html.text (strNum ++ " services") \ No newline at end of file + Html.text (strNum ++ " services")