pinokiod 3.8.76 → 3.8.78

package/package.json

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

package/server/index.js

@@ -2623,56 +2623,59 @@ class Server {
     }))
     this.app.get("/network", ex(async (req, res) => {
       let list = []
-      let peers_info = this.kernel.peer.info
 //      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
-          console.log({ router })
-          let port_mapping = this.kernel.peer.info[host].port_mapping
-          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,
-                external_port: parseInt(external_port),
-                internal_port: parseInt(internal_port),
-                ...proc
-              })
-            } else {
-              processes.push({
-                router: [],
-                external_port: parseInt(external_port),
-                internal_port: parseInt(internal_port),
-                ...proc
-              })
+      let peers_info = {}
+      if (this.kernel.peer.info) {
+        peers_info = this.kernel.peer.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
+            console.log({ router })
+            let port_mapping = this.kernel.peer.info[host].port_mapping
+            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,
+                  external_port: parseInt(external_port),
+                  internal_port: parseInt(internal_port),
+                  ...proc
+                })
+              } else {
+                processes.push({
+                  router: [],
+                  external_port: parseInt(external_port),
+                  internal_port: parseInt(internal_port),
+                  ...proc
+                })
+              }
             }
+          } catch (e) {
+            console.log(">>e", e)
           }
-        } catch (e) {
-          console.log(">>e", e)
+          processes.sort((a, b) => {
+            return b.external_port-a.external_port
+          })
+          list.push({
+            host,
+            name: this.kernel.peer.info[host].name,
+            platform: this.kernel.peer.info[host].platform,
+            processes
+          })
         }
-        processes.sort((a, b) => {
-          return b.external_port-a.external_port
-        })
-        list.push({
-          host,
-          name: this.kernel.peer.info[host].name,
-          platform: this.kernel.peer.info[host].platform,
-          processes
-        })
       }
+      console.log({ peers_info })
         
 //      if (this.kernel.processes.info) {
 //        console.log("proc info", this.kernel.processes.info)
@@ -2790,8 +2793,6 @@ class Server {
         }
       }
 
-      console.log("network", JSON.stringify(list, null, 2))
-
       res.render("network", {
         ip: this.kernel.peer.current_ip,
         peers,

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="/network" 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>Network</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>

package/server/views/network.ejs

@@ -165,8 +165,14 @@ body.dark .browser-options-row {
   font-weight: bold;
 }
 .header-label-sub {
+  text-align: center;
   font-size: 14px;
-  padding: 0 4px;
+  padding: 10px;
+  border-bottom: 1px solid rgba(0,0,0,0.1);
+}
+.header-label-sub .s {
+  padding: 10px 0;
+  opacity: 0.7;
 }
 .header-container {
   margin: 10px;
@@ -175,6 +181,7 @@ body.dark .browser-options-row {
   box-sizing: border-box;
 }
 .container {
+  margin-top: 20px;
   display: grid;
   grid-template-columns: repeat(<%=list.length%>, 1fr);
 }
@@ -183,7 +190,7 @@ body.dark .browser-options-row {
 }
 .container-row {
   background: rgba(0, 0, 100, 0.04);
-  padding: 20px;
+  padding: 15px 30px;
   box-sizing: border-box;
 }
 .desc {
@@ -211,6 +218,7 @@ td:first-child, th:first-child {
   overflow-wrap: break-word;
 }
 .container-row td {
+  vertical-align: top;
   font-size: 14px;
   padding: 2px;
 }
@@ -236,6 +244,7 @@ td:first-child, th:first-child {
 <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
   <a class='btn2' href="https://portal.pinokio.computer/" target="_blank"><div><i class="fa-solid fa-face-smile-beam"></i></div><div>Community</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>
@@ -258,6 +267,7 @@ td:first-child, th:first-child {
   </div>
   -->
   <div class='container'>
+    <% let brands = { win32: "windows", darwin: "apple", linux: "Linux" } %>
     <% list.forEach(({ host, name, platform, processes }, index) => { %>
       <div class='container-row'>
         <!--
@@ -266,12 +276,12 @@ td:first-child, th:first-child {
         <% if (index === 0) { %>
           <div class='header-label-sub'>
             <h1><i class="fa-solid fa-podcast"></i> <%=name%></h1>
-            <div><%=platform%> <%=host%> (this machine)</div>
+            <div class='s'><i class="fa-brands fa-<%=brands[platform]%>"></i> <%=platform%> <%=host%> (this machine)</div>
           </div>
         <% } else { %>
           <div class='header-label-sub'>
             <h1><i class="fa-solid fa-wifi"></i> <%=name%></h1>
-            <div><%=platform%> <%=host%> (remote)</div>
+            <div class='s'><i class="fa-brands fa-<%=brands[platform]%>"></i> <%=platform%> <%=host%> (remote)</div>
           </div>
         <% } %>
         <table>

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="/network" 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>Network</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>

package/server/views/settings.ejs

@@ -239,6 +239,7 @@ hr {
 <% }) %>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</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>