pinokiod 1.2.19 → 1.2.21

package/kernel/api/index.js

@@ -527,6 +527,7 @@ class Api {
     // replace {{{ }}} with {{ }}
     rpc = this.kernel.template.flatten(rpc)
 
+
     // 6. rpc must have method names
     if (rpc.method) {
 
@@ -723,8 +724,42 @@ class Api {
 
           } else {
             // still going
-            let next_rpc = script.run[rpc.next]
-            return { request, rawrpc: next_rpc, input: result, step: rpc.next, total: script.run.length }
+            //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 }
           }
 
         } catch (e) {
@@ -809,9 +844,6 @@ class Api {
     let concurrency = (rawrpc.queue ? 1 : 10);
 
     // queue_id
-    if (rawrpc.queue) {
-    } else {
-    }
 
     let queue_id
     if (rawrpc.uri) {

package/kernel/index.js

@@ -28,7 +28,7 @@ const VARS = {
 //const memwatch = require('@airbnb/node-memwatch');
 class Kernel {
   //schema = ">=1.0.0"
-  schema = "<=1.3.0"
+  schema = "<=1.4.0"
   constructor(store) {
     this.fetch = fetch
     this.store = store

package/package.json

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