Add async example to hello-world

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

@@ -2,10 +2,15 @@ import Peer from "@fluencelabs/aqua-lib/builtin.aqua"
 
 service HelloWorld("hello-world"):
     hello(str: string)
+    getFortune() -> string
 
 func sayHello():
     HelloWorld.hello("Hello, world!")
 
+func tellFortune() -> string:
+    res <- HelloWorld.getFortune()
+    <- res
+
 func getRelayTime() -> u64:
     on HOST_PEER_ID:
         ts <- Peer.timestamp_ms()

fluence-js-examples/hello-world/package-lock.json

@@ -13,7 +13,7 @@
         "@fluencelabs/fluence-network-environment": "1.0.10"
       },
       "devDependencies": {
-        "@fluencelabs/aqua": "^0.3.0-226",
+        "@fluencelabs/aqua": "^0.3.2-233",
         "@fluencelabs/aqua-lib": "^0.1.14",
         "chokidar-cli": "^3.0.0",
         "ts-node": "^10.2.1",
@@ -73,14 +73,16 @@
       }
     },
     "node_modules/@fluencelabs/aqua": {
-      "version": "0.3.0-226",
+      "version": "0.3.2-233",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz",
-      "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==",
+      "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==",
       "dev": true,
+      "dependencies": {
+        "@fluencelabs/fluence": "0.12.1"
+      },
       "bin": {
         "aqua": "index.js",
-        "aqua-cli": "error.js",
+        "aqua-cli": "error.js"
-        "aqua-j": "index-java.js"
       }
     },
     "node_modules/@fluencelabs/aqua-lib": {
@@ -89,6 +91,30 @@
       "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==",
       "dev": true
     },
+    "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz",
+      "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==",
+      "dev": true,
+      "dependencies": {
+        "@chainsafe/libp2p-noise": "4.0.0",
+        "@fluencelabs/avm": "0.14.4",
+        "async": "3.2.0",
+        "base64-js": "1.5.1",
+        "bs58": "4.0.1",
+        "cids": "0.8.1",
+        "it-length-prefixed": "3.0.1",
+        "it-pipe": "1.1.0",
+        "libp2p": "0.32.3",
+        "libp2p-crypto": "0.19.7",
+        "libp2p-mplex": "0.10.4",
+        "libp2p-websockets": "0.16.1",
+        "loglevel": "1.7.0",
+        "multiaddr": "10.0.0",
+        "peer-id": "0.15.3",
+        "uuid": "8.3.0"
+      }
+    },
     "node_modules/@fluencelabs/avm": {
       "version": "0.14.4",
       "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz",
@@ -3243,10 +3269,39 @@
       }
     },
     "@fluencelabs/aqua": {
-      "version": "0.3.0-226",
+      "version": "0.3.2-233",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz",
-      "integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==",
+      "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "@fluencelabs/fluence": "0.12.1"
+      },
+      "dependencies": {
+        "@fluencelabs/fluence": {
+          "version": "0.12.1",
+          "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz",
+          "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==",
+          "dev": true,
+          "requires": {
+            "@chainsafe/libp2p-noise": "4.0.0",
+            "@fluencelabs/avm": "0.14.4",
+            "async": "3.2.0",
+            "base64-js": "1.5.1",
+            "bs58": "4.0.1",
+            "cids": "0.8.1",
+            "it-length-prefixed": "3.0.1",
+            "it-pipe": "1.1.0",
+            "libp2p": "0.32.3",
+            "libp2p-crypto": "0.19.7",
+            "libp2p-mplex": "0.10.4",
+            "libp2p-websockets": "0.16.1",
+            "loglevel": "1.7.0",
+            "multiaddr": "10.0.0",
+            "peer-id": "0.15.3",
+            "uuid": "8.3.0"
+          }
+        }
+      }
     },
     "@fluencelabs/aqua-lib": {
       "version": "0.1.14",

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

@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@fluencelabs/aqua": "^0.3.0-226",
+    "@fluencelabs/aqua": "^0.3.2-233",
     "@fluencelabs/aqua-lib": "^0.1.14",
     "chokidar-cli": "^3.0.0",
     "ts-node": "^10.2.1",

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

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.3.0-226
+ * Aqua version: 0.3.2-233
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@@ -11,21 +11,27 @@ import {
     ResultCodes,
     RequestFlow,
     RequestFlowBuilder,
-    CallParams,
+    CallParams
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
 
 
+function missingFields(obj: any, fields: string[]): string[] {
+    return fields.filter(f => !(f in obj))
+}
+
 // Services
 
- export interface HelloWorldDef {
+export interface HelloWorldDef {
-     hello: (str: string, callParams: CallParams<'str'>) => void;
+    getFortune: (callParams: CallParams<null>) => string;
- }
+hello: (str: string, callParams: CallParams<'str'>) => void;
-
+}
- export function registerHelloWorld(service: HelloWorldDef): 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) {
+       
+
+export function registerHelloWorld(...args: any) {
     let peer: FluencePeer;
     let serviceId: any;
     let service: any;
@@ -39,10 +45,9 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
         serviceId = args[0];
     } else if (typeof args[1] === 'string') {
         serviceId = args[1];
-    }  
+    } else {
- 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
@@ -57,15 +62,29 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
         service = args[2];
     }
 
+    const incorrectServiceDefinitions = missingFields(service, ['getFortune', 'hello']);
+    if (!!incorrectServiceDefinitions.length) {
+        throw new Error("Error registering service HelloWorld: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", "))
+    }
+
     peer.internals.callServiceHandler.use((req, resp, next) => {
         if (req.serviceId !== serviceId) {
             next();
             return;
         }
 
+        if (req.fnName === 'getFortune') {
+            const callParams = {
+                ...req.particleContext,
+                tetraplets: {
                     
- if (req.fnName === 'hello') {
+                },
+            };
+            resp.retCode = ResultCodes.success;
+            resp.result = service.getFortune(callParams)
+        }
 
+if (req.fnName === 'hello') {
             const callParams = {
                 ...req.particleContext,
                 tetraplets: {
@@ -74,20 +93,18 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
             };
             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(config?: {ttl?: number}): Promise<void>;
- export function sayHello(...args: any) {
+export function sayHello(peer: FluencePeer, config?: {ttl?: number}): Promise<void>;
+export function sayHello(...args: any) {
     let peer: FluencePeer;
 
     let config: any;
@@ -103,16 +120,14 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
     const promise = new Promise<void>((resolve, reject) => {
         const r = new RequestFlowBuilder()
                 .disableInjections()
-                 .withRawScript(
+                .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) => {
@@ -122,8 +137,7 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
 
                     h.onEvent('callbackSrv', 'response', (args) => {
 
-});
+                    });
-
                     h.onEvent('errorHandlingSrv', 'error', (args) => {
                         const [err] = args;
                         reject(err);
@@ -133,9 +147,11 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
                 .handleTimeout(() => {
                     reject('Request timed out for sayHello');
                 })
-        if(config && config.ttl) {
+
+                if (config && config.ttl) {
                     r.withTTL(config.ttl)
                 }
+
                 request = r.build();
     });
     peer.internals.initiateFlow(request!);
@@ -144,9 +160,74 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
 
  
 
- export function getRelayTime(config?: {ttl?: number}) : Promise<number>;
+export function tellFortune(config?: {ttl?: number}): Promise<string>;
- export function getRelayTime(peer: FluencePeer, config?: {ttl?: number}) : Promise<number>;
+export function tellFortune(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
- export function getRelayTime(...args: any) {
+export function tellFortune(...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<string>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+                .disableInjections()
+                .withRawScript(`
+                    (xor
+                     (seq
+                      (seq
+                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+                       (call %init_peer_id% ("hello-world" "getFortune") [] res)
+                      )
+                      (xor
+                       (call %init_peer_id% ("callbackSrv" "response") [res])
+                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+                      )
+                     )
+                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+                    )
+                `,
+                )
+                .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 tellFortune');
+                })
+
+                if (config && config.ttl) {
+                    r.withTTL(config.ttl)
+                }
+
+                request = r.build();
+    });
+    peer.internals.initiateFlow(request!);
+    return promise;
+}
+
+ 
+
+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;
@@ -162,8 +243,7 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
     const promise = new Promise<number>((resolve, reject) => {
         const r = new RequestFlowBuilder()
                 .disableInjections()
-                 .withRawScript(
+                .withRawScript(`
-                     `
                     (xor
                      (seq
                       (seq
@@ -179,8 +259,7 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
                       )
                      )
                      (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
-)
+                    )
-
                 `,
                 )
                 .configHandler((h) => {
@@ -191,8 +270,7 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
                     h.onEvent('callbackSrv', 'response', (args) => {
                         const [res] = args;
                         resolve(res);
-});
+                    });
-
                     h.onEvent('errorHandlingSrv', 'error', (args) => {
                         const [err] = args;
                         reject(err);
@@ -202,12 +280,13 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
                 .handleTimeout(() => {
                     reject('Request timed out for getRelayTime');
                 })
-        if(config && config.ttl) {
+
+                if (config && config.ttl) {
                     r.withTTL(config.ttl)
                 }
+
                 request = r.build();
     });
     peer.internals.initiateFlow(request!);
     return promise;
 }
-      

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

@@ -4,19 +4,27 @@ import {
   registerHelloWorld,
   sayHello,
   getRelayTime,
+  tellFortune,
 } from "./_aqua/hello-world";
 
 async function main() {
   await Fluence.start({ connectTo: krasnodar[0] });
 
   registerHelloWorld({
-    hello: async (str) => {
+    hello: (str) => {
       console.log(str);
     },
+    getFortune: async () => {
+      await new Promise(resolve => {
+        setTimeout(resolve, 1000)
+      })
+      return "Wealth awaits you very soon."
   });
 
   await sayHello();
 
+  console.log(await tellFortune());
+
   const relayTime = await getRelayTime();
 
   console.log("The relay time is: ", new Date(relayTime).toLocaleString());