pinokiod 3.8.131 → 3.8.133

package/kernel/bin/index.js

@@ -670,7 +670,9 @@ class Bin {
   async install2(req, ondata) {
     let { requirements, install_required, requirements_pending, error } = await this.check_bin()
     req.params = JSON.stringify(requirements)
+    console.log(">>>>> 1")
     if (this.install_required) {
+      console.log(">>>>> 2")
       let res = await this.install(req, ondata)
       return res
     }

package/kernel/index.js

@@ -280,7 +280,7 @@ class Kernel {
       // 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())
+      console.log("router mapping after step 3", this.router.info)
 
       // 4. refresh peer info to reflect the updated router info
       await this.peer.refresh()
@@ -294,7 +294,7 @@ class Kernel {
       // 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())
+      console.log("router mapping after step 5", this.router.info)
 
       await this.router.update()
 
@@ -520,6 +520,10 @@ class Kernel {
 //      }
     }
   }
+  kill(pid) {
+    console.log("Kill", pid)
+    kill(pid, 'SIGKILL', true)
+  }
   async init(options) {
 
     let home = this.store.get("home")
@@ -666,7 +670,9 @@ class Kernel {
         if (this.homedir) {
           this.shell.init().then(async () => {
             this.bin.check_bin()
+            console.log(">>>> 1")
             if (this.envs) {
+              console.log(">>>> 2")
               this.template.update({
                 env: this.envs,
                 envs: this.envs,
@@ -715,6 +721,7 @@ class Kernel {
                         }
                       }
                     }
+                console.log(">>>>>> d")
                     clearInterval(interval)
                     setTimeout(() => {
                       this.launch_complete = true
@@ -757,6 +764,15 @@ class Kernel {
 
 
         await this.proto.init()
+
+        // refresh every 5 second
+        if (this.refresh_interval) {
+          clearInterval(this.refresh_interval)
+        }
+        this.refresh_interval = setInterval(() => {
+          this.refresh()    
+        }, 5000)
+
       }
 
     } catch (e) {

package/kernel/procs.js

@@ -80,7 +80,6 @@ class Procs {
     });
   }
   async refresh() {
-    console.time("Get list")
     let map = {}
     let list = await new Promise((resolve, reject) => {
       this.getPortPidList((err, portPidList) => {
@@ -98,17 +97,21 @@ class Procs {
           let list = portPidList.map(({ port, pid, ip }) => {
             const fullname = pidToName[pid] || 'Unknown';
             const name = fullname.split(path.sep).pop()
-            map["" + pid] =  fullname
-            return { port, pid , name, fullname, ip }
-          })
-          list = list.filter((item) => {
-            return !["caddy", "caddy.exe"].includes(item.name.toLowerCase()) 
-          })
+            if (["caddy", "caddy.exe"].includes(name)) {
+              return null
+            } else {
+              map["" + pid] =  fullname
+              return { port, pid , name, fullname, ip }
+            }
+          }).filter((x) => { return x })
+//          list = list.filter((item) => {
+//            return !["caddy", "caddy.exe"].includes(item.name.toLowerCase()) 
+//          })
+          console.log("#LIST", { list, size: list.length })
           resolve(list)
         });
       });      
     })
-    console.timeEnd("Get list")
     this.info = list
     this.map = map
   }

package/kernel/router/index.js

@@ -24,6 +24,7 @@ class Router {
     this.default_port = "42000"
     this.default_host = "127.0.0.1"
 
+    this.info = {}
     this.mapping = {}
     this.port_mapping = {}   // 127.0.0.1 => 192.168,..
     this.local_network_mapping = {}
@@ -37,7 +38,7 @@ class Router {
     }
     this._mapping[host][dial].add(match)
   }
-  info() {
+  _info() {
     let mapping = {}
     for(let host in this.mapping) {
       let internal_maps = this.mapping[host]
@@ -53,16 +54,28 @@ class Router {
 
     let host_mapping = mapping[this.kernel.peer.host]
     if (host_mapping) {
-      let json = JSON.stringify(host_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])
+      for(let key in host_mapping) {
+        for(let cache_key in this.port_cache) {
+          if (key.endsWith(cache_key)) {
+            let transformed = key.replace(":" + cache_key, '')
+            let port = this.port_cache[cache_key]
+            host_mapping[transformed + ":" + port] = host_mapping[key]
+            console.log("replacing", transformed + ":" + port, "with", host_mapping[key])
+            delete host_mapping[key]
+          }
+        }
       }
-      console.log("json", json)
-      let m = JSON.parse(json)
-
-      mapping[this.kernel.peer.host] = m
-      console.log("AFTER REPLACING", m)
+      mapping[this.kernel.peer.host] = host_mapping
+//      let json = JSON.stringify(host_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])
+//      }
+//      console.log("json", json)
+//      let m = JSON.parse(json)
+//
+//      mapping[this.kernel.peer.host] = m
+      console.log("AFTER REPLACING", mapping)
     }
 
     return mapping
@@ -91,18 +104,19 @@ class Router {
     }
   */
   published() {
-    let info = this.info()
-    console.log("published info", info)
     let pub = {}
-    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
+    console.log("published info", this.info)
+    if (this.info) {
+      let routes = this.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
+        }
       }
+      console.log({ pub })
     }
-    console.log({ pub })
     return pub
   }
   async fill() {
@@ -113,7 +127,7 @@ class Router {
 
     // iterate through them and see if the port already exists
     let count = matches ? new Set(matches).size : 0
-    console.log("fill matches", { matches, count })
+    //console.log("fill matches", { matches, count })
     /*
     let count = 0
     if (matches) {
@@ -130,14 +144,14 @@ class Router {
     */
 
 
+    console.log("^^^^^^^^", { count , matches })
 
     let new_config
  
     if (count > 0) {
       let ports = await this.kernel.ports(count)
-      console.log("Filling with port cache", { port_cache: this.port_cache, config: this.config })
+      console.log("Filling with port cache", JSON.stringify({ port_cache: this.port_cache, config: this.config }, null, 2))
       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) {
@@ -167,41 +181,55 @@ class Router {
   // set local config
   async local() {
     this._mapping = {}
+    console.log("Processing local")
     this.localhost_home_router.handle()
+    console.log("after 1", this._mapping)
     this.localhost_variable_router.handle(this.kernel.memory.local)
+    console.log("after 2", this._mapping)
     for(let proc of this.kernel.processes.info) {
       this.localhost_port_router.handle(proc)
     }
+    console.log("after 3", this._mapping)
     //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) {
+        console.log("peer.host === kernel.peer.host", peer.host)
         this.peer_home_router.handle(peer)
+        console.log("after 4", this._mapping)
         this.peer_variable_router.handle(peer)
+        console.log("after 5", this._mapping)
         this.peer_port_router.handle(peer)
+        console.log("after 6", this._mapping)
       }
     }
+    console.log("after 7", this._mapping)
     await this.fill()
+    console.log("after 8", this._mapping)
     this.mapping = this._mapping
   }
 
   // set remote config
   async remote() {
+    console.log("Before remote", this.kernel.peer.info)
     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)
       }
     }
+    console.log("After remote", this.kernel.peer.info)
     //await this.fill()
     this.mapping = this._mapping
+    this.info = this._info()
   }
 
   // update caddy config
   async update() {
-    console.log("this.config", this.config)
-    console.log("this.old_config", this.old_config)
+//    console.log("this.config", JSON.stringify(this.config))
+//    console.log("this.old_config", JSON.stringify(this.old_config))
     if (JSON.stringify(this.config) === JSON.stringify(this.old_config)) {
       console.log("config hasn't updated")
     } else {
@@ -211,16 +239,16 @@ class Router {
       }).catch((e) => {
         console.log("EEEEEEEEEEEEE", e.message)
       })
-      console.log("Caddy Response", { response })
+//      console.log("Caddy Response", { response })
       this.old_config = this.config
     }
   }
 
   async refresh() {
-    console.log("router.refresh")
-    console.time("router.refresh")
-    console.log("> procs", this.kernel.processes.info)
-    console.log("> peers", this.kernel.peer.info)
+//    console.log("router.refresh")
+//    console.time("router.refresh")
+//    console.log("> procs", this.kernel.processes.info)
+//    console.log("> peers", this.kernel.peer.info)
     this._mapping = {}
 //    this.port_mapping = {}   // 127.0.0.1 => 192.168,..
 //    this.local_network_mapping = {}

package/kernel/router/peer_port_router.js

@@ -9,35 +9,43 @@ class PeerPortRouter extends Processor {
   }
   handle(peer) {
     console.log("PeerPortRouter", peer)
-    let https_domains_mapping = this.router.info()[peer.host]
+    let https_domains_mapping = this.router.info[peer.host]
+    console.log({ https_domains_mapping })
     for(let dial in https_domains_mapping) {
+      console.log({ dial })
       let parsed_dial = this.parse_ip(dial)
+      console.log("Parsed dial", parsed_dial)
 
+      if (parsed_dial.host !== peer.host) {
+        // ONLY connect for 127.0.0.1 or localhost
+        // DO NOT connect if it's the actual host => because it will keep creating proxies forever recursively. only need to create proxies for localhost
+        let https_domains = https_domains_mapping[dial]
 
-      let https_domains = https_domains_mapping[dial]
-
-      // 1. if https_domains is made up of one item <port>.localhost,
-      // add <port>.<account>.localhost
-      // 2. if https_domains is made up of two items <port>.localhost and <port>.<account>.localhost, don't do anything
-      for(let https_domain of https_domains) {
-        // insert the $account value right before the last part (1234.localhost => 1234.x.localhost)
-        let match
-        if (https_domain.endsWith(`${peer.name}.localhost`)) {
-          match = https_domain
-        } else {
-          let chunks = https_domain.split(".")
-          chunks.splice(chunks.length - 1, 0, peer.name)
-          match = chunks.join(".")
+        // 1. if https_domains is made up of one item <port>.localhost,
+        // add <port>.<account>.localhost
+        // 2. if https_domains is made up of two items <port>.localhost and <port>.<account>.localhost, don't do anything
+        for(let https_domain of https_domains) {
+          // insert the $account value right before the last part (1234.localhost => 1234.x.localhost)
+          let match
+          if (https_domain.endsWith(`${peer.name}.localhost`)) {
+            match = https_domain
+          } else {
+            let chunks = https_domain.split(".")
+            chunks.splice(chunks.length - 1, 0, peer.name)
+            match = chunks.join(".")
+          }
+          this.connector.handle({
+            match,
+            connector: {
+              host: peer.host,
+              port: parsed_dial.port
+            },
+            dial,
+          })
         }
-        this.connector.handle({
-          match,
-          connector: {
-            host: peer.host,
-            port: parsed_dial.port
-          },
-          dial,
-        })
       }
+
+
     }
   }
 }

package/kernel/router/peer_variable_router.js

@@ -20,6 +20,7 @@ class PeerVariableRouter extends Processor {
           console.log({ dial, name, has_port: this.has_port(dial), parsed_dial: this.parse_ip(dial) })
           if (this.has_port(dial)) {
             let parsed_dial = this.parse_ip(dial)
+            console.log("PeerVariable", { parsed_dial })
             if (key === "url") {
               this.connector.handle({
                 match: `${name}.${peer.name}.localhost`.toLowerCase(),

package/kernel/util.js

@@ -317,10 +317,12 @@ function fill_object(obj, pattern, list, cache) {
         if (!(match in map)) {
           if (replaced_map[match]) {
             map[match] = replaced_map[match]
+            console.log("filling with cache", { match, replaced: replaced_map[match] })
           } else {
             if (index >= list.length) throw new Error("Not enough items provided");
             map[match] = list[index++];
             replaced_map[match] = map[match]
+            console.log("filling with new", { match, replaced: replaced_map[match] })
           }
         }
         return map[match];

package/package.json

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

package/server/index.js

@@ -2761,7 +2761,7 @@ class Server {
       }
 
       res.render("network", {
-        ip: this.kernel.peer.current_ip,
+        current_host: this.kernel.peer.host,
         peers,
         list,
         name: this.kernel.peer.name,
@@ -3980,15 +3980,15 @@ class Server {
       //  process.exit()
       //});
     })
-    process.on('exit', () => {
-      console.log("[Exit event]")
-      kill(process.pid, 'SIGKILL', true)
-      //let map = this.kernel.processes.map || {}
-      //kill(process.pid, map, 'SIGKILL', () => {
-      //  console.log("child procs killed for", process.pid)
-      //  process.exit()
-      //});
-    })
+//    process.on('exit', () => {
+//      console.log("[Exit event]")
+//      kill(process.pid, 'SIGKILL', true)
+//      //let map = this.kernel.processes.map || {}
+//      //kill(process.pid, map, 'SIGKILL', () => {
+//      //  console.log("child procs killed for", process.pid)
+//      //  process.exit()
+//      //});
+//    })
 //    process.on('exit', () => {
 //      console.log("exit Event")
 //      if (this.kernel && this.kernel.shell) {

package/server/views/network.ejs

@@ -194,6 +194,11 @@ body.dark .browser-options-row {
   padding: 15px 30px;
   box-sizing: border-box;
 }
+.container-row.current {
+}
+.container-row.current .header-label-sub {
+  color: royalblue;
+}
 .desc {
 /*
   text-align:center;
@@ -393,11 +398,11 @@ input:checked + .slider:before {
   <div class='container'>
     <% let brands = { win32: "windows", darwin: "apple", linux: "Linux" } %>
     <% list.forEach(({ host, name, platform, processes }, index) => { %>
-      <div class='container-row'>
+      <div class='container-row <%=current_host === host ? 'current' : ''%>'>
         <!--
         <div class='header-label-sub'><i class="fa-solid fa-microchip"></i> System</div>
         -->
-        <% if (index === 0) { %>
+        <% if (current_host === host) { %>
           <div class='header-label-sub'>
             <h1><i class="fa-solid fa-podcast"></i> <%=name%></h1>
             <div class='s'><i class="fa-brands fa-<%=brands[platform]%>"></i> <%=platform%> <%=host%> (this machine)</div>