pinokiod 3.8.99 → 3.8.101

package/kernel/index.js

@@ -266,28 +266,56 @@ class Kernel {
     if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
       active = true
     }
-
-      console.log("kernel.refresh", { active, notify_peers })
+    console.log("kernel.refresh", { active, notify_peers })
     if (active) {
 
+      // 1. get the process list
+      console.log("Step 1: Get process list")
+      await this.processes.refresh()
+      console.log("Process info", this.processes.info)
+
+      // 2. refresh peer info to reflect the proc info
+      await this.peer.refresh()
+
+      // 3. set current local host router info
+      console.log("Step 3: Set current local host router")
+      await this.router.local()
+      console.log("router mapping after step 3", this.router.info())
 
-      await Promise.all([
-        // refresh proc info
-        this.processes.refresh(),
-        // refresh peer info
-        this.peer.refresh()
-      ])
-      console.log("proc info", this.processes.info)
-      console.log("peer info", this.peer.info)
-      // refresh router info
-      await this.router.refresh()
-      console.log("router info", this.router.published())
+      // 4. refresh peer info to reflect the updated router info
       await this.peer.refresh()
 
+      // 4. tell peers to refresh
       if (notify_peers) {
-        // broadcast to peers to refresh
+        console.log("Step 4: notify peers to refresh")
         await this.peer.notify_peers()
       }
+
+      // 4. update remote router
+      console.log("Step 5: Set remote routers")
+      await this.router.remote()
+      console.log("router mapping after step 5", this.router.info())
+
+      await this.router.update()
+
+
+//      await Promise.all([
+//        // refresh proc info
+//        this.processes.refresh(),
+//        // refresh peer info
+//        this.peer.refresh()
+//      ])
+//      console.log("proc info", this.processes.info)
+//      console.log("peer info", this.peer.info)
+//      // refresh router info
+//      await this.router.refresh()
+//      console.log("router info", this.router.published())
+////      await this.peer.refresh()
+//
+//      if (notify_peers) {
+//        // broadcast to peers to refresh
+//        await this.peer.notify_peers()
+//      }
     }
   }
   async clearLog(group) {

package/kernel/procs.js

@@ -17,7 +17,6 @@ class Procs {
       const lines = stdout.trim().split('\n');
 
       lines.forEach(line => {
-        console.log({ line })
         if (isWin) {
           // Skip headers
           if (!line.startsWith('  TCP')) return;
@@ -107,7 +106,6 @@ class Procs {
         });
       });      
     })
-    console.log( { list } )
     console.timeEnd("Get list")
     this.info = list
   }

package/kernel/router/connector.js

@@ -16,12 +16,12 @@ class Connector {
               "handler": "reverse_proxy",
               "upstreams": [{ "dial": dial }],
               "headers": {
-                "request": {
-                  "set": {
-                    "X-Forwarded-Proto": ["https"],
-                    "X-Forwarded-Host": ["{http.request.host}"]
-                  }
-                },
+//                "request": {
+//                  "set": {
+//                    "X-Forwarded-Proto": ["https"],
+//                    "X-Forwarded-Host": ["{http.request.host}"]
+//                  }
+//                },
                 "response": {
                   "set": {
                     "Access-Control-Allow-Origin": ["*"],

package/kernel/router/index.js

@@ -36,12 +36,8 @@ 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]
@@ -53,14 +49,12 @@ class Router {
       }
     }
 
-    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
   }
@@ -89,16 +83,18 @@ class Router {
         pub[dial] = matches
       }
     }
+    console.log({ pub })
     return pub
   }
   async fill() {
     const jsonString = JSON.stringify(this.config)
     // find all PORT_PLACEHOLDER patterns
     const matches = jsonString.match(/:PORT_PLACEHOLDER_[0-9.:]+/g)
-    console.log("matches", matches)
+
 
     // iterate through them and see if the port already exists
     let count = matches ? new Set(matches).size : 0
+    console.log("fill matches", { matches, count })
     /*
     let count = 0
     if (matches) {
@@ -114,15 +110,14 @@ class Router {
     }
     */
 
-    console.log("count", count)
+
 
     let new_config
  
     if (count > 0) {
       let ports = await this.kernel.ports(count)
-      console.log({ count, ports })
-      console.log("PORT_CACHE", this.port_cache)
       let response = Util.fill_object(this.config, /PORT_PLACEHOLDER_.+/, ports, this.port_cache)
+      console.log("fill_object response", response)
       this.config = response.result
       let replaced_map = response.replaced_map
       for(let key in replaced_map) {
@@ -132,7 +127,6 @@ class Router {
         let local_share_ip = chunks[0]
         let original_port = chunks[1]
         let local_share_port = replaced_map[key]
-        console.log({ local_share_ip, local_share_port })
         if (!this.local_network_mapping[local_share_ip]) {
           this.local_network_mapping[local_share_ip] = {}
         }
@@ -141,14 +135,66 @@ class Router {
 
         //let original_port = key.replace("PORT_PLACEHOLDER_", "")
         this.port_mapping[original_port] = replaced_map[key]
+        console.log("set port_mapping", { original_port, key, replaced_map })
       }
       this.port_cache = replaced_map
     }
-    console.log("port_cache", this.port_cache)
-    console.log("port_mapping", this.port_mapping)
 
   }
 
+
+  // set local config
+  async local() {
+    this._mapping = {}
+    this.localhost_home_router.handle()
+    this.localhost_variable_router.handle(this.kernel.memory.local)
+    for(let proc of this.kernel.processes.info) {
+      this.localhost_port_router.handle(proc)
+    }
+    //this.mapping = this._mapping
+
+    for(let host in this.kernel.peer.info) {
+      let peer = this.kernel.peer.info[host]
+      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)
+      }
+    }
+    await this.fill()
+    this.mapping = this._mapping
+  }
+
+  // set remote config
+  async remote() {
+    for(let host in this.kernel.peer.info) {
+      let peer = this.kernel.peer.info[host]
+      if (peer.host !== this.kernel.peer.host) {
+        this.peer_peer_router.handle(peer)
+      }
+    }
+    //await this.fill()
+    this.mapping = this._mapping
+  }
+
+  // update caddy config
+  async update() {
+    console.log("this.config", this.config)
+    console.log("this.old_config", this.old_config)
+    if (JSON.stringify(this.config) === JSON.stringify(this.old_config)) {
+      console.log("config hasn't updated")
+    } else {
+      console.log("config has updated")
+      let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
+        headers: { 'Content-Type': 'application/json' }
+      }).catch((e) => {
+        console.log("EEEEEEEEEEEEE", e.message)
+      })
+      console.log("Caddy Response", { response })
+      this.old_config = this.config
+    }
+  }
+
   async refresh() {
     console.log("router.refresh")
     console.time("router.refresh")

package/kernel/util.js

@@ -307,7 +307,6 @@ const update_env = async (filepath, changes) => {
   await fs.promises.writeFile(filepath, newval)
 };
 function fill_object(obj, pattern, list, cache) {
-  console.log("FILL_OBJECT", { obj, pattern, list, cache })
   const map = {};
   const replaced_map = cache || {}
   let index = 0;

package/package.json

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

package/server/index.js

@@ -1377,7 +1377,6 @@ class Server {
         }
       })
 
-      console.log("ITEMS", items)
 
 //      if (req.query && req.query.mode === "task") {
 //        running = running.filter((x) => {
@@ -2260,6 +2259,7 @@ class Server {
 
 
     await this.kernel.init({ port: this.port})
+    this.kernel.peer.start(this.kernel)
 
 
     if (needInitHome) {
@@ -3882,7 +3882,7 @@ class Server {
         console.log({ peer_info: this.kernel.peer.info })
         console.time("check_peer")
         let ready = true
-        if (this.kernel.peer.info) {
+        if (this.kernel.peer.info && Object.keys(this.kernel.peer.info).length > 0) {
           for(let host in this.kernel.peer.info) {
             let info = this.kernel.peer.info[host]
             if (info.router && Object.keys(info.router).length > 0) {
@@ -3996,7 +3996,7 @@ class Server {
         server: this.listening
       });
     })
-    this.kernel.peer.start(this.kernel)
+//    this.kernel.peer.start(this.kernel)
 
 
   }