pinokiod 3.15.21 → 3.15.23

package/kernel/index.js

@@ -812,7 +812,7 @@ class Kernel {
         if (network_active) {
           this.refresh_interval = setInterval(() => {
             if (this.server_running) {
-              this.refresh()    
+              this.refresh(true)    
             } else {
               console.log("server not running yet. retry network refresh in 5 secs")
             }

package/kernel/procs.js

@@ -15,10 +15,12 @@ class Procs {
   }
   async isHttp(localAddress) {
     if (this.cache.hasOwnProperty(localAddress)) {
+      console.log("Use cached", localAddress)
       return this.cache[localAddress]
     }
+    console.log("Not cached", localAddress)
     try {
-      await axios.head(`http://${localAddress}`, { timeout: 1000 });
+      await axios.head(`http://${localAddress}`, { timeout: 3000 });
       this.cache[localAddress] = true
       return true;
     } catch (err) {
@@ -46,7 +48,7 @@ class Procs {
     let pids = new Set()
     let s = stdout.trim()
     const lines = s.split('\n');
-    console.time("###### Line parsing")
+//    console.time("###### Line parsing")
     for(let line of lines) {
       if (isWin) {
         // Skip headers
@@ -119,15 +121,14 @@ class Procs {
         }
       }
     }
-    console.timeEnd("###### Line parsing")
-    console.time("########## http_check")
+//    console.timeEnd("###### Line parsing")
+//    console.time("########## http_check")
     const http_check = await Promise.all(results.map(({ ip }) => {
       return limit(() => {
         return this.isHttp(ip) 
       })
     }))
-    console.timeEnd("########## http_check")
-    console.log({ http_check })
+//    console.timeEnd("########## http_check")
     let filtered = []
     for(let i=0; i<http_check.length; i++) {
       if (http_check[i]) {
@@ -240,7 +241,12 @@ class Procs {
 //            console.log("GET MAP")
             this.pid_running = false
             let map = this.get_name(e.state)
-            this.port_map = map
+            if (!this.port_map) {
+              this.port_map = {}
+            }
+            for(let key in map) {
+              this.port_map[key] = map[key]
+            }
             this.pid_cb(map)
           }
         }
@@ -251,26 +257,25 @@ class Procs {
     }
   }
   async refresh() {
-    console.log("Procs.refresh")
     let map = {}
     this.refreshing = true
     let ts = Date.now()
     let list = await new Promise((resolve, reject) => {
-      console.time(">>>>>>>>GET PORTS " + ts)
-      console.log("get ports")
+//      console.time(">>>>>>>>GET PORTS " + ts)
+//      console.log("get ports")
       this.getPortPidList((portPidList) => {
-        console.log("done: get ports")
-        console.log({ portPidList })
-        console.timeEnd(">>>>>>>>GET PORTS " + ts)
-        console.time(">>>>>>> GET PIDS " + ts)
+//        console.log("done: get ports")
+//        console.log({ portPidList })
+//        console.timeEnd(">>>>>>>>GET PORTS " + ts)
+//        console.time(">>>>>>> GET PIDS " + ts)
         // if there's any new port, run getPidToNameMap
 
 
-        console.log("getPid")
+//        console.log("getPid")
         this.getPidToNameMap(portPidList, (pidToName) => {
-          console.log("done getPid")
+//          console.log("done getPid")
           
-          console.timeEnd(">>>>>>> GET PIDS " + ts)
+//          console.timeEnd(">>>>>>> GET PIDS " + ts)
           let list = portPidList.map(({ port, pid, ip }) => {
             const fullname = pidToName[pid] || 'Unknown';
             const name = fullname.split(path.sep).pop()

package/kernel/router/index.js

@@ -208,9 +208,9 @@ class Router {
   // update caddy config
   async update() {
     if (JSON.stringify(this.config) === JSON.stringify(this.old_config)) {
-//      console.log("config hasn't updated")
+      console.log("######### config hasn't updated")
     } else {
-//      console.log("caddy config has updated", this.config)
+      console.log("######### caddy config has updated. refresh", this.config)
       try {
         let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
           headers: { 'Content-Type': 'application/json' }

package/package.json

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