pinokiod 3.20.18 → 3.20.20

package/kernel/favicon.js

@@ -0,0 +1,56 @@
+const axios = require('axios')
+const { URL } = require("url");
+const { JSDOM } = require("jsdom");
+
+class Favicon {
+  async get(pageUrl) {
+    let origin;
+    try {
+      origin = new URL(pageUrl).origin;
+    } catch {
+      throw new Error("Invalid URL: " + pageUrl);
+    }
+
+    const candidates = [
+      "/favicon.ico",
+      "/favicon.png",
+      "/assets/favicon.ico",
+      "/static/favicon.ico",
+      "/favicon.svg",
+    ];
+
+    // 1. Try common favicon paths first
+    for (const path of candidates) {
+      const fullUrl = origin + path;
+      if (await this.checkImageUrl(fullUrl)) return fullUrl;
+    }
+
+    // 2. Fallback to parsing HTML
+    try {
+      const res = await axios.get(pageUrl, { timeout: 1000 });
+      const dom = new JSDOM(res.data);
+      const icons = Array.from(dom.window.document.querySelectorAll("link[rel~='icon'], link[rel='apple-touch-icon']"));
+
+      for (const icon of icons) {
+        const href = icon.getAttribute("href");
+        if (!href) continue;
+        const resolvedUrl = new URL(href, origin).href;
+        if (await this.checkImageUrl(resolvedUrl)) return resolvedUrl;
+      }
+    } catch {
+      // Ignore HTML errors
+    }
+
+    return null;
+  }
+
+  async checkImageUrl(url) {
+    try {
+      const res = await axios.head(url, { timeout: 3000 });
+      return res.status === 200 && res.headers["content-type"]?.startsWith("image/");
+    } catch {
+      return false;
+    }
+  }
+}
+module.exports = Favicon

package/kernel/index.js

@@ -37,6 +37,7 @@ const Procs = require('./procs')
 const Peer = require('./peer')
 const Git = require('./git')
 const Connect = require('./connect')
+const Favicon = require('./favicon')
 const { DownloaderHelper } = require('node-downloader-helper');
 const { ProxyAgent } = require('proxy-agent');
 const fakeUa = require('fake-useragent');
@@ -83,6 +84,7 @@ class Kernel {
     this.exposed = {}
     this.envs = {}
     this.shellpath = shellPath.sync()
+    this.favicon = new Favicon()
 
 
   }

package/kernel/prototype.js

@@ -76,7 +76,6 @@ class Proto {
       let mod = await this.kernel.require(mod_path)
 
       console.log({ mod_path, projectType, startType })
-      console.log("payload", payload)
 
       await mod(payload, ondata, this.kernel)
 

package/package.json

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

package/server/index.js

@@ -659,6 +659,12 @@ class Server {
     }
     return shell_id
   }
+  is_subpath(parent, child) {
+    const relative = path.relative(parent, child);
+    let check = !!relative && !relative.startsWith('..') && !path.isAbsolute(relative);
+    console.log({ relative, parent, child, check })
+    return check
+  }
   async render(req, res, pathComponents, meta) {
     let base_path = req.base || this.kernel.path("api")
     let full_filepath = path.resolve(base_path, ...pathComponents)
@@ -1326,35 +1332,6 @@ class Server {
           let p = path.resolve(uri, item.name, "pinokio.js")
           let config  = (await this.kernel.loader.load(p)).resolved
           if (config) {
-            /*
-            if (config.version) {
-              let coerced = semver.coerce(config.version)
-              console.log("version", { coerced, v: config.version })
-              if (semver.satisfies(coerced, this.kernel.schema)) {
-                console.log("semver satisfied", config.version, this.kernel.schema)
-              } else {
-                console.log("semver NOT satisfied", config.version, this.kernel.schema)
-                error = `Please update Pinokio to the latest version (current script version: ${config.version}, supported: ${this.kernel.schema}`
-              }
-            }
-            */
-//            if (config.run) {
-//              items[i].run = config.run
-//            }
-//            if (config.menu) {
-//              if (typeof config.menu === "function") {
-//                if (config.menu.constructor.name === "AsyncFunction") {
-//                  config.menu = await config.menu(this.kernel, this.kernel.info)
-//                } else {
-//                  config.menu = config.menu(this.kernel, this.kernel.info)
-//                }
-//              }
-//
-//              await this.renderMenu(uri, item.name, config, pathComponents)
-//
-//              items[i].menu = config.menu
-//            }
-
             if (config.shortcuts) {
               if (typeof config.shortcuts === "function") {
                 if (config.shortcuts.constructor.name === "AsyncFunction") {
@@ -1372,36 +1349,35 @@ class Server {
           if (config && config.type === "lib") {
             continue
           }
-
-//          // if there's a run clause, do not display on the home page
-//          if (config && config.run && Array.isArray(config.run)) {
-//            continue
-//          }
-
-
           // check if there is a running process with this folder name
           let runningApps = new Set()
           for(let key in this.kernel.api.running) {
             //let p = this.kernel.path("api", items[i].name) + path.sep
             let p = this.kernel.path("api", items[i].name)
 
-            //let re = new RegExp(items[i].name)
-            //if (re.test(key)) {
-            //if (p === key) {
-
-
             // not only should include the pattern, but also end with it (otherwise can include similar patterns such as /api/qqqa, /api/qqqaaa, etc.
 
             let is_running
             let api_path = this.kernel.path("api")
-            if (key.startsWith(api_path)) {
-              // api script
-              if (key.startsWith(p)) {
+            if (this.is_subpath(api_path, key)) {
+              if (this.is_subpath(p, key)) {
                 is_running = true
               }
             } else {
               if (key.endsWith(p)) {
                 is_running = true
+              } else {
+                if (!path.isAbsolute(key)) {
+                  let chunks = key.split("_")
+                  if (chunks.length > 1) {
+                    let folder = chunks[0]
+                    /// if the folder name matches, it's running
+                    if (folder === items[i].name) {
+                      is_running = true
+                    }
+                  }
+
+                }
               }
             }
             // 1. if the script path starts with api path => api script
@@ -1412,34 +1388,46 @@ class Server {
 
             //if (key.includes(p) && key.endsWith(p)) {
             if (is_running) {
-              items[i].running = true
-              items[i].index = index
+              // add to running
+              running.push(items[i]) 
               if (!items[i].running_scripts) {
                 items[i].running_scripts = []
               }
-              if (key.startsWith(p)) {
-                items[i].running_scripts.push({ path: path.relative(this.kernel.homedir, key), name: path.relative(p, key) })
-              } else {
-                let chunks = key.split("?")
-                let dev = chunks[0]
-                let name_chunks = dev.split(path.sep)
-                let name = name_chunks[name_chunks.length-1]
-                items[i].running_scripts.push({ id: key, name })
-              }
-              index++;
-              running.push(items[i])
-//              break
-            }
-            let shell = this.kernel.shell.find({
-              filter: (shell) => {
-                return shell.id.startsWith(items[i].name + "_")
-              }
-            })
-            if (shell.length > 0) {
               items[i].running = true
               items[i].index = index
+
+              // add the running script to running_scripts array
+              // 1. normal api script
+              if (path.isAbsolute(key)) {
+                // script
+                if (this.is_subpath(api_path, key)) {
+                  // scripts inside api folder
+                  if (this.is_subpath(p, key)) {
+                    items[i].running_scripts.push({ path: path.relative(this.kernel.homedir, key), name: path.relative(p, key) })
+                  }
+                } else {
+                  // other global scripts
+                  let chunks = key.split("?")
+                  let dev = chunks[0]
+                  let name_chunks = dev.split(path.sep)
+                  let name = name_chunks[name_chunks.length-1]
+                  items[i].running_scripts.push({ id: key, name })
+                }
+              } else {
+                let shell = this.kernel.shell.find({
+                  filter: (shell) => {
+                    return shell.id.startsWith(items[i].name + "_")
+                  }
+                })
+                if (shell.length > 0) {
+                  items[i].running = true
+                  items[i].index = index
+                  for(let sh of shell) {
+                    items[i].running_scripts.push({ id: sh.id, name: "Terminal", type: "shell" })
+                  }
+                }
+              }
               index++;
-              running.push(items[i])
             }
           }
           if (!items[i].running) {
@@ -1447,8 +1435,6 @@ class Server {
             index++;
             notRunning.push(items[i])
           }
-
-
         }
       }
 
@@ -1567,9 +1553,13 @@ class Server {
 
       let current_urls = await this.current_urls()
 
+      let list = this.getPeerInfo()
+
       if (meta) {
         items = running.concat(notRunning)
         res.render("index", {
+          list,
+          current_host: this.kernel.peer.host,
           current_urls,
           portal: this.portal,
           install: this.install,
@@ -3715,6 +3705,98 @@ class Server {
         requirements_pending,
       })
     }))
+    this.app.get("/net/:name", ex(async (req, res) => {
+      let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
+        bin: this.kernel.bin.preset("network"),
+      })
+
+      if (!requirements_pending && install_required) {
+        console.log("redirect to /setup/network")
+        res.redirect("/setup/network?callback=/network")
+        return
+      }
+
+      let list = this.getPeerInfo()
+      let processes
+      let host
+      let peer
+      for(let item of list) {
+        if (item.name === req.params.name) {
+          processes = item.processes
+          host = item.host
+          console.log("matched", processes)
+          peer = item
+        }
+      }
+      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) => {
+      //    let favicon = await this.kernel.favicon.get("http://" + proc.ip)
+      //    console.log("Got favicon", { favicon, ip: proc.ip })
+      //    if (favicon) {
+      //      favicons[proc.host] = favicon
+      //    }
+      //  })
+      //}))
+      for(let proc of peer.processes) {
+        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.ip] = meta.icon
+                }
+                if (meta.title) {
+                  titles[proc.ip] = meta.title
+                }
+                if (meta.description) {
+                  descriptions[proc.ip] = meta.description
+                }
+              }
+            }
+          }
+        }
+        // if not running from pinokio, try to fetch and infer the favicon
+        if (!favicons[proc.ip]) {
+          let favicon = await this.kernel.favicon.get("http://" + proc.ip)
+          if (favicon) {
+            favicons[proc.ip] = favicon
+          }
+        }
+      }
+      console.timeEnd("Favicon")
+
+      let current_urls = await this.current_urls(req.originalUrl.slice(1))
+      console.log("LIST", JSON.stringify(list, null, 2))
+      res.render("net", {
+        favicons,
+        titles,
+        descriptions,
+        current_urls,
+        docs: this.docs,
+        portal: this.portal,
+        install: this.install,
+        agent: this.agent,
+        theme: this.theme,
+        processes,
+        error: null,
+        list,
+        host,
+        running: [],
+        current_host: this.kernel.peer.host,
+      })
+    }))
     this.app.get("/network", ex(async (req, res) => {
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
         bin: this.kernel.bin.preset("network"),
@@ -3812,8 +3894,10 @@ class Server {
       }
 
 
+      let current_urls = await this.current_urls(req.originalUrl.slice(1))
 
       res.render("network", {
+        current_urls,
         requirements_pending,
         install_required,
         docs: this.docs,

package/server/public/style.css

@@ -111,6 +111,9 @@ body.dark *::-webkit-scrollbar-thumb {
   border: 2px dotted silver !important;
 }
 .app-btns {
+  display: flex;
+  gap: 5px;
+  align-items: center;
 }
 .drawer {
   max-height: 100000px;
@@ -151,6 +154,10 @@ body.dark .dynamic.selected {
   background: rgba(0,0,0,0.05);
   */
 }
+.submenu {
+  margin-left: 10px;
+  box-sizing: border-box;
+}
 
 .url-bar {
   font-family: verdana;
@@ -160,12 +167,12 @@ body.dark .dynamic.selected {
   flex-grow: 1;
 }
 .url-bar .http-url:hover {
-  color: firebrick;
-  border-color: firebrick;
+  color: royalblue;
+  border-color: royalblue;
 }
 .url-bar .https-url:hover {
-  color: firebrick;
-  border-color: firebrick;
+  color: royalblue;
+  border-color: royalblue;
 }
 .url-bar .https-url {
   cursor: pointer;
@@ -652,7 +659,13 @@ form.search {
   margin: 0;
   display: flex;
   flex-grow: 1;
+  /*
   padding: 0 10px 20px;
+  */
+  padding: 0 10px 10px;
+  /*
+  padding: 10px 20px 10px;
+  */
 }
 .input-form {
   padding: 10px;
@@ -720,7 +733,7 @@ body.dark form.search input[type=search] {
 }
 form.search input[type=search] {
   flex-grow: 1;
-  padding: 10px;
+  padding: 8px 10px;
   /*
   margin: 0 0 0 10px;
   */
@@ -733,8 +746,9 @@ form.search input[type=search] {
   border: 1px solid rgba(0,0,0,0.1);
   border-right: none;
   background: rgba(0,0,0,0.05);
-  */
   background: white;
+  */
+  background: rgba(0,0,0,0.05);
   border: none;
   outline: none;
 }
@@ -996,7 +1010,7 @@ header {
   background: white;
   */
   position: sticky;
-  padding: 10px;
+  padding: 10px 10px 0;
   top: 0;
   box-sizing: border-box;
   z-index: 1000;
@@ -1121,6 +1135,9 @@ main {
 main h1 {
   margin: 0;
 }
+body.dark .offline .indicator {
+  background: rgba(255,255,255,0.1);
+}
 .hidden {
   display: none !important;
 }
@@ -1137,6 +1154,9 @@ main h1 {
   box-sizing: border-box;
 }
 .container {
+  flex-grow: 1;
+  box-sizing: border-box;
+  padding: 0 20px;
 /*
   max-width: var(--content-width);
   margin: 20px auto;
@@ -1227,9 +1247,11 @@ body.dark .readme a {
 .line:last-child {
   border: none;
 }
+/*
 body.dark .line {
   border-bottom: 1px solid var(--dark-thin);
 }
+*/
 body.dark .line.selected, body.dark .line:hover {
 /*
   border-left: 6px solid white;
@@ -1257,7 +1279,9 @@ body.dark .line:hover {
   padding: 15px 15px;
   */
   padding: 7px 5px;
+  /*
   border-bottom: 1px solid var(--light-thin);
+  */
 }
 .thick.line {
   padding: 15px;
@@ -1345,22 +1369,34 @@ body.dark .line.align-top h3 .col .uri {
 .line.align-top h3 .col .uri {
   opacity: 0.9;
   padding-bottom: 2px;
-  color: var(--light-fade);
+  color: rgba(0,0,0,0.4);
   font-size: 12px;
   font-family: verdana;
 }
 body.dark .line.align-top h3 .col .title a {
   color: var(--dark-link-color);
 }
-.line.align-top h3 .col .title i {
-  font-size: 15px;
+.line.align-top h3 .col .title span {
   margin-left: 5px;
 }
+
+.running-apps .line.align-top h3 .col .title {
+/*
+  color: yellowgreen;
+  */
+}
+.running-apps .line.align-top h3 .col .title i {
+  color: yellowgreen;
+}
+.line.align-top h3 .col .title i {
+  font-size: 12px;
+}
+body.dark .line.align-top h3 .col .title i {
+}
 .line.align-top h3 .col .title a {
   text-decoration: none;
   display: flex;
   align-items: center;
-  color: var(--light-link-color);
 }
 .line.align-top h3 .col .title .btn {
   letter-spacing: 0;
@@ -1376,10 +1412,7 @@ body.dark .line.align-top h3 .col .title a {
   */
   display: flex;
   align-items: center;
-  /*
-  font-size: 20px;
-  */
-  font-size: 16px;
+  font-size: 14px;
   font-family: arial;
   font-weight: bold;
 }
@@ -1942,30 +1975,11 @@ nav.error-message {
   font-weight: bold;
 }
 /*
-.not-running-apps, .running-apps {
-  background: rgba(0,0,100,0.04);
-}
-body.dark .not-running-apps, body.dark .running-apps {
-  background: rgba(255,255,255,0.03);
-}
-*/
-/*
-.running-apps .line .title {
-  color: #82bc09;
-}
-*/
 .running-apps .line {
   border-left: 10px solid #82bc09;
 }
 .running-apps .line img {
   padding-left: 3px;
-  /*
-  padding-left: 10px;
-  border: 3px solid #8fd400;
-  */
-  /*
-  border-radius: 5px;
-  */
 }
 body.dark .not-running-apps .line {
   border-left: 10px solid rgba(255,255,255,0.1);
@@ -1976,21 +1990,14 @@ body.dark .not-running-apps .line {
 .not-running-apps .line img {
   padding-left: 3px;
 }
-/*
-.running-apps .line.align-top h3 .col .title {
-  color: #8fd400;
-}
-*/
 .running-apps .spinner, .not-running-apps .spinner {
   width: 50px;
   text-align: center;
   font-size: 20px;
 }
+*/
 body.dark header .home {
   color: var(--dark-btn-color);
-  /*
-  color: white;
-  */
 }
 header .home {
   color: var(--light-color); 

package/server/views/app.ejs

@@ -760,7 +760,7 @@ body.dark .top-menu .btn2.selected {
   color: white;
 }
 body.minimized #collapse {
-  background: none;
+  background: none !important;
 }
 body.dark #collapse {
   background: rgba(255,255,255,0.07);
@@ -776,8 +776,13 @@ body.dark .mode-selector .btn2.selected {
 }
 .mode-selector {
   display: flex;
+  gap: 3px;
+  /*
+  gap: 5px;
+  */
 }
 .mode-selector .btn2 {
+  border-radius: 0;
   padding: 10px 0;
   min-width: 40px;
 }
@@ -900,7 +905,6 @@ body.dark .mode-selector .btn2.selected {
     <a class='http-url' target="_blank" href="<%=current_urls.http%>"><i class="fa-solid fa-square-arrow-up-right"></i> <%=current_urls.http%></a>
   <% } %>
 </div>
-<a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <!--
 <input type='url' id='location' readonly value="<%=execUrl%>">

package/server/views/connect/x.ejs

@@ -196,7 +196,6 @@ pre {
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <div class='flexible'></div>
-<a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='nav-btns'>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>

package/server/views/connect.ejs

@@ -232,7 +232,6 @@ body.dark .config {
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <div class='flexible'></div>
-<a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='nav-btns'>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>

package/server/views/download.ejs

@@ -115,7 +115,6 @@ body.frozen {
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
-<a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>

package/server/views/explore.ejs

@@ -125,7 +125,6 @@ body main iframe {
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <div class='flexible'></div>
-<a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='nav-btns'>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>

package/server/views/file_explorer.ejs

@@ -234,7 +234,6 @@ body.dark .browser-options-row {
         </div>
       <% } %>
       <div class='browser-options-row'>
-        <a href="/network" class='btn'><div><i class="fa-solid fa-gauge"></i> Configure</div></a>
         <div class='flexible'>
           <h3><i class="fa-solid fa-wifi"></i> Local Sharing</h3>
           <div>Serve Pinokio, installed apps, and even external apps (example: Ollama) to any device on the same network.</div>