From ad8e18f01cf77e14eaa049d38c2c5ad349016326 Mon Sep 17 00:00:00 2001 From: Pavel Date: Fri, 22 Oct 2021 09:41:48 +0300 Subject: [PATCH] Update fluence-js to 14.2 and aqua to 0.4.0-235 (#33) --- .../aqua-ipfs-integration/aqua/package.json | 6 +- .../aqua-ipfs-integration/aqua/src/exports.ts | 1212 ++++++------- .../aqua-ipfs-integration/aqua/src/process.ts | 1266 ++++++------- .../aqua-ipfs-integration/nodejs/package.json | 4 +- .../aqua-ipfs-integration/package-lock.json | 276 ++- .../aqua-ipfs-integration/package.json | 4 + .../aqua-ipfs-integration/web/package.json | 2 +- .../client-peer/package-lock.json | 156 +- .../echo-greeter/client-peer/package.json | 6 +- .../client-peer/package-lock.json | 110 +- .../price-oracle/client-peer/package.json | 6 +- .../price-oracle/web/package-lock.json | 92 +- aqua-examples/price-oracle/web/package.json | 4 +- .../browser-example/package-lock.json | 227 ++- .../browser-example/package.json | 4 +- .../src/_aqua/getting-started.ts | 150 +- .../hello-world/aqua/hello-world.aqua | 5 + .../hello-world/package-lock.json | 181 +- fluence-js-examples/hello-world/package.json | 4 +- .../hello-world/src/_aqua/hello-world.ts | 349 ++-- fluence-js-examples/hello-world/src/index.ts | 11 +- .../node-example/package-lock.json | 171 +- fluence-js-examples/node-example/package.json | 4 +- .../node-example/src/_aqua/calc.ts | 242 +-- .../src/_aqua/demo-calculation.ts | 186 +- .../1-browser-to-browser/package-lock.json | 253 ++- quickstart/1-browser-to-browser/package.json | 4 +- .../src/_aqua/getting-started.ts | 285 ++- .../3-browser-to-service/package-lock.json | 251 ++- quickstart/3-browser-to-service/package.json | 4 +- .../src/_aqua/getting-started.ts | 388 ++-- .../client-peer/.gitignore | 1 + .../dist/src/compiled-aqua/adder.js | 344 ---- .../dist/src/compiled-aqua/builtin.js | 548 ------ .../client-peer/dist/src/index.js | 130 -- .../client-peer/package-lock.json | 185 +- .../client-peer/package.json | 6 +- .../client-peer/src/compiled-aqua/adder.ts | 916 ++++------ .../client-peer/src/compiled-aqua/builtin.ts | 1600 ++++++++--------- 39 files changed, 4409 insertions(+), 5184 deletions(-) create mode 100644 quickstart/4-composing-services-with-aqua/client-peer/.gitignore delete mode 100644 quickstart/4-composing-services-with-aqua/client-peer/dist/src/compiled-aqua/adder.js delete mode 100644 quickstart/4-composing-services-with-aqua/client-peer/dist/src/compiled-aqua/builtin.js delete mode 100644 quickstart/4-composing-services-with-aqua/client-peer/dist/src/index.js diff --git a/aqua-examples/aqua-ipfs-integration/aqua/package.json b/aqua-examples/aqua-ipfs-integration/aqua/package.json index bf79cbe..fd5307d 100644 --- a/aqua-examples/aqua-ipfs-integration/aqua/package.json +++ b/aqua-examples/aqua-ipfs-integration/aqua/package.json @@ -23,7 +23,7 @@ "dependencies": { "@fluencelabs/aqua-ipfs": "0.4.2", "@fluencelabs/aqua-lib": "0.1.14", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "ipfs-http-client": "^50.1.2", "it-all": "^1.0.5", @@ -31,7 +31,7 @@ "uint8arrays": "^2.1.5" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", - "typescript": "^3.9.5" + "@fluencelabs/aqua": "^0.4.0-235", + "typescript": "^4.0.0" } } diff --git a/aqua-examples/aqua-ipfs-integration/aqua/src/exports.ts b/aqua-examples/aqua-ipfs-integration/aqua/src/exports.ts index 44dfb30..20399e0 100644 --- a/aqua-examples/aqua-ipfs-integration/aqua/src/exports.ts +++ b/aqua-examples/aqua-ipfs-integration/aqua/src/exports.ts @@ -1,706 +1,592 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-235 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - // Functions + - export function set_timeout(node: string, timeout_sec: number, config?: {ttl?: number}) : Promise; - export function set_timeout(peer: FluencePeer, node: string, timeout_sec: number, config?: {ttl?: number}) : Promise; - export function set_timeout(...args: any) { - let peer: FluencePeer; - let node: any; -let timeout_sec: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - node = args[1]; -timeout_sec = args[2]; -config = args[3]; - } else { - peer = Fluence.getPeer(); - node = args[0]; -timeout_sec = args[1]; -config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "node") [] node) - ) - (call %init_peer_id% ("getDataSrv" "timeout_sec") [] timeout_sec) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call node ("aqua-ipfs" "set_timeout") [timeout_sec]) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) -) +export function set_timeout(node: string, timeout_sec: number, config?: {ttl?: number}): Promise; +export function set_timeout(peer: FluencePeer, node: string, timeout_sec: number, config?: {ttl?: number}): Promise; +export function set_timeout(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node', () => {return node;}); -h.on('getDataSrv', 'timeout_sec', () => {return timeout_sec;}); - h.onEvent('callbackSrv', 'response', (args) => { - -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for set_timeout'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "node") [] node) + ) + (call %init_peer_id% ("getDataSrv" "timeout_sec") [] timeout_sec) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call node ("aqua-ipfs" "set_timeout") [timeout_sec]) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + ` + return callFunction( + args, + { + "functionName" : "set_timeout", + "returnType" : { + "tag" : "void" + }, + "argDefs" : [ + { + "name" : "node", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "timeout_sec", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return Promise.race([promise, Promise.resolve()]); + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + - export function get_and_cache(node: string, cid: string, from: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; - export function get_and_cache(peer: FluencePeer, node: string, cid: string, from: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; - export function get_and_cache(...args: any) { - let peer: FluencePeer; - let node: any; -let cid: any; -let from: any; -let error: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - node = args[1]; -cid = args[2]; -from = args[3]; -error = args[4]; -config = args[5]; - } else { - peer = Fluence.getPeer(); - node = args[0]; -cid = args[1]; -from = args[2]; -error = args[3]; -config = args[4]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "node") [] node) - ) - (call %init_peer_id% ("getDataSrv" "cid") [] cid) - ) - (call %init_peer_id% ("getDataSrv" "from") [] from) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (seq - (call node ("aqua-ipfs" "get_from") [cid from] get) - (xor - (match get.$.success! true - (xor - (seq - (call node ("aqua-ipfs" "put") [get.$.path!] put) - (xor - (match put.$.success! true - (xor - (ap put.$.hash! $localCid) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (par - (seq - (call -relay- ("op" "noop") []) - (xor - (call %init_peer_id% ("callbackSrv" "error") ["Ipfs.put failed" put.$.error!]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (null) - ) - ) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) - ) - ) - ) - (par - (seq - (call -relay- ("op" "noop") []) - (xor - (call %init_peer_id% ("callbackSrv" "error") ["Ipfs.get failed" get.$.error!]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) - ) - ) - (null) - ) - ) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [$localCid]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 6]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 7]) -) +export function get_and_cache(node: string, cid: string, from: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise, config?: {ttl?: number}): Promise; +export function get_and_cache(peer: FluencePeer, node: string, cid: string, from: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise, config?: {ttl?: number}): Promise; +export function get_and_cache(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node', () => {return node;}); -h.on('getDataSrv', 'cid', () => {return cid;}); -h.on('getDataSrv', 'from', () => {return from;}); - - h.use((req, resp, next) => { - if(req.serviceId === 'callbackSrv' && req.fnName === 'error') { - - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0],arg1: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - error(req.args[0], req.args[1], callParams); resp.result = {} - - } - next(); - }); - - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { resolve(null); } - opt = opt[0]; - } - return resolve(opt); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for get_and_cache'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "node") [] node) + ) + (call %init_peer_id% ("getDataSrv" "cid") [] cid) + ) + (call %init_peer_id% ("getDataSrv" "from") [] from) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (seq + (call node ("aqua-ipfs" "get_from") [cid from] get) + (xor + (match get.$.success! true + (xor + (seq + (call node ("aqua-ipfs" "put") [get.$.path!] put) + (xor + (match put.$.success! true + (xor + (ap put.$.hash! $localCid) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (par + (seq + (call -relay- ("op" "noop") []) + (xor + (call %init_peer_id% ("callbackSrv" "error") ["Ipfs.put failed" put.$.error!]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (null) + ) + ) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ) + ) + (par + (seq + (call -relay- ("op" "noop") []) + (xor + (call %init_peer_id% ("callbackSrv" "error") ["Ipfs.get failed" get.$.error!]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) + ) + ) + (null) + ) + ) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$localCid]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 6]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 7]) + ) + ` + return callFunction( + args, + { + "functionName" : "get_and_cache", + "returnType" : { + "tag" : "optional" + }, + "argDefs" : [ + { + "name" : "node", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "cid", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "from", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "error", + "argType" : { + "tag" : "callback", + "callback" : { + "argDefs" : [ + { + "name" : "arg0", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "arg1", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + } + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + +export type Get_fromResult = { error: string; path: string; success: boolean; } +export function get_from(node: string, cid: string, from: string, config?: {ttl?: number}): Promise; +export function get_from(peer: FluencePeer, node: string, cid: string, from: string, config?: {ttl?: number}): Promise; +export function get_from(...args: any) { - export function get_from(node: string, cid: string, from: string, config?: {ttl?: number}) : Promise<{error:string;path:string;success:boolean}>; - export function get_from(peer: FluencePeer, node: string, cid: string, from: string, config?: {ttl?: number}) : Promise<{error:string;path:string;success:boolean}>; - export function get_from(...args: any) { - let peer: FluencePeer; - let node: any; -let cid: any; -let from: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - node = args[1]; -cid = args[2]; -from = args[3]; -config = args[4]; - } else { - peer = Fluence.getPeer(); - node = args[0]; -cid = args[1]; -from = args[2]; -config = args[3]; - } - - let request: RequestFlow; - const promise = new Promise<{error:string;path:string;success:boolean}>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "node") [] node) - ) - (call %init_peer_id% ("getDataSrv" "cid") [] cid) - ) - (call %init_peer_id% ("getDataSrv" "from") [] from) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call node ("aqua-ipfs" "get_from") [cid from] result) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [result]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node', () => {return node;}); -h.on('getDataSrv', 'cid', () => {return cid;}); -h.on('getDataSrv', 'from', () => {return from;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for get_from'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "node") [] node) + ) + (call %init_peer_id% ("getDataSrv" "cid") [] cid) + ) + (call %init_peer_id% ("getDataSrv" "from") [] from) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call node ("aqua-ipfs" "get_from") [cid from] result) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [result]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "get_from", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "node", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "cid", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "from", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + +export type Get_local_api_multiaddrResult = { error: string; multiaddr: string; success: boolean; } +export function get_local_api_multiaddr(node: string, config?: {ttl?: number}): Promise; +export function get_local_api_multiaddr(peer: FluencePeer, node: string, config?: {ttl?: number}): Promise; +export function get_local_api_multiaddr(...args: any) { - export function get_local_api_multiaddr(node: string, config?: {ttl?: number}) : Promise<{error:string;multiaddr:string;success:boolean}>; - export function get_local_api_multiaddr(peer: FluencePeer, node: string, config?: {ttl?: number}) : Promise<{error:string;multiaddr:string;success:boolean}>; - export function get_local_api_multiaddr(...args: any) { - let peer: FluencePeer; - let node: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - node = args[1]; -config = args[2]; - } else { - peer = Fluence.getPeer(); - node = args[0]; -config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise<{error:string;multiaddr:string;success:boolean}>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "node") [] node) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call node ("aqua-ipfs" "get_local_api_multiaddr") [] result) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [result]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node', () => {return node;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for get_local_api_multiaddr'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "node") [] node) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call node ("aqua-ipfs" "get_local_api_multiaddr") [] result) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [result]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "get_local_api_multiaddr", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "node", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + +export type Get_external_swarm_multiaddrResult = { error: string; multiaddr: string; success: boolean; } +export function get_external_swarm_multiaddr(node: string, config?: {ttl?: number}): Promise; +export function get_external_swarm_multiaddr(peer: FluencePeer, node: string, config?: {ttl?: number}): Promise; +export function get_external_swarm_multiaddr(...args: any) { - export function get_external_swarm_multiaddr(node: string, config?: {ttl?: number}) : Promise<{error:string;multiaddr:string;success:boolean}>; - export function get_external_swarm_multiaddr(peer: FluencePeer, node: string, config?: {ttl?: number}) : Promise<{error:string;multiaddr:string;success:boolean}>; - export function get_external_swarm_multiaddr(...args: any) { - let peer: FluencePeer; - let node: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - node = args[1]; -config = args[2]; - } else { - peer = Fluence.getPeer(); - node = args[0]; -config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise<{error:string;multiaddr:string;success:boolean}>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "node") [] node) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call node ("aqua-ipfs" "get_external_swarm_multiaddr") [] result) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [result]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node', () => {return node;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for get_external_swarm_multiaddr'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "node") [] node) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call node ("aqua-ipfs" "get_external_swarm_multiaddr") [] result) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [result]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "get_external_swarm_multiaddr", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "node", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + +export type PutResult = { error: string; hash: string; success: boolean; } +export function put(node: string, path: string, config?: {ttl?: number}): Promise; +export function put(peer: FluencePeer, node: string, path: string, config?: {ttl?: number}): Promise; +export function put(...args: any) { - export function put(node: string, path: string, config?: {ttl?: number}) : Promise<{error:string;hash:string;success:boolean}>; - export function put(peer: FluencePeer, node: string, path: string, config?: {ttl?: number}) : Promise<{error:string;hash:string;success:boolean}>; - export function put(...args: any) { - let peer: FluencePeer; - let node: any; -let path: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - node = args[1]; -path = args[2]; -config = args[3]; - } else { - peer = Fluence.getPeer(); - node = args[0]; -path = args[1]; -config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise<{error:string;hash:string;success:boolean}>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "node") [] node) - ) - (call %init_peer_id% ("getDataSrv" "path") [] path) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call node ("aqua-ipfs" "put") [path] result) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [result]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node', () => {return node;}); -h.on('getDataSrv', 'path', () => {return path;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for put'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "node") [] node) + ) + (call %init_peer_id% ("getDataSrv" "path") [] path) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call node ("aqua-ipfs" "put") [path] result) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [result]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "put", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "node", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "path", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + +export type Get_external_api_multiaddrResult = { error: string; multiaddr: string; success: boolean; } +export function get_external_api_multiaddr(node: string, config?: {ttl?: number}): Promise; +export function get_external_api_multiaddr(peer: FluencePeer, node: string, config?: {ttl?: number}): Promise; +export function get_external_api_multiaddr(...args: any) { - export function get_external_api_multiaddr(node: string, config?: {ttl?: number}) : Promise<{error:string;multiaddr:string;success:boolean}>; - export function get_external_api_multiaddr(peer: FluencePeer, node: string, config?: {ttl?: number}) : Promise<{error:string;multiaddr:string;success:boolean}>; - export function get_external_api_multiaddr(...args: any) { - let peer: FluencePeer; - let node: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - node = args[1]; -config = args[2]; - } else { - peer = Fluence.getPeer(); - node = args[0]; -config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise<{error:string;multiaddr:string;success:boolean}>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "node") [] node) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call node ("aqua-ipfs" "get_external_api_multiaddr") [] result) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [result]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node', () => {return node;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for get_external_api_multiaddr'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "node") [] node) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call node ("aqua-ipfs" "get_external_api_multiaddr") [] result) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [result]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "get_external_api_multiaddr", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "node", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - diff --git a/aqua-examples/aqua-ipfs-integration/aqua/src/process.ts b/aqua-examples/aqua-ipfs-integration/aqua/src/process.ts index e0103ed..21f609f 100644 --- a/aqua-examples/aqua-ipfs-integration/aqua/src/process.ts +++ b/aqua-examples/aqua-ipfs-integration/aqua/src/process.ts @@ -1,730 +1,622 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-235 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - export interface StringOpDef { - array: (s: string, callParams: CallParams<'s'>) => string[]; - } - - export function registerStringOp(service: StringOpDef): void; +export interface StringOpDef { + array: (s: string, callParams: CallParams<'s'>) => string[] | Promise; +} +export function registerStringOp(service: StringOpDef): void; export function registerStringOp(serviceId: string, service: StringOpDef): void; export function registerStringOp(peer: FluencePeer, service: StringOpDef): void; export function registerStringOp(peer: FluencePeer, serviceId: string, service: StringOpDef): void; - export function registerStringOp(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "op" +export function registerStringOp(...args: any) { + registerService( + args, + { + "defaultServiceId" : "op", + "functions" : [ + { + "functionName" : "array", + "argDefs" : [ + { + "name" : "s", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'array') { - - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.array(req.args[0], callParams) - - } - - - next(); - }); - } - // Functions + - export function add_blueprint(module_hash: string, config?: {ttl?: number}) : Promise; - export function add_blueprint(peer: FluencePeer, module_hash: string, config?: {ttl?: number}) : Promise; - export function add_blueprint(...args: any) { - let peer: FluencePeer; - let module_hash: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - module_hash = args[1]; -config = args[2]; - } else { - peer = Fluence.getPeer(); - module_hash = args[0]; -config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "module_hash") [] module_hash) - ) - (call %init_peer_id% ("op" "concat_strings") ["hash:" module_hash] prefixed_hash) - ) - (call %init_peer_id% ("op" "array") [prefixed_hash] dependencies) - ) - (call %init_peer_id% ("dist" "make_blueprint") ["process_files" dependencies] blueprint) - ) - (call %init_peer_id% ("dist" "add_blueprint") [blueprint] blueprint_id) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [blueprint_id]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) -) +export function add_blueprint(module_hash: string, config?: {ttl?: number}): Promise; +export function add_blueprint(peer: FluencePeer, module_hash: string, config?: {ttl?: number}): Promise; +export function add_blueprint(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'module_hash', () => {return module_hash;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for add_blueprint'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "module_hash") [] module_hash) + ) + (call %init_peer_id% ("op" "concat_strings") ["hash:" module_hash] prefixed_hash) + ) + (call %init_peer_id% ("op" "array") [prefixed_hash] dependencies) + ) + (call %init_peer_id% ("dist" "make_blueprint") ["process_files" dependencies] blueprint) + ) + (call %init_peer_id% ("dist" "add_blueprint") [blueprint] blueprint_id) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [blueprint_id]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ` + return callFunction( + args, + { + "functionName" : "add_blueprint", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "module_hash", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + - export function put_file_size(relay: string, cid: string, ipfs: string, service_id: string, logSize: (arg0: number, callParams: CallParams<'arg0'>) => void, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise<{error:string;hash:string;success:boolean} | null>; - export function put_file_size(peer: FluencePeer, relay: string, cid: string, ipfs: string, service_id: string, logSize: (arg0: number, callParams: CallParams<'arg0'>) => void, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise<{error:string;hash:string;success:boolean} | null>; - export function put_file_size(...args: any) { - let peer: FluencePeer; - let relay: any; -let cid: any; -let ipfs: any; -let service_id: any; -let logSize: any; -let error: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - relay = args[1]; -cid = args[2]; -ipfs = args[3]; -service_id = args[4]; -logSize = args[5]; -error = args[6]; -config = args[7]; - } else { - peer = Fluence.getPeer(); - relay = args[0]; -cid = args[1]; -ipfs = args[2]; -service_id = args[3]; -logSize = args[4]; -error = args[5]; -config = args[6]; - } - - let request: RequestFlow; - const promise = new Promise<{error:string;hash:string;success:boolean} | null>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "relay") [] relay) - ) - (call %init_peer_id% ("getDataSrv" "cid") [] cid) - ) - (call %init_peer_id% ("getDataSrv" "ipfs") [] ipfs) - ) - (call %init_peer_id% ("getDataSrv" "service_id") [] service_id) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (seq - (call relay ("aqua-ipfs" "get_from") [cid ipfs] get) - (xor - (match get.$.success! true - (xor - (seq - (call relay (service_id "file_size") [get.$.path!] size) - (xor - (match size.$.success! true - (xor - (seq - (seq - (par - (seq - (call -relay- ("op" "noop") []) - (xor - (call %init_peer_id% ("callbackSrv" "logSize") [size.$.size!]) - (seq - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - (call -relay- ("op" "noop") []) - ) - ) - ) - (null) - ) - (call relay (service_id "write_file_size") [size.$.size!] write) - ) - (xor - (match write.$.success! true - (xor - (call relay ("aqua-ipfs" "put") [write.$.path!] $result) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - ) - (par - (seq - (call -relay- ("op" "noop") []) - (xor - (call %init_peer_id% ("callbackSrv" "error") ["ProcessFiles.write_file_size failed" write.$.error!]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) - ) - ) - (null) - ) - ) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) - ) - ) - ) - (par - (seq - (call -relay- ("op" "noop") []) - (xor - (call %init_peer_id% ("callbackSrv" "error") ["ProcessFiles.file_size failed" size.$.error!]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) - ) - ) - (null) - ) - ) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 6]) - ) - ) - ) - (par - (seq - (call -relay- ("op" "noop") []) - (xor - (call %init_peer_id% ("callbackSrv" "error") ["Ipfs.get_from failed" get.$.error!]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 7]) - ) - ) - (null) - ) - ) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 8]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [$result]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 9]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 10]) -) +export function put_file_size(relay: string, cid: string, ipfs: string, service_id: string, logSize: (arg0: number, callParams: CallParams<'arg0'>) => void | Promise, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise, config?: {ttl?: number}): Promise<{ error: string; hash: string; success: boolean; } | null>; +export function put_file_size(peer: FluencePeer, relay: string, cid: string, ipfs: string, service_id: string, logSize: (arg0: number, callParams: CallParams<'arg0'>) => void | Promise, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise, config?: {ttl?: number}): Promise<{ error: string; hash: string; success: boolean; } | null>; +export function put_file_size(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'relay', () => {return relay;}); -h.on('getDataSrv', 'cid', () => {return cid;}); -h.on('getDataSrv', 'ipfs', () => {return ipfs;}); -h.on('getDataSrv', 'service_id', () => {return service_id;}); - - h.use((req, resp, next) => { - if(req.serviceId === 'callbackSrv' && req.fnName === 'logSize') { - - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - logSize(req.args[0], callParams); resp.result = {} - - } - next(); - }); - - - h.use((req, resp, next) => { - if(req.serviceId === 'callbackSrv' && req.fnName === 'error') { - - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0],arg1: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - error(req.args[0], req.args[1], callParams); resp.result = {} - - } - next(); - }); - - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { resolve(null); } - opt = opt[0]; - } - return resolve(opt); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for put_file_size'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "relay") [] relay) + ) + (call %init_peer_id% ("getDataSrv" "cid") [] cid) + ) + (call %init_peer_id% ("getDataSrv" "ipfs") [] ipfs) + ) + (call %init_peer_id% ("getDataSrv" "service_id") [] service_id) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (seq + (call relay ("aqua-ipfs" "get_from") [cid ipfs] get) + (xor + (match get.$.success! true + (xor + (seq + (call relay (service_id "file_size") [get.$.path!] size) + (xor + (match size.$.success! true + (xor + (seq + (seq + (par + (seq + (call -relay- ("op" "noop") []) + (xor + (call %init_peer_id% ("callbackSrv" "logSize") [size.$.size!]) + (seq + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + (call -relay- ("op" "noop") []) + ) + ) + ) + (null) + ) + (call relay (service_id "write_file_size") [size.$.size!] write) + ) + (xor + (match write.$.success! true + (xor + (call relay ("aqua-ipfs" "put") [write.$.path!] $result) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + ) + (par + (seq + (call -relay- ("op" "noop") []) + (xor + (call %init_peer_id% ("callbackSrv" "error") ["ProcessFiles.write_file_size failed" write.$.error!]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ) + (null) + ) + ) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) + ) + ) + ) + (par + (seq + (call -relay- ("op" "noop") []) + (xor + (call %init_peer_id% ("callbackSrv" "error") ["ProcessFiles.file_size failed" size.$.error!]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) + ) + ) + (null) + ) + ) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 6]) + ) + ) + ) + (par + (seq + (call -relay- ("op" "noop") []) + (xor + (call %init_peer_id% ("callbackSrv" "error") ["Ipfs.get_from failed" get.$.error!]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 7]) + ) + ) + (null) + ) + ) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 8]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$result]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 9]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 10]) + ) + ` + return callFunction( + args, + { + "functionName" : "put_file_size", + "returnType" : { + "tag" : "optional" + }, + "argDefs" : [ + { + "name" : "relay", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "cid", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "ipfs", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "service_id", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "logSize", + "argType" : { + "tag" : "callback", + "callback" : { + "argDefs" : [ + { + "name" : "arg0", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + } + } + }, + { + "name" : "error", + "argType" : { + "tag" : "callback", + "callback" : { + "argDefs" : [ + { + "name" : "arg0", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "arg1", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + } + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + - export function remove_service(relay: string, service_id: string, config?: {ttl?: number}) : Promise; - export function remove_service(peer: FluencePeer, relay: string, service_id: string, config?: {ttl?: number}) : Promise; - export function remove_service(...args: any) { - let peer: FluencePeer; - let relay: any; -let service_id: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - relay = args[1]; -service_id = args[2]; -config = args[3]; - } else { - peer = Fluence.getPeer(); - relay = args[0]; -service_id = args[1]; -config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "relay") [] relay) - ) - (call %init_peer_id% ("getDataSrv" "service_id") [] service_id) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call relay ("srv" "remove") [service_id]) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [true]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) +export function remove_service(relay: string, service_id: string, config?: {ttl?: number}): Promise; +export function remove_service(peer: FluencePeer, relay: string, service_id: string, config?: {ttl?: number}): Promise; +export function remove_service(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'relay', () => {return relay;}); -h.on('getDataSrv', 'service_id', () => {return service_id;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for remove_service'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "relay") [] relay) + ) + (call %init_peer_id% ("getDataSrv" "service_id") [] service_id) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call relay ("srv" "remove") [service_id]) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [true]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "remove_service", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "relay", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "service_id", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; -} - - - - export function add_module(name: string, path: string, config?: {ttl?: number}) : Promise; - export function add_module(peer: FluencePeer, name: string, path: string, config?: {ttl?: number}) : Promise; - export function add_module(...args: any) { - let peer: FluencePeer; - let name: any; -let path: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - name = args[1]; -path = args[2]; -config = args[3]; - } else { - peer = Fluence.getPeer(); - name = args[0]; -path = args[1]; -config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "name") [] name) - ) - (call %init_peer_id% ("getDataSrv" "path") [] path) + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script ) - (call %init_peer_id% ("dist" "default_module_config") [name] config) - ) - (call %init_peer_id% ("dist" "add_module_from_vault") [path config] module_hash) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [module_hash]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) -) +} - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'name', () => {return name;}); -h.on('getDataSrv', 'path', () => {return path;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); + - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for add_module'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) +export function add_module(name: string, path: string, config?: {ttl?: number}): Promise; +export function add_module(peer: FluencePeer, name: string, path: string, config?: {ttl?: number}): Promise; +export function add_module(...args: any) { + + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "name") [] name) + ) + (call %init_peer_id% ("getDataSrv" "path") [] path) + ) + (call %init_peer_id% ("dist" "default_module_config") [name] config) + ) + (call %init_peer_id% ("dist" "add_module_from_vault") [path config] module_hash) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [module_hash]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ` + return callFunction( + args, + { + "functionName" : "add_module", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "name", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "path", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + - export function deploy_service(relay: string, cid: string, ipfs: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; - export function deploy_service(peer: FluencePeer, relay: string, cid: string, ipfs: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; - export function deploy_service(...args: any) { - let peer: FluencePeer; - let relay: any; -let cid: any; -let ipfs: any; -let error: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - relay = args[1]; -cid = args[2]; -ipfs = args[3]; -error = args[4]; -config = args[5]; - } else { - peer = Fluence.getPeer(); - relay = args[0]; -cid = args[1]; -ipfs = args[2]; -error = args[3]; -config = args[4]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "relay") [] relay) - ) - (call %init_peer_id% ("getDataSrv" "cid") [] cid) - ) - (call %init_peer_id% ("getDataSrv" "ipfs") [] ipfs) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (seq - (call relay ("aqua-ipfs" "get_from") [cid ipfs] get_result) - (xor - (match get_result.$.success! true - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (call relay ("dist" "default_module_config") ["process_files"] config) - (call relay ("dist" "add_module_from_vault") [get_result.$.path! config] module_hash) - ) - (call relay ("op" "concat_strings") ["hash:" module_hash] prefixed_hash) - ) - (call relay ("op" "array") [prefixed_hash] dependencies) - ) - (call relay ("dist" "make_blueprint") ["process_files" dependencies] blueprint) - ) - (call relay ("dist" "add_blueprint") [blueprint] blueprint_id) - ) - (call relay ("srv" "create") [blueprint_id] $service_id) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (par - (seq - (call -relay- ("op" "noop") []) - (xor - (call %init_peer_id% ("callbackSrv" "error") ["Ipfs.get_from failed" get_result.$.error!]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (null) - ) - ) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [$service_id]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) -) +export function deploy_service(relay: string, cid: string, ipfs: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise, config?: {ttl?: number}): Promise; +export function deploy_service(peer: FluencePeer, relay: string, cid: string, ipfs: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise, config?: {ttl?: number}): Promise; +export function deploy_service(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'relay', () => {return relay;}); -h.on('getDataSrv', 'cid', () => {return cid;}); -h.on('getDataSrv', 'ipfs', () => {return ipfs;}); - - h.use((req, resp, next) => { - if(req.serviceId === 'callbackSrv' && req.fnName === 'error') { - - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0],arg1: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - error(req.args[0], req.args[1], callParams); resp.result = {} - - } - next(); - }); - - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { resolve(null); } - opt = opt[0]; - } - return resolve(opt); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for deploy_service'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "relay") [] relay) + ) + (call %init_peer_id% ("getDataSrv" "cid") [] cid) + ) + (call %init_peer_id% ("getDataSrv" "ipfs") [] ipfs) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (seq + (call relay ("aqua-ipfs" "get_from") [cid ipfs] get_result) + (xor + (match get_result.$.success! true + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (call relay ("dist" "default_module_config") ["process_files"] config) + (call relay ("dist" "add_module_from_vault") [get_result.$.path! config] module_hash) + ) + (call relay ("op" "concat_strings") ["hash:" module_hash] prefixed_hash) + ) + (call relay ("op" "array") [prefixed_hash] dependencies) + ) + (call relay ("dist" "make_blueprint") ["process_files" dependencies] blueprint) + ) + (call relay ("dist" "add_blueprint") [blueprint] blueprint_id) + ) + (call relay ("srv" "create") [blueprint_id] $service_id) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (par + (seq + (call -relay- ("op" "noop") []) + (xor + (call %init_peer_id% ("callbackSrv" "error") ["Ipfs.get_from failed" get_result.$.error!]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (null) + ) + ) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$service_id]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) + ) + ` + return callFunction( + args, + { + "functionName" : "deploy_service", + "returnType" : { + "tag" : "optional" + }, + "argDefs" : [ + { + "name" : "relay", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "cid", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "ipfs", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "error", + "argType" : { + "tag" : "callback", + "callback" : { + "argDefs" : [ + { + "name" : "arg0", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "arg1", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + } + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - diff --git a/aqua-examples/aqua-ipfs-integration/nodejs/package.json b/aqua-examples/aqua-ipfs-integration/nodejs/package.json index 564d7c5..1b8c3b5 100644 --- a/aqua-examples/aqua-ipfs-integration/nodejs/package.json +++ b/aqua-examples/aqua-ipfs-integration/nodejs/package.json @@ -25,7 +25,7 @@ "dependencies": { "@fluencelabs/ipfs-execution-aqua": "file:../aqua", "@fluencelabs/aqua": "0.3.0-225", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@fluencelabs/aqua-lib": "0.1.14", "@fluencelabs/aqua-ipfs": "0.4.2", @@ -35,6 +35,6 @@ "multiaddr": "^10.0.0" }, "devDependencies": { - "typescript": "^3.9.5" + "typescript": "^4.0.0" } } diff --git a/aqua-examples/aqua-ipfs-integration/package-lock.json b/aqua-examples/aqua-ipfs-integration/package-lock.json index bac4cda..cb74d3d 100644 --- a/aqua-examples/aqua-ipfs-integration/package-lock.json +++ b/aqua-examples/aqua-ipfs-integration/package-lock.json @@ -9,7 +9,11 @@ "aqua", "nodejs", "web" - ] + ], + "dependencies": { + "@fluencelabs/fluence": "^0.14.2", + "typescript": "^4.4.4" + } }, "aqua": { "name": "@fluencelabs/ipfs-execution-aqua", @@ -19,7 +23,7 @@ "dependencies": { "@fluencelabs/aqua-ipfs": "0.4.2", "@fluencelabs/aqua-lib": "0.1.14", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "ipfs-http-client": "^50.1.2", "it-all": "^1.0.5", @@ -27,8 +31,8 @@ "uint8arrays": "^2.1.5" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", - "typescript": "^3.9.5" + "@fluencelabs/aqua": "^0.4.0-235", + "typescript": "^4.0.0" } }, "node_modules/@babel/code-frame": { @@ -1964,14 +1968,16 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, + "dependencies": { + "@fluencelabs/fluence": "0.12.1" + }, "bin": { "aqua": "index.js", - "aqua-cli": "error.js", - "aqua-j": "index-java.js" + "aqua-cli": "error.js" } }, "node_modules/@fluencelabs/aqua-ipfs": { @@ -1987,18 +1993,11 @@ "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.1.14.tgz", "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" }, - "node_modules/@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", - "dependencies": { - "base64-js": "1.5.1" - } - }, - "node_modules/@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.14.4", @@ -2014,16 +2013,76 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", "uuid": "8.3.0" } }, + "node_modules/@fluencelabs/aqua/node_modules/multiaddr": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-10.0.0.tgz", + "integrity": "sha512-yP3LzFkM0GORZHNenS8Ok2spsaICRBhxLEohAfKKwwrgHIEWrDUhMRIkh/MONDBThNqaiGl7Ch1H7qblRDNHyg==", + "dev": true, + "dependencies": { + "dns-over-http-resolver": "^1.0.0", + "err-code": "^3.0.1", + "is-ip": "^3.1.0", + "multiformats": "^9.0.2", + "uint8arrays": "^2.1.3", + "varint": "^6.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/varint": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==", + "dev": true + }, + "node_modules/@fluencelabs/avm": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dependencies": { + "base64-js": "1.5.1" + } + }, + "node_modules/@fluencelabs/fluence": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", + "dependencies": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.15.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, "node_modules/@fluencelabs/fluence-network-environment": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", "integrity": "sha512-aaWZDDFIIasSTgdFdw1KEz+boZMSn7pXffUENZNLX4DrP11rC3AEX4c8GnIJQbWqGsouOFZOPna2DSG6o2rLNQ==" }, + "node_modules/@fluencelabs/fluence/node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, "node_modules/@fluencelabs/fluence/node_modules/multiaddr": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-10.0.0.tgz", @@ -16080,11 +16139,6 @@ "tslib": "^2.0.3" } }, - "node_modules/noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node_modules/node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -20308,6 +20362,19 @@ "aproba": "^1.1.1" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, + "node_modules/rxjs/node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -22899,6 +22966,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "node_modules/ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", @@ -23049,9 +23121,9 @@ } }, "node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -25510,7 +25582,7 @@ "@fluencelabs/aqua": "0.3.0-225", "@fluencelabs/aqua-ipfs": "0.4.2", "@fluencelabs/aqua-lib": "0.1.14", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@fluencelabs/ipfs-execution-aqua": "file:../aqua", "ipfs-http-client": "^50.1.2", @@ -25519,7 +25591,7 @@ "uint8arrays": "^2.1.5" }, "devDependencies": { - "typescript": "^3.9.5" + "typescript": "^4.0.0" } }, "nodejs/node_modules/@fluencelabs/aqua": { @@ -25537,7 +25609,7 @@ "version": "0.1.0", "dependencies": { "@fluencelabs/aqua-lib": "0.1.14", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@fluencelabs/ipfs-execution-aqua": "file:../aqua", "@testing-library/jest-dom": "^5.14.1", @@ -25559,18 +25631,6 @@ "devDependencies": { "node-sass": "^6.0.1" } - }, - "web/node_modules/typescript": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", - "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } } }, "dependencies": { @@ -26898,10 +26958,59 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", - "dev": true + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", + "dev": true, + "requires": { + "@fluencelabs/fluence": "0.12.1" + }, + "dependencies": { + "@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.14.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "uuid": "8.3.0" + } + }, + "multiaddr": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-10.0.0.tgz", + "integrity": "sha512-yP3LzFkM0GORZHNenS8Ok2spsaICRBhxLEohAfKKwwrgHIEWrDUhMRIkh/MONDBThNqaiGl7Ch1H7qblRDNHyg==", + "dev": true, + "requires": { + "dns-over-http-resolver": "^1.0.0", + "err-code": "^3.0.1", + "is-ip": "^3.1.0", + "multiformats": "^9.0.2", + "uint8arrays": "^2.1.3", + "varint": "^6.0.0" + } + }, + "varint": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==", + "dev": true + } + } }, "@fluencelabs/aqua-ipfs": { "version": "0.4.2", @@ -26925,12 +27034,12 @@ } }, "@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -26943,11 +27052,20 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" }, "dependencies": { + "@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "requires": { + "base64-js": "1.5.1" + } + }, "multiaddr": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-10.0.0.tgz", @@ -26979,13 +27097,13 @@ "@fluencelabs/aqua": "0.3.0-225", "@fluencelabs/aqua-ipfs": "0.4.2", "@fluencelabs/aqua-lib": "0.1.14", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@fluencelabs/ipfs-execution-aqua": "file:../aqua", "ipfs-http-client": "^50.1.2", "it-all": "^1.0.5", "multiaddr": "^10.0.0", - "typescript": "^3.9.5", + "typescript": "^4.0.0", "uint8arrays": "^2.1.5" }, "dependencies": { @@ -26999,15 +27117,15 @@ "@fluencelabs/ipfs-execution-aqua": { "version": "file:aqua", "requires": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-235", "@fluencelabs/aqua-ipfs": "0.4.2", "@fluencelabs/aqua-lib": "0.1.14", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "ipfs-http-client": "^50.1.2", "it-all": "^1.0.5", "multiaddr": "^10.0.0", - "typescript": "^3.9.5", + "typescript": "^4.0.0", "uint8arrays": "^2.1.5" } }, @@ -34416,7 +34534,7 @@ "version": "file:web", "requires": { "@fluencelabs/aqua-lib": "0.1.14", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@fluencelabs/ipfs-execution-aqua": "file:../aqua", "@testing-library/jest-dom": "^5.14.1", @@ -34435,13 +34553,6 @@ "recoil": "^0.3.1", "typescript": "^4.3.5", "web-vitals": "^1.1.2" - }, - "dependencies": { - "typescript": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", - "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==" - } } }, "ipfs-core-types": { @@ -38375,11 +38486,6 @@ "tslib": "^2.0.3" } }, - "noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -41683,6 +41789,21 @@ "aproba": "^1.1.1" } }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + } + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -43798,6 +43919,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", @@ -43914,9 +44040,9 @@ } }, "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==" + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==" }, "uint8arrays": { "version": "2.1.10", diff --git a/aqua-examples/aqua-ipfs-integration/package.json b/aqua-examples/aqua-ipfs-integration/package.json index 708c77c..8d972ee 100644 --- a/aqua-examples/aqua-ipfs-integration/package.json +++ b/aqua-examples/aqua-ipfs-integration/package.json @@ -7,5 +7,9 @@ ], "scripts": { "build": "npm run build -w aqua -w nodejs -w web" + }, + "dependencies": { + "@fluencelabs/fluence": "^0.14.2", + "typescript": "^4.4.4" } } diff --git a/aqua-examples/aqua-ipfs-integration/web/package.json b/aqua-examples/aqua-ipfs-integration/web/package.json index cd426c0..efa6d41 100644 --- a/aqua-examples/aqua-ipfs-integration/web/package.json +++ b/aqua-examples/aqua-ipfs-integration/web/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@fluencelabs/ipfs-execution-aqua": "file:../aqua", - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@fluencelabs/aqua-lib": "0.1.14", "@testing-library/jest-dom": "^5.14.1", diff --git a/aqua-examples/echo-greeter/client-peer/package-lock.json b/aqua-examples/echo-greeter/client-peer/package-lock.json index b921d4c..ecd6be7 100644 --- a/aqua-examples/echo-greeter/client-peer/package-lock.json +++ b/aqua-examples/echo-greeter/client-peer/package-lock.json @@ -10,13 +10,13 @@ "license": "MIT", "dependencies": { "@fluencelabs/aqua-lib": "^0.1.14", - "@fluencelabs/fluence": "^0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "^1.0.10", "it-all": "^1.0.5" }, "devDependencies": { - "@fluencelabs/aqua": "0.3.2-233", - "typescript": "^3.9.5" + "@fluencelabs/aqua": "^0.4.0-235", + "typescript": "^4.0.0" } }, "node_modules/@chainsafe/libp2p-noise": { @@ -51,9 +51,9 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.2-233", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz", - "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, "dependencies": { "@fluencelabs/fluence": "0.12.1" @@ -68,18 +68,20 @@ "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.1.14.tgz", "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" }, - "node_modules/@fluencelabs/avm": { + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm": { "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "dependencies": { "base64-js": "1.5.1" } }, - "node_modules/@fluencelabs/fluence": { + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.14.4", @@ -99,6 +101,39 @@ "uuid": "8.3.0" } }, + "node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, + "node_modules/@fluencelabs/fluence": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", + "dependencies": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.15.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, "node_modules/@fluencelabs/fluence-network-environment": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", @@ -2253,6 +2288,14 @@ "node": ">= 4" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2428,6 +2471,16 @@ "utf8-byte-length": "^1.0.1" } }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -2445,9 +2498,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -2630,12 +2683,47 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.2-233", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz", - "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, "requires": { "@fluencelabs/fluence": "0.12.1" + }, + "dependencies": { + "@fluencelabs/avm": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, + "requires": { + "base64-js": "1.5.1" + } + }, + "@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.14.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "uuid": "8.3.0" + } + } } }, "@fluencelabs/aqua-lib": { @@ -2644,20 +2732,20 @@ "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" }, "@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", "requires": { "base64-js": "1.5.1" } }, "@fluencelabs/fluence": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", - "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -2671,6 +2759,8 @@ "loglevel": "1.7.0", "multiaddr": "10.0.0", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" } }, @@ -4446,6 +4536,14 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==" }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4582,6 +4680,16 @@ "utf8-byte-length": "^1.0.1" } }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -4596,9 +4704,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "dev": true }, "uint8arrays": { diff --git a/aqua-examples/echo-greeter/client-peer/package.json b/aqua-examples/echo-greeter/client-peer/package.json index 07bd1bf..d8e32e3 100644 --- a/aqua-examples/echo-greeter/client-peer/package.json +++ b/aqua-examples/echo-greeter/client-peer/package.json @@ -14,7 +14,7 @@ ], "dependencies": { "@fluencelabs/aqua-lib": "^0.1.14", - "@fluencelabs/fluence": "^0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "^1.0.10", "it-all": "^1.0.5" }, @@ -43,7 +43,7 @@ }, "homepage": "git+https://github.com/fluencelabs/examples/aqua-examples/echo-greeter#readme", "devDependencies": { - "@fluencelabs/aqua": "0.3.2-233", - "typescript": "^3.9.5" + "@fluencelabs/aqua": "^0.4.0-235", + "typescript": "^4.0.0" } } diff --git a/aqua-examples/price-oracle/client-peer/package-lock.json b/aqua-examples/price-oracle/client-peer/package-lock.json index 38bfbd3..1057a19 100644 --- a/aqua-examples/price-oracle/client-peer/package-lock.json +++ b/aqua-examples/price-oracle/client-peer/package-lock.json @@ -9,14 +9,14 @@ "version": "0.1.0", "license": "MIT", "dependencies": { - "@fluencelabs/aqua-lib": "^0.1.9", - "@fluencelabs/fluence": "^0.13.0", - "@fluencelabs/fluence-network-environment": "^1.0.10", + "@fluencelabs/aqua-lib": "0.1.14", + "@fluencelabs/fluence": "^0.14.2", + "@fluencelabs/fluence-network-environment": "1.0.10", "it-all": "^1.0.5" }, "devDependencies": { - "@fluencelabs/aqua": "0.3.2-233", - "typescript": "^3.9.5" + "@fluencelabs/aqua": "^0.4.0-235", + "typescript": "^4.0.0" } }, "node_modules/@chainsafe/libp2p-noise": { @@ -51,9 +51,9 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.2-233", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz", - "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, "dependencies": { "@fluencelabs/fluence": "0.12.1" @@ -96,17 +96,18 @@ "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "dependencies": { "base64-js": "1.5.1" } }, "node_modules/@fluencelabs/fluence": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.13.0.tgz", - "integrity": "sha512-Dqhr7CAYeAO8Z5jR+mbGu0cVZjkE06cM2L8n9bQWe4T4y2B83ZxUmrs/OTWlYnsLd1Sr2YdDlnyZeUvWLEEmrQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -120,6 +121,8 @@ "loglevel": "1.7.0", "multiaddr": "10.0.0", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" } }, @@ -128,6 +131,14 @@ "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", "integrity": "sha512-aaWZDDFIIasSTgdFdw1KEz+boZMSn7pXffUENZNLX4DrP11rC3AEX4c8GnIJQbWqGsouOFZOPna2DSG6o2rLNQ==" }, + "node_modules/@fluencelabs/fluence/node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, "node_modules/@motrix/nat-api": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@motrix/nat-api/-/nat-api-0.3.2.tgz", @@ -2277,6 +2288,14 @@ "node": ">= 4" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2452,6 +2471,16 @@ "utf8-byte-length": "^1.0.1" } }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -2469,9 +2498,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -2654,9 +2683,9 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.2-233", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz", - "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, "requires": { "@fluencelabs/fluence": "0.12.1" @@ -2697,17 +2726,18 @@ "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "requires": { "base64-js": "1.5.1" } }, "@fluencelabs/fluence": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.13.0.tgz", - "integrity": "sha512-Dqhr7CAYeAO8Z5jR+mbGu0cVZjkE06cM2L8n9bQWe4T4y2B83ZxUmrs/OTWlYnsLd1Sr2YdDlnyZeUvWLEEmrQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -2721,7 +2751,19 @@ "loglevel": "1.7.0", "multiaddr": "10.0.0", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" + }, + "dependencies": { + "@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "requires": { + "base64-js": "1.5.1" + } + } } }, "@fluencelabs/fluence-network-environment": { @@ -4496,6 +4538,14 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==" }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4632,6 +4682,16 @@ "utf8-byte-length": "^1.0.1" } }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -4646,9 +4706,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "dev": true }, "uint8arrays": { diff --git a/aqua-examples/price-oracle/client-peer/package.json b/aqua-examples/price-oracle/client-peer/package.json index 18789da..ae63726 100644 --- a/aqua-examples/price-oracle/client-peer/package.json +++ b/aqua-examples/price-oracle/client-peer/package.json @@ -14,7 +14,7 @@ ], "dependencies": { "@fluencelabs/aqua-lib": "0.1.14", - "@fluencelabs/fluence": "0.13.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "it-all": "^1.0.5" }, @@ -43,7 +43,7 @@ }, "homepage": "git+https://github.com/fluencelabs/examples/aqua-examples/price-oracle#readme", "devDependencies": { - "@fluencelabs/aqua": "0.3.2-233", - "typescript": "^3.9.5" + "@fluencelabs/aqua": "^0.4.0-235", + "typescript": "^4.0.0" } } diff --git a/aqua-examples/price-oracle/web/package-lock.json b/aqua-examples/price-oracle/web/package-lock.json index 8f8f524..6e1fef3 100644 --- a/aqua-examples/price-oracle/web/package-lock.json +++ b/aqua-examples/price-oracle/web/package-lock.json @@ -8,7 +8,7 @@ "name": "price-oracle", "version": "0.1.0", "dependencies": { - "@fluencelabs/fluence": "^0.13.0", + "@fluencelabs/fluence": "^0.14.2", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", "@testing-library/user-event": "^12.8.3", @@ -23,7 +23,7 @@ "web-vitals": "^1.1.2" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.2-233", + "@fluencelabs/aqua": "^0.4.0-235", "@fluencelabs/fluence-network-environment": "1.0.10", "chokidar-cli": "^2.1.0", "node-sass": "^6.0.1" @@ -1908,9 +1908,9 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.2-233", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz", - "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, "dependencies": { "@fluencelabs/fluence": "0.12.1" @@ -1976,17 +1976,18 @@ "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "dependencies": { "base64-js": "1.5.1" } }, "node_modules/@fluencelabs/fluence": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.13.0.tgz", - "integrity": "sha512-Dqhr7CAYeAO8Z5jR+mbGu0cVZjkE06cM2L8n9bQWe4T4y2B83ZxUmrs/OTWlYnsLd1Sr2YdDlnyZeUvWLEEmrQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -2000,6 +2001,8 @@ "loglevel": "1.7.0", "multiaddr": "10.0.0", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" } }, @@ -2009,6 +2012,14 @@ "integrity": "sha512-aaWZDDFIIasSTgdFdw1KEz+boZMSn7pXffUENZNLX4DrP11rC3AEX4c8GnIJQbWqGsouOFZOPna2DSG6o2rLNQ==", "dev": true }, + "node_modules/@fluencelabs/fluence/node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, "node_modules/@fluencelabs/fluence/node_modules/async": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", @@ -20288,6 +20299,19 @@ "aproba": "^1.1.1" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, + "node_modules/rxjs/node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -22374,6 +22398,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "node_modules/ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", @@ -26113,9 +26142,9 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.2-233", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz", - "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, "requires": { "@fluencelabs/fluence": "0.12.1" @@ -26169,17 +26198,18 @@ "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "requires": { "base64-js": "1.5.1" } }, "@fluencelabs/fluence": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.13.0.tgz", - "integrity": "sha512-Dqhr7CAYeAO8Z5jR+mbGu0cVZjkE06cM2L8n9bQWe4T4y2B83ZxUmrs/OTWlYnsLd1Sr2YdDlnyZeUvWLEEmrQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -26193,9 +26223,19 @@ "loglevel": "1.7.0", "multiaddr": "10.0.0", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" }, "dependencies": { + "@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "requires": { + "base64-js": "1.5.1" + } + }, "async": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", @@ -40356,6 +40396,21 @@ "aproba": "^1.1.1" } }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + } + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -42042,6 +42097,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", diff --git a/aqua-examples/price-oracle/web/package.json b/aqua-examples/price-oracle/web/package.json index 6a5bf6e..68908d7 100644 --- a/aqua-examples/price-oracle/web/package.json +++ b/aqua-examples/price-oracle/web/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@fluencelabs/fluence": "^0.13.0", + "@fluencelabs/fluence": "^0.14.2", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", "@testing-library/user-event": "^12.8.3", @@ -44,7 +44,7 @@ ] }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.2-233", + "@fluencelabs/aqua": "^0.4.0-235", "@fluencelabs/fluence-network-environment": "1.0.10", "chokidar-cli": "^2.1.0", "node-sass": "^6.0.1" diff --git a/fluence-js-examples/browser-example/package-lock.json b/fluence-js-examples/browser-example/package-lock.json index 8fa5d32..4bf3112 100644 --- a/fluence-js-examples/browser-example/package-lock.json +++ b/fluence-js-examples/browser-example/package-lock.json @@ -8,7 +8,7 @@ "name": "getting-started-browser", "version": "0.1.0", "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", @@ -24,7 +24,7 @@ "web-vitals": "^1.1.2" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-234", "@fluencelabs/aqua-lib": "0.1.9", "chokidar-cli": "^2.1.0", "node-sass": "^6.0.1" @@ -1904,14 +1904,16 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", + "version": "0.4.0-234", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-234.tgz", + "integrity": "sha512-7ysLPh3R4gAfXgO24OGT7rP5UGKUHs7ipfx4HTJsYZahZ0rMbWA98uC/aM3+q0WH1WEowyV16zvGACONFLZ5RA==", "dev": true, + "dependencies": { + "@fluencelabs/fluence": "0.12.1" + }, "bin": { "aqua": "index.js", - "aqua-cli": "error.js", - "aqua-j": "index-java.js" + "aqua-cli": "error.js" } }, "node_modules/@fluencelabs/aqua-lib": { @@ -1920,18 +1922,11 @@ "integrity": "sha512-WLvwrH98R4BT7NHrzYkJE8f0G61BZi3lVog/W3pmyzYjufxTtxoAS28Zqycbt0ZVpUTfIC016QKu58b4SbhZWw==", "dev": true }, - "node_modules/@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", - "dependencies": { - "base64-js": "1.5.1" - } - }, - "node_modules/@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.14.4", @@ -1947,16 +1942,85 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", "uuid": "8.3.0" } }, + "node_modules/@fluencelabs/aqua/node_modules/async": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==", + "dev": true + }, + "node_modules/@fluencelabs/aqua/node_modules/loglevel": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz", + "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + }, + "funding": { + "type": "tidelift", + "url": "https://tidelift.com/subscription/pkg/npm-loglevel?utm_medium=referral&utm_source=npm_fund" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/uuid": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", + "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==", + "dev": true, + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@fluencelabs/avm": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, + "dependencies": { + "base64-js": "1.5.1" + } + }, + "node_modules/@fluencelabs/fluence": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", + "dependencies": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.15.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, "node_modules/@fluencelabs/fluence-network-environment": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", "integrity": "sha512-aaWZDDFIIasSTgdFdw1KEz+boZMSn7pXffUENZNLX4DrP11rC3AEX4c8GnIJQbWqGsouOFZOPna2DSG6o2rLNQ==" }, + "node_modules/@fluencelabs/fluence/node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, "node_modules/@fluencelabs/fluence/node_modules/async": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", @@ -16089,11 +16153,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" }, - "node_modules/noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node_modules/node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -20185,6 +20244,19 @@ "aproba": "^1.1.1" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, + "node_modules/rxjs/node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -22270,6 +22342,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "node_modules/ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", @@ -26004,10 +26081,57 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", - "dev": true + "version": "0.4.0-234", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-234.tgz", + "integrity": "sha512-7ysLPh3R4gAfXgO24OGT7rP5UGKUHs7ipfx4HTJsYZahZ0rMbWA98uC/aM3+q0WH1WEowyV16zvGACONFLZ5RA==", + "dev": true, + "requires": { + "@fluencelabs/fluence": "0.12.1" + }, + "dependencies": { + "@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.14.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "uuid": "8.3.0" + } + }, + "async": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==", + "dev": true + }, + "loglevel": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz", + "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==", + "dev": true + }, + "uuid": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", + "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==", + "dev": true + } + } }, "@fluencelabs/aqua-lib": { "version": "0.1.9", @@ -26019,17 +26143,18 @@ "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "requires": { "base64-js": "1.5.1" } }, "@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -26042,11 +26167,20 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" }, "dependencies": { + "@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "requires": { + "base64-js": "1.5.1" + } + }, "async": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", @@ -36953,11 +37087,6 @@ } } }, - "noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -40165,6 +40294,21 @@ "aproba": "^1.1.1" } }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + } + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -41851,6 +41995,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", diff --git a/fluence-js-examples/browser-example/package.json b/fluence-js-examples/browser-example/package.json index 249d275..62eed86 100644 --- a/fluence-js-examples/browser-example/package.json +++ b/fluence-js-examples/browser-example/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", @@ -45,7 +45,7 @@ ] }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-234", "@fluencelabs/aqua-lib": "0.1.9", "chokidar-cli": "^2.1.0", "node-sass": "^6.0.1" diff --git a/fluence-js-examples/browser-example/src/_aqua/getting-started.ts b/fluence-js-examples/browser-example/src/_aqua/getting-started.ts index 748053b..699435e 100644 --- a/fluence-js-examples/browser-example/src/_aqua/getting-started.ts +++ b/fluence-js-examples/browser-example/src/_aqua/getting-started.ts @@ -1,103 +1,83 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-234 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - // Functions + - export function getRelayTime(relayPeerId: string, config?: {ttl?: number}) : Promise; - export function getRelayTime(peer: FluencePeer, relayPeerId: string, config?: {ttl?: number}) : Promise; - export function getRelayTime(...args: any) { - let peer: FluencePeer; - let relayPeerId: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - relayPeerId = args[1]; -config = args[2]; - } else { - peer = Fluence.getPeer(); - relayPeerId = args[0]; -config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "relayPeerId") [] relayPeerId) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call relayPeerId ("peer" "timestamp_ms") [] ts) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [ts]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) +export function getRelayTime(relayPeerId: string, config?: {ttl?: number}): Promise; +export function getRelayTime(peer: FluencePeer, relayPeerId: string, config?: {ttl?: number}): Promise; +export function getRelayTime(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'relayPeerId', () => {return relayPeerId;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for getRelayTime'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "relayPeerId") [] relayPeerId) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call relayPeerId ("peer" "timestamp_ms") [] ts) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [ts]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "getRelayTime", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "relayPeerId", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - diff --git a/fluence-js-examples/hello-world/aqua/hello-world.aqua b/fluence-js-examples/hello-world/aqua/hello-world.aqua index 7e5e5fe..9dec021 100644 --- a/fluence-js-examples/hello-world/aqua/hello-world.aqua +++ b/fluence-js-examples/hello-world/aqua/hello-world.aqua @@ -2,10 +2,15 @@ import Peer from "@fluencelabs/aqua-lib/builtin.aqua" service HelloWorld("hello-world"): hello(str: string) + getFortune() -> string func sayHello(): HelloWorld.hello("Hello, world!") +func tellFortune() -> string: + res <- HelloWorld.getFortune() + <- res + func getRelayTime() -> u64: on HOST_PEER_ID: ts <- Peer.timestamp_ms() diff --git a/fluence-js-examples/hello-world/package-lock.json b/fluence-js-examples/hello-world/package-lock.json index 6c2078c..eb7d3c9 100644 --- a/fluence-js-examples/hello-world/package-lock.json +++ b/fluence-js-examples/hello-world/package-lock.json @@ -9,11 +9,11 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "0.14.1", "@fluencelabs/fluence-network-environment": "1.0.10" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-234", "@fluencelabs/aqua-lib": "^0.1.14", "chokidar-cli": "^3.0.0", "ts-node": "^10.2.1", @@ -73,14 +73,16 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", + "version": "0.4.0-234", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-234.tgz", + "integrity": "sha512-7ysLPh3R4gAfXgO24OGT7rP5UGKUHs7ipfx4HTJsYZahZ0rMbWA98uC/aM3+q0WH1WEowyV16zvGACONFLZ5RA==", "dev": true, + "dependencies": { + "@fluencelabs/fluence": "0.12.1" + }, "bin": { "aqua": "index.js", - "aqua-cli": "error.js", - "aqua-j": "index-java.js" + "aqua-cli": "error.js" } }, "node_modules/@fluencelabs/aqua-lib": { @@ -89,18 +91,11 @@ "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==", "dev": true }, - "node_modules/@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", - "dependencies": { - "base64-js": "1.5.1" - } - }, - "node_modules/@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.14.4", @@ -116,16 +111,57 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", "uuid": "8.3.0" } }, + "node_modules/@fluencelabs/avm": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, + "dependencies": { + "base64-js": "1.5.1" + } + }, + "node_modules/@fluencelabs/fluence": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.1.tgz", + "integrity": "sha512-Yqg5Hw2XO/X28ZU2iOt9znx9MXUOfTIIlJO5JLaoQfRY6k/5deLkJILsxaDbaTWg2iFnURydyP3cUSqBkitFwg==", + "dependencies": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.15.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, "node_modules/@fluencelabs/fluence-network-environment": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", "integrity": "sha512-aaWZDDFIIasSTgdFdw1KEz+boZMSn7pXffUENZNLX4DrP11rC3AEX4c8GnIJQbWqGsouOFZOPna2DSG6o2rLNQ==" }, + "node_modules/@fluencelabs/fluence/node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, "node_modules/@motrix/nat-api": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@motrix/nat-api/-/nat-api-0.3.2.tgz", @@ -2253,11 +2289,6 @@ "node": ">= 0.4.0" } }, - "node_modules/noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node_modules/node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -2700,6 +2731,14 @@ "node": ">= 4" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2963,6 +3002,16 @@ } } }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -3243,10 +3292,39 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", - "dev": true + "version": "0.4.0-234", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-234.tgz", + "integrity": "sha512-7ysLPh3R4gAfXgO24OGT7rP5UGKUHs7ipfx4HTJsYZahZ0rMbWA98uC/aM3+q0WH1WEowyV16zvGACONFLZ5RA==", + "dev": true, + "requires": { + "@fluencelabs/fluence": "0.12.1" + }, + "dependencies": { + "@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.14.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "uuid": "8.3.0" + } + } + } }, "@fluencelabs/aqua-lib": { "version": "0.1.14", @@ -3258,17 +3336,18 @@ "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "requires": { "base64-js": "1.5.1" } }, "@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.1.tgz", + "integrity": "sha512-Yqg5Hw2XO/X28ZU2iOt9znx9MXUOfTIIlJO5JLaoQfRY6k/5deLkJILsxaDbaTWg2iFnURydyP3cUSqBkitFwg==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -3281,9 +3360,20 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" + }, + "dependencies": { + "@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "requires": { + "base64-js": "1.5.1" + } + } } }, "@fluencelabs/fluence-network-environment": { @@ -5055,11 +5145,6 @@ "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==" }, - "noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -5381,6 +5466,14 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==" }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -5572,6 +5665,16 @@ "yn": "3.1.1" } }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", diff --git a/fluence-js-examples/hello-world/package.json b/fluence-js-examples/hello-world/package.json index 4cdc32a..21a5314 100644 --- a/fluence-js-examples/hello-world/package.json +++ b/fluence-js-examples/hello-world/package.json @@ -11,14 +11,14 @@ "author": "", "license": "ISC", "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-234", "@fluencelabs/aqua-lib": "^0.1.14", "chokidar-cli": "^3.0.0", "ts-node": "^10.2.1", "typescript": "^4.4.2" }, "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "0.14.1", "@fluencelabs/fluence-network-environment": "1.0.10" } } diff --git a/fluence-js-examples/hello-world/src/_aqua/hello-world.ts b/fluence-js-examples/hello-world/src/_aqua/hello-world.ts index eedb85c..4297d74 100644 --- a/fluence-js-examples/hello-world/src/_aqua/hello-world.ts +++ b/fluence-js-examples/hello-world/src/_aqua/hello-world.ts @@ -1,213 +1,190 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-234 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - export interface HelloWorldDef { - hello: (str: string, callParams: CallParams<'str'>) => void; - } - - export function registerHelloWorld(service: HelloWorldDef): void; +export interface HelloWorldDef { + getFortune: (callParams: CallParams) => string | Promise; +hello: (str: string, callParams: CallParams<'str'>) => void | Promise; +} +export function registerHelloWorld(service: HelloWorldDef): void; export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void; export function registerHelloWorld(peer: FluencePeer, service: HelloWorldDef): void; export function registerHelloWorld(peer: FluencePeer, serviceId: string, service: HelloWorldDef): void; - export function registerHelloWorld(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "hello-world" +export function registerHelloWorld(...args: any) { + registerService( + args, + { + "defaultServiceId" : "hello-world", + "functions" : [ + { + "functionName" : "getFortune", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "hello", + "argDefs" : [ + { + "name" : "str", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'hello') { - - const callParams = { - ...req.particleContext, - tetraplets: { - str: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - service.hello(req.args[0], callParams); resp.result = {} - - } - - - next(); - }); - } - // Functions + - export function sayHello(config?: {ttl?: number}) : Promise; - export function sayHello(peer: FluencePeer, config?: {ttl?: number}) : Promise; - export function sayHello(...args: any) { - let peer: FluencePeer; - - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - config = args[1]; - } else { - peer = Fluence.getPeer(); - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("hello-world" "hello") ["Hello, world!"]) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) -) +export function sayHello(config?: {ttl?: number}): Promise; +export function sayHello(peer: FluencePeer, config?: {ttl?: number}): Promise; +export function sayHello(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - - h.onEvent('callbackSrv', 'response', (args) => { - -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for sayHello'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) - } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return Promise.race([promise, Promise.resolve()]); + let script = ` + (xor + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("hello-world" "hello") ["Hello, world!"]) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ` + return callFunction( + args, + { + "functionName" : "sayHello", + "returnType" : { + "tag" : "void" + }, + "argDefs" : [ + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + - export function getRelayTime(config?: {ttl?: number}) : Promise; - export function getRelayTime(peer: FluencePeer, config?: {ttl?: number}) : Promise; - export function getRelayTime(...args: any) { - let peer: FluencePeer; - - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - config = args[1]; - } else { - peer = Fluence.getPeer(); - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (xor - (call -relay- ("peer" "timestamp_ms") [] ts) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [ts]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) +export function tellFortune(config?: {ttl?: number}): Promise; +export function tellFortune(peer: FluencePeer, config?: {ttl?: number}): Promise; +export function tellFortune(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for getRelayTime'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) - } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + let script = ` + (xor + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("hello-world" "getFortune") [] res) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [res]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ` + return callFunction( + args, + { + "functionName" : "tellFortune", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) +} + + + +export function getRelayTime(config?: {ttl?: number}): Promise; +export function getRelayTime(peer: FluencePeer, config?: {ttl?: number}): Promise; +export function getRelayTime(...args: any) { + + let script = ` + (xor + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (xor + (call -relay- ("peer" "timestamp_ms") [] ts) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [ts]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "getRelayTime", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - diff --git a/fluence-js-examples/hello-world/src/index.ts b/fluence-js-examples/hello-world/src/index.ts index db21cce..9874a91 100644 --- a/fluence-js-examples/hello-world/src/index.ts +++ b/fluence-js-examples/hello-world/src/index.ts @@ -4,19 +4,28 @@ import { registerHelloWorld, sayHello, getRelayTime, + tellFortune, } from "./_aqua/hello-world"; async function main() { await Fluence.start({ connectTo: krasnodar[0] }); registerHelloWorld({ - hello: async (str) => { + hello: (str) => { console.log(str); }, + getFortune: async () => { + await new Promise((resolve) => { + setTimeout(resolve, 1000); + }); + return "Wealth awaits you very soon."; + }, }); await sayHello(); + console.log(await tellFortune()); + const relayTime = await getRelayTime(); console.log("The relay time is: ", new Date(relayTime).toLocaleString()); diff --git a/fluence-js-examples/node-example/package-lock.json b/fluence-js-examples/node-example/package-lock.json index 8c5ea4a..cbaba95 100644 --- a/fluence-js-examples/node-example/package-lock.json +++ b/fluence-js-examples/node-example/package-lock.json @@ -9,11 +9,11 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-234", "chokidar-cli": "^3.0.0", "ts-node": "^10.2.1", "typescript": "^4.4.2" @@ -72,28 +72,32 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", + "version": "0.4.0-234", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-234.tgz", + "integrity": "sha512-7ysLPh3R4gAfXgO24OGT7rP5UGKUHs7ipfx4HTJsYZahZ0rMbWA98uC/aM3+q0WH1WEowyV16zvGACONFLZ5RA==", "dev": true, + "dependencies": { + "@fluencelabs/fluence": "0.12.1" + }, "bin": { "aqua": "index.js", - "aqua-cli": "error.js", - "aqua-j": "index-java.js" + "aqua-cli": "error.js" } }, - "node_modules/@fluencelabs/avm": { + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm": { "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "dependencies": { "base64-js": "1.5.1" } }, - "node_modules/@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.14.4", @@ -109,11 +113,43 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", "uuid": "8.3.0" } }, + "node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, + "node_modules/@fluencelabs/fluence": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", + "dependencies": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.15.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, "node_modules/@fluencelabs/fluence-network-environment": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", @@ -2246,11 +2282,6 @@ "node": ">= 0.4.0" } }, - "node_modules/noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node_modules/node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -2693,6 +2724,14 @@ "node": ">= 4" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2956,6 +2995,16 @@ } } }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -3236,26 +3285,64 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", - "dev": true + "version": "0.4.0-234", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-234.tgz", + "integrity": "sha512-7ysLPh3R4gAfXgO24OGT7rP5UGKUHs7ipfx4HTJsYZahZ0rMbWA98uC/aM3+q0WH1WEowyV16zvGACONFLZ5RA==", + "dev": true, + "requires": { + "@fluencelabs/fluence": "0.12.1" + }, + "dependencies": { + "@fluencelabs/avm": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, + "requires": { + "base64-js": "1.5.1" + } + }, + "@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.14.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "uuid": "8.3.0" + } + } + } }, "@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", "requires": { "base64-js": "1.5.1" } }, "@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -3268,8 +3355,9 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" } }, @@ -5042,11 +5130,6 @@ "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==" }, - "noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -5368,6 +5451,14 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==" }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -5559,6 +5650,16 @@ "yn": "3.1.1" } }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", diff --git a/fluence-js-examples/node-example/package.json b/fluence-js-examples/node-example/package.json index 8e2fda4..52618bd 100644 --- a/fluence-js-examples/node-example/package.json +++ b/fluence-js-examples/node-example/package.json @@ -11,13 +11,13 @@ "author": "", "license": "ISC", "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-234", "chokidar-cli": "^3.0.0", "ts-node": "^10.2.1", "typescript": "^4.4.2" }, "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10" } } diff --git a/fluence-js-examples/node-example/src/_aqua/calc.ts b/fluence-js-examples/node-example/src/_aqua/calc.ts index d81bd23..b2ee1a9 100644 --- a/fluence-js-examples/node-example/src/_aqua/calc.ts +++ b/fluence-js-examples/node-example/src/_aqua/calc.ts @@ -1,167 +1,117 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-234 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - export interface CalcDef { - add: (n: number, callParams: CallParams<'n'>) => void; -divide: (n: number, callParams: CallParams<'n'>) => void; -getResult: (callParams: CallParams) => number; -multiply: (n: number, callParams: CallParams<'n'>) => void; -reset: (callParams: CallParams) => void; -subtract: (n: number, callParams: CallParams<'n'>) => void; - } - - export function registerCalc(service: CalcDef): void; +export interface CalcDef { + add: (n: number, callParams: CallParams<'n'>) => void | Promise; +divide: (n: number, callParams: CallParams<'n'>) => void | Promise; +getResult: (callParams: CallParams) => number | Promise; +multiply: (n: number, callParams: CallParams<'n'>) => void | Promise; +reset: (callParams: CallParams) => void | Promise; +subtract: (n: number, callParams: CallParams<'n'>) => void | Promise; +} +export function registerCalc(service: CalcDef): void; export function registerCalc(serviceId: string, service: CalcDef): void; export function registerCalc(peer: FluencePeer, service: CalcDef): void; export function registerCalc(peer: FluencePeer, serviceId: string, service: CalcDef): void; - export function registerCalc(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "calc" +export function registerCalc(...args: any) { + registerService( + args, + { + "defaultServiceId" : "calc", + "functions" : [ + { + "functionName" : "add", + "argDefs" : [ + { + "name" : "n", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + }, + { + "functionName" : "divide", + "argDefs" : [ + { + "name" : "n", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + }, + { + "functionName" : "getResult", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "multiply", + "argDefs" : [ + { + "name" : "n", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + }, + { + "functionName" : "reset", + "argDefs" : [ + ], + "returnType" : { + "tag" : "void" + } + }, + { + "functionName" : "subtract", + "argDefs" : [ + { + "name" : "n", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'add') { - - const callParams = { - ...req.particleContext, - tetraplets: { - n: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - service.add(req.args[0], callParams); resp.result = {} - - } - - - - if (req.fnName === 'divide') { - - const callParams = { - ...req.particleContext, - tetraplets: { - n: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - service.divide(req.args[0], callParams); resp.result = {} - - } - - - - if (req.fnName === 'getResult') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getResult(callParams) - - } - - - - if (req.fnName === 'multiply') { - - const callParams = { - ...req.particleContext, - tetraplets: { - n: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - service.multiply(req.args[0], callParams); resp.result = {} - - } - - - - if (req.fnName === 'reset') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - service.reset(callParams); resp.result = {} - - } - - - - if (req.fnName === 'subtract') { - - const callParams = { - ...req.particleContext, - tetraplets: { - n: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - service.subtract(req.args[0], callParams); resp.result = {} - - } - - - next(); - }); - } - // Functions diff --git a/fluence-js-examples/node-example/src/_aqua/demo-calculation.ts b/fluence-js-examples/node-example/src/_aqua/demo-calculation.ts index d8040b3..0b5d919 100644 --- a/fluence-js-examples/node-example/src/_aqua/demo-calculation.ts +++ b/fluence-js-examples/node-example/src/_aqua/demo-calculation.ts @@ -1,122 +1,98 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-234 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - // Functions + - export function demoCalculation(config?: {ttl?: number}) : Promise; - export function demoCalculation(peer: FluencePeer, config?: {ttl?: number}) : Promise; - export function demoCalculation(...args: any) { - let peer: FluencePeer; - - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - config = args[1]; - } else { - peer = Fluence.getPeer(); - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call -relay- ("op" "noop") []) - ) - (call "12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e" ("op" "noop") []) - ) - (xor - (seq - (seq - (seq - (seq - (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "add") [10]) - (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "multiply") [5]) - ) - (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "subtract") [8]) - ) - (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "divide") [6]) - ) - (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "getResult") [] res) - ) - (seq - (seq - (seq - (call "12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e" ("op" "noop") []) - (call -relay- ("op" "noop") []) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - (call -relay- ("op" "noop") []) - ) - ) +export function demoCalculation(config?: {ttl?: number}): Promise; +export function demoCalculation(peer: FluencePeer, config?: {ttl?: number}): Promise; +export function demoCalculation(...args: any) { + + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call -relay- ("op" "noop") []) + ) + (call "12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e" ("op" "noop") []) + ) + (xor + (seq + (seq + (seq + (seq + (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "add") [10]) + (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "multiply") [5]) + ) + (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "subtract") [8]) + ) + (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "divide") [6]) + ) + (call "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3" ("calc" "getResult") [] res) + ) + (seq + (seq + (seq + (call "12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e" ("op" "noop") []) + (call -relay- ("op" "noop") []) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + (call -relay- ("op" "noop") []) + ) + ) + ) + (call "12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e" ("op" "noop") []) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [res]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "demoCalculation", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script ) - (call "12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e" ("op" "noop") []) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [res]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for demoCalculation'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) - } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; } - diff --git a/quickstart/1-browser-to-browser/package-lock.json b/quickstart/1-browser-to-browser/package-lock.json index 5844d5a..8f0a4a1 100644 --- a/quickstart/1-browser-to-browser/package-lock.json +++ b/quickstart/1-browser-to-browser/package-lock.json @@ -8,7 +8,7 @@ "name": "getting-started-browser", "version": "0.1.0", "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", @@ -24,7 +24,7 @@ "web-vitals": "^1.1.2" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-235", "@fluencelabs/aqua-lib": "0.1.14", "chokidar-cli": "^2.1.0", "node-sass": "^6.0.1" @@ -1953,14 +1953,16 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, + "dependencies": { + "@fluencelabs/fluence": "0.12.1" + }, "bin": { "aqua": "index.js", - "aqua-cli": "error.js", - "aqua-j": "index-java.js" + "aqua-cli": "error.js" } }, "node_modules/@fluencelabs/aqua-lib": { @@ -1969,37 +1971,11 @@ "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==", "dev": true }, - "node_modules/@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", - "dependencies": { - "base64-js": "1.5.1" - } - }, - "node_modules/@fluencelabs/avm/node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.14.4", @@ -2015,34 +1991,56 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", "uuid": "8.3.0" } }, + "node_modules/@fluencelabs/avm": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, + "dependencies": { + "base64-js": "1.5.1" + } + }, + "node_modules/@fluencelabs/fluence": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", + "dependencies": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.15.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, "node_modules/@fluencelabs/fluence-network-environment": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", "integrity": "sha512-aaWZDDFIIasSTgdFdw1KEz+boZMSn7pXffUENZNLX4DrP11rC3AEX4c8GnIJQbWqGsouOFZOPna2DSG6o2rLNQ==" }, - "node_modules/@fluencelabs/fluence/node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "node_modules/@fluencelabs/fluence/node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } }, "node_modules/@gar/promisify": { "version": "1.1.2", @@ -5093,9 +5091,23 @@ } }, "node_modules/base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] }, "node_modules/batch": { "version": "0.6.1", @@ -14864,11 +14876,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, - "node_modules/noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node_modules/node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -19043,6 +19050,19 @@ "aproba": "^1.1.1" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, + "node_modules/rxjs/node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -21411,6 +21431,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "node_modules/ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", @@ -25314,10 +25339,39 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", - "dev": true + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", + "dev": true, + "requires": { + "@fluencelabs/fluence": "0.12.1" + }, + "dependencies": { + "@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.14.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "uuid": "8.3.0" + } + } + } }, "@fluencelabs/aqua-lib": { "version": "0.1.14", @@ -25329,24 +25383,18 @@ "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "requires": { "base64-js": "1.5.1" - }, - "dependencies": { - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - } } }, "@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -25359,15 +25407,19 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" }, "dependencies": { - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "requires": { + "base64-js": "1.5.1" + } } } }, @@ -27801,9 +27853,9 @@ } }, "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "batch": { "version": "0.6.1", @@ -35539,11 +35591,6 @@ } } }, - "noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -38855,6 +38902,21 @@ "aproba": "^1.1.1" } }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + } + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -40791,6 +40853,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", diff --git a/quickstart/1-browser-to-browser/package.json b/quickstart/1-browser-to-browser/package.json index 3d0b967..4977931 100644 --- a/quickstart/1-browser-to-browser/package.json +++ b/quickstart/1-browser-to-browser/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", @@ -45,7 +45,7 @@ ] }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-235", "@fluencelabs/aqua-lib": "0.1.14", "chokidar-cli": "^2.1.0", "node-sass": "^6.0.1" diff --git a/quickstart/1-browser-to-browser/src/_aqua/getting-started.ts b/quickstart/1-browser-to-browser/src/_aqua/getting-started.ts index 731012f..edab4aa 100644 --- a/quickstart/1-browser-to-browser/src/_aqua/getting-started.ts +++ b/quickstart/1-browser-to-browser/src/_aqua/getting-started.ts @@ -1,187 +1,138 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-235 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - export interface HelloPeerDef { - hello: (from: string, callParams: CallParams<'from'>) => string; - } - - export function registerHelloPeer(service: HelloPeerDef): void; +export interface HelloPeerDef { + hello: (from: string, callParams: CallParams<'from'>) => string | Promise; +} +export function registerHelloPeer(service: HelloPeerDef): void; export function registerHelloPeer(serviceId: string, service: HelloPeerDef): void; export function registerHelloPeer(peer: FluencePeer, service: HelloPeerDef): void; export function registerHelloPeer(peer: FluencePeer, serviceId: string, service: HelloPeerDef): void; - export function registerHelloPeer(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "HelloPeer" -} - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'hello') { - - const callParams = { - ...req.particleContext, - tetraplets: { - from: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.hello(req.args[0], callParams) - - } - - - next(); - }); - } - - -// Functions - - export function sayHello(targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise; - export function sayHello(peer: FluencePeer, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise; - export function sayHello(...args: any) { - let peer: FluencePeer; - let targetPeerId: any; -let targetRelayPeerId: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - targetPeerId = args[1]; -targetRelayPeerId = args[2]; -config = args[3]; - } else { - peer = Fluence.getPeer(); - targetPeerId = args[0]; -targetRelayPeerId = args[1]; -config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "targetPeerId") [] targetPeerId) - ) - (call %init_peer_id% ("getDataSrv" "targetRelayPeerId") [] targetRelayPeerId) - ) - (call -relay- ("op" "noop") []) - ) - (call targetRelayPeerId ("op" "noop") []) - ) - (xor - (call targetPeerId ("HelloPeer" "hello") [%init_peer_id%] res) - (seq - (seq - (seq - (call targetRelayPeerId ("op" "noop") []) - (call -relay- ("op" "noop") []) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - (call -relay- ("op" "noop") []) - ) - ) - ) - (call targetRelayPeerId ("op" "noop") []) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [res]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'targetPeerId', () => {return targetPeerId;}); -h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for sayHello'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) +export function registerHelloPeer(...args: any) { + registerService( + args, + { + "defaultServiceId" : "HelloPeer", + "functions" : [ + { + "functionName" : "hello", + "argDefs" : [ + { + "name" : "from", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ] +} + ); } +// Functions + + +export function sayHello(targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}): Promise; +export function sayHello(peer: FluencePeer, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}): Promise; +export function sayHello(...args: any) { + + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "targetPeerId") [] targetPeerId) + ) + (call %init_peer_id% ("getDataSrv" "targetRelayPeerId") [] targetRelayPeerId) + ) + (call -relay- ("op" "noop") []) + ) + (call targetRelayPeerId ("op" "noop") []) + ) + (xor + (call targetPeerId ("HelloPeer" "hello") [%init_peer_id%] res) + (seq + (seq + (seq + (call targetRelayPeerId ("op" "noop") []) + (call -relay- ("op" "noop") []) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + (call -relay- ("op" "noop") []) + ) + ) + ) + (call targetRelayPeerId ("op" "noop") []) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [res]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "sayHello", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "targetPeerId", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "targetRelayPeerId", + "argType" : { + "tag" : "primitive" + } + } + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) +} diff --git a/quickstart/3-browser-to-service/package-lock.json b/quickstart/3-browser-to-service/package-lock.json index 097f20b..21365f7 100644 --- a/quickstart/3-browser-to-service/package-lock.json +++ b/quickstart/3-browser-to-service/package-lock.json @@ -8,7 +8,7 @@ "name": "getting-started-browser", "version": "0.1.0", "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", @@ -24,7 +24,7 @@ "web-vitals": "^1.1.2" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-235", "@fluencelabs/aqua-lib": "0.1.14", "chokidar-cli": "^2.1.0", "node-sass": "^6.0.1" @@ -1953,14 +1953,16 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, + "dependencies": { + "@fluencelabs/fluence": "0.12.1" + }, "bin": { "aqua": "index.js", - "aqua-cli": "error.js", - "aqua-j": "index-java.js" + "aqua-cli": "error.js" } }, "node_modules/@fluencelabs/aqua-lib": { @@ -1969,37 +1971,20 @@ "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==", "dev": true }, - "node_modules/@fluencelabs/avm": { + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm": { "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "dependencies": { "base64-js": "1.5.1" } }, - "node_modules/@fluencelabs/avm/node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.14.4", @@ -2015,35 +2000,48 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", "uuid": "8.3.0" } }, + "node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, + "node_modules/@fluencelabs/fluence": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", + "dependencies": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.15.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, "node_modules/@fluencelabs/fluence-network-environment": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", "integrity": "sha512-aaWZDDFIIasSTgdFdw1KEz+boZMSn7pXffUENZNLX4DrP11rC3AEX4c8GnIJQbWqGsouOFZOPna2DSG6o2rLNQ==" }, - "node_modules/@fluencelabs/fluence/node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/@gar/promisify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", @@ -5093,9 +5091,23 @@ } }, "node_modules/base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] }, "node_modules/batch": { "version": "0.6.1", @@ -14864,11 +14876,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, - "node_modules/noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node_modules/node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -19043,6 +19050,19 @@ "aproba": "^1.1.1" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, + "node_modules/rxjs/node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -21411,6 +21431,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "node_modules/ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", @@ -25314,10 +25339,48 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", - "dev": true + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", + "dev": true, + "requires": { + "@fluencelabs/fluence": "0.12.1" + }, + "dependencies": { + "@fluencelabs/avm": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, + "requires": { + "base64-js": "1.5.1" + } + }, + "@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.14.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "uuid": "8.3.0" + } + } + } }, "@fluencelabs/aqua-lib": { "version": "0.1.14", @@ -25326,27 +25389,20 @@ "dev": true }, "@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", "requires": { "base64-js": "1.5.1" - }, - "dependencies": { - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - } } }, "@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -25359,16 +25415,10 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" - }, - "dependencies": { - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - } } }, "@fluencelabs/fluence-network-environment": { @@ -27801,9 +27851,9 @@ } }, "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "batch": { "version": "0.6.1", @@ -35539,11 +35589,6 @@ } } }, - "noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -38855,6 +38900,21 @@ "aproba": "^1.1.1" } }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + } + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -40791,6 +40851,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", diff --git a/quickstart/3-browser-to-service/package.json b/quickstart/3-browser-to-service/package.json index 3d0b967..4977931 100644 --- a/quickstart/3-browser-to-service/package.json +++ b/quickstart/3-browser-to-service/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@fluencelabs/fluence": "0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "1.0.10", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", @@ -45,7 +45,7 @@ ] }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", + "@fluencelabs/aqua": "^0.4.0-235", "@fluencelabs/aqua-lib": "0.1.14", "chokidar-cli": "^2.1.0", "node-sass": "^6.0.1" diff --git a/quickstart/3-browser-to-service/src/_aqua/getting-started.ts b/quickstart/3-browser-to-service/src/_aqua/getting-started.ts index 5cbbffc..6c2b678 100644 --- a/quickstart/3-browser-to-service/src/_aqua/getting-started.ts +++ b/quickstart/3-browser-to-service/src/_aqua/getting-started.ts @@ -1,258 +1,180 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-235 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - export interface HelloWorldDef { - hello: (from: string, callParams: CallParams<'from'>) => {msg:string;reply:string}; - } - - export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void; +export interface HelloWorldDef { + hello: (from: string, callParams: CallParams<'from'>) => { msg: string; reply: string; } | Promise<{ msg: string; reply: string; }>; +} +export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void; export function registerHelloWorld(peer: FluencePeer, serviceId: string, service: HelloWorldDef): void; - export function registerHelloWorld(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'hello') { - - const callParams = { - ...req.particleContext, - tetraplets: { - from: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.hello(req.args[0], callParams) - - } - - - next(); - }); - } +export function registerHelloWorld(...args: any) { + registerService( + args, + { + "functions" : [ + { + "functionName" : "hello", + "argDefs" : [ + { + "name" : "from", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); +} - export interface HelloPeerDef { - hello: (message: string, callParams: CallParams<'message'>) => string; - } - - export function registerHelloPeer(service: HelloPeerDef): void; +export interface HelloPeerDef { + hello: (message: string, callParams: CallParams<'message'>) => string | Promise; +} +export function registerHelloPeer(service: HelloPeerDef): void; export function registerHelloPeer(serviceId: string, service: HelloPeerDef): void; export function registerHelloPeer(peer: FluencePeer, service: HelloPeerDef): void; export function registerHelloPeer(peer: FluencePeer, serviceId: string, service: HelloPeerDef): void; - export function registerHelloPeer(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "HelloPeer" -} - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'hello') { - - const callParams = { - ...req.particleContext, - tetraplets: { - message: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.hello(req.args[0], callParams) - - } - - - next(); - }); - } - - -// Functions - - export function sayHello(targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise; - export function sayHello(peer: FluencePeer, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise; - export function sayHello(...args: any) { - let peer: FluencePeer; - let targetPeerId: any; -let targetRelayPeerId: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - targetPeerId = args[1]; -targetRelayPeerId = args[2]; -config = args[3]; - } else { - peer = Fluence.getPeer(); - targetPeerId = args[0]; -targetRelayPeerId = args[1]; -config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "targetPeerId") [] targetPeerId) - ) - (call %init_peer_id% ("getDataSrv" "targetRelayPeerId") [] targetRelayPeerId) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (seq - (call -relay- ("op" "noop") []) - (call "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi" ("1e740ce4-81f6-4dd4-9bed-8d86e9c2fa50" "hello") [%init_peer_id%] comp) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (par - (seq - (call targetRelayPeerId ("op" "noop") []) - (xor - (call targetPeerId ("HelloPeer" "hello") [%init_peer_id%] res) - (seq - (seq - (call targetRelayPeerId ("op" "noop") []) - (call -relay- ("op" "noop") []) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - ) - (null) - ) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [comp.$.reply!]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'targetPeerId', () => {return targetPeerId;}); -h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for sayHello'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) +export function registerHelloPeer(...args: any) { + registerService( + args, + { + "defaultServiceId" : "HelloPeer", + "functions" : [ + { + "functionName" : "hello", + "argDefs" : [ + { + "name" : "message", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ] +} + ); } +// Functions + + +export function sayHello(targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}): Promise; +export function sayHello(peer: FluencePeer, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}): Promise; +export function sayHello(...args: any) { + + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "targetPeerId") [] targetPeerId) + ) + (call %init_peer_id% ("getDataSrv" "targetRelayPeerId") [] targetRelayPeerId) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (seq + (call -relay- ("op" "noop") []) + (call "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi" ("1e740ce4-81f6-4dd4-9bed-8d86e9c2fa50" "hello") [%init_peer_id%] comp) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (par + (seq + (call targetRelayPeerId ("op" "noop") []) + (xor + (call targetPeerId ("HelloPeer" "hello") [%init_peer_id%] res) + (seq + (seq + (call targetRelayPeerId ("op" "noop") []) + (call -relay- ("op" "noop") []) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + ) + (null) + ) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [comp.$.reply!]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) + ) + ` + return callFunction( + args, + { + "functionName" : "sayHello", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "targetPeerId", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "targetRelayPeerId", + "argType" : { + "tag" : "primitive" + } + } + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) +} diff --git a/quickstart/4-composing-services-with-aqua/client-peer/.gitignore b/quickstart/4-composing-services-with-aqua/client-peer/.gitignore new file mode 100644 index 0000000..53c37a1 --- /dev/null +++ b/quickstart/4-composing-services-with-aqua/client-peer/.gitignore @@ -0,0 +1 @@ +dist \ No newline at end of file diff --git a/quickstart/4-composing-services-with-aqua/client-peer/dist/src/compiled-aqua/adder.js b/quickstart/4-composing-services-with-aqua/client-peer/dist/src/compiled-aqua/adder.js deleted file mode 100644 index 7a3f6f8..0000000 --- a/quickstart/4-composing-services-with-aqua/client-peer/dist/src/compiled-aqua/adder.js +++ /dev/null @@ -1,344 +0,0 @@ -"use strict"; -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.add_one_par_alt = exports.add_one_par = exports.add_one_three_times = exports.add_one = exports.registerMyOp = exports.registerAddOne = void 0; -/** - * - * 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.3.0-226 - * - */ -var fluence_1 = require("@fluencelabs/fluence"); -var v1_1 = require("@fluencelabs/fluence/dist/internal/compilerSupport/v1"); -function registerAddOne() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var serviceId; - var service; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - } - else { - peer = fluence_1.Fluence.getPeer(); - } - if (typeof args[0] === 'string') { - serviceId = args[0]; - } - else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(fluence_1.FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } - else if (typeof args[1] === 'object') { - service = args[1]; - } - else { - service = args[2]; - } - peer.internals.callServiceHandler.use(function (req, resp, next) { - if (req.serviceId !== serviceId) { - next(); - return; - } - if (req.fnName === 'add_one') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - arg0: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.add_one(req.args[0], callParams); - } - next(); - }); -} -exports.registerAddOne = registerAddOne; -function registerMyOp() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var serviceId; - var service; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - } - else { - peer = fluence_1.Fluence.getPeer(); - } - if (typeof args[0] === 'string') { - serviceId = args[0]; - } - else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "op"; - } - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(fluence_1.FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } - else if (typeof args[1] === 'object') { - service = args[1]; - } - else { - service = args[2]; - } - peer.internals.callServiceHandler.use(function (req, resp, next) { - if (req.serviceId !== serviceId) { - next(); - return; - } - if (req.fnName === 'identity') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - u: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - service.identity(req.args[0], callParams); - resp.result = {}; - } - next(); - }); -} -exports.registerMyOp = registerMyOp; -function add_one() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var value; - var node; - var service_id; - var config; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - value = args[1]; - node = args[2]; - service_id = args[3]; - config = args[4]; - } - else { - peer = fluence_1.Fluence.getPeer(); - value = args[0]; - node = args[1]; - service_id = args[2]; - config = args[3]; - } - var request; - var promise = new Promise(function (resolve, reject) { - var r = new v1_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n (xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"value\") [] value)\n )\n (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n )\n (call %init_peer_id% (\"getDataSrv\" \"service_id\") [] service_id)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call node (service_id \"add_one\") [value] res)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'value', function () { return value; }); - h.on('getDataSrv', 'node', function () { return node; }); - h.on('getDataSrv', 'service_id', function () { return service_id; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for add_one'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - peer.internals.initiateFlow(request); - return promise; -} -exports.add_one = add_one; -function add_one_three_times() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var value; - var ns_tuples; - var config; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - value = args[1]; - ns_tuples = args[2]; - config = args[3]; - } - else { - peer = fluence_1.Fluence.getPeer(); - value = args[0]; - ns_tuples = args[1]; - config = args[2]; - } - var request; - var promise = new Promise(function (resolve, reject) { - var r = new v1_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n (xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"value\") [] value)\n )\n (call %init_peer_id% (\"getDataSrv\" \"ns_tuples\") [] ns_tuples)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call ns_tuples.$.[0].node_id! (ns_tuples.$.[0].service_id! \"add_one\") [value] res1)\n )\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n )\n )\n (xor\n (call ns_tuples.$.[1].node_id! (ns_tuples.$.[1].service_id! \"add_one\") [res1] res2)\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n )\n )\n (xor\n (call ns_tuples.$.[2].node_id! (ns_tuples.$.[2].service_id! \"add_one\") [res2] res3)\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [res3])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 5])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'value', function () { return value; }); - h.on('getDataSrv', 'ns_tuples', function () { return ns_tuples; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for add_one_three_times'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - peer.internals.initiateFlow(request); - return promise; -} -exports.add_one_three_times = add_one_three_times; -function add_one_par() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var value; - var ns_tuples; - var config; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - value = args[1]; - ns_tuples = args[2]; - config = args[3]; - } - else { - peer = fluence_1.Fluence.getPeer(); - value = args[0]; - ns_tuples = args[1]; - config = args[2]; - } - var request; - var promise = new Promise(function (resolve, reject) { - var r = new v1_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n (xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"value\") [] value)\n )\n (call %init_peer_id% (\"getDataSrv\" \"ns_tuples\") [] ns_tuples)\n )\n (fold ns_tuples ns\n (par\n (seq\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call ns.$.node_id! (ns.$.service_id! \"add_one\") [value] $res)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (call %init_peer_id% (\"op\" \"noop\") [])\n )\n (next ns)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"identity\") [$res.$.[2]!])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'value', function () { return value; }); - h.on('getDataSrv', 'ns_tuples', function () { return ns_tuples; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for add_one_par'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - peer.internals.initiateFlow(request); - return promise; -} -exports.add_one_par = add_one_par; -function add_one_par_alt() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var payload; - var config; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - payload = args[1]; - config = args[2]; - } - else { - peer = fluence_1.Fluence.getPeer(); - payload = args[0]; - config = args[1]; - } - var request; - var promise = new Promise(function (resolve, reject) { - var r = new v1_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n (xor\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"payload\") [] payload)\n )\n (fold payload vns\n (par\n (seq\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call vns.$.node_id! (vns.$.service_id! \"add_one\") [vns.$.value!] $res)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (call %init_peer_id% (\"op\" \"noop\") [])\n )\n (next vns)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"identity\") [$res.$.[2]!])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'payload', function () { return payload; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for add_one_par_alt'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - peer.internals.initiateFlow(request); - return promise; -} -exports.add_one_par_alt = add_one_par_alt; diff --git a/quickstart/4-composing-services-with-aqua/client-peer/dist/src/compiled-aqua/builtin.js b/quickstart/4-composing-services-with-aqua/client-peer/dist/src/compiled-aqua/builtin.js deleted file mode 100644 index f3a5141..0000000 --- a/quickstart/4-composing-services-with-aqua/client-peer/dist/src/compiled-aqua/builtin.js +++ /dev/null @@ -1,548 +0,0 @@ -"use strict"; -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.registerDist = exports.registerScript = exports.registerKademlia = exports.registerOp = exports.registerPeer = exports.registerSrv = void 0; -/** - * - * 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.3.0-226 - * - */ -var fluence_1 = require("@fluencelabs/fluence"); -var v1_1 = require("@fluencelabs/fluence/dist/internal/compilerSupport/v1"); -function registerSrv() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var serviceId; - var service; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - } - else { - peer = fluence_1.Fluence.getPeer(); - } - if (typeof args[0] === 'string') { - serviceId = args[0]; - } - else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "srv"; - } - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(fluence_1.FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } - else if (typeof args[1] === 'object') { - service = args[1]; - } - else { - service = args[2]; - } - peer.internals.callServiceHandler.use(function (req, resp, next) { - if (req.serviceId !== serviceId) { - next(); - return; - } - if (req.fnName === 'add_alias') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - alias: req.tetraplets[0], service_id: req.tetraplets[1] - } }); - resp.retCode = v1_1.ResultCodes.success; - service.add_alias(req.args[0], req.args[1], callParams); - resp.result = {}; - } - if (req.fnName === 'create') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - blueprint_id: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.create(req.args[0], callParams); - } - if (req.fnName === 'get_interface') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - service_id: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.get_interface(req.args[0], callParams); - } - if (req.fnName === 'list') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: {} }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.list(callParams); - } - if (req.fnName === 'remove') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - service_id: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - service.remove(req.args[0], callParams); - resp.result = {}; - } - if (req.fnName === 'resolve_alias') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - alias: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.resolve_alias(req.args[0], callParams); - } - next(); - }); -} -exports.registerSrv = registerSrv; -function registerPeer() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var serviceId; - var service; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - } - else { - peer = fluence_1.Fluence.getPeer(); - } - if (typeof args[0] === 'string') { - serviceId = args[0]; - } - else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "peer"; - } - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(fluence_1.FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } - else if (typeof args[1] === 'object') { - service = args[1]; - } - else { - service = args[2]; - } - peer.internals.callServiceHandler.use(function (req, resp, next) { - if (req.serviceId !== serviceId) { - next(); - return; - } - if (req.fnName === 'connect') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - id: req.tetraplets[0], multiaddrs: req.tetraplets[1] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.connect(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], callParams); - } - if (req.fnName === 'get_contact') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - peer: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.get_contact(req.args[0], callParams); - } - if (req.fnName === 'identify') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: {} }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.identify(callParams); - } - if (req.fnName === 'is_connected') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - peer: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.is_connected(req.args[0], callParams); - } - if (req.fnName === 'timestamp_ms') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: {} }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.timestamp_ms(callParams); - } - if (req.fnName === 'timestamp_sec') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: {} }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.timestamp_sec(callParams); - } - next(); - }); -} -exports.registerPeer = registerPeer; -function registerOp() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var serviceId; - var service; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - } - else { - peer = fluence_1.Fluence.getPeer(); - } - if (typeof args[0] === 'string') { - serviceId = args[0]; - } - else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "op"; - } - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(fluence_1.FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } - else if (typeof args[1] === 'object') { - service = args[1]; - } - else { - service = args[2]; - } - peer.internals.callServiceHandler.use(function (req, resp, next) { - if (req.serviceId !== serviceId) { - next(); - return; - } - if (req.fnName === 'array') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - a: req.tetraplets[0], b: req.tetraplets[1], c: req.tetraplets[2], d: req.tetraplets[3] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.array(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], req.args[3].length === 0 ? null : req.args[3][0], callParams); - } - if (req.fnName === 'array_length') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - array: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.array_length(req.args[0], callParams); - } - if (req.fnName === 'bytes_from_b58') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - b: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.bytes_from_b58(req.args[0], callParams); - } - if (req.fnName === 'bytes_to_b58') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - bs: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.bytes_to_b58(req.args[0], callParams); - } - if (req.fnName === 'concat') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - a: req.tetraplets[0], b: req.tetraplets[1], c: req.tetraplets[2], d: req.tetraplets[3] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.concat(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], req.args[3].length === 0 ? null : req.args[3][0], callParams); - } - if (req.fnName === 'concat_strings') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - a: req.tetraplets[0], b: req.tetraplets[1] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.concat_strings(req.args[0], req.args[1], callParams); - } - if (req.fnName === 'identity') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - s: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - var respResult = service.identity(req.args[0].length === 0 ? null : req.args[0][0], callParams); - resp.result = respResult === null ? [] : [respResult]; - } - if (req.fnName === 'noop') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: {} }); - resp.retCode = v1_1.ResultCodes.success; - service.noop(callParams); - resp.result = {}; - } - if (req.fnName === 'sha256_string') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - s: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.sha256_string(req.args[0], callParams); - } - if (req.fnName === 'string_from_b58') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - b: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.string_from_b58(req.args[0], callParams); - } - if (req.fnName === 'string_to_b58') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - s: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.string_to_b58(req.args[0], callParams); - } - next(); - }); -} -exports.registerOp = registerOp; -function registerKademlia() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var serviceId; - var service; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - } - else { - peer = fluence_1.Fluence.getPeer(); - } - if (typeof args[0] === 'string') { - serviceId = args[0]; - } - else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "kad"; - } - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(fluence_1.FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } - else if (typeof args[1] === 'object') { - service = args[1]; - } - else { - service = args[2]; - } - peer.internals.callServiceHandler.use(function (req, resp, next) { - if (req.serviceId !== serviceId) { - next(); - return; - } - if (req.fnName === 'merge') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - target: req.tetraplets[0], left: req.tetraplets[1], right: req.tetraplets[2], count: req.tetraplets[3] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.merge(req.args[0], req.args[1], req.args[2], req.args[3].length === 0 ? null : req.args[3][0], callParams); - } - if (req.fnName === 'neighborhood') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - key: req.tetraplets[0], already_hashed: req.tetraplets[1], count: req.tetraplets[2] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.neighborhood(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], callParams); - } - next(); - }); -} -exports.registerKademlia = registerKademlia; -function registerScript() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var serviceId; - var service; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - } - else { - peer = fluence_1.Fluence.getPeer(); - } - if (typeof args[0] === 'string') { - serviceId = args[0]; - } - else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "script"; - } - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(fluence_1.FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } - else if (typeof args[1] === 'object') { - service = args[1]; - } - else { - service = args[2]; - } - peer.internals.callServiceHandler.use(function (req, resp, next) { - if (req.serviceId !== serviceId) { - next(); - return; - } - if (req.fnName === 'add') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - air_script: req.tetraplets[0], interval: req.tetraplets[1] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.add(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], callParams); - } - if (req.fnName === 'list') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: {} }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.list(callParams); - } - if (req.fnName === 'remove') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - script_id: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.remove(req.args[0], callParams); - } - next(); - }); -} -exports.registerScript = registerScript; -function registerDist() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var peer; - var serviceId; - var service; - if (fluence_1.FluencePeer.isInstance(args[0])) { - peer = args[0]; - } - else { - peer = fluence_1.Fluence.getPeer(); - } - if (typeof args[0] === 'string') { - serviceId = args[0]; - } - else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "dist"; - } - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(fluence_1.FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } - else if (typeof args[1] === 'object') { - service = args[1]; - } - else { - service = args[2]; - } - peer.internals.callServiceHandler.use(function (req, resp, next) { - if (req.serviceId !== serviceId) { - next(); - return; - } - if (req.fnName === 'add_blueprint') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - blueprint: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.add_blueprint(req.args[0], callParams); - } - if (req.fnName === 'add_module') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - wasm_b56_content: req.tetraplets[0], conf: req.tetraplets[1] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.add_module(req.args[0], req.args[1], callParams); - } - if (req.fnName === 'add_module_from_vault') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - path: req.tetraplets[0], config: req.tetraplets[1] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.add_module_from_vault(req.args[0], req.args[1], callParams); - } - if (req.fnName === 'default_module_config') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - module_name: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.default_module_config(req.args[0], callParams); - } - if (req.fnName === 'get_interface') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - module_id: req.tetraplets[0] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.get_interface(req.args[0], callParams); - } - if (req.fnName === 'list_blueprints') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: {} }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.list_blueprints(callParams); - } - if (req.fnName === 'list_modules') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: {} }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.list_modules(callParams); - } - if (req.fnName === 'make_blueprint') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - name: req.tetraplets[0], dependencies: req.tetraplets[1] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.make_blueprint(req.args[0], req.args[1], callParams); - } - if (req.fnName === 'make_module_config') { - var callParams = __assign(__assign({}, req.particleContext), { tetraplets: { - name: req.tetraplets[0], mem_pages_count: req.tetraplets[1], logger_enabled: req.tetraplets[2], preopened_files: req.tetraplets[3], envs: req.tetraplets[4], mapped_dirs: req.tetraplets[5], mounted_binaries: req.tetraplets[6], logging_mask: req.tetraplets[7] - } }); - resp.retCode = v1_1.ResultCodes.success; - resp.result = service.make_module_config(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], req.args[3].length === 0 ? null : req.args[3][0], req.args[4].length === 0 ? null : req.args[4][0], req.args[5].length === 0 ? null : req.args[5][0], req.args[6].length === 0 ? null : req.args[6][0], req.args[7].length === 0 ? null : req.args[7][0], callParams); - } - next(); - }); -} -exports.registerDist = registerDist; -// Functions diff --git a/quickstart/4-composing-services-with-aqua/client-peer/dist/src/index.js b/quickstart/4-composing-services-with-aqua/client-peer/dist/src/index.js deleted file mode 100644 index 19cad80..0000000 --- a/quickstart/4-composing-services-with-aqua/client-peer/dist/src/index.js +++ /dev/null @@ -1,130 +0,0 @@ -"use strict"; -/* - * Copyright 2021 Fluence Labs Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -Object.defineProperty(exports, "__esModule", { value: true }); -var fluence_1 = require("@fluencelabs/fluence"); -var fluence_network_environment_1 = require("@fluencelabs/fluence-network-environment"); -var adder_1 = require("./compiled-aqua/adder"); -var topos = [ - { - "node_id": "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", - "service_id": "7b2ab89f-0897-4537-b726-8120b405074d" - }, - { - "node_id": "12D3KooWKnEqMfYo9zvfHmqTLpLdiHXPe4SVqUWcWHDJdFGrSmcA", - "service_id": "e013f18a-200f-4249-8303-d42d10d3ce46" - }, - { - "node_id": "12D3KooWDUszU2NeWyUVjCXhGEt1MoZrhvdmaQQwtZUriuGN1jTr", - "service_id": "191ef700-fd13-4151-9b7c-3fabfe3c0387" - } -]; -var topos_alt = [ - { - "value": 5, - "node_id": "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", - "service_id": "7b2ab89f-0897-4537-b726-8120b405074d" - }, - { - "value": 10, - "node_id": "12D3KooWKnEqMfYo9zvfHmqTLpLdiHXPe4SVqUWcWHDJdFGrSmcA", - "service_id": "e013f18a-200f-4249-8303-d42d10d3ce46" - }, - { - "value": 15, - "node_id": "12D3KooWDUszU2NeWyUVjCXhGEt1MoZrhvdmaQQwtZUriuGN1jTr", - "service_id": "191ef700-fd13-4151-9b7c-3fabfe3c0387" - } -]; -var value = 5; -// let greeting_service = -function main() { - return __awaiter(this, void 0, void 0, function () { - var basic_add, seq_add, par_add, par_add_alt; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - // console.log("hello"); - // setLogLevel('DEBUG'); - return [4 /*yield*/, fluence_1.Fluence.start({ connectTo: fluence_network_environment_1.krasnodar[2] })]; - case 1: - // console.log("hello"); - // setLogLevel('DEBUG'); - _a.sent(); - console.log("created a Fluence client %s with relay %s", fluence_1.Fluence.getStatus().peerId, fluence_1.Fluence.getStatus().relayPeerId); - return [4 /*yield*/, adder_1.add_one(value, topos[0].node_id, topos[0].service_id)]; - case 2: - basic_add = _a.sent(); - console.log("add_one to ", value, " equals ", basic_add); - return [4 /*yield*/, adder_1.add_one_three_times(value, topos)]; - case 3: - seq_add = _a.sent(); - console.log("add_one sequentially equals ", seq_add); - return [4 /*yield*/, adder_1.add_one_par(value, topos)]; - case 4: - par_add = _a.sent(); - console.log("add_one parallel equals ", par_add); - return [4 /*yield*/, adder_1.add_one_par_alt(topos_alt)]; - case 5: - par_add_alt = _a.sent(); - console.log("add_one parallel alt equals ", par_add_alt); - return [2 /*return*/]; - } - }); - }); -} -main() - .then(function () { return process.exit(0); }) - .catch(function (error) { - console.error(error); - process.exit(1); -}); diff --git a/quickstart/4-composing-services-with-aqua/client-peer/package-lock.json b/quickstart/4-composing-services-with-aqua/client-peer/package-lock.json index c623413..2fd9fcf 100644 --- a/quickstart/4-composing-services-with-aqua/client-peer/package-lock.json +++ b/quickstart/4-composing-services-with-aqua/client-peer/package-lock.json @@ -10,13 +10,13 @@ "license": "MIT", "dependencies": { "@fluencelabs/aqua-lib": "^0.1.14", - "@fluencelabs/fluence": "^0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "^1.0.10", "it-all": "^1.0.5" }, "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", - "typescript": "^3.9.5" + "@fluencelabs/aqua": "^0.4.0-235", + "typescript": "^4.0.0" } }, "node_modules/@chainsafe/libp2p-noise": { @@ -51,14 +51,16 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", "dev": true, + "dependencies": { + "@fluencelabs/fluence": "0.12.1" + }, "bin": { "aqua": "index.js", - "aqua-cli": "error.js", - "aqua-j": "index-java.js" + "aqua-cli": "error.js" } }, "node_modules/@fluencelabs/aqua-lib": { @@ -66,18 +68,20 @@ "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.1.14.tgz", "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" }, - "node_modules/@fluencelabs/avm": { + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm": { "version": "0.14.4", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, "dependencies": { "base64-js": "1.5.1" } }, - "node_modules/@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.14.4", @@ -93,11 +97,43 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", "uuid": "8.3.0" } }, + "node_modules/@fluencelabs/avm": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", + "dependencies": { + "base64-js": "1.5.1" + } + }, + "node_modules/@fluencelabs/fluence": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", + "dependencies": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.15.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, "node_modules/@fluencelabs/fluence-network-environment": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.10.tgz", @@ -1879,11 +1915,6 @@ "node": ">= 0.4.0" } }, - "node_modules/noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node_modules/node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -2257,6 +2288,14 @@ "node": ">= 4" } }, + "node_modules/rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "dependencies": { + "tslib": "~2.1.0" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2432,6 +2471,16 @@ "utf8-byte-length": "^1.0.1" } }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -2449,9 +2498,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -2634,10 +2683,48 @@ } }, "@fluencelabs/aqua": { - "version": "0.3.0-226", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", - "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", - "dev": true + "version": "0.4.0-235", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", + "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", + "dev": true, + "requires": { + "@fluencelabs/fluence": "0.12.1" + }, + "dependencies": { + "@fluencelabs/avm": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "dev": true, + "requires": { + "base64-js": "1.5.1" + } + }, + "@fluencelabs/fluence": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", + "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "4.0.0", + "@fluencelabs/avm": "0.14.4", + "async": "3.2.0", + "base64-js": "1.5.1", + "bs58": "4.0.1", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "0.32.3", + "libp2p-crypto": "0.19.7", + "libp2p-mplex": "0.10.4", + "libp2p-websockets": "0.16.1", + "loglevel": "1.7.0", + "multiaddr": "10.0.0", + "peer-id": "0.15.3", + "uuid": "8.3.0" + } + } + } }, "@fluencelabs/aqua-lib": { "version": "0.1.14", @@ -2645,20 +2732,20 @@ "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" }, "@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.15.4.tgz", + "integrity": "sha512-NLZDq83ocJ1Helm0D8kPMSSkjxH0y+Tujg0px773zjIShbh3jgiJOjAW1xCYgTt9K0LqepjP0bWX4/8nUZfr7g==", "requires": { "base64-js": "1.5.1" } }, "@fluencelabs/fluence": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.0.tgz", - "integrity": "sha512-eYg3CflqeqlWUoaXXXUBxls7Pzjytp1nkHZWoe39bL7poF20T1BuTovNWo/jTWma5HS4L1FaAGGRNaMcN0wFHQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.2.tgz", + "integrity": "sha512-Cf5Ii6dpVSSi839jB7H0Y9k07xncYdHiTNKp4LlPg6inXuy2OPb2E7qF5DXlMM9O1dBb/UJTa4jZlQDsgWriiQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", + "@fluencelabs/avm": "0.15.4", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -2671,8 +2758,9 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", - "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" } }, @@ -4175,11 +4263,6 @@ "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==" }, - "noble-ed25519": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", - "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" - }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -4453,6 +4536,14 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==" }, + "rxjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", + "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "requires": { + "tslib": "~2.1.0" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4589,6 +4680,16 @@ "utf8-byte-length": "^1.0.1" } }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -4603,9 +4704,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", "dev": true }, "uint8arrays": { diff --git a/quickstart/4-composing-services-with-aqua/client-peer/package.json b/quickstart/4-composing-services-with-aqua/client-peer/package.json index 35da0db..2c423ae 100644 --- a/quickstart/4-composing-services-with-aqua/client-peer/package.json +++ b/quickstart/4-composing-services-with-aqua/client-peer/package.json @@ -14,7 +14,7 @@ ], "dependencies": { "@fluencelabs/aqua-lib": "^0.1.14", - "@fluencelabs/fluence": "^0.12.0", + "@fluencelabs/fluence": "^0.14.2", "@fluencelabs/fluence-network-environment": "^1.0.10", "it-all": "^1.0.5" }, @@ -43,7 +43,7 @@ }, "homepage": "git+https://github.com/fluencelabs/examples/aqua-examples/echo-greeter#readme", "devDependencies": { - "@fluencelabs/aqua": "^0.3.0-226", - "typescript": "^3.9.5" + "@fluencelabs/aqua": "^0.4.0-235", + "typescript": "^4.0.0" } } diff --git a/quickstart/4-composing-services-with-aqua/client-peer/src/compiled-aqua/adder.ts b/quickstart/4-composing-services-with-aqua/client-peer/src/compiled-aqua/adder.ts index 4278d10..77185b9 100644 --- a/quickstart/4-composing-services-with-aqua/client-peer/src/compiled-aqua/adder.ts +++ b/quickstart/4-composing-services-with-aqua/client-peer/src/compiled-aqua/adder.ts @@ -1,565 +1,439 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-235 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - export interface AddOneDef { - add_one: (arg0: number, callParams: CallParams<'arg0'>) => number; - } - - export function registerAddOne(serviceId: string, service: AddOneDef): void; +export interface AddOneDef { + add_one: (arg0: number, callParams: CallParams<'arg0'>) => number | Promise; +} +export function registerAddOne(serviceId: string, service: AddOneDef): void; export function registerAddOne(peer: FluencePeer, serviceId: string, service: AddOneDef): void; - export function registerAddOne(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'add_one') { - - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.add_one(req.args[0], callParams) - - } - - - next(); - }); - } +export function registerAddOne(...args: any) { + registerService( + args, + { + "functions" : [ + { + "functionName" : "add_one", + "argDefs" : [ + { + "name" : "arg0", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); +} - export interface MyOpDef { - identity: (u: number, callParams: CallParams<'u'>) => void; - } - - export function registerMyOp(service: MyOpDef): void; +export interface MyOpDef { + identity: (u: number, callParams: CallParams<'u'>) => void | Promise; +} +export function registerMyOp(service: MyOpDef): void; export function registerMyOp(serviceId: string, service: MyOpDef): void; export function registerMyOp(peer: FluencePeer, service: MyOpDef): void; export function registerMyOp(peer: FluencePeer, serviceId: string, service: MyOpDef): void; - export function registerMyOp(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "op" +export function registerMyOp(...args: any) { + registerService( + args, + { + "defaultServiceId" : "op", + "functions" : [ + { + "functionName" : "identity", + "argDefs" : [ + { + "name" : "u", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'identity') { - - const callParams = { - ...req.particleContext, - tetraplets: { - u: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - service.identity(req.args[0], callParams); resp.result = {} - - } - - - next(); - }); - } - // Functions + - export function add_one(value: number, node: string, service_id: string, config?: {ttl?: number}) : Promise; - export function add_one(peer: FluencePeer, value: number, node: string, service_id: string, config?: {ttl?: number}) : Promise; - export function add_one(...args: any) { - let peer: FluencePeer; - let value: any; -let node: any; -let service_id: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - value = args[1]; -node = args[2]; -service_id = args[3]; -config = args[4]; - } else { - peer = Fluence.getPeer(); - value = args[0]; -node = args[1]; -service_id = args[2]; -config = args[3]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "value") [] value) - ) - (call %init_peer_id% ("getDataSrv" "node") [] node) - ) - (call %init_peer_id% ("getDataSrv" "service_id") [] service_id) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (seq - (call -relay- ("op" "noop") []) - (call node (service_id "add_one") [value] res) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [res]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) +export function add_one(value: number, node: string, service_id: string, config?: {ttl?: number}): Promise; +export function add_one(peer: FluencePeer, value: number, node: string, service_id: string, config?: {ttl?: number}): Promise; +export function add_one(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'value', () => {return value;}); -h.on('getDataSrv', 'node', () => {return node;}); -h.on('getDataSrv', 'service_id', () => {return service_id;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for add_one'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "value") [] value) + ) + (call %init_peer_id% ("getDataSrv" "node") [] node) + ) + (call %init_peer_id% ("getDataSrv" "service_id") [] service_id) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (seq + (call -relay- ("op" "noop") []) + (call node (service_id "add_one") [value] res) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [res]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "add_one", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "value", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "node", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "service_id", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + - export function add_one_three_times(value: number, ns_tuples: {node_id:string;service_id:string}[], config?: {ttl?: number}) : Promise; - export function add_one_three_times(peer: FluencePeer, value: number, ns_tuples: {node_id:string;service_id:string}[], config?: {ttl?: number}) : Promise; - export function add_one_three_times(...args: any) { - let peer: FluencePeer; - let value: any; -let ns_tuples: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - value = args[1]; -ns_tuples = args[2]; -config = args[3]; - } else { - peer = Fluence.getPeer(); - value = args[0]; -ns_tuples = args[1]; -config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "value") [] value) - ) - (call %init_peer_id% ("getDataSrv" "ns_tuples") [] ns_tuples) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (seq - (call -relay- ("op" "noop") []) - (call ns_tuples.$.[0].node_id! (ns_tuples.$.[0].service_id! "add_one") [value] res1) - ) - (seq - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - (call -relay- ("op" "noop") []) - ) - ) - ) - (xor - (call ns_tuples.$.[1].node_id! (ns_tuples.$.[1].service_id! "add_one") [res1] res2) - (seq - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - (call -relay- ("op" "noop") []) - ) - ) - ) - (xor - (call ns_tuples.$.[2].node_id! (ns_tuples.$.[2].service_id! "add_one") [res2] res3) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [res3]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) -) +export function add_one_three_times(value: number, ns_tuples: { node_id: string; service_id: string; }[], config?: {ttl?: number}): Promise; +export function add_one_three_times(peer: FluencePeer, value: number, ns_tuples: { node_id: string; service_id: string; }[], config?: {ttl?: number}): Promise; +export function add_one_three_times(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'value', () => {return value;}); -h.on('getDataSrv', 'ns_tuples', () => {return ns_tuples;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for add_one_three_times'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "value") [] value) + ) + (call %init_peer_id% ("getDataSrv" "ns_tuples") [] ns_tuples) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (seq + (call -relay- ("op" "noop") []) + (call ns_tuples.$.[0].node_id! (ns_tuples.$.[0].service_id! "add_one") [value] res1) + ) + (seq + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + (call -relay- ("op" "noop") []) + ) + ) + ) + (xor + (call ns_tuples.$.[1].node_id! (ns_tuples.$.[1].service_id! "add_one") [res1] res2) + (seq + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + (call -relay- ("op" "noop") []) + ) + ) + ) + (xor + (call ns_tuples.$.[2].node_id! (ns_tuples.$.[2].service_id! "add_one") [res2] res3) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [res3]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) + ) + ` + return callFunction( + args, + { + "functionName" : "add_one_three_times", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "value", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "ns_tuples", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + - export function add_one_par(value: number, ns_tuples: {node_id:string;service_id:string}[], config?: {ttl?: number}) : Promise; - export function add_one_par(peer: FluencePeer, value: number, ns_tuples: {node_id:string;service_id:string}[], config?: {ttl?: number}) : Promise; - export function add_one_par(...args: any) { - let peer: FluencePeer; - let value: any; -let ns_tuples: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - value = args[1]; -ns_tuples = args[2]; -config = args[3]; - } else { - peer = Fluence.getPeer(); - value = args[0]; -ns_tuples = args[1]; -config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "value") [] value) - ) - (call %init_peer_id% ("getDataSrv" "ns_tuples") [] ns_tuples) - ) - (fold ns_tuples ns - (par - (seq - (seq - (seq - (call -relay- ("op" "noop") []) - (xor - (seq - (call -relay- ("op" "noop") []) - (call ns.$.node_id! (ns.$.service_id! "add_one") [value] $res) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (call %init_peer_id% ("op" "noop") []) - ) - (next ns) - ) - ) - ) - (call %init_peer_id% ("op" "identity") [$res.$.[2]!]) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [$res]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) +export function add_one_par(value: number, ns_tuples: { node_id: string; service_id: string; }[], config?: {ttl?: number}): Promise; +export function add_one_par(peer: FluencePeer, value: number, ns_tuples: { node_id: string; service_id: string; }[], config?: {ttl?: number}): Promise; +export function add_one_par(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'value', () => {return value;}); -h.on('getDataSrv', 'ns_tuples', () => {return ns_tuples;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for add_one_par'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "value") [] value) + ) + (call %init_peer_id% ("getDataSrv" "ns_tuples") [] ns_tuples) + ) + (fold ns_tuples ns + (par + (seq + (seq + (seq + (call -relay- ("op" "noop") []) + (xor + (seq + (call -relay- ("op" "noop") []) + (call ns.$.node_id! (ns.$.service_id! "add_one") [value] $res) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (call %init_peer_id% ("op" "noop") []) + ) + (next ns) + ) + ) + ) + (call %init_peer_id% ("op" "identity") [$res.$.[2]!]) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$res]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "add_one_par", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "value", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "ns_tuples", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - + - export function add_one_par_alt(payload: {node_id:string;service_id:string;value:number}[], config?: {ttl?: number}) : Promise; - export function add_one_par_alt(peer: FluencePeer, payload: {node_id:string;service_id:string;value:number}[], config?: {ttl?: number}) : Promise; - export function add_one_par_alt(...args: any) { - let peer: FluencePeer; - let payload: any; - let config: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - payload = args[1]; -config = args[2]; - } else { - peer = Fluence.getPeer(); - payload = args[0]; -config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("getDataSrv" "payload") [] payload) - ) - (fold payload vns - (par - (seq - (seq - (seq - (call -relay- ("op" "noop") []) - (xor - (seq - (call -relay- ("op" "noop") []) - (call vns.$.node_id! (vns.$.service_id! "add_one") [vns.$.value!] $res) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - ) - (call -relay- ("op" "noop") []) - ) - (call %init_peer_id% ("op" "noop") []) - ) - (next vns) - ) - ) - ) - (call %init_peer_id% ("op" "identity") [$res.$.[2]!]) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [$res]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) -) +export function add_one_par_alt(payload: { node_id: string; service_id: string; value: number; }[], config?: {ttl?: number}): Promise; +export function add_one_par_alt(peer: FluencePeer, payload: { node_id: string; service_id: string; value: number; }[], config?: {ttl?: number}): Promise; +export function add_one_par_alt(...args: any) { - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'payload', () => {return payload;}); - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for add_one_par_alt'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) + let script = ` + (xor + (seq + (seq + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("getDataSrv" "payload") [] payload) + ) + (fold payload vns + (par + (seq + (seq + (seq + (call -relay- ("op" "noop") []) + (xor + (seq + (call -relay- ("op" "noop") []) + (call vns.$.node_id! (vns.$.service_id! "add_one") [vns.$.value!] $res) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + ) + (call -relay- ("op" "noop") []) + ) + (call %init_peer_id% ("op" "noop") []) + ) + (next vns) + ) + ) + ) + (call %init_peer_id% ("op" "identity") [$res.$.[2]!]) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$res]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) + ) + ` + return callFunction( + args, + { + "functionName" : "add_one_par_alt", + "returnType" : { + "tag" : "primitive" + }, + "argDefs" : [ + { + "name" : "payload", + "argType" : { + "tag" : "primitive" + } } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; + ], + "names" : { + "relay" : "-relay-", + "getDataSrv" : "getDataSrv", + "callbackSrv" : "callbackSrv", + "responseSrv" : "callbackSrv", + "responseFnName" : "response", + "errorHandlingSrv" : "errorHandlingSrv", + "errorFnName" : "error" + } +}, + script + ) } - diff --git a/quickstart/4-composing-services-with-aqua/client-peer/src/compiled-aqua/builtin.ts b/quickstart/4-composing-services-with-aqua/client-peer/src/compiled-aqua/builtin.ts index 4a33ab1..b684b03 100644 --- a/quickstart/4-composing-services-with-aqua/client-peer/src/compiled-aqua/builtin.ts +++ b/quickstart/4-composing-services-with-aqua/client-peer/src/compiled-aqua/builtin.ts @@ -1,921 +1,801 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * 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.3.0-226 + * Aqua version: 0.4.0-235 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { - ResultCodes, - RequestFlow, - RequestFlowBuilder, CallParams, -} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + callFunction, + registerService, +} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2'; // Services - export interface SrvDef { - add_alias: (alias: string, service_id: string, callParams: CallParams<'alias' | 'service_id'>) => void; -create: (blueprint_id: string, callParams: CallParams<'blueprint_id'>) => string; -get_interface: (service_id: string, callParams: CallParams<'service_id'>) => {function_signatures:{arguments:string[][];name:string;output_types:string[]}[];record_types:{fields:string[][];id:number;name:string}[]}; -list: (callParams: CallParams) => {blueprint_id:string;id:string;owner_id:string}[]; -remove: (service_id: string, callParams: CallParams<'service_id'>) => void; -resolve_alias: (alias: string, callParams: CallParams<'alias'>) => string; - } - - export function registerSrv(service: SrvDef): void; +export interface SrvDef { + add_alias: (alias: string, service_id: string, callParams: CallParams<'alias' | 'service_id'>) => void | Promise; +create: (blueprint_id: string, callParams: CallParams<'blueprint_id'>) => string | Promise; +get_interface: (service_id: string, callParams: CallParams<'service_id'>) => { function_signatures: { arguments: string[][]; name: string; output_types: string[]; }[]; record_types: { fields: string[][]; id: number; name: string; }[]; } | Promise<{ function_signatures: { arguments: string[][]; name: string; output_types: string[]; }[]; record_types: { fields: string[][]; id: number; name: string; }[]; }>; +list: (callParams: CallParams) => { blueprint_id: string; id: string; owner_id: string; }[] | Promise<{ blueprint_id: string; id: string; owner_id: string; }[]>; +remove: (service_id: string, callParams: CallParams<'service_id'>) => void | Promise; +resolve_alias: (alias: string, callParams: CallParams<'alias'>) => string | Promise; +} +export function registerSrv(service: SrvDef): void; export function registerSrv(serviceId: string, service: SrvDef): void; export function registerSrv(peer: FluencePeer, service: SrvDef): void; export function registerSrv(peer: FluencePeer, serviceId: string, service: SrvDef): void; - export function registerSrv(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "srv" +export function registerSrv(...args: any) { + registerService( + args, + { + "defaultServiceId" : "srv", + "functions" : [ + { + "functionName" : "add_alias", + "argDefs" : [ + { + "name" : "alias", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "service_id", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + }, + { + "functionName" : "create", + "argDefs" : [ + { + "name" : "blueprint_id", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "get_interface", + "argDefs" : [ + { + "name" : "service_id", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "list", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "remove", + "argDefs" : [ + { + "name" : "service_id", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "void" + } + }, + { + "functionName" : "resolve_alias", + "argDefs" : [ + { + "name" : "alias", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'add_alias') { - - const callParams = { - ...req.particleContext, - tetraplets: { - alias: req.tetraplets[0],service_id: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - service.add_alias(req.args[0], req.args[1], callParams); resp.result = {} - - } - - - - if (req.fnName === 'create') { - - const callParams = { - ...req.particleContext, - tetraplets: { - blueprint_id: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.create(req.args[0], callParams) - - } - - - - if (req.fnName === 'get_interface') { - - const callParams = { - ...req.particleContext, - tetraplets: { - service_id: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.get_interface(req.args[0], callParams) - - } - - - - if (req.fnName === 'list') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.list(callParams) - - } - - - - if (req.fnName === 'remove') { - - const callParams = { - ...req.particleContext, - tetraplets: { - service_id: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - service.remove(req.args[0], callParams); resp.result = {} - - } - - - - if (req.fnName === 'resolve_alias') { - - const callParams = { - ...req.particleContext, - tetraplets: { - alias: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.resolve_alias(req.args[0], callParams) - - } - - - next(); - }); - } - export interface PeerDef { - connect: (id: string, multiaddrs: string[] | null, callParams: CallParams<'id' | 'multiaddrs'>) => boolean; -get_contact: (peer: string, callParams: CallParams<'peer'>) => {addresses:string[];peer_id:string}; -identify: (callParams: CallParams) => {external_addresses:string[]}; -is_connected: (peer: string, callParams: CallParams<'peer'>) => boolean; -timestamp_ms: (callParams: CallParams) => number; -timestamp_sec: (callParams: CallParams) => number; - } - - export function registerPeer(service: PeerDef): void; +export interface PeerDef { + connect: (id: string, multiaddrs: string[] | null, callParams: CallParams<'id' | 'multiaddrs'>) => boolean | Promise; +get_contact: (peer: string, callParams: CallParams<'peer'>) => { addresses: string[]; peer_id: string; } | Promise<{ addresses: string[]; peer_id: string; }>; +identify: (callParams: CallParams) => { external_addresses: string[]; } | Promise<{ external_addresses: string[]; }>; +is_connected: (peer: string, callParams: CallParams<'peer'>) => boolean | Promise; +timestamp_ms: (callParams: CallParams) => number | Promise; +timestamp_sec: (callParams: CallParams) => number | Promise; +} +export function registerPeer(service: PeerDef): void; export function registerPeer(serviceId: string, service: PeerDef): void; export function registerPeer(peer: FluencePeer, service: PeerDef): void; export function registerPeer(peer: FluencePeer, serviceId: string, service: PeerDef): void; - export function registerPeer(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "peer" +export function registerPeer(...args: any) { + registerService( + args, + { + "defaultServiceId" : "peer", + "functions" : [ + { + "functionName" : "connect", + "argDefs" : [ + { + "name" : "id", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "multiaddrs", + "argType" : { + "tag" : "optional" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "get_contact", + "argDefs" : [ + { + "name" : "peer", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "identify", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "is_connected", + "argDefs" : [ + { + "name" : "peer", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "timestamp_ms", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "timestamp_sec", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'connect') { - - const callParams = { - ...req.particleContext, - tetraplets: { - id: req.tetraplets[0],multiaddrs: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.connect(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], callParams) - - } - - - - if (req.fnName === 'get_contact') { - - const callParams = { - ...req.particleContext, - tetraplets: { - peer: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.get_contact(req.args[0], callParams) - - } - - - - if (req.fnName === 'identify') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.identify(callParams) - - } - - - - if (req.fnName === 'is_connected') { - - const callParams = { - ...req.particleContext, - tetraplets: { - peer: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.is_connected(req.args[0], callParams) - - } - - - - if (req.fnName === 'timestamp_ms') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.timestamp_ms(callParams) - - } - - - - if (req.fnName === 'timestamp_sec') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.timestamp_sec(callParams) - - } - - - next(); - }); - } - export interface OpDef { - array: (a: string, b: string | null, c: string | null, d: string | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[]; -array_length: (array: string[], callParams: CallParams<'array'>) => number; -bytes_from_b58: (b: string, callParams: CallParams<'b'>) => number[]; -bytes_to_b58: (bs: number[], callParams: CallParams<'bs'>) => string; -concat: (a: string[], b: string[] | null, c: string[] | null, d: string[] | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[]; -concat_strings: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string; -identity: (s: string | null, callParams: CallParams<'s'>) => string | null; -noop: (callParams: CallParams) => void; -sha256_string: (s: string, callParams: CallParams<'s'>) => string; -string_from_b58: (b: string, callParams: CallParams<'b'>) => string; -string_to_b58: (s: string, callParams: CallParams<'s'>) => string; - } - - export function registerOp(service: OpDef): void; +export interface OpDef { + array: (a: string, b: string | null, c: string | null, d: string | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[] | Promise; +array_length: (array: string[], callParams: CallParams<'array'>) => number | Promise; +bytes_from_b58: (b: string, callParams: CallParams<'b'>) => number[] | Promise; +bytes_to_b58: (bs: number[], callParams: CallParams<'bs'>) => string | Promise; +concat: (a: string[], b: string[] | null, c: string[] | null, d: string[] | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[] | Promise; +concat_strings: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string | Promise; +identity: (s: string | null, callParams: CallParams<'s'>) => string | null | Promise; +noop: (callParams: CallParams) => void | Promise; +sha256_string: (s: string, callParams: CallParams<'s'>) => string | Promise; +string_from_b58: (b: string, callParams: CallParams<'b'>) => string | Promise; +string_to_b58: (s: string, callParams: CallParams<'s'>) => string | Promise; +} +export function registerOp(service: OpDef): void; export function registerOp(serviceId: string, service: OpDef): void; export function registerOp(peer: FluencePeer, service: OpDef): void; export function registerOp(peer: FluencePeer, serviceId: string, service: OpDef): void; - export function registerOp(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "op" +export function registerOp(...args: any) { + registerService( + args, + { + "defaultServiceId" : "op", + "functions" : [ + { + "functionName" : "array", + "argDefs" : [ + { + "name" : "a", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "b", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "c", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "d", + "argType" : { + "tag" : "optional" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "array_length", + "argDefs" : [ + { + "name" : "array", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "bytes_from_b58", + "argDefs" : [ + { + "name" : "b", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "bytes_to_b58", + "argDefs" : [ + { + "name" : "bs", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "concat", + "argDefs" : [ + { + "name" : "a", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "b", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "c", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "d", + "argType" : { + "tag" : "optional" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "concat_strings", + "argDefs" : [ + { + "name" : "a", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "b", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "identity", + "argDefs" : [ + { + "name" : "s", + "argType" : { + "tag" : "optional" + } + } + ], + "returnType" : { + "tag" : "optional" + } + }, + { + "functionName" : "noop", + "argDefs" : [ + ], + "returnType" : { + "tag" : "void" + } + }, + { + "functionName" : "sha256_string", + "argDefs" : [ + { + "name" : "s", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "string_from_b58", + "argDefs" : [ + { + "name" : "b", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "string_to_b58", + "argDefs" : [ + { + "name" : "s", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'array') { - - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0],b: req.tetraplets[1],c: req.tetraplets[2],d: req.tetraplets[3] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.array(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], req.args[3].length === 0 ? null : req.args[3][0], callParams) - - } - - - - if (req.fnName === 'array_length') { - - const callParams = { - ...req.particleContext, - tetraplets: { - array: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.array_length(req.args[0], callParams) - - } - - - - if (req.fnName === 'bytes_from_b58') { - - const callParams = { - ...req.particleContext, - tetraplets: { - b: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.bytes_from_b58(req.args[0], callParams) - - } - - - - if (req.fnName === 'bytes_to_b58') { - - const callParams = { - ...req.particleContext, - tetraplets: { - bs: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.bytes_to_b58(req.args[0], callParams) - - } - - - - if (req.fnName === 'concat') { - - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0],b: req.tetraplets[1],c: req.tetraplets[2],d: req.tetraplets[3] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.concat(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], req.args[3].length === 0 ? null : req.args[3][0], callParams) - - } - - - - if (req.fnName === 'concat_strings') { - - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0],b: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.concat_strings(req.args[0], req.args[1], callParams) - - } - - - - if (req.fnName === 'identity') { - - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - - var respResult = service.identity(req.args[0].length === 0 ? null : req.args[0][0], callParams); - resp.result = respResult === null ? [] : [respResult] - - - } - - - - if (req.fnName === 'noop') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - service.noop(callParams); resp.result = {} - - } - - - - if (req.fnName === 'sha256_string') { - - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.sha256_string(req.args[0], callParams) - - } - - - - if (req.fnName === 'string_from_b58') { - - const callParams = { - ...req.particleContext, - tetraplets: { - b: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.string_from_b58(req.args[0], callParams) - - } - - - - if (req.fnName === 'string_to_b58') { - - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.string_to_b58(req.args[0], callParams) - - } - - - next(); - }); - } - export interface KademliaDef { - merge: (target: string, left: string[], right: string[], count: number | null, callParams: CallParams<'target' | 'left' | 'right' | 'count'>) => string[]; -neighborhood: (key: string, already_hashed: boolean | null, count: number | null, callParams: CallParams<'key' | 'already_hashed' | 'count'>) => string[]; - } - - export function registerKademlia(service: KademliaDef): void; +export interface KademliaDef { + merge: (target: string, left: string[], right: string[], count: number | null, callParams: CallParams<'target' | 'left' | 'right' | 'count'>) => string[] | Promise; +neighborhood: (key: string, already_hashed: boolean | null, count: number | null, callParams: CallParams<'key' | 'already_hashed' | 'count'>) => string[] | Promise; +} +export function registerKademlia(service: KademliaDef): void; export function registerKademlia(serviceId: string, service: KademliaDef): void; export function registerKademlia(peer: FluencePeer, service: KademliaDef): void; export function registerKademlia(peer: FluencePeer, serviceId: string, service: KademliaDef): void; - export function registerKademlia(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "kad" +export function registerKademlia(...args: any) { + registerService( + args, + { + "defaultServiceId" : "kad", + "functions" : [ + { + "functionName" : "merge", + "argDefs" : [ + { + "name" : "target", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "left", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "right", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "count", + "argType" : { + "tag" : "optional" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "neighborhood", + "argDefs" : [ + { + "name" : "key", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "already_hashed", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "count", + "argType" : { + "tag" : "optional" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'merge') { - - const callParams = { - ...req.particleContext, - tetraplets: { - target: req.tetraplets[0],left: req.tetraplets[1],right: req.tetraplets[2],count: req.tetraplets[3] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.merge(req.args[0], req.args[1], req.args[2], req.args[3].length === 0 ? null : req.args[3][0], callParams) - - } - - - - if (req.fnName === 'neighborhood') { - - const callParams = { - ...req.particleContext, - tetraplets: { - key: req.tetraplets[0],already_hashed: req.tetraplets[1],count: req.tetraplets[2] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.neighborhood(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], callParams) - - } - - - next(); - }); - } - export interface ScriptDef { - add: (air_script: string, interval: string | null, callParams: CallParams<'air_script' | 'interval'>) => string; -list: (callParams: CallParams) => {failures:number;id:string;interval:string;owner:string;src:string}; -remove: (script_id: string, callParams: CallParams<'script_id'>) => boolean; - } - - export function registerScript(service: ScriptDef): void; +export interface ScriptDef { + add: (air_script: string, interval: string | null, callParams: CallParams<'air_script' | 'interval'>) => string | Promise; +list: (callParams: CallParams) => { failures: number; id: string; interval: string; owner: string; src: string; } | Promise<{ failures: number; id: string; interval: string; owner: string; src: string; }>; +remove: (script_id: string, callParams: CallParams<'script_id'>) => boolean | Promise; +} +export function registerScript(service: ScriptDef): void; export function registerScript(serviceId: string, service: ScriptDef): void; export function registerScript(peer: FluencePeer, service: ScriptDef): void; export function registerScript(peer: FluencePeer, serviceId: string, service: ScriptDef): void; - export function registerScript(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "script" +export function registerScript(...args: any) { + registerService( + args, + { + "defaultServiceId" : "script", + "functions" : [ + { + "functionName" : "add", + "argDefs" : [ + { + "name" : "air_script", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "interval", + "argType" : { + "tag" : "optional" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "list", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "remove", + "argDefs" : [ + { + "name" : "script_id", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'add') { - - const callParams = { - ...req.particleContext, - tetraplets: { - air_script: req.tetraplets[0],interval: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.add(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], callParams) - - } - - - - if (req.fnName === 'list') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.list(callParams) - - } - - - - if (req.fnName === 'remove') { - - const callParams = { - ...req.particleContext, - tetraplets: { - script_id: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.remove(req.args[0], callParams) - - } - - - next(); - }); - } - export interface DistDef { - add_blueprint: (blueprint: {dependencies:string[];name:string}, callParams: CallParams<'blueprint'>) => string; -add_module: (wasm_b56_content: number[], conf: {name:string}, callParams: CallParams<'wasm_b56_content' | 'conf'>) => string; -add_module_from_vault: (path: string, config: {name:string}, callParams: CallParams<'path' | 'config'>) => string; -default_module_config: (module_name: string, callParams: CallParams<'module_name'>) => {name:string}; -get_interface: (module_id: string, callParams: CallParams<'module_id'>) => {function_signatures:{arguments:string[][];name:string;output_types:string[]}[];record_types:{fields:string[][];id:number;name:string}[]}; -list_blueprints: (callParams: CallParams) => {dependencies:string[];id:string;name:string}[]; -list_modules: (callParams: CallParams) => {config:{name:string};hash:string;name:string}[]; -make_blueprint: (name: string, dependencies: string[], callParams: CallParams<'name' | 'dependencies'>) => {dependencies:string[];name:string}; -make_module_config: (name: string, mem_pages_count: number | null, logger_enabled: boolean | null, preopened_files: string[] | null, envs: string[][] | null, mapped_dirs: string[][] | null, mounted_binaries: string[][] | null, logging_mask: number | null, callParams: CallParams<'name' | 'mem_pages_count' | 'logger_enabled' | 'preopened_files' | 'envs' | 'mapped_dirs' | 'mounted_binaries' | 'logging_mask'>) => {name:string}; - } - - export function registerDist(service: DistDef): void; +export interface DistDef { + add_blueprint: (blueprint: { dependencies: string[]; name: string; }, callParams: CallParams<'blueprint'>) => string | Promise; +add_module: (wasm_b56_content: number[], conf: { name: string; }, callParams: CallParams<'wasm_b56_content' | 'conf'>) => string | Promise; +add_module_from_vault: (path: string, config: { name: string; }, callParams: CallParams<'path' | 'config'>) => string | Promise; +default_module_config: (module_name: string, callParams: CallParams<'module_name'>) => { name: string; } | Promise<{ name: string; }>; +get_interface: (module_id: string, callParams: CallParams<'module_id'>) => { function_signatures: { arguments: string[][]; name: string; output_types: string[]; }[]; record_types: { fields: string[][]; id: number; name: string; }[]; } | Promise<{ function_signatures: { arguments: string[][]; name: string; output_types: string[]; }[]; record_types: { fields: string[][]; id: number; name: string; }[]; }>; +list_blueprints: (callParams: CallParams) => { dependencies: string[]; id: string; name: string; }[] | Promise<{ dependencies: string[]; id: string; name: string; }[]>; +list_modules: (callParams: CallParams) => { config: { name: string; }; hash: string; name: string; }[] | Promise<{ config: { name: string; }; hash: string; name: string; }[]>; +make_blueprint: (name: string, dependencies: string[], callParams: CallParams<'name' | 'dependencies'>) => { dependencies: string[]; name: string; } | Promise<{ dependencies: string[]; name: string; }>; +make_module_config: (name: string, mem_pages_count: number | null, logger_enabled: boolean | null, preopened_files: string[] | null, envs: string[][] | null, mapped_dirs: string[][] | null, mounted_binaries: string[][] | null, logging_mask: number | null, callParams: CallParams<'name' | 'mem_pages_count' | 'logger_enabled' | 'preopened_files' | 'envs' | 'mapped_dirs' | 'mounted_binaries' | 'logging_mask'>) => { name: string; } | Promise<{ name: string; }>; +} +export function registerDist(service: DistDef): void; export function registerDist(serviceId: string, service: DistDef): void; export function registerDist(peer: FluencePeer, service: DistDef): void; export function registerDist(peer: FluencePeer, serviceId: string, service: DistDef): void; - export function registerDist(...args: any) { - let peer: FluencePeer; - let serviceId: any; - let service: any; - if (FluencePeer.isInstance(args[0])) { - peer = args[0]; - } else { - peer = Fluence.getPeer(); - } + - if (typeof args[0] === 'string') { - serviceId = args[0]; - } else if (typeof args[1] === 'string') { - serviceId = args[1]; - } - else { - serviceId = "dist" +export function registerDist(...args: any) { + registerService( + args, + { + "defaultServiceId" : "dist", + "functions" : [ + { + "functionName" : "add_blueprint", + "argDefs" : [ + { + "name" : "blueprint", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "add_module", + "argDefs" : [ + { + "name" : "wasm_b56_content", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "conf", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "add_module_from_vault", + "argDefs" : [ + { + "name" : "path", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "config", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "default_module_config", + "argDefs" : [ + { + "name" : "module_name", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "get_interface", + "argDefs" : [ + { + "name" : "module_id", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "list_blueprints", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "list_modules", + "argDefs" : [ + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "make_blueprint", + "argDefs" : [ + { + "name" : "name", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "dependencies", + "argType" : { + "tag" : "primitive" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + }, + { + "functionName" : "make_module_config", + "argDefs" : [ + { + "name" : "name", + "argType" : { + "tag" : "primitive" + } + }, + { + "name" : "mem_pages_count", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "logger_enabled", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "preopened_files", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "envs", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "mapped_dirs", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "mounted_binaries", + "argType" : { + "tag" : "optional" + } + }, + { + "name" : "logging_mask", + "argType" : { + "tag" : "optional" + } + } + ], + "returnType" : { + "tag" : "primitive" + } + } + ] +} + ); } - - // Figuring out which overload is the service. - // If the first argument is not Fluence Peer and it is an object, then it can only be the service def - // If the first argument is peer, we are checking further. The second argument might either be - // an object, that it must be the service object - // or a string, which is the service id. In that case the service is the third argument - if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { - service = args[0]; - } else if (typeof args[1] === 'object') { - service = args[1]; - } else { - service = args[2]; - } - - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } - - - if (req.fnName === 'add_blueprint') { - - const callParams = { - ...req.particleContext, - tetraplets: { - blueprint: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.add_blueprint(req.args[0], callParams) - - } - - - - if (req.fnName === 'add_module') { - - const callParams = { - ...req.particleContext, - tetraplets: { - wasm_b56_content: req.tetraplets[0],conf: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.add_module(req.args[0], req.args[1], callParams) - - } - - - - if (req.fnName === 'add_module_from_vault') { - - const callParams = { - ...req.particleContext, - tetraplets: { - path: req.tetraplets[0],config: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.add_module_from_vault(req.args[0], req.args[1], callParams) - - } - - - - if (req.fnName === 'default_module_config') { - - const callParams = { - ...req.particleContext, - tetraplets: { - module_name: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.default_module_config(req.args[0], callParams) - - } - - - - if (req.fnName === 'get_interface') { - - const callParams = { - ...req.particleContext, - tetraplets: { - module_id: req.tetraplets[0] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.get_interface(req.args[0], callParams) - - } - - - - if (req.fnName === 'list_blueprints') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.list_blueprints(callParams) - - } - - - - if (req.fnName === 'list_modules') { - - const callParams = { - ...req.particleContext, - tetraplets: { - - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.list_modules(callParams) - - } - - - - if (req.fnName === 'make_blueprint') { - - const callParams = { - ...req.particleContext, - tetraplets: { - name: req.tetraplets[0],dependencies: req.tetraplets[1] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.make_blueprint(req.args[0], req.args[1], callParams) - - } - - - - if (req.fnName === 'make_module_config') { - - const callParams = { - ...req.particleContext, - tetraplets: { - name: req.tetraplets[0],mem_pages_count: req.tetraplets[1],logger_enabled: req.tetraplets[2],preopened_files: req.tetraplets[3],envs: req.tetraplets[4],mapped_dirs: req.tetraplets[5],mounted_binaries: req.tetraplets[6],logging_mask: req.tetraplets[7] - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.make_module_config(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], req.args[3].length === 0 ? null : req.args[3][0], req.args[4].length === 0 ? null : req.args[4][0], req.args[5].length === 0 ? null : req.args[5][0], req.args[6].length === 0 ? null : req.args[6][0], req.args[7].length === 0 ? null : req.args[7][0], callParams) - - } - - - next(); - }); - } - // Functions