pinokiod 3.10.5 → 3.10.7

package/kernel/index.js

@@ -263,7 +263,6 @@ class Kernel {
     this.log_queue.push({ data, group, info })
   }
   async refresh(notify_peers) {
-    console.log("kernel.refresh", { notify_peers })
     let env = await Environment.get(this.homedir)
     let peer_active = false
     // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
@@ -274,13 +273,10 @@ class Kernel {
     if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
       https_active = true
     }
-    console.log({ https_active, peer_active })
 //    console.log("kernel.refresh", { active, notify_peers })
 
     let caddy_installed = await this.bin.check_installed({ name: "caddy" })
 
-    console.log({ caddy_installed, https_active })
-
     // 1. https
     // 2. https + local share
 //    console.log("caddy installed?", caddy_installed)

package/kernel/procs.js

@@ -1,34 +1,42 @@
 const os = require('os')
 const path = require('path')
+const axios = require('axios')
 const { fork, exec } = require('child_process');
 const platform = os.platform();
 class Procs {
   constructor () {
     console.log("Initializing procs")
   }
+  async isHttp(localAddress) {
+    try {
+      await axios.head(`http://${localAddress}`, { timeout: 1000 });
+      return true;
+    } catch (err) {
+      return false;
+    }
+  }
   getPortPidList(callback) {
     const isWin = platform === 'win32';
     const cmd = isWin ? 'netstat -ano -p tcp' : 'lsof -nP -iTCP -sTCP:LISTEN';
-    exec(cmd, (err, stdout) => {
+    exec(cmd, async (err, stdout) => {
       if (err) return callback(err);
 
       const results = [];
       let pids = new Set()
       let s = stdout.trim()
-      console.log(">>>>>>>>>>", s)
       const lines = s.split('\n');
 
-      lines.forEach(line => {
-        console.log({ line, isWin })
+      for(let line of lines) {
         if (isWin) {
           // Skip headers
-          if (!line.startsWith('  TCP')) return;
+          if (!line.startsWith('  TCP')) continue;
           const parts = line.trim().split(/\s+/);
           const [ , localAddress, , state, pid ] = parts;
-          console.log({ parts, localAddress, state, pid })
-          if (state !== 'LISTENING') return;
+
+          //if (state !== 'LISTENING') return;
+          let isHttp = await this.isHttp(localAddress)
+          if (!isHttp) continue
           const chunks = localAddress.split(":")
-          console.log({ chunks })
           const port = chunks.pop()
           let ip = chunks.pop()
           if (!ip || ip === "*") {
@@ -36,17 +44,20 @@ class Procs {
           } else {
             ip = localAddress
           }
-          console.log({ port, ip })
-          if (pids.has(pid+"/"+port)) return;
+          if (pids.has(pid+"/"+port)) continue;
           pids.add(pid+"/"+port)
           results.push({ port, pid, ip });
         } else {
-          if (!/LISTEN/.test(line)) return;
+          //if (!/LISTEN/.test(line)) return;
           const parts = line.trim().split(/\s+/);
           const pid = parts[1];
 
           const match = line.match(/([^\s]+:\d+)\s/);
           const localAddress = match?.[1];
+
+          let isHttp = await this.isHttp(localAddress)
+          if (!isHttp) continue;
+
           const chunks = localAddress.split(":")
           const port = chunks.pop()
           let ip = chunks.pop()
@@ -57,12 +68,11 @@ class Procs {
           }
           //const portMatch = line.match(/:(\d+)\s/);
           //const port = portMatch?.[1];
-          if (pids.has(pid+"/"+port)) return;
+          if (pids.has(pid+"/"+port)) continue;
           pids.add(pid+"/"+port)
           if (pid && port) results.push({ port, pid, ip });
         }
-      });
-
+      }
       callback(null, results);
     });
   }
@@ -89,7 +99,6 @@ class Procs {
     let map = {}
     let list = await new Promise((resolve, reject) => {
       this.getPortPidList((err, portPidList) => {
-        console.log({ portPidList })
         if (err) {
           console.log("getPortPidList Error", err)
           reject(err)
@@ -114,7 +123,6 @@ class Procs {
               return { port, pid , name, fullname, ip }
             }
           }).filter((x) => { return x })
-          console.log({ list })
           resolve(list)
         });
       });      

package/package.json

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