pinokiod 3.25.0 → 3.27.0

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/prototype.js

@@ -67,6 +67,7 @@ class Proto {
         title,
         description,
         meta,
+        data,
         content
       })
     }
@@ -76,6 +77,7 @@ class Proto {
     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/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.25.0",
+  "version": "3.27.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -384,6 +384,20 @@ class Server {
     }
 //    console.timeEnd("1 chrome " + d)
 
+
+    console.log("req.query", req.query)
+    if (req.query.autolaunch === "1") {
+      let fullpath = path.resolve(this.kernel.homedir, "ENVIRONMENT")
+      await Util.update_env(fullpath, {
+        PINOKIO_ONDEMAND_AUTOLAUNCH: "1"
+      })
+    } else if (req.query.autolaunch === "0") {
+      let fullpath = path.resolve(this.kernel.homedir, "ENVIRONMENT")
+      await Util.update_env(fullpath, {
+        PINOKIO_ONDEMAND_AUTOLAUNCH: "0"
+      })
+    }
+
     let name = req.params.name
     let config = await this.kernel.api.meta(name)
 
@@ -439,7 +453,12 @@ class Server {
     }
 
     let uri = this.kernel.path("api")
-    await this.renderMenu(uri, name, config, [])
+    try {
+      await this.renderMenu(uri, name, config, [])
+    } catch(e) {
+      config.menu = []
+      err = e.stack
+    }
 
 
     let platform = os.platform()
@@ -1756,8 +1775,6 @@ class Server {
       let unix_path = Util.p2u(cwd)
       let shell_id = this.get_shell_id(unix_path, currentIndexPath, rendered)
 
-      console.log("SHELL ID 1", shell_id)
-
 //          let hash = crypto.createHash('md5').update(JSON.stringify(rendered)).digest('hex')
 //          let shell_id
 //          if (rendered.id) {
@@ -1778,7 +1795,6 @@ class Server {
         }
       }
     }
-    console.log("renderShell", menuitem)
     return menuitem
   }
 
@@ -2881,17 +2897,25 @@ class Server {
       let host = u.host
       if (host.endsWith(".localhost")) {
         let name = host.replace(/\.localhost$/, '')
+        let env = await Environment.get(this.kernel.homedir)
+        let autolaunch = false
+        if (env && env.PINOKIO_ONDEMAND_AUTOLAUNCH === "1") {
+          autolaunch = true
+        }
         let api_path = this.kernel.path("api", name)
         let exists = await this.exists(api_path)
         if (exists) {
           let meta = await this.kernel.api.meta(name)
+          console.log({ autolaunch })
           res.render("start", {
+            autolaunch,
             logo: this.logo,
             theme: this.theme,
             agent: this.agent,
             name: meta.title,
             image: meta.icon,
-            link: "/p/" + name 
+            //link: autolaunch ? "/p/" + name : "/p/" + name + "?autolaunch"
+            link: autolaunch ? "/p/" + name + "?autolaunch=1" : "/p/" + name + "?autolaunch=0"
           })
           return
         }
@@ -3121,6 +3145,12 @@ class Server {
 //      await this.kernel.proto.init()
       let list = this.getPeerInfo()
       let ai = await this.kernel.proto.ai()
+      ai.push({
+        title: "Use your own AI recipe",
+        description: "Enter your own markdown instruction for AI",
+        meta: {},
+        content: ""
+      })
       console.log("ai", ai)
       res.render("init/index", {
         list,
@@ -3753,6 +3783,25 @@ class Server {
         agent: this.agent,
       })
     }))
+    this.app.post("/plugin/update", ex(async (req, res) => {
+      console.time("/plugin/update")
+      try {
+        await this.kernel.exec({
+          message: "git pull",
+          path: this.kernel.path("plugin/code")
+        }, (e) => {
+          console.log(e)
+        })
+        console.timeEnd("/plugin/update")
+        res.json({
+          success: true
+        })
+      } catch (e) {
+        res.json({
+          error: e.stack
+        })
+      }
+    }))
     this.app.post("/network/reset", ex(async (req, res) => {
       let caddy_path = this.kernel.path("cache/XDG_DATA_HOME/caddy")
       await rimraf(caddy_path)
@@ -3775,6 +3824,7 @@ class Server {
       })
     }))
     this.app.get("/net/:name", ex(async (req, res) => {
+      let protocol = req.get('X-Forwarded-Proto')
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
         bin: this.kernel.bin.preset("network"),
       })
@@ -3786,7 +3836,7 @@ class Server {
       }
 
       let list = this.getPeerInfo()
-      let processes
+      let processes = []
       let host
       let peer
       for(let item of list) {
@@ -3799,7 +3849,6 @@ class Server {
       let favicons = {}
       let titles = {}
       let descriptions = {}
-      console.time("Favicon")
       //await Promise.all(peer.processes.map((proc) => {
       //  console.log("Proc", proc)
       //  return new Promise(async (resolve, reject) => {
@@ -3810,55 +3859,63 @@ class Server {
       //    }
       //  })
       //}))
-      let pinokio_ip
-      for(let proc of peer.processes) {
-        if (proc.internal_port === 42000) {
-          // pinokio ip
-          pinokio_ip = proc.external_ip
-        }
-        if (proc.external_router) {
-          // try to get icons from pinokio
-          for(let router of proc.external_router) {
-            // replace the root domain: facefusion-pinokio.git.x.localhost => facefusion-pinokio.git
-            let pattern = `.${req.params.name}.localhost`
-            if (router.endsWith(pattern)) {
-              let name = router.replace(pattern, "")
-              let api_path = this.kernel.path("api", name)
-              let exists = await this.exists(api_path)
-              if (exists) {
-                let meta = await this.kernel.api.meta(name)
-                if (meta.icon) {
-                  favicons[proc.external_ip] = meta.icon
-                }
-                if (meta.title) {
-                  titles[proc.external_ip] = meta.title
+
+      if (peer && peer.processes) {
+        let pinokio_ip
+        for(let proc of peer.processes) {
+          if (proc.internal_port === 42000) {
+            // pinokio ip
+            pinokio_ip = proc.external_ip
+          }
+          if (proc.external_router) {
+            // try to get icons from pinokio
+            for(let router of proc.external_router) {
+              // replace the root domain: facefusion-pinokio.git.x.localhost => facefusion-pinokio.git
+              let pattern = `.${req.params.name}.localhost`
+              if (router.endsWith(pattern)) {
+                let name = router.replace(pattern, "")
+                let api_path = this.kernel.path("api", name)
+                let exists = await this.exists(api_path)
+                if (exists) {
+                  let meta = await this.kernel.api.meta(name)
+                  if (meta.icon) {
+                    favicons[proc.external_ip] = meta.icon
+                  }
+                  if (meta.title) {
+                    titles[proc.external_ip] = meta.title
+                  }
+                  if (meta.description) {
+                    descriptions[proc.external_ip] = meta.description
+                  }
                 }
-                if (meta.description) {
-                  descriptions[proc.external_ip] = meta.description
+              }
+            }
+          }
+          // if not an app running inside pinokio, try to fetch and infer the favicon
+          if (!favicons[proc.external_ip]) {
+            if (protocol === "https") {
+              if (proc.external_router.length > 0) {
+                let favicon = await this.kernel.favicon.get("https://" + proc.external_router[0])
+                if (favicon) {
+                  favicons[proc.external_ip] = favicon
                 }
               }
+            } else {
+              let favicon = await this.kernel.favicon.get("http://" + proc.external_ip)
+              if (favicon) {
+                favicons[proc.external_ip] = favicon
+              }
             }
           }
         }
-        // if not running from pinokio, try to fetch and infer the favicon
-        if (!favicons[proc.external_ip]) {
-          let favicon = await this.kernel.favicon.get("http://" + proc.external_ip)
-          if (favicon) {
-            favicons[proc.external_ip] = favicon
+        for (let external_ip in favicons) {
+          let favicon_path = favicons[external_ip]
+          if (!favicon_path.startsWith("http")) {
+            favicons[external_ip] = "http://" + pinokio_ip + favicon_path
           }
         }
       }
-      for (let external_ip in favicons) {
-        let favicon_path = favicons[external_ip]
-        if (!favicon_path.startsWith("http")) {
-          favicons[external_ip] = "http://" + pinokio_ip + favicon_path
-        }
-      }
-      console.timeEnd("Favicon")
-      console.log("favicons", favicons)
-
       let current_urls = await this.current_urls(req.originalUrl.slice(1))
-      console.log("LIST", JSON.stringify(list, null, 2))
       res.render("net", {
         selected_name: req.params.name,
         favicons,
@@ -4019,7 +4076,6 @@ class Server {
       })
     }))
     this.app.post("/state", ex(async (req, res) => {
-      console.log("POST /state", req.body)
       /*
       req.body := {
         name: <name>, 
@@ -4045,7 +4101,6 @@ class Server {
           this.menu_hidden[req.body.name][req.body.type] = true
         }
       }
-      console.log("select", req.body)
       res.json({
         success: true
       })
@@ -4956,8 +5011,10 @@ class Server {
       })
     }))
     this.app.get("/d/*", ex(async (req, res) => {
+    console.log("> 1")
       let filepath = Util.u2p(req.params[0])
       let plugin = await this.getPluginGlobal(filepath)
+    console.log("> 2")
       let html = ""
       let plugin_menu
       try {
@@ -4967,12 +5024,14 @@ class Server {
         plugin_menu = []
       }
       let current_urls = await this.current_urls(req.originalUrl.slice(1))
+    console.log("> 3")
       let retry = false
       // if plugin_menu is empty, try again in 1 sec
       if (plugin_menu.length === 0) {
         retry = true
       }
       let venvs = await Util.find_venv(filepath)
+    console.log("> 4")
       let terminal
       if (venvs.length > 0) {
         let terminals = []
@@ -5016,6 +5075,7 @@ class Server {
           })]
         }
       }
+    console.log("> 5")
 
       let exec_menus = []
       let shell_menus = []
@@ -5045,6 +5105,7 @@ class Server {
         exec_menus.sort((a, b) => { return a > b })
         shell_menus.sort((a, b) => { return a > b })
       }
+    console.log("> 6")
       let dynamic = [
         {
           icon: "fa-solid fa-robot",
@@ -5060,6 +5121,7 @@ class Server {
         },
         terminal,
       ]
+    console.log("> 7")
       res.render("d", {
         retry,
         current_urls,
@@ -5215,7 +5277,6 @@ class Server {
   //    await this.kernel.plugin.init()
       let plugin = await this.getPlugin(req.params.name)
       let html = ""
-      console.log("plugin", JSON.stringify(plugin, null, 2))
       let plugin_menu
       if (plugin) {
         if (plugin && plugin.menu && Array.isArray(plugin.menu)) {
@@ -5348,6 +5409,9 @@ class Server {
     }))
     this.app.get("/pinokio/peer", ex(async (req, res) => {
 //      await this.kernel.refresh()
+      let current_peer_info = this.kernel.peer.current_host(this.kernel)
+      res.json(current_peer_info)
+      /*
       res.json({
         home: this.kernel.homedir,
         arch: this.kernel.arch,
@@ -5360,6 +5424,7 @@ class Server {
         router: this.kernel.router.published(),
         memory: this.kernel.memory
       })
+      */
     }))
     this.app.get("/pinokio/memory", ex((req, res) => {
       let filepath = req.query.filepath
@@ -5431,25 +5496,25 @@ class Server {
       }
     }))
     this.app.get("/pinokio/launch/:name", ex(async (req, res) => {
-      this.chrome(req, res, "launch")
+      await this.chrome(req, res, "launch")
     }))
     this.app.get("/pinokio/browser/:name/dev", ex(async (req, res) => {
-      this.chrome(req, res, "browse")
+      await this.chrome(req, res, "browse")
     }))
     this.app.get("/pinokio/browser/:name/browse", ex(async (req, res) => {
-      this.chrome(req, res, "browse")
+      await this.chrome(req, res, "browse")
     }))
     this.app.get("/pinokio/browser/:name", ex(async (req, res) => {
-      this.chrome(req, res, "run")
+      await this.chrome(req, res, "run")
     }))
     this.app.get("/p/:name/dev", ex(async (req, res) => {
-      this.chrome(req, res, "browse")
+      await this.chrome(req, res, "browse")
     }))
     this.app.get("/p/:name/browse", ex(async (req, res) => {
-      this.chrome(req, res, "browse")
+      await this.chrome(req, res, "browse")
     }))
     this.app.get("/p/:name", ex(async (req, res) => {
-      this.chrome(req, res, "run")
+      await this.chrome(req, res, "run")
     }))
     this.app.post("/pinokio/delete", ex(async (req, res) => {
       try {

package/server/public/modalinput.js

@@ -3,6 +3,7 @@ const ModalInput = async (params, uri) => {
   {
     title,
     type: "modal" (default) |"notify"
+    confirm: "OK",
     form: [{
       type,
       items,
@@ -20,6 +21,7 @@ const ModalInput = async (params, uri) => {
   let description = (params.description ? `<div class='desc'>${params.description}</div>` : "")
   let result = await Swal.fire({
     title: (params.title || ""),
+    customClass: params.customClass,
     html: description + form.map((field) => {
       let type = (field.type ? field.type : "text")
       let autofocus = (field.autofocus ? "autofocus" : "")
@@ -68,7 +70,7 @@ const ModalInput = async (params, uri) => {
       }
     }).join("\n"),
     //focusConfirm: false,
-    confirmButtonText: 'Done',
+    confirmButtonText: params.confirm || 'Done',
     didRender: () => {
       Swal.getPopup().querySelectorAll('[data-type=file]').forEach((el, index) => {
         const dz = new Dropzone(el, {

package/server/views/500.ejs

@@ -3,7 +3,7 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <style>
-body {
+body.error-body  {
   width: 100%;
   margin: 0;
   background: royalblue;
@@ -20,26 +20,27 @@ h1 {
 pre {
   width: 100%;
 }
-footer {
+body.error-body footer.error-footer {
+  display: block;
   border-left: 4px solid white;
   padding: 10px 20px;
   margin-top: 50px;
 }
-footer ol {
+body.error-body footer.error-footer ol {
   padding-inline-start: 20px;
   margin: 0;
   padding-top: 10px;
 }
-footer a {
+body.error-body footer.error-footer a {
   color: white;
   font-weight: bold;
 }
 </style>
 </head>
-<body>
+<body class='error-body'>
 <h1>Error</h1>
 <pre><%=stack%></pre>
-<footer>
+<footer class='error-footer'>
   <div>You may want to try:</div>
   <ol>
     <li>Update Pinokio: Simply install the latest version, it should only update the app binary while keeping all the data in tact. <a href="<%=install%>" target="_blank">Go to Download Page</a></li>

package/server/views/app.ejs

@@ -13,6 +13,7 @@
 <link href="/filepond-plugin-image-preview.min.css" rel="stylesheet" />
 <link href="/filepond-plugin-image-edit.min.css" rel="stylesheet" />
 <link href="/style.css" rel="stylesheet"/>
+<script src="/modalinput.js"></script>
 <% if (agent === "electron") { %>
   <link href="/electron.css" rel="stylesheet"/>
 <% } %>
@@ -623,7 +624,9 @@ nav .logo {
 }
 .error-message {
   width: 100%;
+  /*
   background: royalblue !important;
+  */
   color: white;
   display: flex;
   justify-content: center;
@@ -1161,7 +1164,7 @@ body.dark .mode-selector .btn2.selected {
 <% if (error) { %>
   <div class='error-message'>
     <div>
-      <h1>Error</h1> 
+      <h1><i class="fa-solid fa-triangle-exclamation"></i> Error</h1> 
       <div><%=error%></div>
     </div>
   </div>
@@ -2190,9 +2193,23 @@ body.dark .mode-selector .btn2.selected {
   const try_dynamic = async () => {
     console.log("Try_dynamic")
     let rendered
+    let status
     const dynamic = await fetch("<%=dynamic%>").then((res) => {
+      status = res.status
       return res.text()
     })
+    console.log("STatus", status)
+    if (status == 500) {
+      ModalInput({
+        description: dynamic,
+        confirm: "OK",
+        customClass: {
+          popup: "full-popup",
+          title: "full-title"
+        }
+      })
+      return
+    }
     if (dynamic && dynamic.length > 0) {
       console.log({ dynamic })
       if (document.querySelector(".dynamic .submenu")) {
@@ -2233,9 +2250,23 @@ body.dark .mode-selector .btn2.selected {
         }, 1000)
       })
     }
+    let status
     const html = await fetch("<%=sidebar%>").then((res) => {
+      status = res.status
       return res.text()
     })
+    console.log({ status })
+    if (status == 500) {
+      ModalInput({
+        description: html,
+        confirm: "OK",
+        customClass: {
+          popup: "full-popup",
+          title: "full-title"
+        }
+      })
+      return
+    }
     document.querySelector(".menu").innerHTML = html
 
     <% if (type !== 'run') { %>