pinokiod 3.85.0 → 3.86.0

package/kernel/api/index.js

@@ -802,6 +802,13 @@ class Api {
       current: i,
       uri: request.uri,
       cwd,
+      exists: (...args) => {
+        return fs.existsSync(path.resolve(cwd, ...args))
+      },
+      running: (...args) => {
+        let fullpath = path.resolve(cwd, ...args)
+        return this.running[fullpath]
+      },
       name,
       self: script,
       port,

package/kernel/bin/caddy.js

@@ -32,10 +32,16 @@ class Caddy {
       await new Promise((resolve, reject) => {
         let interval = setInterval(() => {
           if (this.kernel.processes.caddy_pid) {
-            console.log("kill caddy", this.kernel.processes.caddy_pid)
-            kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
-            console.log("killed existing caddy")
-            resolve()
+            try {
+              console.log("kill caddy", this.kernel.processes.caddy_pid)
+              kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
+              console.log("killed existing caddy")
+              clearInterval(interval)
+              resolve()
+            } catch (error) {
+              clearInterval(interval)
+              reject(error)
+            }
           } else {
             console.log("try killing existing caddy again in 1 sec")
           }

package/kernel/peer.js

@@ -23,14 +23,11 @@ class PeerDiscovery {
     }
   }
   async check_peers () {
-    console.log(">>>>>>>>>>>> check peers")
     let peer_array = Array.from(this.peers)
     for(let host of peer_array) {
       if (this.host !== host) {
         let result = await this._refresh(host)
-        console.log("check peers", { host, result })
         if (!result) {
-          console.log("delete host", host)
           this.peers.delete(host)
           delete this.info[host]
         }

package/kernel/prototype.js

@@ -75,6 +75,7 @@ class Proto {
     await fs.promises.rm(this.kernel.path("prototype"), { recursive: true })
   }
   async create(req, ondata) {
+    console.log("CREATE", req)
     try {
       if (req.client) {
         this.kernel.client = req.client

package/kernel/shell.js

@@ -18,6 +18,9 @@ const Util = require('./util')
 const Environment = require('./environment')
 const ShellParser = require('./shell_parser')
 const home = os.homedir()
+
+// xterm.js currently ignores DECSYNCTERM (CSI ? 2026 h/l) and renders it as text on Windows.
+// filterDecsync() removes these sequences so they do not pollute the terminal output.
 class Shell {
   /*
     params 
@@ -37,6 +40,7 @@ class Shell {
     this.platform = os.platform()
     this.logs = {}
     this.shell = this.platform === 'win32' ? 'cmd.exe' : 'bash';
+    this.decsyncBuffer = ''
 
     // Windows: /D => ignore AutoRun Registry Key
     // Others: --noprofile => ignore .bash_profile, --norc => ignore .bashrc
@@ -551,7 +555,7 @@ class Shell {
       term.onData((data) => {
         if (!this.prompt_done) {
           if (this.prompt_ready) {
-            queue.push(data)
+            queue.push(this.filterDecsync(data))
           } else {
             setTimeout(() => {
               if (!this.prompt_ready) {
@@ -1080,7 +1084,7 @@ class Shell {
                 data = data.replace(/\x1b\[6n/g, ''); // remove the code
               }
 
-              this.queue.push(data)
+              this.queue.push(this.filterDecsync(data))
             }
           });
         }
@@ -1182,6 +1186,43 @@ class Shell {
     let cleaned = this.stripAnsi(buf)
     this._log(buf, cleaned)
   }
+  filterDecsync(data) {
+    if (!data) return data
+
+    const prefix = '\u001b[?2026'
+    let chunk = this.decsyncBuffer ? this.decsyncBuffer + data : data
+    if (chunk.includes('\u2190')) {
+      chunk = chunk.replace(/\u2190/g, '\u001b')
+    }
+    this.decsyncBuffer = ''
+
+    let result = ''
+    let i = 0
+    while (i < chunk.length) {
+      if (chunk.charCodeAt(i) === 0x1b) { // ESC
+        const remaining = chunk.slice(i)
+        if (remaining.startsWith('\u001b[?2026h') || remaining.startsWith('\u001b[?2026l')) {
+          i += 8
+          continue
+        }
+
+        // Check if the remaining characters form a partial prefix of DECSYNCTERM
+        let matched = 0
+        const len = Math.min(prefix.length, remaining.length)
+        while (matched < len && remaining[matched] === prefix[matched]) {
+          matched++
+        }
+        if (matched === remaining.length && matched < prefix.length + 1) {
+          this.decsyncBuffer = remaining
+          return result
+        }
+      }
+      result += chunk[i]
+      i++
+    }
+
+    return result
+  }
   _log(buf, cleaned) {
 
 

package/kernel/util.js

@@ -146,6 +146,8 @@ let file_type = async (cwd, file) => {
         link: true
       }
     }
+  } else {
+    return { }
   }
 }
 

package/package.json

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

package/pipe/views/login.ejs

@@ -41,7 +41,7 @@ main input {
 }
 main button {
   color: white;
-  background: royalblue;
+  background: rgba(127, 91, 243, 0.9);
   padding: 10px;
   box-sizing: border-box;
   border: none;

package/server/index.js

@@ -108,10 +108,53 @@ class Server {
   stop() {
     this.server.close()
   }
+  killProcessTree(pid, label) {
+    const numericPid = typeof pid === 'string' ? parseInt(pid, 10) : pid
+    if (!Number.isInteger(numericPid) || numericPid <= 0) {
+      return
+    }
+    if (label) {
+      console.log(label, numericPid)
+    }
+    try {
+      kill(numericPid, 'SIGKILL', true)
+    } catch (error) {
+      if (error && error.code === 'ESRCH') {
+        return
+      }
+      console.error(`Failed to kill pid ${numericPid}`, error)
+    }
+  }
+  killTrackedProcesses() {
+    if (this.kernel && this.kernel.processes && this.kernel.processes.map) {
+      for (const [pid, name] of Object.entries(this.kernel.processes.map)) {
+        if (parseInt(pid, 10) === process.pid) {
+          continue
+        }
+        this.killProcessTree(pid, `kill child ${name}`)
+      }
+    }
+  }
+  shutdown(signalLabel) {
+    const label = signalLabel || 'Shutdown'
+    console.log(`[${label} event] Kill`, process.pid)
+    if (this.kernel && this.kernel.shell) {
+      try {
+        this.kernel.shell.reset()
+      } catch (error) {
+        console.error('Failed to reset shells', error)
+      }
+    }
+    this.killTrackedProcesses()
+    if (this.kernel && this.kernel.processes && this.kernel.processes.caddy_pid) {
+      this.killProcessTree(this.kernel.processes.caddy_pid, 'kill caddy')
+    }
+    this.killProcessTree(process.pid, 'kill self')
+  }
   exists (s) {
     return new Promise(r=>fs.access(s, fs.constants.F_OK, e => r(!e)))
   }
-  running_dynamic (name, menu) {
+  running_dynamic (name, menu, selected_query) {
     let cwd = this.kernel.path("api", name)
     let running_dynamic = []
     const traverse = (obj, indexPath) => {
@@ -136,9 +179,17 @@ class Server {
 
               let id = `${filepath}?cwd=${cwd}`
               //if (this.kernel.api.running[filepath]) {
-              if (this.kernel.api.running[id]) {
+              if (this.kernel.api.running[id] || selected_query.plugin === obj.src) {
                 obj.running = true
                 obj.display = "indent"
+                if (selected_query.plugin === obj.src) {
+                  obj.default = true
+                  for(let key in selected_query) {
+                    if (key !== "plugin") {
+                      obj.href = obj.href + "&" + key + "=" + encodeURIComponent(selected_query[key])
+                    }
+                  }
+                }
                 running_dynamic.push(obj)
               }
             } else if (href.startsWith("/run")) {
@@ -148,9 +199,18 @@ class Server {
               let id = `${filepath}?cwd=${cwd}`
               obj.script_id = id
               //if (this.kernel.api.running[filepath]) {
-              if (this.kernel.api.running[id]) {
+              if (this.kernel.api.running[id] || selected_query.plugin === obj.src) {
                 obj.running = true
                 obj.display = "indent"
+                if (selected_query.plugin === obj.src) {
+                  console.log("selected_query", selected_query)
+                  obj.default = true
+                  for(let key in selected_query) {
+                    if (key !== "plugin") {
+                      obj.href = obj.href + "&" + key + "=" + encodeURIComponent(selected_query[key])
+                    }
+                  }
+                }
                 running_dynamic.push(obj)
               }
             }
@@ -158,9 +218,19 @@ class Server {
             let unix_path = Util.p2u(this.kernel.path("api", name))
             let shell_id = this.get_shell_id(unix_path, indexPath, obj[key])
             let decoded_shell_id = decodeURIComponent(shell_id)
-            if (this.kernel.api.running["shell/" + decoded_shell_id]) {
+            let id = "shell/" + decoded_shell_id
+            if (this.kernel.api.running[id] || selected_query.plugin === id) {
               obj.running = true
               obj.display = "indent"
+              if (selected_query.plugin === id) {
+                obj.default = true
+                  console.log("selected_query", selected_query)
+                for(let key in selected_query) {
+                  if (key !== "plugin") {
+                    obj.href = obj.href + "&" + key + "=" + encodeURIComponent(selected_query[key])
+                  }
+                }
+              }
               running_dynamic.push(obj)
             }
           }
@@ -292,20 +362,20 @@ class Server {
           }
         }
       } else {
-        cfg = await this.renderIndex(name)
+        cfg = await this.renderIndex(name, cfg)
       }
     } else {
-      cfg = await this.renderIndex(name)
+      cfg = await this.renderIndex(name, cfg)
     }
     return cfg
   }
-  async renderIndex(name) {
+  async renderIndex(name, cfg) {
     let p = this.kernel.path("api", name)
     let html_path = path.resolve(p, "index.html")
     let html_exists = await this.kernel.exists(html_path)
     console.log({ html_path, html_exists })
     if (html_exists) {
-      return {
+      return Object.assign({
         title: name, 
         menu: [{
           default: true,
@@ -313,9 +383,9 @@ class Server {
           text: "index.html",
           href: "index.html?raw=true",
         }]
-      }
+      }, cfg)
     } else {
-      return {
+      return Object.assign({
         title: name, 
         menu: [{
           default: true,
@@ -323,7 +393,7 @@ class Server {
           text: "Project Files",
           href: `/files/api/${name}`,
         }]
-      }
+      }, cfg)
     }
   }
   async getGit(ref, filepath) {
@@ -520,9 +590,7 @@ class Server {
       err = e.stack
     }
 
-    console.log("renderMenu before", config)
     await this.renderMenu(req, uri, name, config, [])
-    console.log("renderMenu after", config)
 
     let platform = os.platform()
 
@@ -602,7 +670,11 @@ class Server {
     let plugin = await this.getPlugin(req, plugin_config, name)
     if (plugin && plugin.menu && Array.isArray(plugin.menu)) {
       plugin = structuredClone(plugin)
-      plugin_menu = this.running_dynamic(name, plugin.menu)
+      let default_plugin_query
+      if (req.query) {
+        default_plugin_query = req.query
+      }
+      plugin_menu = this.running_dynamic(name, plugin.menu, default_plugin_query)
     }
 
     let posix_path = Util.p2u(this.kernel.path("api", name))
@@ -617,6 +689,18 @@ class Server {
     let dev_tab = "/p/" + name + "/dev"
     let review_tab = "/p/" + name + "/review"
 
+    let dynamic_url = "/pinokio/dynamic/" + name;
+    if (Object.values(req.query).length > 0) {
+      let index = 0
+      for(let key in req.query) {
+        if (index === 0) {
+          dynamic_url = dynamic_url + `?${key}=${encodeURIComponent(req.query[key])}`
+        } else {
+          dynamic_url = dynamic_url + `&${key}=${encodeURIComponent(req.query[key])}`
+        }
+        index++;
+      }
+    }
 
     const result = {
       dev_link,
@@ -639,7 +723,7 @@ class Server {
       sidebar: "/pinokio/sidebar/" + name,
       repos: "/pinokio/repos/" + name,
       ai: "/pinokio/ai/" + name,
-      dynamic: "/pinokio/dynamic/" + name,
+      dynamic: dynamic_url,
 //      dynamic: "/pinokio/dynamic/" + name,
       dynamic_content: null,
       name,
@@ -1019,7 +1103,6 @@ class Server {
           template = "editor"
         }
 
-        console.log("check requirements")
         let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
           //bin: this.kernel.bin.preset("ai"),
           bin: this.kernel.bin.preset("dev"),
@@ -1076,7 +1159,6 @@ class Server {
           if (platform === "win32") {
             root_path = root_path.replace(/\\/g, '\\\\')
           }
-          console.log({ cwd, api_path, root, root_path })
           res.render("required_env_editor", {
             portal: this.portal,
             agent: req.agent,
@@ -1613,7 +1695,6 @@ class Server {
           items
         })
       } else {
-        console.log("RENDER FILE EXPLORER")
         res.render("file_explorer", {
           docs: this.docs, 
           portal: this.portal,
@@ -2033,7 +2114,6 @@ class Server {
               if (menuitem.image.startsWith("/")) {
                 imagePath = menuitem.image
               } else {
-                console.log({ launcher_root, name, image: menuitem.image })
                 if (launcher_root) {
                   imagePath = `/api/${name}/${launcher_root}/${menuitem.image}?raw=true`
                 } else {
@@ -3075,7 +3155,6 @@ class Server {
           ...result
         })
       }
-      console.log(JSON.stringify(bundles, null, 2))
       res.render("tools", {
         current_host: this.kernel.peer.host,
         pending,
@@ -3125,6 +3204,23 @@ class Server {
       })
     }))
 
+    this.app.get("/bookmarklet", ex(async (req, res) => {
+      const protocol = (req.$source && req.$source.protocol) || req.protocol || 'http';
+      const host = req.get('host') || `localhost:${this.port}`;
+      const baseUrl = `${protocol}://${host}`;
+      const targetBase = `${baseUrl}/?create=1&prompt=`;
+      const safeTargetBase = targetBase.replace(/'/g, "\\'");
+      const bookmarkletHref = `javascript:(()=>{window.open('${safeTargetBase}'+encodeURIComponent(window.location.href),'_blank');})();`;
+
+      res.render("bookmarklet", {
+        theme: this.theme,
+        agent: req.agent,
+        baseUrl,
+        targetBase,
+        bookmarkletHref
+      });
+    }))
+
     //let home = this.kernel.homedir
     //let home = this.kernel.store.get("home")
     this.app.get("/launch", ex(async (req, res) => {
@@ -3145,7 +3241,6 @@ class Server {
         autolaunch = true
       }
       let chunks = host.split(".")
-      console.log("GET /launch", { url, host, chunks })
       if (chunks[chunks.length-1] === "localhost") {
         // if <...>.<kernel.peer.name>.localhost
         let nameChunks
@@ -3172,7 +3267,6 @@ class Server {
           for(let folder of folders) {
             let pattern1 = `${folder}.${this.kernel.peer.name}.localhost`
             let pattern2 = `${folder}.localhost`
-            console.log("checking", { pattern1, pattern2, chunks: chunks.join(".") })
             if (pattern1 === chunks.join(".")) {
               matched = true
               nameChunks = chunks.slice(0, -2)
@@ -3193,20 +3287,16 @@ class Server {
             // look for any matching peer names
             // if exists, redirect to that host
             for(let name of peer_names) {
-              console.log({ host, name })
               if (host.endsWith(`.${name}.localhost`)) {
-                console.log("matched. redirecting")
                 res.redirect(`https://pinokio.${name}.localhost/launch?url=${url}`)
                 return
               }
             }
           }
         } else {
-          console.log("> 3")
           nameChunks = chunks
         }
         let name = nameChunks.join(".")
-        console.log({ nameChunks, chunks, name })
         let api_path = this.kernel.path("api", name)
         let exists = await this.exists(api_path)
         if (exists) {
@@ -3556,7 +3646,6 @@ class Server {
       } catch (e) {
         console.log(e)
       }
-      console.log({ https_running })
       if (!https_running) {
 //        res.json({ error: "pinokio.host not yet available" })
         res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
@@ -3574,7 +3663,6 @@ class Server {
           break
         }
       }
-      console.log({ router_running })
       if (!router_running) {
 //        res.json({ error: "pinokio.localhost not yet available" })
         res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
@@ -3677,7 +3765,6 @@ class Server {
       res.json({ success: true })
     }))
     this.app.post("/go", ex(async (req, res) => {
-      console.log("GO", req.body)
       Util.openURL(req.body.url)
       res.json({ success: true })
     }))
@@ -3691,7 +3778,6 @@ class Server {
         // relpath : ...
         let relpath = req.body.asset_path.split("/").filter((x) => { return x }).slice(1).join("/")
         let filepath = this.kernel.path(relpath)
-        console.log({ filepath, relpath })
         Util.openfs(filepath, req.body, this.kernel)
       } else if (req.body.path) {
         Util.openfs(req.body.path, req.body, this.kernel)
@@ -3701,7 +3787,6 @@ class Server {
     this.app.post("/keys", ex(async (req, res) => {
       let p = this.kernel.path("key.json")
       let keys  = (await this.kernel.loader.load(p)).resolved
-      console.log("update", req.body)
       for(let host in req.body) {
         let updated = req.body[host]
         for(let indexStr in updated) {
@@ -3806,8 +3891,6 @@ class Server {
 
       let hosts = await this.get_github_hosts()
 
-      console.log("hosts", hosts)
-
       let items
       if (hosts.length > 0) {
         // logged in => display logout
@@ -4018,6 +4101,16 @@ class Server {
         running: (shell ? true : false)
       })
     }))
+    this.app.get("/pro", ex(async (req, res) => {
+      let target = req.query.target ? req.query.target : null
+      let cwd = this.kernel.path("api")
+      res.render("pro", {
+        target,
+        cwd,
+        theme: this.theme,
+        agent: req.agent,
+      })
+    }))
 //    this.app.get("/terminal/:api/:id", ex(async (req, res) => {
 //      res.render("shell", {
 //        theme: this.theme,
@@ -4089,7 +4182,6 @@ class Server {
       if (cr.has("caddy")) {
         wait = "caddy"
       }
-      console.log({ wait, cr })
 
       let current = req.query.callback || req.originalUrl
 
@@ -4245,9 +4337,7 @@ class Server {
 
 //      let list = this.getPeerInfo()
 //      console.log("peeerInfo", JSON.stringify(list, null, 2))
-      console.time("check peers")
       await this.kernel.peer.check_peers()
-      console.timeEnd("check peers")
 
 
       let peers = []
@@ -4828,7 +4918,6 @@ class Server {
           //const repositoryPath = this.kernel.path(pathComponents[0], pathComponents[1])
           //const repositoryPath = this.kernel.path(pathComponents[0])
           const repositoryPath = path.resolve(this.kernel.api.userdir, api_path)
-          console.log({ repositoryPath })
           gitRemote = await git.getConfig({
             fs,
             http,
@@ -4974,7 +5063,6 @@ class Server {
           if (config) {
             if (config.xterm) {
               this.xterm = config.xterm
-              console.log("this.xterm", this.xterm)
             }
           }
         }
@@ -5309,7 +5397,6 @@ class Server {
       })
     }))
     this.app.get("/dev/*", ex(async (req, res) => {
-      console.log("GET /dev/*", req.params)
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
         bin: this.kernel.bin.preset("dev"),
       })
@@ -5444,7 +5531,11 @@ class Server {
       if (plugin) {
         if (plugin && plugin.menu && Array.isArray(plugin.menu)) {
           plugin = structuredClone(plugin)
-          plugin_menu = this.running_dynamic(req.params.name, plugin.menu)
+          let default_plugin_query
+          if (req.query) {
+            default_plugin_query = req.query
+          }
+          plugin_menu = this.running_dynamic(req.params.name, plugin.menu, default_plugin_query)
           html = await new Promise((resolve, reject) => {
             ejs.renderFile(path.resolve(__dirname, "views/partials/dynamic.ejs"), { dynamic: plugin_menu }, (err, html) => {
               resolve(html)
@@ -5752,7 +5843,6 @@ class Server {
       let gitRemote = null
       try {
         const repositoryPath = path.resolve(this.kernel.api.userdir, req.params.name)
-        console.log({ repositoryPath })
         gitRemote = await git.getConfig({
           fs,
           http,
@@ -5905,7 +5995,6 @@ class Server {
       res.redirect("/pinokio/install")
     }))
     this.app.get("/pinokio/install", ex((req, res) => {
-      console.log("render /pinokio/install")
       let requirements = req.session.requirements
       let callback = req.session.callback
       req.session.requirements = null
@@ -6087,7 +6176,6 @@ class Server {
       await fs.promises.mkdir(this.kernel.path("screenshots"), { recursive: true }).catch((e) => { })
       for(let key in req.files) {
         let file = req.files[key]
-        console.log({ file, key })
         let ts = String(Date.now()) + ".png"
         await fs.promises.writeFile(this.kernel.path("screenshots", ts), file.buffer)
       }
@@ -6278,7 +6366,6 @@ class Server {
         }
       } else {
         // if network is not active, return success immediately (just checking if the server is up)
-        console.log("this.kernel.router.published()")
         res.json({ success: true })
       }
     }))
@@ -6340,48 +6427,11 @@ class Server {
       })
     });
     process.on('SIGINT', () => {
-      //if (this.kernel && this.kernel.shell) {
-      //  console.log("shell reset")
-      //  this.kernel.shell.reset(() => {
-      //    process.exit()
-      //  })
-      //} else {
-      //  process.exit()
-      //}
-      console.log("[SigInt event] Kill", process.pid)
-      if (this.kernel.processes.caddy_pid) {
-        console.log("kill caddy", this.kernel.processes.caddy_pid)
-        kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
-      }
-      console.log("kill self")
-      kill(process.pid, 'SIGKILL', true)
-      //kill(process.pid, map, 'SIGKILL', () => {
-      //  console.log("child procs killed for", process.pid)
-      //  process.exit()
-      //});
+      this.shutdown('SigInt')
     })
 
     process.on('SIGTERM', () => {
-//      if (this.kernel && this.kernel.shell) {
-//        console.log("shell reset")
-//        this.kernel.shell.reset(() => {
-//          process.exit()
-//        })
-//      } else {
-//        process.exit()
-//      }
-      console.log("[Sigterm event] Kill", process.pid)
-      if (this.kernel.processes.caddy_pid) {
-        console.log("kill caddy", this.kernel.processes.caddy_pid)
-        kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
-      }
-      console.log("kill self")
-      kill(process.pid, 'SIGKILL', true)
-      //let map = this.kernel.processes.map || {}
-      //kill(process.pid, map, 'SIGKILL', () => {
-      //  console.log("child procs killed for", process.pid)
-      //  process.exit()
-      //});
+      this.shutdown('SigTerm')
     })
 //    process.on('exit', () => {
 //      console.log("[Exit event]")