pinokiod 3.8.63 → 3.8.65

package/kernel/index.js

@@ -199,7 +199,7 @@ class Kernel {
     return this.api.running[id]
   }
   start_port () {
-    if (this.router.port_mapping && this.router.port_mapping.length > 0) {
+    if (this.router.port_mapping && Object.keys(this.router.port_mapping).length > 0) {
       let max_caddy_port = Math.max(Object.values(this.router.port_mapping))
       let start_port = Math.max(42003, max_caddy_port + 1)
       console.log({ start_port })

package/kernel/router/index.js

@@ -77,24 +77,12 @@ class Router {
     let info = this.info()
     console.log("published info", info)
     let pub = {}
-    for(let host in info) {
-      let routes = info[host]
-      pub[host] = {}
-      for(let dial in routes) {
-        let matches = routes[dial]
-        // current host => the single source of truth
-        if (dial.startsWith(this.kernel.peer.host)) {
-          pub[host][dial] = matches
-//          let exposed_matches = matches.filter((m) => {
-//            return m.endsWith(`${this.kernel.peer.name}.localhost`)
-//          })
-//          let port = dial.split(":")[1]
-//          let exposed_port = this.port_mapping[`${port}`]
-//          let exposed_dial = `${this.kernel.peer.host}:${exposed_port}` // exposed_dial :- 192.168...
-//          pub[host][exposed_dial] = exposed_matches 
-        } else {
-          pub[host][dial] = matches
-        }
+    let routes = info[this.kernel.peer.host]
+    for(let dial in routes) {
+      let matches = routes[dial]
+      // current host => the single source of truth
+      if (dial.startsWith(this.kernel.peer.host)) {
+        pub[dial] = matches
       }
     }
     return pub

package/package.json

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

package/server/index.js

@@ -2625,9 +2625,13 @@ class Server {
       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.info()[this.kernel.peer.host][item.ip] || [],
+          router: this.kernel.router.published()[external_ip] || [],
           ...item
         }
       })
@@ -2724,6 +2728,8 @@ class Server {
         }
       }
 
+      console.log("LIST", JSON.stringify(list, null, 2))
+
       res.render("proxy", {
         ip: this.kernel.peer.current_ip,
         peers,