pinokiod 3.8.11 → 3.8.13

package/kernel/bin/index.js

@@ -282,6 +282,8 @@ class Bin {
       } catch (e) {
         console.log("RefreshInstalled Error", e)
       }
+
+      // initialize pipconfig
       let pipconfig_path = path.resolve(this.kernel.homedir, "pipconfig")
       let pipconfig_exists = await this.kernel.api.exists(pipconfig_path)
       // if not, create one
@@ -289,10 +291,6 @@ class Bin {
         const pipconfigStr = `[global]
   timeout = 1000`
         await fs.promises.writeFile(pipconfig_path, pipconfigStr) 
-  //      await fs.promises.copyFile(
-  //        path.resolve(__dirname, "..", "pipconfig_template"),
-  //        pipconfig_path
-  //      )
       }
 
       // add gitconfig => support git lfs, long path, etc.
@@ -302,6 +300,13 @@ class Bin {
         path.resolve(__dirname, "..", "gitconfig_template"),
         gitconfig_path
       )
+
+      for(let mod of this.mods) {
+        if (mod.mod.start) {
+          await mod.mod.start()
+        }
+      }
+
     }
 
 
@@ -585,7 +590,7 @@ class Bin {
   //  await this.mod(name).rm({}, ondata)
   //  await this.mod(name).install(options, ondata)
   //}
-  async tryInstall(requirement, x, i, total, ondata) {
+  async tryInstall(id, requirement, x, i, total, ondata) {
     let current_platform = os.platform()
     let current_arch = os.arch()
     let current_gpu = this.kernel.gpu
@@ -645,7 +650,7 @@ class Bin {
               ondata({ html: `<b><i class="fas fa-circle-notch fa-spin"></i> ${progress} Installing ${name}</b>${message}` }, "notify2")
               console.log("## Before m.mod.install", requirement)
               requirement._attempt = x
-              await m.mod.install(requirement, ondata, this.kernel)
+              await m.mod.install(requirement, ondata, this.kernel, id)
 
 //                // 2 second delay to fix conda issue
 //                await new Promise((resolve, reject) => {
@@ -703,6 +708,8 @@ class Bin {
 
     let requirements = JSON.parse(req.params)
 
+    console.time("### Total Install")
+
     for(let x=0; x<10; x++) {
       console.log(`## Install Attempt ${x}`)
       let i = 0;
@@ -716,7 +723,9 @@ class Bin {
           console.log("already installed. skip.")
         } else {
           console.log("not installed. install.")
-          await this.tryInstall(requirement, x, i, requirements.length, ondata)
+          console.time("############# Install " +requirement.name)
+          await this.tryInstall(req.id, requirement, x, i, requirements.length, ondata)
+          console.timeEnd("############# Install " +requirement.name)
         }
       }
 
@@ -772,6 +781,7 @@ class Bin {
     //    }
     //  }
     //}
+    console.timeEnd("### Total Install")
     await this.init()
   }
   async installed(r) {
@@ -810,7 +820,8 @@ class Bin {
       { name: "git", },
       { name: "zip", },
       { name: "node", },
-      { name: "ffmpeg", }
+      { name: "ffmpeg", },
+      { name: "caddy", }
     ]
     let platform = os.platform()
     if (platform === "win32") {
@@ -827,11 +838,11 @@ class Bin {
       requirements.push({ name: "cuda", })
     }
     requirements = requirements.concat([
-      { name: "py" },
       { name: "cloudflared" },
-      { name: "playwright" },
+//      { name: "playwright" },
       { name: "huggingface" },
-      { name: "uv" }
+      { name: "uv" },
+      { name: "py" },
     ])
 
     let requirements_pending = !this.installed_initialized

package/kernel/bin/node.js

@@ -3,18 +3,16 @@ const fetch = require('cross-fetch')
 const { rimraf } = require('rimraf')
 const decompress = require('decompress');
 class Node {
+  cmd() {
+    return "nodejs pnpm"
+  }
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      //message: "conda install -y nodejs=22.12.0 -c conda-forge"
       message: [
         "conda clean -y --all",
         //"conda install -y nodejs=20.17.0 pnpm -c conda-forge"
-        "conda install -y nodejs pnpm -c conda-forge"
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/py.js

@@ -8,7 +8,7 @@ class Py {
       path: this.kernel.path("bin")
     }, ondata)
     await this.kernel.exec({
-      message: "pip install -r requirements.txt",
+      message: "uv pip install -r requirements.txt",
       venv: "env",
       path: this.kernel.bin.path("py")
     }, ondata)

package/kernel/bin/uv.js

@@ -3,16 +3,15 @@ const fetch = require('cross-fetch')
 const { rimraf } = require('rimraf')
 const decompress = require('decompress');
 class UV {
+  cmd() {
+    return "uv"
+  }
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        "conda install -y -c conda-forge uv",
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/zip.js

@@ -1,20 +1,19 @@
 class Zip {
-  async install(req, ondata) {
+  cmd() {
     let cmd
     if (this.kernel.platform === 'win32') {
-      cmd = "conda install -y -c conda-forge 7zip"
+      cmd = "7zip"
     } else {
-      cmd = "conda install -y -c conda-forge p7zip"
+      cmd = "p7zip"
     }
+    return cmd
+  }
+  async install(req, ondata) {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        cmd
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
     }, ondata)
   }
   async installed() {

package/kernel/index.js

@@ -20,6 +20,7 @@ const Template = require('jimini')
 const which = require('which')
 const Shells = require("./shells")
 const Key = require("./key")
+const KV = require('./kv')
 const Script = require('./script')
 const Environment = require("./environment")
 const Util = require('./util')
@@ -42,7 +43,8 @@ class Kernel {
   //schema = ">=1.0.0"
   //schema = "<=2.1.0"
   //schema = "<=3.2.0"
-  schema = "<=3.7.0"
+  //schema = "<=3.7.0"
+  schema = "<=4.0.0"
   constructor(store) {
     this.fetch = fetch
 
@@ -78,6 +80,7 @@ class Kernel {
     this.info = new Info(this)
     this.pipe = new Pipe(this)
     this.proto = new Proto(this)
+    this.kv = new KV(this)
     this.cloudflare = new Cloudflare()
     this.shellpath = shellPath.sync()
   }
@@ -107,6 +110,21 @@ class Kernel {
       }
     }
   }
+//  path_exists(...args) {
+//    return this.info.exists(...args)
+//  }
+//  path_resolve(...args) {
+//    return this.info.path(...args)
+//  }
+//  script_running(...args) {
+//    return this.info.running(...args)
+//  }
+//  script_local(...args) {
+//    return this.info.local(...args)
+//  }
+//  script_global(...args) {
+//    return this.info.global(...args)
+//  }
   async env(...args) {
     let folderpath
     if (args) {
@@ -540,6 +558,7 @@ class Kernel {
         console.log("bin init finished")
         if (this.homedir) {
           this.shell.init().then(async () => {
+            console.log("shell init finished")
             this.bin.check_bin()
             if (this.envs) {
               this.template.update({
@@ -564,10 +583,12 @@ class Kernel {
                   }
                 }
               })
+              console.log("*******************")
 
               // get env
               if (!this.launch_complete) {
                 let interval = setInterval(async () => {
+                  console.log("this.i", this.i)
                   if (this.i) {
                     for(let api of this.i.api) {
                       console.log({ api })

package/kernel/info.js

@@ -40,13 +40,17 @@ class Info {
   running(...args) {
     let cwd = path.dirname(this.caller())
     let resolved_path = path.resolve(cwd, ...args)
-    return this.kernel.api.running[resolved_path]
+    console.log("api.running", this.kernel.api.running)
+    let running = this.kernel.api.running[resolved_path]
+    console.log("info.running", { cwd, resolved_path, running })
+    return running ? running : false
   }
   exists(...args) {
     let cwd = path.dirname(this.caller())
     let resolved_path = path.resolve(cwd, ...args)
-    console.log({ cwd, resolved_path })
-    return fs.existsSync(resolved_path)
+    let exists = fs.existsSync(resolved_path)
+    console.log("info.exists", { cwd, resolved_path, exists })
+    return exists ? exists: false
   }
   local(...args) {
     let cwd = path.dirname(this.caller())

package/kernel/kv.js

@@ -0,0 +1,35 @@
+class KV {
+  constructor(kernel) {
+    this.kernel = kernel
+  }
+  async set(host, val, index) {
+    if (this.kernel.homedir) {
+      let filePath = this.kernel.path("key.json")
+      let json = await this.kernel.load(filePath)
+      if (!json) json = {}
+      // if the array at host path doesn't exist, create an empty array
+      if (!json[host]) {
+        json[host] = []
+      }
+      // if index doesn't exist, set index 0
+      json[host][index] = val
+      await fs.promises.writeFile(filePath, JSON.stringify(json, null, 2), 'utf8')
+    }
+  }
+  async get(host, index) {
+    if (this.kernel.homedir) {
+      let filePath = this.kernel.path("key.json")
+      console.log({ host, index, filePath })
+      let json = await this.kernel.load(filePath)
+      if (!json) {
+        return null
+      }
+      console.log({ json })
+      if (json[host]) {
+        return json[host][index]
+      }
+    }
+    return null
+  }
+}
+module.exports = KV

package/kernel/shell.js

@@ -216,7 +216,7 @@ class Shell {
     console.timeEnd("> 5")
   }
   async start(params, ondata) {
-    console.log("shell start", params)
+    this.ondata = ondata
 
     /*
       params := {
@@ -227,6 +227,8 @@ class Shell {
       }
     */
 
+    this.kill_messages = params.kill
+
     this.cols = 100
     this.rows = 30
 
@@ -265,6 +267,7 @@ class Shell {
     await this.init_env(params)
 
 
+    this.ondata({ raw: `\r\n████\r\n██ Starting Shell ${this.id}\r\n` })
 
 
 
@@ -277,13 +280,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) => { })
@@ -294,6 +297,7 @@ 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)
@@ -331,13 +335,27 @@ class Shell {
 
 //    return this.id
   }
+  emit2(message) {
+    let i = 0;
+    const interval = setInterval(() => {
+      if (i >= message.length) {
+        clearInterval(interval);
+        return;
+      }
+      let chunk = message.slice(i, i+1024)
+      console.log("Writing chunk", chunk)
+      this.ptyProcess.write(chunk)
+      i += 1024;
+    }, 10);
+  }
   emit(message) {
-    console.log("> 1", { message, input: this.input })
-    if (this.ptyProcess) {
-      console.log("> 2")
-      if (this.input) {
-        console.log("> 3")
-        this.ptyProcess.write(message)
+    if (message.length > 1024) {
+      this.emit2(message)
+    } else {
+      if (this.ptyProcess) {
+        if (this.input) {
+          this.ptyProcess.write(message)
+        }
       }
     }
   }
@@ -414,7 +432,6 @@ class Shell {
     return r
   }
   async request(params, cb) {
-    console.log("shell.request", params)
     // create the path if it doesn't exist
     await fs.promises.mkdir(params.path, { recursive: true }).catch((e) => { })
 
@@ -952,8 +969,16 @@ class Shell {
         this.resolve(buf)
       }
       this.resolve = undefined
+      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) {
     console.log("KILL")
 
@@ -979,12 +1004,36 @@ class Shell {
     this.vt.dispose()
     this.queue.killAndDrain()
     if (this.ptyProcess) {
-      this.ptyProcess.kill()
-      this.ptyProcess = undefined
+      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)
+          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 {
+        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)
 
   }
   log() {

package/kernel/shells.js

@@ -66,12 +66,14 @@ class Shells {
       let res
       for(let i=0; i<params.message.length; i++) {
         let message = params.message[i]
-        let params_dup = Object.assign({}, params) 
-        params_dup.message = message
-        res = await this._launch(params_dup, options, ondata)
-        // if there's an error, immediately return with the error
-        if (res.error) {
-          return res
+        if (message) {
+          let params_dup = Object.assign({}, params) 
+          params_dup.message = message
+          res = await this._launch(params_dup, options, ondata)
+          // if there's an error, immediately return with the error
+          if (res.error) {
+            return res
+          }
         }
       }
       return res
@@ -81,7 +83,6 @@ class Shells {
     }
   }
   async _launch(params, options, ondata) {
-    console.log("_launch", { params, options })
     // iterate through all the envs
     params.env = this.kernel.bin.envs(params.env)
 
@@ -157,6 +158,7 @@ class Shells {
       ondata(stream)
     })
 
+
     /*
       {
         method: "shell.run",
@@ -273,7 +275,6 @@ class Shells {
       }
     */
     let session = this.get(params.id)
-    console.log("EMIT", { session, params })
     if (session) {
       session.emit(params.emit)
     }
@@ -348,7 +349,6 @@ class Shells {
     }
   }
   async run(req, options, ondata) {
-    console.log("shells.run",req)
     let response = await this.launch(req, options, ondata)
 //    req.id = id
 //    let sh = this.get(id)
@@ -381,6 +381,7 @@ class Shells {
     *  - Kill by group ID
     *    request = { group } 
     */
+
     if (request.id) {
 
       let shells = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.8.11",
+  "version": "3.8.13",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -54,6 +54,7 @@
     "random-useragent": "^0.5.0",
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",
+    "selfsigned": "^2.4.1",
     "semver": "^7.5.4",
     "shell-path": "^2.0.0",
     "sudo-prompt-programfiles-x86": "^9.2.10",