From 547b3b988b70f460a8b31e4f1b79d83fc394438a Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Fri, 18 Jun 2021 16:54:58 +0300 Subject: [PATCH 1/8] remove commented lines --- caddy.Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/caddy.Dockerfile b/caddy.Dockerfile index b1841b3..f2913ce 100644 --- a/caddy.Dockerfile +++ b/caddy.Dockerfile @@ -3,15 +3,6 @@ WORKDIR / COPY ./dist /dist COPY Caddyfile /Caddyfile -#RUN printf '\n\ -#dash.fluence.dev {\n\ -# try_files /bundle/{path} /bundle/index.html?{query}&p={path}\n\ -#}\n\ -#'\ -#>> /tmp/hello - -#RUN echo 'try_files /bundle/{path} /bundle/index.html?{query}&p={path}' > Caddyfile - VOLUME /data #CMD ["caddy", "file-server", "--root", "/bundle", "--browse"] From 4c4b84ed0aedca279c649ae1484927f3fd02b784 Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Fri, 18 Jun 2021 16:55:16 +0300 Subject: [PATCH 2/8] remove commented line --- caddy.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/caddy.Dockerfile b/caddy.Dockerfile index f2913ce..665f4e7 100644 --- a/caddy.Dockerfile +++ b/caddy.Dockerfile @@ -5,7 +5,6 @@ COPY Caddyfile /Caddyfile VOLUME /data -#CMD ["caddy", "file-server", "--root", "/bundle", "--browse"] CMD ["caddy", "run", "--config", "/Caddyfile"] # DO NOT FORGET TO USE VOLUME OR CERTBOT WILL BAN: -v caddy_data:/data From 3f6846276f0059e136816fe898b9c474fb29ed67 Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Fri, 18 Jun 2021 17:09:28 +0300 Subject: [PATCH 3/8] Use caddy 2.4.0 --- Caddyfile | 2 +- caddy.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Caddyfile b/Caddyfile index 339ee9e..816d444 100644 --- a/Caddyfile +++ b/Caddyfile @@ -8,5 +8,5 @@ encode zstd gzip file_server root * /dist - # try_files {path} /index.html + try_files {path} /index.html } diff --git a/caddy.Dockerfile b/caddy.Dockerfile index 665f4e7..e42ba97 100644 --- a/caddy.Dockerfile +++ b/caddy.Dockerfile @@ -1,4 +1,4 @@ -FROM caddy +FROM caddy:2.4.0 WORKDIR / COPY ./dist /dist COPY Caddyfile /Caddyfile From 029e1e3c64f294058e4286c0d4b684805b451e9a Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Fri, 18 Jun 2021 17:12:47 +0300 Subject: [PATCH 4/8] revert --- Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Caddyfile b/Caddyfile index 816d444..339ee9e 100644 --- a/Caddyfile +++ b/Caddyfile @@ -8,5 +8,5 @@ encode zstd gzip file_server root * /dist - try_files {path} /index.html + # try_files {path} /index.html } From 39aacd86de3c4a7b1a1c5e0402de1e6231198da3 Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Fri, 18 Jun 2021 17:16:43 +0300 Subject: [PATCH 5/8] Enable SPA routing --- Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Caddyfile b/Caddyfile index 339ee9e..816d444 100644 --- a/Caddyfile +++ b/Caddyfile @@ -8,5 +8,5 @@ encode zstd gzip file_server root * /dist - # try_files {path} /index.html + try_files {path} /index.html } From d8e8d594004d66d6ee9fa379b8d745bbed5046c3 Mon Sep 17 00:00:00 2001 From: DieMyst Date: Tue, 22 Jun 2021 12:52:34 +0300 Subject: [PATCH 6/8] update aqua --- package-lock.json | 68 +++++++------- package.json | 4 +- src/_aqua/app.js | 230 +++++++++++++++++++--------------------------- src/index.js | 2 +- 4 files changed, 134 insertions(+), 170 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9dc19aa..af1ca5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fluence-admin", - "version": "0.0.1", + "version": "0.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -998,9 +998,9 @@ } }, "@fluencelabs/aqua-cli": { - "version": "0.1.5-142", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-cli/-/aqua-cli-0.1.5-142.tgz", - "integrity": "sha512-22BhF9j44FPTUc3JM6tGRz0SnyMthJM05cIuS98mHYTTTPU7i0jOS0dl/V7BYzSBJBAwEmZLA1Z/3bGr9PUBEA==", + "version": "0.1.7-152", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-cli/-/aqua-cli-0.1.7-152.tgz", + "integrity": "sha512-oVT9IWllJb8dhzKEMoIWd9FDFEKkBo8zKlzUbQxU7OCbjxkuozF+aiMqJEQlFNSbBL9z1b5KVkF1gcgmSkKWSg==", "dev": true }, "@fluencelabs/aqua-lib": { @@ -1010,9 +1010,9 @@ "dev": true }, "@fluencelabs/avm": { - "version": "0.9.12", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.9.12.tgz", - "integrity": "sha512-NCRGJafLa1Zs98IIOIALrPUoOEjesITsB9of2/r+IDgGKunf0NjI2/tqU5pK+37ye/qro5W+FJsHyseDh7zSDQ==", + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.10.5.tgz", + "integrity": "sha512-R65qY8PeVdlF27UDlcODTnxSBfEbiqXivHWoM62e7mZYr4T/lcZEklqMPOkRrymJWs7y/zP/D8N7zxecDNLBOA==", "requires": { "base64-js": "1.5.1" }, @@ -1025,11 +1025,11 @@ } }, "@fluencelabs/fluence": { - "version": "0.9.47", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.9.47.tgz", - "integrity": "sha512-NueaISvOvE1dDoeyfDcVmcDteXLyMbhb/hU7Z9O+5rJEvMYo2CzhIGAQo9bTDFLNBoamXFJdpqV3iLBn/kRs9Q==", + "version": "0.9.53", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.9.53.tgz", + "integrity": "sha512-DxazRumUWM4idI55ZSbfI26lRm5tvrgBYPa4XwPmxSbjgkLE5OjZ+sUStesMiUSst6ROQkwMM4v8BK7WqAyMuw==", "requires": { - "@fluencelabs/avm": "0.9.12", + "@fluencelabs/avm": "0.10.5", "async": "3.2.0", "base64-js": "1.3.1", "bs58": "4.0.1", @@ -1053,13 +1053,13 @@ "integrity": "sha512-TetSwl2PnLEoxkP/lr3MFpqSRKFO02PJMyjeN2TQbUUviQyfYLpL/IQFocaQZc0fRzOQWVg65aqSStHtA3rB6w==" }, "@motrix/nat-api": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@motrix/nat-api/-/nat-api-0.3.1.tgz", - "integrity": "sha512-mUsW8BlSK4bE5kjC5H4oQPjnXXuiRtE2V26tzW/AOroXl5CuhMEr9EDrr+wUFvDHlDwK4B0uSOBa8yILr6AfbQ==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@motrix/nat-api/-/nat-api-0.3.2.tgz", + "integrity": "sha512-T3LSHnEUULbSU1o1zCZZ1ul8l8Jm98f0fz/0BeF7DhNvrV63YllLCD4vUR9hFZWu/+WTIVPnbH8dBK5Ckuveuw==", "requires": { "async": "^3.2.0", - "debug": "^4.1.1", - "default-gateway": "^6.0.1", + "debug": "^4.3.1", + "default-gateway": "^6.0.3", "request": "^2.88.2", "unordered-array-remove": "^1.0.2", "xml2js": "^0.4.23" @@ -1074,9 +1074,9 @@ } }, "execa": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz", - "integrity": "sha512-4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "requires": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -8082,9 +8082,9 @@ }, "dependencies": { "cids": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.6.tgz", - "integrity": "sha512-5P+Jas2bVpjiHibp/SOwKY+v7JhAjTChaAZN+vCIrsWXn/JZV0frX22Vp5zZgEyJRPco79pX+yNQ2S3LkRukHQ==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.7.tgz", + "integrity": "sha512-dlh+K0hMwFAFFjWQ2ZzxOhgGVNVREPdmk8cqHFui2U4sOodcemLMxdE5Ujga4cDcDQhWfldEPThkfu6KWBt1eA==", "requires": { "multibase": "^4.0.1", "multicodec": "^3.0.1", @@ -8406,9 +8406,9 @@ }, "dependencies": { "cids": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.6.tgz", - "integrity": "sha512-5P+Jas2bVpjiHibp/SOwKY+v7JhAjTChaAZN+vCIrsWXn/JZV0frX22Vp5zZgEyJRPco79pX+yNQ2S3LkRukHQ==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.7.tgz", + "integrity": "sha512-dlh+K0hMwFAFFjWQ2ZzxOhgGVNVREPdmk8cqHFui2U4sOodcemLMxdE5Ujga4cDcDQhWfldEPThkfu6KWBt1eA==", "requires": { "multibase": "^4.0.1", "multicodec": "^3.0.1", @@ -9154,9 +9154,9 @@ }, "dependencies": { "cids": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.6.tgz", - "integrity": "sha512-5P+Jas2bVpjiHibp/SOwKY+v7JhAjTChaAZN+vCIrsWXn/JZV0frX22Vp5zZgEyJRPco79pX+yNQ2S3LkRukHQ==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.7.tgz", + "integrity": "sha512-dlh+K0hMwFAFFjWQ2ZzxOhgGVNVREPdmk8cqHFui2U4sOodcemLMxdE5Ujga4cDcDQhWfldEPThkfu6KWBt1eA==", "requires": { "multibase": "^4.0.1", "multicodec": "^3.0.1", @@ -10590,9 +10590,9 @@ }, "dependencies": { "cids": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.6.tgz", - "integrity": "sha512-5P+Jas2bVpjiHibp/SOwKY+v7JhAjTChaAZN+vCIrsWXn/JZV0frX22Vp5zZgEyJRPco79pX+yNQ2S3LkRukHQ==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.7.tgz", + "integrity": "sha512-dlh+K0hMwFAFFjWQ2ZzxOhgGVNVREPdmk8cqHFui2U4sOodcemLMxdE5Ujga4cDcDQhWfldEPThkfu6KWBt1eA==", "requires": { "multibase": "^4.0.1", "multicodec": "^3.0.1", @@ -15643,9 +15643,9 @@ "dev": true }, "ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz", + "integrity": "sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw==" }, "xml2js": { "version": "0.4.23", diff --git a/package.json b/package.json index 6a30e0c..f1a47ba 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/fluencelabs/fluence-admin#readme", "dependencies": { - "@fluencelabs/fluence": "0.9.47", + "@fluencelabs/fluence": "0.9.53", "@fluencelabs/fluence-network-environment": "1.0.9", "css-spinners": "^1.0.1", "tachyons": "^4.12.0", @@ -39,7 +39,7 @@ "devDependencies": { "@babel/core": "^7.11.6", "@babel/preset-env": "^7.11.5", - "@fluencelabs/aqua-cli": "^0.1.5-142", + "@fluencelabs/aqua-cli": "^0.1.7-152", "@fluencelabs/aqua-lib": "^0.1.5", "@types/yup": "^0.29.11", "babel-loader": "^8.1.0", diff --git a/src/_aqua/app.js b/src/_aqua/app.js index 3fcf5aa..5e160df 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.5-142 + * Aqua version: 0.1.7-152 * */ import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable'; @@ -26,7 +26,7 @@ export async function askAllAndSend(client, peer) { (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) (call %init_peer_id% ("getDataSrv" "peer") [] peer) ) - (call -relay- ("op" "identity") []) + (call -relay- ("op" "noop") []) ) (xor (seq @@ -40,12 +40,12 @@ export async function askAllAndSend(client, peer) { (call peer ("srv" "list") [] services) ) (seq - (call -relay- ("op" "identity") []) + (call -relay- ("op" "noop") []) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) ) ) ) - (call -relay- ("op" "identity") []) + (call -relay- ("op" "noop") []) ) (call %init_peer_id% ("event" "all_info") [peer ident services blueprints modules]) ) @@ -95,7 +95,7 @@ export async function findAndAskNeighboursSchema(client, relayPeerId, clientId) ) (call %init_peer_id% ("getDataSrv" "clientId") [] clientId) ) - (call -relay- ("op" "identity") []) + (call -relay- ("op" "noop") []) ) (xor (seq @@ -108,24 +108,24 @@ export async function findAndAskNeighboursSchema(client, relayPeerId, clientId) (fold neighbors2 n2 (seq (seq - (seq - (xor + (xor + (seq (seq (seq - (seq - (call n2 ("peer" "identify") [] ident) - (call n2 ("dist" "list_blueprints") [] blueprints) - ) - (call n2 ("dist" "list_modules") [] modules) + (call n2 ("peer" "identify") [] ident) + (call n2 ("dist" "list_blueprints") [] blueprints) ) - (call n2 ("srv" "list") [] services) + (call n2 ("dist" "list_modules") [] modules) ) + (call n2 ("srv" "list") [] services) + ) + (seq (seq - (call -relay- ("op" "identity") []) + (call -relay- ("op" "noop") []) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) ) + (call -relay- ("op" "noop") []) ) - (call -relay- ("op" "identity") []) ) (call n ("event" "all_info") [n2 ident services blueprints modules]) ) @@ -134,36 +134,18 @@ export async function findAndAskNeighboursSchema(client, relayPeerId, clientId) ) ) (seq - (call -relay- ("op" "identity") []) + (call -relay- ("op" "noop") []) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) ) - (seq - (seq - (seq - (call -relay- ("op" "identity") []) - (next n) - ) - (call -relay- ("op" "identity") []) - ) - (call %init_peer_id% ("op" "identity") []) - ) + (next n) ) ) ) - (seq - (seq - (call -relay- ("op" "identity") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) - ) - (call -relay- ("op" "identity") []) - ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) ) - (seq - (call -relay- ("op" "identity") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) - ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) ) `, @@ -204,140 +186,122 @@ 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 - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "relayPeerId") [] relayPeerId) - ) - (call %init_peer_id% ("getDataSrv" "knownPeers") [] knownPeers) - ) - (par (seq (seq - (seq - (call -relay- ("op" "identity") []) - (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" "identity") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "identity") []) - ) - (call %init_peer_id% ("event" "all_info") [relayPeerId ident services blueprints modules]) - ) - (fold knownPeers peer - (par - (seq + (call -relay- ("op" "noop") []) + (xor (seq (seq - (call -relay- ("op" "identity") []) - (xor + (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 -relay- ("op" "noop") []) + ) + (call %init_peer_id% ("event" "all_info") [relayPeerId ident services blueprints modules]) + ) + (fold knownPeers peer + (par + (seq + (seq + (seq + (call -relay- ("op" "noop") []) + (xor + (seq (seq (seq - (seq - (call peer ("peer" "identify") [] ident0) - (call peer ("dist" "list_blueprints") [] blueprints0) - ) - (call peer ("dist" "list_modules") [] modules0) + (call peer ("peer" "identify") [] ident0) + (call peer ("dist" "list_blueprints") [] blueprints0) ) - (call peer ("srv" "list") [] services0) - ) - (seq - (call -relay- ("op" "identity") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + (call peer ("dist" "list_modules") [] modules0) ) + (call peer ("srv" "list") [] services0) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) ) - (call -relay- ("op" "identity") []) ) - (call %init_peer_id% ("event" "all_info") [peer ident0 services0 blueprints0 modules0]) + (call -relay- ("op" "noop") []) ) - (next peer) + (call %init_peer_id% ("event" "all_info") [peer ident0 services0 blueprints0 modules0]) ) + (next peer) ) ) ) - (call -relay- ("op" "identity") []) - ) - (xor (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 + (call -relay- ("op" "noop") []) + (xor + (seq + (call relayPeerId ("kad" "neighborhood") [%init_peer_id% false] neighbors) + (fold neighbors n + (par + (xor (seq - (seq + (call n ("kad" "neighborhood") [%init_peer_id% false] neighbors2) + (fold neighbors2 n2 (seq - (xor - (seq + (seq + (xor (seq (seq - (call n2 ("peer" "identify") [] ident1) - (call n2 ("dist" "list_blueprints") [] blueprints1) + (seq + (call n2 ("peer" "identify") [] ident1) + (call n2 ("dist" "list_blueprints") [] blueprints1) + ) + (call n2 ("dist" "list_modules") [] modules1) ) - (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% 3]) + ) + (call -relay- ("op" "noop") []) ) - (call n2 ("srv" "list") [] services1) - ) - (seq - (call -relay- ("op" "identity") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) + (call n ("event" "all_info") [n2 ident1 services1 blueprints1 modules1]) ) - (call -relay- ("op" "identity") []) + (next n2) ) - (call n ("event" "all_info") [n2 ident1 services1 blueprints1 modules1]) ) - (next n2) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) ) ) + (next n) ) - (seq - (call -relay- ("op" "identity") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) - ) - ) - (seq - (seq - (seq - (call -relay- ("op" "identity") []) - (next n) - ) - (call -relay- ("op" "identity") []) - ) - (call %init_peer_id% ("op" "identity") []) ) ) - ) - ) - (seq - (seq - (call -relay- ("op" "identity") []) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) ) - (call -relay- ("op" "identity") []) ) ) ) - (seq - (call -relay- ("op" "identity") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 6]) - ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 6]) ) `, diff --git a/src/index.js b/src/index.js index f7939b0..add6312 100644 --- a/src/index.js +++ b/src/index.js @@ -69,7 +69,7 @@ function event(name, peer, peers, identify, services, modules, blueprints) { /* eslint-enable */ (async () => { - setLogLevel('DEBUG'); + setLogLevel('INFO'); const pid = await generatePeerId(); const flags = genFlags(pid.toB58String()); From ba86658c744407ff563214a79d72e6072f850be3 Mon Sep 17 00:00:00 2001 From: DieMyst Date: Tue, 22 Jun 2021 13:17:32 +0300 Subject: [PATCH 7/8] update aqua --- package-lock.json | 6 +++--- package.json | 2 +- src/_aqua/app.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index af1ca5f..0cf75a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -998,9 +998,9 @@ } }, "@fluencelabs/aqua-cli": { - "version": "0.1.7-152", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-cli/-/aqua-cli-0.1.7-152.tgz", - "integrity": "sha512-oVT9IWllJb8dhzKEMoIWd9FDFEKkBo8zKlzUbQxU7OCbjxkuozF+aiMqJEQlFNSbBL9z1b5KVkF1gcgmSkKWSg==", + "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==", "dev": true }, "@fluencelabs/aqua-lib": { diff --git a/package.json b/package.json index f1a47ba..f5e3373 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@babel/core": "^7.11.6", "@babel/preset-env": "^7.11.5", - "@fluencelabs/aqua-cli": "^0.1.7-152", + "@fluencelabs/aqua-cli": "^0.1.7-153", "@fluencelabs/aqua-lib": "^0.1.5", "@types/yup": "^0.29.11", "babel-loader": "^8.1.0", diff --git a/src/_aqua/app.js b/src/_aqua/app.js index 5e160df..6af7308 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-152 + * Aqua version: 0.1.7-153 * */ import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable'; From 01037462d6ce220563034dd084d68c1a1f69de6d Mon Sep 17 00:00:00 2001 From: Pavel Date: Tue, 22 Jun 2021 13:28:17 +0300 Subject: [PATCH 8/8] Passing environment via a separate json file (#15) --- env/env.json | 4 +++ index.html | 1 + src/index.js | 86 +++++++++++++++++++++++++++++++++++++++++++---- webpack.config.js | 3 ++ 4 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 env/env.json diff --git a/env/env.json b/env/env.json new file mode 100644 index 0000000..c3af7be --- /dev/null +++ b/env/env.json @@ -0,0 +1,4 @@ +{ + "nodes": [], + "logLevel": "error" +} diff --git a/index.html b/index.html index 3b2efd7..ac0dd34 100644 --- a/index.html +++ b/index.html @@ -24,6 +24,7 @@ gtag('js', new Date()); gtag('config', 'G-6ZTQKE1D4L'); +
diff --git a/src/index.js b/src/index.js index add6312..caa1f20 100644 --- a/src/index.js +++ b/src/index.js @@ -19,6 +19,7 @@ import 'css-spinners/dist/all.min.css'; import './main.css'; // eslint-disable-next-line import/no-extraneous-dependencies import log from 'loglevel'; +import Multiaddr from 'multiaddr'; import { dev, krasnodar } from '@fluencelabs/fluence-network-environment'; import { createClient, @@ -33,12 +34,83 @@ import * as serviceWorker from './serviceWorker'; import { eventType } from './types'; import { getAll } from './_aqua/app'; -const relayIdx = 3; +const defaultNetworkName = 'krasnodar'; -const relays = krasnodar; -// const relays = dev; +const defaultEnv = { + relays: krasnodar, + relayIdx: 3, + logLevel: 'error', +}; -function genFlags(peerId) { +async function loadScript(script) { + return new Promise((resolve, reject) => { + var xhr = new XMLHttpRequest(); + xhr.open('GET', script.src); + xhr.onreadystatechange = function () { + if (xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200) { + resolve(xhr.responseText); + } + }; + xhr.onerror = reject; + xhr.onabort = reject; + xhr.send(); + }); +} + +function isMultiaddr(multiaddr) { + try { + Multiaddr(multiaddr); + return true; + } catch (error) { + return false; + } +} + +async function initEnvironment() { + try { + const script = document.getElementById('env'); + if (!script) { + console.log("Couldn't load environment, falling back to default (${defaultNetworkName})"); + return defaultEnv; + } + + const scriptContent = await loadScript(script); + const envWrapper = JSON.parse(scriptContent); + + const res = { ...defaultEnv }; + + const data = envWrapper ? envWrapper.nodes : []; + if (data.length === 0) { + console.log(`Environment is empty, falling back to default (${defaultNetworkName})`); + } else { + data.forEach((element) => { + if (!element.multiaddr) { + console.error('multiaddr field is missing for ', element); + } + if (!element.peerId) { + console.error('peerId field is missing for ', element); + } + if (!isMultiaddr(element.multiaddr)) { + console.error(`Value ${element.multiaddr} is not a correct multiaddr`); + } + }); + res.relays = data; + res.relayIdx = 0; + } + + if (envWrapper.logLevel !== undefined) { + res.logLevel = envWrapper.logLevel; + } + + return res; + } catch (error) { + console.error("Couldn't parse environment, error: ", error); + } + + return defaultEnv; +} + +function genFlags(peerId, relays, relayIdx) { return { peerId, relayId: relays[relayIdx].peerId, @@ -69,10 +141,10 @@ function event(name, peer, peers, identify, services, modules, blueprints) { /* eslint-enable */ (async () => { - setLogLevel('INFO'); - + const { relays, relayIdx, logLevel } = await initEnvironment(); + setLogLevel(logLevel); const pid = await generatePeerId(); - const flags = genFlags(pid.toB58String()); + const flags = genFlags(pid.toB58String(), relays, relayIdx); console.log(`connect with client: ${pid.toB58String()}`); // If the relay is ever changed, an event shall be sent to elm diff --git a/webpack.config.js b/webpack.config.js index a7f0676..b6ab174 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -40,6 +40,9 @@ var common = { { from: 'favicon.ico', }, + { + from: './env/*.*', + }, ], }), ],