nuxt-gin-tools 0.2.2 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-gin-tools",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "This project is used as a dependency for [nuxt-gin-starter](https://github.com/RapboyGao/nuxt-gin-starter.git)",
   "bin": {
     "nuxt-gin": "index.js"

package/src/dev-go.js

@@ -14,12 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startGoDev = startGoDev;
 const child_process_1 = require("child_process");
-const child_process_2 = require("child_process");
 const chokidar_1 = __importDefault(require("chokidar"));
 const chalk_1 = __importDefault(require("chalk"));
 const fs_extra_1 = require("fs-extra");
-const os_1 = __importDefault(require("os"));
 const path_1 = require("path");
+const utils_1 = require("./utils");
 const cwd = process.cwd();
 const RESTART_DEBOUNCE_MS = 150;
 const SHUTDOWN_TIMEOUT_MS = 2000;
@@ -41,90 +40,11 @@ function getGinPort() {
     }
     return null;
 }
-function killPortUnix(port) {
-    try {
-        const output = (0, child_process_2.execSync)(`lsof -ti tcp:${port}`, {
-            stdio: ["ignore", "pipe", "ignore"],
-        })
-            .toString()
-            .trim();
-        if (!output) {
-            return;
-        }
-        const pids = output
-            .split("\n")
-            .map((pid) => Number(pid.trim()))
-            .filter((pid) => Number.isInteger(pid) && pid > 0);
-        for (const pid of pids) {
-            try {
-                process.kill(pid, "SIGKILL");
-                console.log(chalk_1.default.yellow(`[${LOG_TAG}] killed process ${pid} on ginPort ${port} (unix)`));
-            }
-            catch (_a) {
-                // best effort
-            }
-        }
-    }
-    catch (_b) {
-        // best effort
-    }
-}
-function killPortWindows(port) {
-    try {
-        const output = (0, child_process_2.execSync)(`netstat -ano -p tcp`, {
-            stdio: ["ignore", "pipe", "ignore"],
-        })
-            .toString()
-            .trim();
-        if (!output) {
-            return;
-        }
-        const pids = new Set();
-        for (const line of output.split("\n")) {
-            const trimmed = line.trim();
-            if (!trimmed || !trimmed.startsWith("TCP")) {
-                continue;
-            }
-            const parts = trimmed.split(/\s+/);
-            if (parts.length < 5) {
-                continue;
-            }
-            const localAddress = parts[1];
-            const pid = Number(parts[parts.length - 1]);
-            const match = localAddress.match(/:(\d+)$/);
-            if (!match) {
-                continue;
-            }
-            const localPort = Number(match[1]);
-            if (localPort === port && Number.isInteger(pid) && pid > 0) {
-                pids.add(pid);
-            }
-        }
-        for (const pid of pids) {
-            try {
-                (0, child_process_2.execSync)(`taskkill /PID ${pid} /F`, {
-                    stdio: ["ignore", "ignore", "ignore"],
-                });
-                console.log(chalk_1.default.yellow(`[${LOG_TAG}] killed process ${pid} on ginPort ${port} (win32)`));
-            }
-            catch (_a) {
-                // best effort
-            }
-        }
-    }
-    catch (_b) {
-        // best effort
-    }
-}
 function killGinPortIfNeeded() {
     if (!ginPort) {
         return;
     }
-    if (os_1.default.platform() === "win32") {
-        killPortWindows(ginPort);
-        return;
-    }
-    killPortUnix(ginPort);
+    (0, utils_1.killPort)(ginPort, { logPrefix: LOG_TAG, portLabel: "ginPort" });
 }
 function normalizePath(filePath) {
     return filePath.replace(/\\/g, "/").replace(/^\.\//, "");

package/src/develop.js

@@ -15,109 +15,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.develop = develop;
 const concurrently_1 = __importDefault(require("concurrently"));
 const fs_extra_1 = require("fs-extra");
-const os_1 = __importDefault(require("os"));
 const path_1 = require("path");
-const child_process_1 = require("child_process");
-const chalk_1 = __importDefault(require("chalk"));
 const cleanup_1 = __importDefault(require("./cleanup"));
 const postinstall_1 = __importDefault(require("./postinstall"));
 const dev_go_1 = require("./dev-go");
+const utils_1 = require("./utils");
 const cwd = process.cwd();
 const serverConfig = (0, fs_extra_1.readJSONSync)((0, path_1.join)(cwd, "server.config.json"));
-function killPort(port) {
-    if (!Number.isInteger(port)) {
-        return;
-    }
-    try {
-        const output = (0, child_process_1.execSync)(`lsof -ti tcp:${port}`, {
-            stdio: ["ignore", "pipe", "ignore"],
-        })
-            .toString()
-            .trim();
-        if (!output) {
-            return;
-        }
-        const pids = output
-            .split("\n")
-            .map((pid) => Number(pid.trim()))
-            .filter((pid) => Number.isInteger(pid) && pid > 0);
-        for (const pid of pids) {
-            try {
-                process.kill(pid, "SIGKILL");
-                console.log(chalk_1.default.yellow(`Killed process ${pid} on port ${port} (unix)`));
-            }
-            catch (_a) {
-                // Best-effort: if the process is already gone, ignore.
-            }
-        }
-    }
-    catch (_b) {
-        // Best-effort: lsof might be missing or no process is listening on the port.
-    }
-}
-function killPortWindows(port) {
-    if (!Number.isInteger(port)) {
-        return;
-    }
-    try {
-        const output = (0, child_process_1.execSync)(`netstat -ano -p tcp`, {
-            stdio: ["ignore", "pipe", "ignore"],
-        })
-            .toString()
-            .trim();
-        if (!output) {
-            return;
-        }
-        const pids = new Set();
-        for (const line of output.split("\n")) {
-            const trimmed = line.trim();
-            if (!trimmed || !trimmed.startsWith("TCP")) {
-                continue;
-            }
-            const parts = trimmed.split(/\s+/);
-            if (parts.length < 5) {
-                continue;
-            }
-            const localAddress = parts[1];
-            const pid = Number(parts[parts.length - 1]);
-            const match = localAddress.match(/:(\d+)$/);
-            if (!match) {
-                continue;
-            }
-            const localPort = Number(match[1]);
-            if (localPort === port && Number.isInteger(pid) && pid > 0) {
-                pids.add(pid);
-            }
-        }
-        for (const pid of pids) {
-            try {
-                (0, child_process_1.execSync)(`taskkill /PID ${pid} /F`, {
-                    stdio: ["ignore", "ignore", "ignore"],
-                });
-                console.log(chalk_1.default.yellow(`Killed process ${pid} on port ${port} (win32)`));
-            }
-            catch (_a) {
-                // Best-effort: if the process is already gone, ignore.
-            }
-        }
-    }
-    catch (_b) {
-        // Best-effort: netstat might be missing or no process is listening on the port.
-    }
-}
-function killPortsFromConfig() {
-    const ports = [serverConfig.ginPort, serverConfig.nuxtPort]
-        .filter((port) => Number.isInteger(port) && port > 0)
-        .filter((port, index, list) => list.indexOf(port) === index);
-    for (const port of ports) {
-        if (os_1.default.platform() === "win32") {
-            killPortWindows(port);
-        }
-        else {
-            killPort(port);
-        }
-    }
-}
 /**
  * 启动本地开发环境。
  *
@@ -143,7 +47,7 @@ function develop() {
         }
         // 在开发前确保占用端口被释放
         if (killPortBeforeDevelop) {
-            killPortsFromConfig();
+            (0, utils_1.killPorts)([serverConfig.ginPort, serverConfig.nuxtPort]);
         }
         (0, fs_extra_1.ensureDirSync)((0, path_1.join)(cwd, ".build/.server"));
         // Nuxt 保持在 concurrently 中运行，统一复用 nuxt 标签输出。

package/src/utils.d.ts

@@ -0,0 +1,7 @@
+type KillPortOptions = {
+    logPrefix?: string;
+    portLabel?: string;
+};
+export declare function killPort(port: number, options?: KillPortOptions): void;
+export declare function killPorts(ports: Array<number | undefined>, options?: KillPortOptions): void;
+export {};

package/src/utils.js

@@ -0,0 +1,112 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.killPort = killPort;
+exports.killPorts = killPorts;
+const child_process_1 = require("child_process");
+const chalk_1 = __importDefault(require("chalk"));
+const os_1 = __importDefault(require("os"));
+function isValidPort(port) {
+    return Number.isInteger(port) && port > 0;
+}
+function buildMessage(pid, port, platform, options) {
+    var _a;
+    const prefix = (options === null || options === void 0 ? void 0 : options.logPrefix) ? `[${options.logPrefix}] ` : "";
+    const label = (_a = options === null || options === void 0 ? void 0 : options.portLabel) !== null && _a !== void 0 ? _a : "port";
+    return `${prefix}killed process ${pid} on ${label} ${port} (${platform})`;
+}
+function killPortUnix(port, options) {
+    try {
+        const output = (0, child_process_1.execSync)(`lsof -ti tcp:${port}`, {
+            stdio: ["ignore", "pipe", "ignore"],
+        })
+            .toString()
+            .trim();
+        if (!output) {
+            return;
+        }
+        const pids = output
+            .split("\n")
+            .map((pid) => Number(pid.trim()))
+            .filter((pid) => Number.isInteger(pid) && pid > 0);
+        for (const pid of pids) {
+            try {
+                process.kill(pid, "SIGKILL");
+                console.log(chalk_1.default.yellow(buildMessage(pid, port, "unix", options)));
+            }
+            catch (_a) {
+                // Best-effort: if the process is already gone, ignore.
+            }
+        }
+    }
+    catch (_b) {
+        // Best-effort: lsof might be missing or no process is listening on the port.
+    }
+}
+function killPortWindows(port, options) {
+    try {
+        const output = (0, child_process_1.execSync)(`netstat -ano -p tcp`, {
+            stdio: ["ignore", "pipe", "ignore"],
+        })
+            .toString()
+            .trim();
+        if (!output) {
+            return;
+        }
+        const pids = new Set();
+        for (const line of output.split("\n")) {
+            const trimmed = line.trim();
+            if (!trimmed || !trimmed.startsWith("TCP")) {
+                continue;
+            }
+            const parts = trimmed.split(/\s+/);
+            if (parts.length < 5) {
+                continue;
+            }
+            const localAddress = parts[1];
+            const pid = Number(parts[parts.length - 1]);
+            const match = localAddress.match(/:(\d+)$/);
+            if (!match) {
+                continue;
+            }
+            const localPort = Number(match[1]);
+            if (localPort === port && Number.isInteger(pid) && pid > 0) {
+                pids.add(pid);
+            }
+        }
+        for (const pid of pids) {
+            try {
+                (0, child_process_1.execSync)(`taskkill /PID ${pid} /F`, {
+                    stdio: ["ignore", "ignore", "ignore"],
+                });
+                console.log(chalk_1.default.yellow(buildMessage(pid, port, "win32", options)));
+            }
+            catch (_a) {
+                // Best-effort: if the process is already gone, ignore.
+            }
+        }
+    }
+    catch (_b) {
+        // Best-effort: netstat might be missing or no process is listening on the port.
+    }
+}
+function killPort(port, options) {
+    if (!isValidPort(port)) {
+        return;
+    }
+    if (os_1.default.platform() === "win32") {
+        killPortWindows(port, options);
+        return;
+    }
+    killPortUnix(port, options);
+}
+function killPorts(ports, options) {
+    const validPorts = ports
+        .filter((port) => typeof port === "number" && isValidPort(port))
+        .filter((port, index, list) => list.indexOf(port) === index);
+    for (const port of validPorts) {
+        killPort(port, options);
+    }
+}