pinokiod 3.8.128 → 3.8.130

package/kernel/bin/index.js

@@ -772,7 +772,7 @@ class Bin {
     //  }
     //}
     console.timeEnd("### Total Install")
-    await this.kernel.init()
+    await this.init()
   }
   async installed(r) {
     if (Array.isArray(r.name)) {

package/kernel/index.js

@@ -536,13 +536,13 @@ class Kernel {
     }
 
 //    // kill all processes just in case
-    await new Promise((resolve, reject) => {
-      console.log("killing child processes for", process.pid)
-      kill(process.pid, {}, 'SIGKILL', () => {
-        console.log("child procs killed for", process.pid)
-        resolve()
-      });
-    })
+//    await new Promise((resolve, reject) => {
+//      console.log("killing child processes for", process.pid)
+//      kill(process.pid, {}, 'SIGKILL', () => {
+//        console.log("child procs killed for", process.pid)
+//        resolve()
+//      });
+//    })
 
     this.info = new Info(this)
     this.pipe = new Pipe(this)

package/kernel/shell.js

@@ -2,7 +2,8 @@ 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 kill = require('./tree-kill');
+const kill = require('kill-sync')
 const fastq = require('fastq')
 const { v4: uuidv4 } = require('uuid');
 const os = require('os');
@@ -979,26 +980,42 @@ class Shell {
     this.queue.killAndDrain()
     if (this.ptyProcess) {
       if (cb) {
-        let map = this.kernel.processes.map || {}
-        kill(this.ptyProcess.pid, map, 'SIGKILL', () => {
-          console.log("child procs killed for", this.ptyProcess.pid)
-          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` })
-          console.log("before cb 1")
-          cb()
-        });
+        kill(this.ptyProcess.pid, "SIGKILL", true)
+        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` })
+        console.log("before cb 1")
+        cb()
+
+//        let map = this.kernel.processes.map || {}
+//        kill(this.ptyProcess.pid, map, 'SIGKILL', () => {
+//          console.log("child procs killed for", this.ptyProcess.pid)
+//          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` })
+//          console.log("before cb 1")
+//          cb()
+//        });
       } else {
-        let map = this.kernel.processes.map || {}
-        kill(this.ptyProcess.pid, map, 'SIGKILL');
-        console.log("child procs killed for", this.ptyProcess.pid)
+        kill(this.ptyProcess.pid, "SIGKILL", true)
         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` })
+
+//        let map = this.kernel.processes.map || {}
+//        kill(this.ptyProcess.pid, map, 'SIGKILL');
+//        console.log("child procs killed for", this.ptyProcess.pid)
+//        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

package/kernel/tree-kill.js

@@ -60,11 +60,11 @@ function killAll (tree, map, signal, callback) {
                     killed[pidpid] = 1;
                 }
             });
-            // exception: if the pid is the current process,
-            // kill all subprocesses, but do NOT kill the current process
-            if (String(pid) === String(process.pid)) {
-              return
-            }
+//            // exception: if the pid is the current process,
+//            // kill all subprocesses, but do NOT kill the current process
+//            if (String(pid) === String(process.pid)) {
+//              return
+//            }
             if (!killed[pid]) {
                 killPid(pid, map, signal);
                 killed[pid] = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.8.128",
+  "version": "3.8.130",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -40,6 +40,7 @@
     "jimini": "^0.0.7",
     "jsdom": "^24.0.0",
     "key-store": "^1.2.0",
+    "kill-sync": "^1.0.3",
     "kleur": "^4.1.5",
     "lodash": "^4.17.21",
     "marked": "^5.0.1",

package/server/index.js

@@ -1,5 +1,6 @@
 const express = require('express');
-const kill = require('../kernel/tree-kill');
+//const kill = require('../kernel/tree-kill');
+const kill = require('kill-sync')
 const portfinder = require('portfinder-cp');
 const proxy = require('express-http-proxy-cp');
 const sudo = require("sudo-prompt-programfiles-x86");
@@ -3955,10 +3956,11 @@ class Server {
       //  process.exit()
       //}
       let map = this.kernel.processes.map || {}
-      kill(process.pid, map, 'SIGKILL', () => {
-        console.log("child procs killed for", process.pid)
-        process.exit()
-      });
+      kill(process.pid, 'SIGKILL', true)
+      //kill(process.pid, map, 'SIGKILL', () => {
+      //  console.log("child procs killed for", process.pid)
+      //  process.exit()
+      //});
     })
 
     process.on('SIGTERM', () => {
@@ -3971,19 +3973,21 @@ class Server {
 //      } else {
 //        process.exit()
 //      }
-      let map = this.kernel.processes.map || {}
-      kill(process.pid, map, 'SIGKILL', () => {
-        console.log("child procs killed for", process.pid)
-        process.exit()
-      });
+      kill(process.pid, 'SIGKILL', true)
+      //let map = this.kernel.processes.map || {}
+      //kill(process.pid, map, 'SIGKILL', () => {
+      //  console.log("child procs killed for", process.pid)
+      //  process.exit()
+      //});
     })
     process.on('exit', () => {
       console.log("[Exit event]")
-      let map = this.kernel.processes.map || {}
-      kill(process.pid, map, 'SIGKILL', () => {
-        console.log("child procs killed for", process.pid)
-        process.exit()
-      });
+      kill(process.pid, 'SIGKILL', true)
+      //let map = this.kernel.processes.map || {}
+      //kill(process.pid, map, 'SIGKILL', () => {
+      //  console.log("child procs killed for", process.pid)
+      //  process.exit()
+      //});
     })
 //    process.on('exit', () => {
 //      console.log("exit Event")