pinokiod 3.8.1 → 3.8.5

package/kernel/shell.js

@@ -13,7 +13,6 @@ const pty = require('@homebridge/node-pty-prebuilt-multiarch')
 const path = require("path")
 const sudo = require("sudo-prompt-programfiles-x86");
 const unparse = require('yargs-unparser-custom-flag');
-const shellPath = require('shell-path');
 const Util = require('./util')
 const Environment = require('./environment')
 const home = os.homedir()
@@ -60,36 +59,9 @@ class Shell {
     }, 1)
 
   }
-  async start(params, ondata) {
-
-    /*
-      params := {
-        group: <group id>,
-        id: <shell id>,
-        path: <shell cwd (always absolute path)>,
-        env: <environment value key pairs>
-      }
-    */
-    this.cols = params.cols ? params.cols : 100;
-    this.rows = params.rows ? params.rows : 30;
-
-    this.vt = new Terminal({
-      allowProposedApi: true,
-      cols: this.cols,
-      rows: this.rows,
-    })
-    this.vts = new SerializeAddon()
-    this.vt.loadAddon(this.vts)
-
-    // 1. id
-    this.id = (params.id ? params.id : uuidv4())
-
-    // 2. group id
-    this.group = params.group
-
-    // 2. env
-    // default env
-
+  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) {
@@ -103,6 +75,15 @@ class Shell {
     if (this.env.CMAKE_GENERATOR) {
       delete this.env.CMAKE_GENERATOR
     }
+
+    //this.env.PNPM_CONFIG_PREFIX = this.kernel.path("bin/npm")
+    //this.env.pnpm_config_prefix = this.kernel.path("bin/npm")
+//    this.env.PNPM_HOME = this.kernel.path("bin/npm")
+//    this.env.pnpm_home = this.kernel.path("bin/npm")
+
+//    this.env.NPM_CONFIG_PREFIX = this.kernel.path("bin/npm")
+//    this.env.npm_config_prefix = this.kernel.path("bin/npm")
+
     
 //    if (this.env.CUDA_HOME) {
 //      delete this.env.CUDA_HOME
@@ -117,16 +98,12 @@ class Shell {
         delete this.env[key]
       }
     }
+    console.timeEnd("> 1")
+    console.time("> 2")
 
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
     this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
     this.env.TORCH_FORCE_NO_WEIGHTS_ONLY_LOAD = 1
-//    if (this.platform === 'win32') {
-//      this.env.USERPROFILE = this.kernel.homedir
-//    } else {
-//      this.env.HOME = this.kernel.homedir
-//    }
-
 //    this.env.PIP_REQUIRE_VIRTUALENV = "true"
 //    this.env.NPM_CONFIG_USERCONFIG = this.kernel.path("user_npmrc")
 //    this.env.NPM_CONFIG_GLOBALCONFIG = this.kernel.path("global_npmrc")
@@ -136,7 +113,9 @@ 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) {
@@ -158,7 +137,7 @@ class Shell {
     if (this.platform === 'win32') {
       // ignore 
     } else {
-      this.env[PATH_KEY]= shellPath.sync() || [
+      this.env[PATH_KEY]= this.kernel.shellpath || [
         './node_modules/.bin',
         '/.nodebrew/current/bin',
         '/usr/local/bin',
@@ -177,6 +156,8 @@ 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
@@ -210,8 +191,10 @@ 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]
@@ -230,6 +213,61 @@ class Shell {
         delete this.env[key]
       }
     }
+    console.timeEnd("> 5")
+  }
+  async start(params, ondata) {
+    console.log("shell start", params)
+
+    /*
+      params := {
+        group: <group id>,
+        id: <shell id>,
+        path: <shell cwd (always absolute path)>,
+        env: <environment value key pairs>
+      }
+    */
+
+    this.cols = 100
+    this.rows = 30
+
+    if (params.cols) {
+      this.cols = params.cols
+    }
+    if (params.rows) {
+      this.rows = params.rows
+    }
+    if (params.client && params.client.cols) {
+      this.cols = params.client.cols
+    }
+    if (params.client && params.client.rows) {
+      this.rows = params.client.rows
+    }
+
+    console.log({ cols: this.cols, rows: this.rows })
+
+
+    this.vt = new Terminal({
+      allowProposedApi: true,
+      cols: this.cols,
+      rows: this.rows,
+    })
+    this.vts = new SerializeAddon()
+    this.vt.loadAddon(this.vts)
+
+    // 1. id
+    this.id = (params.id ? params.id : uuidv4())
+
+    // 2. group id
+    this.group = params.group
+
+    // 2. env
+    // default env
+    await this.init_env(params)
+
+
+
+
+
     // 3. path => path can be http, relative, absolute
     this.path = params.path
 
@@ -281,11 +319,12 @@ class Shell {
       return response
     } else {
       let response = await this.request(params, async (stream) => {
-        if (stream.prompt) {
-          this.resolve()
-        } else {
-          if (ondata) ondata(stream)
-        }
+        if (ondata) ondata(stream)
+//        if (stream.prompt) {
+//          this.resolve()
+//        } else {
+//          if (ondata) ondata(stream)
+//        }
       })
       return response
     }
@@ -293,8 +332,13 @@ class Shell {
 //    return this.id
   }
   emit(message) {
+    console.log("> 1", { message, input: this.input })
     if (this.ptyProcess) {
-      this.ptyProcess.write(message)
+      console.log("> 2")
+      if (this.input) {
+        console.log("> 3")
+        this.ptyProcess.write(message)
+      }
     }
   }
   send(message, newline, cb) {
@@ -370,12 +414,16 @@ 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) => { })
 
 
     // not connected => make a new connection => which means get a new prompt
     // if already connected => no need for a new prompt
+    if (params.input) {
+      this.input = params.input
+    }
     if (params.persistent) {
       this.persistent = params.persistent
     }
@@ -907,6 +955,7 @@ class Shell {
     }
   }
   kill(message, force) {
+    console.log("KILL")
 
     this.done = true
     this.ready = false
@@ -1014,6 +1063,11 @@ ${cleaned}
 
   }
   stream(msg, callback) {
+    if (msg === "\u0007") {
+      // Ignore bell sound escape character because it slows down everything and makes redundant sound
+      callback()
+      return
+    }
     this.vt.write(msg, () => {
       let buf = this.vts.serialize()
       let cleaned = this.stripAnsi(buf)
@@ -1021,8 +1075,10 @@ ${cleaned}
         id: this.id,
         raw: msg,
         cleaned,
-        state: cleaned
+        state: cleaned,
+        shell_id: this.id
       }
+      this.state = cleaned
       if (this.cb) this.cb(response)
 
       // Decide whether to kill or continue
@@ -1037,15 +1093,15 @@ ${cleaned}
           // todo: may need to handle cases when the command returns immediately with no output (example: 'which brew' returns immediately with no text if brew doesn't exist)
           setTimeout(() => {
             if (cache === cleaned) {
-              if (this.persistent) {
-                if (this.cb) this.cb({
-                  //raw: cached_msg,
-                  //raw: msg,
-                  //raw: "",
-                  cleaned,
-                  state: cleaned,
-                  prompt: true
-                })
+              if (this.input || this.persistent) {
+//                if (this.cb) this.cb({
+//                  //raw: cached_msg,
+//                  //raw: msg,
+//                  //raw: "",
+//                  cleaned,
+//                  state: cleaned,
+//                  prompt: true
+//                })
                 callback()
               } else {
                 callback()

package/kernel/shells.js

@@ -35,15 +35,20 @@ class Shells {
     } else {
       m = "ls"
     }
-    let response = await sh.start({
-      message: m,
+    console.time("init_env")
+    await sh.init_env({
       env: this.kernel.bin.envs({}),
-      conda: {
-        skip: true
-      }
-    }, async (stream) => {
-      process.stdout.write(stream.raw)
     })
+    console.timeEnd("init_env")
+//    let response = await sh.start({
+//      message: m,
+//      env: this.kernel.bin.envs({}),
+//      conda: {
+//        skip: true
+//      }
+//    }, async (stream) => {
+//      process.stdout.write(stream.raw)
+//    })
 
     this.kernel.envs = sh.env
     // also set the uppercase variables if they're not set
@@ -76,6 +81,7 @@ 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)
 
@@ -267,6 +273,7 @@ class Shells {
       }
     */
     let session = this.get(params.id)
+    console.log("EMIT", { session, params })
     if (session) {
       session.emit(params.emit)
     }
@@ -341,6 +348,7 @@ 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)
@@ -429,6 +437,7 @@ class Shells {
     }
   }
   rm(id) {
+    console.log("SHELL RM", id)
     for(let i=0; i<this.shells.length; i++) {
       let shell = this.shells[i]
       if (shell.id === id) {

package/kernel/store.js

@@ -0,0 +1,58 @@
+const os = require('os')
+const path = require('path')
+const fs = require('fs')
+class Store {
+  constructor() {
+    this.root = path.resolve(os.homedir(), ".pinokio")
+    if (!fs.existsSync(path.resolve(this.root))) {
+      fs.mkdirSync(path.resolve(this.root))
+    }
+  }
+  exists() {
+    let p =  path.resolve(this.root, "config.json")
+    return fs.existsSync(p)
+  }
+  clone(old) {
+    console.log("clone", old)
+    let p =  path.resolve(this.root, "config.json")
+    fs.writeFileSync(p, JSON.stringify(old, null, 2))
+  }
+  set(key, val) {
+    let o
+    try {
+      let str = fs.readFileSync(path.resolve(this.root, "config.json"), "utf8")
+      o = JSON.parse(str)
+    } catch(e) {
+      o = {}
+    }
+    o[key] = val
+    fs.writeFileSync(path.resolve(this.root, "config.json"), JSON.stringify(o, null, 2))
+  }
+  get(key) {
+    try {
+      let str = fs.readFileSync(path.resolve(this.root, "config.json"), "utf8")
+      let o = JSON.parse(str)
+      return o[key]
+    } catch (e) {
+      return null
+    }
+  }
+  delete(key) {
+    try {
+      let str = fs.readFileSync(path.resolve(this.root, "config.json"), "utf8")
+      let o = JSON.parse(str)
+      delete o[key]
+      fs.writeFileSync(path.resolve(this.root, "config.json"), JSON.stringify(o, null, 2))
+    } catch (e) {
+    }
+  }
+  store() {
+    try {
+      let str = fs.readFileSync(path.resolve(this.root, "config.json"), "utf8")
+      let o = JSON.parse(str)
+      return o
+    } catch (e) {
+    }
+  }
+}
+module.exports = Store

package/kernel/util.js

@@ -14,6 +14,9 @@ const groupReplacement = "$$$";
 const h = "[^\\S\\r\\n]";  // simulate `\h`
 const returnPattern = /\r/g;
 const returnReplacement = "\\r";
+const {
+  glob
+} = require('glob')
 
 
 // asar handling for go-get-folder-size
@@ -36,26 +39,20 @@ const du = async (folderpath) => {
 const is_port_available = async (port) => {
   return new Promise((resolve) => {
     const server = http.createServer();
-    console.log("> Checking port availability", port)
     try {
       server.listen(port, (err) => {
         if (err) {
-          console.log("> [1 port not available]", err)
           resolve(false); // Port is occupied
         } else {
-          console.log("> [2 port available] test server started. closing test server now.")
           server.close(() => {
-            console.log("> Test server closed.")
             resolve(true); // Port is free
           }); // Close the server immediately after testing
         }
       });
       server.on('error', (err) => {
-        console.log("> [3 port not available]", err);
         resolve(false); // Port is occupied
       });
     } catch (e) {
-      console.log("> [4 port not available]", err)
       resolve(false) // port not available
     }
   });
@@ -94,39 +91,89 @@ const parse_env = async (filename) => {
     return {}
   }
 }
-const openfs = (dirPath, options) => {
+const openfs = (dirPath, options, kernel) => {
   let command = '';
   const platform = os.platform()
-  let mode = "view"
-  if (options && options.mode) {
-    mode = options.mode
-  }
-  if (mode === "view") {
-    switch (platform) {
-      case 'darwin':
-        command = `open -R "${dirPath}"`;
-        break;
-      case 'win32':
-        command = `explorer /select,"${dirPath}" & timeout /t 1 >nul`;
-        break;
-      default:
-        command = `xdg-open "${dirPath}"`;
-        break;
+  console.log("openfs", dirPath, options)
+  if (options && options.command) {
+    let mode = "view"
+    if (options && options.command) {
+      mode = options.command
+    }
+    console.log("> mode", mode)
+    if (mode === "view") {
+      switch (platform) {
+        case 'darwin':
+          command = `open -R "${dirPath}"`;
+          break;
+        case 'win32':
+          command = `explorer /select,"${dirPath}" & timeout /t 1 >nul`;
+          break;
+        default:
+          command = `xdg-open "${dirPath}"`;
+          break;
+      }
+      child_process.exec(command)
+    } else if (mode === "open") {
+      switch (platform) {
+        case 'darwin':
+          command = `open "${dirPath}"`;
+          break;
+        case 'win32':
+          command = `explorer "${dirPath}"`;
+          break;
+        default:
+          command = `xdg-open "${dirPath}"`;
+          break;
+      }
+      child_process.exec(command)
+    } else {
+      command = `${mode} "${dirPath}"`
+      console.log("> command", command)
+      if (kernel) {
+        kernel.exec({
+          message: command,
+        }, (e) => {
+          process.stdout.write(e.raw)
+        }).then(() => {
+          console.log("DONE")
+        })
+      } else {
+        child_process.exec(command)
+      }
+    }
+  } else {
+    let mode = "view"
+    if (options && options.mode) {
+      mode = options.mode
     }
-  } else if (mode === "open") {
-    switch (platform) {
-      case 'darwin':
-        command = `open "${dirPath}"`;
-        break;
-      case 'win32':
-        command = `explorer "${dirPath}"`;
-        break;
-      default:
-        command = `xdg-open "${dirPath}"`;
-        break;
+    if (mode === "view") {
+      switch (platform) {
+        case 'darwin':
+          command = `open -R "${dirPath}"`;
+          break;
+        case 'win32':
+          command = `explorer /select,"${dirPath}" & timeout /t 1 >nul`;
+          break;
+        default:
+          command = `xdg-open "${dirPath}"`;
+          break;
+      }
+    } else if (mode === "open") {
+      switch (platform) {
+        case 'darwin':
+          command = `open "${dirPath}"`;
+          break;
+        case 'win32':
+          command = `explorer "${dirPath}"`;
+          break;
+        default:
+          command = `xdg-open "${dirPath}"`;
+          break;
+      }
     }
+    child_process.exec(command)
   }
-  child_process.exec(command)
 }
 const parse_env_detail = async (filename) => {
   // takes env and returns an array
@@ -199,6 +246,30 @@ const escapeStringRegexp = (string) => {
 		.replace(/-/g, '\\x2d');
 }
 
+const find_python = async (root) => {
+  let python_pattern
+  if (os.platform() === "win32") {
+    python_pattern = "**/python.exe";
+  } else {
+    python_pattern = "**/python"; // Matches python, python3, python3.x
+  }
+  const pythonBinaries = await glob(python_pattern, { nodir: true, cwd: root });
+  return pythonBinaries
+}
+const find_venv = async (root) => {
+  let python_pattern
+  if (os.platform() === "win32") {
+    python_pattern = "**/python.exe";
+  } else {
+    python_pattern = "**/python"; // Matches python, python3, python3.x
+  }
+  const pythonBinaries = await glob(python_pattern, { nodir: true, cwd: root, absolute: true });
+  const venvs = pythonBinaries.map((p) => {
+    return path.resolve(p, "../..") 
+  })
+  return venvs
+}
+
 const update_env = async (filepath, changes) => {
   console.log("UPDATE_ENV", { filepath, changes })
   const env = await fs.promises.readFile(filepath, "utf8")
@@ -237,5 +308,5 @@ const update_env = async (filepath, changes) => {
   await fs.promises.writeFile(filepath, newval)
 };
 module.exports = {
-  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv
 }

package/package.json

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

package/script/index.js

@@ -4,6 +4,16 @@ const os = require('os')
 const platform = os.platform()
 const Server = require('../server')
 class Store {
+  constructor() {
+    let o
+    try {
+      let str = fs.readFileSync(path.resolve(__dirname, "pinokio.json"), "utf8")
+      o = JSON.parse(str)
+    } catch(e) {
+      o = {}
+    }
+    this.store =  o
+  }
   set(key, val) {
     let o
     try {
@@ -13,6 +23,7 @@ class Store {
       o = {}
     }
     o[key] = val
+    this.store = o
     fs.writeFileSync(path.resolve(__dirname, "pinokio.json"), JSON.stringify(o, null, 2))
   }
   get(key) {
@@ -31,6 +42,7 @@ class Store {
       console.log("before delete", o)
       delete o[key]
       console.log("after delete", o)
+      this.store = o
       fs.writeFileSync(path.resolve(__dirname, "pinokio.json"), JSON.stringify(o, null, 2))
     } catch (e) {
     }