pinokiod 2.15.45 → 2.15.47

package/kernel/api/index.js

@@ -10,6 +10,7 @@ const { glob, sync, hasMagic } = require('glob-gitignore')
 const fastq = require('fastq')
 const Loader = require("../loader")
 const Environment = require("../environment")
+const Util = require('../util')
 
 class Api {
   constructor(kernel) {
@@ -739,6 +740,27 @@ class Api {
               rpc,
               rawrpc
             })
+
+            // if there's an error, set the PINOKIO_SCRIPT_DEFAULT to false
+
+            /*
+              req := {
+                "method": "env.set",
+                "params": {
+                  <key>: <val>,
+                  <key>: <val>,
+                }
+              }
+            */
+            // write to current app folder's ENVIRONMENT
+            console.log("request", request)
+            let api_path = Util.api_path(request.path, this.kernel)
+            console.log("api_path", api_path)
+            let env_path = path.resolve(api_path, "ENVIRONMENT")
+            console.log("env_path", env_path)
+            await Util.update_env(env_path, {
+              PINOKIO_SCRIPT_DEFAULT: "false"
+            })
             return
           }
 

package/kernel/shells.js

@@ -59,22 +59,12 @@ class Shells {
       console.log("Message Array", params.message)
       for(let i=0; i<params.message.length; i++) {
         let message = params.message[i]
-        let params = Object.assign({}, params) 
-        params.message = message
-        console.log("Launching Message", params)
-        res = await this._launch(params, options, ondata)
-        // if there's an error, trigger an error event
+        let params_dup = Object.assign({}, params) 
+        params_dup.message = message
+        console.log("Launching Message", params_dup)
+        res = await this._launch(params_dup, options, ondata)
+        // if there's an error, immediately return with the error
         if (res.error) {
-          console.log("Error exists. Trigger an error", { res })
-          ondata({
-            id: res.id,
-            type: "error",
-            data: res.response,
-            event: res.error,
-//            rpc,
-//            rawrpc
-          })
-          // if there's an error, return immediately => so it will NOT go forward and stop the script
           return res
         }
       }
@@ -206,9 +196,6 @@ class Shells {
             }
           }
         }
-
-        console.log("Line before", line)
-
         // 3. Now with all the `break: false` (ignored patterns) gone, look for the `break: true` patterns
         for(let handler of breakPoints) {
           if (handler.event) {
@@ -218,16 +205,11 @@ class Shells {
             }
             let re = new RegExp(matches[1], matches[2])
 
-            console.log("re", re)
-
             // only the "break: true" ones
             if (handler.break) {
-              console.log("checking break handler", handler)
-
               let match;
               // Keep executing the regex on the text until no more matches are found
               while ((match = re.exec(line)) !== null) {
-                console.log("match found", match)
                 errors.add(match[0])
                 // errors.add(match.slice(1));
               }

package/package.json

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

package/server/views/fullscreen_editor.ejs

@@ -432,7 +432,8 @@ document.addEventListener("DOMContentLoaded", async () => {
 
 
 
-            document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
+            //document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
+            document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>ERROR</pre>`
 //            document.querySelector("footer .toggle-expand i").className = "fa-solid fa-circle-chevron-down"
 //            document.querySelector("footer").classList.add("expanded")
             document.querySelector("footer i").className = "fa-solid fa-triangle-exclamation"