pinokiod 3.8.62 → 3.8.64

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/connector.js

@@ -3,10 +3,13 @@ class Connector {
     this.router = router
   }
   handle ({ match, connector, dial, }) {
+    console.log("connector.handle", { match, connector, dial })
     let connector_name = connector.host + ":" + connector.port
+    let listener = "0.0.0.0:PORT_PLACEHOLDER_" + connector_name
+    let listener_pointer = connector.host + ":PORT_PLACEHOLDER_" + connector_name
     if(!this.router.config.apps.http.servers[connector_name]) {
       this.router.config.apps.http.servers[connector_name] = {
-        "listen": ["0.0.0.0:PORT_PLACEHOLDER_" + connector_name],
+        "listen": [listener],
         "routes": [{
           "handle": [
             {
@@ -35,7 +38,7 @@ class Connector {
       "handle": [
         {
           "handler": "reverse_proxy",
-          "upstreams": [{ "dial": connector.host + ":PORT_PLACEHOLDER_" + connector_name }]
+          "upstreams": [{ "dial": listener_pointer }]
         },
         {
           "handler": "headers",
@@ -50,7 +53,8 @@ class Connector {
         }
       ]
     })
-    this.router.add({ host: connector.host, dial, match })
+    console.log("Router.add", { host: connector.host, dial: listener_pointer, match })
+    this.router.add({ host: connector.host, dial: listener_pointer, match })
   }
 }
 module.exports = Connector

package/kernel/router/index.js

@@ -32,8 +32,12 @@ class Router {
       this._mapping[host][dial] = new Set()
     }
     this._mapping[host][dial].add(match)
+    console.log(">this._mapping", this._mapping)
   }
   info() {
+    console.log("#### this._mapping", this._mapping)
+
+
     let mapping = {}
     for(let host in this._mapping) {
       let internal_maps = this._mapping[host]
@@ -44,8 +48,31 @@ class Router {
         mapping[host][url] = Array.from(internal_maps[url])
       }
     }
-    return mapping
+
+    console.log("mapping", mapping)
+    let json = JSON.stringify(mapping)
+    for(let key in this.port_cache) {
+      console.log("replacing", key, "with", this.port_cache[key])
+      json = json.replaceAll(key, this.port_cache[key])
+    }
+    let m = JSON.parse(json)
+    console.log({ m })
+    return m
+//    return mapping
   }
+  /*
+    returns only the published peer info
+    {
+      <peer1 host>: {
+        <dial1>: [<match1>, <match2>, ..],
+        <dial2>: [<match1>, <match2>, ..],
+      },
+      <peer2 host>: {
+        <dial1>: [<match1>, <match2>, ..],
+        <dial2>: [<match1>, <match2>, ..],
+      },
+    }
+  */
   published() {
     let info = this.info()
     console.log("published info", info)
@@ -55,14 +82,16 @@ class Router {
       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)) {
-          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 
+          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
         }

package/package.json

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