pinokiod 3.19.91 → 3.19.93

package/kernel/api/local/index.js

@@ -46,6 +46,8 @@ class Local {
         }
       }
     */
+
+
     let converted = Object.assign({}, req, {
       params: {
         local: req.params

package/kernel/api/set/index.js

@@ -104,6 +104,17 @@ module.exports = async (req, ondata, kernel) => {
       }
       old = await set(old, kv, kernel, req, ondata)
       kernel.memory[type][parent_id] = old
+    
+      if (ondata) {
+        ondata({ raw: `\r\n\r\n===================================================\r\n` })
+        ondata({
+          raw: `# ${type} variables\r\n`
+        })
+        ondata({
+          raw: JSON.stringify(old, null, 2).replace(/\n/g, "\r\n")
+        })
+        ondata({ raw: `\r\n===================================================\r\n\r\n` })
+      }
 
 //      if (!kernel.memory[type][req.uri]) {
 //        kernel.memory[type][req.uri] = {}

package/kernel/bin/cli.js

@@ -15,8 +15,11 @@ class CLI {
     } else {
       exists = await Util.exists(this.kernel.path("bin/npm/bin/pterm"))
     }
+    console.log("cli check")
+    console.log({exists})
     if (exists) {
       let p = this.kernel.which("pterm")
+      console.log({ p })
       if (p) {
         let res = await this.kernel.exec({
           message: "pterm version terminal"
@@ -25,6 +28,7 @@ class CLI {
         if (e && e.length > 0) {
           let v = e[1]
           let coerced = semver.coerce(v)
+          console.log({ e, v, coerced })
           if (semver.satisfies(coerced, this.version)) {
             return true
           } else {

package/kernel/index.js

@@ -638,6 +638,7 @@ class Kernel {
         return null
       }
     } else {
+      console.log("which.sync", name, this.envs.PATH)
       return which.sync(name, { nothrow: true, path: this.envs.PATH })
     }
   }

package/kernel/shells.js

@@ -92,11 +92,15 @@ class Shells {
     if (options) params.group = options.group  // set group
 
     let m
+    let matched_index
 
     // if error doesn't exist, add default "error:" event
     if (!params.on) {
       params.on = []
     }
+
+    let monitor = structuredClone(params.on)
+
     // default error
     const defaultHandlers = [{
       event: "/error:/i",
@@ -132,7 +136,8 @@ class Shells {
         }
       */
       if (params.on && Array.isArray(params.on)) {
-        for(let handler of params.on) {
+        for(let i=0; i<params.on.length; i++) {
+          let handler = params.on[i]
           // regexify
           //let matches = /^\/([^\/]+)\/([dgimsuy]*)$/.exec(handler.event)
           if (handler.event) {
@@ -167,10 +172,12 @@ class Shells {
                   stream.matches = rendered_event
                   if (handler.kill) {
                     m = rendered_event[0]
+                    matched_index = i
                     sh.kill()
                   }
                   if (handler.done) {
                     m = rendered_event[0]
+                    matched_index = i
                     sh.continue()
                   }
                 }
@@ -250,6 +257,36 @@ class Shells {
     }
 
 
+    if (ondata) {
+      if (m) {
+        ondata({ raw: `\r\n\r\n===================================================\r\n` })
+        //ondata({ raw: `# event handlers\r\n` })
+        //ondata({
+        //  raw: JSON.stringify(monitor, null, 2).replace(/\n/g, "\r\n") + "\r\n\r\n"
+        //})
+        ////for(let handler of monitor) {
+        ////  let matches = /^\/(.+)\/([dgimsuy]*)$/gs.exec(handler.event)
+        ////  if (!/g/.test(matches[2])) {
+        ////    matches[2] += "g"   // if g option is not included, include it (need it for matchAll)
+        ////  }
+        ////  let re = new RegExp(matches[1], matches[2])
+        ////  ondata({ raw: `- ${re}\r\n` })
+        ////}
+        //ondata({ raw: `# matched event handler\r\n` })
+        //ondata({
+        //  raw: JSON.stringify(monitor[matched_index], null, 2).replace(/\n/g, "\r\n") + "\r\n\r\n"
+        //})
+        ondata({
+          raw: `# input.event\r\n`
+        })
+        ondata({
+          raw: JSON.stringify(m, null, 2).replace(/\n/g, "\r\n")
+        })
+        ondata({ raw: `\r\n===================================================\r\n\r\n` })
+      }
+    }
+
+
     if (errors.size > 0) {
       // try replacing the shortest pattern from the text one by one and narrow down the errors
       // so it doesn't accidently contain a very long match

package/package.json

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