pinokiod 3.24.0 → 3.26.0

package/kernel/api/exec/index.js

@@ -0,0 +1,67 @@
+const child_process = require('child_process')
+module.exports = async (req, ondata, kernel) => {
+  /*
+    req := {
+      method: "exec",
+      params: {
+
+        // pinokio params
+        message: <message>,
+        path: <path>,
+
+        // node.js child_process.exec params
+
+        // Working directory
+        cwd: '/path/to/working/directory',
+        
+        // Environment variables
+        env: { ...process.env, CUSTOM_VAR: 'value' },
+        
+        // Encoding for stdout/stderr (default: 'utf8')
+        encoding: 'utf8', // or 'buffer', 'ascii', etc.
+        
+        // Shell to execute the command
+        shell: '/bin/bash', // default varies by platform
+        
+        // Timeout in milliseconds
+        timeout: 10000, // Kill process after 10 seconds
+        
+        // Maximum buffer size for stdout/stderr
+        maxBuffer: 1024 * 1024, // 1MB (default: 1024 * 1024)
+        
+        // Signal to send when killing due to timeout
+        killSignal: 'SIGTERM', // default: 'SIGTERM'
+        
+        // User identity (Unix only)
+        uid: 1000,
+        gid: 1000,
+        
+        // Windows-specific options
+        windowsHide: true, // Hide subprocess console window on Windows
+        windowsVerbatimArguments: false // Quote handling on Windows
+
+      }
+    }
+  */
+  if (req.params && req.params.message) {
+    // if cwd exists, use cwd
+    // if cwd doesn't exist, set pat
+    if (!req.params.cwd && req.params.path) {
+      req.params.cwd = req.params.path
+    }
+    req.params.env = Object.assign({}, kernel.envs, req.params.env)
+    console.log("env", JSON.stringify(req.params.env, null, 2))
+    ondata({ raw: `██ Exec: ${req.params.message}\r\n` })
+    let response = await new Promise((resolve, reject) => {
+      child_process.exec(req.params.message, req.params, (error, stdout, stderr) => {
+        resolve({
+          stdout,
+          error,
+          stderr
+        })
+      })
+    })
+    console.log({ response })
+    return response
+  }
+}

package/kernel/api/index.js

@@ -1176,6 +1176,7 @@ class Api {
 //        console.log("kernel.refresh after step")
 //        this.kernel.refresh(true)
       } catch (e) {
+        console.log("FUDKDFKSDFLJSDFHSDFLKHSDLFHSDFH", e)
         ondata({ raw: e.toString() })
       }
     }, concurrency)

package/kernel/bin/caddy.js

@@ -113,7 +113,7 @@ class Caddy {
       //let response = await this.kernel.api.wait(id)
       console.log("ondata", ondata.toString())
       setTimeout(() => {
-        ondata({ html: `<b><i class="fa-solid fa-keyboard"></i> Enter the system password to generate a certificate</b>` }, "notify3")
+        ondata({ html: `<b><i class="fa-solid fa-keyboard"></i> Enter the system password to generate an HTTPS certificate</b>` }, "notify3")
       }, 2000)
       await this.kernel.exec({
         input: true,

package/kernel/index.js

@@ -293,16 +293,11 @@ class Kernel {
   async refresh(notify_peers) {
     const ts = Date.now()
     let network_active = await this.network_active()
-//    console.log({ network_active })
     if (!network_active) {
       return
     }
     let network_running = await this.network_running()
-//    console.log({ network_running })
-//    console.log({ refreshing: this.processes.refreshing })
     if (network_running) {
-
-
       let ts = Date.now()
       if (this.processes.refreshing) {
         // process list refreshing. try again later
@@ -680,7 +675,7 @@ class Kernel {
     this.processes = new Procs(this)
     this.kv = new KV(this)
     this.cloudflare = new Cloudflare()
-    this.peer = new Peer()
+    this.peer = new Peer(this)
     this.git = new Git(this)
 
     this.homedir = home

package/kernel/peer.js

@@ -3,7 +3,8 @@ const axios = require('axios');
 const os = require('os')
 const Environment = require("./environment")
 class PeerDiscovery {
-  constructor(port = 41234, message = 'ping', interval = 1000) {
+  constructor(kernel, port = 41234, message = 'ping', interval = 1000) {
+    this.kernel = kernel
     this.port = port;
     this.message = Buffer.from(message);
     this.interval = interval;
@@ -100,10 +101,14 @@ class PeerDiscovery {
   }
   async _refresh(host) {
     try {
-      let res = await axios.get(`http://${host}:${this.default_port}/pinokio/peer`, {
-        timeout: 2000
-      })
-      return res.data
+      if (host === this.host) {
+        return this.current_host()
+      } else {
+        let res = await axios.get(`http://${host}:${this.default_port}/pinokio/peer`, {
+          timeout: 2000
+        })
+        return res.data
+      }
     } catch (e) {
       console.log("_refresh error", { host , e })
       return null
@@ -128,6 +133,19 @@ class PeerDiscovery {
       return res
     }
   }
+  current_host() {
+    return {
+      home: this.kernel.homedir,
+      arch: this.kernel.arch,
+      platform: this.kernel.platform,
+      name: this.kernel.peer.name,
+      host: this.kernel.peer.host,
+      port_mapping: this.kernel.router.port_mapping,
+      proc: this.kernel.processes.info,
+      router: this.kernel.router.published(),
+      memory: this.kernel.memory
+    }
+  }
   // refresh peer info
   async refresh(peers) {
 //    if (this.active) {

package/kernel/plugin.js

@@ -5,33 +5,13 @@ class Plugin {
   constructor(kernel) {
     this.kernel = kernel
   }
-  async init() {
-    let exists = await this.kernel.exists("plugin")
-    if (!exists) {
-      await fs.promises.mkdir(this.kernel.path("plugin"), { recursive: true }).catch((e) => {})
-      if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
-        await this.kernel.exec({
-          //message: "git clone https://github.com/peanutcocktail/plugin",
-          //message: "git clone https://github.com/pinokiocomputer/plugin",
-          message: "git clone https://github.com/pinokiocomputer/code",
-          path: this.kernel.path("plugin")
-        }, (e) => {
-          process.stdout.write(e.raw)
-        })
-      }
-    }
+  async setConfig() {
     let plugin_dir = path.resolve(this.kernel.homedir, "plugin")
-//    this.config = await this.kernel.require(pinokiojs)
     this.cache = {}
 
     let plugin_paths = await glob('**/pinokio.js', { cwd: plugin_dir })
-    console.log({ plugin_paths })
 
     let plugins = []
-//    let info = new Info(this.kernel)
-//    info.cwd = () => {
-//      return plugin_dir
-//    }
     for(let plugin_path of plugin_paths) {
       let config = await this.kernel.require(path.resolve(plugin_dir, plugin_path))
       let cwd = plugin_path.split("/").slice(0, -1).join("/")
@@ -48,26 +28,29 @@ class Plugin {
         return plugin
       })
     }
-    console.log("THIS.config", JSON.stringify(this.config, null, 2))
-
-//    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) {
-//        await this.kernel.exec({
-//          //message: "git clone https://github.com/peanutcocktail/plugin",
-//          //message: "git clone https://github.com/pinokiocomputer/plugin",
-//          message: "git clone https://github.com/pinokiocomputer/code",
-//          path: this.kernel.homedir
-//        }, (e) => {
-//          process.stdout.write(e.raw)
-//        })
-//      }
-//      let plugin_dir = path.resolve(this.kernel.homedir, "plugin")
-//      let pinokiojs = path.resolve(plugin_dir, "pinokio.js")
-//      this.config = await this.kernel.require(pinokiojs)
-//      this.cache = {}
-//    }
+  }
+  async init() {
+    let exists = await this.kernel.exists("plugin")
+    if (!exists) {
+      await fs.promises.mkdir(this.kernel.path("plugin"), { recursive: true }).catch((e) => {})
+    }
+    let code_exists = await this.kernel.exists("plugin/code")
+    if (!code_exists) {
+      if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
+        await this.kernel.exec({
+          //message: "git clone https://github.com/peanutcocktail/plugin",
+          //message: "git clone https://github.com/pinokiocomputer/plugin",
+          message: "git clone https://github.com/pinokiocomputer/code",
+          path: this.kernel.path("plugin")
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
+        await this.setConfig()
+        return
+      }
+    } else {
+      await this.setConfig()
+    }
   }
   async update() {
     if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {

package/kernel/prototype.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const { glob, sync, hasMagic } = require('glob-gitignore')
 const marked = require('marked')
+const matter = require('gray-matter');
 class Proto {
   constructor(kernel) {
     this.kernel = kernel
@@ -49,10 +50,34 @@ class Proto {
     }
     console.log("Proto init done")
   }
+  async ai() {
+    let ai_path = this.kernel.path("prototype/system/ai/new/static")
+    let mds = await fs.promises.readdir(ai_path)
+    mds = mds.filter((md) => {
+      return md.endsWith(".md")
+    })
+    const results = []
+    for(let md of mds) {
+      let mdpath = path.resolve(ai_path, md)
+      let mdstr = await fs.promises.readFile(mdpath, "utf8")
+      const { data, content } = matter(mdstr)
+//      const html = marked.parse(content)
+      let { title, description, ...meta } = data
+      results.push({
+        title,
+        description,
+        meta,
+        data,
+        content
+      })
+    }
+    return results
+  }
   async reset() {
     await fs.promises.rm(this.kernel.path("prototype"), { recursive: true })
   }
   async create(req, ondata) {
+    console.log("REQ", req)
     try {
       let projectType = req.params.projectType
       let startType = req.params.cliType || req.params.startType

package/kernel/router/index.js

@@ -216,6 +216,19 @@ class Router {
         await this.fill()
       }
     }
+    this.config.apps.http.servers.main.routes.push({
+      "handle": [
+        {
+          "handler": "static_response",
+          "status_code": 302,
+          "headers": {
+            "Location": [
+              `https://${this.default_match}/launch?url={http.request.scheme}://{http.request.host}{http.request.uri}`
+            ]
+          }
+        }
+      ]
+    })
     this.mapping = this._mapping
   }
 

package/kernel/router/localhost_home_router.js

@@ -6,6 +6,17 @@ class LocalhostHomeRouter {
     this.router.add({ host: this.router.kernel.peer.host, dial: this.router.default_host + ":" + this.router.default_port, match: this.router.default_match })
     this.router.config = {
       "apps": {
+        "tls": {
+          "automation": {
+            "policies": [
+              {
+                "issuers": [{ "module": "internal" }],
+                "on_demand": true
+              }
+            ]
+          }
+        },
+
         "http": {
           "servers": {
             "main": {

package/kernel/shell.js

@@ -209,7 +209,6 @@ class Shell {
     }
   }
   async start(params, ondata) {
-    console.log("SHELL START", params)
     this.ondata = ondata
 
     /*
@@ -1056,10 +1055,8 @@ class Shell {
               for(let notif of notifications) {
                 if (notif.type !== "bell") {
                   Util.push({
-//                    title: notif.type,
-//                    subtitle: notif.title,
                     image: path.resolve(__dirname, "../server/public/pinokio-black.png"),
-                    message: notif.title,//`🔔 [${notif.type}] ${notif.title}: ${notif.message}\n`,
+                    message: notif.title,
                     sound: true,
                     timeout: 30,
                   })
@@ -1135,8 +1132,10 @@ class Shell {
         this.ptyProcess = undefined
         // automatically remove the shell from this.kernel.shells
         this.kernel.shell.rm(this.id)
-        this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
-        this.ondata({ raw: "", type: "shell.kill" })
+        if (!this.mute) {
+          this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
+          this.ondata({ raw: "", type: "shell.kill" })
+        }
         cb()
       } else {
         kill(this.ptyProcess.pid, "SIGKILL", true)
@@ -1144,13 +1143,17 @@ class Shell {
         this.ptyProcess = undefined
         // automatically remove the shell from this.kernel.shells
         this.kernel.shell.rm(this.id)
-        this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
-        this.ondata({ raw: "", type: "shell.kill" })
+        if (!this.mute) {
+          this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
+          this.ondata({ raw: "", type: "shell.kill" })
+        }
       }
     } else {
       this.kernel.shell.rm(this.id)
-      this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
-      this.ondata({ raw: "", type: "shell.kill" })
+      if (!this.mute) {
+        this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
+        this.ondata({ raw: "", type: "shell.kill" })
+      }
     }
 
 

package/kernel/shells.js

@@ -142,59 +142,66 @@ class Shells {
           }
         }
       */
-      if (params.on && Array.isArray(params.on)) {
-        for(let i=0; i<params.on.length; i++) {
-          let handler = params.on[i]
-          // regexify
-          //let matches = /^\/([^\/]+)\/([dgimsuy]*)$/.exec(handler.event)
-          if (handler.event) {
-            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)
+      try {
+        if (params.on && Array.isArray(params.on)) {
+          for(let i=0; i<params.on.length; i++) {
+            let handler = params.on[i]
+            // regexify
+            //let matches = /^\/([^\/]+)\/([dgimsuy]*)$/.exec(handler.event)
+            if (handler.event) {
+              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)
                 }
-                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]
-                    matched_index = i
-                    sh.kill()
+                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]
-                    matched_index = i
-                    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]
+                      matched_index = i
+                      sh.kill()
+                    }
+                    if (handler.done) {
+                      m = rendered_event[0]
+                      matched_index = i
+                      sh.continue()
+                    }
                   }
                 }
               }
             }
           }
         }
-      }
-      if (ondata) {
-        ondata(stream)
+        if (ondata) {
+          ondata(stream)
+        }
+      } catch (e) {
+        console.log("Capture error", e)
+        ondata({ raw: e.stack })
+        sh.mute = true
+        sh.kill()
       }
     })
     /*
@@ -490,8 +497,6 @@ class Shells {
 
     if (request.id) {
 
-    console.log("this.shells", this.shells.map((x) => { return x.id }))
-
       let shells = []
       for(let i=0; i<this.shells.length; i++) {
         shells.push(this.shells[i])

package/kernel/util.js

@@ -224,7 +224,6 @@ const openURL = (url) => {
   } else {
     command = `xdg-open "${url}"`; // Linux
   }
-  console.log("openURL", { url, command })
   child_process.exec(command);
 }
 const openfs = (dirPath, options, kernel) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.24.0",
+  "version": "3.26.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -36,6 +36,7 @@
     "glob": "^10.3.3",
     "glob-gitignore": "^1.0.14",
     "go-get-folder-size": "^0.5.5",
+    "gray-matter": "^4.0.3",
     "http-proxy": "^1.18.1",
     "http-proxy-middleware": "^3.0.0",
     "http-terminator": "^3.2.0",