pinokiod 3.9.27 → 3.9.28

package/kernel/api/index.js

@@ -496,15 +496,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)
@@ -551,7 +548,6 @@ class Api {
         }
         method = mod[methodName].bind(mod)
       } else {
-        console.log(">> 3")
         if (chunks.length === 1) {
           let methodName = chunks[0]
           modpath = path.resolve(__dirname, methodName)

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

@@ -183,7 +183,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

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,30 @@ 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")
+//        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) {

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,42 +7,44 @@ class Proto {
     this.kernel = kernel
   }
   async init() {
+    this.items = []
+    this.kv = {}
+    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",
-        path: this.kernel.path("prototype")
-      }, (e) => {
-        process.stdout.write(e.raw)
-      })
-    }
+      // 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
+      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")
+      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
         }
-        this.items.push(c)
-        this.kv[proto] = c
       }
     }
   }

package/package.json

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

package/server/index.js

@@ -1186,6 +1186,8 @@ class Server {
         pinokioPath = `pinokio://?uri=${gitRemote}/${pathComponents.slice(1).join("/")}`
       }
 
+      console.log("API.RUNNING", this.kernel.api.running)
+
       let running = []
       let notRunning = []
       if (pathComponents.length === 0) {
@@ -1255,6 +1257,7 @@ class Server {
           for(let key in this.kernel.api.running) {
             //let p = this.kernel.path("api", items[i].name) + path.sep
             let p = this.kernel.path("api", items[i].name)
+            console.log({ key, p })
 
             //let re = new RegExp(items[i].name)
             //if (re.test(key)) {
@@ -1262,7 +1265,27 @@ class Server {
 
 
             // not only should include the pattern, but also end with it (otherwise can include similar patterns such as /api/qqqa, /api/qqqaaa, etc.
-            if (key.includes(p) && key.endsWith(p)) {
+
+            let is_running
+            let api_path = this.kernel.path("api")
+            if (key.startsWith(api_path)) {
+              // api script
+              if (key.startsWith(p)) {
+                is_running = true
+              }
+            } else {
+              if (key.endsWith(p)) {
+                is_running = true
+              }
+            }
+            // 1. if the script path starts with api path => api script
+            //    => check includes and startsWith
+
+            // 2. if the script path starts with anything else => other scripts (prototype, plugin ,etc.)
+            //    => check inlcludes and endsWith
+
+            //if (key.includes(p) && key.endsWith(p)) {
+            if (is_running) {
               items[i].running = true
               items[i].index = index
               if (!items[i].running_scripts) {
@@ -2256,15 +2279,28 @@ class Server {
     }
   }
   async getPlugin(name) {
-    let info = new Info(this.kernel)
-    info.caller = () => {
-      return this.kernel.path("api", name, "pinokio.js")
+    if (this.kernel.plugin.config) {
+      try {
+        let info = new Info(this.kernel)
+        info.caller = () => {
+          return this.kernel.path("api", name, "pinokio.js")
+        }
+        let menu = await this.kernel.plugin.config.menu(this.kernel, info)
+        let plugin = { menu }
+        let uri = this.kernel.path("api")
+        await this.renderMenu(uri, name, plugin, [])
+        return plugin
+      } catch (e) {
+        return {
+          menu: []
+        }
+      }
+    } else {
+      return {
+        menu: []
+      }
+      
     }
-    let menu = await this.kernel.plugin.config.menu(this.kernel, info)
-    let plugin = { menu }
-    let uri = this.kernel.path("api")
-    await this.renderMenu(uri, name, plugin, [])
-    return plugin
   }
 
   async start(options) {