From 502b692ef965cc97e51b6ac0cc77c67226897634 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Fri, 22 Oct 2021 09:31:01 +0300 Subject: [PATCH] update aqua-ipfs examples --- .../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 +- 7 files changed, 1339 insertions(+), 1431 deletions(-) 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",