pinokiod 3.3.28 → 3.3.30

package/kernel/util.js

@@ -1,4 +1,5 @@
 const fs = require('fs')
+const http = require('http');
 const os = require('os')
 const net = require('node:net')
 const path = require('path')
@@ -31,6 +32,21 @@ const du = async (folderpath) => {
   console.log("totalSize", totalSize)
   return totalSize;
 }
+
+const is_port_running = async (port) => {
+  return new Promise((resolve) => {
+    const server = http.createServer();
+    server.listen(port, (err) => {
+      if (err) {
+        resolve(false); // Port is occupied
+      } else {
+        server.close(); // Close the server immediately after testing
+        resolve(true); // Port is free
+      }
+    });
+  });
+};
+
 const port_running = async (host, port) => {
   const timeout = 1000
   const promise = new Promise((resolve, reject) => {
@@ -206,5 +222,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
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_running
 }

package/package.json

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

package/server/index.js

@@ -2087,9 +2087,10 @@ class Server {
       } else {
         const primary_port = 80
         const secondary_port = 42000
-        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 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 = await portfinder.isAvailablePromise({ host: "0.0.0.0", port: primary_port })
         console.log("check available", { primary_port, available })