Update all js-related examples to the latest version of JS SDK and Aqua compiler (#20)

aqua-examples/aqua-ipfs-integration/README.md

@@ -1,30 +1,37 @@
 # IPFS code execution example
+
 This example showcases 2 things:
+
 1. how it's possible to store .wasm modules on IPFS, then deploy them to Fluence as a service
 2. ability to process IPFS files via a Fluence service. In this example, we get a size of a file
 
 ## Learn about AquaIPFS
+
 See [Aqua Book](https://doc.fluence.dev/aqua-book/libraries/aqua-ipfs).
 
 ## How to run & use this example
+
+You need npm v7 or later to run the examples
+
 ### Web example
+
 1. Run it
+
 ```
-cd web
 npm i
-npm start
+npm start -w web
 ```
 
 2. Press "deploy"
 3. Copy WASM service CID and press "get_size"
 
 ### NodeJS example
+
 ```
-cd nodejs
 npm i
-npm start
+npm start -w nodejs
 ```
 
 ## Aqua implementation
-The business logic is implemented in Aqua in [process.aqua](aqua/aqua/process.aqua)
 
+The business logic is implemented in Aqua in [process.aqua](aqua/aqua/process.aqua)

aqua-examples/aqua-ipfs-integration/aqua/aqua/exports.aqua

@@ -0,0 +1,5 @@
+module Exports
+
+import "@fluencelabs/aqua-ipfs/ipfs-api.aqua"
+
+export set_timeout, get_external_swarm_multiaddr, get_external_api_multiaddr

aqua-examples/aqua-ipfs-integration/aqua/aqua/process_files.aqua

@@ -1,3 +1,5 @@
+module ProcessFiles declares *
+
 data SizeResult:
   size: u32
   success: bool

aqua-examples/aqua-ipfs-integration/aqua/package.json

@@ -4,8 +4,8 @@
   "description": "An example of executing WASM code from IPFS over IPFS files",
   "main": "dist/index.js",
   "scripts": {
-    "postinstall": "../service/scripts/build.sh && npm run build",
-    "compile-aqua": "aqua -i aqua -o src",
+    "postinstall": "../service/scripts/build.sh",
+    "compile-aqua": "aqua -m ../node_modules -i aqua -o src",
     "build": "npm run compile-aqua && tsc"
   },
   "keywords": [
@@ -22,16 +22,16 @@
   "license": "MIT",
   "dependencies": {
     "@fluencelabs/aqua-ipfs": "0.4.2",
-    "@fluencelabs/fluence": "0.10.1",
     "@fluencelabs/aqua-lib": "0.1.14",
+    "@fluencelabs/fluence": "0.12.0",
     "@fluencelabs/fluence-network-environment": "1.0.10",
     "ipfs-http-client": "^50.1.2",
     "it-all": "^1.0.5",
-    "uint8arrays": "^2.1.5",
-    "multiaddr": "^10.0.0"
+    "multiaddr": "^10.0.0",
+    "uint8arrays": "^2.1.5"
   },
   "devDependencies": {
-    "typescript": "^3.9.5",
-    "@fluencelabs/aqua": "0.2.2-221"
+    "@fluencelabs/aqua": "^0.3.0-226",
+    "typescript": "^3.9.5"
   }
 }

aqua-examples/aqua-ipfs-integration/aqua/src/exports.ts

@@ -0,0 +1,706 @@
+/**
+ *
+ * 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
+ *
+ */
+import { Fluence, FluencePeer } from '@fluencelabs/fluence';
+import {
+    ResultCodes,
+    RequestFlow,
+    RequestFlowBuilder,
+    CallParams,
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
+
+
+// Services
+
+
+// Functions
+
+ export function set_timeout(node: string, timeout_sec: number, config?: {ttl?: number}) : Promise<void>;
+ export function set_timeout(peer: FluencePeer, node: string, timeout_sec: number, config?: {ttl?: number}) : Promise<void>;
+ 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<void>((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])
+ )
+)
+
+                 `,
+                 )
+                 .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)
+        }
+        request = r.build();
+    });
+    peer.internals.initiateFlow(request!);
+    return Promise.race([promise, Promise.resolve()]);
+}
+      
+
+
+ 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<string | null>;
+ 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<string | null>;
+ 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<string | null>((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])
+)
+
+                 `,
+                 )
+                 .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)
+        }
+        request = r.build();
+    });
+    peer.internals.initiateFlow(request!);
+    return promise;
+}
+      
+
+
+ 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)
+        }
+        request = r.build();
+    });
+    peer.internals.initiateFlow(request!);
+    return promise;
+}
+      
+
+
+ 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)
+        }
+        request = r.build();
+    });
+    peer.internals.initiateFlow(request!);
+    return promise;
+}
+      
+
+
+ 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)
+        }
+        request = r.build();
+    });
+    peer.internals.initiateFlow(request!);
+    return promise;
+}
+      
+
+
+ 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)
+        }
+        request = r.build();
+    });
+    peer.internals.initiateFlow(request!);
+    return promise;
+}
+      
+
+
+ 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)
+        }
+        request = r.build();
+    });
+    peer.internals.initiateFlow(request!);
+    return promise;
+}
+      

aqua-examples/aqua-ipfs-integration/aqua/src/index.ts

@@ -1 +1,2 @@
-export * from './process'
+export * from "./process";
+export * from "./exports";

aqua-examples/aqua-ipfs-integration/aqua/src/process.ts

@@ -3,34 +3,111 @@
  * 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.2.2-221
+ * Aqua version: 0.3.0-226
  *
  */
-import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
-import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
-import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+import { Fluence, FluencePeer } from '@fluencelabs/fluence';
+import {
+    ResultCodes,
+    RequestFlow,
+    RequestFlowBuilder,
+    CallParams,
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
 
 
 // Services
 
-//StringOp
-//defaultId = "op"
+ export interface StringOpDef {
+     array: (s: string, callParams: CallParams<'s'>) => string[];
+ }
 
-//array: (s: string) => string[]
-//END StringOp
+ 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"
+}
 
+    // 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 async function add_blueprint(client: FluenceClient, module_hash: string, config?: {ttl?: number}): Promise<string> {
-    let request: RequestFlow;
-    const promise = new Promise<string>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
+ export function add_blueprint(module_hash: string, config?: {ttl?: number}) : Promise<string>;
+ export function add_blueprint(peer: FluencePeer, module_hash: string, config?: {ttl?: number}) : Promise<string>;
+ 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<string>((resolve, reject) => {
+         const r = new RequestFlowBuilder()
+                 .disableInjections()
+                 .withRawScript(
+                     `
+     (xor
  (seq
   (seq
    (seq
@@ -56,11 +133,11 @@ export async function add_blueprint(client: FluenceClient, module_hash: string,
  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
 )
 
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
+                 `,
+                 )
+                 .configHandler((h) => {
+                     h.on('getDataSrv', '-relay-', () => {
+                    return peer.getStatus().relayPeerId;
                 });
                 h.on('getDataSrv', 'module_hash', () => {return module_hash;});
                 h.onEvent('callbackSrv', 'response', (args) => {
@@ -69,7 +146,6 @@ export async function add_blueprint(client: FluenceClient, module_hash: string,
 });
 
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
                     const [err] = args;
                     reject(err);
                 });
@@ -83,20 +159,50 @@ export async function add_blueprint(client: FluenceClient, module_hash: string,
         }
         request = r.build();
     });
-    await client.initiateFlow(request!);
+    peer.internals.initiateFlow(request!);
     return promise;
 }
       
 
 
-export async function put_file_size(client: FluenceClient, relay: string, cid: string, ipfs: string, service_id: string, logSize: (arg0: number) => void, error: (arg0: string, arg1: string) => void, config?: {ttl?: number}): Promise<{error:string;hash:string;success:boolean} | null> {
-    let request: RequestFlow;
-    const promise = new Promise<{error:string;hash:string;success:boolean} | null>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
+ 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
@@ -218,18 +324,50 @@ export async function put_file_size(client: FluenceClient, relay: string, cid: s
  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 10])
 )
 
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
+                 `,
+                 )
+                 .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.on('callbackSrv', 'logSize', (args) => {logSize(args[0]); return {};});
-h.on('callbackSrv', 'error', (args) => {error(args[0], args[1]); return {};});
+
+ 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)) {
@@ -240,7 +378,6 @@ h.on('callbackSrv', 'error', (args) => {error(args[0], args[1]); return {};});
 });
 
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
                     const [err] = args;
                     reject(err);
                 });
@@ -254,20 +391,38 @@ h.on('callbackSrv', 'error', (args) => {error(args[0], args[1]); return {};});
         }
         request = r.build();
     });
-    await client.initiateFlow(request!);
+    peer.internals.initiateFlow(request!);
     return promise;
 }
       
 
 
-export async function remove_service(client: FluenceClient, relay: string, service_id: string, config?: {ttl?: number}): Promise<boolean> {
-    let request: RequestFlow;
-    const promise = new Promise<boolean>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
+ export function remove_service(relay: string, service_id: string, config?: {ttl?: number}) : Promise<boolean>;
+ export function remove_service(peer: FluencePeer, relay: string, service_id: string, config?: {ttl?: number}) : Promise<boolean>;
+ 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<boolean>((resolve, reject) => {
+         const r = new RequestFlowBuilder()
+                 .disableInjections()
+                 .withRawScript(
+                     `
+     (xor
  (seq
   (seq
    (seq
@@ -299,11 +454,11 @@ export async function remove_service(client: FluenceClient, relay: string, servi
  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
 )
 
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
+                 `,
+                 )
+                 .configHandler((h) => {
+                     h.on('getDataSrv', '-relay-', () => {
+                    return peer.getStatus().relayPeerId;
                 });
                 h.on('getDataSrv', 'relay', () => {return relay;});
 h.on('getDataSrv', 'service_id', () => {return service_id;});
@@ -313,7 +468,6 @@ h.on('getDataSrv', 'service_id', () => {return service_id;});
 });
 
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
                     const [err] = args;
                     reject(err);
                 });
@@ -327,20 +481,38 @@ h.on('getDataSrv', 'service_id', () => {return service_id;});
         }
         request = r.build();
     });
-    await client.initiateFlow(request!);
+    peer.internals.initiateFlow(request!);
     return promise;
 }
       
 
 
-export async function add_module(client: FluenceClient, name: string, path: string, config?: {ttl?: number}): Promise<string> {
-    let request: RequestFlow;
-    const promise = new Promise<string>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
+ export function add_module(name: string, path: string, config?: {ttl?: number}) : Promise<string>;
+ export function add_module(peer: FluencePeer, name: string, path: string, config?: {ttl?: number}) : Promise<string>;
+ 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<string>((resolve, reject) => {
+         const r = new RequestFlowBuilder()
+                 .disableInjections()
+                 .withRawScript(
+                     `
+     (xor
  (seq
   (seq
    (seq
@@ -363,11 +535,11 @@ export async function add_module(client: FluenceClient, name: string, path: stri
  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
 )
 
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
+                 `,
+                 )
+                 .configHandler((h) => {
+                     h.on('getDataSrv', '-relay-', () => {
+                    return peer.getStatus().relayPeerId;
                 });
                 h.on('getDataSrv', 'name', () => {return name;});
 h.on('getDataSrv', 'path', () => {return path;});
@@ -377,7 +549,6 @@ h.on('getDataSrv', 'path', () => {return path;});
 });
 
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
                     const [err] = args;
                     reject(err);
                 });
@@ -391,20 +562,44 @@ h.on('getDataSrv', 'path', () => {return path;});
         }
         request = r.build();
     });
-    await client.initiateFlow(request!);
+    peer.internals.initiateFlow(request!);
     return promise;
 }
       
 
 
-export async function deploy_service(client: FluenceClient, relay: string, cid: string, ipfs: string, error: (arg0: string, arg1: string) => void, config?: {ttl?: number}): Promise<string | null> {
-    let request: RequestFlow;
-    const promise = new Promise<string | null>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
+ export function deploy_service(relay: string, cid: string, ipfs: string, error: (arg0: string, arg1: string, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise<string | null>;
+ 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<string | null>;
+ 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<string | null>((resolve, reject) => {
+         const r = new RequestFlowBuilder()
+                 .disableInjections()
+                 .withRawScript(
+                     `
+     (xor
  (seq
   (seq
    (seq
@@ -480,16 +675,32 @@ export async function deploy_service(client: FluenceClient, relay: string, cid:
  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5])
 )
 
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
+                 `,
+                 )
+                 .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('callbackSrv', 'error', (args) => {error(args[0], args[1]); return {};});
+
+ 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)) {
@@ -500,7 +711,6 @@ h.on('callbackSrv', 'error', (args) => {error(args[0], args[1]); return {};});
 });
 
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
                     const [err] = args;
                     reject(err);
                 });
@@ -514,7 +724,7 @@ h.on('callbackSrv', 'error', (args) => {error(args[0], args[1]); return {};});
         }
         request = r.build();
     });
-    await client.initiateFlow(request!);
+    peer.internals.initiateFlow(request!);
     return promise;
 }
       

aqua-examples/aqua-ipfs-integration/aqua/src/process_files.ts

@@ -1,26 +0,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.2.2-221
- *
- */
-import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
-import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
-import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
-
-
-// Services
-
-//ProcessFiles
-//defaultId = undefined
-
-//file_size: (file_path: string) => {error:string;size:number;success:boolean}
-//write_file_size: (size: number) => {error:string;path:string;success:boolean}
-//END ProcessFiles
-
-
-
-// Functions
-

aqua-examples/aqua-ipfs-integration/nodejs/demo.ts

@@ -1,110 +0,0 @@
-/*
- * Copyright 2020 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.
- */
-
-
-import { provideFile } from "./provider";
-
-import { set_timeout } from "@fluencelabs/aqua-ipfs-ts";
-import { createClient, setLogLevel } from "@fluencelabs/fluence";
-import { stage, krasnodar, Node, testNet } from "@fluencelabs/fluence-network-environment";
-import { deploy_service, put_file_size, remove_service } from "@fluencelabs/ipfs-execution-aqua";
-import { globSource, urlSource }from 'ipfs-http-client';
-
-async function main(environment: Node[]) {
-    // setLogLevel('DEBUG');
-    let providerHost = environment[0];
-    let providerClient = await createClient(providerHost);
-    console.log("📘 uploading .wasm to node %s", providerHost.multiaddr);
-    let path = globSource('../service/artifacts/process_files.wasm');
-    let { file, swarmAddr, rpcAddr } = await provideFile(path, providerClient);
-    console.log("📗 swarmAddr", swarmAddr);
-    console.log("📗 rpcAddr", rpcAddr);
-
-    const fluence = await createClient(environment[1]);
-    console.log("📗 created a fluence client %s with relay %s", fluence.selfPeerId, fluence.relayPeerId);
-
-    // default IPFS timeout is 1 sec, set to 10 secs to retrieve file from remote node
-    await set_timeout(fluence, environment[2].peerId, 10);
-
-    console.log("\n\n📘 Will deploy ProcessFiles service");
-    var service_id = await deploy_service(
-        fluence, 
-        environment[2].peerId, file.cid.toString(), rpcAddr,
-        (label, error) => { console.error("📕 deploy_service failed: ", label, error) },
-        { ttl: 10000 }
-    )
-    service_id = fromOption(service_id);
-    if (service_id === null) { 
-        return; 
-    }
-
-    console.log("📗 ProcessFiles service is now deployed and available as", service_id);
-
-    console.log("\n\n📘 Will upload file & calculate its size");
-    let { file: newFile } = await provideFile(urlSource("https://i.imgur.com/NZgK6DB.png"), providerClient);
-    var putResult = await put_file_size(
-        fluence, 
-        environment[2].peerId, newFile.cid.toString(), rpcAddr, service_id,
-        fileSize => console.log("📗 Calculated file size:", fileSize),
-        (label, error) => { console.error("📕 put_file_size failed: ", label, error) },
-        { ttl: 10000 }
-    )
-    putResult = fromOption(putResult);
-    if (putResult !== null) {
-        console.log("📗 File size is saved to IPFS:", putResult);
-    }
-
-    let result = await remove_service(fluence, environment[2].peerId, service_id);
-    console.log("📗 ProcessFiles service removed", result);
-    return;
-}
-
-function fromOption<T>(opt: T | T[] | null): T | null {
-    if (Array.isArray(opt)) {
-        if (opt.length === 0) { return null; }
-        
-        opt = opt[0];
-    }
-    if (opt === null) { return null; }
-    
-    return opt;
-}
-
-let args = process.argv.slice(2);
-var environment: Node[];
-if (args.length >= 1 && args[0] == "testnet") {
-    environment = testNet;
-    console.log("📘 Will connect to testNet");
-} else if (args[0] == "stage") {
-    environment = stage;
-    console.log("📘 Will connect to stage");
-} else if (args[0] == "krasnodar") {
-    environment = krasnodar;
-    console.log("📘 Will connect to krasnodar");
-} else if (args[0] == "testnet") {
-    environment = testNet;
-    console.log("📘 Will connect to testNet");
-} else {
-    throw "Specify environment";
-}
-
-main(environment)
-  .then(() => process.exit(0))
-  .catch(error => {
-    console.error(error);
-    process.exit(1);
-  });
-

aqua-examples/aqua-ipfs-integration/nodejs/package.json

@@ -5,9 +5,7 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
-    "prestart:local": "npm run build",
     "start:local": "node dist/demo.js local",
-    "prestart:remote": "npm run build",
     "start:remote": "node dist/demo.js krasnodar",
     "start": "npm run start:remote"
   },
@@ -25,17 +23,17 @@
   "license": "MIT",
   "dependencies": {
     "@fluencelabs/ipfs-execution-aqua": "file:../aqua",
-    "@fluencelabs/aqua-ipfs-ts": "0.4.2",
-    "@fluencelabs/fluence": "0.10.1",
+    "@fluencelabs/aqua": "0.3.0-225",
+    "@fluencelabs/fluence": "0.12.0",
     "@fluencelabs/fluence-network-environment": "1.0.10",
     "@fluencelabs/aqua-lib": "0.1.14",
+    "@fluencelabs/aqua-ipfs": "0.4.2",
     "ipfs-http-client": "^50.1.2",
     "it-all": "^1.0.5",
     "uint8arrays": "^2.1.5",
     "multiaddr": "^10.0.0"
   },
   "devDependencies": {
-    "typescript": "^3.9.5",
-    "@fluencelabs/aqua": "0.2.2-221"
+    "typescript": "^3.9.5"
   }
 }

aqua-examples/aqua-ipfs-integration/nodejs/provider.ts

@@ -1,45 +0,0 @@
-import { create, CID }from 'ipfs-http-client';
-import { AddResult } from 'ipfs-core-types/src/root';
-import { Multiaddr, protocols } from 'multiaddr';
-import { get_external_swarm_multiaddr, get_external_api_multiaddr } from "@fluencelabs/aqua-ipfs-ts";
-import { FluenceClient } from "@fluencelabs/fluence";
-
-export async function provideFile(source: any, provider: FluenceClient): Promise<{ file: AddResult, swarmAddr: string, rpcAddr: string }> {
-    var swarmAddr;
-    var result = await get_external_swarm_multiaddr(provider, provider.relayPeerId!, { ttl: 20000 });
-    if (result.success) {
-        swarmAddr = result.multiaddr;
-    } else {
-        console.error("Failed to retrieve external swarm multiaddr from %s: ", provider.relayPeerId);
-        throw result.error;
-    }
-
-    var rpcAddr;
-    var result = await get_external_api_multiaddr(provider, provider.relayPeerId!);
-    if (result.success) {
-        rpcAddr = result.multiaddr;
-    } else {
-        console.error("Failed to retrieve external api multiaddr from %s: ", provider.relayPeerId);
-        throw result.error;
-    }
-
-    var rpcMaddr = new Multiaddr(rpcAddr).decapsulateCode(protocols.names.p2p.code);
-    // HACK: `as any` is needed because ipfs-http-client forgot to add `| Multiaddr` to the `create` types
-    const ipfs = create(rpcMaddr as any);
-    console.log("📗 created ipfs client to %s", rpcMaddr);
-
-    await ipfs.id();
-    console.log("📗 connected to ipfs");
-
-    const file = await ipfs.add(source);
-    console.log("📗 uploaded file:", file);
-
-    // To download the file, uncomment the following code:
-    //    let files = await ipfs.get(file.cid);
-    //    for await (const file of files) {
-    //        const content = uint8ArrayConcat(await all(file.content));
-    //        console.log("📗 downloaded file of length ", content.length);
-    //    }
-
-    return { file, swarmAddr, rpcAddr };
-}

aqua-examples/aqua-ipfs-integration/nodejs/src/demo.ts

@@ -0,0 +1,140 @@
+/*
+ * Copyright 2020 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.
+ */
+
+import { provideFile } from "./provider";
+
+import { Fluence, FluencePeer, setLogLevel } from "@fluencelabs/fluence";
+import {
+  stage,
+  krasnodar,
+  Node,
+  testNet,
+} from "@fluencelabs/fluence-network-environment";
+import {
+  deploy_service,
+  put_file_size,
+  remove_service,
+  set_timeout,
+} from "@fluencelabs/ipfs-execution-aqua";
+
+import { globSource, urlSource } from "ipfs-http-client";
+
+async function main(environment: Node[]) {
+  // setLogLevel('DEBUG');
+  let providerHost = environment[0];
+  let providerClient = new FluencePeer();
+  await providerClient.start({ connectTo: providerHost });
+  console.log("📘 uploading .wasm to node %s", providerHost.multiaddr);
+  let path = globSource("../service/artifacts/process_files.wasm");
+  let { file, swarmAddr, rpcAddr } = await provideFile(path, providerClient);
+  console.log("📗 swarmAddr", swarmAddr);
+  console.log("📗 rpcAddr", rpcAddr);
+
+  await Fluence.start({ connectTo: environment[1] });
+  console.log(
+    "📗 created a fluence client %s with relay %s",
+    Fluence.getStatus().peerId,
+    Fluence.getStatus().relayPeerId
+  );
+
+  // default IPFS timeout is 1 sec, set to 10 secs to retrieve file from remote node
+  await set_timeout(environment[2].peerId, 10);
+
+  console.log("\n\n📘 Will deploy ProcessFiles service");
+  var service_id = await deploy_service(
+    environment[2].peerId,
+    file.cid.toString(),
+    rpcAddr,
+    (label, error) => {
+      console.error("📕 deploy_service failed: ", label, error);
+    },
+    { ttl: 10000 }
+  );
+  service_id = fromOption(service_id);
+  if (service_id === null) {
+    return;
+  }
+
+  console.log(
+    "📗 ProcessFiles service is now deployed and available as",
+    service_id
+  );
+
+  console.log("\n\n📘 Will upload file & calculate its size");
+  let { file: newFile } = await provideFile(
+    urlSource("https://i.imgur.com/NZgK6DB.png"),
+    providerClient
+  );
+  var putResult = await put_file_size(
+    environment[2].peerId,
+    newFile.cid.toString(),
+    rpcAddr,
+    service_id,
+    (fileSize) => console.log("📗 Calculated file size:", fileSize),
+    (label, error) => {
+      console.error("📕 put_file_size failed: ", label, error);
+    },
+    { ttl: 10000 }
+  );
+  putResult = fromOption(putResult);
+  if (putResult !== null) {
+    console.log("📗 File size is saved to IPFS:", putResult);
+  }
+
+  let result = await remove_service(environment[2].peerId, service_id);
+  console.log("📗 ProcessFiles service removed", result);
+  return;
+}
+
+function fromOption<T>(opt: T | T[] | null): T | null {
+  if (Array.isArray(opt)) {
+    if (opt.length === 0) {
+      return null;
+    }
+
+    opt = opt[0];
+  }
+  if (opt === null) {
+    return null;
+  }
+
+  return opt;
+}
+
+let args = process.argv.slice(2);
+var environment: Node[];
+if (args.length >= 1 && args[0] == "testnet") {
+  environment = testNet;
+  console.log("📘 Will connect to testNet");
+} else if (args[0] == "stage") {
+  environment = stage;
+  console.log("📘 Will connect to stage");
+} else if (args[0] == "krasnodar") {
+  environment = krasnodar;
+  console.log("📘 Will connect to krasnodar");
+} else if (args[0] == "testnet") {
+  environment = testNet;
+  console.log("📘 Will connect to testNet");
+} else {
+  throw "Specify environment";
+}
+
+main(environment)
+  .then(() => process.exit(0))
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });

aqua-examples/aqua-ipfs-integration/nodejs/src/provider.ts

@@ -0,0 +1,65 @@
+import { create, CID } from "ipfs-http-client";
+import { AddResult } from "ipfs-core-types/src/root";
+import { Multiaddr, protocols } from "multiaddr";
+
+import { FluencePeer } from "@fluencelabs/fluence";
+import {
+  get_external_api_multiaddr,
+  get_external_swarm_multiaddr,
+} from "@fluencelabs/ipfs-execution-aqua";
+
+export async function provideFile(
+  source: any,
+  provider: FluencePeer
+): Promise<{ file: AddResult; swarmAddr: string; rpcAddr: string }> {
+  const relayPeerId = provider.getStatus().relayPeerId!;
+  let swarmAddr;
+  let result = await get_external_swarm_multiaddr(
+    provider,
+    provider.getStatus().relayPeerId!,
+    { ttl: 20000 }
+  );
+  if (result.success) {
+    swarmAddr = result.multiaddr;
+  } else {
+    console.error(
+      "Failed to retrieve external swarm multiaddr from %s: ",
+      provider.getStatus().relayPeerId!
+    );
+    throw result.error;
+  }
+
+  let rpcAddr;
+  result = await get_external_api_multiaddr(provider, relayPeerId);
+  if (result.success) {
+    rpcAddr = result.multiaddr;
+  } else {
+    console.error(
+      "Failed to retrieve external api multiaddr from %s: ",
+      relayPeerId
+    );
+    throw result.error;
+  }
+
+  let rpcMaddr = new Multiaddr(rpcAddr).decapsulateCode(
+    protocols.names.p2p.code
+  );
+  // HACK: `as any` is needed because ipfs-http-client forgot to add `| Multiaddr` to the `create` types
+  const ipfs = create(rpcMaddr as any);
+  console.log("📗 created ipfs client to %s", rpcMaddr);
+
+  await ipfs.id();
+  console.log("📗 connected to ipfs");
+
+  const file = await ipfs.add(source);
+  console.log("📗 uploaded file:", file);
+
+  // To download the file, uncomment the following code:
+  //    let files = await ipfs.get(file.cid);
+  //    for await (const file of files) {
+  //        const content = uint8ArrayConcat(await all(file.content));
+  //        console.log("📗 downloaded file of length ", content.length);
+  //    }
+
+  return { file, swarmAddr, rpcAddr };
+}

aqua-examples/aqua-ipfs-integration/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "aqua-ipfs-integration",
+  "workspaces": [
+    "aqua",
+    "nodejs",
+    "web"
+  ],
+  "scripts": {
+    "build": "npm run build -w aqua -w nodejs -w web"
+  }
+}

aqua-examples/aqua-ipfs-integration/web/aqua/exports.aqua

@@ -0,0 +1,5 @@
+module Exports
+
+import "@fluencelabs/aqua-ipfs/ipfs-api.aqua"
+
+export set_timeout, get_external_swarm_multiaddr, get_external_api_multiaddr

aqua-examples/aqua-ipfs-integration/web/aqua/process.aqua

@@ -0,0 +1,78 @@
+import "@fluencelabs/aqua-lib/builtin.aqua"
+import "@fluencelabs/aqua-ipfs/ipfs.aqua"
+import "process_files.aqua"
+
+alias PeerId : string
+alias CID : string
+alias Multiaddr : string
+alias Hash : string
+alias ServiceID : string
+
+service StringOp("op"):
+    -- function that wraps string in array
+    array(s: string) -> []string
+
+-- Add module to node
+func add_module(name: string, path: string) -> Hash:
+    config <- Dist.default_module_config(name)
+    module_hash <- Dist.add_module_from_vault(path, config)
+    <- module_hash
+
+-- Add service blueprint to node
+func add_blueprint(module_hash: Hash) -> string:
+    prefixed_hash <- Op.concat_strings("hash:", module_hash)
+    dependencies <- StringOp.array(prefixed_hash)
+    blueprint <- Dist.make_blueprint("process_files", dependencies)
+    blueprint_id <- Dist.add_blueprint(blueprint)
+    <- blueprint_id
+
+-- Download single .wasm module from IPFS and create a service from it
+func deploy_service(relay: PeerId, cid: CID, ipfs: Multiaddr, error: string, string -> ()) -> ?ServiceID:
+    service_id: *ServiceID
+    on relay:
+        -- Download .wasm from IPFS to node
+        get_result <- Ipfs.get_from(cid, ipfs)        
+        if get_result.success:
+            module_hash <- add_module("process_files", get_result.path)
+            blueprint_id <- add_blueprint(module_hash)
+            service_id <- Srv.create(blueprint_id)
+        else:
+            co error("Ipfs.get_from failed", get_result.error)
+    
+    <- service_id
+
+-- Download file from IPFS, and write it's size to file in IPFS
+func put_file_size(
+    relay: PeerId, 
+    cid: CID, 
+    ipfs: Multiaddr, 
+    service_id: ServiceID, 
+    logSize: u32 -> (),
+    error: string, string -> ()
+) -> ?IpfsPutResult:
+    result: *IpfsPutResult
+    ProcessFiles service_id
+    on relay:
+        get <- Ipfs.get_from(cid, ipfs)
+        if get.success:
+            size <- ProcessFiles.file_size(get.path)
+            if size.success:
+                -- report file size in background
+                co logSize(size.size)
+                -- write file size to disk
+                write <- ProcessFiles.write_file_size(size.size)
+                if write.success:
+                    -- upload file to ipfs
+                    result <- Ipfs.put(write.path)
+                else:
+                    co error("ProcessFiles.write_file_size failed", write.error)
+            else:
+                co error("ProcessFiles.file_size failed", size.error)
+        else:
+            co error("Ipfs.get_from failed", get.error)
+    <- result
+
+func remove_service(relay: PeerId, service_id: ServiceID) -> bool:
+    on relay:
+        Srv.remove(service_id)
+    <- true

aqua-examples/aqua-ipfs-integration/web/aqua/process_files.aqua

@@ -0,0 +1,15 @@
+module ProcessFiles declares *
+
+data SizeResult:
+  size: u32
+  success: bool
+  error: string
+
+data WriteResult:
+  path: string
+  success: bool
+  error: string
+
+service ProcessFiles:
+  file_size(file_path: string) -> SizeResult
+  write_file_size(size: u32) -> WriteResult

aqua-examples/aqua-ipfs-integration/web/package.json

@@ -4,8 +4,7 @@
   "private": true,
   "dependencies": {
     "@fluencelabs/ipfs-execution-aqua": "file:../aqua",
-    "@fluencelabs/aqua-ipfs-ts": "0.4.2",
-    "@fluencelabs/fluence": "0.10.1",
+    "@fluencelabs/fluence": "0.12.0",
     "@fluencelabs/fluence-network-environment": "1.0.10",
     "@fluencelabs/aqua-lib": "0.1.14",
     "@testing-library/jest-dom": "^5.14.1",
@@ -49,7 +48,6 @@
     ]
   },
   "devDependencies": {
-    "chokidar-cli": "^2.1.0",
     "node-sass": "^6.0.1"
   }
 }

aqua-examples/aqua-ipfs-integration/web/src/App.tsx

@@ -22,13 +22,6 @@ function App() {
   const isDeployed = useRecoilValue(isDeployedState);
   const hasResult = useRecoilValue(hasResultState);
 
-  console.log(
-    "isConnected gotRpcAddr deployed\n",
-    isConnected,
-    gotRpcAddr,
-    isDeployed
-  );
-
   return (
     <div className="App">
       <header>

aqua-examples/aqua-ipfs-integration/web/src/Components/ConnectedInfo.tsx

@@ -1,9 +1,10 @@
 import { useRecoilValue } from "recoil";
-import { clientState } from "../appState";
+import { isConnectedState, selfPeerIdState } from "../appState";
 import { TextWithLabel } from "./TextInput";
 
 export const ConnectedInfo = () => {
-  const client = useRecoilValue(clientState);
+  const selfPeerId = useRecoilValue(selfPeerIdState);
+  const client = useRecoilValue(isConnectedState);
   if (client === null) {
     return <></>;
   }
@@ -11,8 +12,8 @@ export const ConnectedInfo = () => {
   return (
     <>
       <h1>Connected</h1>
-      <TextWithLabel text={"Peer id:"} value={client.selfPeerId} />
-      <TextWithLabel text={"Relay peer id:"} value={client.selfPeerId} />
+      <TextWithLabel text={"Peer id:"} value={selfPeerId} />
+      <TextWithLabel text={"Relay peer id:"} value={selfPeerId} />
     </>
   );
 };

aqua-examples/aqua-ipfs-integration/web/src/Components/SizeCalcForm.tsx

@@ -1,4 +1,4 @@
-import { useRecoilState, useRecoilValue } from "recoil";
+import { useRecoilState } from "recoil";
 import { useGetFileSize } from "../appLogic";
 import { fileCIDState, rpcAddrState } from "../appState";
 import { TextInput } from "./TextInput";

aqua-examples/aqua-ipfs-integration/web/src/appLogic.ts

@@ -1,47 +1,50 @@
-import { get_external_api_multiaddr } from "@fluencelabs/aqua-ipfs-ts";
-import { FluenceClient, createClient } from "@fluencelabs/fluence";
+import { Fluence } from "@fluencelabs/fluence";
 import { krasnodar } from "@fluencelabs/fluence-network-environment";
 import { useSetRecoilState, useRecoilValue, useRecoilState } from "recoil";
 import {
   deploy_service,
   put_file_size,
   remove_service,
+  get_external_api_multiaddr,
 } from "@fluencelabs/ipfs-execution-aqua";
 import {
-  clientState,
+  isConnectedState,
   rpcAddrState,
   wasmState,
   serviceIdState,
   fileCIDState,
   fileSizeState,
   fileSizeCIDState,
+  relayState,
+  selfPeerIdState,
 } from "./appState";
 import { decapsulateP2P, fromOption } from "./util";
 
 export const relayNodes = [krasnodar[0], krasnodar[1], krasnodar[2]];
 
-const getRpcAddr = async (client: FluenceClient) => {
-  if (client === null) {
-    console.log("getRpcAddr client is null");
-    return;
-  }
-
-  let result = await get_external_api_multiaddr(client, client.relayPeerId!);
+const requestRpcAddr = async () => {
+  let result = await get_external_api_multiaddr(
+    Fluence.getStatus().relayPeerId!
+  );
   console.log("getRpcAddr result", result);
   let rpcAddr = result.multiaddr;
   return decapsulateP2P(rpcAddr);
 };
 
 export const useClientConnect = () => {
-  const setClient = useSetRecoilState(clientState);
+  const setIsConnected = useSetRecoilState(isConnectedState);
+  const setRelay = useSetRecoilState(relayState);
+  const setSelfPeerId = useSetRecoilState(selfPeerIdState);
   const setRpcAddr = useSetRecoilState(rpcAddrState);
 
   const connect = async (relayPeerId: string) => {
     try {
-      const client = await createClient(relayPeerId);
-      const addr = await getRpcAddr(client);
+      await Fluence.start({ connectTo: relayPeerId });
+      setIsConnected(true);
+      setRelay(Fluence.getStatus().relayPeerId!);
+      setSelfPeerId(Fluence.getStatus().peerId!);
+      const addr = await requestRpcAddr();
       setRpcAddr(addr!);
-      setClient(client);
     } catch (err) {
       console.log("Client initialization failed", err);
     }
@@ -51,9 +54,10 @@ export const useClientConnect = () => {
 };
 
 export const useDeployService = () => {
+  const relay = useRecoilValue(relayState);
   const wasm = useRecoilValue(wasmState);
   const rpcAddr = useRecoilValue(rpcAddrState);
-  const client = useRecoilValue(clientState);
+  const client = useRecoilValue(isConnectedState);
   const setServiceId = useSetRecoilState(serviceIdState);
 
   return async () => {
@@ -63,8 +67,7 @@ export const useDeployService = () => {
     }
 
     var service_id = await deploy_service(
-      client,
-      client.relayPeerId!,
+      relay!,
       wasm,
       rpcAddr,
       (msg, value) => console.log(msg, value),
@@ -76,21 +79,21 @@ export const useDeployService = () => {
 };
 
 export const useGetFileSize = () => {
+  const relay = useRecoilValue(relayState);
   const rpcAddr = useRecoilValue(rpcAddrState);
-  const client = useRecoilValue(clientState);
+  const isConnected = useRecoilValue(isConnectedState);
   const serviceId = useRecoilValue(serviceIdState);
   const fileCID = useRecoilValue(fileCIDState);
   const setFileSize = useSetRecoilState(fileSizeState);
   const setFileSizeCID = useSetRecoilState(fileSizeCIDState);
 
   return async () => {
-    if (client === null || serviceId === null || rpcAddr === null) {
+    if (!isConnected || serviceId === null || rpcAddr === null) {
       return;
     }
 
     var putResult = await put_file_size(
-      client,
-      client.relayPeerId!,
+      relay!,
       fileCID!,
       rpcAddr,
       serviceId,
@@ -111,18 +114,19 @@ export const useGetFileSize = () => {
 };
 
 export const useRemoveService = () => {
-  const client = useRecoilValue(clientState);
+  const relay = useRecoilValue(relayState);
+  const isConnected = useRecoilValue(isConnectedState);
   const [serviceId, setServiceId] = useRecoilState(serviceIdState);
   const setFileCID = useSetRecoilState(fileCIDState);
   const setFileSize = useSetRecoilState(fileSizeState);
   const setFileSizeCID = useSetRecoilState(fileSizeCIDState);
 
   return async () => {
-    if (client === null || serviceId === null) {
+    if (isConnected || serviceId === null) {
       return;
     }
 
-    await remove_service(client, client.relayPeerId!, serviceId, {
+    await remove_service(relay!, serviceId, {
       ttl: 10000,
     });
     setServiceId(null);

aqua-examples/aqua-ipfs-integration/web/src/appState.ts

@@ -1,10 +1,18 @@
-import { FluenceClient } from "@fluencelabs/fluence";
 import { atom, selector } from "recoil";
 
-export const clientState = atom<FluenceClient | null>({
-  key: "clientState",
+export const isConnectedState = atom<boolean>({
+  key: "isConnectedState",
+  default: false,
+});
+
+export const selfPeerIdState = atom<string | null>({
+  key: "selfPeerIdState",
+  default: null,
+});
+
+export const relayState = atom<string | null>({
+  key: "relayState",
   default: null,
-  dangerouslyAllowMutability: true,
 });
 
 export const serviceIdState = atom<string | null>({
@@ -37,16 +45,6 @@ export const fileSizeCIDState = atom<string | null>({
   default: null,
 });
 
-export const isConnectedState = selector({
-  key: "isConnectedState",
-  get: ({ get }) => {
-    const client = get(clientState);
-
-    return client !== null && client.isConnected;
-  },
-  dangerouslyAllowMutability: true,
-});
-
 export const gotRpcAddrState = selector({
   key: "getRpcAddrState",
   get: ({ get }) => {

aqua-examples/echo-greeter/client-peer/.gitignore

@@ -0,0 +1,2 @@
+dist/
+src/_aqua

aqua-examples/echo-greeter/client-peer/dist/aqua-compiled/echo_greeter.js

@@ -1,178 +0,0 @@
-"use strict";
-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 });
-exports.echo_greeting_par = exports.echo_greeting_seq_2 = exports.echo_greeting_seq = void 0;
-var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable");
-function echo_greeting_seq(client, names, greet, node, echo_service_id, greeting_service_id, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"names\") [] names)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"echo_service_id\") [] echo_service_id)\n      )\n      (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (seq\n       (call -relay- (\"op\" \"noop\") [])\n       (call node (echo_service_id \"echo\") [names] echo_names)\n      )\n      (fold echo_names result\n       (seq\n        (call node (greeting_service_id \"greeting\") [result.$.echo! greet] $res)\n        (next result)\n       )\n      )\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 client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'node', function () { return node; });
-                            h.on('getDataSrv', 'echo_service_id', function () { return echo_service_id; });
-                            h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_seq');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_seq = echo_greeting_seq;
-function echo_greeting_seq_2(client, names, greet, echo_topo, greeting_topo, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"names\") [] names)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"echo_topo\") [] echo_topo)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"greeting_topo\") [] greeting_topo)\n      )\n      (call -relay- (\"op\" \"noop\") [])\n     )\n     (xor\n      (seq\n       (call -relay- (\"op\" \"noop\") [])\n       (call echo_topo.$.node! (echo_topo.$.service_id! \"echo\") [names] echo_names)\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     (fold echo_names result\n      (seq\n       (call greeting_topo.$.node! (greeting_topo.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n       (next result)\n      )\n     )\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\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% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_topo', function () { return echo_topo; });
-                            h.on('getDataSrv', 'greeting_topo', function () { return greeting_topo; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_seq_2');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_seq_2 = echo_greeting_seq_2;
-function echo_greeting_par(client, greet, echo_service, greeting_services, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"greet\") [] greet)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n       )\n       (call -relay- (\"op\" \"noop\") [])\n      )\n      (xor\n       (seq\n        (call -relay- (\"op\" \"noop\") [])\n        (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\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    (fold echo_results result\n     (seq\n      (fold greeting_services greeting_service\n       (seq\n        (seq\n         (xor\n          (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n          (seq\n           (call -relay- (\"op\" \"noop\") [])\n           (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n          )\n         )\n         (call -relay- (\"op\" \"noop\") [])\n        )\n        (next greeting_service)\n       )\n      )\n      (next result)\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% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_service', function () { return echo_service; });
-                            h.on('getDataSrv', 'greeting_services', function () { return greeting_services; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_par');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_par = echo_greeting_par;

aqua-examples/echo-greeter/client-peer/dist/aqua/echo_greeter.js

@@ -1,178 +0,0 @@
-"use strict";
-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 });
-exports.echo_greeting_par = exports.echo_greeting_seq_2 = exports.echo_greeting_seq = void 0;
-var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable");
-function echo_greeting_seq(client, names, greet, node, echo_service_id, greeting_service_id, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"names\") [] names)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"echo_service_id\") [] echo_service_id)\n      )\n      (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (seq\n       (call -relay- (\"op\" \"noop\") [])\n       (call node (echo_service_id \"echo\") [names] echo_names)\n      )\n      (fold echo_names result\n       (seq\n        (call node (greeting_service_id \"greeting\") [result.$.echo! greet] $res)\n        (next result)\n       )\n      )\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 client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'node', function () { return node; });
-                            h.on('getDataSrv', 'echo_service_id', function () { return echo_service_id; });
-                            h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_seq');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_seq = echo_greeting_seq;
-function echo_greeting_seq_2(client, names, greet, echo_topo, greeting_topo, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"names\") [] names)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"echo_topo\") [] echo_topo)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"greeting_topo\") [] greeting_topo)\n      )\n      (call -relay- (\"op\" \"noop\") [])\n     )\n     (xor\n      (seq\n       (call -relay- (\"op\" \"noop\") [])\n       (call echo_topo.$.node! (echo_topo.$.service_id! \"echo\") [names] echo_names)\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     (fold echo_names result\n      (seq\n       (call greeting_topo.$.node! (greeting_topo.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n       (next result)\n      )\n     )\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\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% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_topo', function () { return echo_topo; });
-                            h.on('getDataSrv', 'greeting_topo', function () { return greeting_topo; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_seq_2');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_seq_2 = echo_greeting_seq_2;
-function echo_greeting_par(client, greet, echo_service, greeting_services, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"greet\") [] greet)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n       )\n       (call -relay- (\"op\" \"noop\") [])\n      )\n      (xor\n       (seq\n        (call -relay- (\"op\" \"noop\") [])\n        (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\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    (fold echo_results result\n     (seq\n      (fold greeting_services greeting_service\n       (seq\n        (seq\n         (xor\n          (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n          (seq\n           (call -relay- (\"op\" \"noop\") [])\n           (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n          )\n         )\n         (call -relay- (\"op\" \"noop\") [])\n        )\n        (next greeting_service)\n       )\n      )\n      (next result)\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% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_service', function () { return echo_service; });
-                            h.on('getDataSrv', 'greeting_services', function () { return greeting_services; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_par');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_par = echo_greeting_par;

aqua-examples/echo-greeter/client-peer/dist/client-peer/src/index.js

@@ -1,84 +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 greeting_services = [{ "node": "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", "service_id": "fb5f7126-e1ee-4ecf-81e7-20804cb7203b" }, { "node": "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", "service_id": "893a6fb8-43b9-4b11-8786-93300bd68bc8" }];
-var echo_services = [{ "node": "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", "service_id": "5cf520ff-dd65-47d7-a51a-2bf08dfe2ede" }, { "node": "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", "service_id": "5a03906b-3217-40a2-93fb-7e83be735408" }];
-var names = ["Jim", "John", "Jake"];
-// let greeting_service =
-function main() {
-    return __awaiter(this, void 0, void 0, function () {
-        var fluence;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, fluence_1.createClient(fluence_network_environment_1.krasnodar[2])];
-                case 1:
-                    fluence = _a.sent();
-                    console.log("created a fluence client %s with relay %s", fluence.selfPeerId, fluence.relayPeerId);
-                    //func echo_greeting_seq(names: []string, greet: bool, node: string, echo_service_id: string, greeting_service_id: string) -> []string:
-                    // const network_result = await echo_greeting_seq(fluence, names, true, echo_services[0].node, echo_services[0].service_id, greeting_services[0].service_id);
-                    // console.log("seq result: ", network_result);
-                    // const network_result_par = await get_price_par(fluence, "ethereum", "usd", getter_topo, mean_topo);
-                    // console.log("par result: ", network_result_par);
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-main()
-    .then(function () { return process.exit(0); })
-    .catch(function (error) {
-    console.error(error);
-    process.exit(1);
-});

aqua-examples/echo-greeter/client-peer/dist/echo_greeter.js

@@ -1,178 +0,0 @@
-"use strict";
-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 });
-exports.echo_greeting_par = exports.echo_greeting_seq_2 = exports.echo_greeting_seq = void 0;
-var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable");
-function echo_greeting_seq(client, names, greet, node, echo_service_id, greeting_service_id, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"names\") [] names)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"echo_service_id\") [] echo_service_id)\n      )\n      (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (seq\n       (call -relay- (\"op\" \"noop\") [])\n       (call node (echo_service_id \"echo\") [names] echo_names)\n      )\n      (fold echo_names result\n       (seq\n        (call node (greeting_service_id \"greeting\") [result.$.echo! greet] $res)\n        (next result)\n       )\n      )\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 client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'node', function () { return node; });
-                            h.on('getDataSrv', 'echo_service_id', function () { return echo_service_id; });
-                            h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_seq');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_seq = echo_greeting_seq;
-function echo_greeting_seq_2(client, names, greet, echo_topo, greeting_topo, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"names\") [] names)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"echo_topo\") [] echo_topo)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"greeting_topo\") [] greeting_topo)\n      )\n      (call -relay- (\"op\" \"noop\") [])\n     )\n     (xor\n      (seq\n       (call -relay- (\"op\" \"noop\") [])\n       (call echo_topo.$.node! (echo_topo.$.service_id! \"echo\") [names] echo_names)\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     (fold echo_names result\n      (seq\n       (call greeting_topo.$.node! (greeting_topo.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n       (next result)\n      )\n     )\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\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% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_topo', function () { return echo_topo; });
-                            h.on('getDataSrv', 'greeting_topo', function () { return greeting_topo; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_seq_2');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_seq_2 = echo_greeting_seq_2;
-function echo_greeting_par(client, greet, echo_service, greeting_services, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"greet\") [] greet)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n       )\n       (call -relay- (\"op\" \"noop\") [])\n      )\n      (xor\n       (seq\n        (call -relay- (\"op\" \"noop\") [])\n        (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\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    (fold echo_results result\n     (seq\n      (fold greeting_services greeting_service\n       (seq\n        (seq\n         (xor\n          (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n          (seq\n           (call -relay- (\"op\" \"noop\") [])\n           (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n          )\n         )\n         (call -relay- (\"op\" \"noop\") [])\n        )\n        (next greeting_service)\n       )\n      )\n      (next result)\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% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_service', function () { return echo_service; });
-                            h.on('getDataSrv', 'greeting_services', function () { return greeting_services; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_par');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_par = echo_greeting_par;

aqua-examples/echo-greeter/client-peer/dist/src/echo_greeter.js

@@ -1,372 +0,0 @@
-"use strict";
-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 });
-exports.echo_greeting_par_alternative = exports.echo_greeting_seq = exports.greeting = exports.echo = exports.echo_greeting_par = exports.echo_greeting_par_improved = exports.echo_greeting_seq_2 = void 0;
-var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable");
-// Services
-//OpString
-//defaultId = "op"
-//identity: (s: string) => void
-//END OpString
-//EchoService
-//defaultId = undefined
-//echo: (arg0: string[]) => {echo:string}[]
-//END EchoService
-//GreetingService
-//defaultId = "service-id"
-//greeting: (arg0: string, arg1: boolean) => string
-//END GreetingService
-// Functions
-function echo_greeting_seq_2(client, names, greet, echo_topo, greeting_topo, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"names\") [] names)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"echo_topo\") [] echo_topo)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"greeting_topo\") [] greeting_topo)\n      )\n      (call -relay- (\"op\" \"noop\") [])\n     )\n     (xor\n      (seq\n       (call -relay- (\"op\" \"noop\") [])\n       (call echo_topo.$.node! (echo_topo.$.service_id! \"echo\") [names] echo_names)\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     (fold echo_names result\n      (seq\n       (call greeting_topo.$.node! (greeting_topo.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n       (next result)\n      )\n     )\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\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% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_topo', function () { return echo_topo; });
-                            h.on('getDataSrv', 'greeting_topo', function () { return greeting_topo; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_seq_2');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_seq_2 = echo_greeting_seq_2;
-function echo_greeting_par_improved(client, echo_service, greeting_services, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_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\" \"echo_service\") [] echo_service)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n       )\n       (call -relay- (\"op\" \"noop\") [])\n      )\n      (xor\n       (seq\n        (call -relay- (\"op\" \"noop\") [])\n        (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\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    (fold echo_results result\n     (seq\n      (seq\n       (par\n        (seq\n         (seq\n          (call -relay- (\"op\" \"noop\") [])\n          (fold greeting_services greeting_service\n           (seq\n            (seq\n             (xor\n              (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greeting_service.$.greet!] $res)\n              (seq\n               (call -relay- (\"op\" \"noop\") [])\n               (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n              )\n             )\n             (call -relay- (\"op\" \"noop\") [])\n            )\n            (next greeting_service)\n           )\n          )\n         )\n         (call %init_peer_id% (\"op\" \"noop\") [])\n        )\n        (null)\n       )\n       (call -relay- (\"op\" \"noop\") [])\n      )\n      (next result)\n     )\n    )\n   )\n   (call %init_peer_id% (\"op\" \"identity\") [$res.$.[5]!])\n  )\n  (xor\n   (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n   (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'echo_service', function () { return echo_service; });
-                            h.on('getDataSrv', 'greeting_services', function () { return greeting_services; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_par_improved');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_par_improved = echo_greeting_par_improved;
-function echo_greeting_par(client, greet, echo_service, greeting_services, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"greet\") [] greet)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n       )\n       (call -relay- (\"op\" \"noop\") [])\n      )\n      (xor\n       (seq\n        (call -relay- (\"op\" \"noop\") [])\n        (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\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    (fold echo_results result\n     (seq\n      (seq\n       (par\n        (seq\n         (seq\n          (call -relay- (\"op\" \"noop\") [])\n          (fold greeting_services greeting_service\n           (seq\n            (seq\n             (xor\n              (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n              (seq\n               (call -relay- (\"op\" \"noop\") [])\n               (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n              )\n             )\n             (call -relay- (\"op\" \"noop\") [])\n            )\n            (next greeting_service)\n           )\n          )\n         )\n         (call %init_peer_id% (\"op\" \"noop\") [])\n        )\n        (null)\n       )\n       (call -relay- (\"op\" \"noop\") [])\n      )\n      (next result)\n     )\n    )\n   )\n   (call %init_peer_id% (\"op\" \"identity\") [$res.$.[5]!])\n  )\n  (xor\n   (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n   (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_service', function () { return echo_service; });
-                            h.on('getDataSrv', 'greeting_services', function () { return greeting_services; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_par');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_par = echo_greeting_par;
-function echo(client, names, node, echo_service, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_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\" \"names\") [] names)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n      )\n      (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call node (echo_service \"echo\") [names] 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 client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'node', function () { return node; });
-                            h.on('getDataSrv', 'echo_service', function () { return echo_service; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo = echo;
-function greeting(client, name, greet, node, greeting_service_id, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_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\" \"name\") [] name)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n      )\n      (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call node (greeting_service_id \"greeting\") [name greet] 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 client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'name', function () { return name; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'node', function () { return node; });
-                            h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for greeting');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.greeting = greeting;
-function echo_greeting_seq(client, names, greet, node, echo_service_id, greeting_service_id, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"names\") [] names)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"echo_service_id\") [] echo_service_id)\n      )\n      (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (seq\n       (call -relay- (\"op\" \"noop\") [])\n       (call node (echo_service_id \"echo\") [names] echo_names)\n      )\n      (fold echo_names result\n       (seq\n        (call node (greeting_service_id \"greeting\") [result.$.echo! greet] $res)\n        (next result)\n       )\n      )\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 client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'names', function () { return names; });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'node', function () { return node; });
-                            h.on('getDataSrv', 'echo_service_id', function () { return echo_service_id; });
-                            h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_seq');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_seq = echo_greeting_seq;
-function echo_greeting_par_alternative(client, greet, echo_service, greeting_services, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"greet\") [] greet)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n       )\n       (call -relay- (\"op\" \"noop\") [])\n      )\n      (xor\n       (seq\n        (call -relay- (\"op\" \"noop\") [])\n        (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\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    (fold echo_results result\n     (seq\n      (fold greeting_services greeting_service\n       (seq\n        (seq\n         (par\n          (seq\n           (seq\n            (xor\n             (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n             (seq\n              (call -relay- (\"op\" \"noop\") [])\n              (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n             )\n            )\n            (call -relay- (\"op\" \"noop\") [])\n           )\n           (call %init_peer_id% (\"op\" \"noop\") [])\n          )\n          (null)\n         )\n         (call -relay- (\"op\" \"noop\") [])\n        )\n        (next greeting_service)\n       )\n      )\n      (next result)\n     )\n    )\n   )\n   (call %init_peer_id% (\"op\" \"identity\") [$res.$.[5]!])\n  )\n  (xor\n   (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n   (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'greet', function () { return greet; });
-                            h.on('getDataSrv', 'echo_service', function () { return echo_service; });
-                            h.on('getDataSrv', 'greeting_services', function () { return greeting_services; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for echo_greeting_par_alternative');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.echo_greeting_par_alternative = echo_greeting_par_alternative;

aqua-examples/echo-greeter/client-peer/dist/src/index.js

@@ -1,144 +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 echo_greeter_1 = require("./echo_greeter");
-var greeting_topos = [
-    {
-        node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt",
-        service_id: "5cf520ff-dd65-47d7-a51a-2bf08dfe2ede",
-    },
-    {
-        node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE",
-        service_id: "5a03906b-3217-40a2-93fb-7e83be735408",
-    },
-];
-var echo_topos = [
-    {
-        node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt",
-        service_id: "fb5f7126-e1ee-4ecf-81e7-20804cb7203b",
-    },
-    {
-        node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE",
-        service_id: "893a6fb8-43b9-4b11-8786-93300bd68bc8",
-    },
-];
-var echo_service = {
-    node: echo_topos[0].node,
-    service_id: echo_topos[0].service_id,
-    names: ["Jim", "John", "Jake"],
-};
-var greeting_services = [
-    {
-        node: greeting_topos[0].node,
-        service_id: greeting_topos[0].service_id,
-        greet: true,
-    },
-    {
-        node: greeting_topos[1].node,
-        service_id: greeting_topos[1].service_id,
-        greet: false,
-    },
-];
-var names = ["Jim", "John", "Jake"];
-// let greeting_service =
-function main() {
-    return __awaiter(this, void 0, void 0, function () {
-        var fluence, echo_result, result, _i, echo_result_1, item, greeting_result, seq_result, par_result;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, fluence_1.createClient(fluence_network_environment_1.krasnodar[2])];
-                case 1:
-                    fluence = _a.sent();
-                    console.log("created a fluence client %s with relay %s", fluence.selfPeerId, fluence.relayPeerId);
-                    return [4 /*yield*/, echo_greeter_1.echo(fluence, names, echo_topos[0].node, echo_topos[0].service_id)];
-                case 2:
-                    echo_result = _a.sent();
-                    result = "";
-                    for (_i = 0, echo_result_1 = echo_result; _i < echo_result_1.length; _i++) {
-                        item = echo_result_1[_i];
-                        result += item.echo + ",";
-                    }
-                    console.log("echo result                       : ", result);
-                    return [4 /*yield*/, echo_greeter_1.greeting(fluence, names[0], true, greeting_topos[0].node, greeting_topos[0].service_id)];
-                case 3:
-                    greeting_result = _a.sent();
-                    console.log("greeting result                   : ", greeting_result);
-                    return [4 /*yield*/, echo_greeter_1.echo_greeting_seq(fluence, names, true, echo_topos[0].node, echo_topos[0].service_id, greeting_topos[0].service_id)];
-                case 4:
-                    seq_result = _a.sent();
-                    console.log("seq result                         : ", seq_result);
-                    return [4 /*yield*/, echo_greeter_1.echo_greeting_par(fluence, true, echo_service, greeting_services)];
-                case 5:
-                    par_result = _a.sent();
-                    console.log("par result                          : ", par_result);
-                    return [4 /*yield*/, echo_greeter_1.echo_greeting_par_alternative(fluence, true, echo_service, greeting_services)];
-                case 6:
-                    par_result = _a.sent();
-                    console.log("par alternative result              : ", par_result);
-                    return [4 /*yield*/, echo_greeter_1.echo_greeting_par_improved(fluence, echo_service, greeting_services)];
-                case 7:
-                    par_result = _a.sent();
-                    console.log("par improved signature result        : ", par_result);
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-main()
-    .then(function () { return process.exit(0); })
-    .catch(function (error) {
-    console.error(error);
-    process.exit(1);
-});

aqua-examples/echo-greeter/client-peer/package-lock.json

@@ -38,9 +38,9 @@
       }
     },
     "@fluencelabs/aqua": {
-      "version": "0.2.2-221",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.2.2-221.tgz",
-      "integrity": "sha512-npFPyIs95uEDfkxKytvjj88NFS2z147+WebnRMp9aHbnGrzmKqLBG6eyoxPuTh9qTQbPL9DfX5rbl/iPfr4Sxw==",
+      "version": "0.3.0-224",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-224.tgz",
+      "integrity": "sha512-6rcs79Rub2LLOBHYiZu7AVeHH9aLG4qnhYiefneuLtn1G7npPUVFYbkuO1TSJ4zilq7cvP/IqJEhc6CLDx4f8g==",
       "dev": true
     },
     "@fluencelabs/aqua-lib": {
@@ -49,29 +49,22 @@
       "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg=="
     },
     "@fluencelabs/avm": {
-      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.3.tgz",
-      "integrity": "sha512-HCRIn8WHshHDkZmoW9ITnEzdr+XcZBo9SjlcbKHd8+ls1LkX4SiGe2tKh3QQwtmJ6xFh9TypTwjWeDYCGIw7JA==",
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz",
+      "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==",
       "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.10.1",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.10.1.tgz",
-      "integrity": "sha512-xAtZh6B9IIQiDflwNhf4dIvjNX6vFddDvU27fGiDuhiXs92k/dQ6ks3yWL0tqsceSbkz4w7r2vQMfDq6gWkdgg==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.11.0.tgz",
+      "integrity": "sha512-HfUS8eLwfviiJhqsrHnOnRxO20TbdahPreP6AkBXQaEpWeRew6vxAd0Dn+xdzy6KCJ4W9GOKLcgtPfqquIO2Pg==",
       "requires": {
         "@chainsafe/libp2p-noise": "4.0.0",
-        "@fluencelabs/avm": "0.14.3",
+        "@fluencelabs/avm": "0.14.4",
         "async": "3.2.0",
-        "base64-js": "1.3.1",
+        "base64-js": "1.5.1",
         "bs58": "4.0.1",
         "cids": "0.8.1",
         "it-length-prefixed": "3.0.1",
@@ -82,6 +75,7 @@
         "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"
       }
@@ -295,9 +289,9 @@
       "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="
     },
     "@types/node": {
-      "version": "16.7.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
-      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz",
+      "integrity": "sha512-nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag=="
     },
     "@types/retry": {
       "version": "0.12.1",
@@ -412,9 +406,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=="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -974,9 +968,9 @@
       "integrity": "sha512-wiI02c+G1BVuu0jz30Nsr1/et0cpSRulKUusN8HDZXxuX4MdUzfMp2P4JUk+a49Wr1kHitRLrnnh3+UzJ6neaQ=="
     },
     "it-glob": {
-      "version": "0.0.13",
-      "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.13.tgz",
-      "integrity": "sha512-0Hcd5BraJUPzL28NWiFbdNrcdyNxNTKKdU3sjdFiYynNTQpwlG2UKW31X7bp+XhJwux/oPzIquo5ioztVmc2RQ==",
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.14.tgz",
+      "integrity": "sha512-TKKzs9CglbsihSpcwJPXN5DBUssu4akRzPlp8QJRCoLrKoaOpyY2V1qDlxx+UMivn0i114YyTd4AawWl7eqIdw==",
       "requires": {
         "@types/minimatch": "^3.0.4",
         "minimatch": "^3.0.4"
@@ -1034,9 +1028,9 @@
       "integrity": "sha512-EElupuWhHVStUgUY+OfTJIS2MZed96lDrAXzJUuqiiqLnIKoBRqtX1ZG2oR0bGDsSppmz83MtzCeKLZ9TVAUxQ=="
     },
     "it-merge": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/it-merge/-/it-merge-1.0.2.tgz",
-      "integrity": "sha512-bp+h4X3tQ83/a2MvaeP4nRi+52z2AO2y8tf2OzDdaSXKMC0n0gVtHrJUDaE+kiIkBiUtTt1hp7vJHMM0VtCfGA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/it-merge/-/it-merge-1.0.3.tgz",
+      "integrity": "sha512-FTIcv8VGOkSnq5WGoepN+ag/DVdSVZk7pALuduxyGlErH7uzcvZD3IXHXY47ViptHQFbga2rU9SPlFmC7ttRBA==",
       "requires": {
         "it-pushable": "^1.4.0"
       }
@@ -1583,6 +1577,11 @@
       "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",
@@ -2088,9 +2087,9 @@
       }
     },
     "ws": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz",
-      "integrity": "sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg=="
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
     },
     "xml2js": {
       "version": "0.4.23",

aqua-examples/echo-greeter/client-peer/package.json

@@ -14,12 +14,12 @@
   ],
   "dependencies": {
     "@fluencelabs/aqua-lib": "^0.1.14",
-    "@fluencelabs/fluence": "^0.10.1",
+    "@fluencelabs/fluence": "^0.11.0",
     "@fluencelabs/fluence-network-environment": "^1.0.10",
     "it-all": "^1.0.5"
   },
   "scripts": {
-    "compile-aqua": "aqua -i ../aqua-scripts -o src/",
+    "compile-aqua": "aqua -i ../aqua-scripts -o src/_aqua",
     "prebuild": "npm run compile-aqua",
     "build": "tsc",
     "prestart:local": "npm run build",
@@ -43,7 +43,7 @@
   },
   "homepage": "git+https://github.com/fluencelabs/examples/aqua-examples/echo-greeter#readme",
   "devDependencies": {
-    "@fluencelabs/aqua": "0.2.2-221",
+    "@fluencelabs/aqua": "^0.3.0-226",
     "typescript": "^3.9.5"
   }
 }

aqua-examples/echo-greeter/client-peer/src/index.ts

@@ -14,74 +14,73 @@
  * limitations under the License.
  */
 
-import { createClient, setLogLevel, FluenceClient } from "@fluencelabs/fluence";
+import { setLogLevel, FluencePeer } from "@fluencelabs/fluence";
 import { krasnodar, Node } from "@fluencelabs/fluence-network-environment";
 import {
-    echo,
-    greeting,
-    echo_greeting_seq,
-    echo_greeting_par,
-    echo_greeting_par_alternative,
-    echo_greeting_par_improved
-} from "./echo_greeter";
-
+  echo,
+  greeting,
+  echo_greeting_seq,
+  echo_greeting_par,
+  echo_greeting_par_alternative,
+  echo_greeting_par_improved,
+} from "./_aqua/echo_greeter";
 
 interface EchoResult {
-    echo: string;
+  echo: string;
 }
 interface NodeServicePair {
-    node: string;
-    service_id: string;
+  node: string;
+  service_id: string;
 }
 
 interface EchoService {
-    node: string;
-    service_id: string;
-    names: Array<string>;
+  node: string;
+  service_id: string;
+  names: Array<string>;
 }
 
 interface GreetingService {
-    node: string;
-    service_id: string;
-    greet: boolean;
+  node: string;
+  service_id: string;
+  greet: boolean;
 }
 
 let greeting_topos: Array<NodeServicePair> = [
-    {
-        node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt",
-        service_id: "5cf520ff-dd65-47d7-a51a-2bf08dfe2ede",
-    },
-    {
-        node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE",
-        service_id: "5a03906b-3217-40a2-93fb-7e83be735408",
-    },
+  {
+    node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt",
+    service_id: "5cf520ff-dd65-47d7-a51a-2bf08dfe2ede",
+  },
+  {
+    node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE",
+    service_id: "5a03906b-3217-40a2-93fb-7e83be735408",
+  },
 ];
 let echo_topos: Array<NodeServicePair> = [
-    {
-        node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt",
-        service_id: "fb5f7126-e1ee-4ecf-81e7-20804cb7203b",
-    },
-    {
-        node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE",
-        service_id: "893a6fb8-43b9-4b11-8786-93300bd68bc8",
-    },
+  {
+    node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt",
+    service_id: "fb5f7126-e1ee-4ecf-81e7-20804cb7203b",
+  },
+  {
+    node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE",
+    service_id: "893a6fb8-43b9-4b11-8786-93300bd68bc8",
+  },
 ];
 let echo_service: EchoService = {
-    node: echo_topos[0].node,
-    service_id: echo_topos[0].service_id,
-    names: ["Jim", "John", "Jake"],
+  node: echo_topos[0].node,
+  service_id: echo_topos[0].service_id,
+  names: ["Jim", "John", "Jake"],
 };
 let greeting_services: Array<GreetingService> = [
-    {
-        node: greeting_topos[0].node,
-        service_id: greeting_topos[0].service_id,
-        greet: true,
-    },
-    {
-        node: greeting_topos[1].node,
-        service_id: greeting_topos[1].service_id,
-        greet: false,
-    },
+  {
+    node: greeting_topos[0].node,
+    service_id: greeting_topos[0].service_id,
+    greet: true,
+  },
+  {
+    node: greeting_topos[1].node,
+    service_id: greeting_topos[1].service_id,
+    greet: false,
+  },
 ];
 
 let names: Array<string> = ["Jim", "John", "Jake"];
@@ -89,82 +88,73 @@ let names: Array<string> = ["Jim", "John", "Jake"];
 // let greeting_service =
 
 async function main() {
-    // console.log("hello");
-    // setLogLevel('DEBUG');
+  // console.log("hello");
+  // setLogLevel('DEBUG');
 
-    const fluence = await createClient(krasnodar[2]);
-    console.log(
-        "created a fluence client %s with relay %s",
-        fluence.selfPeerId,
-        fluence.relayPeerId
-    );
+  await Fluence.start({ connectTo: krasnodar[2] });
+  console.log(
+    "created a fluence client %s with relay %s",
+    FluencePeer.default.connectionInfo.selfPeerId,
+    FluencePeer.default.connectionInfo.connectedRelay
+  );
 
-    let echo_result = await echo(
-        fluence,
-        names,
-        echo_topos[0].node,
-        echo_topos[0].service_id
-    );
+  let echo_result = await echo(
+    names,
+    echo_topos[0].node,
+    echo_topos[0].service_id
+  );
 
-    let result = "";
+  let result = "";
 
-    for (let item of echo_result) {
-        result += item.echo + ","
-    }
-    console.log("echo result                       : ", result);
+  for (let item of echo_result) {
+    result += item.echo + ",";
+  }
+  console.log("echo result                       : ", result);
 
-    let greeting_result = await greeting(
-        fluence,
-        names[0],
-        true,
-        greeting_topos[0].node,
-        greeting_topos[0].service_id
-    );
-    console.log("greeting result                   : ", greeting_result);
+  let greeting_result = await greeting(
+    names[0],
+    true,
+    greeting_topos[0].node,
+    greeting_topos[0].service_id
+  );
+  console.log("greeting result                   : ", greeting_result);
 
-    // echo_greeting_par(greet: bool, echo_service: EchoServiceInput, greeting_services: []NodeServicePair) -> []string:
-    let seq_result = await echo_greeting_seq(
-        fluence,
-        names,
-        true,
-        echo_topos[0].node,
-        echo_topos[0].service_id,
-        greeting_topos[0].service_id
-    );
-    console.log("seq result                         : ", seq_result);
+  // echo_greeting_par(greet: bool, echo_service: EchoServiceInput, greeting_services: []NodeServicePair) -> []string:
+  let seq_result = await echo_greeting_seq(
+    names,
+    true,
+    echo_topos[0].node,
+    echo_topos[0].service_id,
+    greeting_topos[0].service_id
+  );
+  console.log("seq result                         : ", seq_result);
 
+  let par_result = await echo_greeting_par(
+    true,
+    echo_service,
+    greeting_services
+  );
+  console.log("par result                          : ", par_result);
 
-    let par_result = await echo_greeting_par(
-        fluence,
-        true,
-        echo_service,
-        greeting_services
-    );
-    console.log("par result                          : ", par_result);
+  par_result = await echo_greeting_par_alternative(
+    true,
+    echo_service,
+    greeting_services
+  );
+  console.log("par alternative result              : ", par_result);
 
+  par_result = await echo_greeting_par_improved(
+    echo_service,
+    greeting_services
+  );
+  console.log("par improved signature result        : ", par_result);
 
-    par_result = await echo_greeting_par_alternative(
-        fluence,
-        true,
-        echo_service,
-        greeting_services
-    );
-    console.log("par alternative result              : ", par_result);
-
-    par_result = await echo_greeting_par_improved(
-        fluence,
-        echo_service,
-        greeting_services
-    );
-    console.log("par improved signature result        : ", par_result);
-
-
-    return;
+  return;
 }
 
 main()
-    .then(() => process.exit(0))
-    .catch((error) => {
-        console.error(error);
-        process.exit(1);
-    });
+  .then(() => process.exit(0))
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });

aqua-examples/price-oracle/client-peer/.gitignore

@@ -0,0 +1,2 @@
+dist/
+src/_aqua/

aqua-examples/price-oracle/client-peer/dist/get_crypto_prices.js

@@ -1,133 +0,0 @@
-"use strict";
-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 });
-exports.get_price_par = exports.get_price = void 0;
-var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable");
-function get_price(client, coin, currency, node, pg_sid, mean_sid, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"coin\") [] coin)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"currency\") [] currency)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"pg_sid\") [] pg_sid)\n      )\n      (call %init_peer_id% (\"getDataSrv\" \"mean_sid\") [] mean_sid)\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (seq\n       (seq\n        (seq\n         (seq\n          (seq\n           (seq\n            (call node (\"op\" \"string_to_b58\") [node] k)\n            (call node (\"peer\" \"timestamp_ms\") [] ts_ms0)\n           )\n           (call node (pg_sid \"price_getter\") [coin currency ts_ms0] res0)\n          )\n          (call node (\"op\" \"identity\") [res0.$.result!] $prices)\n         )\n         (call node (\"peer\" \"timestamp_ms\") [] ts_ms1)\n        )\n        (call node (pg_sid \"price_getter\") [coin currency ts_ms1] res1)\n       )\n       (call node (\"op\" \"identity\") [res1.$.result!] $prices)\n      )\n      (call node (mean_sid \"mean\") [$prices] result)\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\") [result])\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 client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'coin', function () { return coin; });
-                            h.on('getDataSrv', 'currency', function () { return currency; });
-                            h.on('getDataSrv', 'node', function () { return node; });
-                            h.on('getDataSrv', 'pg_sid', function () { return pg_sid; });
-                            h.on('getDataSrv', 'mean_sid', function () { return mean_sid; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for get_price');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.get_price = get_price;
-function get_price_par(client, coin, currency, getter_topo, mean_topo, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\n  (seq\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\" \"coin\") [] coin)\n          )\n          (call %init_peer_id% (\"getDataSrv\" \"currency\") [] currency)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"getter_topo\") [] getter_topo)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"mean_topo\") [] mean_topo)\n       )\n       (fold getter_topo topo\n        (par\n         (seq\n          (seq\n           (seq\n            (call -relay- (\"op\" \"noop\") [])\n            (xor\n             (seq\n              (seq\n               (seq\n                (call topo.$.node! (\"op\" \"string_to_b58\") [topo.$.node!] k)\n                (call topo.$.node! (\"peer\" \"timestamp_ms\") [] ts_ms)\n               )\n               (call topo.$.node! (topo.$.service_id! \"price_getter\") [coin currency ts_ms] res)\n              )\n              (call topo.$.node! (\"op\" \"identity\") [res.$.result!] $prices)\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 topo)\n        )\n       )\n      )\n      (call %init_peer_id% (\"op\" \"identity\") [$prices.$.[2]!])\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call mean_topo.$.node! (mean_topo.$.service_id! \"mean\") [$prices] result)\n     )\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n     )\n    )\n   )\n   (call -relay- (\"op\" \"noop\") [])\n  )\n  (xor\n   (call %init_peer_id% (\"callbackSrv\" \"response\") [result])\n   (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'coin', function () { return coin; });
-                            h.on('getDataSrv', 'currency', function () { return currency; });
-                            h.on('getDataSrv', 'getter_topo', function () { return getter_topo; });
-                            h.on('getDataSrv', 'mean_topo', function () { return mean_topo; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for get_price_par');
-                        });
-                        if (config === null || config === void 0 ? void 0 : config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.get_price_par = get_price_par;

aqua-examples/price-oracle/client-peer/dist/src/get_crypto_prices.js

@@ -1,133 +0,0 @@
-"use strict";
-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 });
-exports.get_price_par = exports.get_price = void 0;
-var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable");
-function get_price(client, coin, currency, node, pg_sid, mean_sid, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"coin\") [] coin)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"currency\") [] currency)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"pg_sid\") [] pg_sid)\n      )\n      (call %init_peer_id% (\"getDataSrv\" \"mean_sid\") [] mean_sid)\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (seq\n       (seq\n        (seq\n         (seq\n          (seq\n           (seq\n            (call node (\"op\" \"string_to_b58\") [node] k)\n            (call node (\"peer\" \"timestamp_ms\") [] ts_ms0)\n           )\n           (call node (pg_sid \"price_getter\") [coin currency ts_ms0] res0)\n          )\n          (call node (\"op\" \"identity\") [res0.$.result!] $prices)\n         )\n         (call node (\"peer\" \"timestamp_ms\") [] ts_ms1)\n        )\n        (call node (pg_sid \"price_getter\") [coin currency ts_ms1] res1)\n       )\n       (call node (\"op\" \"identity\") [res1.$.result!] $prices)\n      )\n      (call node (mean_sid \"mean\") [$prices] result)\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\") [result])\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 client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'coin', function () { return coin; });
-                            h.on('getDataSrv', 'currency', function () { return currency; });
-                            h.on('getDataSrv', 'node', function () { return node; });
-                            h.on('getDataSrv', 'pg_sid', function () { return pg_sid; });
-                            h.on('getDataSrv', 'mean_sid', function () { return mean_sid; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for get_price');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.get_price = get_price;
-function get_price_par(client, coin, currency, getter_topo, mean_topo, config) {
-    return __awaiter(this, void 0, void 0, function () {
-        var request, promise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    promise = new Promise(function (resolve, reject) {
-                        var r = new api_unstable_1.RequestFlowBuilder()
-                            .disableInjections()
-                            .withRawScript("\n(xor\n (seq\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\" \"coin\") [] coin)\n         )\n         (call %init_peer_id% (\"getDataSrv\" \"currency\") [] currency)\n        )\n        (call %init_peer_id% (\"getDataSrv\" \"getter_topo\") [] getter_topo)\n       )\n       (call %init_peer_id% (\"getDataSrv\" \"mean_topo\") [] mean_topo)\n      )\n      (fold getter_topo topo\n       (par\n        (seq\n         (seq\n          (call -relay- (\"op\" \"noop\") [])\n          (xor\n           (seq\n            (seq\n             (seq\n              (call topo.$.node! (\"op\" \"string_to_b58\") [topo.$.node!] k)\n              (call topo.$.node! (\"peer\" \"timestamp_ms\") [] ts_ms)\n             )\n             (call topo.$.node! (topo.$.service_id! \"price_getter\") [coin currency ts_ms] res)\n            )\n            (call topo.$.node! (\"op\" \"identity\") [res.$.result!] $prices)\n           )\n           (seq\n            (call -relay- (\"op\" \"noop\") [])\n            (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n           )\n          )\n         )\n         (call mean_topo.$.node! (\"op\" \"noop\") [])\n        )\n        (next topo)\n       )\n      )\n     )\n     (call -relay- (\"op\" \"noop\") [])\n    )\n    (xor\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call mean_topo.$.node! (mean_topo.$.service_id! \"mean\") [$prices] result)\n     )\n     (seq\n      (call -relay- (\"op\" \"noop\") [])\n      (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n     )\n    )\n   )\n   (call -relay- (\"op\" \"noop\") [])\n  )\n  (xor\n   (call %init_peer_id% (\"callbackSrv\" \"response\") [result])\n   (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n  )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n            ")
-                            .configHandler(function (h) {
-                            h.on('getDataSrv', '-relay-', function () {
-                                return client.relayPeerId;
-                            });
-                            h.on('getDataSrv', 'coin', function () { return coin; });
-                            h.on('getDataSrv', 'currency', function () { return currency; });
-                            h.on('getDataSrv', 'getter_topo', function () { return getter_topo; });
-                            h.on('getDataSrv', 'mean_topo', function () { return mean_topo; });
-                            h.onEvent('callbackSrv', 'response', function (args) {
-                                var res = args[0];
-                                resolve(res);
-                            });
-                            h.onEvent('errorHandlingSrv', 'error', function (args) {
-                                // assuming error is the single argument
-                                var err = args[0];
-                                reject(err);
-                            });
-                        })
-                            .handleScriptError(reject)
-                            .handleTimeout(function () {
-                            reject('Request timed out for get_price_par');
-                        });
-                        if (config && config.ttl) {
-                            r.withTTL(config.ttl);
-                        }
-                        request = r.build();
-                    });
-                    return [4 /*yield*/, client.initiateFlow(request)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, promise];
-            }
-        });
-    });
-}
-exports.get_price_par = get_price_par;

aqua-examples/price-oracle/client-peer/dist/src/index.js

@@ -1,90 +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 get_crypto_prices_1 = require("./get_crypto_prices");
-var getter_topo;
-var mean_topo;
-getter_topo = Array({ "node": "12D3KooWCMr9mU894i8JXAFqpgoFtx6qnV1LFPSfVc3Y34N4h4LS", "service_id": "c315073d-4311-4db3-be57-8f154f032d28" }, { "node": "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi", "service_id": "25f9123a-f386-4cb2-9c1e-bb7c247c9c09" });
-mean_topo = { "node": "12D3KooWCMr9mU894i8JXAFqpgoFtx6qnV1LFPSfVc3Y34N4h4LS", "service_id": "dd47389f-25d9-4870-a2a9-909359e73580" };
-function main() {
-    return __awaiter(this, void 0, void 0, function () {
-        var fluence, network_result, network_result_par;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    console.log("hello crypto investors");
-                    return [4 /*yield*/, fluence_1.createClient(fluence_network_environment_1.krasnodar[2])];
-                case 1:
-                    fluence = _a.sent();
-                    console.log("created a fluence client %s with relay %s", fluence.selfPeerId, fluence.relayPeerId);
-                    return [4 /*yield*/, get_crypto_prices_1.get_price(fluence, "ethereum", "usd", "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi", "25f9123a-f386-4cb2-9c1e-bb7c247c9c09", "b2790307-055e-41ca-9640-3c41856d464b")];
-                case 2:
-                    network_result = _a.sent();
-                    console.log("seq result: ", network_result);
-                    return [4 /*yield*/, get_crypto_prices_1.get_price_par(fluence, "ethereum", "usd", getter_topo, mean_topo)];
-                case 3:
-                    network_result_par = _a.sent();
-                    console.log("par result: ", network_result_par);
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-main()
-    .then(function () { return process.exit(0); })
-    .catch(function (error) {
-    console.error(error);
-    process.exit(1);
-});

aqua-examples/price-oracle/client-peer/get_crypto_prices.ts

@@ -1,237 +0,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.1.9-163
- *
- */
-import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
-import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
-import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
-
-
-
-export async function get_price(client: FluenceClient, coin: string, currency: string, node: string, pg_sid: string, mean_sid: string, config?: {ttl?: number}): Promise<{error_msg:string;result:number;success:boolean}> {
-    let request: RequestFlow;
-    const promise = new Promise<{error_msg:string;result:number;success:boolean}>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
- (seq
-  (seq
-   (seq
-    (seq
-     (seq
-      (seq
-       (seq
-        (seq
-         (seq
-          (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-          (call %init_peer_id% ("getDataSrv" "coin") [] coin)
-         )
-         (call %init_peer_id% ("getDataSrv" "currency") [] currency)
-        )
-        (call %init_peer_id% ("getDataSrv" "node") [] node)
-       )
-       (call %init_peer_id% ("getDataSrv" "pg_sid") [] pg_sid)
-      )
-      (call %init_peer_id% ("getDataSrv" "mean_sid") [] mean_sid)
-     )
-     (call -relay- ("op" "noop") [])
-    )
-    (xor
-     (seq
-      (seq
-       (seq
-        (seq
-         (seq
-          (seq
-           (seq
-            (call node ("op" "string_to_b58") [node] k)
-            (call node ("peer" "timestamp_ms") [] ts_ms0)
-           )
-           (call node (pg_sid "price_getter") [coin currency ts_ms0] res0)
-          )
-          (call node ("op" "identity") [res0.$.result!] $prices)
-         )
-         (call node ("peer" "timestamp_ms") [] ts_ms1)
-        )
-        (call node (pg_sid "price_getter") [coin currency ts_ms1] res1)
-       )
-       (call node ("op" "identity") [res1.$.result!] $prices)
-      )
-      (call node (mean_sid "mean") [$prices] 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 client.relayPeerId!;
-                });
-                h.on('getDataSrv', 'coin', () => {return coin;});
-h.on('getDataSrv', 'currency', () => {return currency;});
-h.on('getDataSrv', 'node', () => {return node;});
-h.on('getDataSrv', 'pg_sid', () => {return pg_sid;});
-h.on('getDataSrv', 'mean_sid', () => {return mean_sid;});
-                h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
-  resolve(res);
-});
-
-                h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
-                    const [err] = args;
-                    reject(err);
-                });
-            })
-            .handleScriptError(reject)
-            .handleTimeout(() => {
-                reject('Request timed out for get_price');
-            })
-        if(config?.ttl) {
-            r.withTTL(config.ttl)
-        }
-        request = r.build();
-    });
-    await client.initiateFlow(request!);
-    return promise;
-}
-      
-
-
-export async function get_price_par(client: FluenceClient, coin: string, currency: string, getter_topo: {node:string;service_id:string}[], mean_topo: {node:string;service_id:string}, config?: {ttl?: number}): Promise<{error_msg:string;result:number;success:boolean}> {
-    let request: RequestFlow;
-    const promise = new Promise<{error_msg:string;result:number;success:boolean}>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
- (seq
-  (seq
-   (seq
-    (seq
-     (seq
-      (seq
-       (seq
-        (seq
-         (seq
-          (seq
-           (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-           (call %init_peer_id% ("getDataSrv" "coin") [] coin)
-          )
-          (call %init_peer_id% ("getDataSrv" "currency") [] currency)
-         )
-         (call %init_peer_id% ("getDataSrv" "getter_topo") [] getter_topo)
-        )
-        (call %init_peer_id% ("getDataSrv" "mean_topo") [] mean_topo)
-       )
-       (fold getter_topo topo
-        (par
-         (seq
-          (seq
-           (seq
-            (call -relay- ("op" "noop") [])
-            (xor
-             (seq
-              (seq
-               (seq
-                (call topo.$.node! ("op" "string_to_b58") [topo.$.node!] k)
-                (call topo.$.node! ("peer" "timestamp_ms") [] ts_ms)
-               )
-               (call topo.$.node! (topo.$.service_id! "price_getter") [coin currency ts_ms] res)
-              )
-              (call topo.$.node! ("op" "identity") [res.$.result!] $prices)
-             )
-             (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 topo)
-        )
-       )
-      )
-      (call %init_peer_id% ("op" "identity") [$prices.$.[2]!])
-     )
-     (call -relay- ("op" "noop") [])
-    )
-    (xor
-     (seq
-      (call -relay- ("op" "noop") [])
-      (call mean_topo.$.node! (mean_topo.$.service_id! "mean") [$prices] result)
-     )
-     (seq
-      (call -relay- ("op" "noop") [])
-      (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
-     )
-    )
-   )
-   (call -relay- ("op" "noop") [])
-  )
-  (xor
-   (call %init_peer_id% ("callbackSrv" "response") [result])
-   (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 client.relayPeerId!;
-                });
-                h.on('getDataSrv', 'coin', () => {return coin;});
-h.on('getDataSrv', 'currency', () => {return currency;});
-h.on('getDataSrv', 'getter_topo', () => {return getter_topo;});
-h.on('getDataSrv', 'mean_topo', () => {return mean_topo;});
-                h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
-  resolve(res);
-});
-
-                h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
-                    const [err] = args;
-                    reject(err);
-                });
-            })
-            .handleScriptError(reject)
-            .handleTimeout(() => {
-                reject('Request timed out for get_price_par');
-            })
-        if(config?.ttl) {
-            r.withTTL(config.ttl)
-        }
-        request = r.build();
-    });
-    await client.initiateFlow(request!);
-    return promise;
-}
-      

aqua-examples/price-oracle/client-peer/package.json

@@ -14,12 +14,12 @@
   ],
   "dependencies": {
     "@fluencelabs/aqua-lib": "^0.1.9",
-    "@fluencelabs/fluence": "^0.9.53",
+    "@fluencelabs/fluence": "^0.11.0",
     "@fluencelabs/fluence-network-environment": "^1.0.10",
     "it-all": "^1.0.5"
   },
   "scripts": {
-    "compile-aqua": "aqua -i ../aqua-scripts -o .",
+    "compile-aqua": "aqua -i ../aqua-scripts -o src/_aqua",
     "prebuild": "npm run compile-aqua",
     "build": "tsc",
     "prestart:local": "npm run build",
@@ -43,7 +43,7 @@
   },
   "homepage": "git+https://github.com/fluencelabs/examples/aqua-examples/price-oracle#readme",
   "devDependencies": {
-    "@fluencelabs/aqua": "0.1.14-207",
+    "@fluencelabs/aqua": "^0.3.0-226",
     "typescript": "^3.9.5"
   }
-}
+}

aqua-examples/price-oracle/client-peer/src/get_crypto_prices.ts

@@ -1,230 +0,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.1.9-164
- *
- */
-import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
-import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
-import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
-
-
-
-export async function get_price(client: FluenceClient, coin: string, currency: string, node: string, pg_sid: string, mean_sid: string, config?: { ttl?: number }): Promise<{ error_msg: string; result: number; success: boolean }> {
-    let request: RequestFlow;
-    const promise = new Promise<{ error_msg: string; result: number; success: boolean }>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
- (seq
-  (seq
-   (seq
-    (seq
-     (seq
-      (seq
-       (seq
-        (seq
-         (seq
-          (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-          (call %init_peer_id% ("getDataSrv" "coin") [] coin)
-         )
-         (call %init_peer_id% ("getDataSrv" "currency") [] currency)
-        )
-        (call %init_peer_id% ("getDataSrv" "node") [] node)
-       )
-       (call %init_peer_id% ("getDataSrv" "pg_sid") [] pg_sid)
-      )
-      (call %init_peer_id% ("getDataSrv" "mean_sid") [] mean_sid)
-     )
-     (call -relay- ("op" "noop") [])
-    )
-    (xor
-     (seq
-      (seq
-       (seq
-        (seq
-         (seq
-          (seq
-           (seq
-            (call node ("op" "string_to_b58") [node] k)
-            (call node ("peer" "timestamp_ms") [] ts_ms0)
-           )
-           (call node (pg_sid "price_getter") [coin currency ts_ms0] res0)
-          )
-          (call node ("op" "identity") [res0.$.result!] $prices)
-         )
-         (call node ("peer" "timestamp_ms") [] ts_ms1)
-        )
-        (call node (pg_sid "price_getter") [coin currency ts_ms1] res1)
-       )
-       (call node ("op" "identity") [res1.$.result!] $prices)
-      )
-      (call node (mean_sid "mean") [$prices] 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 client.relayPeerId!;
-                });
-                h.on('getDataSrv', 'coin', () => { return coin; });
-                h.on('getDataSrv', 'currency', () => { return currency; });
-                h.on('getDataSrv', 'node', () => { return node; });
-                h.on('getDataSrv', 'pg_sid', () => { return pg_sid; });
-                h.on('getDataSrv', 'mean_sid', () => { return mean_sid; });
-                h.onEvent('callbackSrv', 'response', (args) => {
-                    const [res] = args;
-                    resolve(res);
-                });
-
-                h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
-                    const [err] = args;
-                    reject(err);
-                });
-            })
-            .handleScriptError(reject)
-            .handleTimeout(() => {
-                reject('Request timed out for get_price');
-            })
-        if (config && config.ttl) {
-            r.withTTL(config.ttl)
-        }
-        request = r.build();
-    });
-    await client.initiateFlow(request!);
-    return promise;
-}
-
-
-
-export async function get_price_par(client: FluenceClient, coin: string, currency: string, getter_topo: { node: string; service_id: string }[], mean_topo: { node: string; service_id: string }, config?: { ttl?: number }): Promise<{ error_msg: string; result: number; success: boolean }> {
-    let request: RequestFlow;
-    const promise = new Promise<{ error_msg: string; result: number; success: boolean }>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
- (seq
-  (seq
-   (seq
-    (seq
-     (seq
-      (seq
-       (seq
-        (seq
-         (seq
-          (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-          (call %init_peer_id% ("getDataSrv" "coin") [] coin)
-         )
-         (call %init_peer_id% ("getDataSrv" "currency") [] currency)
-        )
-        (call %init_peer_id% ("getDataSrv" "getter_topo") [] getter_topo)
-       )
-       (call %init_peer_id% ("getDataSrv" "mean_topo") [] mean_topo)
-      )
-      (fold getter_topo topo
-       (par
-        (seq
-         (seq
-          (call -relay- ("op" "noop") [])
-          (xor
-           (seq
-            (seq
-             (seq
-              (call topo.$.node! ("op" "string_to_b58") [topo.$.node!] k)
-              (call topo.$.node! ("peer" "timestamp_ms") [] ts_ms)
-             )
-             (call topo.$.node! (topo.$.service_id! "price_getter") [coin currency ts_ms] res)
-            )
-            (call topo.$.node! ("op" "identity") [res.$.result!] $prices)
-           )
-           (seq
-            (call -relay- ("op" "noop") [])
-            (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-           )
-          )
-         )
-         (call mean_topo.$.node! ("op" "noop") [])
-        )
-        (next topo)
-       )
-      )
-     )
-     (call -relay- ("op" "noop") [])
-    )
-    (xor
-     (seq
-      (call -relay- ("op" "noop") [])
-      (call mean_topo.$.node! (mean_topo.$.service_id! "mean") [$prices] result)
-     )
-     (seq
-      (call -relay- ("op" "noop") [])
-      (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
-     )
-    )
-   )
-   (call -relay- ("op" "noop") [])
-  )
-  (xor
-   (call %init_peer_id% ("callbackSrv" "response") [result])
-   (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 client.relayPeerId!;
-                });
-                h.on('getDataSrv', 'coin', () => { return coin; });
-                h.on('getDataSrv', 'currency', () => { return currency; });
-                h.on('getDataSrv', 'getter_topo', () => { return getter_topo; });
-                h.on('getDataSrv', 'mean_topo', () => { return mean_topo; });
-                h.onEvent('callbackSrv', 'response', (args) => {
-                    const [res] = args;
-                    resolve(res);
-                });
-
-                h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
-                    const [err] = args;
-                    reject(err);
-                });
-            })
-            .handleScriptError(reject)
-            .handleTimeout(() => {
-                reject('Request timed out for get_price_par');
-            })
-        if (config && config.ttl) {
-            r.withTTL(config.ttl)
-        }
-        request = r.build();
-    });
-    await client.initiateFlow(request!);
-    return promise;
-}

aqua-examples/price-oracle/client-peer/src/index.ts

@@ -14,41 +14,66 @@
  * limitations under the License.
  */
 
-import { createClient, setLogLevel, FluenceClient } from "@fluencelabs/fluence";
+import { setLogLevel, FluencePeer } from "@fluencelabs/fluence";
 import { krasnodar, Node } from "@fluencelabs/fluence-network-environment";
-import { get_price, get_price_par } from "./get_crypto_prices";
+import { get_price, get_price_par } from "./_aqua/get_crypto_prices";
 
 interface NodeServicePair {
-    node: string;
-    service_id: string;
-
+  node: string;
+  service_id: string;
 }
 
 let getter_topo: Array<NodeServicePair>;
 let mean_topo: NodeServicePair;
 
-getter_topo = Array({ "node": "12D3KooWCMr9mU894i8JXAFqpgoFtx6qnV1LFPSfVc3Y34N4h4LS", "service_id": "c315073d-4311-4db3-be57-8f154f032d28" }, { "node": "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi", "service_id": "25f9123a-f386-4cb2-9c1e-bb7c247c9c09" });
-mean_topo = { "node": "12D3KooWCMr9mU894i8JXAFqpgoFtx6qnV1LFPSfVc3Y34N4h4LS", "service_id": "dd47389f-25d9-4870-a2a9-909359e73580" };
+getter_topo = Array(
+  {
+    node: "12D3KooWCMr9mU894i8JXAFqpgoFtx6qnV1LFPSfVc3Y34N4h4LS",
+    service_id: "c315073d-4311-4db3-be57-8f154f032d28",
+  },
+  {
+    node: "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi",
+    service_id: "25f9123a-f386-4cb2-9c1e-bb7c247c9c09",
+  }
+);
+mean_topo = {
+  node: "12D3KooWCMr9mU894i8JXAFqpgoFtx6qnV1LFPSfVc3Y34N4h4LS",
+  service_id: "dd47389f-25d9-4870-a2a9-909359e73580",
+};
 
 async function main() {
-    console.log("hello crypto investors");
-    // setLogLevel('DEBUG');
-    const fluence = await createClient(krasnodar[2]);
-    console.log("created a fluence client %s with relay %s", fluence.selfPeerId, fluence.relayPeerId);
+  console.log("hello crypto investors");
+  // setLogLevel('DEBUG');
+  await Fluence.start({ connectTo: krasnodar[2] });
+  console.log(
+    "created a fluence client %s with relay %s",
+    FluencePeer.default.connectionInfo.selfPeerId,
+    FluencePeer.default.connectionInfo.connectedRelay
+  );
 
-    const network_result = await get_price(fluence, "ethereum", "usd", "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi", "25f9123a-f386-4cb2-9c1e-bb7c247c9c09", "b2790307-055e-41ca-9640-3c41856d464b");
-    console.log("seq result: ", network_result);
+  const network_result = await get_price(
+    "ethereum",
+    "usd",
+    "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi",
+    "25f9123a-f386-4cb2-9c1e-bb7c247c9c09",
+    "b2790307-055e-41ca-9640-3c41856d464b"
+  );
+  console.log("seq result: ", network_result);
 
-    const network_result_par = await get_price_par(fluence, "ethereum", "usd", getter_topo, mean_topo);
-    console.log("par result: ", network_result_par);
+  const network_result_par = await get_price_par(
+    "ethereum",
+    "usd",
+    getter_topo,
+    mean_topo
+  );
+  console.log("par result: ", network_result_par);
 
-    return;
+  return;
 }
 
 main()
-    .then(() => process.exit(0))
-    .catch(error => {
-        console.error(error);
-        process.exit(1);
-    });
-
+  .then(() => process.exit(0))
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });

js-sdk-examples/browser-example/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fluencelabs/fluence": "0.9.53",
+    "@fluencelabs/fluence": "0.12.0",
     "@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.1.14-207",
+    "@fluencelabs/aqua": "^0.3.0-226",
     "@fluencelabs/aqua-lib": "0.1.9",
     "chokidar-cli": "^2.1.0",
     "node-sass": "^6.0.1"

js-sdk-examples/browser-example/src/App.tsx

@@ -2,32 +2,30 @@ import React, { useEffect, useState } from "react";
 import logo from "./logo.svg";
 import "./App.scss";
 
-import { createClient, FluenceClient } from "@fluencelabs/fluence";
+import { Fluence } from "@fluencelabs/fluence";
 import { krasnodar } from "@fluencelabs/fluence-network-environment";
 import { getRelayTime } from "./_aqua/getting-started";
 
 const relayNode = krasnodar[0];
 
 function App() {
-  const [client, setClient] = useState<FluenceClient | null>(null);
   const [relayTime, setRelayTime] = useState<Date | null>(null);
 
-  useEffect(() => {
-    createClient(relayNode)
-      .then((client) => setClient(client))
-      .catch((err) => console.log("Client initialization failed", err));
-  }, [client]);
 
-  const doGetRelayTime = async () => {
-    if (!client) {
+  useEffect(() => {
+    Fluence.start({ connectTo: relayNode })
+      .catch((err) => console.log("Client initialization failed", err));
+  }, []);
+
+  const onGetRelayTimeBtnClick = async () => {
+    if (!Fluence.getStatus().isConnected) {
       return;
     }
 
-    const time = await getRelayTime(client, relayNode.peerId);
+    const time = await getRelayTime(relayNode.peerId);
     setRelayTime(new Date(time));
   };
 
-  const isConnected = client !== null;
 
   return (
     <div className="App">
@@ -36,8 +34,8 @@ function App() {
       </header>
 
       <div className="content">
-        <h1>Status: {isConnected ? "Connected" : "Disconnected"}</h1>
-        <button className="btn" onClick={doGetRelayTime}>
+        <h1>Status: {Fluence.getStatus().isConnected ? "Connected" : "Disconnected"}</h1>
+        <button className="btn" onClick={onGetRelayTimeBtnClick}>
           Get relay time
         </button>
         {relayTime && (

js-sdk-examples/browser-example/src/_aqua/getting-started.ts

@@ -3,23 +3,46 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-162
+ * Aqua version: 0.3.0-226
  *
  */
-import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
-import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
-import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+import { Fluence, FluencePeer } from '@fluencelabs/fluence';
+import {
+    ResultCodes,
+    RequestFlow,
+    RequestFlowBuilder,
+    CallParams,
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
 
 
+// Services
 
-export async function getRelayTime(client: FluenceClient, relayPeerId: string, config?: {ttl?: number}): Promise<number> {
-    let request: RequestFlow;
-    const promise = new Promise<number>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
+
+// Functions
+
+ export function getRelayTime(relayPeerId: string, config?: {ttl?: number}) : Promise<number>;
+ export function getRelayTime(peer: FluencePeer, relayPeerId: string, config?: {ttl?: number}) : Promise<number>;
+ 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<number>((resolve, reject) => {
+         const r = new RequestFlowBuilder()
+                 .disableInjections()
+                 .withRawScript(
+                     `
+     (xor
  (seq
   (seq
    (seq
@@ -48,20 +71,19 @@ export async function getRelayTime(client: FluenceClient, relayPeerId: string, c
  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
 )
 
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
+                 `,
+                 )
+                 .configHandler((h) => {
+                     h.on('getDataSrv', '-relay-', () => {
+                    return peer.getStatus().relayPeerId;
                 });
                 h.on('getDataSrv', 'relayPeerId', () => {return relayPeerId;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
                     const [err] = args;
                     reject(err);
                 });
@@ -70,12 +92,12 @@ export async function getRelayTime(client: FluenceClient, relayPeerId: string, c
             .handleTimeout(() => {
                 reject('Request timed out for getRelayTime');
             })
-        if(config?.ttl) {
+        if(config && config.ttl) {
             r.withTTL(config.ttl)
         }
         request = r.build();
     });
-    await client.initiateFlow(request!);
+    peer.internals.initiateFlow(request!);
     return promise;
 }
-      
+      

js-sdk-examples/browser-example/tsconfig.json

@@ -9,6 +9,7 @@
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
+    "noImplicitAny": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,

js-sdk-examples/hello-world/aqua/hello-world.aqua

@@ -0,0 +1,12 @@
+import Peer from "@fluencelabs/aqua-lib/builtin.aqua"
+
+service HelloWorld("hello-world"):
+    hello(str: string)
+
+func sayHello():
+    HelloWorld.hello("Hello, world!")
+
+func getRelayTime() -> u64:
+    on HOST_PEER_ID:
+        ts <- Peer.timestamp_ms()
+    <- ts

js-sdk-examples/hello-world/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "hello-world",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "start": "node -r ts-node/register src/index.ts",
+    "compile-aqua": "aqua --import . -i ./aqua/ -o ./src/_aqua",
+    "watch-aqua": "chokidar \"**/*.aqua\" -c \"npm run compile-aqua\""
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@fluencelabs/aqua": "^0.3.0-226",
+    "@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-network-environment": "1.0.10"
+  }
+}

js-sdk-examples/hello-world/src/_aqua/hello-world.ts

@@ -0,0 +1,213 @@
+/**
+ *
+ * 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
+ *
+ */
+import { Fluence, FluencePeer } from '@fluencelabs/fluence';
+import {
+    ResultCodes,
+    RequestFlow,
+    RequestFlowBuilder,
+    CallParams,
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
+
+
+// Services
+
+ export interface HelloWorldDef {
+     hello: (str: string, callParams: CallParams<'str'>) => void;
+ }
+
+ 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"
+}
+
+    // 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<void>;
+ export function sayHello(peer: FluencePeer, config?: {ttl?: number}) : Promise<void>;
+ 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<void>((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])
+)
+
+                 `,
+                 )
+                 .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()]);
+}
+      
+
+
+ export function getRelayTime(config?: {ttl?: number}) : Promise<number>;
+ export function getRelayTime(peer: FluencePeer, config?: {ttl?: number}) : Promise<number>;
+ 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<number>((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])
+)
+
+                 `,
+                 )
+                 .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;
+}
+      

js-sdk-examples/hello-world/src/index.ts

@@ -0,0 +1,27 @@
+import { Fluence } from "@fluencelabs/fluence";
+import { krasnodar } from "@fluencelabs/fluence-network-environment";
+import {
+  registerHelloWorld,
+  sayHello,
+  getRelayTime,
+} from "./_aqua/hello-world";
+
+async function main() {
+  await Fluence.start({ connectTo: krasnodar[0] });
+
+  registerHelloWorld({
+    hello: async (str) => {
+      console.log(str);
+    },
+  });
+
+  await sayHello();
+
+  const relayTime = await getRelayTime();
+
+  console.log("The relay time is: ", new Date(relayTime).toLocaleString());
+
+  await Fluence.stop();
+}
+
+main();

js-sdk-examples/hello-world/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "ES2015",
+    "module": "CommonJS",
+    "skipLibCheck": true
+  }
+}

js-sdk-examples/node-example/aqua/calc.aqua

@@ -0,0 +1,8 @@
+service Calc("calc"):
+    add(n: f32)
+    subtract(n: f32)
+    multiply(n: f32)
+    divide(n: f32)
+    reset()
+    getResult() -> f32
+

js-sdk-examples/node-example/aqua/demo-calculation.aqua

@@ -0,0 +1,13 @@
+import "./calc.aqua"
+
+const PEER ?= "12D3KooWLBkw4Tz8bRoSriy5WEpHyWfU11jEK3b5yCa7FBRDRWH3"
+const RELAY ?= "12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e"
+
+func demoCalculation() -> f32:
+    on PEER via RELAY:
+        Calc.add(10)
+        Calc.multiply(5)
+        Calc.subtract(8)
+        Calc.divide(6)
+        res <- Calc.getResult()
+    <- res

js-sdk-examples/node-example/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "node-example",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "start": "node -r ts-node/register src/index.ts",
+    "compile-aqua": "aqua --import . -i ./aqua/ -o ./src/_aqua",
+    "watch-aqua": "chokidar \"**/*.aqua\" -c \"npm run compile-aqua\""
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@fluencelabs/aqua": "^0.3.0-226",
+    "chokidar-cli": "^3.0.0",
+    "ts-node": "^10.2.1",
+    "typescript": "^4.4.2"
+  },
+  "dependencies": {
+    "@fluencelabs/fluence": "0.12.0",
+    "@fluencelabs/fluence-network-environment": "1.0.10"
+  }
+}

js-sdk-examples/node-example/src/_aqua/calc.ts

@@ -0,0 +1,167 @@
+/**
+ *
+ * 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
+ *
+ */
+import { Fluence, FluencePeer } from '@fluencelabs/fluence';
+import {
+    ResultCodes,
+    RequestFlow,
+    RequestFlowBuilder,
+    CallParams,
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
+
+
+// Services
+
+ export interface CalcDef {
+     add: (n: number, callParams: CallParams<'n'>) => void;
+divide: (n: number, callParams: CallParams<'n'>) => void;
+getResult: (callParams: CallParams<null>) => number;
+multiply: (n: number, callParams: CallParams<'n'>) => void;
+reset: (callParams: CallParams<null>) => void;
+subtract: (n: number, callParams: CallParams<'n'>) => void;
+ }
+
+ 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"
+}
+
+    // 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
+

js-sdk-examples/node-example/src/_aqua/demo-calculation.ts

@@ -0,0 +1,122 @@
+/**
+ *
+ * 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
+ *
+ */
+import { Fluence, FluencePeer } from '@fluencelabs/fluence';
+import {
+    ResultCodes,
+    RequestFlow,
+    RequestFlowBuilder,
+    CallParams,
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
+
+
+// Services
+
+
+// Functions
+
+ export function demoCalculation(config?: {ttl?: number}) : Promise<number>;
+ export function demoCalculation(peer: FluencePeer, config?: {ttl?: number}) : Promise<number>;
+ 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<number>((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") [])
+      )
+     )
+    )
+    (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;
+}
+      

js-sdk-examples/node-example/src/index.ts

@@ -0,0 +1,59 @@
+import { Fluence } from "@fluencelabs/fluence";
+import { krasnodar } from "@fluencelabs/fluence-network-environment";
+import { registerCalc, CalcDef } from "./_aqua/calc";
+
+class Calc implements CalcDef {
+  private _state: number = 0;
+
+  add(n: number) {
+    this._state += n;
+  }
+
+  subtract(n: number) {
+    this._state -= n;
+  }
+
+  multiply(n: number) {
+    this._state *= n;
+  }
+
+  divide(n: number) {
+    this._state /= n;
+  }
+
+  reset() {
+    this._state = 0;
+  }
+
+  getResult() {
+    return this._state;
+  }
+}
+
+const keypress = async () => {
+  process.stdin.setRawMode(true);
+  return new Promise<void>((resolve) =>
+    process.stdin.once("data", () => {
+      process.stdin.setRawMode(false);
+      resolve();
+    })
+  );
+};
+
+async function main() {
+  await Fluence.start({
+    connectTo: krasnodar[0],
+  });
+
+  registerCalc(new Calc());
+
+  console.log("application started");
+  console.log("peer id is: ", Fluence.getStatus().peerId);
+  console.log("relay is: ", Fluence.getStatus().relayPeerId);
+  console.log("press any key to continue");
+  await keypress();
+
+  await Fluence.stop();
+}
+
+main();

js-sdk-examples/node-example/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "ES2015",
+    "module": "CommonJS",
+    "skipLibCheck": true
+  }
+}

quickstart/1-browser-to-browser/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fluencelabs/fluence": "0.10.1",
+    "@fluencelabs/fluence": "0.12.0",
     "@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.2.2-221",
+    "@fluencelabs/aqua": "^0.3.0-226",
     "@fluencelabs/aqua-lib": "0.1.14",
     "chokidar-cli": "^2.1.0",
     "node-sass": "^6.0.1"

quickstart/1-browser-to-browser/src/App.tsx

@@ -1,46 +1,47 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import logo from "./logo.svg";
 import "./App.scss";
 
-import { createClient, FluenceClient } from "@fluencelabs/fluence";
+import { Fluence } from "@fluencelabs/fluence";
 import { krasnodar } from "@fluencelabs/fluence-network-environment";
-import { sayHello } from "./_aqua/getting-started";
+import { sayHello, registerHelloPeer } from "./_aqua/getting-started";
 
 const relayNodes = [krasnodar[0], krasnodar[1], krasnodar[2]];
 
 function App() {
-  const [client, setClient] = useState<FluenceClient | null>(null);
+  const [isConnected, setIsConnected] = useState<boolean>(false);
   const [helloMessage, setHelloMessage] = useState<string | null>(null);
 
   const [peerIdInput, setPeerIdInput] = useState<string>("");
   const [relayPeerIdInput, setRelayPeerIdInput] = useState<string>("");
 
-  const connect = (relayPeerId: string) => {
-    createClient(relayPeerId)
-      .then((client) => {
-        // Register handler for this call in aqua:
-        // HelloPeer.hello(%init_peer_id%)
-        client.callServiceHandler.on("HelloPeer", "hello", (args) => {
-          const [from] = args;
+  const connect = async (relayPeerId: string) => {
+    try {
+      await Fluence.start({ connectTo: relayPeerId });
+      setIsConnected(true);
+      // Register handler for this call in aqua:
+      // HelloPeer.hello(%init_peer_id%)
+      registerHelloPeer({
+        hello: (from) => {
           setHelloMessage("Hello from: \n" + from);
           return "Hello back to you, \n" + from;
-        });
-        setClient(client);
-      })
-      .catch((err) => console.log("Client initialization failed", err));
+        }
+      });
+    } catch (err) {
+       console.log("Peer initialization failed", err);
+    }
   };
 
   const helloBtnOnClick = async () => {
-    if (client === null) {
+    if (!Fluence.getStatus().isConnected) {
       return;
     }
+    
     // Using aqua is as easy as calling a javascript funсtion
-    const res = await sayHello(client!, peerIdInput, relayPeerIdInput);
+    const res = await sayHello(peerIdInput, relayPeerIdInput);
     setHelloMessage(res);
   };
 
-  const isConnected = client !== null;
-
   return (
     <div className="App">
       <header>
@@ -55,11 +56,11 @@ function App() {
               <tbody>
                 <tr>
                   <td className="bold">Peer id:</td>
-                  <td className="mono">{client!.selfPeerId}</td>
+                  <td className="mono">{Fluence.getStatus().peerId!}</td>
                   <td>
                     <button
                       className="btn-clipboard"
-                      onClick={() => copyToClipboard(client!.selfPeerId)}
+                      onClick={() => copyToClipboard(Fluence.getStatus().peerId!)}
                     >
                       <i className="gg-clipboard"></i>
                     </button>
@@ -67,11 +68,11 @@ function App() {
                 </tr>
                 <tr>
                   <td className="bold">Relay peer id:</td>
-                  <td className="mono">{client!.relayPeerId}</td>
+                  <td className="mono">{Fluence.getStatus().relayPeerId}</td>
                   <td>
                     <button
                       className="btn-clipboard"
-                      onClick={() => copyToClipboard(client!.relayPeerId!)}
+                      onClick={() => copyToClipboard(Fluence.getStatus().relayPeerId!)}
                     >
                       <i className="gg-clipboard"></i>
                     </button>

quickstart/1-browser-to-browser/src/_aqua/getting-started.ts

@@ -3,34 +3,114 @@
  * 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.2.2-221
+ * Aqua version: 0.3.0-226
  *
  */
-import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
-import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
-import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+import { Fluence, FluencePeer } from '@fluencelabs/fluence';
+import {
+    ResultCodes,
+    RequestFlow,
+    RequestFlowBuilder,
+    CallParams,
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
 
 
 // Services
 
-//HelloPeer
-//defaultId = "HelloPeer"
+ export interface HelloPeerDef {
+     hello: (from: string, callParams: CallParams<'from'>) => string;
+ }
 
-//hello: (from: string) => string
-//END HelloPeer
+ 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 async function sayHello(client: FluenceClient, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}): Promise<string> {
-    let request: RequestFlow;
-    const promise = new Promise<string>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
+ export function sayHello(targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise<string>;
+ export function sayHello(peer: FluencePeer, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise<string>;
+ 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<string>((resolve, reject) => {
+         const r = new RequestFlowBuilder()
+                 .disableInjections()
+                 .withRawScript(
+                     `
+     (xor
  (seq
   (seq
    (seq
@@ -74,11 +154,11 @@ export async function sayHello(client: FluenceClient, targetPeerId: string, targ
  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
 )
 
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
+                 `,
+                 )
+                 .configHandler((h) => {
+                     h.on('getDataSrv', '-relay-', () => {
+                    return peer.getStatus().relayPeerId;
                 });
                 h.on('getDataSrv', 'targetPeerId', () => {return targetPeerId;});
 h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;});
@@ -88,7 +168,6 @@ h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;});
 });
 
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
                     const [err] = args;
                     reject(err);
                 });
@@ -102,7 +181,7 @@ h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;});
         }
         request = r.build();
     });
-    await client.initiateFlow(request!);
+    peer.internals.initiateFlow(request!);
     return promise;
 }
       

quickstart/3-browser-to-service/aqua/getting-started.aqua

@@ -1,7 +1,7 @@
 import "@fluencelabs/aqua-lib/builtin.aqua"
 
-const helloWorldNodePeerId ?= "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi"
-const helloWorldServiceId ?= "1e740ce4-81f6-4dd4-9bed-8d86e9c2fa50"
+const HELLO_WORLD_NODE_PEER_ID ?= "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi"
+const HELLO_WORLD_SERVICE_ID ?= "1e740ce4-81f6-4dd4-9bed-8d86e9c2fa50"
 
 data HelloWorld:
   msg: string
@@ -17,8 +17,8 @@ service HelloPeer("HelloPeer"):
 
 func sayHello(targetPeerId: PeerId, targetRelayPeerId: PeerId) -> string:
     -- execute computation on a Peer in the network
-    on helloWorldNodePeerId:
-        HelloWorld helloWorldServiceId
+    on HELLO_WORLD_NODE_PEER_ID:
+        HelloWorld HELLO_WORLD_SERVICE_ID
         comp <- HelloWorld.hello(%init_peer_id%)
 
     -- send the result to target browser in the background

quickstart/3-browser-to-service/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fluencelabs/fluence": "0.10.1",
+    "@fluencelabs/fluence": "0.12.0",
     "@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.2.2-221",
+    "@fluencelabs/aqua": "^0.3.0-226",
     "@fluencelabs/aqua-lib": "0.1.14",
     "chokidar-cli": "^2.1.0",
     "node-sass": "^6.0.1"

quickstart/3-browser-to-service/src/App.tsx

@@ -2,45 +2,46 @@ import React, { useState } from "react";
 import logo from "./logo.svg";
 import "./App.scss";
 
-import { createClient, FluenceClient } from "@fluencelabs/fluence";
+import { Fluence } from "@fluencelabs/fluence";
 import { krasnodar } from "@fluencelabs/fluence-network-environment";
-import { sayHello } from "./_aqua/getting-started";
+import { registerHelloPeer, sayHello } from "./_aqua/getting-started";
 
 const relayNodes = [krasnodar[0], krasnodar[1], krasnodar[2]];
 
 function App() {
-  const [client, setClient] = useState<FluenceClient | null>(null);
+  const [isConnected, setIsConnected] = useState<boolean>(false);
   const [helloMessage, setHelloMessage] = useState<string | null>(null);
 
   const [peerIdInput, setPeerIdInput] = useState<string>("");
   const [relayPeerIdInput, setRelayPeerIdInput] = useState<string>("");
 
-  const connect = (relayPeerId: string) => {
-    createClient(relayPeerId)
-      .then((client) => {
-        // Register handler for this call in aqua:
-        // HelloWorld.recieveHello(%init_peer_id%)
-        client.callServiceHandler.onEvent("HelloPeer", "hello", (args) => {
-          // no computation is done inside the browser
-          const [msg] = args;
-          setHelloMessage(msg);
-        });
-        setClient(client);
-      })
-      .catch((err) => console.log("Client initialization failed", err));
+  const connect = async (relayPeerId: string) => {
+    try {
+      await Fluence.start({ connectTo: relayPeerId });
+      setIsConnected(true);
+      // Register handler for this call in aqua:
+      // HelloPeer.hello(%init_peer_id%)
+      registerHelloPeer({
+        hello: (from) => {
+          setHelloMessage("Hello from: \n" + from);
+          return "Hello back to you, \n" + from;
+        }
+      });
+    } catch (err) {
+       console.log("Peer initialization failed", err);
+    }
   };
 
   const helloBtnOnClick = async () => {
-    if (client === null) {
+    if (!isConnected) {
       return;
     }
+    
     // Using aqua is as easy as calling a javascript funсtion
-    const res = await sayHello(client!, peerIdInput, relayPeerIdInput);
+    const res = await sayHello(peerIdInput, relayPeerIdInput);
     setHelloMessage(res);
   };
 
-  const isConnected = client !== null;
-
   return (
     <div className="App">
       <header>
@@ -55,11 +56,11 @@ function App() {
               <tbody>
                 <tr>
                   <td className="bold">Peer id:</td>
-                  <td className="mono">{client!.selfPeerId}</td>
+                  <td className="mono">{Fluence.getStatus().peerId!}</td>
                   <td>
                     <button
                       className="btn-clipboard"
-                      onClick={() => copyToClipboard(client!.selfPeerId)}
+                      onClick={() => copyToClipboard(Fluence.getStatus().peerId!)}
                     >
                       <i className="gg-clipboard"></i>
                     </button>
@@ -67,11 +68,11 @@ function App() {
                 </tr>
                 <tr>
                   <td className="bold">Relay peer id:</td>
-                  <td className="mono">{client!.relayPeerId}</td>
+                  <td className="mono">{Fluence.getStatus().relayPeerId!}</td>
                   <td>
                     <button
                       className="btn-clipboard"
-                      onClick={() => copyToClipboard(client!.relayPeerId!)}
+                      onClick={() => copyToClipboard(Fluence.getStatus().relayPeerId!)}
                     >
                       <i className="gg-clipboard"></i>
                     </button>

quickstart/3-browser-to-service/src/_aqua/getting-started.ts

@@ -3,43 +3,176 @@
  * 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.2.2-221
+ * Aqua version: 0.3.0-226
  *
  */
-import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
-import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
-import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+import { Fluence, FluencePeer } from '@fluencelabs/fluence';
+import {
+    ResultCodes,
+    RequestFlow,
+    RequestFlowBuilder,
+    CallParams,
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
 
 
 // Services
 
-//HelloWorld
-//defaultId = undefined
+ export interface HelloWorldDef {
+     hello: (from: string, callParams: CallParams<'from'>) => {msg:string;reply:string};
+ }
 
-//hello: (from: string) => {msg:string;reply:string}
-//END HelloWorld
+ 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 interface HelloPeerDef {
+     hello: (message: string, callParams: CallParams<'message'>) => string;
+ }
 
+ 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();
+    }
 
-//HelloPeer
-//defaultId = "HelloPeer"
+    if (typeof args[0] === 'string') {
+        serviceId = args[0];
+    } else if (typeof args[1] === 'string') {
+        serviceId = args[1];
+    }  
+ else {
+     serviceId = "HelloPeer"
+}
 
-//hello: (message: string) => string
-//END 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 async function sayHello(client: FluenceClient, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}): Promise<string> {
-    let request: RequestFlow;
-    const promise = new Promise<string>((resolve, reject) => {
-        const r = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
+ export function sayHello(targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise<string>;
+ export function sayHello(peer: FluencePeer, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise<string>;
+ 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<string>((resolve, reject) => {
+         const r = new RequestFlowBuilder()
+                 .disableInjections()
+                 .withRawScript(
+                     `
+     (xor
  (seq
   (seq
    (seq
@@ -92,11 +225,11 @@ export async function sayHello(client: FluenceClient, targetPeerId: string, targ
  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
 )
 
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
+                 `,
+                 )
+                 .configHandler((h) => {
+                     h.on('getDataSrv', '-relay-', () => {
+                    return peer.getStatus().relayPeerId;
                 });
                 h.on('getDataSrv', 'targetPeerId', () => {return targetPeerId;});
 h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;});
@@ -106,7 +239,6 @@ h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;});
 });
 
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
                     const [err] = args;
                     reject(err);
                 });
@@ -120,7 +252,7 @@ h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;});
         }
         request = r.build();
     });
-    await client.initiateFlow(request!);
+    peer.internals.initiateFlow(request!);
     return promise;
 }