pinokiod 3.8.68 → 3.8.69

package/kernel/api/index.js

@@ -186,7 +186,7 @@ class Api {
       type: "disconnect"
     })
     console.timeEnd("stop 4")
-    await this.kernel.router.refresh()
+    this.kernel.refresh()
     return true
   }
   async startScripts() {
@@ -1074,7 +1074,7 @@ class Api {
             })
           }
         }
-        await this.kernel.router.refresh()
+        this.kernel.refresh()
       } catch (e) {
         ondata({ raw: e.toString() })
       }

package/kernel/bin/caddy.js

@@ -44,7 +44,7 @@ class Caddy {
           }
         })
       })
-      await this.kernel.router.refresh()
+      this.kernel.refresh()
     }
 //    const config = {
 //      "apps": {

package/kernel/bin/index.js

@@ -347,12 +347,9 @@ class Bin {
   //      process.stdout.write(stream.raw)
   //        console.log("conda list check", { stream })
       })
-      console.log("> res", res)
 
       let lines = res.response.split(/[\r\n]+/)
-      console.log("> lines", lines)
       for(let line of lines) {
-        console.log("> start", start)
         if (start) {
           let chunks = line.split(/\s+/).filter(x => x)
           if (chunks.length > 2) {

package/kernel/index.js

@@ -258,6 +258,22 @@ class Kernel {
   log(data, group, info) {
     this.log_queue.push({ data, group, info })
   }
+  async refresh(broadcast) {
+    console.log("kernel.refresh", { broadcast })
+    await Promise.all([
+      // refresh proc info
+      this.processes.refresh(),
+      // refresh peer info
+      this.peer.refresh()
+    ])
+    // refresh router info
+    await this.router.refresh()
+
+    if (broadcast) {
+      // broadcast to peers
+      await this.peer.broadcast()
+    }
+  }
   async clearLog(group) {
     let relativePath = path.relative(this.homedir, group)
     for(let type of ["info", "buf", "cleaned"]) {

package/kernel/peer.js

@@ -45,6 +45,24 @@ class PeerDiscovery {
       return null
     }
   }
+  async _broadcast(host) {
+    try {
+      let res = await axios.post(`http://${host}:${this.default_port}/pinokio/peer/refresh`, {
+        timeout: 2000
+      })
+      return res.data
+    } catch (e) {
+      return null
+    }
+  }
+  // notify peers to refresh my info
+  async braodcast() {
+    let res = await Promise.all(Array.from(this.peers).map((host) => {
+      return this._broadcast(host)
+    }))
+    return res
+  }
+  // refresh peer info
   async refresh() {
     this.info = {}
     let peer_info = await Promise.all(Array.from(this.peers).map((host) => {

package/kernel/procs.js

@@ -23,8 +23,6 @@ class Procs {
           if (!line.startsWith('  TCP')) return;
           const parts = line.trim().split(/\s+/);
           const [ , localAddress, , state, pid ] = parts;
-          if (pids.has(pid)) return;
-          pids.add(pid)
           if (state !== 'LISTENING') return;
           const chunks = localAddress.split(":")
           const port = chunks.pop()
@@ -34,13 +32,13 @@ class Procs {
           } else {
             ip = localAddress
           }
+          if (pids.has(pid+"/"+port)) return;
+          pids.add(pid+"/"+port)
           results.push({ port, pid, ip });
         } else {
           if (!/LISTEN/.test(line)) return;
           const parts = line.trim().split(/\s+/);
           const pid = parts[1];
-          if (pids.has(pid)) return;
-          pids.add(pid)
 
           const match = line.match(/([^\s]+:\d+)\s/);
           const localAddress = match?.[1];
@@ -54,6 +52,8 @@ class Procs {
           }
           //const portMatch = line.match(/:(\d+)\s/);
           //const port = portMatch?.[1];
+          if (pids.has(pid+"/"+port)) return;
+          pids.add(pid+"/"+port)
           if (pid && port) results.push({ port, pid, ip });
         }
       });
@@ -100,14 +100,16 @@ class Procs {
             const name = fullname.split(path.sep).pop()
             return { port, pid , name, fullname, ip }
           })
+          list = list.filter((item) => {
+            return item.name.toLowerCase() !== "caddy"
+          })
           resolve(list)
         });
       });      
     })
     console.log( { list } )
     console.timeEnd("Get list")
-    this.list = list
-    return this.list
+    this.info = list
   }
 }
 module.exports = Procs

package/kernel/router/index.js

@@ -24,7 +24,7 @@ class Router {
     this.default_port = "42000"
     this.default_host = "127.0.0.1"
 
-    this._mapping = {}
+    this.mapping = {}
     this.port_mapping = {}   // 127.0.0.1 => 192.168,..
     this.local_network_mapping = {}
   }
@@ -39,12 +39,12 @@ class Router {
     console.log(">this._mapping", this._mapping)
   }
   info() {
-    console.log("#### this._mapping", this._mapping)
+    console.log("#### this.mapping", this.mapping)
 
 
     let mapping = {}
-    for(let host in this._mapping) {
-      let internal_maps = this._mapping[host]
+    for(let host in this.mapping) {
+      let internal_maps = this.mapping[host]
       if (!mapping[host]) {
         mapping[host] = {}
       }
@@ -115,6 +115,8 @@ class Router {
     */
 
     console.log("count", count)
+
+    let new_config
  
     if (count > 0) {
       let ports = await this.kernel.ports(count)
@@ -148,23 +150,27 @@ class Router {
   }
 
   async refresh() {
-//    this._mapping = {}
+    console.log("router.refresh")
+    console.time("router.refresh")
+    console.log("> procs", this.kernel.processes.info)
+    console.log("> peers", this.kernel.peer.info)
+    this._mapping = {}
 //    this.port_mapping = {}   // 127.0.0.1 => 192.168,..
 //    this.local_network_mapping = {}
 
+    let old_config = this.config
+
     // 1. Localhost handling
     this.localhost_home_router.handle()
     this.localhost_variable_router.handle(this.kernel.memory.local)
-    let procs = await this.kernel.processes.refresh()
-    for(let proc of procs) {
+    for(let proc of this.kernel.processes.info) {
       this.localhost_port_router.handle(proc)
     }
+    this.mapping = this._mapping
 
     // 2. Peers handling
-    let peers = await this.kernel.peer.refresh()
-    console.log(">3", { peers })
-    for(let host in peers) {
-      let peer = peers[host]
+    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)
@@ -174,19 +180,28 @@ class Router {
       }
     }
     // replace :PORT_PLACEHOLDER with available ports
-    console.log("CONFIG BEFORE", JSON.stringify(this.config, null, 2))
 
-    await this.fill()
 
-    console.log("CONFIG AFTER", JSON.stringify(this.config, null, 2))
-
-
-    let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
-      headers: { 'Content-Type': 'application/json' }
-    }).catch((e) => {
-      console.log("EEEEEEEEEEEEE", e)
-    })
-    console.log("Caddy Response", { response })
+    await this.fill()
+    this.mapping = this._mapping
+    console.timeEnd("router.refresh")
+
+
+    // compare old config with new config
+    // if it hasn't changed, don't do anything
+    // if it has changed, refresh
+
+    if (JSON.stringify(this.config) === JSON.stringify(old_config)) {
+      console.log("config hasn't updated")
+    } else {
+      console.log("config has updated")
+      let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
+        headers: { 'Content-Type': 'application/json' }
+      }).catch((e) => {
+        console.log("EEEEEEEEEEEEE", e)
+      })
+      console.log("Caddy Response", { response })
+    }
   }
 }
 module.exports = Router

package/package.json

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

package/server/index.js

@@ -2621,22 +2621,76 @@ class Server {
         id: req.params.id
       })
     }))
-    this.app.get("/proxy", ex(async (req, res) => {
-      await this.kernel.router.refresh()
-      let list = await this.kernel.processes.refresh()
-      list = list.map((item) => {
-        let internal_port = item.ip.split(":")[1]
-        let external_port = this.kernel.router.port_mapping[internal_port]
-        let external_ip = `${this.kernel.peer.host}:${external_port}`
-        console.log({ internal_port, external_port, external_ip })
-        return {
-          //proxy: this.kernel.caddy.mapping[item.ip] || [],
-          router: this.kernel.router.published()[external_ip] || [],
-          ...item
+    this.app.get("/network", ex(async (req, res) => {
+      let list = []
+      let peers_info = await this.kernel.peer.refresh()
+      console.log({ peers_info })
+      let info = this.kernel.router.info()
+      console.log("33 info", info)
+      let remote_peers = Object.keys(this.kernel.peer.info).filter(x => x !== this.kernel.peer.host)
+      let nodes = [this.kernel.peer.host].concat(remote_peers)
+      for(let host of nodes) {
+        let processes = []
+        try {
+          let procs = this.kernel.peer.info[host].proc
+          let router = this.kernel.peer.info[host].router
+          let port_mapping = this.kernel.peer.info[host].port_mapping
+          console.log("&&", { procs })
+          for(let proc of procs) {
+            let internal_port = proc.ip.split(":")[1]
+            let external_port = port_mapping[internal_port]
+            if (external_port) {
+              let external_ip = `${host}:${external_port}`
+              console.log({ internal_port, external_port, external_ip })
+              processes.push({
+                //proxy: this.kernel.caddy.mapping[item.ip] || [],
+                router: router[external_ip] || [],
+                external_ip,
+                ...proc
+              })
+            } else {
+              processes.push({
+                router: [],
+                ...proc
+              })
+            }
+          }
+        } catch (e) {
+          console.log(">>e", e)
         }
-      })
+        list.push({
+          host,
+          name: this.kernel.peer.info[host].name,
+          platform: this.kernel.peer.info[host].platform,
+          processes
+        })
+      }
+        
+//      if (this.kernel.processes.info) {
+//        console.log("proc info", this.kernel.processes.info)
+//        list = this.kernel.processes.info.map((item) => {
+//          console.log("item", item)
+//          console.log("item.ip", item.ip)
+//          let internal_port = item.ip.split(":")[1]
+//          let external_port = this.kernel.router.port_mapping[internal_port]
+//          if (external_port) {
+//            let external_ip = `${this.kernel.peer.host}:${external_port}`
+//            console.log({ internal_port, external_port, external_ip })
+//            return {
+//              //proxy: this.kernel.caddy.mapping[item.ip] || [],
+//              router: info[this.kernel.peer.host][external_ip] || [],
+//              external_ip,
+//              ...item
+//            }
+//          } else {
+//            return {
+//              router: [],
+//              ...item
+//            }
+//          }
+//        })
+//      }
 
-      let peers_info = await this.kernel.peer.refresh()
       let peers = []
       for(let host in peers_info) {
         let peer_info = peers_info[host]
@@ -2728,12 +2782,13 @@ class Server {
         }
       }
 
-      console.log("LIST", JSON.stringify(list, null, 2))
+      console.log("network", JSON.stringify(list, null, 2))
 
-      res.render("proxy", {
+      res.render("network", {
         ip: this.kernel.peer.current_ip,
         peers,
         list,
+        port_mapping: this.kernel.router.port_mapping,
 //        port_mapping: this.kernel.caddy.port_mapping,
 //        ip_mapping: this.kernel.caddy.ip_mapping,
         lan: this.kernel.router.local_network_mapping,
@@ -3263,14 +3318,22 @@ class Server {
       */
 
     }))
+    this.app.post("/pinokio/peer/refresh", ex(async (req, res) => {
+      // refresh and broadcast
+      await this.kernel.refresh(true)
+      res.json({ success: true })
+    }))
     this.app.get("/pinokio/peer", ex((req, res) => {
+      console.log("/pinokio/peer", { proc: this.kernel.processes.info })
       res.json({
         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,
         //router: this.kernel.router.info(),
+        proc: this.kernel.processes.info,
         router: this.kernel.router.published(),
         memory: this.kernel.memory
       })
@@ -3862,6 +3925,8 @@ class Server {
         this.kernel.shell.reset(() => {
           process.exit()
         })
+      } else {
+        process.exit()
       }
     })
     process.on('SIGTERM', () => {
@@ -3870,6 +3935,8 @@ class Server {
         this.kernel.shell.reset(() => {
           process.exit()
         })
+      } else {
+        process.exit()
       }
     })
 //    process.on('exit', () => {

package/server/views/file_explorer.ejs

@@ -235,7 +235,7 @@ body.dark .browser-options-row {
         </div>
       <% } %>
       <div class='browser-options-row'>
-        <a href="/proxy" class='btn'><div><i class="fa-solid fa-gauge"></i> Configure</div></a>
+        <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>

package/server/views/index.ejs

@@ -228,7 +228,7 @@ body.dark .browser-options-row {
     <!--
     <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
     -->
-    <a href="/proxy" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Wifi Sharing</div></a>
+    <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Wifi Sharing</div></a>
     <a class='btn2' href="https://portal.pinokio.computer/" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
     <% if (agent === "electron") { %>
       <a class='btn2' data-filepath="<%=filepath%>"><div><i class="fa-regular fa-folder-open"></i></div><div>Files</div></a>
@@ -288,7 +288,7 @@ body.dark .browser-options-row {
         </div>
       <% } %>
       <div class='browser-options-row'>
-        <a href="/proxy" class='btn'><div><i class="fa-solid fa-gauge"></i> Configure</div></a>
+        <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>

package/server/views/{proxy.ejs → network.ejs}

@@ -173,7 +173,7 @@ body.dark .browser-options-row {
 }
 .container {
   display: grid;
-  grid-template-columns: repeat(2, 1fr);
+  grid-template-columns: repeat(<%=list.length%>, 1fr);
 }
 .dark .container-row {
   background: rgba(255, 255, 255, 0.04);
@@ -209,7 +209,7 @@ td:first-child, th:first-child {
 }
 .container-row td {
   font-size: 14px;
-  padding: 5px;
+  padding: 2px;
 }
 @media only screen and (max-width: 480px) {
   .btn2 {
@@ -244,6 +244,7 @@ td:first-child, th:first-child {
 <main>
   <div class='header-label'><i class='fa-solid fa-wifi'></i> Networking</div>
   <div class='desc'>Serve Pinokio, installed apps, and even external apps to any device on the same network.</div>
+  <!--
   <div class='header-container'>
     <div class='header-label-sub'><i class="fa-solid fa-podcast"></i> Local Network</div>
     <% peers.forEach((item) => { %>
@@ -252,39 +253,45 @@ td:first-child, th:first-child {
       </a>
     <% }) %>
   </div>
+  -->
   <div class='container'>
-    <div class='container-row'>
-      <div class='header-label-sub'><i class="fa-solid fa-microchip"></i> System</div>
-      <table>
-        <tr>
-          <th>Server</th>
-          <th>https</th>
-          <th>http</th>
-        </tr>
-        <% list.forEach((item) => { %>
-          <tr> 
-            <td class='title'><%=item.name%></td>
-            <td>
-              <% item.router.forEach((domain) => { %>
-                <div>
-                  <a target="_blank" href="https://<%=domain%>">https://<%=domain%></a>
-                </div>
-              <% }) %>
-            </td>
-            <td>
-              <div>
-                <a target="_blank" href="http://localhost:<%=item.port%>">http://localhost:<%=item.port%></a>
-              </div>
-              <% if (lan[ip]) { %>
+    <% list.forEach(({ host, name, platform, processes }) => { %>
+      <div class='container-row'>
+        <!--
+        <div class='header-label-sub'><i class="fa-solid fa-microchip"></i> System</div>
+        -->
+        <div class='header-label-sub'><%=name%> (<%=platform%>, <%=host%>)</div>
+        <table>
+          <tr>
+            <th>Server</th>
+            <th>https</th>
+            <th>http</th>
+          </tr>
+          <% processes.forEach((item) => { %>
+            <tr> 
+              <td class='title'><%=item.name%></td>
+              <td>
+                <% item.router.forEach((domain) => { %>
+                  <div>
+                    <a target="_blank" href="https://<%=domain%>">https://<%=domain%></a>
+                  </div>
+                <% }) %>
+              </td>
+              <td>
                 <div>
-                  <a target="_blank" href="http://<%=ip%>:<%=lan[ip][item.port]%>">http://<%=ip%>:<%=lan[ip][item.port]%></a>
+                  <a target="_blank" href="http://localhost:<%=item.port%>">http://localhost:<%=item.port%></a>
                 </div>
-              <% } %>
-            </td>
-          </tr>
-        <% }) %>
-      </table>
-    </div>
+                <% if (item.external_ip) { %>
+                  <div>
+                    <a target="_blank" href="http://<%=item.external_ip%>">http://<%=item.external_ip%></a>
+                  </div>
+                <% } %>
+              </td>
+            </tr>
+          <% }) %>
+        </table>
+      </div>
+    <% }) %>
     <div class='container-row hidden'>
       <div class='header-label-sub'><i class="fa-solid fa-microchip"></i> System Programs</div>
       <div class='line align-top'>
@@ -333,6 +340,7 @@ td:first-child, th:first-child {
         </div>
       <% }) %>
     </div>
+    <!--
     <div class='container-row'>
       <div class='header-label-sub'><i class="fa-solid fa-dice-d6"></i> Pinokio</div>
       <% apps.forEach((item) => { %>
@@ -358,6 +366,7 @@ td:first-child, th:first-child {
         </a>
       <% }) %>
     </div>
+    -->
   </div>
 </main>
 <script>

package/server/views/prototypes.ejs

@@ -196,7 +196,7 @@ body.dark .browser-options-row {
   <input type='search' class="flexible" placeholder='Filter downloaded apps'>
 </form>
 <div class='nav-btns'>
-  <a href="/proxy" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Wifi Sharing</div></a>
+  <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Wifi Sharing</div></a>
   <a class='btn2' href="https://portal.pinokio.computer/" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Debug</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>