pinokiod 1.1.24 → 1.1.25

package/kernel/api/index.js

@@ -240,6 +240,26 @@ class Api {
     }
     return null
   }
+  resolveBrowserPath(uri) {
+    let repos = Object.keys(this.gitPath)
+    let matched_repo = repos.filter((repo) => {
+      return uri.includes(repo)
+    })
+    if (matched_repo.length > 0) {
+      let repo_uri = matched_repo[0]
+
+      let relative_path = uri
+        .replace(repo_uri, "")    // remove the git repo uri
+        .slice(1)                 // remove the leading '/' for relative path
+
+      let repopath = this.gitPath[repo_uri]
+      let reponame = path.basename(repopath)
+
+      return `/pinokio/browser/${reponame}/${relative_path}`
+    } else {
+      return null
+    }
+  }
 
   resolveWebPath(uri) {
     let repos = Object.keys(this.gitPath)
@@ -682,6 +702,7 @@ class Api {
             // kill all connected shells
             // if not daemon
             if (script.daemon) {
+              console.log("## DONE")
               this.ondata({
                 id: request.path,
                 type: "start",

package/kernel/api/modal/index.js

@@ -0,0 +1,5 @@
+module.exports = async (req, ondata, kernel) => {
+  ondata(req.params, "modal")
+  let response = await kernel.api.wait(req.parent.path)
+  return response
+}

package/kernel/api/process/index.js

@@ -1,4 +1,126 @@
+const waitOn = require('wait-on');
 class Process {
+//  async start(req, ondata, kernel) {
+//    /*
+//      req := {
+//        method: "process.start",
+//        params: {
+//          uri: "https://github.com/cocktailpeanutlabs/comfyui.git/start.js",
+//          html: "please install ollama",
+//        }
+//      }
+//    */
+//    if (kernel.running(req.params.uri)) {
+//      // nothing
+//    } else {
+//      // if exists
+//      let uri = req.params.uri
+//      let filePath = kernel.api.filePath(uri)
+//      if (kernel.exists(filePath)) {
+//        // run script
+//        await kernel.api.init()
+//        console.log("start process", uri)
+//        await kernel.api.process({ uri })
+//        console.log("process finished")
+//      } else {
+//        // display html notify
+//        let repo = new URL(uri)
+//        let href = `https://pinokio.computer/item?uri=${repo}`
+//        ondata({
+//          html: req.params.html,
+//          href,
+//          target: "_blank",
+//        }, "notify")
+//      }
+//    }
+//  }
+//  async run (req, ondata, kernel) {
+//    /*
+//      // if uri is not specified => just wait
+//      req := {
+//        method: "process.wait",
+//        params: {
+//          wait: <waitOn object>,
+//          href: "https://ollama.com",
+//          html: "please install ollama",
+//        }
+//      }
+//
+//      // if uri is specified => it's pinokio script
+//      1. if the wait condition is met => return immediately
+//      2. if the wait condition is not met
+//        2.1. if the script exists
+//          run the script
+//          and wait for the wait condition
+//        2.2. if the script does not exist
+//          display the 'message' and the 'link'
+//
+//      req := {
+//        method: "process.wait",
+//        params: {
+//          start: "https://github.com/cocktailpeanutlabs/comfyui.git/start.js",
+//          wait: <waitOn object>,
+//          html: "start comfyui",
+//        }
+//      }
+//    */
+//
+//    if (req.params) {
+//      if (req.params.wait) {
+//
+//        await new Promise((resolve, reject) => {
+//          let options = req.params.wait
+//          waitOn(options).then(() => {
+//            resolve()
+//          })
+//
+//          // 1. if there's a script attribute
+//          //  1.0. check if the script repo exists
+//          //    => if exists, go to the next step
+//          //    => if not exists, display the message and the link
+//          //  1.1. check if the script is running
+//          //    => if running, don't do anything => waitOn() will automatically return
+//          //    => if not running, start the script
+//          //  1.2. check if the script is not repo exists
+//          // 2. if there's no script attribute => display the message and the link
+//          if (req.params.start) {
+//            if (kernel.running(req.params.start)) {
+//              // nothing
+//            } else {
+//              // if exists
+//              let uri = req.params.start
+//              let filePath = kernel.api.filePath(uri)
+//              if (kernel.exists(filePath)) {
+//                // run script
+//                //await kernel.api.init()
+//                kernel.api.process({ uri })
+//              } else {
+//                // display html
+//                let repo = new URL(uri)
+//                let href = `https://pinokio.computer/item?uri=${repo}`
+//                ondata({
+//                  html: req.params.html,
+//                  href,
+//                  target: "_blank",
+//                }, "notify")
+//              }
+//            }
+//          } else {
+//            ondata({
+//              html: req.params.html,
+//              href: req.params.href,
+//              target: "_blank",
+//            }, "notify")
+//          }
+//        })
+//      }
+//    }
+//
+//
+//
+//
+//
+//  }
   async wait (req, ondata, kernel) {
     /*
     params := {

package/kernel/index.js

@@ -5,6 +5,7 @@ const jsdom = require("jsdom");
 const path = require('path')
 const fastq = require('fastq')
 const fetch = require('cross-fetch');
+const waitOn = require('wait-on');
 const system = require('systeminformation');
 const Sysinfo = require('./sysinfo')
 const portfinder = require('portfinder');
@@ -46,7 +47,9 @@ class Kernel {
   }
   local(...args) {
     // get local variables at path
-    let v = this.memory.local[path.resolve(...args)]
+    let filePath = this.api.filePath(path.resolve(...args))
+    let v = this.memory.local[filePath]
+    //let v = this.memory.local[path.resolve(...args)]
     if (v) {
       return  v
     } else {
@@ -55,7 +58,9 @@ class Kernel {
   }
   global(...args) {
     // get local variables at path
-    let v = this.memory.global[path.resolve(...args)]
+    let filePath = this.api.filePath(path.resolve(...args))
+    let v = this.memory.global[filePath]
+//    let v = this.memory.global[path.resolve(...args)]
     if (v) {
       return  v
     } else {
@@ -140,6 +145,9 @@ class Kernel {
     }
   }
 
+  async wait(options) {
+    await waitOn(options)
+  }
 
   async init() {
     let home = this.store.get("home")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.1.24",
+  "version": "1.1.25",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,6 @@
     "fastq": "^1.15.0",
     "form-data": "^4.0.0",
     "fs-extra": "^11.1.1",
-    "gepeto": "^0.0.33",
     "glob": "^10.3.3",
     "glob-gitignore": "^1.0.14",
     "handlebars": "^4.7.7",
@@ -45,6 +44,7 @@
     "node-calls-python": "^1.8.2",
     "node-downloader-helper": "^2.1.9",
     "node-pty-prebuilt-multiarch-cp": "^0.10.1-pre.48",
+    "open": "8.4.2",
     "pdrive": "^0.0.23",
     "portfinder": "^1.0.32",
     "random-useragent": "^0.5.0",
@@ -56,6 +56,7 @@
     "symlink-dir": "^5.2.1",
     "systeminformation": "^5.18.4",
     "uuid": "^9.0.0",
+    "wait-on": "^7.2.0",
     "watcher": "^2.2.2",
     "ws": "^8.13.0",
     "xterm-addon-fit": "^0.8.0",

package/server/index.js

@@ -11,7 +11,6 @@ const cors = require('cors');
 const path = require("path")
 const fs = require('fs');
 const os = require('os')
-const gepeto = require('gepeto')
 const { fork } = require('child_process');
 const semver = require('semver')
 const fse = require('fs-extra')
@@ -262,6 +261,7 @@ class Server {
 
 
     let stat = await fs.promises.stat(filepath)
+    console.log("ST", { stat, filepath, isfile: stat.isFile() })
     if (pathComponents.length === 0 && req.query.mode === "explore") {
       res.render("explore", {
         version: this.version,
@@ -368,6 +368,7 @@ class Server {
         query: req.query
       })
     } else if (stat.isFile()) {
+      console.log("isfile")
 
       if (req.query && req.query.raw) {
         try {
@@ -426,6 +427,8 @@ class Server {
 
       let runner = json || js
 
+      console.log({ runner, json, js, editmode, m })
+
       let rawpath = `/raw/${pathComponents.join('/')}` + "?frame=true"
       if (editmode) {
         let content = await fs.promises.readFile(filepath, "utf8")
@@ -758,6 +761,7 @@ class Server {
 
         res.render(template, result)
       } else {
+        console.log("FRAME", rawpath)
         res.render("frame", {
           logo: this.logo,
           theme: this.theme,
@@ -1065,10 +1069,6 @@ class Server {
       for(let i=0; i<config.menu.length; i++) {
         let menuitem = config.menu[i]
 
-
-
-
-
         if (menuitem.menu) {
           let m = await this.renderMenu(uri, name, { menu: menuitem.menu }, pathComponents)
           menuitem.menu = m.menu
@@ -1883,6 +1883,17 @@ class Server {
       this.tabs[req.body.name] = req.body.tabs
       res.json({ success: true })
     })
+    this.app.get("/pinokio/browser", async (req, res) => {
+      console.log("req.query", req.query)
+      if (req.query && req.query.uri) {
+        let uri = req.query.uri
+        let p = this.kernel.api.resolveBrowserPath(uri)
+        console.log({ uri, p})
+        res.redirect(p)
+      } else {
+        res.redirect("/")
+      }
+    })
     this.app.get("/pinokio/browser/:name", async (req, res) => {
       let name = req.params.name
       let app_path = this.kernel.path("api", name, "pinokio.js")
@@ -2279,14 +2290,6 @@ class Server {
     this.app.get("/check", (req, res) => {
       res.json({ success: true })
     })
-    this.app.post("/gepeto", async (req, res) => {
-      try {
-        await gepeto(path.resolve(this.kernel.homedir, "api", req.body.name))
-      } catch (e) {
-        console.log("gepeto error", e)
-      }
-      res.json({ success: true })
-    })
     this.app.post("/restart", async (req, res) => {
       console.log("post /restart")
       this.start(this.debug)

package/server/public/install.js

@@ -106,28 +106,6 @@ const install = async (name, url, term, socket, options) => {
     // ask the backend to create install.json and start.json if gradio
     location.href = `/?selected=${name}`
 
-//    await fetch("/gepeto", {
-//      method: "post",
-//      headers: {
-//        "Content-Type": "application/json"
-//      },
-//      body: JSON.stringify({
-//        name
-//      })
-//    })
-//
-//    //location.href = "/api/" + name
-//    location.href = `/?selected=${name}`
-//    /*
-//    n.Noty({
-//      text: "Success! Click here to continue.",
-//      callbacks: {
-//        onClose: () => {
-//          location.href = "/api/" + name
-//        }
-//      }
-//    })
-//    */
   }
 }
 const createTerm = () => {

package/server/public/simplemodal.js

@@ -0,0 +1,24 @@
+const SimpleModal = async (params) => {
+  let btns = params.menu.map((item) => {
+    if (item.href) {
+      return `<a class='btn' href='${item.href}' target='_blank'>${item.text}</a>`
+    } else if (item.action) {
+      return `<a class='btn' target='_blank'>${item.text}</a>`
+    }
+  }).join("")
+  await Swal.fire({
+    title: params.title,
+    html: `<div class='simple-modal-desc'>
+${params.description}
+</div>
+<div class='simple-modal-content'>${btns}</div>`,
+//    showConfirmButton: false,
+//    footer: `<div class='simple-modal-footer'>
+//<div class='flexible'></div>
+//<div id='simple-modal-close'>Done</div>
+//</div>`,
+//    didClose: (result) => {
+//      // Optional: Handle overall modal closing if needed
+//    }
+  })
+}

package/server/public/style.css

@@ -81,6 +81,25 @@ footer .toggle-expand {
 footer pre {
   background: none !important;
 }
+.simple-modal-desc {
+  padding-bottom: 10px;
+  text-align: left;
+  font-size: 14px;
+}
+.simple-modal-content {
+  text-align: left;
+  width: 100%;
+  box-sizing: border-box;
+}
+.simple-modal-content .btn {
+  margin-right: 5px;
+}
+.simple-modal-footer {
+  display: flex;
+  padding: 10px;
+  width: 100%;
+  box-sizing: border-box;
+}
 footer {
   font-family: verdana;
   overflow: hidden;

package/server/socket.js

@@ -40,10 +40,6 @@ class Socket {
 
             console.log("socket ID", { id, req })
 
-  //          if (req.mode !== "listen") {
-  //            // since the event came from the client, connect the buffer
-  //            this.buffer[id] = []
-  //          }
             if (req.status) {
               ws.send(JSON.stringify({
                 data: this.parent.kernel.api.running[id] ? true : false

package/server/views/editor.ejs

@@ -18,6 +18,7 @@
 <script src="/nav.js"></script>
 <script src="/autoexpand.js"></script>
 <script src="/modalinput.js"></script>
+<script src="/simplemodal.js"></script>
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
@@ -308,6 +309,8 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .play").classList.add("hidden")
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.remove("hidden")
+          } else if (packet.type === "modal") {
+            await SimpleModal(packet.data)
           } else if (packet.type === "input") {
             let params = packet.data
             let type = (params.type ? params.type : "modal")

package/server/views/fullscreen_editor.ejs

@@ -20,6 +20,7 @@
 -->
 <script src="/autoexpand.js"></script>
 <script src="/modalinput.js"></script>
+<script src="/simplemodal.js"></script>
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
@@ -287,6 +288,8 @@ document.addEventListener("DOMContentLoaded", async () => {
 //                uri: "~" + location.pathname,
 //              })
 //            }
+          } else if (packet.type === "modal") {
+            await SimpleModal(packet.data)
           } else if (packet.type === "input") {
             let params = packet.data
             let type = (params.type ? params.type : "modal")