pinokiod 3.19.63 → 3.19.66

package/package.json

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

package/server/index.js

@@ -366,6 +366,8 @@ class Server {
   }
 
   async chrome(req, res, type) {
+    let d = Date.now()
+    console.time("1 chrome " + d)
     let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
       bin: this.kernel.bin.preset("dev"),
     })
@@ -373,6 +375,7 @@ class Server {
       res.redirect(`/setup/dev?callback=${req.originalUrl}`)
       return
     }
+    console.timeEnd("1 chrome " + d)
 
     let name = req.params.name
     let config = await this.kernel.api.meta(name)
@@ -487,17 +490,22 @@ class Server {
 //      }
 //    }
 
+    console.time("2 chrome " + d)
     await this.init_env("api/" + name)
+    console.timeEnd("2 chrome " + d)
 
+    console.time("3 chrome " + d)
     let mode = "run"
     if (req.query && req.query.mode) {
       mode = req.query.mode
     }
     const env = await this.kernel.env("api/" + name)
+    console.timeEnd("3 chrome " + d)
 
     // profile + feed
     const repositoryPath = path.resolve(this.kernel.api.userdir, name)
 
+    console.time("4 chrome " + d)
     try {
       await git.resolveRef({ fs, dir: repositoryPath, ref: 'HEAD' });
     } catch (err) {
@@ -506,7 +514,9 @@ class Server {
       await git.init({ fs, dir: repositoryPath });
     }
 
+    console.timeEnd("4 chrome " + d)
 
+    console.time("5 chrome " + d)
     let gitRemote = await git.getConfig({ fs, http, dir: repositoryPath, path: 'remote.origin.url' })
     let profile
     let feed
@@ -520,11 +530,13 @@ class Server {
       profile = this.profile(gitRemote)
       feed = this.newsfeed(gitRemote)
     }
+    console.timeEnd("5 chrome " + d)
 
     // git
 
     let c = this.kernel.path("api", name)
 
+    console.time("6 chrome " + d)
     await this.kernel.plugin.init()
     let plugin = await this.getPlugin(name)
     let plugin_menu = null
@@ -571,9 +583,12 @@ class Server {
       execUrl: "/api/" + name,
 //      rawpath,
     }
+    console.timeEnd("6 chrome " + d)
+    console.time("7 chrome " + d)
     if (!this.kernel.proto.config) {
       await this.kernel.proto.init()
     }
+    console.timeEnd("7 chrome " + d)
     res.render("app", result)
   }
   getVariationUrls(req) {

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