From ef8ceb71891612f705725c0267e7366b550b66fd Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Mon, 5 Jul 2021 13:26:11 +0300 Subject: [PATCH] Service retrieval seems to work --- aqua/app.aqua | 6 +- package-lock.json | 6 +- package.json | 4 +- src/_aqua/app.js | 189 ++++++++-------------------------------------- src/index.js | 1 + 5 files changed, 40 insertions(+), 166 deletions(-) diff --git a/aqua/app.aqua b/aqua/app.aqua index 33f9f7a..b028fd0 100644 --- a/aqua/app.aqua +++ b/aqua/app.aqua @@ -32,8 +32,8 @@ func findAndAskNeighboursSchema(relayPeerId: PeerId, clientId: PeerId): func getAll(relayPeerId: PeerId, knownPeers: []PeerId): askAllAndSend(relayPeerId) - par for peer <- knownPeers par: - askAllAndSend(peer) + -- par for peer <- knownPeers par: + -- askAllAndSend(peer) - par findAndAskNeighboursSchema(relayPeerId, %init_peer_id%) + -- par findAndAskNeighboursSchema(relayPeerId, %init_peer_id%) diff --git a/package-lock.json b/package-lock.json index c808db3..0b052be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -998,9 +998,9 @@ } }, "@fluencelabs/aqua-cli": { - "version": "0.1.7-153", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-cli/-/aqua-cli-0.1.7-153.tgz", - "integrity": "sha512-/4z8QbA9RJZMaRIjy+Q1ZAiT8HIHONUGOG87YWaRb9O1uBHY1o/Onorx/kIlSXAF8+0N0EI/CVkhWWIrYMy9HQ==", + "version": "0.1.8-160", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-cli/-/aqua-cli-0.1.8-160.tgz", + "integrity": "sha512-ZZxfhxp9EHFVmkg6nWApvTQMm9WC06YEaj7NPHafnQShqsHtmV4srAZCcUBjVsLw3OyFTbke9e+hlUhP332bfA==", "dev": true }, "@fluencelabs/aqua-lib": { diff --git a/package.json b/package.json index 8772334..b35a636 100644 --- a/package.json +++ b/package.json @@ -38,10 +38,9 @@ "yup": "^0.32.9" }, "devDependencies": { - "elm-live": "^4.0.2", "@babel/core": "^7.11.6", "@babel/preset-env": "^7.11.5", - "@fluencelabs/aqua-cli": "^0.1.7-153", + "@fluencelabs/aqua-cli": "^0.1.8-160", "@fluencelabs/aqua-lib": "0.1.6", "@types/yup": "^0.29.11", "babel-loader": "^8.1.0", @@ -54,6 +53,7 @@ "elm-analyse": "^0.16.5", "elm-format": "^0.8.4", "elm-hot-webpack-loader": "^1.1.7", + "elm-live": "^4.0.2", "elm-test": "^0.19.1-revision4", "elm-webpack-loader": "^6.0.1", "file-loader": "^6.1.0", diff --git a/src/_aqua/app.js b/src/_aqua/app.js index 5f3e04a..b73c053 100644 --- a/src/_aqua/app.js +++ b/src/_aqua/app.js @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.1.7-153 + * Aqua version: 0.1.8-160 * */ import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable'; @@ -297,188 +297,61 @@ export async function getAll(client, relayPeerId, knownPeers) { (seq (seq (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "relayPeerId") [] relayPeerId) - ) - (call %init_peer_id% ("getDataSrv" "knownPeers") [] knownPeers) - ) - (par - (par (seq (seq (seq (seq - (call -relay- ("op" "noop") []) - (xor - (seq - (seq - (seq - (call relayPeerId ("peer" "identify") [] ident) - (call relayPeerId ("dist" "list_blueprints") [] blueprints) - ) - (call relayPeerId ("dist" "list_modules") [] modules) - ) - (call relayPeerId ("srv" "list") [] services) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "relayPeerId") [] relayPeerId) ) - (call -relay- ("op" "noop") []) + (call %init_peer_id% ("getDataSrv" "knownPeers") [] knownPeers) ) - (call %init_peer_id% ("event" "collectPeerInfo") [relayPeerId ident services blueprints modules]) + (call -relay- ("op" "noop") []) ) - (fold services srv - (par - (seq - (seq - (seq - (call -relay- ("op" "noop") []) - (xor - (call relayPeerId ("srv" "get_interface") [srv.$.id!] iface) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (call %init_peer_id% ("event" "collectServiceInterface") [relayPeerId srv.$.id! iface]) - ) - (next srv) - ) - ) - ) - (fold knownPeers peer - (par + (xor (seq (seq (seq - (seq - (call -relay- ("op" "noop") []) - (xor - (seq - (seq - (seq - (call peer ("peer" "identify") [] ident0) - (call peer ("dist" "list_blueprints") [] blueprints0) - ) - (call peer ("dist" "list_modules") [] modules0) - ) - (call peer ("srv" "list") [] services0) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (call %init_peer_id% ("event" "collectPeerInfo") [peer ident0 services0 blueprints0 modules0]) - ) - (fold services0 srv0 - (par - (seq - (seq - (seq - (call -relay- ("op" "noop") []) - (xor - (call peer ("srv" "get_interface") [srv0.$.id!] iface0) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (call %init_peer_id% ("event" "collectServiceInterface") [peer srv0.$.id! iface0]) - ) - (next srv0) + (call relayPeerId ("peer" "identify") [] ident) + (call relayPeerId ("dist" "list_blueprints") [] blueprints) ) + (call relayPeerId ("dist" "list_modules") [] modules) ) + (call relayPeerId ("srv" "list") [] services) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) ) - (next peer) ) ) - ) - (seq (call -relay- ("op" "noop") []) - (xor + ) + (call %init_peer_id% ("event" "collectPeerInfo") [relayPeerId ident services blueprints modules]) + ) + (fold services srv + (par + (seq (seq - (call relayPeerId ("kad" "neighborhood") [%init_peer_id% false] neighbors) - (fold neighbors n - (par - (xor - (seq - (call n ("kad" "neighborhood") [%init_peer_id% false] neighbors2) - (fold neighbors2 n2 - (par - (seq - (seq - (xor - (seq - (seq - (seq - (call n2 ("peer" "identify") [] ident1) - (call n2 ("dist" "list_blueprints") [] blueprints1) - ) - (call n2 ("dist" "list_modules") [] modules1) - ) - (call n2 ("srv" "list") [] services1) - ) - (seq - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) - ) - (call -relay- ("op" "noop") []) - ) - ) - (call n ("event" "collectPeerInfo") [n2 ident1 services1 blueprints1 modules1]) - ) - (fold services1 srv1 - (par - (seq - (xor - (call n2 ("srv" "get_interface") [srv1.$.id!] iface1) - (seq - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 6]) - ) - (call -relay- ("op" "noop") []) - ) - ) - (call n ("event" "collectServiceInterface") [n2 srv1.$.id! iface1]) - ) - (next srv1) - ) - ) - ) - (next n2) - ) - ) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 7]) - ) + (seq + (call -relay- ("op" "noop") []) + (xor + (call relayPeerId ("srv" "get_interface") [srv.$.id!] iface) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) - (next n) ) ) + (call -relay- ("op" "noop") []) ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 8]) + (call %init_peer_id% ("event" "collectServiceInterface") [relayPeerId srv.$.id! iface]) ) + (next srv) ) ) ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 9]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, diff --git a/src/index.js b/src/index.js index c6ef3eb..70e7713 100644 --- a/src/index.js +++ b/src/index.js @@ -140,6 +140,7 @@ function genFlags(peerId, relays, relayIdx) { const services = args[2]; const blueprints = args[3]; const modules = args[4]; + const interfaces = args[5]; const eventRaw = { peerId, identify,