pinokiod 3.52.0 → 3.54.0

package/kernel/index.js

@@ -366,6 +366,10 @@ class Kernel {
     await this.peer.check(this)
     return this.peer.active
   }
+  async peer_active() {
+    await this.peer.check(this)
+    return this.peer.peer_active
+  }
   async network_installed() {
     let installed = await this.bin.check_installed({ name: "caddy" })
     return installed
@@ -386,61 +390,79 @@ class Kernel {
   }
   async refresh(notify_peers) {
     const ts = Date.now()
-    let network_active = await this.network_active()
-    if (!network_active) {
-      return
-    }
-    let network_running = await this.network_running()
-    if (network_running) {
-      let ts = Date.now()
-      if (this.processes.refreshing) {
-        // process list refreshing. try again later
-        return
-      }
 
+    await this.peer.check(this)
+
+    if (this.peer.peer_active) {
       // 1. get the process list
       await this.processes.refresh()
 
       // 2. refresh peer info to reflect the proc info
       //await this.peer.refresh()
       await this.peer.refresh_host(this.peer.host)
+      
+    }
 
-      // 3. load custom routers from ~/pinokio/network
-      await this.router.init()
 
-      // 4. set current local host router info
-      await this.router.local()
+//    let network_active = await this.network_active()
+//    if (!network_active) {
+//      return
+//    }
 
-      // 7. update remote router
-      await this.router.remote()
+    if (this.peer.https_active) {
+      let network_running = await this.network_running()
+      if (network_running) {
+        let ts = Date.now()
+        if (this.processes.refreshing) {
+          // process list refreshing. try again later
+          return
+        }
 
-      await this.router.static()
+  //      // 1. get the process list
+  //      await this.processes.refresh()
+  //
+  //      // 2. refresh peer info to reflect the proc info
+  //      //await this.peer.refresh()
+  //      console.log("peer refresh_host")
+  //      await this.peer.refresh_host(this.peer.host)
 
-      await this.router.custom_domain()
+        // 3. load custom routers from ~/pinokio/network
+        await this.router.init()
 
+        // 4. set current local host router info
+        await this.router.local()
 
-      this.router.fallback()
+        // 7. update remote router
+        await this.router.remote()
 
-      // 8. update caddy config
-      await this.router.update()
+        await this.router.static()
+
+        await this.router.custom_domain()
+
+
+        this.router.fallback()
+
+        // 8. update caddy config
+        await this.router.update()
 
-      // 6. tell peers to refresh
-      let changed
-      let new_config = JSON.stringify(await this.peer.current_host())
-      if (this.old_config !== new_config) {
-        console.log("Proc config has changed. update router.")
-        changed = true
-      } else {
-//        console.log("Proc config is the same")
-        changed = false
-      }
-      this.old_config = new_config
-      if (changed) {
-        await this.peer.notify_refresh()
       }
-      // 9. announce self to the peer network
-      this.peer.announce()
     }
+    // 6. tell peers to refresh
+    let changed
+    let new_config = JSON.stringify(await this.peer.current_host())
+    if (this.old_config !== new_config) {
+      console.log("Proc config has changed. update router.")
+      changed = true
+    } else {
+//        console.log("Proc config is the same")
+      changed = false
+    }
+    this.old_config = new_config
+    if (changed) {
+      await this.peer.notify_refresh()
+    }
+    // 9. announce self to the peer network
+    this.peer.announce()
   }
   async clearLog(group) {
     let relativePath = path.relative(this.homedir, group)
@@ -879,11 +901,11 @@ class Kernel {
 //      let contents = await fs.promises.readdir(this.homedir)
       //await this.bin.init()
       let ts = Date.now()
-      this.git.index(this).then(() => {
-        //console.log(this.git.mapping)
-      })
       this.bin.init().then(() => {
         if (this.homedir) {
+          this.git.index(this).then(() => {
+            //console.log(this.git.mapping)
+          })
           this.shell.init().then(async () => {
             this.bin.check({
               bin: this.bin.preset("ai"),
@@ -990,8 +1012,8 @@ class Kernel {
         if (this.refresh_interval) {
           clearInterval(this.refresh_interval)
         }
-        let network_active = await this.network_active()
-        if (network_active) {
+        //let network_active = await this.network_active()
+        //if (network_active) {
           this.refresh_interval = setInterval(() => {
             if (this.server_running) {
               this.refresh(true)    
@@ -999,7 +1021,7 @@ class Kernel {
               console.log("server not running yet. retry network refresh in 5 secs")
             }
           }, 5000)
-        }
+        //}
 
       }
 

package/kernel/peer.js

@@ -40,8 +40,8 @@ class PeerDiscovery {
   }
   async check(kernel) {
     let env = await Environment.get(kernel.homedir, kernel)
-    //let peer_active = true
-    let peer_active = false
+    let peer_active = true
+    //let peer_active = false
     if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
     //if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
       peer_active = true
@@ -54,10 +54,14 @@ class PeerDiscovery {
       //https_active = false 
     }
 //    console.log("kernel.refresh", { active, notify_peers })
-    this.name = os.userInfo().username
+
+    //this.name = os.userInfo().username
+    this.name = "p" + this.host.split(".").pop()
     if (env && env.PINOKIO_NETWORK_NAME && env.PINOKIO_NETWORK_NAME.length > 0) {
       this.name = env.PINOKIO_NETWORK_NAME
     }
+    this.peer_active = peer_active
+    this.https_active = https_active
     if (peer_active && https_active) {
       this.active = true
     } else {
@@ -77,7 +81,8 @@ class PeerDiscovery {
 //      this.active = true
 //    }
 
-    if (this.active) {
+    //if (this.active) {
+    if (this.peer_active) {
       // Listen for incoming pings
       this.socket = dgram.createSocket('udp4');
       this.socket.on('message', (msg, rinfo) => {
@@ -319,8 +324,8 @@ class PeerDiscovery {
       */
       let http_icon = null
       let https_icon = null
-      let http_href = null
-      let https_href = null
+      let https_href = `https://pinokio.${this.name}.localhost/p/${folder}`
+      let http_href = `http://${this.host}:42000/p/${folder}`
       let app_href = null
       if (meta && !meta.init_required) {
         if (meta.title) {
@@ -330,8 +335,6 @@ class PeerDiscovery {
             https_icon = `https://pinokio.${this.name}.localhost/asset/api/${folder}/${meta.iconpath}`
           }
           //https_href = `https://${folder}.${this.name}.localhost`
-          https_href = `https://pinokio.${this.name}.localhost/p/${folder}`
-          http_href = `http://${this.host}:42000/p/${folder}`
           app_href = `https://${folder}.${this.name}.localhost`
           installed.push({
             folder,
@@ -342,8 +345,18 @@ class PeerDiscovery {
             http_href,
             ...meta 
           })
+          continue
         }
       }
+
+      installed.push({
+        folder,
+        https_href,
+        http_href,
+        ...meta 
+      })
+
+
     }
     return installed
   }

package/kernel/router/index.js

@@ -217,16 +217,16 @@ class Router {
   }
 
   async static() {
-    this.localhost_static_router.handle()
-    for(let host in this.kernel.peer.info) {
-      let info = this.kernel.peer.info[host]
-      if (info.rewrite_mapping) {
-        for(let name in info.rewrite_mapping) {
-          this.peer_static_router.handle(info.rewrite_mapping[name])
-        }
-      }
-    }
-    this.mapping = this._mapping
+//    this.localhost_static_router.handle()
+//    for(let host in this.kernel.peer.info) {
+//      let info = this.kernel.peer.info[host]
+//      if (info.rewrite_mapping) {
+//        for(let name in info.rewrite_mapping) {
+//          this.peer_static_router.handle(info.rewrite_mapping[name])
+//        }
+//      }
+//    }
+//    this.mapping = this._mapping
   }
 
   // set local config

package/kernel/router/localhost_static_router.js

@@ -12,6 +12,7 @@ class LocalhostStaticRouter extends Processor {
     this.rewriter = new Rewriter(router)
   }
   handle () {
+    console.log("LOCALHOST STATIC ROUTER")
     let configs = []
     for(let api_name in this.router.kernel.pinokio_configs) {
       let config = this.router.kernel.pinokio_configs[api_name]
@@ -41,11 +42,13 @@ class LocalhostStaticRouter extends Processor {
             let local_dial = `${this.router.default_host}:${this.router.default_port}`
             let peer_dial = `${this.router.kernel.peer.host}:${this.router.default_port}`
             let rewrite = `/asset/api/${api_name}`
+            console.log("LOCALHOST REWRITE HANDLE", { rewrite, localhost_match, local_dial })
             this.rewriter.handle({
               route: rewrite,
               match: [localhost_match],
               dial: local_dial,
             })
+            console.log("LOCALHOST REWRITE HANDLE", { rewrite, peer_match, peer_dial })
             this.rewriter.handle({
               route: rewrite,
               match: [peer_match],

package/kernel/router/peer_static_router.js

@@ -30,6 +30,7 @@ class PeerStaticRouter extends Processor {
         rewrite: /asset/api/test
         match: test.x.localhost
     */ 
+    console.log("PEER STATIC ROUTER", rewrite_mapping)
     let url = new URL("http://" + rewrite_mapping.external_ip)
     let dial = url.host
     let rewrite = url.pathname

package/package.json

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

package/server/index.js

@@ -280,6 +280,52 @@ class Server {
       }
     })
   }
+  async processMenu(name, config) {
+    let cfg = config
+    if (cfg) {
+      if (cfg.menu) {
+        if (typeof cfg.menu === "function") {
+          if (cfg.menu.constructor.name === "AsyncFunction") {
+            cfg.menu = await cfg.menu(this.kernel, this.kernel.info)
+          } else {
+            cfg.menu = cfg.menu(this.kernel, this.kernel.info)
+          }
+        }
+      } else {
+        cfg = await this.renderIndex(name)
+      }
+    } else {
+      cfg = await this.renderIndex(name)
+    }
+    return cfg
+  }
+  async renderIndex(name) {
+    let p = this.kernel.path("api", name)
+    let html_path = path.resolve(p, "index.html")
+    let html_exists = await this.kernel.exists(html_path)
+    console.log({ html_path, html_exists })
+    if (html_exists) {
+      return {
+        title: name, 
+        menu: [{
+          default: true,
+          icon: "fa-solid fa-link",
+          text: "index.html",
+          href: "index.html?raw=true",
+        }]
+      }
+    } else {
+      return {
+        title: name, 
+        menu: [{
+          default: true,
+          icon: "fa-solid fa-link",
+          text: "Project Files",
+          href: `/files/api/${name}`,
+        }]
+      }
+    }
+  }
   async getGit(ref, filepath) {
     let dir = this.kernel.path("api", filepath)
     let branches = await git.listBranches({ fs, dir });
@@ -463,31 +509,21 @@ class Server {
       }
     }
 
-    let menu = config.menu || []
-    try {
-      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)
-        }
-      }
-    } catch (e) {
-      err = e.stack
-      config.menu = []
-    }
-
 
     let uri = this.kernel.path("api")
     try {
       let launcher = await this.kernel.api.launcher(name)
       req.launcher_root = launcher.launcher_root
-      await this.renderMenu(req, uri, name, config, [])
+      config = await this.processMenu(name, config)
     } catch(e) {
       config.menu = []
       err = e.stack
     }
 
+    console.log("renderMenu before", config)
+    await this.renderMenu(req, uri, name, config, [])
+    console.log("renderMenu after", config)
+
     let platform = os.platform()
 
     await Environment.init({ name }, this.kernel)
@@ -2631,10 +2667,10 @@ class Server {
   getPeers() {
     let list = []
     for(let key in this.kernel.peer.info) {
-      if (key !== this.kernel.peer.host) {
+//      if (key !== this.kernel.peer.host) {
         let info = this.kernel.peer.info[key]
         list.push(info)
-      }
+//      }
     }
     return list
   }
@@ -3040,6 +3076,7 @@ class Server {
     this.app.get("/screenshots", ex(async (req, res) => {
       let list = this.getPeers()
       res.render("screenshots", {
+        current_host: this.kernel.peer.host,
         version: this.version,
         portal: this.portal,
         logo: this.logo,
@@ -5467,60 +5504,20 @@ class Server {
       res.send(html)
     }))
     this.app.get("/pinokio/sidebar/:name", ex(async (req, res) => {
+
+      let uri = this.kernel.path("api")
       let name = req.params.name
       let launcher = await this.kernel.api.launcher(name)
-      let rawpath = "/api/" + name
       let config = launcher.script
-      req.launcher_root = launcher.launcher_root
-      if (config && 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)
-          }
-        }
-
-        let uri = this.kernel.path("api")
-        await this.renderMenu(req, uri, name, config, [])
-      } else {
-        // if there is no menu, display all files
-        let p = this.kernel.path("api", name)
-
-        let html_path = path.resolve(p, "index.html")
-        let html_exists = await this.kernel.exists(html_path)
-        if (html_exists) {
-          config = {
-            title: name, 
-            menu: [{
-              default: true,
-              icon: "fa-solid fa-link",
-              text: "index.html",
-              href: "index.html?raw=true",
-            }]
-          }
-        } else {
-          let files = await fs.promises.readdir(p, { withFileTypes: true })
-          files = files.filter((file) => {
-            return file.name.endsWith(".json") || file.name.endsWith(".js")
-          }).filter((file) => {
-            return file.name !== "pinokio.js" && file.name !== "pinokio.json" && file.name !== "pinokio_meta.json"
-          })
-          config = {
-            title: name, 
-            menu: files.map((file) => {
-              return {
-                text: file.name,
-                href: file.name
-              }
-            })
-          }
-        }
-
-        let uri = this.kernel.path("api")
-        await this.renderMenu(req, uri, name, config, [])
+      try {
+        let rawpath = "/api/" + name
+        req.launcher_root = launcher.launcher_root
+        config = await this.processMenu(name, config)
+      } catch(e) {
+        config.menu = []
+        err = e.stack
       }
-
+      await this.renderMenu(req, uri, name, config, [])
 
       ejs.renderFile(path.resolve(__dirname, "views/partials/menu.ejs"), { menu: config.menu }, (err, html) => {
         res.send(html)
@@ -5567,11 +5564,81 @@ class Server {
 //    }))
 
     this.app.get("/info/procs", ex(async (req, res) => {
-      console.time("Refresh")
       await this.kernel.processes.refresh()
-      console.timeEnd("Refresh")
+
+      let info = []
+      for(let item of this.kernel.processes.info) {
+        info.push({
+          online: true,
+          host: {
+            ip: this.kernel.peer.host,
+            local: true,
+            name: this.kernel.peer.name,
+            platform: this.kernel.platform,
+            arch: this.kernel.arch,
+          },
+          ...item,
+        })
+      }
+      // get only the parts not from this peer
+      for(let host in this.kernel.peer.info) {
+        let host_info = this.kernel.peer.info[host]
+        let host_rewrites = host_info.rewrite_mapping
+        for(let key in host_rewrites) {
+          info.push({
+            online: true,
+            host: {
+              ip: host,
+              local: this.kernel.peer.host === host,
+              name: host_info.name,
+              platform: host_info.platform,
+              arch: host_info.arch
+            },
+            name: `[Files] ${host_rewrites[key].name}`,
+            ip: host_rewrites[key].external_ip
+          })
+        }
+        if (this.kernel.peer.host !== host) {
+          let host_routers = host_info.router_info
+          for(let host_router of host_routers) {
+            let ip
+            // the peer sharing works only if external_ip is available (caddy is installed)
+            if (host_router.external_ip) {
+              ip = host_router.external_ip
+            } else {
+              // if caddy is not turned on, set ip as null, so that it suggests turning on peer sharing
+              ip = null
+            }
+            info.push({
+              online: true,
+              host: {
+                ip: host,
+                name: host_info.name,
+                platform: host_info.platform,
+                arch: host_info.arch
+              },
+              name: host_router.title || host_router.name,
+              ip
+            })
+          }
+        }
+
+        for(let app of host_info.installed) {
+          info.push({
+            host: {
+              ip: host,
+              local: this.kernel.peer.host === host,
+              name: host_info.name,
+              platform: host_info.platform,
+              arch: host_info.arch
+            },
+            name: app.title || app.folder,
+            ip: app.http_href.replace("http://", "")
+          })
+        }
+      }
       res.json({
-        info: this.kernel.processes.info
+        info
       })
     }))
 

package/server/public/common.js

@@ -477,15 +477,6 @@ document.addEventListener("DOMContentLoaded", () => {
   }
 
 
-  if (document.querySelector(".urlbar")) {
-    document.querySelector(".urlbar").addEventListener("submit", (e) => {
-      debugger
-      e.preventDefault()
-      e.stopPropagation()
-      location.href = "/container?url=" + e.target.querySelector("input[type=url]").value
-    })
-  }
-
   if (document.querySelector("#genlog")) {
     document.querySelector("#genlog").addEventListener("click", (e) => {
       e.preventDefault()

package/server/public/style.css

@@ -2363,8 +2363,6 @@ body.dark .mode-selector .btn2.selected {
 }
 
 
-
-
 body.minimized {
   display: flex;
   flex-direction: row;
@@ -2433,7 +2431,7 @@ body.minimized .appcanvas, body.minimized main {
 body.minimized .appcanvas {
   padding-top: 20px;
 }
-body.minimized main {
+body.minimized main, body.minimized iframe.mainframe {
 /*
   padding-top: 10px;
   */
@@ -2448,6 +2446,9 @@ body.minimized .app-icon {
 body.minimized #dragger {
   display: block;
 }
+body.minimized aside .tab.submenu {
+  padding: 10px;
+}
 /*
 body.minimized aside {
   display: none;