pinokiod 3.19.2 → 3.19.5

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 pterm@latest --force",
+    }, 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\.5.*/.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 pterm",
+    }, 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()
@@ -628,62 +630,41 @@ class Bin {
       return res
     }
   }
-  async init_launcher(req, ondata) {
-    console.log("init_launcher", req)
-    try {
-      let projectType = req.params.projectType
-      let startType = req.params.cliType || req.params.startType
-      console.log({ projectType, startType })
-
-      let cwd = req.cwd
-      let name = req.name
-      let payload = {}
-      payload.cwd = path.resolve(cwd, name)
-      payload.input = req.params
-
-      let mod_path = path.resolve(__dirname, "../proto", projectType, startType)
-      let mod = await this.kernel.require(mod_path)
-
-      await mod(payload, ondata, this.kernel)
-
-      // copy readme
-      let readme_path = path.resolve(__dirname, "../proto/PINOKIO.md")
-      console.log("copy to", readme_path, path.resolve(cwd, name, "PINOKIO.md"))
-      await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
-
-      return { success: "/p/" + name }
-    } catch (e) {
-      console.log("ERROR", e)
-      return { error: e.stack }
-    }
-  }
+//  async init_launcher(req, ondata) {
+//    console.log("init_launcher", req)
+//    try {
+//      let projectType = req.params.projectType
+//      let startType = req.params.cliType || req.params.startType
+//      console.log({ projectType, startType })
+//
+//      let cwd = req.cwd
+//      let name = req.name
+//      let payload = {}
+//      payload.cwd = path.resolve(cwd, name)
+//      payload.input = req.params
+//
+//      let mod_path = path.resolve(__dirname, "../proto", projectType, startType)
+//      let mod = await this.kernel.require(mod_path)
+//
+//      await mod(payload, ondata, this.kernel)
+//
+//      // copy readme
+//      let readme_path = path.resolve(__dirname, "../proto/PINOKIO.md")
+//      console.log("copy to", readme_path, path.resolve(cwd, name, "PINOKIO.md"))
+//      await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
+//
+//      // copy CLI.md
+//      let cli_readme_path = 
+//
+//      return { success: "/p/" + name }
+//    } catch (e) {
+//      console.log("ERROR", e)
+//      return { error: e.stack }
+//    }
+//  }
   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 +684,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}`)
@@ -782,6 +764,7 @@ class Bin {
   async check_installed(r, dependencies) {
     if (Array.isArray(r.name)) {
       for(let name of r.name) {
+        let d = Date.now()
         let installed = await this._installed(name, r.type, dependencies)
         if (!installed) return false
       }
@@ -794,13 +777,10 @@ class Bin {
   async _installed(name, type, dependencies) {
     if (type === "conda") {
       let conda_installed = this.installed.conda.has(name)
-      console.log({ dependencies })
       let dependencies_installed = true
       for(let d of dependencies) {
-        console.log("checking dependency", d)
         if(!this.installed.conda.has(d)) {
           dependencies_installed = false
-          console.log("not installed", d)
           break
         }
       }
@@ -814,10 +794,20 @@ class Bin {
       let filepath = path.resolve(__dirname, "..", "kernel", "bin", name + ".js")
       let mod = this.mod[name]
       let installed = false
-      if (mod.installed) {
-        installed = await mod.installed()
+      if (!this.cached_mod_installed) {
+        this.cached_mod_installed = {}
+      }
+      if (this.cached_mod_installed[name] === true) {
+        return true
+      } else {
+        if (mod.installed) {
+          installed = await mod.installed()
+          if (installed) {
+            this.cached_mod_installed[name] = true
+          }
+        }
+        return installed
       }
-      return installed
     }
   }
   preset(mode) {
@@ -1002,25 +992,36 @@ class Bin {
       install_required = false
       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]) {
+          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');
@@ -276,7 +277,8 @@ class Kernel {
     return installed
   }
   async network_running() {
-    let installed = await this.network_installed()
+    let installed = true
+//    let installed = await this.network_installed()
     if (installed) {
       try {
         await axios.get(`http://127.0.0.1:2019/config/`, { timeout: 1000 });
@@ -658,6 +660,7 @@ class Kernel {
     this.kv = new KV(this)
     this.cloudflare = new Cloudflare()
     this.peer = new Peer()
+    this.git = new Git(this)
 
     this.homedir = home
 
@@ -780,7 +783,9 @@ class Kernel {
       this.bin.init().then(() => {
         if (this.homedir) {
           this.shell.init().then(async () => {
-//            this.bin.check()
+            this.bin.check({
+              bin: this.bin.preset("ai"),
+            })
             if (this.envs) {
               this.template.update({
                 env: this.envs,

package/kernel/prototype.js

@@ -24,6 +24,9 @@ class Proto {
         }, (e) => {
           process.stdout.write(e.raw)
         })
+      }
+      let exists2 = await this.kernel.exists("prototype/PINOKIO.md")
+      if (!exists2) {
         await this.kernel.download({
           uri: "https://raw.githubusercontent.com/pinokiocomputer/home/refs/heads/main/docs/README.md",
           path: this.kernel.path("prototype"),
@@ -32,6 +35,16 @@ class Proto {
           process.stdout.write(e.raw)
         })
       }
+      let exists3 = await this.kernel.exists("prototype/CLI.md")
+      if (!exists3) {
+        await this.kernel.download({
+          uri: "https://raw.githubusercontent.com/pinokiocomputer/pterm/refs/heads/main/README.md",
+          path: this.kernel.path("prototype"),
+          filename: "CLI.md"
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
+      }
     }
   }
   async reset() {
@@ -59,6 +72,11 @@ class Proto {
       let readme_path = this.kernel.path("prototype/PINOKIO.md")
       await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
 
+      // copy cli.md
+      let cli_readme_path = this.kernel.path("prototype/CLI.md")
+      await fs.promises.cp(cli_readme_path, path.resolve(cwd, name, "CLI.md"))
+
+
       return { success: "/p/" + name }
     } catch (e) {
       console.log("ERROR", e)

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"
+      ]
+    }
+  }]
+}