pinokiod 3.8.59 → 3.8.61

package/kernel/router/index.js

@@ -7,6 +7,7 @@ const LocalhostPortRouter = require('./localhost_port_router')
 const PeerHomeRouter = require('./peer_home_router')
 const PeerVariableRouter = require('./peer_variable_router')
 const PeerPortRouter = require('./peer_port_router')
+const PeerPeerRouter = require('./peer_peer_router')
 class Router {
   constructor(kernel) {
     this.kernel = kernel
@@ -16,12 +17,12 @@ class Router {
     this.peer_home_router = new PeerHomeRouter(this)
     this.peer_variable_router = new PeerVariableRouter(this)
     this.peer_port_router = new PeerPortRouter(this)
+    this.peer_peer_router = new PeerPeerRouter(this)
     this.default_prefix = "pinokio"
     this.default_suffix = "localhost"
     this.default_match = this.default_prefix + "." + this.default_suffix
     this.default_port = "42000"
     this.default_host = "127.0.0.1"
-    this.config
   }
   async add({ host, match, dial }) {
     if (!this._mapping[host]) {
@@ -45,6 +46,25 @@ class Router {
     }
     return mapping
   }
+  published() {
+    let info = this.info()
+    let pub = {}
+    for(let host in info) {
+      let routes = info[host]
+      pub[host] = {}
+      for(let dial in routes) {
+        let matches = routes[dial]
+        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 
+      }
+    }
+    return pub
+  }
   async fill() {
     const jsonString = JSON.stringify(this.config)
     // find all PORT_PLACEHOLDER patterns
@@ -52,6 +72,8 @@ class Router {
     console.log("matches", matches)
 
     // iterate through them and see if the port already exists
+    let count = matches ? new Set(matches).size : 0
+    /*
     let count = 0
     if (matches) {
       for(let match of matches) {
@@ -64,6 +86,7 @@ class Router {
         }
       }
     }
+    */
 
     console.log("count", count)
  
@@ -116,15 +139,20 @@ class Router {
     console.log(">3", { peers })
     for(let host in peers) {
       let peer = peers[host]
-      this.peer_home_router.handle(peer)
-      this.peer_variable_router.handle(peer)
-      this.peer_port_router.handle(peer)
+      if (peer.host === this.kernel.peer.host) {
+        this.peer_home_router.handle(peer)
+        this.peer_variable_router.handle(peer)
+        this.peer_port_router.handle(peer)
+      } else {
+        this.peer_peer_router.handle(peer)
+      }
     }
     // replace :PORT_PLACEHOLDER with available ports
+    console.log("CONFIG BEFORE", JSON.stringify(this.config, null, 2))
 
     await this.fill()
 
-    console.log("CONFIG", JSON.stringify(this.config, null, 2))
+    console.log("CONFIG AFTER", JSON.stringify(this.config, null, 2))
 
 
     let response = await axios.post('http://127.0.0.1:2019/load', this.config, {

package/kernel/router/peer_peer_router.js

@@ -0,0 +1,27 @@
+const Common = require('./common')
+class PeerPeerRouter {
+  constructor(router) {
+    this.router = router
+    this.common = new Common(router)
+  }
+  handle(peer) {
+    let routes = peer.router[peer.host]
+    for(let dial in routes) {
+      let matches = routes[dial]
+      let exposed_matches = matches.filter((m) => {
+        return m.endsWith(`${peer.name}.localhost`)
+      })
+      let port = dial.split(":")[1]
+      let exposed_dial = `${peer.host}:${port}` // exposed_dial :- 192.168...
+      for(let match of exposed_matches) {
+        console.log("common.handle", { match, exposed_dial, host: peer.host })
+        this.common.handle({
+          match,
+          dial: exposed_dial,
+          host: peer.host
+        })
+      }
+    }
+  }
+}
+module.exports = PeerPeerRouter

package/kernel/router/peer_variable_router.js

@@ -8,7 +8,7 @@ class PeerVariableRouter extends Processor {
     this.connector = new Connector(router)
   }
   handle(peer) {
-    console.log("PeerVariableRouter", peer)
+    console.log("PeerVariableRouter", JSON.stringify(peer, null, 2))
     for(let script_path in peer.memory.local) {
       let local_variables = peer.memory.local[script_path]
       for(let key in local_variables) {

package/package.json

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

package/server/index.js

@@ -3264,7 +3264,8 @@ class Server {
         platform: this.kernel.platform,
         name: this.kernel.peer.name,
         host: this.kernel.peer.host,
-        router: this.kernel.router.info(),
+        //router: this.kernel.router.info(),
+        router: this.kernel.router.published(),
         memory: this.kernel.memory
       })
     }))