pinokiod 3.8.21 → 3.8.23

package/kernel/bin/caddy.js

@@ -32,9 +32,6 @@ class Caddy {
         this.kernel.exec({
           message: `caddy run --watch`,
           path: this.kernel.homedir,
-          kill: [{
-            message: "caddy stop"
-          }]
         }, (e) => {
           console.log("[CADDY] " + e.cleaned)
           if (!resolved) {
@@ -57,12 +54,6 @@ class Caddy {
                 {
                   "match": [{ "method": ["OPTIONS"] }],
                   "handle": [
-                    {
-                      "handler": "request_header",
-                      "set": {
-                        "Origin": ["http://127.0.0.1"]
-                      }
-                    },
                     {
                       "handler": "headers",
                       "response": {
@@ -103,12 +94,6 @@ class Caddy {
                 {
                   "match": [{ "host": ["l.pinokio.localhost"] }],
                   "handle": [
-                    {
-                      "handler": "request_header",
-                      "set": {
-                        "Origin": ["http://127.0.0.1"]
-                      }
-                    },
                     {
                       "handler": "reverse_proxy",
                       "upstreams": [{ "dial": "127.0.0.1:1234" }]
@@ -129,12 +114,6 @@ class Caddy {
                 {
                   "match": [{ "host": ["o.pinokio.localhost"] }],
                   "handle": [
-                    {
-                      "handler": "request_header",
-                      "set": {
-                        "Origin": ["http://127.0.0.1"]
-                      }
-                    },
                     {
                       "handler": "reverse_proxy",
                       "upstreams": [{ "dial": "127.0.0.1:11434" }]
@@ -155,12 +134,6 @@ class Caddy {
                 {
                   "match": [{ "host": ["a.pinokio.localhost"] }],
                   "handle": [
-                    {
-                      "handler": "request_header",
-                      "set": {
-                        "Origin": ["http://127.0.0.1"]
-                      }
-                    },
                     {
                       "handler": "reverse_proxy",
                       "upstreams": [{ "dial": "127.0.0.1:7860" }]
@@ -181,12 +154,6 @@ class Caddy {
                 {
                   "match": [{ "host": ["b.pinokio.localhost"] }],
                   "handle": [
-                    {
-                      "handler": "request_header",
-                      "set": {
-                        "Origin": ["http://127.0.0.1"]
-                      }
-                    },
                     {
                       "handler": "reverse_proxy",
                       "upstreams": [{ "dial": "127.0.0.1:7861" }]
@@ -207,12 +174,6 @@ class Caddy {
                 {
                   "match": [{ "host": ["c.pinokio.localhost"] }],
                   "handle": [
-                    {
-                      "handler": "request_header",
-                      "set": {
-                        "Origin": ["http://127.0.0.1"]
-                      }
-                    },
                     {
                       "handler": "reverse_proxy",
                       "upstreams": [{ "dial": "127.0.0.1:7862" }]
@@ -363,9 +324,6 @@ class Caddy {
       this.kernel.exec({
         message: `caddy run --watch`,
         path: this.kernel.homedir,
-        kill: [{
-          message: "caddy stop"
-        }]
       }, (e) => {
         resolve()
         console.log("[CADDY] " + e.cleaned)
@@ -384,10 +342,6 @@ class Caddy {
         path: this.kernel.homedir
       }, (e) => {
         ondata(e)
-  //      console.log(e)
-  //        if (/Caddy Local Authority/i.test(e.cleaned)) {
-  //          trusted = true
-  //        }
       })
     } else {
       console.log("req", req)

package/kernel/shell.js

@@ -2,7 +2,7 @@ const { Terminal } = require('xterm-headless');
 const { SerializeAddon } = require("xterm-addon-serialize");
 const sanitize = require("sanitize-filename");
 const YAML = require('yaml')
-
+const kill = require('tree-kill');
 const fastq = require('fastq')
 const { v4: uuidv4 } = require('uuid');
 const os = require('os');
@@ -60,8 +60,6 @@ class Shell {
 
   }
   async init_env(params) {
-    console.log({ params })
-    console.time("> 1")
     this.env = Object.assign({}, process.env)
     // If the user has set PYTHONPATH, unset it.
     if (this.env.PYTHONPATH) {
@@ -90,16 +88,12 @@ class Shell {
 //    }
     for(let key in this.env) {
       if (key.startsWith("CUDA")) {
-        console.log("Unset env key: " + key)
         delete this.env[key]
       }
       if (/.*(SSH|SSL).*/.test(key)) {
-        console.log("Unset env key: " + key)
         delete this.env[key]
       }
     }
-    console.timeEnd("> 1")
-    console.time("> 2")
 
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
     this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
@@ -113,9 +107,7 @@ class Shell {
     // First override this.env with system env
     let system_env = await Environment.get(this.kernel.homedir)
     this.env = Object.assign(this.env, system_env)
-    console.timeEnd("> 2")
 
-    console.time("> 3")
     // if the shell is running from a script file, the params.$parent will include the path to the parent script
     // this means we need to apply app environment as well
     if (params.$parent) {
@@ -147,7 +139,6 @@ class Shell {
 
     if (this.platform === "linux") {
       let gxx = this.kernel.which('g++')
-      console.log({ gxx })
       if (gxx) {
         this.env.NVCC_PREPEND_FLAGS = `-ccbin ${gxx}`
       }
@@ -156,8 +147,6 @@ class Shell {
     this.env[PATH_KEY] = this.env[PATH_KEY] + path.delimiter + path.resolve(this.kernel.homedir, 'bin')
 
 
-    console.timeEnd("> 3")
-    console.time("> 4")
     if (params.env) {
       for(let key in params.env) {
         // iterate through the env attributes
@@ -191,10 +180,6 @@ class Shell {
         }
       }
     }
-    console.timeEnd("> 4")
-
-
-    console.time("> 5")
     for(let key in this.env) {
       if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key) && key !== "ProgramFiles(x86)") {
         delete this.env[key]
@@ -213,7 +198,6 @@ class Shell {
         delete this.env[key]
       }
     }
-    console.timeEnd("> 5")
   }
   async start(params, ondata) {
     this.ondata = ondata
@@ -245,9 +229,6 @@ class Shell {
       this.rows = params.client.rows
     }
 
-    console.log({ cols: this.cols, rows: this.rows })
-
-
     this.vt = new Terminal({
       allowProposedApi: true,
       cols: this.cols,
@@ -280,13 +261,13 @@ class Shell {
     if (params.sudo) {
       let options = {
         name: "Pinokio",
-        env: {}
+//        env: {}
 //        icns: '/Applications/Electron.app/Contents/Resources/Electron.icns', // (optional)
       };
 
-      for(let key in this.env) {
-        options.env[key] = String(this.env[key])
-      }
+//      for(let key in this.env) {
+//        options.env[key] = String(this.env[key])
+//      }
 
       // sudo-prompt uses TEMP
       await fs.promises.mkdir(this.env.TEMP, { recursive: true }).catch((e) => { })
@@ -297,7 +278,6 @@ class Shell {
         // Modify process.env (and need to immediately revert it back to original process.env so as to not affect other logic)
         let old_env = process.env
         process.env = this.env
-        console.log("sudo process.env", process.env)
         sudo.exec(params.message, options, (err, stdout, stderr) => {
           if (err) {
             console.log("SUDOPROMPT ERR", err)
@@ -343,7 +323,6 @@ class Shell {
         return;
       }
       let chunk = message.slice(i, i+1024)
-      console.log("Writing chunk", chunk)
       this.ptyProcess.write(chunk)
       i += 1024;
     }, 10);
@@ -972,14 +951,7 @@ class Shell {
       this.ondata({ raw: `\r\n\r\n██ Detached from Shell ${this.id}\r\n\r\n` })
     }
   }
-  runSequentially(tasks) {
-    let chain = Promise.resolve();
-    for (const task of tasks) {
-      chain = chain.then(() => task());
-    }
-    return chain;
-  }
-  kill(message, force) {
+  kill(message, force, cb) {
     console.log("KILL")
 
     this.done = true
@@ -1004,36 +976,24 @@ class Shell {
     this.vt.dispose()
     this.queue.killAndDrain()
     if (this.ptyProcess) {
-      if (this.kill_messages) {
-        console.log({ kill_messages: this.kill_messages })
-        let promises = this.kill_messages.map((m) => {
-          return new Promise(async (resolve, reject) => {
-            await this.kernel.exec(m, this.ondata)
-            resolve()
-          })
-        })
-        this.runSequentially(promises).then(() => {
-          console.log("Running kill message", { kill_messages })
-          this.ptyProcess.write(kill_messages)
+      if (cb) {
+        console.log("tree kill", this.ptyProcess.pid)
+        kill(this.ptyProcess.pid, 'SIGKILL', () => {
           this.ptyProcess.kill()
           this.ptyProcess = undefined
-          // automatically remove the shell from this.kernel.shells
-          this.kernel.shell.rm(this.id)
-          this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
-        })
+          cb()
+        });
       } else {
+        console.log("tree kill", this.ptyProcess.pid)
+        kill(this.ptyProcess.pid, 'SIGKILL');
         this.ptyProcess.kill()
         this.ptyProcess = undefined
-        // automatically remove the shell from this.kernel.shells
-        this.kernel.shell.rm(this.id)
-        this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
       }
-    } else {
-      // automatically remove the shell from this.kernel.shells
-      this.kernel.shell.rm(this.id)
-      this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
     }
 
+    // automatically remove the shell from this.kernel.shells
+    this.kernel.shell.rm(this.id)
+    this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
 
   }
   log() {

package/kernel/shells.js

@@ -358,7 +358,7 @@ class Shells {
   stop (request, message) {
     return this.kill(request, message)
   }
-  reset() {
+  reset(cb) {
     let info = this.shells.map((s) => {
       return { id: s.id, group: s.group, cmd: s.cmd }
     })
@@ -367,9 +367,19 @@ class Shells {
       for(let i=0; i<this.shells.length; i++) {
         shells.push(this.shells[i])
       }
+      let count = 0
       for(let shell of shells) {
         console.log("[Kill Shell]", { id: shell.id, group: shell.group, cmd: shell.cmd })
-        shell.kill("", true)
+        if (cb) {
+          shell.kill("", true, () => {
+            count++
+            if (count >= shells.length) {
+              cb()
+            }
+          })
+        } else {
+          shell.kill("", true)
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.8.21",
+  "version": "3.8.23",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -60,6 +60,7 @@
     "sudo-prompt-programfiles-x86": "^9.2.10",
     "symlink-dir": "^5.2.1",
     "systeminformation": "^5.18.4",
+    "tree-kill": "^1.2.2",
     "uuid": "^9.0.0",
     "wait-on": "^7.2.0",
     "which": "^5.0.0",

package/server/index.js

@@ -3846,13 +3846,19 @@ class Server {
     });
     process.on('SIGINT', () => {
       console.log("SIGINT Event")
-      if (this.kernel && this.kernel.shell) this.kernel.shell.reset()
-      process.exit()
+      if (this.kernel && this.kernel.shell) {
+        this.kernel.shell.reset(() => {
+          process.exit()
+        })
+      }
     })
     process.on('SIGTERM', () => {
       console.log("SIGTERM Event")
-      if (this.kernel && this.kernel.shell) this.kernel.shell.reset()
-      process.exit()
+      if (this.kernel && this.kernel.shell) {
+        this.kernel.shell.reset(() => {
+          process.exit()
+        })
+      }
     })
 //    process.on('exit', () => {
 //      console.log("exit Event")