pinokiod 3.9.27 → 3.9.29

package/kernel/api/index.js

@@ -173,8 +173,6 @@ class Api {
     // 1. set the "stop" flag for the uri, so the next execution in the queue for the uri will NOT queue another task
     // 2. stream a message closing the socket
 
-    console.log("STOP", req)
-
     if (req.params.id) {
       // /Users/x/pinokio/prototype/system/aicode/template/claude.json?cwd=/Users/x/pinokio/api/MMAudio.git
       // take the first part only since the rest is the cwd
@@ -191,18 +189,12 @@ class Api {
     }
     // reset modules
     let modpath = this.resolvePath(cwd, req.params.uri)
-    console.log("STOP modpath", modpath)
-    console.log("this.mods before", this.mods)
-    console.log("this.child_procs before", this.child_procs)
     if (this.child_procs[modpath]) {
       let child_procs = Array.from(this.child_procs[modpath])
       for(let proc of child_procs) {
-        console.log("reset child proc", proc)
         delete this.mods[proc]
       }
       delete this.child_procs[modpath]
-      console.log("this.mods after", this.mods)
-      console.log("this.child_procs after", this.child_procs)
     }
 
 
@@ -225,10 +217,7 @@ class Api {
       this.waiter[requestPath].reject()
       delete this.waiter[requestPath]
     }
-
-    console.log("Stop", { req, requestPath })
     if (req.params.id) {
-      console.log("delete", req.params.id, this.running[req.params.id])
       delete this.running[req.params.id]
       delete this.kernel.memory.local[req.params.id]
     } else {
@@ -496,15 +485,12 @@ class Api {
     let method
     let dirname
     let mod
-    console.log(">> resolveMethod", { req, cwd })
     if (req.method && typeof req.method === "function") {
-      console.log(">> 1")
       modpath = null
       method = req.method
       dirname = __dirname
       mod = null
     } else if (req.uri) {
-      console.log(">> 2")
       modpath = this.resolvePath(cwd, req.uri)
       let m = (await this.loader.load(modpath))
       const stats = await fs.promises.stat(modpath)
@@ -536,7 +522,6 @@ class Api {
       }
       mod = m.resolved
       dirname = m.dirname
-      console.log({ m })
       method = mod[req.method].bind(mod)
     } else {
       // KERNEL
@@ -551,11 +536,9 @@ class Api {
         }
         method = mod[methodName].bind(mod)
       } else {
-        console.log(">> 3")
         if (chunks.length === 1) {
           let methodName = chunks[0]
           modpath = path.resolve(__dirname, methodName)
-          console.log({ modpath })
           mod = (await this.loader.load(modpath))
           method = mod.resolved
           dirname = mod.dirname
@@ -660,8 +643,6 @@ class Api {
       cwd = request.cwd
     }
 
-    console.log("STEP", { request, rawrpc, input, args })
-
     let id = request.id || request.path
 
     let memory = {
@@ -717,7 +698,6 @@ class Api {
     }
     // replace {{{ }}} with {{ }}
     rpc = this.kernel.template.flatten(rpc)
-    console.log({ rpc })
 
     // 6. rpc must have method names
     if (rpc.method) {
@@ -732,8 +712,6 @@ class Api {
       // 7. resolve the rpc
       let resolved = await this.resolveMethod(rpc, cwd)
 
-      console.log({ resolved })
-
       // 8. the endpoint must exist
       if (!resolved.method) {
         this.ondata({
@@ -1146,7 +1124,6 @@ class Api {
     this.queues[queue_id] = fastq.promise(async ({ request, rawrpc, input, step, total, cwd, args }) => {
       try {
         let response  = await this.step(request, rawrpc, input, step, total, args)
-        console.log("Handle Response", { request, response })
         if (response) {
           if (response.rawrpc) {
             this.queue(response.request, response.rawrpc, response.input, response.step, response.total, cwd, args)
@@ -1268,7 +1245,6 @@ class Api {
     }
   }
   async process(request, done) {
-    console.log("Process", request)
     /**************************************************************
     *
     *   req := { uri: <relative path>|<absolute path>|<url> }   

package/kernel/api/input/index.js

@@ -2,6 +2,7 @@ module.exports = async (req, ondata, kernel) => {
   // send "input" type event so the frontend triggers a modal
   ondata(req.params, "input")
   // then, wait until the frontend responds
-  let response = await kernel.api.wait(req.parent.path)
+  let id = req.parent.id || req.parent.path
+  let response = await kernel.api.wait(id)
   return response
 }

package/kernel/api/shell/index.js

@@ -129,7 +129,7 @@ class Shell {
       req.params.cols = req.client.cols
     }
     let response = await kernel.shell.run(req.params, options, async (stream) => {
-      process.stdout.write(stream.raw)
+//      process.stdout.write(stream.raw)
       ondata(stream)
     })
     return response

package/kernel/bin/git.js

@@ -42,11 +42,9 @@ class Git {
   async installed() {
     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
     }
   }

package/kernel/bin/index.js

@@ -39,20 +39,7 @@ class Bin {
     this.platform = os.platform()
   }
   async shell_kill(params, ondata) {
-    console.log("shell_kill", params)
     this.kernel.shell.kill(params.params)
-
-//    let id = params.params.id
-//    console.log("id", id)
-//    console.log("api.running", this.kernel.api.running)
-//    delete this.kernel.api.running[id]
-//    delete this.kernel.memory.local[id]
-//
-//    ondata({
-//      id,
-//      type: "disconnect"
-//    })
-//    this.kernel.refresh(true)
   }
   async shell_start(params, ondata) {
     params.path = params.path || this.path()
@@ -183,7 +170,6 @@ class Bin {
     // return a single merged env object, constructed from all the modules
 
     // 1. get the module envs
-    console.log("this.mods", this.mods)
     let envs = this.mods.map((mod) => {
       if (mod.name === "vs") {
         // don't include vs now
@@ -255,8 +241,6 @@ class Bin {
       return file.endsWith(".js") && file !== "index.js" && file !== "cmake.js"
     })
 
-    console.log("BIN INIT")
-
     for(let filename of modfiles) {
       // 1. get all the modules in __dirname
       // 2. load them

package/kernel/index.js

@@ -637,7 +637,6 @@ class Kernel {
           this.shell.init().then(async () => {
 //            this.bin.check()
             if (this.envs) {
-              console.log("template.update")
               this.template.update({
                 env: this.envs,
                 envs: this.envs,
@@ -652,7 +651,6 @@ class Kernel {
                         return null
                       }
                     } catch (e) {
-                      console.log(`>> which ${name}`, e)
                       return null
                     }
                   } else {
@@ -660,6 +658,23 @@ class Kernel {
                   }
                 }
               })
+              if (this.bin.installed.conda.has("git")) {
+                await this.proto.init()
+                await this.plugin.init()
+              }
+
+              this.sys = new Sysinfo()
+              await this.sys.init(this)
+              let info = this.sys.info
+
+              this.sysinfo = info
+
+              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))
+              let pwpath = this.bin.path("playwright/node_modules/playwright")
+              this.playwright = (await this.loader.load(pwpath)).resolved
 
               // get env
               if (!this.launch_complete) {
@@ -703,9 +718,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,
@@ -715,30 +728,6 @@ class Kernel {
             return this.api.get_proxy_url("/proxy", port)
           },
         })
-        console.log("> 2")
-        this.sys = new Sysinfo()
-        await this.sys.init(this)
-        console.log("> 3")
-        let info = this.sys.info
-
-        this.sysinfo = info
-
-        await this.getInfo()
-        console.log("> 4")
-
-        await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
-        console.log("> 5")
-        await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify(this.i, null, 2))
-        console.log("> 6")
-        let pwpath = this.bin.path("playwright/node_modules/playwright")
-        this.playwright = (await this.loader.load(pwpath)).resolved
-
-        console.log("> 7")
-
-        await this.proto.init()
-        console.log("> 8")
-        await this.plugin.init()
-        console.log("> 9")
 
         // refresh every 5 second
         if (this.refresh_interval) {
@@ -763,13 +752,15 @@ class Kernel {
   }
   async update_sysinfo() {
     try {
-      await this.sys.refresh()
-      let info = this.sys.info
-      this.template.update(info)
-      this.sysinfo = info
-      this.gpu = info.gpu
-      this.gpu_model = info.gpu_model
-      this.gpus = info.gpus
+      if (this.sys) {
+        await this.sys.refresh()
+        let info = this.sys.info
+        this.template.update(info)
+        this.sysinfo = info
+        this.gpu = info.gpu
+        this.gpu_model = info.gpu_model
+        this.gpus = info.gpus
+      }
     } catch (e) {
       console.log("sysinfo error", e)
     }

package/kernel/loader.js

@@ -93,6 +93,7 @@ class Loader {
     } catch (e) {
       return false;
     }
+    // fs.access doesn't work when packaged in electron => use fs.stat
     //return new Promise(r=>fs.access(abspath, fs.constants.F_OK, e => r(!e)))
   }
 }

package/kernel/plugin.js

@@ -4,30 +4,34 @@ class Plugin {
     this.kernel = kernel
   }
   async init() {
-    // if ~/pinokio/prototype doesn't exist, clone
-    let exists = await this.kernel.exists("plugin")
-    if (!exists) {
-      await this.kernel.exec({
-        message: "git clone https://github.com/peanutcocktail/plugin",
-        path: this.kernel.homedir
-      }, (e) => {
-        process.stdout.write(e.raw)
-      })
-    }
+    if (this.kernel.bin.installed.conda.has("git")) {
+      // if ~/pinokio/prototype doesn't exist, clone
+      let exists = await this.kernel.exists("plugin")
+      if (!exists) {
+        await this.kernel.exec({
+          message: "git clone https://github.com/peanutcocktail/plugin",
+          path: this.kernel.homedir
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
+      }
 
-    let plugin_dir = path.resolve(this.kernel.homedir, "plugin")
-    let pinokiojs = path.resolve(plugin_dir, "pinokio.js")
-    this.config = await this.kernel.require(pinokiojs)
+      let plugin_dir = path.resolve(this.kernel.homedir, "plugin")
+      let pinokiojs = path.resolve(plugin_dir, "pinokio.js")
+      this.config = await this.kernel.require(pinokiojs)
+    }
   }
   async update() {
-    let exists = await this.kernel.exists("plugin")
-    if (!exists) {
-      await this.kernel.exec({
-        message: "git pull",
-        path: this.kernel.path("plugin")
-      }, (e) => {
-        process.stdout.write(e.raw)
-      })
+    if (this.kernel.bin.installed.conda.has("git")) {
+      let exists = await this.kernel.exists("plugin")
+      if (!exists) {
+        await this.kernel.exec({
+          message: "git pull",
+          path: this.kernel.path("plugin")
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
+      }
     }
   }
 }

package/kernel/prototype.js

@@ -7,43 +7,50 @@ class Proto {
     this.kernel = kernel
   }
   async init() {
-
-    // if ~/pinokio/prototype doesn't exist, clone
-    let exists = await this.kernel.exists("prototype")
-    if (!exists) {
-      console.log("prototype doesn't exist. cloning...")
-      await fs.promises.mkdir(this.kernel.path("prototype"), { recursive: true }).catch((e) => { })
-      await this.kernel.exec({
-        message: "git clone https://github.com/peanutcocktail/prototype system",
-        path: this.kernel.path("prototype")
-      }, (e) => {
-        process.stdout.write(e.raw)
-      })
-    }
-
-
-    let cwd = path.resolve(this.kernel.homedir, "prototype")
-    let prototype_paths = (await glob('**/pinokio.js', { cwd }))
-    let prototype_dir = path.resolve(this.kernel.homedir, "prototype")
     this.items = []
     this.kv = {}
-    for(let prototype_path of prototype_paths) {
-      let proto = path.dirname(prototype_path)
-      let pinokiojs = path.resolve(prototype_dir, prototype_path)
-      let config = await this.kernel.require(pinokiojs)
-      if (config && config.run) {
-        if (config.icon) {
-          config.icon = "/prototype/" + proto + "/" + config.icon
-        } else {
-          config.icon === "/pinokio-black.png"
-        }
-        let c = {
-          id: proto,
-          ...config
-        }
-        this.items.push(c)
-        this.kv[proto] = c
+    if (this.kernel.bin.installed.conda.has("git")) {
+
+      // if ~/pinokio/prototype doesn't exist, clone
+      let exists = await this.kernel.exists("prototype")
+      if (!exists) {
+        console.log("prototype doesn't exist. cloning...")
+        await fs.promises.mkdir(this.kernel.path("prototype"), { recursive: true }).catch((e) => { })
+        await this.kernel.exec({
+          //message: "git clone https://github.com/peanutcocktail/prototype system",
+          message: "git clone https://github.com/cocktailpeanutlabs/proto system",
+          path: this.kernel.path("prototype")
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
       }
+
+      let pinokiojs_path = this.kernel.path("prototype/system/pinokio.js")
+      let config = await this.kernel.require(pinokiojs_path)
+      this.config = config
+
+
+
+////      let prototype_paths = (await glob('**/pinokio.js', { cwd }))
+//      let prototype_dir = path.resolve(this.kernel.homedir, "prototype")
+//      for(let prototype_path of prototype_paths) {
+//        let proto = path.dirname(prototype_path)
+//        let pinokiojs = path.resolve(prototype_dir, prototype_path)
+//        let config = await this.kernel.require(pinokiojs)
+//        if (config && config.run) {
+//          if (config.icon) {
+//            config.icon = "/prototype/" + proto + "/" + config.icon
+//          } else {
+//            config.icon === "/pinokio-black.png"
+//          }
+//          let c = {
+//            id: proto,
+//            ...config
+//          }
+//          this.items.push(c)
+//          this.kv[proto] = c
+//        }
+//      }
     }
   }
   async readme(proto) {

package/kernel/shells.js

@@ -145,7 +145,9 @@ class Shells {
           }
         }
       }
-      ondata(stream)
+      if (ondata) {
+        ondata(stream)
+      }
     })
     /*
       {
@@ -284,7 +286,9 @@ class Shells {
         // if the stream includes "prompt": true, don't emit the event since that event is only for
         // handling listeners
         if (!stream.prompt) {
-          ondata(stream)
+          if (ondata) {
+            ondata(stream)
+          }
         }
         if (params.on) {
           for(let handler of params.on) {

package/package.json

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