pinokiod 3.8.99 → 3.8.100

package/kernel/index.js

@@ -282,7 +282,7 @@ class Kernel {
       // refresh router info
       await this.router.refresh()
       console.log("router info", this.router.published())
-      await this.peer.refresh()
+//      await this.peer.refresh()
 
       if (notify_peers) {
         // broadcast to peers to refresh

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/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,13 +83,13 @@ 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
@@ -114,14 +108,11 @@ 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)
       this.config = response.result
       let replaced_map = response.replaced_map
@@ -132,7 +123,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] = {}
         }
@@ -144,8 +134,6 @@ class Router {
       }
       this.port_cache = replaced_map
     }
-    console.log("port_cache", this.port_cache)
-    console.log("port_mapping", this.port_mapping)
 
   }
 

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.100",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -2260,6 +2260,7 @@ class Server {
 
 
     await this.kernel.init({ port: this.port})
+    this.kernel.peer.start(this.kernel)
 
 
     if (needInitHome) {
@@ -3882,7 +3883,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 +3997,7 @@ class Server {
         server: this.listening
       });
     })
-    this.kernel.peer.start(this.kernel)
+//    this.kernel.peer.start(this.kernel)
 
 
   }