pinokiod 3.3.31 → 3.3.33

package/kernel/util.js

@@ -33,20 +33,27 @@ const du = async (folderpath) => {
   return totalSize;
 }
 
-const is_port_running = async (port) => {
+const is_port_available = async (port) => {
   return new Promise((resolve) => {
     const server = http.createServer();
     console.log("> Checking port availability", port)
-    server.listen(port, (err) => {
-      if (err) {
-        console.log(">", err)
-        resolve(true); // Port is occupied
-      } else {
-        server.close(); // Close the server immediately after testing
-        console.log("> test server started")
-        resolve(false); // Port is free
-      }
-    });
+    try {
+      server.listen(port, (err) => {
+        if (err) {
+          console.log("> [1 port not available]", err)
+          resolve(false); // Port is occupied
+        } else {
+          console.log("> [2 port available] test server started. closing test server now.")
+          server.close(() => {
+            console.log("> Test server closed.")
+            resolve(true); // Port is free
+          }); // Close the server immediately after testing
+        }
+      });
+    } catch (e) {
+      console.log("> [3 port not available]", err)
+      resolve(false) // port not available
+    }
   });
 };
 
@@ -225,5 +232,5 @@ const update_env = async (filepath, changes) => {
   await fs.promises.writeFile(filepath, newval)
 };
 module.exports = {
-  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_running
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available
 }

package/package.json

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

package/server/index.js

@@ -2087,11 +2087,12 @@ class Server {
       } else {
         const primary_port = 80
         const secondary_port = 42000
-        const running = await Util.is_port_running(primary_port)
+        const available = await Util.is_port_available(primary_port)
+        //const running = await Util.is_port_running(primary_port)
 //        const running1 = await Util.port_running("localhost", primary_port)
 //        const running2 = await Util.port_running("127.0.0.1", primary_port)
 //        const running = running1 || running2
-        const available = !running
+//        const available = !running
         //const available = await portfinder.isAvailablePromise({ host: "0.0.0.0", port: primary_port })
         console.log("check available", { primary_port, available })
         if (available) {