@bonsae/nrg 0.11.0 → 0.12.0

package/types/server.d.ts

@@ -2158,7 +2158,9 @@ export declare abstract class IONode<TConfig = any, TCredentials = any, TInput =
 	constructor(RED: RED, node: any, config: IONodeConfig<TConfig>, credentials: IONodeCredentials<TCredentials>);
 	abstract input(msg: TInput): void | Promise<void>;
 	send(msg: TOutput): void;
+	private _nodeSource;
 	status(status: IONodeStatus): void;
+	error(message: string, msg?: any): void;
 	updateWires(wires: string[][]): void;
 	receive(msg: TInput): void;
 	get x(): number;

package/vite/index.js

@@ -383,7 +383,24 @@ module.exports = settings;
     this.logger.raw(line);
   }
   async start() {
-    this.port = await getPort({ port: this.preferredPort });
+    const available = await detect(this.preferredPort);
+    if (available === this.preferredPort) {
+      this.port = this.preferredPort;
+    } else {
+      this.logger.warn(
+        `Port ${this.preferredPort} is still in use, waiting...`
+      );
+      await new Promise((resolve) => setTimeout(resolve, 2e3));
+      const retryAvailable = await detect(this.preferredPort);
+      if (retryAvailable === this.preferredPort) {
+        this.port = this.preferredPort;
+      } else {
+        this.logger.warn(
+          `Port ${this.preferredPort} still occupied, using port ${retryAvailable}`
+        );
+        this.port = await getPort({ port: this.preferredPort });
+      }
+    }
     const startProcess = () => {
       return new Promise(async (resolve, reject) => {
         try {
@@ -498,11 +515,17 @@ module.exports = settings;
         }
       };
       try {
-        await retry(checkPortUsage, { attempts: 5, delay: 100 });
+        await retry(checkPortUsage, { attempts: 10, delay: 300 });
       } catch {
         this.logger.warn(
-          `Port ${currentPort} may still be in use. If restart fails, try again in a few seconds.`
+          `Port ${currentPort} still in use after stop. Force killing...`
         );
+        if (pid) {
+          await new Promise((resolve) => {
+            treeKill2(pid, "SIGKILL", () => resolve());
+          });
+          await new Promise((resolve) => setTimeout(resolve, 1e3));
+        }
       }
     }
     this.port = null;
@@ -2270,10 +2293,14 @@ function serverPlugin(options) {
               changeOrigin: true,
               ws: true,
               configure: (proxy) => {
-                proxy.on("error", () => {
+                proxy.on("error", (_err, _req, res) => {
                   if (nodeRedPort) {
                     proxy.options.target = `http://127.0.0.1:${nodeRedPort}`;
                   }
+                  if (res && !res.headersSent && "writeHead" in res) {
+                    res.writeHead(502);
+                    res.end();
+                  }
                 });
               }
             }
@@ -2288,7 +2315,11 @@ function serverPlugin(options) {
           info: () => {
           },
           warn: console.warn,
-          error: console.error,
+          error: (...args) => {
+            const msg = args.map(String).join(" ");
+            if (isStarting && msg.includes("ECONNREFUSED")) return;
+            console.error(...args);
+          },
           warnOnce: () => {
           },
           hasWarned: false,