pinokiod 3.19.62 → 3.19.65

package/kernel/util.js

@@ -159,27 +159,32 @@ const exists= (abspath) => {
   return new Promise(r=>fs.access(abspath, fs.constants.F_OK, e => r(!e)))
 }
 const log = async (filepath, str, session) => {
-  try {
-    await fs.promises.mkdir(filepath, { recursive: true })
-  } catch (e) {
-  }
+  if (str && str.trim().length > 0) {
+    try {
+      await fs.promises.mkdir(filepath, { recursive: true })
+    } catch (e) {
+    }
 
-  let output = '';
-  for (let line of str.split('\n')) {
-    line = line.split('\r').pop(); // handle overwriting lines
-    output += line + '\n';
-  }
+    let output = '';
+    for (let line of str.split('\n')) {
+      line = line.split('\r').pop(); // handle overwriting lines
+      output += line + '\n';
+    }
 
-  const pattern = [
-    '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
-    '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-Za-z=><~]))'
-  ].join('|');
-  const regex = new RegExp(pattern, 'gi')
-  let stripped = str.replaceAll(regex, '');
-  let logpath = path.resolve(filepath, session)
-  await fs.promises.writeFile(logpath, stripped)
-  let latest_logpath = path.resolve(filepath, "latest")
-  await fs.promises.writeFile(latest_logpath, stripped)
+    const pattern = [
+      '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+      '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-Za-z=><~]))'
+    ].join('|');
+    const regex = new RegExp(pattern, 'gi')
+    let stripped = str.replaceAll(regex, '');
+    let logpath = path.resolve(filepath, session)
+    console.log("> write log", logpath)
+    await fs.promises.writeFile(logpath, stripped)
+    let latest_logpath = path.resolve(filepath, "latest")
+    console.log("> write latest log", latest_logpath)
+    await fs.promises.writeFile(latest_logpath, stripped)
+    console.log("> all logs written")
+  }
 }
 const run = (cmd, cwd, kernel) => {
 //  console.log("Util.run", { cmd, cwd })

package/package.json

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

package/server/socket.js

@@ -176,74 +176,7 @@ class Socket {
       for(let key in this.buffer) {
         let buf = this.buffer[key]
         if (this.old_buffer[key] !== buf) {
-
-          /*
-            
-            dev
-              /Users/x/pinokio/plugin/dev/claude.json?cwd=/Users/x/pinokio/api/audioplay
-              /Users/x/pinokio/plugin/dev/gemini.json?cwd=/Users/x/pinokio/api/audioplay
-
-            api 
-              /Users/x/pinokio/api/audioplay/start.json
-
-            shell
-              facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
-              facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
-              audioplay_0.0_a56eb7d48c9e96d8a5217d625d83d204
-          */
-
-          // 1. dev
-          if (path.isAbsolute(key)) {
-            let p = key.replace(/\?.*$/, '')
-            let relative = path.relative(this.parent.kernel.homedir, p)
-            if (relative.startsWith("plugin")) {
-              // dev
-              let m = /\?.*$/.exec(key)
-              if (m && m.length > 0) {
-                /*
-                DEV Changed {
-                  cwd: '/Users/x/pinokio/api/audioplay',
-                  relative: 'plugin/dev/claude.json'
-                }
-                */
-                let paramStr = m[0]
-                let cwd = new URL("http://localhost" + paramStr).searchParams.get("cwd")
-                let session = this.sessions[key]
-                let logpath = path.resolve(cwd, "logs/dev", path.parse(relative).base)
-                await Util.log(logpath, buf, session)
-
-              }
-            } else if (relative.startsWith("api")) {
-              // api
-              /*
-              API Changed {
-                cwd: '/Users/x/pinokio/api/audioplay/start.json',
-                filepath: [ 'start.json' ]
-              }
-              */
-              let filepath_chunks = relative.split(path.sep).slice(2)
-              let cwd = this.parent.kernel.path(...relative.split(path.sep).slice(0, 2))
-              let session = this.sessions[key]
-              let logpath = path.resolve(cwd, "logs/api", ...filepath_chunks)
-              await Util.log(logpath, buf, session)
-            }
-          } else {
-            // Only log SHELL
-            /*
-            SHELL Changed { cwd: '/Users/x/pinokio/api/kernel.api.stop', key: 'kernel.api.stop' }
-            */
-            if (key.startsWith("kernel.")) {
-              // do not log since these are not shell operations
-              // need to refactor later to make this logic cleaner
-            } else {
-              let cwd = this.parent.kernel.path("api", key.split("_")[0])
-              let session = this.sessions[key]
-              let logpath = path.resolve(cwd, "logs/shell")
-              await Util.log(logpath, buf, session)
-            }
-
-
-          }
+          this.log_buffer(key, buf)
         } else {
 //          console.log(`State hasn't changed: ${key}`)
         }
@@ -298,9 +231,11 @@ class Socket {
     }
 
     if (e.data && e.data.type === "shell.kill") {
-      // when shell is killed, reset the buffer
-      delete this.buffer[id]
-      delete this.sessions[id]
+      this.log_buffer(id, this.buffer[id]).then(() => {
+        // when shell is killed, reset the buffer
+        delete this.buffer[id]
+        delete this.sessions[id]
+      })
     }
 
     if (!this.buffer[id]) {
@@ -356,5 +291,75 @@ class Socket {
       }
     }
   }
+  async log_buffer(key, buf) {
+
+    /*
+      
+      dev
+        /Users/x/pinokio/plugin/dev/claude.json?cwd=/Users/x/pinokio/api/audioplay
+        /Users/x/pinokio/plugin/dev/gemini.json?cwd=/Users/x/pinokio/api/audioplay
+
+      api 
+        /Users/x/pinokio/api/audioplay/start.json
+
+      shell
+        facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
+        facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
+        audioplay_0.0_a56eb7d48c9e96d8a5217d625d83d204
+    */
+
+    // 1. dev
+    if (path.isAbsolute(key)) {
+      let p = key.replace(/\?.*$/, '')
+      let relative = path.relative(this.parent.kernel.homedir, p)
+      if (relative.startsWith("plugin")) {
+        // dev
+        let m = /\?.*$/.exec(key)
+        if (m && m.length > 0) {
+          /*
+          DEV Changed {
+            cwd: '/Users/x/pinokio/api/audioplay',
+            relative: 'plugin/dev/claude.json'
+          }
+          */
+          let paramStr = m[0]
+          let cwd = new URL("http://localhost" + paramStr).searchParams.get("cwd")
+          let session = this.sessions[key]
+          let logpath = path.resolve(cwd, "logs/dev", path.parse(relative).base)
+          await Util.log(logpath, buf, session)
+
+        }
+      } else if (relative.startsWith("api")) {
+        // api
+        /*
+        API Changed {
+          cwd: '/Users/x/pinokio/api/audioplay/start.json',
+          filepath: [ 'start.json' ]
+        }
+        */
+        let filepath_chunks = relative.split(path.sep).slice(2)
+        let cwd = this.parent.kernel.path(...relative.split(path.sep).slice(0, 2))
+        let session = this.sessions[key]
+        let logpath = path.resolve(cwd, "logs/api", ...filepath_chunks)
+        await Util.log(logpath, buf, session)
+      }
+    } else {
+      // Only log SHELL
+      /*
+      SHELL Changed { cwd: '/Users/x/pinokio/api/kernel.api.stop', key: 'kernel.api.stop' }
+      */
+      if (key.startsWith("kernel.")) {
+        // do not log since these are not shell operations
+        // need to refactor later to make this logic cleaner
+      } else {
+        let cwd = this.parent.kernel.path("api", key.split("_")[0])
+        let session = this.sessions[key]
+        let logpath = path.resolve(cwd, "logs/shell")
+        await Util.log(logpath, buf, session)
+      }
+
+
+    }
+  }
 }
 module.exports = Socket