Update hello-world example

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

@@ -13,7 +13,7 @@
         "@fluencelabs/fluence-network-environment": "1.0.10"
       },
       "devDependencies": {
-        "@fluencelabs/aqua": "^0.3.2-233",
+        "@fluencelabs/aqua": "^0.4.0-234",
         "@fluencelabs/aqua-lib": "^0.1.14",
         "chokidar-cli": "^3.0.0",
         "ts-node": "^10.2.1",
@@ -73,9 +73,9 @@
       }
     },
     "node_modules/@fluencelabs/aqua": {
-      "version": "0.3.2-233",
+      "version": "0.4.0-234",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-234.tgz",
-      "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==",
+      "integrity": "sha512-7ysLPh3R4gAfXgO24OGT7rP5UGKUHs7ipfx4HTJsYZahZ0rMbWA98uC/aM3+q0WH1WEowyV16zvGACONFLZ5RA==",
       "dev": true,
       "dependencies": {
         "@fluencelabs/fluence": "0.12.1"
@@ -3292,9 +3292,9 @@
       }
     },
     "@fluencelabs/aqua": {
-      "version": "0.3.2-233",
+      "version": "0.4.0-234",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-234.tgz",
-      "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==",
+      "integrity": "sha512-7ysLPh3R4gAfXgO24OGT7rP5UGKUHs7ipfx4HTJsYZahZ0rMbWA98uC/aM3+q0WH1WEowyV16zvGACONFLZ5RA==",
       "dev": true,
       "requires": {
         "@fluencelabs/fluence": "0.12.1"

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

@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@fluencelabs/aqua": "^0.3.2-233",
+    "@fluencelabs/aqua": "^0.4.0-234",
     "@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,27 +3,22 @@
  * 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.2-233
+ * Aqua version: 0.4.0-234
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
-    ResultCodes,
+    CallParams,
-    RequestFlow,
+    callFunction,
-    RequestFlowBuilder,
+    registerService,
-    CallParams
+} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-} 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 {
-    getFortune: (callParams: CallParams<null>) => string;
+    getFortune: (callParams: CallParams<null>) => string | Promise<string>;
-hello: (str: string, callParams: CallParams<'str'>) => void;
+hello: (str: string, callParams: CallParams<'str'>) => void | Promise<void>;
 }
 export function registerHelloWorld(service: HelloWorldDef): void;
 export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void;
@@ -32,71 +27,36 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
        
 
 export function registerHelloWorld(...args: any) {
-    let peer: FluencePeer;
+    registerService(
-    let serviceId: any;
+        args,
-    let service: any;
+        {
-    if (FluencePeer.isInstance(args[0])) {
+    "defaultServiceId" : "hello-world",
-        peer = args[0];
+    "functions" : [
-    } else {
+        {
-        peer = Fluence.getPeer();
+            "functionName" : "getFortune",
+            "argDefs" : [
+            ],
+            "returnType" : {
+                "tag" : "primitive"
             }
-
-    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];
-    }
-
-    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: {
-                    
         },
-            };
+        {
-            resp.retCode = ResultCodes.success;
+            "functionName" : "hello",
-            resp.result = service.getFortune(callParams)
+            "argDefs" : [
+                {
+                    "name" : "str",
+                    "argType" : {
+                        "tag" : "primitive"
                     }
-
-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();
+            "returnType" : {
-    });
+                "tag" : "void"
+            }
+        }
+    ]
+}
+    );
 }
       
 // Functions
@@ -105,22 +65,8 @@ if (req.fnName === 'hello') {
 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;
+    let script = `
-    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-)
@@ -128,34 +74,28 @@ export function sayHello(...args: any) {
                      )
                      (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
                     )
-                `,
+    `
-                )
+    return callFunction(
-                .configHandler((h) => {
+        args,
-                    h.on('getDataSrv', '-relay-', () => {
+        {
-                        return peer.getStatus().relayPeerId;
+    "functionName" : "sayHello",
-                    });
+    "returnType" : {
-
+        "tag" : "void"
-                    h.onEvent('callbackSrv', 'response', (args) => {
+    },
-
+    "argDefs" : [
-                    });
+    ],
-                    h.onEvent('errorHandlingSrv', 'error', (args) => {
+    "names" : {
-                        const [err] = args;
+        "relay" : "-relay-",
-                        reject(err);
+        "getDataSrv" : "getDataSrv",
-                    });
+        "callbackSrv" : "callbackSrv",
-                })
+        "responseSrv" : "callbackSrv",
-                .handleScriptError(reject)
+        "responseFnName" : "response",
-                .handleTimeout(() => {
+        "errorHandlingSrv" : "errorHandlingSrv",
-                    reject('Request timed out for sayHello');
+        "errorFnName" : "error"
-                })
-
-                if (config && config.ttl) {
-                    r.withTTL(config.ttl)
     }
-
+},
-                request = r.build();
+        script
-    });
+    )
-    peer.internals.initiateFlow(request!);
-    return Promise.race([promise, Promise.resolve()]);
 }
 
  
@@ -163,22 +103,8 @@ export function sayHello(...args: any) {
 export function tellFortune(config?: {ttl?: number}): Promise<string>;
 export function tellFortune(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
 export function tellFortune(...args: any) {
-    let peer: FluencePeer;
 
-    let config: any;
+    let script = `
-    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
@@ -192,35 +118,28 @@ export function tellFortune(...args: any) {
                      )
                      (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
                     )
-                `,
+    `
-                )
+    return callFunction(
-                .configHandler((h) => {
+        args,
-                    h.on('getDataSrv', '-relay-', () => {
+        {
-                        return peer.getStatus().relayPeerId;
+    "functionName" : "tellFortune",
-                    });
+    "returnType" : {
-
+        "tag" : "primitive"
-                    h.onEvent('callbackSrv', 'response', (args) => {
+    },
-                        const [res] = args;
+    "argDefs" : [
-                        resolve(res);
+    ],
-                    });
+    "names" : {
-                    h.onEvent('errorHandlingSrv', 'error', (args) => {
+        "relay" : "-relay-",
-                        const [err] = args;
+        "getDataSrv" : "getDataSrv",
-                        reject(err);
+        "callbackSrv" : "callbackSrv",
-                    });
+        "responseSrv" : "callbackSrv",
-                })
+        "responseFnName" : "response",
-                .handleScriptError(reject)
+        "errorHandlingSrv" : "errorHandlingSrv",
-                .handleTimeout(() => {
+        "errorFnName" : "error"
-                    reject('Request timed out for tellFortune');
-                })
-
-                if (config && config.ttl) {
-                    r.withTTL(config.ttl)
     }
-
+},
-                request = r.build();
+        script
-    });
+    )
-    peer.internals.initiateFlow(request!);
-    return promise;
 }
 
  
@@ -228,22 +147,8 @@ export function tellFortune(...args: any) {
 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;
+    let script = `
-    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
@@ -260,33 +165,26 @@ export function getRelayTime(...args: any) {
                      )
                      (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
                     )
-                `,
+    `
+    return callFunction(
+        args,
+        {
+    "functionName" : "getRelayTime",
+    "returnType" : {
+        "tag" : "primitive"
+    },
+    "argDefs" : [
+    ],
+    "names" : {
+        "relay" : "-relay-",
+        "getDataSrv" : "getDataSrv",
+        "callbackSrv" : "callbackSrv",
+        "responseSrv" : "callbackSrv",
+        "responseFnName" : "response",
+        "errorHandlingSrv" : "errorHandlingSrv",
+        "errorFnName" : "error"
+    }
+},
+        script
     )
-                .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;
 }

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

@@ -15,10 +15,11 @@ async function main() {
       console.log(str);
     },
     getFortune: async () => {
-      await new Promise(resolve => {
+      await new Promise((resolve) => {
-        setTimeout(resolve, 1000)
+        setTimeout(resolve, 1000);
-      })
+      });
-      return "Wealth awaits you very soon."
+      return "Wealth awaits you very soon.";
+    },
   });
 
   await sayHello();