pinokiod 1.2.21 → 1.2.22

package/kernel/api/index.js

@@ -575,6 +575,50 @@ class Api {
           rpc.next = null
         }
 
+        if (rpc.hasOwnProperty("when")) {
+          console.log("rpc.when", { rpc })
+          // if rpc.when is false, don't run this and go to the next step
+          if (!rpc.when) {
+            if (typeof rpc.next === "undefined" || rpc.next === null) {
+              // last call
+              if (script.daemon) {
+                this.ondata({
+                  id: request.path,
+                  type: "start",
+                  data: {
+                    title: "Started",
+                    description: "All scripts finished running. Running in daemon mode..."
+                  }
+                })
+              } else {
+                // no next rpc to execute. Finish
+                this.kernel.memory.local[request.path] = {}
+                this.ondata({
+                  id: request.path,
+                  type: "event",
+                  data: "stop",
+                  rpc,
+                  rawrpc
+                })
+                await this.stop({
+                  params: {
+                    uri: request.path
+                  }
+                })
+              }
+              return
+            } else {
+              // still ongoing
+              let next_rpc = script.run[rpc.next]
+              console.log("NEXT RPC", next_rpc, i, rpc.next)
+              if (next_rpc) {
+                return { request, rawrpc: next_rpc, input: null, step: rpc.next, total: script.run.length }
+              }
+            }
+          }
+        }
+
+
         try {
           this.ondata({
             id: request.path,
@@ -724,42 +768,8 @@ class Api {
 
           } else {
             // still going
-            //let next_rpc = script.run[rpc.next]
-            for(let i=rpc.next; i<script.run.length; i++) {
-              let next_rpc = script.run[i]
-              console.log("NEXT RPC", next_rpc)
-              if (next_rpc) {
-                return { request, rawrpc: next_rpc, input: result, step: i, total: script.run.length }
-              }
-            }
-
-            // if all the steps are null, end.
-            if (script.daemon) {
-              this.ondata({
-                id: request.path,
-                type: "start",
-                data: {
-                  title: "Started",
-                  description: "All scripts finished running. Running in daemon mode..."
-                }
-              })
-            } else {
-              // no next rpc to execute. Finish
-              this.kernel.memory.local[request.path] = {}
-              this.ondata({
-                id: request.path,
-                type: "event",
-                data: "stop",
-                rpc,
-                rawrpc
-              })
-              await this.stop({
-                params: {
-                  uri: request.path
-                }
-              })
-            }
-            //return { request, rawrpc: next_rpc, input: result, step: rpc.next, total: script.run.length }
+            let next_rpc = script.run[rpc.next]
+            return { request, rawrpc: next_rpc, input: result, step: rpc.next, total: script.run.length }
           }
 
         } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "description": "",
   "main": "index.js",
   "scripts": {