pinokiod 3.8.74 → 3.8.76

package/kernel/bin/caddy.js

@@ -31,7 +31,7 @@ class Caddy {
       let resolved
       await new Promise((resolve, reject) => {
         this.kernel.exec({
-          message: `caddy run --watch --log-file ${this.kernel.path('logs/caddy.log')}`,
+          message: `caddy run --watch`,
           path: this.kernel.homedir,
         }, (e) => {
           console.log("[CADDY] " + e.cleaned)
@@ -324,7 +324,7 @@ class Caddy {
     let resolved
     await new Promise((resolve, reject) => {
       this.kernel.exec({
-        message: `caddy run --watch --log-file ${kernel.path('logs/caddy.log')}`,
+        message: `caddy run --watch`,
         path: this.kernel.homedir,
       }, (e) => {
         resolve()

package/kernel/router/localhost_home_router.js

@@ -54,6 +54,17 @@ class LocalhostHomeRouter {
             }
           }
         }
+      },
+      "logging": {
+        "logs": {
+          "default": {
+            "writer": {
+              "output": "file",
+              "filename": this.router.kernel.path("logs/caddy.log")
+            },
+            "level": "INFO"
+          }
+        }
       }
     }
   }

package/package.json

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

package/server/index.js

@@ -2623,7 +2623,8 @@ class Server {
     }))
     this.app.get("/network", ex(async (req, res) => {
       let list = []
-      let peers_info = await this.kernel.peer.refresh()
+      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)
@@ -2634,8 +2635,8 @@ class Server {
         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
-          console.log("&&", { procs })
           for(let proc of procs) {
             let internal_port = proc.ip.split(":")[1]
             let external_port = port_mapping[internal_port]
@@ -2646,11 +2647,15 @@ class Server {
                 //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
               })
             }
@@ -2658,6 +2663,9 @@ class Server {
         } 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,

package/server/views/network.ejs

@@ -159,12 +159,15 @@ body.dark .browser-options-row {
   text-align: center;
   text-transform: capitalize;
 }
-.header-label-sub {
+.header-label-sub h1 {
   font-size: 25px;
   letter-spacing: -1px;
-  padding: 0 10px 10px;
   font-weight: bold;
 }
+.header-label-sub {
+  font-size: 14px;
+  padding: 0 4px;
+}
 .header-container {
   margin: 10px;
   background: rgba(0, 0, 100, 0.04);
@@ -179,7 +182,6 @@ body.dark .browser-options-row {
   background: rgba(255, 255, 255, 0.04);
 }
 .container-row {
-  margin: 10px;
   background: rgba(0, 0, 100, 0.04);
   padding: 20px;
   box-sizing: border-box;
@@ -190,6 +192,7 @@ body.dark .browser-options-row {
 }
 .container-row table {
   width: 100%;
+  margin-top: 20px;
 }
 table a {
   text-decoration: none;
@@ -201,7 +204,7 @@ td:first-child, th:first-child {
 .container-row th {
   text-align: left;
   font-size: 18px;
-  padding: 5px;
+  padding: 2px;
   text-transform: uppercase;
 }
 .container-row td.title {
@@ -242,7 +245,7 @@ td:first-child, th:first-child {
 </h1>
 </header>
 <main>
-  <div class='header-label'><i class='fa-solid fa-wifi'></i> Networking</div>
+  <div class='header-label'><i class='fa-solid fa-wifi'></i> Network</div>
   <div class='desc'>Serve Pinokio, installed apps, and even external apps to any device on the same network.</div>
   <!--
   <div class='header-container'>
@@ -255,12 +258,22 @@ td:first-child, th:first-child {
   </div>
   -->
   <div class='container'>
-    <% list.forEach(({ host, name, platform, processes }) => { %>
+    <% list.forEach(({ host, name, platform, processes }, index) => { %>
       <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>
+        <% 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>
+        <% } else { %>
+          <div class='header-label-sub'>
+            <h1><i class="fa-solid fa-wifi"></i> <%=name%></h1>
+            <div><%=platform%> <%=host%> (remote)</div>
+          </div>
+        <% } %>
         <table>
           <tr>
             <th>Server</th>