pinokiod 1.2.51 → 1.2.53

package/kernel/api/fs/index.js

@@ -19,7 +19,8 @@ class FS {
       }
     */
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
-    let filepath = path.resolve(cwd, req.params.path)
+    let filepath = kernel.api.filePath(req.params.path, cwd)
+    //let filepath = path.resolve(cwd, req.params.path)
     let data = await fs.promises.readFile(filepath, req.params.encoding)
     return data
   }
@@ -252,7 +253,8 @@ class FS {
   }
   async rm(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
-    let filepath = path.resolve(cwd, req.params.path)
+    //let filepath = path.resolve(cwd, req.params.path)
+    let filepath = kernel.api.filePath(req.params.path, cwd)
 //    await fs.promises.rm(filepath)
     ondata({ raw: "\r\nremoving:\r\n" + filepath + "\r\n" })
     await rimraf(filepath)
@@ -260,8 +262,11 @@ class FS {
   }
   async copy(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
-    let src = path.resolve(cwd, req.params.src)
-    let dest = path.resolve(cwd, req.params.dest)
+    //let src = path.resolve(cwd, req.params.src)
+    //let dest = path.resolve(cwd, req.params.dest)
+
+    let src = kernel.api.filePath(req.params.src, cwd)
+    let dest = kernel.api.filePath(req.params.dest, cwd)
     let options = req.params.options
     ondata({ raw: "\r\ncopying:\r\nfrom: " + src + "\r\nto: " + dest + "\r\n" })
     await fs.promises.cp(src, dest, options)
@@ -270,7 +275,8 @@ class FS {
 
   async init(req, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
-    let filepath = path.resolve(cwd, req.params.path)
+    //let filepath = path.resolve(cwd, req.params.path)
+    let filepath = kernel.api.filePath(req.params.path, cwd)
     let folder = path.dirname(filepath)
     await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
     return filepath
@@ -282,7 +288,7 @@ class FS {
       } else if (typeof req.params.join === 'string') {
         await fs.promises.appendFile(filepath, req.params.join, "utf8")
       } else {
-        await fs.promises.appendFile(filepath, Strin(req.params.join), "utf8")
+        await fs.promises.appendFile(filepath, String(req.params.join), "utf8")
       }
     }
   }

package/kernel/api/goto/index.js

@@ -20,5 +20,5 @@ module.exports = async (req, ondata, kernel) => {
       }
     }
   }
-  return req.params.input
+  return req.params.params || req.params.input
 }

package/kernel/api/index.js

@@ -196,6 +196,7 @@ class Api {
   async linkGit() {
     // iterate through all userdir folders and check for gitconfig
     // if they exist, add to this.gitPath
+    this.gitPath = {}
     let files
     try {
       files = await fs.promises.readdir(this.userdir, { withFileTypes: true })
@@ -308,6 +309,10 @@ class Api {
     // git url
     // test to see if any of the gitPaths match partially
 
+    if (!uri.includes(".git")) {
+      throw new Error("a git repository URI must end with .git")
+    }
+
     let repos = Object.keys(this.gitPath)
     let matched_repo = repos.filter((repo) => {
       return uri.includes(repo)
@@ -512,6 +517,7 @@ class Api {
     let { cwd, script } = await this.resolveScript(request.path)
 
     let memory = {
+      script: this.kernel.script,
       input,
       args,
       global: (this.kernel.memory.global[request.path] || {}),

package/kernel/api/script/index.js

@@ -41,6 +41,30 @@ class Script {
         - absolute path
         - http path
     */
+    let uri = await this.download(req, ondata, kernel)
+    let res = await new Promise((resolve, reject) => {
+      kernel.api.process({
+        uri,
+        input: req.params.params,
+        client: req.client,
+        caller: req.parent.path,
+      }, (r) => {
+        resolve(r.input)
+      })
+    })
+    // need to call api.linkGit() so the git repositories list is up to date
+    return res
+  }
+  async return(req, ondata, kernel) {
+    /*
+      {
+        "method": "script.return",
+        "params": <RETURN OBJECT>
+      }
+    */
+    return req.params
+  }
+  async download(req, ondata, kernel) {
     let uri
     if (req.params.uri.startsWith("http")) {
       uri = req.params.uri
@@ -94,27 +118,7 @@ class Script {
     } else {
       uri = path.resolve(req.cwd, req.params.uri)
     }
-    let res = await new Promise((resolve, reject) => {
-      kernel.api.process({
-        uri,
-        input: req.params.params,
-        client: req.client,
-        caller: req.parent.path,
-      }, (r) => {
-        resolve(r.input)
-      })
-    })
-    // need to call api.linkGit() so the git repositories list is up to date
-    return res
-  }
-  async return(req, ondata, kernel) {
-    /*
-      {
-        "method": "script.return",
-        "params": <RETURN OBJECT>
-      }
-    */
-    return req.params
+    return uri
   }
 }
 module.exports = Script

package/kernel/index.js

@@ -17,6 +17,7 @@ const Python = require("./python")
 const Template = require('jimini')
 const Shells = require("./shells")
 const Key = require("./key")
+const Script = require('./script')
 const Config = require("./pinokio.json")
 const VARS = {
   pip: {
@@ -204,6 +205,7 @@ class Kernel {
 //      this.homedir = path.resolve(os.homedir(), "pinokio")
 //    }
 //    console.log("homedir", this.homedir)
+    this.script = new Script(this)
     this.loader = new Loader()
     this.bin = new Bin(this)
     this.api = new Api(this)
@@ -277,7 +279,6 @@ class Kernel {
           let info = sysinfo.info
           this.template.update(info)
           this.sysinfo = info
-          console.log("running", this.api.running)
         } catch (e) {
           console.log("sysinfo error", e)
         }

package/kernel/script.js

@@ -0,0 +1,75 @@
+const path = require('path')
+const fs = require('fs')
+class Script {
+  constructor(kernel) {
+    this.kernel = kernel
+  }
+  // script.resolve('https://github.com/cocktailpeanutlabs/comfyui.git', 'start.json')
+  // script.resolve('~/api/comfyui.git', 'start.json')
+  // script.resolve(cwd, 'start.json')
+  resolve(...chunks) {
+    let [base, ...relative] = chunks
+    let p = this.kernel.api.filePath(base)
+    if (p) {
+      return path.resolve(p, ...relative)
+    } else {
+      return false
+    }
+  }
+  exists(...chunks) {
+    let abspath = this.resolve(...chunks)
+    if (abspath) {
+      return fs.existsSync(abspath)
+    } else {
+      return false
+    }
+  }
+  // script.running('https://github.com/cocktailpeanutlabs/comfyui.git/start.json')
+  // script.running('~/api/comfyui.git/start.json')
+  // script.running(cwd, 'start.json')
+  running(...chunks) {
+    let id = this.resolve(...chunks)
+    if (id) {
+      if (this.kernel.api.running[id]) {
+        return true
+      } else {
+        return false
+      }
+    } else {
+      return false
+    }
+  }
+  // script.local('https://github.com/cocktailpeanutlabs/comfyui.git/start.json')
+  // script.local('~/api/comfyui.git/start.json')
+  // script.local(cwd, 'start.json')
+  local(...chunks) {
+    let id = this.resolve(...chunks)
+    if (id) {
+      let v = this.kernel.memory.local[id]
+      if (v) {
+        return  v
+      } else {
+        return {}
+      }
+    } else {
+      return null
+    }
+  }
+  // script.global('https://github.com/cocktailpeanutlabs/comfyui.git/start.json')
+  // script.global('~/api/comfyui.git/start.json')
+  // script.global(cwd, 'start.json')
+  global(...chunks) {
+    let id = this.resolve(...chunks)
+    if (id) {
+      let v = this.kernel.memory.global[id]
+      if (v) {
+        return  v
+      } else {
+        return {}
+      }
+    } else {
+      return null
+    }
+  }
+}
+module.exports = Script

package/package.json

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

package/server/index.js

@@ -223,7 +223,7 @@ class Server {
           path: 'remote.origin.url'
         })
       } catch (e) {
-        console.log("ERROR", e)
+//        console.log("ERROR", e)
       }
     }
 
@@ -922,6 +922,7 @@ class Server {
 
 
         let index = 0
+        console.log({ items })
         for(let i=0; i<items.length; i++) {
           let item = items[i]
           let p = path.resolve(uri, item.name, "pinokio.js")
@@ -937,19 +938,6 @@ class Server {
                 error = `Please update Pinokio to the latest version (current script version: ${config.version}, supported: ${this.kernel.schema}`
               }
             }
-            /*
-            if (config.pinokiod) {
-              // if the script contains a 'pinokiod' field, compare it against the current version
-              // if the current version satisfies the pinokiod field, move forward
-              // otherwise display an "upgrade" message
-              if (semver.satisfies(this.version.pinokiod, config.pinokiod)) {
-                console.log("semver satisfied", this.version.pinokiod, config.pinokiod)
-              } else {
-                console.log("semver NOT satisfied", this.version.pinokiod, config.pinokiod)
-                error = `Please update Pinokio to the latest version (current pinokiod: ${this.version.pinokiod}, required: ${config.pinokiod}`
-              }
-            }
-            */
             if (config.menu) {
               if (typeof config.menu === "function") {
                 if (config.menu.constructor.name === "AsyncFunction") {
@@ -1132,6 +1120,8 @@ class Server {
       for(let i=0; i<config.menu.length; i++) {
         let menuitem = config.menu[i]
 
+        console.log({ menuitem })
+
         if (menuitem.menu) {
           let m = await this.renderMenu(uri, name, { menu: menuitem.menu }, pathComponents)
           menuitem.menu = m.menu
@@ -1856,6 +1846,23 @@ class Server {
 
         let uri = this.kernel.path("api")
         await this.renderMenu(uri, name, config, [])
+      } else {
+        // if there is no menu, display all files
+        let p = this.kernel.path("api", name)
+        let files = await fs.promises.readdir(p, { withFileTypes: true })
+        console.log("files", files)
+        config = {
+          title: name, 
+          menu: files.map((file) => {
+            return {
+              text: file.name,
+              href: file.name
+            }
+          })
+        }
+        let uri = this.kernel.path("api")
+        await this.renderMenu(uri, name, config, [])
+        console.log("config", config)
       }
 
 
@@ -1962,6 +1969,23 @@ class Server {
         let uri = this.kernel.path("api")
         await this.renderMenu(uri, name, config, [])
 
+      } else {
+        // if there is no menu, display all files
+        let p = this.kernel.path("api", name)
+        let files = await fs.promises.readdir(p, { withFileTypes: true })
+        console.log("files", files)
+        config = {
+          title: name, 
+          menu: files.map((file) => {
+            return {
+              text: file.name,
+              href: file.name
+            }
+          })
+        }
+        let uri = this.kernel.path("api")
+        await this.renderMenu(uri, name, config, [])
+        console.log("config", config)
       }
       let platform = os.platform()
       res.render("browser", {

package/server/views/browser.ejs

@@ -1261,6 +1261,11 @@ document.querySelector("aside").addEventListener("click", async (e) => {
 })
 const refresh = async () => {
   console.log("REFRESH")
+  await new Promise((resolve, reject) => {
+    setTimeout(() => {
+      resolve()
+    }, 1000)
+  })
   const html = await fetch("<%=sidebar%>").then((res) => {
     return res.text()
   })