pinokiod 3.19.2 → 3.19.4

package/kernel/api/filepicker/index.js

@@ -1,5 +1,3 @@
-const path = require('path')
-const { spawn } = require("child_process");
 /*
 {
   method: "filepicker.open",
@@ -7,6 +5,7 @@ const { spawn } = require("child_process");
     title,             := <dialog title>
     type,              := folder | file (default)
     path,               := <cwd to open from>
+    filetype,         := <file types to accept> can be an array or string (example: `image/*.png,*.jpg` or `["image/*.png", "docs/*.pdf"]`)
     filetypes,         := <file types to accept> (example:   [["Images", "*.png *.jpg *.jpeg"]] )
     multiple,          := True | False (allow multiple)
     save,              := True | False ('save as' dialog, which lets the user select a file name)
@@ -26,6 +25,8 @@ returns: {
 }
 
 */
+const path = require('path')
+const Util = require("../../util")
 class Filepicker {
   async open(req, ondata, kernel) {
     if (req.params.cwd) {
@@ -35,27 +36,10 @@ class Filepicker {
     } else {
       req.params.cwd = req.cwd
     }
-    let response = await new Promise((resolve, reject) => {
-      let picker_path = kernel.path("bin/py/picker.py")
-      const proc = spawn("python", [picker_path])
 
-      let output = "";
-      proc.stdout.on("data", (chunk) => output += chunk);
-      proc.stderr.on("data", (err) => console.error("Python error:", err.toString()));
-      proc.on("close", () => {
-        try {
-          const result = JSON.parse(output);
-          if (result.error) return reject(result.error);
-          resolve(result.paths); // Always an array
-        } catch (e) {
-          reject("Failed to parse Python output: " + output);
-        }
-      });
+    let res = await Util.filepicker(req, ondata, kernel)
+    return res
 
-      proc.stdin.write(JSON.stringify(req.params));
-      proc.stdin.end();
-    });
-    return { paths: response }
   }
 }
 module.exports = Filepicker

package/kernel/api/index.js

@@ -1321,7 +1321,6 @@ class Api {
         // look for pinokio.js
         let p = path.resolve(request.path, "pinokio.js")
         let exists = await this.exists(p)
-        console.log({ p, exists })
         if (exists) {
           await this.launch(request, p)
         } else {
@@ -1332,7 +1331,6 @@ class Api {
           })
         }
       } else {
-        console.log({ request })
         let { cwd, script } = await this.resolveScript(request.path)
 
         if (!script) {

package/kernel/api/push/index.js

@@ -0,0 +1,21 @@
+/*
+  {
+    method: "push",
+    params: {
+      title: <string>,
+      subtitle: <string>, 
+      message: <string>,
+      image: <image path>,
+      sound: true|false,
+    }
+  }
+(*/
+const util = require('../../util')
+const path = require('path');
+module.exports = async (req, ondata, kernel) => {
+  let params = req.params
+  if (params.image) {
+    params.image = path.resolve(req.cwd, params.image)
+  }
+  util.push(params)
+}

package/kernel/bin/cli.js

@@ -0,0 +1,31 @@
+const path = require('path')
+class CLI {
+  async install(req, ondata) {
+    await this.kernel.exec({
+      message: "npm install -g pinokio-cli@latest",
+    }, ondata)
+  }
+  async installed(req, ondata) {
+    console.log("Check installed")
+    if (this.kernel.which('pinokio')) {
+      let res = await this.kernel.exec({
+        message: "pinokio version"
+      }, ondata)
+      if (/.*v0\.0\.4.*/.test(res.stdout)) {
+        console.log("Installed")
+        return true
+      } else {
+        console.log("Not Installed")
+        return false
+      }
+    } else {
+      return false
+    }
+  }
+  async uninstall(req, ondata) {
+    await this.kernel.exec({
+      message: "npm uninstall -g pinokio-cli",
+    }, ondata)
+  }
+}
+module.exports = CLI

package/kernel/bin/git.js

@@ -45,6 +45,25 @@ class Git {
         gitconfig_path
       )
     }
+
+    await fs.promises.mkdir(this.kernel.path("scripts/git"), { recursive: true }).catch((e) => { })
+    let gitpush_path = path.resolve(this.kernel.homedir, "scripts/git/push.json")
+    await fs.promises.copyFile(
+      path.resolve(__dirname, "..", "scripts/git/push"),
+      gitpush_path
+    )
+
+    let gitcreate_path = path.resolve(this.kernel.homedir, "scripts/git/create.json")
+    await fs.promises.copyFile(
+      path.resolve(__dirname, "..", "scripts/git/create"),
+      gitcreate_path
+    )
+
+    let gitcommit_path = path.resolve(this.kernel.homedir, "scripts/git/commit.json")
+    await fs.promises.copyFile(
+      path.resolve(__dirname, "..", "scripts/git/commit"),
+      gitcommit_path
+    )
   }
   async installed() {
     let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
@@ -52,6 +71,21 @@ class Git {
     if (!exists) {
       return false; 
     }
+    let gitpush_path = path.resolve(this.kernel.homedir, "scripts/git/push.json")
+    let exists2 = await this.kernel.api.exists(gitpush_path)
+    if (!exists2) {
+      return false; 
+    }
+    let gitcreate_path = path.resolve(this.kernel.homedir, "scripts/git/create.json")
+    let exists3 = await this.kernel.api.exists(gitcreate_path)
+    if (!exists3) {
+      return false; 
+    }
+    let gitcommit_path = path.resolve(this.kernel.homedir, "scripts/git/commit.json")
+    let exists4 = await this.kernel.api.exists(gitcommit_path)
+    if (!exists4) {
+      return false; 
+    }
 
     if (this.kernel.platform === "darwin") {
       let gh_config_exists = await this.kernel.exists("config/gh")

package/kernel/bin/index.js

@@ -4,13 +4,13 @@ const _ = require('lodash')
 const path = require('path')
 const { rimraf } = require('rimraf')
 const { DownloaderHelper } = require('node-downloader-helper');
-const { spawn } = require('child_process')
 const { ProxyAgent } = require('proxy-agent');
 
 //const Cmake = require("./cmake")
 const Python = require('./python')
 const Git = require('./git')
 const Node = require('./node')
+const CLI = require('./cli')
 const Brew = require("./brew")
 const Conda = require("./conda")
 const Win = require("./win")
@@ -27,6 +27,7 @@ const fse = require('fs-extra')
 const semver = require('semver')
 //const { bootstrap } = require('global-agent')
 const Environment = require('../environment')
+const Util = require("../util")
 //const imageToAscii = require("image-to-ascii");
 
 const Setup = require('./setup')
@@ -198,6 +199,7 @@ class Bin {
     return e
   }
   async init() {
+    this.requirements_cache = {}
     this.mods = []
     if (this.kernel.homedir) {
       const bin_folder = this.path()
@@ -658,32 +660,8 @@ class Bin {
     }
   }
   async filepicker(req, ondata) {
-    /*
-      req.params := {
-        cwd: cwd
-      }
-    */
-    let response = await new Promise((resolve, reject) => {
-      let picker_path = this.kernel.path("bin/py/picker.py")
-      const proc = spawn("python", [picker_path])
-
-      let output = "";
-      proc.stdout.on("data", (chunk) => output += chunk);
-      proc.stderr.on("data", (err) => console.error("Python error:", err.toString()));
-      proc.on("close", () => {
-        try {
-          const result = JSON.parse(output);
-          if (result.error) return reject(result.error);
-          resolve(result.paths); // Always an array
-        } catch (e) {
-          reject("Failed to parse Python output: " + output);
-        }
-      });
-
-      proc.stdin.write(JSON.stringify(req.params));
-      proc.stdin.end();
-    });
-    return { paths: response }
+    let res = await Util.filepicker(req, ondata, this.kernel)
+    return res
   }
   async install(req, ondata) {
     /*
@@ -703,6 +681,7 @@ class Bin {
     } else {
       this.client = null
     }
+    console.log("Client", this.client)
     let requirements = JSON.parse(req.params)
     for(let x=0; x<10; x++) {
       console.log(`## Install Attempt ${x}`)
@@ -1000,27 +979,40 @@ class Bin {
     let install_required = true
     if (!requirements_pending) {
       install_required = false
+      console.log("requirements", requirements)
       for(let i=0; i<requirements.length; i++) {
         let r = requirements[i]
-        //let installed = await this.installed(r)
-        //requirements[i].installed = installed
-        //if (!installed) {
-        //  install_required = true
-        //}
-        let relevant = this.relevant(r)
-        requirements[i].relevant = relevant
-        if (relevant) {
-          let dependencies
-          if (r.name === "conda") {
-            dependencies = config.bin.conda_requirements
-            requirements[i].dependencies = dependencies
-          }
-          let installed = await this.check_installed(r, dependencies)
-          requirements[i].installed = installed
-          if (!installed) {
-            install_required = true
+        let fingerprint = JSON.stringify(r)
+        let installed
+        if (this.requirements_cache[fingerprint]) {
+          console.log("USE CACHED", fingerprint)
+          installed = true
+          requirements[i].installed = true
+        } else {
+          //let installed = await this.installed(r)
+          //requirements[i].installed = installed
+          //if (!installed) {
+          //  install_required = true
+          //}
+          let relevant = this.relevant(r)
+          requirements[i].relevant = relevant
+          if (relevant) {
+            let dependencies
+            if (r.name === "conda") {
+              dependencies = config.bin.conda_requirements
+              requirements[i].dependencies = dependencies
+            }
+            installed = await this.check_installed(r, dependencies)
+            if (installed) {
+              // cache if true
+              this.requirements_cache[fingerprint] = true
+            }
+            requirements[i].installed = installed
           }
         }
+        if (!installed) {
+          install_required = true
+        }
       }
     }
 

package/kernel/bin/setup.js

@@ -27,6 +27,7 @@ module.exports = {
     requirements = requirements.concat([
       { name: "git", },
       { name: "node", },
+      { name: "cli", },
       { name: "ffmpeg", },
 //      { name: "caddy", }
     ])
@@ -68,6 +69,7 @@ module.exports = {
     requirements = requirements.concat([
       { name: "git", },
       { name: "node", },
+      { name: "cli", },
       { name: "py" },
     ])
     return {
@@ -118,6 +120,7 @@ module.exports = {
     requirements = requirements.concat([
       { name: "git", },
       { name: "node", },
+      { name: "cli", },
       { name: "uv", },
     ])
     let conda_requirements = [

package/kernel/environment.js

@@ -310,9 +310,6 @@ const ENV = async (type, homedir) => {
       irrelevant_keys.push(e.key)
     }
   }
-
-  console.log({ filtered_envs, irrelevant_keys })
-
 //  let filtered_envs = envs.filter((e) => {
 //    return e.type.includes(type)
 //  })

package/kernel/git.js

@@ -0,0 +1,64 @@
+const git = require('isomorphic-git')
+const fs = require('fs')
+const path = require('path')
+const { glob, sync, hasMagic } = require('glob-gitignore')
+const http = require('isomorphic-git/http/node')
+const ini = require('ini')
+class Git {
+  constructor(kernel) {
+    this.kernel = kernel
+  }
+  async repos (root) {
+    let _repos = await glob('**/.git/', {
+      cwd: root,
+      onlyDirectories: true,
+      dot: true,
+      ignore: ['**/node_modules/**', "**/venv/**"], // optional
+    });
+
+    let repos = []
+    for(let r of _repos) {
+      const gitPath = path.resolve(root, r)
+      const gitRelPath = path.relative(root, gitPath)
+      const gitParentPath = path.dirname(gitPath)
+      const gitParentRelPath = path.relative(this.kernel.path("api"), gitParentPath)
+      let dir = path.dirname(gitPath)
+      try {
+        let gitRemote = await git.getConfig({
+          fs,
+          http,
+          dir,
+          path: 'remote.origin.url'
+        })
+        repos.push({
+          gitPath,
+          gitRelPath,
+          gitParentPath,
+          gitParentRelPath,
+          dir,
+          url: gitRemote
+        })
+      } catch (e) {
+        repos.push({
+          gitPath,
+          gitRelPath,
+          gitParentPath,
+          gitParentRelPath,
+          dir,
+        })
+      }
+    }
+    return repos
+  }
+  async config (dir) {
+    try {
+      const gitConfigPath = path.resolve(dir, ".git/config")
+      const content = await fs.promises.readFile(gitConfigPath, 'utf-8');
+      const gitconfig = ini.parse(content);
+      return gitconfig
+    } catch (e) {
+      return null
+    }
+  }
+}
+module.exports = Git

package/kernel/index.js

@@ -35,6 +35,7 @@ const Plugin = require('./plugin')
 const Router = require("./router")
 const Procs = require('./procs')
 const Peer = require('./peer')
+const Git = require('./git')
 const Connect = require('./connect')
 const { DownloaderHelper } = require('node-downloader-helper');
 const { ProxyAgent } = require('proxy-agent');
@@ -658,6 +659,7 @@ class Kernel {
     this.kv = new KV(this)
     this.cloudflare = new Cloudflare()
     this.peer = new Peer()
+    this.git = new Git(this)
 
     this.homedir = home
 

package/kernel/router/index.js

@@ -200,19 +200,21 @@ class Router {
     this._mapping = {}
     this.localhost_home_router.handle()
     this.localhost_variable_router.handle(this.kernel.memory.local)
-    for(let proc of this.kernel.processes.info) {
-      this.localhost_port_router.handle(proc)
-    }
-    if (this.kernel.peer.active) {
-      for(let host in this.kernel.peer.info) {
-        let peer = this.kernel.peer.info[host]
-        if (peer.host === this.kernel.peer.host) {
-          this.peer_home_router.handle(peer)
-          this.peer_variable_router.handle(peer)
-          this.peer_port_router.handle(peer)
+    if (this.kernel.processes && this.kernel.processes.info) {
+      for(let proc of this.kernel.processes.info) {
+        this.localhost_port_router.handle(proc)
+      }
+      if (this.kernel.peer.active) {
+        for(let host in this.kernel.peer.info) {
+          let peer = this.kernel.peer.info[host]
+          if (peer.host === this.kernel.peer.host) {
+            this.peer_home_router.handle(peer)
+            this.peer_variable_router.handle(peer)
+            this.peer_port_router.handle(peer)
+          }
         }
+        await this.fill()
       }
-      await this.fill()
     }
     this.mapping = this._mapping
   }

package/kernel/scripts/git/commit

@@ -0,0 +1,21 @@
+{
+  "run": [{
+    "method": "input",
+    "params": {
+      "form": [{
+        "key": "commit",
+        "title": "Commit message"
+      }]
+    }
+  }, {
+    "method": "shell.run",
+    "params": {
+      "chain": true,
+      "path": "{{args.cwd}}",
+      "message": [
+        "git add .",
+        "git commit -am {{input.commit}}"
+      ]
+    }
+  }]
+}

package/kernel/scripts/git/create

@@ -0,0 +1,12 @@
+{
+  "run": [{
+    "method": "shell.run",
+    "params": {
+      "path": "{{args.cwd}}",
+      "input": true,
+      "message": [
+        "gh repo create"
+      ]
+    }
+  }]
+}

package/kernel/scripts/git/push

@@ -0,0 +1,22 @@
+{
+  "run": [{
+    "method": "input",
+    "params": {
+      "form": [{
+        "key": "commit",
+        "title": "Commit message"
+      }]
+    }
+  }, {
+    "method": "shell.run",
+    "params": {
+      "chain": true,
+      "path": "{{args.cwd}}",
+      "message": [
+        "git add .",
+        "git commit -am {{input.commit}}",
+        "git push"
+      ]
+    }
+  }]
+}

package/kernel/shell.js

@@ -252,6 +252,7 @@ class Shell {
     this.ondata({ raw: `\r\n████\r\n██ Starting Shell ${this.id}\r\n` })
 
 
+    this.start_time = Date.now()
     this.params = params
 
     // 3. path => path can be http, relative, absolute
@@ -969,8 +970,22 @@ class Shell {
           this.done = false
           this.ptyProcess = pty.spawn(this.shell, this.args, config)
           this.ptyProcess.onData((data) => {
-//            console.log("onData", { data })
+            if (!this.monitor) {
+              this.monitor = ""
+            }
+            this.monitor = this.monitor + data
+            this.monitor = this.monitor.slice(-300) // last 300
             if (!this.done) {
+
+              // "request cursor position" handling: https://github.com/microsoft/node-pty/issues/535
+              if (data.includes('\x1b[6n')) {
+                const row = this.vt.buffer.active.cursorY + 1;
+                const col = this.vt.buffer.active.cursorX + 1;
+                const response = `\x1b[${row};${col}R`;
+                this.ptyProcess.write(response);
+                data = data.replace(/\x1b\[6n/g, ''); // remove the code
+              }
+
               this.queue.push(data)
             }
           });
@@ -1151,6 +1166,7 @@ ${cleaned}
         raw: msg,
         cleaned,
         state: cleaned,
+        buf,
         shell_id: this.id
       }
       this.state = cleaned

package/kernel/shells.js

@@ -2,6 +2,7 @@ const os = require('os')
 const _ = require('lodash')
 const fs = require('fs')
 const set = require("./api/set")
+const Util = require('./util')
 const {
   glob
 } = require('glob')
@@ -117,8 +118,16 @@ class Shells {
             message,
             on: [{
               event: <regex>,
-              <done|kill|debug>: true
-            }],
+              done: true|false,
+              kill: true|false,
+              debug: true|false,
+              notify: {
+                title,
+                sound,
+                message,
+                image
+              }
+            }]
           }
         }
       */
@@ -127,27 +136,43 @@ class Shells {
           // regexify
           //let matches = /^\/([^\/]+)\/([dgimsuy]*)$/.exec(handler.event)
           if (handler.event) {
-            let matches = /^\/(.+)\/([dgimsuy]*)$/gs.exec(handler.event)
-            if (!/g/.test(matches[2])) {
-              matches[2] += "g"   // if g option is not included, include it (need it for matchAll)
-            }
-            let re = new RegExp(matches[1], matches[2])
-            if (stream.cleaned) {
-              let line = stream.cleaned.replaceAll(/[\r\n]/g, "")
-              //let rendered_event = [...stream.cleaned.matchAll(re)]
-
-
-              let rendered_event = [...line.matchAll(re)]
-              // 3. if the rendered expression is truthy, run the "run" script
-              if (rendered_event.length > 0) {
-                stream.matches = rendered_event
-                if (handler.kill) {
-                  m = rendered_event[0]
-                  sh.kill()
+            if (handler.notify) {
+              // notify is a special case. check by line
+              let matches = /^\/(.+)\/([dgimsuy]*)$/gs.exec(handler.event)
+              if (!/g/.test(matches[2])) {
+                matches[2] += "g"   // if g option is not included, include it (need it for matchAll)
+              }
+              let re = new RegExp(matches[1], matches[2])
+              let test = re.exec(sh.monitor)
+              if (test && test.length > 0) {
+                // reset monitor
+                sh.monitor = ""
+                let params = this.kernel.template.render(handler.notify, { event: test })
+                if (params.image) {
+                  params.contentImage = path.resolve(req.cwd, params.image)
                 }
-                if (handler.done) {
-                  m = rendered_event[0]
-                  sh.continue()
+                Util.push(params)
+              }
+            } else {
+              let matches = /^\/(.+)\/([dgimsuy]*)$/gs.exec(handler.event)
+              if (!/g/.test(matches[2])) {
+                matches[2] += "g"   // if g option is not included, include it (need it for matchAll)
+              }
+              let re = new RegExp(matches[1], matches[2])
+              if (stream.cleaned) {
+                let line = stream.cleaned.replaceAll(/[\r\n]/g, "")
+                let rendered_event = [...line.matchAll(re)]
+                // 3. if the rendered expression is truthy, run the "run" script
+                if (rendered_event.length > 0) {
+                  stream.matches = rendered_event
+                  if (handler.kill) {
+                    m = rendered_event[0]
+                    sh.kill()
+                  }
+                  if (handler.done) {
+                    m = rendered_event[0]
+                    sh.continue()
+                  }
                 }
               }
             }