pinokiod 3.2.197 → 3.2.200

package/kernel/api/index.js

@@ -623,10 +623,26 @@ class Api {
 
         rpc.args = args
 
-        if (i < script.run.length-1) {
-          rpc.next = i+1
+        if (rpc.hasOwnProperty("next")) {
+          console.log("next already exists, don't touch", rpc.next)
+          if (typeof rpc.next === "string") {
+            let run = script.run
+            console.log("run", run)
+            for(let i=0; i<run.length; i++) {
+              let step = run[i]
+              if (step && step.id === rpc.next) {
+                rpc.next = i
+                break
+              }
+            }
+          }
         } else {
-          rpc.next = null
+          if (i < script.run.length-1) {
+            rpc.next = i+1
+          } else {
+            rpc.next = null
+          }
+          console.log("next is not set. compute the next value", rpc.next)
         }
 
         if (rpc.hasOwnProperty("when")) {

package/kernel/api/local/index.js

@@ -64,7 +64,7 @@ class Local {
     */
 
     let current_env = await Environment.get2(req.parent.path, kernel)
-    console.log({ current_env })
+//    console.log({ current_env })
 
     // if the key at current_env.PINOKIO_SHARE_VAR (by default it's 'url') is the variable being set, trigger the share logic
     if (current_env.PINOKIO_SHARE_VAR && current_env.PINOKIO_SHARE_VAR in req.params) {

package/kernel/bin/conda.js

@@ -96,13 +96,11 @@ create_default_packages:
 //        console.log("conda list check", { stream })
     })
 
-    console.log("CONDA", res.response)
     let lines = res.response.split(/[\r\n]+/)
     let conda_check = {}
     let conda = new Set()
     let start = false
     for(let line of lines) {
-      console.log({ line, start })
       if (start) {
         let chunks = line.split(/\s+/).filter(x => x)
         if (chunks.length > 1) {
@@ -122,7 +120,6 @@ create_default_packages:
             let channel = chunks[3]
             let coerced = semver.coerce(version)
             let mamba_requirement = ">=24.11.1"
-            console.log({ name, channel, version })
             if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
               conda_check.mamba = true
             }
@@ -133,7 +130,6 @@ create_default_packages:
           if (name === "sqlite") {
             let coerced = semver.coerce(version)
             let sqlite_requirement = ">=3.47.2"
-            console.log({ coerced, version, sqlite_requirement })
             if (semver.satisfies(coerced, sqlite_requirement)) {
               console.log("semver satisfied")
               conda_check.sqlite = true

package/kernel/bin/index.js

@@ -142,9 +142,7 @@ class Bin {
         this.vs_path_env = mod.mod.env(this.kernel)
         return null
       } else {
-        console.log({ mod })
         if (mod.mod.env) {
-          console.log("env", mod.mod.env)
           return mod.mod.env(this.kernel)
         } else {
           return null
@@ -243,10 +241,8 @@ class Bin {
 //        console.log("conda list check", { stream })
     })
 
-    console.log("CONDA", res.response)
     let lines = res.response.split(/[\r\n]+/)
     for(let line of lines) {
-      console.log({ line, start })
       if (start) {
         let chunks = line.split(/\s+/).filter(x => x)
         if (chunks.length > 1) {
@@ -274,7 +270,7 @@ class Bin {
           if (name === "sqlite") {
             let coerced = semver.coerce(version)
             let sqlite_requirement = ">=3.47.2"
-            console.log({ coerced, version, sqlite_requirement })
+//            console.log({ coerced, version, sqlite_requirement })
             if (semver.satisfies(coerced, sqlite_requirement)) {
               console.log("semver satisfied")
               conda_check.sqlite = true
@@ -325,38 +321,38 @@ class Bin {
       // Try 3 times, because sometimes conda just silently quits with no error message
       for(let i=0; i<5; i++) {
         await this.tryList()
-        console.log(`> conda list ${i}`, Array.from(this.installed.conda))
+//        console.log(`> conda list ${i}`, Array.from(this.installed.conda))
         if (this.installed.conda.size > 0) {
           break 
         }
       }
     }
 
-    // 2. pip
-    let pip = new Set()
-    if (conda_exists) {
-      // conda comes with pip
-      console.log("## check pip")
-      start = false
-      res = await this.exec({ message: `pip list` }, (stream) => {
-//        console.log("pip list check", { stream })
-      })
-      console.log("PIP", res.response)
-      lines = res.response.split(/[\r\n]+/)
-      for(let line of lines) {
-        if (start) {
-          let chunks = line.split(/\s+/).filter(x => x)
-          if (chunks.length > 1) {
-            pip.add(chunks[0])
-          }
-        } else {
-          if (/-------.*/i.test(line)) {
-            start = true 
-          }
-        }
-      }
-    }
-    this.installed.pip = pip
+//    // 2. pip
+//    let pip = new Set()
+//    if (conda_exists) {
+//      // conda comes with pip
+//      console.log("## check pip")
+//      start = false
+//      res = await this.exec({ message: `pip list` }, (stream) => {
+////        console.log("pip list check", { stream })
+//      })
+//      console.log("PIP", res.response)
+//      lines = res.response.split(/[\r\n]+/)
+//      for(let line of lines) {
+//        if (start) {
+//          let chunks = line.split(/\s+/).filter(x => x)
+//          if (chunks.length > 1) {
+//            pip.add(chunks[0])
+//          }
+//        } else {
+//          if (/-------.*/i.test(line)) {
+//            start = true 
+//          }
+//        }
+//      }
+//    }
+//    this.installed.pip = pip
     
 
     if (this.platform === "darwin") {
@@ -427,7 +423,7 @@ class Bin {
       } else {
         e4 = false
       }
-      console.log({ e, e2, e3, e4, stdout })
+      console.log("BREW CHECK", { e, e2, e3, e4 })
       this.brew_installed = e && e2 && e3 && e4
 
     }
@@ -644,7 +640,7 @@ class Bin {
     if (type === "conda") {
       return this.kernel.bin.installed.conda.has(name)
     } else if (type === "pip") {
-      return this.kernel.bin.installed.pip.has(name)
+      return this.kernel.bin.installed.pip && this.kernel.bin.installed.pip.has(name)
     } else if (type === "brew") {
       return this.kernel.bin.installed.brew.has(name)
     } else {

package/kernel/index.js

@@ -14,6 +14,7 @@ const Api = require("./api")
 const Python = require("./python")
 //const Template = require('./template')
 const Template = require('jimini')
+const which = require('which')
 const Shells = require("./shells")
 const Key = require("./key")
 const Script = require('./script')
@@ -35,7 +36,8 @@ const VARS = {
 class Kernel {
   //schema = ">=1.0.0"
   //schema = "<=2.1.0"
-  schema = "<=3.2.0"
+  //schema = "<=3.2.0"
+  schema = "<=3.3.0"
   constructor(store) {
     this.fetch = fetch
     this.store = store
@@ -221,6 +223,25 @@ class Kernel {
   async wait(options) {
     await waitOn(options)
   }
+  async getInfo(){
+    let info = this.sysinfo
+    await this.update_sysinfo()
+    let i = {
+      platform: this.platform,
+      arch: this.arch,
+      running: this.api.running,
+      home: this.homedir,
+      vars: this.vars,
+      memory: this.memory,
+      procs: this.procs,
+      gpu: this.gpu,
+      gpus: this.gpus,
+      version: this.version,
+      ...info
+    }
+
+    this.i = i
+  }
 
   async synchronize_proxies() {
     let proxy_registry_path = path.resolve(this.homedir, "proxy_registry")
@@ -308,7 +329,6 @@ class Kernel {
     this.template = new Template()
     try {
       let grant_permission = false
-      console.log(">>>>>> this.homedir", this.homedir)
       if (this.homedir) {
 
         // 0. create homedir
@@ -356,7 +376,10 @@ class Kernel {
             if (this.envs) {
               this.template.update({
                 env: this.envs,
-                envs: this.envs
+                envs: this.envs,
+                which: (name) => {
+                  return which.sync(name, { nothrow: true, path: this.envs.PATH })
+                }
               })
             }
 //            console.log({ grant_permission })
@@ -380,9 +403,7 @@ class Kernel {
 
       //await this.shell.init()
 
-      console.log("homedir", this.homedir)
       if (this.homedir) {
-        console.log("> 1")
         await this.template.init({
           kernel: this,
           system,
@@ -392,19 +413,16 @@ class Kernel {
             return this.api.get_proxy_url("/proxy", port)
           },
         })
-        console.log("> 2")
         this.sys = new Sysinfo()
         await this.sys.init(this)
         let info = this.sys.info
-        await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
-        await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify({
-          platform: this.platform,
-          arch: this.arch,
-          home: this.homedir,
-          ...info
-        }, null, 2))
+
         this.sysinfo = info
-        await this.update_sysinfo()
+
+        await this.getInfo()
+
+        await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
+        await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify(this.i, null, 2))
       /*
         this.sys = new Sysinfo()
         await this.sys.init(this)

package/kernel/shell.js

@@ -659,7 +659,7 @@ class Shell {
     if (params.venv) {
       let env_path = path.resolve(params.path, params.venv)
       let activate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "activate") : path.resolve(env_path, "bin", "activate"))
-      let deactivate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "deactivate") : path.resolve(env_path, "bin", "deactivate"))
+      let deactivate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "deactivate") : "deactivate")
       let env_exists = await this.exists(env_path)
       if (env_exists) {
         venv_activation = [
@@ -671,7 +671,7 @@ class Shell {
           `python -m venv ${env_path}`,
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
           `python -m pip install --upgrade pip setuptools wheel`,
-          (this.platform === "win32" ? `${deactivate_path}` : `source ${deactivate_path}`),
+          deactivate_path,
           (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
           (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
@@ -721,9 +721,9 @@ class Shell {
               this.queue.push(data)
             }
           });
-          this.ptyProcess.onExit((result) => {
-            console.log(">>>>>>>>>>>>>>>>>>> exec onExit", result)
-          })
+//          this.ptyProcess.onExit((result) => {
+//            console.log(">>>>>>>>>>>>>>>>>>> exec onExit", result)
+//          })
         }
       } catch (e) {
         console.log("** Error", e)
@@ -747,7 +747,6 @@ class Shell {
     }
   }
   kill(message, force) {
-    console.log("> KILL", { message, force })
 
     this.done = true
     this.ready = false
@@ -877,7 +876,6 @@ ${cleaned}
           let cached_msg = msg
           // 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(() => {
-            console.log({ cache, cleaned })
             if (cache === cleaned) {
               if (this.persistent) {
                 if (this.cb) this.cb({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.197",
+  "version": "3.2.200",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -59,6 +59,7 @@
     "systeminformation": "^5.18.4",
     "uuid": "^9.0.0",
     "wait-on": "^7.2.0",
+    "which": "^5.0.0",
     "ws": "^8.13.0",
     "xterm-addon-fit": "^0.8.0",
     "xterm-addon-serialize": "^0.9.0",

package/server/index.js

@@ -229,7 +229,7 @@ class Server {
     let error = null
     if (config && config.version) {
       let coerced = semver.coerce(config.version)
-      console.log("version", { coerced, v: config.version })
+//      console.log("version", { coerced, v: config.version })
       if (semver.satisfies(coerced, this.kernel.schema)) {
         console.log("semver satisfied", config.version, this.kernel.schema)
       } else {
@@ -1761,7 +1761,7 @@ class Server {
     if (type === "conda") {
       return this.kernel.bin.installed.conda.has(name)
     } else if (type === "pip") {
-      return this.kernel.bin.installed.pip.has(name)
+      return this.kernel.bin.installed.pip && this.kernel.bin.installed.pip.has(name)
     } else if (type === "brew") {
       return this.kernel.bin.installed.brew.has(name)
     } else {
@@ -2101,6 +2101,25 @@ class Server {
 
     console.log("available port", this.port)
 
+    let version = this.kernel.store.get("version")
+    let home = this.kernel.store.get("home")
+    console.log({ home, version })
+    if (home) {
+      if (version === this.version.pinokiod) {
+        console.log("version up to date")
+      } else {
+        console.log("not up to date. update py.")
+        // remove ~/bin/miniconda/py
+        let p = path.resolve(home, "bin/py")
+        console.log(`[TRY] reset ${p}`)
+        await fse.remove(p)
+        console.log(`[DONE] reset ${p}`)
+        console.log("[TRY] Updating to the new version")
+        this.kernel.store.set("version", this.version.pinokiod)
+        console.log("[DONE] Updating to the new version")
+      }
+    }
+
     // initialize kernel
     await this.kernel.init({ port: this.port})
 
@@ -2131,64 +2150,64 @@ class Server {
 //    }
     await this.startLogging()
 
-    // check version from this.store
-    let version = this.kernel.store.get("version")
-    // if the version is different from package.json version, run update logic
-    console.log({_homedir: this.kernel.homedir, version, pinokiod: this.version.pinokiod })
-    if (this.kernel.homedir) {
-      if (version === this.version.pinokiod) {
-        console.log("version up to date")
-      } else {
-      // update the py module if it's already installed
-        console.log("not up to date")
-
-//        // give full permission to pinokio folder on windows
-//        if (this.kernel.platform === "win32") {
-//          console.log("1 Give full permission")
-//          await this.kernel.bin.exec({
-//            sudo: true,
-//            message: `icacls ${this.kernel.homedir} /grant Users:(OI)(CI)F /T`
-//          }, (stream) => {
-//            console.log({ stream })
-//          })
-//          console.log("1 Give full permission done")
-//        }
-
-
-        await new Promise((resolve, reject) => {
-          let interval = setInterval(async () => {
-            console.log("checking mod.py")
-            if (this.kernel.bin.mod && this.kernel.bin.mod.py) {
-              console.log("mod.py initialized!")
-              let installed = await this.kernel.bin.mod.py.installed()
-              console.log("py installed", installed)
-              if (installed) {
-                // update
-                console.log("update py")
-                await this.kernel.exec({
-                  message: "git pull",
-                  path: this.kernel.path("bin/py")
-                }, (e) => {
-                  console.log(e)
-                })
-              }
-              // after updating, set the version
-              console.log("set the version", this.version.pinokiod)
-              this.kernel.store.set("version", this.version.pinokiod)
-              console.log("RESTART")
-              clearInterval(interval)
-              resolve()
-            } else {
-              console.log("mod.py not initialized yet")
-            }
-          }, 1000)
-        })
-        this.listening = true   // set this.listening = true so all http connections get reset when restarting
-        await this.start(options)
-        console.log("RESTARTED")
-        return
-      }
-    }
+//    // check version from this.store
+//    //let version = this.kernel.store.get("version")
+//    // if the version is different from package.json version, run update logic
+//    console.log({_homedir: this.kernel.homedir, version, pinokiod: this.version.pinokiod })
+//    if (this.kernel.homedir) {
+//      if (version === this.version.pinokiod) {
+//        console.log("version up to date")
+//      } else {
+//      // update the py module if it's already installed
+//        console.log("not up to date")
+//
+////        // give full permission to pinokio folder on windows
+////        if (this.kernel.platform === "win32") {
+////          console.log("1 Give full permission")
+////          await this.kernel.bin.exec({
+////            sudo: true,
+////            message: `icacls ${this.kernel.homedir} /grant Users:(OI)(CI)F /T`
+////          }, (stream) => {
+////            console.log({ stream })
+////          })
+////          console.log("1 Give full permission done")
+////        }
+//
+//
+//        await new Promise((resolve, reject) => {
+//          let interval = setInterval(async () => {
+//            console.log("checking mod.py")
+//            if (this.kernel.bin.mod && this.kernel.bin.mod.py) {
+//              console.log("mod.py initialized!")
+//              let installed = await this.kernel.bin.mod.py.installed()
+//              console.log("py installed", installed)
+//              if (installed) {
+//                // update
+//                console.log("update py")
+//                await this.kernel.exec({
+//                  message: "git pull",
+//                  path: this.kernel.path("bin/py")
+//                }, (e) => {
+//                  console.log(e)
+//                })
+//              }
+//              // after updating, set the version
+//              console.log("set the version", this.version.pinokiod)
+//              this.kernel.store.set("version", this.version.pinokiod)
+//              console.log("RESTART")
+//              clearInterval(interval)
+//              resolve()
+//            } else {
+//              console.log("mod.py not initialized yet")
+//            }
+//          }, 1000)
+//        })
+//        this.listening = true   // set this.listening = true so all http connections get reset when restarting
+//        await this.start(options)
+//        console.log("RESTARTED")
+//        return
+//      }
+//    }
 
     
 
@@ -2223,7 +2242,7 @@ class Server {
 
 
     //let home = this.kernel.homedir
-    let home = this.kernel.store.get("home")
+    //let home = this.kernel.store.get("home")
     this.app.get("/", ex(async (req, res) => {
       if (req.query.mode !== "settings" && !home) {
         res.redirect("/?mode=settings")
@@ -3057,6 +3076,12 @@ class Server {
       await compressing.zip.compressDir(folder, zipPath)
       res.json({ success: true })
     }))
+    this.app.get("/pinokio/info", ex(async (req, res) => {
+      console.time("getInfo")
+      await this.kernel.getInfo()
+      console.timeEnd("getInfo")
+      res.json(this.kernel.i || {})
+    }))
     this.app.get("/pinokio/port", ex(async (req, res) => {
       let port = await this.kernel.port()
       res.json({ result: port })

package/server/views/pre.ejs

@@ -126,9 +126,9 @@ footer a.btn {
               <div class='title'><%=item.title%></div>
               <div class='description'><%=item.description%></div>
               <% if (item.href.startsWith("http")) { %>
-                <a target="_blank" features="browser" href='<%=item.href%>' class='btn'><i class="fa-solid fa-square-arrow-up-right"></i> Get</a>
+                <a target="_blank" features="browser" href='<%=item.href%>' class='btn'><i class="fa-solid fa-square-arrow-up-right"></i> Install</a>
               <% } else { %>
-                <button class='btn' data-filepath="<%=item.href%>"><i class="fa-solid fa-square-arrow-up-right"></i> Get</button>
+                <button class='btn' data-filepath="<%=item.href%>"><i class="fa-solid fa-square-arrow-up-right"></i> Install</button>
               <% } %>
             </div>
             <!--