pinokiod 3.8.153 → 3.8.1532

package/kernel/api/index.js

@@ -28,6 +28,21 @@ class Api {
     this.child_procs = {}
     this.lproxy = new Lproxy()
   }
+  async meta(name) {
+    let p = this.kernel.path("api", name, "pinokio.js")
+    let pinokio = (await this.kernel.loader.load(p)).resolved
+    let p2 = this.kernel.path("api", name, "pinokio_meta.json")
+    let pinokio2 = (await this.kernel.loader.load(p2)).resolved
+    let p3 = this.kernel.path("api", name, "pinokio.json")
+    let pinokio3 = (await this.kernel.loader.load(p3)).resolved
+    let meta = Object.assign({}, pinokio, pinokio2, pinokio3)
+    meta.iconpath = meta.icon ? this.kernel.path("api", name, meta.icon) : null
+    meta.icon = meta.icon ? `/api/${name}/${meta.icon}?raw=true` : "/pinokio-black.png"
+    meta.path = this.kernel.path("api", name)
+    meta.name = meta.title
+    meta.link = `/pinokio/browser/${name}/browse#n1`
+    return meta
+  }
   get_proxy_url(root, port) {
     if (this.proxies) {
       let proxies = this.proxies[root]
@@ -160,7 +175,6 @@ class Api {
 
     await this.kernel.stopCloudflare({ path: requestPath })
 
-
     // if there are any pending waiters, delete them
 
     if (this.waiter[requestPath]) {
@@ -431,14 +445,18 @@ class Api {
     let method
     let dirname
     let mod
-    if (req.uri) {
+    if (req.method && typeof req.method === "function") {
+      modpath = null
+      method = req.method
+      dirname = __dirname
+      mod = null
+    } else if (req.uri) {
       modpath = this.resolvePath(cwd, req.uri)
       let m = (await this.loader.load(modpath))
       const stats = await fs.promises.stat(modpath)
       if (!this.child_procs[req.parent.path]) {
         this.child_procs[req.parent.path] = new Set()
       }
-      console.log("SCRIPT RESOLVE METHOD", req)
       if (this.mods[modpath]) {
         // use the cached module if unchanged
         if (String(stats.mtime) === String(this.mods[modpath].updated)) {
@@ -572,9 +590,7 @@ class Api {
 
   }
   async step (request, rawrpc, input, i, total, args) {
-    console.time("STEP INIT")
     await Promise.all([this.init(), this.kernel.update_sysinfo()])
-    console.timeEnd("STEP INIT")
 
     // clear global regular expression object RegExp.lastMatch (memory leak prevention)
     let r = /\s*/g.exec("");
@@ -583,6 +599,10 @@ class Api {
 
     let { cwd, script } = await this.resolveScript(request.path)
 
+    if (request.cwd) {
+      cwd = request.cwd
+    }
+
     let memory = {
       script: this.kernel.script,
       input,
@@ -635,7 +655,6 @@ class Api {
         break;
       }
     }
-
     // replace {{{ }}} with {{ }}
     rpc = this.kernel.template.flatten(rpc)
 
@@ -769,6 +788,7 @@ class Api {
                     uri: request.path
                   }
                 })
+                console.log(">>>>>> STOPPED", request)
               }
               return { request, input: null, step: rpc.next, total: script.run.length, args }
             } else {
@@ -987,6 +1007,7 @@ class Api {
                   uri: request.path
                 }
               })
+              console.log("<<<<<< STOPPED", request)
               return { request, input: result, step: rpc.next, total: script.run.length, args }
             }
 
@@ -1232,7 +1253,6 @@ class Api {
       } else {
         console.log({ request })
         let { cwd, script } = await this.resolveScript(request.path)
-        request.cwd = cwd
 
         if (!script) {
           this.ondata({

package/kernel/api/web/index.js

@@ -21,5 +21,11 @@ class Web {
     kernel.exposed[app] = req.params.uri
     console.log("kernel.exposed", kernel.exposed)
   }
+  async open(req, ondata, kernel) {
+    ondata(req.params, "browser.open")
+  }
+  async close(req, ondata, kernel) {
+    ondata(req.params, "browser.close")
+  }
 }
 module.exports = Web

package/kernel/bin/git.js

@@ -5,15 +5,27 @@ const { rimraf } = require('rimraf')
 const path = require("path")
 class Git {
   cmd() {
-    return "git git-lfs gh"
+    if (this.kernel.platform === "darwin") {
+      return "git git-lfs"
+    } else {
+      return "git git-lfs gh"
+    }
   }
   async install(req, ondata) {
-    await this.kernel.bin.exec({
-      message: [
-        "conda clean -y --all",
-        `conda install -y -c conda-forge ${this.cmd()}`
-      ]
-    }, ondata)
+    if (this.kernel.platform === "darwin") {
+      await this.kernel.bin.exec({
+        conda: { skip: true },
+        message: "brew install gh",
+      }, ondata)
+    } else {
+      await this.kernel.bin.exec({
+        message: [
+          "conda clean -y --all",
+          `conda install -y -c conda-forge ${this.cmd()}`
+        ]
+      }, ondata)
+    }
+    await fs.promises.mkdir(this.kernel.path("config/gh"), { recursive: true }).catch((e) => { })
 //    if (this.kernel.platform === 'win32') {
 //      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
 //      // check if gitconfig exists
@@ -28,18 +40,33 @@ class Git {
 //    }
   }
   async installed() {
-    return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
+    if (this.kernel.platform === "darwin") {
+      let gh_config_exists = await this.kernel.exists("config/gh")
+      console.log("conda installed", this.kernel.bin.installed.conda)
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.brew.has("gh") && gh_config_exists
+    } else {
+      let gh_config_exists = await this.kernel.exists("config/gh")
+      console.log("conda installed", this.kernel.bin.installed.conda)
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && gh_config_exists
+    }
   }
   async uninstall(req, ondata) {
-    await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
+    if (this.kernel.platform === "darwin") {
+      await this.kernel.bin.exec({ message: "conda remove git" }, ondata)
+      await this.kernel.bin.exec({
+        conda: { skip: true },
+        message: "brew uninstall gh",
+      })
+    } else {
+      await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
+    }
   }
   env() {
-//    if (this.kernel.platform === 'win32') {
-      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-      return {
-        GIT_CONFIG_GLOBAL: gitconfig_path
-      }
-//    }
+    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+    return {
+      GIT_CONFIG_GLOBAL: gitconfig_path,
+      GH_CONFIG_DIR: this.kernel.path("config/gh")
+    }
   }
   async requires() {
     return ["conda"]

package/kernel/bin/index.js

@@ -359,17 +359,12 @@ class Bin {
             conda_versions[name] = version
             if (name === "conda") {
               conda_check.conda = true
-//              //if (String(version) === "24.11.1") {
-//              if (String(version) === "24.11.3") {
-//                conda_check.conda = true
-//              }
             }
             if (name === "conda-libmamba-solver") {
               //if (String(version) === "24.7.0") {
               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") {
               if (semver.satisfies(coerced, mamba_requirement)) {
                 conda_check.mamba = true
@@ -381,16 +376,6 @@ class Bin {
               if (String(version) === "3.47.2") {
                 conda_check.sqlite = true
               }
-//              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
-//              } else {
-//                console.log("semver NOT satisfied")
-//              }
             }
           }
         } else {
@@ -442,15 +427,12 @@ class Bin {
 
       let brew_path = path.resolve(this.kernel.homedir, "bin", "homebrew")
       let brew_exists = await this.exists(brew_path)
-//      console.log({ brew_path, brew_exists })
 
       let brew = []
       if (brew_exists) {
         start = false
         res = await this.exec({ message: `brew list -1`, conda: { skip: true } }, (stream) => {
-//          console.log("brew list check", { stream })
         })
-//        console.log("BREW", res.response)
         lines = res.response.split(/[\r\n]+/).slice(0, -1)  // ignore last line since it's the prompt
         let end = false
         for(let line of lines) {
@@ -474,7 +456,6 @@ class Bin {
 
 
       // check brew_installed
-//      console.log("checking brew installed")
       let e = await this.kernel.bin.exists("homebrew")
       let { stdout }= await this.exec({ message: "xcode-select -p", conda: { skip: true } }, (stream) => { })
       let e2 = /(.*Library.*Developer.*CommandLineTools.*|.*Xcode.*Developer.*)/gi.test(stdout)
@@ -665,6 +646,7 @@ class Bin {
       this.client = null
     }
     let requirements = JSON.parse(req.params)
+    console.log({ requirements })
     for(let x=0; x<10; x++) {
       console.log(`## Install Attempt ${x}`)
       let i = 0;
@@ -974,6 +956,8 @@ class Bin {
           let dependencies
           if (r.name === "conda") {
             dependencies = config.bin.conda_requirements
+            console.log("check dependencies", dependencies)
+            requirements[i].dependencies = dependencies
           }
           let installed = await this.check_installed(r, dependencies)
           requirements[i].installed = installed

package/kernel/peer.js

@@ -106,7 +106,6 @@ class PeerDiscovery {
   }
   // refresh peer info
   async refresh(peers) {
-      console.log("*Refresh")
 //    if (this.active) {
       this.refreshing = true
       let refresh_peers
@@ -119,7 +118,6 @@ class PeerDiscovery {
       let peer_info = await Promise.all(refresh_peers.map((host) => {
         return this._refresh(host)
       }))
-      console.log("*Peer.refresh", { peer_info })
       for(let i=0; i<peer_info.length; i++) {
         let peer = peer_info[i]
         if (peer) {

package/kernel/prototype.js

@@ -30,7 +30,7 @@ class Proto {
       let proto = path.dirname(prototype_path)
       let pinokiojs = path.resolve(prototype_dir, prototype_path)
       let config = await this.kernel.require(pinokiojs)
-      if (config && config.create && typeof config.create === "function") {
+      if (config && config.run) {
         if (config.icon) {
           config.icon = "/prototype/" + proto + "/" + config.icon
         } else {

package/kernel/router/index.js

@@ -214,7 +214,7 @@ class Router {
         let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
           headers: { 'Content-Type': 'application/json' }
         })
-        console.log("Caddy Response", { response })
+//        console.log("Caddy Response", { response })
         this.old_config = this.config
       } catch (e) {
         console.log("EEEEEEEEEEEEE", e)

package/kernel/shell.js

@@ -95,6 +95,7 @@ class Shell {
       }
     }
 
+//    this.env.TCELL_MINIMIZE=1
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
     this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
     this.env.TORCH_FORCE_NO_WEIGHTS_ONLY_LOAD = 1
@@ -923,6 +924,7 @@ class Shell {
           this.done = false
           this.ptyProcess = pty.spawn(this.shell, this.args, config)
           this.ptyProcess.onData((data) => {
+            console.log({ data, done: this.done })
             if (!this.done) {
               this.queue.push(data)
             }
@@ -985,6 +987,7 @@ class Shell {
         // 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` })
+        this.ondata({ raw: "", type: "shell.kill" })
         console.log("before cb 1")
         cb()
       } else {
@@ -994,10 +997,12 @@ class Shell {
         // 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` })
+        this.ondata({ raw: "", type: "shell.kill" })
       }
     } else {
       this.kernel.shell.rm(this.id)
       this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
+      this.ondata({ raw: "", type: "shell.kill" })
     }
 
 

package/package.json

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