asaihost-nodejs 0.0.2 → 0.0.3

package/dist/asaihost-nodejs.es.js

@@ -1847,12 +1847,6 @@ __name(setupHttpConnectionMonitor, "setupHttpConnectionMonitor");
 import { execSync } from "child_process";
 import process2 from "process";
 var OWN_PID = process2.pid;
-function sleepMs(ms) {
-  const deadline = Date.now() + ms;
-  while (Date.now() < deadline) {
-  }
-}
-__name(sleepMs, "sleepMs");
 function findListeningPids(port) {
   if (!Number.isInteger(port) || port < 1 || port > 65535) return [];
   try {
@@ -1888,32 +1882,20 @@ function findListeningPids(port) {
   }
 }
 __name(findListeningPids, "findListeningPids");
-function killPid(pid) {
-  if (!pid || pid === OWN_PID || pid <= 4) return false;
-  try {
-    if (process2.platform === "win32") {
-      execSync(`taskkill /PID ${pid} /F`, { stdio: "ignore" });
-    } else {
-      execSync(`kill -9 ${pid}`, { stdio: "ignore" });
-    }
-    return true;
-  } catch {
-    return false;
-  }
+function formatOccupants(port, exclude) {
+  const occupants = findListeningPids(port).filter((p) => p !== exclude && p !== OWN_PID);
+  return [...new Set(occupants)].join(", ");
 }
-__name(killPid, "killPid");
+__name(formatOccupants, "formatOccupants");
 function releasePort(port, opts) {
   const exclude = opts?.excludePid ?? OWN_PID;
-  const occupants = findListeningPids(port).filter((p) => p !== exclude && p !== OWN_PID);
-  if (!occupants.length) return true;
+  const occupants = formatOccupants(port, exclude);
+  if (!occupants) return true;
   const label = opts?.label ? `[${opts.label}] ` : "";
-  console.warn(`[AsaiHostNodejs] ${label}\u7AEF\u53E3 ${port} \u88AB\u5360\u7528\uFF0C\u6B63\u5728\u7ED3\u675F\u8FDB\u7A0B: ${occupants.join(", ")}`);
-  for (const pid of occupants) {
-    killPid(pid);
-  }
-  sleepMs(500);
-  const remaining = findListeningPids(port).filter((p) => p !== exclude && p !== OWN_PID);
-  return remaining.length === 0;
+  console.warn(
+    `[AsaiHostNodejs] ${label}\u7AEF\u53E3 ${port} \u88AB\u5360\u7528\uFF08PID: ${occupants}\uFF09\uFF0C\u8BF7\u624B\u52A8\u7ED3\u675F\u5360\u7528\u8FDB\u7A0B\u540E\u91CD\u8BD5`
+  );
+  return false;
 }
 __name(releasePort, "releasePort");
 function collectStartupPorts($asai) {
@@ -2066,7 +2048,6 @@ function startHTTPServer($asai, hostdir) {
 ${err.stack}` : err);
         }
       });
-      releasePort(hostcfg.port, { excludePid: process.pid, label: hostdir });
       if ($asai.hostconfig.ip === "asai" || !hostcfg.ip && !$asai.hostconfig.ip) {
         server.listen(hostcfg.port, () => {
           console.log(`[${hostdir}] Start At ${getNowTime()}.`);
@@ -2122,15 +2103,9 @@ function asaiGuard($asai, failedHostdir = "asai") {
     );
     return;
   }
-  const released = releasePort(port, { excludePid: process.pid, label: failedHostdir });
+  releasePort(port, { excludePid: process.pid, label: failedHostdir });
   $asai.hostconfig.asaiport = conflictPorts.filter((p) => p !== port);
-  if (released) {
-    console.warn(`[AsaiHostNodejs] \u7AEF\u53E3 ${port} \u5DF2\u91CA\u653E\uFF0C\u6B63\u5728\u91CD\u65B0\u542F\u52A8 [${failedHostdir}]`);
-    scheduleHttpRetry($asai, failedHostdir);
-    return;
-  }
-  console.error(`[AsaiHostNodejs] \u7AEF\u53E3 ${port} \u65E0\u6CD5\u91CA\u653E\uFF0C\u542F\u52A8\u5931\u8D25\uFF08netstat -ano | findstr :${port}\uFF09`);
-  process.exit(1);
+  scheduleHttpRetry($asai, failedHostdir);
 }
 __name(asaiGuard, "asaiGuard");
 
@@ -2231,21 +2206,17 @@ function startProxyServer($asai, proxyhostdir) {
       if (err.code === "EADDRINUSE") {
         $asai.$log("PROXY", `\x1B[41mPort ${proxycfg.proxyport} is already start!\x1B[0m`);
         delete $asai.serversproxy?.[proxyhostdir];
-        const released = releasePort(proxycfg.proxyport, {
+        releasePort(proxycfg.proxyport, {
           excludePid: process.pid,
           label: proxyhostdir
         });
-        if (released) {
-          console.warn(`[AsaiHostNodejs] \u4EE3\u7406\u7AEF\u53E3 ${proxycfg.proxyport} \u5DF2\u91CA\u653E\uFF0C\u6B63\u5728\u91CD\u65B0\u542F\u52A8 [${proxyhostdir}]`);
-          setTimeout(() => startProxyServer($asai, proxyhostdir), $asai.hostconfig.tm?.d || 2e3);
-        }
+        setTimeout(() => startProxyServer($asai, proxyhostdir), $asai.hostconfig.tm?.d || 2e3);
       } else {
         $asai.$log("PROXY", "Proxy server error:", err);
       }
     });
     if (!$asai.serversproxy) $asai.serversproxy = {};
     $asai.serversproxy[proxyhostdir] = proxyServer;
-    releasePort(proxycfg.proxyport, { excludePid: process.pid, label: proxyhostdir });
     const listenIp = getHostIP(proxycfg.proxyip, $asai);
     const listenCallback = /* @__PURE__ */ __name(() => {
       console.log(`[${proxyhostdir}] Start At ${getNowTime()}.`);
@@ -6600,7 +6571,7 @@ var initAsaiHostNodejs2 = {
   createTransportDataHandler,
   wireTransportConnectionLogs
 };
-var PLUGIN_VERSION = true ? "0.0.2" : "0.0.1";
+var PLUGIN_VERSION = true ? "0.0.3" : "0.0.1";
 var index_default = initAsaiHostNodejs2;
 export {
   Index_default as AsaiCommon,