pinokiod 3.9.28 → 3.9.30

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 {
@@ -533,7 +522,6 @@ class Api {
       }
       mod = m.resolved
       dirname = m.dirname
-      console.log({ m })
       method = mod[req.method].bind(mod)
     } else {
       // KERNEL
@@ -551,7 +539,6 @@ class Api {
         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
@@ -656,8 +643,6 @@ class Api {
       cwd = request.cwd
     }
 
-    console.log("STEP", { request, rawrpc, input, args })
-
     let id = request.id || request.path
 
     let memory = {
@@ -713,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) {
@@ -728,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({
@@ -1142,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)
@@ -1264,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/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()
@@ -254,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

@@ -728,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) {
@@ -776,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,7 +4,7 @@ class Plugin {
     this.kernel = kernel
   }
   async init() {
-    if (this.kernel.bin.installed.conda.has("git")) {
+    if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
       // if ~/pinokio/prototype doesn't exist, clone
       let exists = await this.kernel.exists("plugin")
       if (!exists) {
@@ -22,7 +22,7 @@ class Plugin {
     }
   }
   async update() {
-    if (this.kernel.bin.installed.conda.has("git")) {
+    if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
       let exists = await this.kernel.exists("plugin")
       if (!exists) {
         await this.kernel.exec({

package/kernel/prototype.js

@@ -9,7 +9,7 @@ class Proto {
   async init() {
     this.items = []
     this.kv = {}
-    if (this.kernel.bin.installed.conda.has("git")) {
+    if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
 
       // if ~/pinokio/prototype doesn't exist, clone
       let exists = await this.kernel.exists("prototype")
@@ -17,35 +17,40 @@ class Proto {
         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/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 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
-        }
-      }
+
+
+////      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.28",
+  "version": "3.9.30",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -102,12 +102,9 @@ class Server {
     return new Promise(r=>fs.access(s, fs.constants.F_OK, e => r(!e)))
   }
   async updateMeta(formData, app_path) {
-    console.log("updateMeta", formData)
-
     // write title/description to pinokio.json
     let dirty
     let meta_path = this.kernel.path("api", app_path, "pinokio.json")
-    console.log("meta_path", meta_path)
     let meta = (await this.kernel.loader.load(meta_path)).resolved
     if (!meta) meta = {}
     if (formData.title) {
@@ -128,13 +125,11 @@ class Server {
       // 
       // write icon file
       let icon_path = this.kernel.path("api", formData.new_path, formData.icon_path)
-      console.log({ icon_path })
       await fs.promises.writeFile(icon_path, formData.avatar)
       meta.icon = formData.icon_path
       dirty = true
     }
     if (dirty) {
-      console.log("Save", meta_path, meta)
       await fs.promises.writeFile(meta_path, JSON.stringify(meta, null, 2))
     }
   }
@@ -516,6 +511,12 @@ class Server {
       execUrl: "/api/" + name,
 //      rawpath,
     }
+    if (!this.kernel.proto.config) {
+      await this.kernel.proto.init()
+    }
+    if (!this.kernel.plugin.config) {
+      await this.kernel.plugin.init()
+    }
     res.render("app", result)
   }
   getVariationUrls(req) {
@@ -1006,7 +1007,6 @@ class Server {
             script_path: (req.base ? full_filepath : null),
           }
 
-
           res.render(template, result)
         }
 
@@ -1186,8 +1186,6 @@ 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) {
@@ -1257,7 +1255,6 @@ 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)) {
@@ -1542,6 +1539,49 @@ class Server {
   }
 
 
+  renderMenu2(config, base, keypath) {
+    // when the config has not loaded yet
+    if (!config) {
+      return { menu: [] }
+    }
+
+    if (config.menu) {
+      for(let i=0; i<config.menu.length; i++) {
+        let item = config.menu[i]
+        let new_keypath
+        if (keypath) {
+          new_keypath = keypath.concat(i)
+        } else {
+          new_keypath = [i]
+        }
+        let c = this.renderMenu2(item, base, new_keypath)
+        config.menu[i] = c
+      }
+    }
+    if (config.text) {
+      if (config.hasOwnProperty("icon")) {
+        config.html = `<i class="${config.icon}"></i> ${config.text}` 
+      } else if (config.hasOwnProperty("image")) {
+        let imagePath = `${base.path}/${config.image}`
+        config.html = `<img class='menu-item-image' src='${imagePath}' /> ${config.text}`
+      } else {
+        config.html = `${config.text}` 
+      }
+      config.btn = config.html
+    }
+    /*
+    if (config.href && !config.href.startsWith("/")) {
+      if (base.href) {
+        config.href = base.href + "/" + config.href
+      }
+    }
+    */
+    if (keypath) {
+      config.href = base.href + "/" + keypath.join("/") + "?path=" + base.cwd
+    }
+    return config
+  }
+
   async renderMenu(uri, name, config, pathComponents, indexPath) {
     if (config.menu) {
 
@@ -1579,7 +1619,7 @@ class Server {
           menuitem.menu = m.menu
         }
 
-        if (menuitem.base === "/") {
+        if (menuitem.base && menuitem.base.startsWith("/")) {
           config.menu[i].href = menuitem.base + menuitem.href
         } else {
           if (menuitem.href && !menuitem.href.startsWith("http")) {
@@ -2547,6 +2587,12 @@ class Server {
 //        return
 //      }
       
+      if (!this.kernel.proto.config) {
+        await this.kernel.proto.init()
+      }
+      if (!this.kernel.plugin.config) {
+        await this.kernel.plugin.init()
+      }
 
       if (req.query.mode !== "settings" && !home) {
         res.redirect("/?mode=settings")
@@ -2845,7 +2891,6 @@ class Server {
       //Util.openfs(req.body.path, req.body.mode)
       let cwd = req.body.cwd
       let cmd = req.body.run
-      console.log({ cmd, cwd })
       Util.run(cmd, cwd, this.kernel)
       res.json({ success: true })
     }))
@@ -3483,22 +3528,34 @@ class Server {
     }))
     this.app.get("/prototype/show/*", ex(async (req, res) => {
       let name = req.params[0].split("/").filter((x) => { return x }).join("/")
-      let icon = this.kernel.proto.kv[name].icon
-      let title = this.kernel.proto.kv[name].title
-      let description = this.kernel.proto.kv[name].description
-      let readme = await this.kernel.proto.readme(name)
-      let config = await this.kernel.api.meta({ path: req.query.path })
+
+      // print readme
+
+      
+
+
+      let paths = req.params[0].split("/")
+      let item
+      let config = this.kernel.proto.config
+      for(let key of paths) {
+        config = config.menu[key] 
+      }
+      let run_path = "/run/prototype/system/" + config.href + "?cwd=" + req.query.path
+      console.log({ config, run_path, query: req.query })
+      let readme_path = this.kernel.path("prototype/system", config.readme)
+      console.log("config.readme.split", config.readme.split("/").slice(0, -1))
+      let md = await fs.promises.readFile(readme_path, "utf8")
+      console.log({ readme_path, md })
+      let baseUrl = "/asset/prototype/system/" + (config.readme.split("/").slice(0, -1).join("/")) + "/"
+      console.log("baseUrl", baseUrl)
+      let readme = marked.parse(md, {
+        baseUrl
+      })
+
       res.render("prototype/show", {
-        config,
-        path: req.query.path,
-        icon,
-        title,
-        description,
-        name,
-        prototype_path: name,
+        run_path,
         portal: this.portal,
         readme,
-        items: this.kernel.proto.items.filter(item => item.type === 'init'),
         logo: this.logo,
         theme: this.theme,
         agent: this.agent,
@@ -3507,11 +3564,11 @@ class Server {
     }))
     this.app.get("/prototype", ex(async (req, res) => {
       // load meta
-      let config = await this.kernel.api.meta({ path: req.query.path })
-      let items = this.kernel.proto.items
-      if (req.query.type) {
-        items = this.kernel.proto.items.filter(item => item.type === req.query.type)
-      }
+//      let config = await this.kernel.api.meta({ path: req.query.path })
+//      let items = this.kernel.proto.items
+//      if (req.query.type) {
+//        items = this.kernel.proto.items.filter(item => item.type === req.query.type)
+//      }
       let title
       let description
       if (req.query.type === "init") {
@@ -3521,14 +3578,38 @@ class Server {
         title = "Extensions"
         description = "Add extension modules to the current folder"
       }
+
+      let config = structuredClone(this.kernel.proto.config)
+      config = this.renderMenu2(config, {
+        cwd: req.query.path,
+        href: "/prototype/show",
+        path: "/asset/prototype/system"
+      })
+
+//    {
+//      "icon": "fa-solid fa-power-off",
+//      "text": "Run Default",
+//      "href": "/api/facefusion-pinokio.git/run.js?run=true&fullscreen=true&mode=Default",
+//      "params": {
+//        "run": true,
+//        "fullscreen": true,
+//        "mode": "Default"
+//      },
+//      "src": "/api/facefusion-pinokio.git/run.js",
+//      "html": "<i class=\"fa-solid fa-power-off\"></i> Run Default",
+//      "btn": "<i class=\"fa-solid fa-power-off\"></i> Run Default",
+//      "target": "@/api/facefusion-pinokio.git/run.js"
+//    },
+//
       res.render("prototype/index", {
         title,
         description,
         config,
         path: req.query.path,
         portal: this.portal,
-        items,
+//        items,
         logo: this.logo,
+        platform: this.kernel.platform,
         theme: this.theme,
         agent: this.agent,
         kernel: this.kernel,
@@ -4291,10 +4372,8 @@ class Server {
         */
 
         let formData = req.body
-        console.log("req.files", req.files)
         for(let key in req.files) {
           let file = req.files[key]
-          console.log({ key, file })
           formData[file.fieldname] = file.buffer
         }
         console.log({ formData })

package/server/public/fseditor.js

@@ -1,8 +1,6 @@
 const FSEditor = async ({title, description, old_path, icon, iconpath, redirect, copy, move, edit }) => {
-  console.log({ icon, iconpath })
   const compare = async (file1, file2) => {
     if (file1.size !== file2.size) return false;
-    console.log({ file1, file2 })
     const buffer1 = await file1.arrayBuffer();
     const buffer2 = await file2.arrayBuffer();
     const view1 = new Uint8Array(buffer1);
@@ -49,11 +47,11 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
   ${folderpath_html}
   <div class='folder-row ${meta_class}'>
     <label for='new-folder-title'>Title</label>
-    <input id="new-folder-title" class="swal2-input" placeholder="Folder Name" value="${title}" />
+    <input id="new-folder-title" class="swal2-input" placeholder="Project Name (stored in pinokio.js)" value="${title}" />
   </div>
   <div class='folder-row ${meta_class}'>
     <label for='new-folder-description'>Description</label>
-    <textarea id="new-folder-description" class="swal2-input" placeholder="Folder Description">${description}</textarea>
+    <textarea id="new-folder-description" class="swal2-input" placeholder="Project Description (stored in pinokio.js)">${description}</textarea>
   </div>
 </div>
 </div>`,
@@ -103,8 +101,6 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
 //              url: '/pinokio/upload', // optional if same as above
             process: async (fieldName, file, metadata, load, error, progress, abort) => {
               const formData = new FormData();
-
-              console.log("upload", { dirty, file })
               formData.append('avatar', file)
               if (dirty) {
                 formData.append("icon_dirty", true)
@@ -128,7 +124,6 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
                 path = old_path
                 formData.append("new_path", old_path)
               }
-              debugger
               if (mode === "copy") {
                 formData.append("copy", true)
               } else if (mode === "move") {
@@ -165,8 +160,6 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
             }
           },
           onaddfile(error, file) {
-            console.log({ file, initial_file })
-            debugger
             if (initial_file) {
               compare(initial_file.file, file.file).then((same) => {
                 if (same) {