poku 1.10.0 → 1.10.1

package/lib/@types/background-process.d.ts

@@ -16,7 +16,7 @@ type BackgroundProcessOptions = {
      */
     startAfter?: string | number;
     /**
-     * Stops the service after:
+     * Stops the service for neither success nor failure after:
      * @default 60000
      */
     timeout?: number;
@@ -43,4 +43,5 @@ export type StartServiceOptions = {
      */
     readonly platform?: Configs['platform'];
 } & BackgroundProcessOptions;
+export type End = (port?: number) => Promise<void>;
 export {};

package/lib/modules/create-service.d.ts

@@ -1,4 +1,4 @@
-import { StartScriptOptions, StartServiceOptions } from '../@types/background-process.js';
+import { End, StartScriptOptions, StartServiceOptions } from '../@types/background-process.js';
 /**
  *
  * Starts a file in a background process
@@ -6,7 +6,7 @@ import { StartScriptOptions, StartServiceOptions } from '../@types/background-pr
  * Useful for servers, APIs, etc.
  */
 export declare const startService: (file: string, options?: StartServiceOptions) => Promise<{
-    end: () => void;
+    end: End;
 }>;
 /**
  *
@@ -18,10 +18,8 @@ export declare const startService: (file: string, options?: StartServiceOptions)
  *
  * ---
  *
- * `startScript` currently doesn't works for **Bun** and **Deno**.
- *
- * - See: https://github.com/wellwelwel/poku/issues/143
+ * For **Bun**, please see https://github.com/oven-sh/bun/issues/11055
  */
 export declare const startScript: (script: string, options?: StartScriptOptions) => Promise<{
-    end: () => void;
+    end: End;
 }>;

package/lib/modules/create-service.js

@@ -18,97 +18,137 @@ const node_child_process_1 = require("child_process");
 const runner_js_1 = require("../helpers/runner.js");
 const node_path_1 = __importDefault(require("path"));
 const list_files_js_1 = require("./list-files.js");
-const node_os_1 = require("os");
-const format_js_1 = require("../helpers/format.js");
+const pid_js_1 = require("../services/pid.js");
+const runningProcesses = new Map();
 /* c8 ignore start */
-const runningProcesses = {};
-const secureEnds = () => Object.values(runningProcesses).forEach((end) => end());
-const killWindowsProcess = (PID) => (0, node_child_process_1.spawn)('taskkill', ['/F', '/T', '/PID', PID.toString()]);
-node_process_1.default.once('SIGINT', () => {
-    secureEnds();
-});
+node_process_1.default.once('SIGINT', () => __awaiter(void 0, void 0, void 0, function* () {
+    for (const { end, port } of runningProcesses.values()) {
+        yield end(port);
+    }
+}));
 /* c8 ignore stop */
 const backgroundProcess = (runtime, args, file, options) => new Promise((resolve, reject) => {
-    let isResolved = false;
-    const service = (0, node_child_process_1.spawn)(runtime, args, {
-        stdio: ['inherit', 'pipe', 'pipe'],
-        /* c8 ignore next */
-        shell: runner_js_1.isWindows,
-        cwd: (options === null || options === void 0 ? void 0 : options.cwd) ? (0, list_files_js_1.sanitizePath)(node_path_1.default.normalize(options.cwd)) : undefined,
-        env: node_process_1.default.env,
-        /* c8 ignore next */
-        detached: !runner_js_1.isWindows,
-        /* c8 ignore next */
-        windowsHide: runner_js_1.isWindows,
-        timeout: options === null || options === void 0 ? void 0 : options.timeout,
-    });
-    const PID = service.pid;
-    /* c8 ignore start */
-    const end = () => {
-        delete runningProcesses[PID];
-        if (runner_js_1.isWindows) {
-            killWindowsProcess(PID);
-            return;
-        }
-        if (['bun', 'deno'].includes(runtime) ||
-            ['bun', 'deno'].includes(String(options === null || options === void 0 ? void 0 : options.runner))) {
-            node_process_1.default.kill(PID);
-            return;
-        }
-        node_process_1.default.kill(-PID, 'SIGKILL');
-        return;
-    };
-    runningProcesses[PID] = end;
-    /* c8 ignore stop */
-    service.stdout.on('data', (data) => {
-        if (!isResolved && typeof (options === null || options === void 0 ? void 0 : options.startAfter) !== 'number') {
-            const stringData = JSON.stringify(String(data));
-            if (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'undefined' ||
-                (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'string' &&
-                    stringData.includes(options === null || options === void 0 ? void 0 : options.startAfter))) {
-                resolve({ end });
-                clearTimeout(timeout);
-                isResolved = true;
+    try {
+        let isResolved = false;
+        const service = (0, node_child_process_1.spawn)(runtime, args, {
+            stdio: ['inherit', 'pipe', 'pipe'],
+            /* c8 ignore next */
+            shell: runner_js_1.isWindows,
+            cwd: (options === null || options === void 0 ? void 0 : options.cwd)
+                ? (0, list_files_js_1.sanitizePath)(node_path_1.default.normalize(options.cwd))
+                : undefined,
+            env: node_process_1.default.env,
+            /* c8 ignore next */
+            detached: !runner_js_1.isWindows,
+            /* c8 ignore next */
+            windowsHide: runner_js_1.isWindows,
+            timeout: options === null || options === void 0 ? void 0 : options.timeout,
+        });
+        const PID = service.pid;
+        let portBackup;
+        /* c8 ignore start */
+        const end = (port) => new Promise((resolve) => {
+            try {
+                runningProcesses.delete(PID);
+                if (runner_js_1.isWindows) {
+                    pid_js_1.killPID.windows(PID);
+                    return;
+                }
+                if (['bun', 'deno'].includes(runtime) ||
+                    ['bun', 'deno'].includes(String(options === null || options === void 0 ? void 0 : options.runner))) {
+                    node_process_1.default.kill(PID);
+                }
+                else
+                    node_process_1.default.kill(-PID, 'SIGKILL');
+                if (port && ['bun', 'deno'].includes(runtime)) {
+                    setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
+                        const PIDs = runner_js_1.isWindows
+                            ? yield pid_js_1.findPID.windows(port)
+                            : yield pid_js_1.findPID.unix(port);
+                        for (const subPID of PIDs) {
+                            if (!subPID)
+                                continue;
+                            runner_js_1.isWindows
+                                ? yield pid_js_1.killPID.windows(subPID)
+                                : yield pid_js_1.killPID.unix(subPID);
+                        }
+                        resolve(undefined);
+                        return;
+                    }));
+                }
+                else {
+                    resolve(undefined);
+                    return;
+                }
             }
-        }
-        (options === null || options === void 0 ? void 0 : options.verbose) && console.log(String(data));
-    });
-    service.stderr.on('data', (data) => {
-        if (!isResolved && typeof (options === null || options === void 0 ? void 0 : options.startAfter) !== 'number') {
-            const stringData = JSON.stringify(String(data));
-            if (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'undefined' ||
-                (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'string' &&
-                    stringData.includes(options === null || options === void 0 ? void 0 : options.startAfter))) {
-                resolve({ end });
-                clearTimeout(timeout);
-                isResolved = true;
+            catch (_a) {
+                {
+                    resolve(undefined);
+                    return;
+                }
             }
-        }
-        (options === null || options === void 0 ? void 0 : options.verbose) && console.log(String(data));
-    });
-    service.on('error', (err) => {
-        secureEnds();
-        reject(`Service failed to start: ${err}`);
-    });
-    service.on('close', (code) => {
-        if (code !== 0)
-            reject(`Service exited with code ${code}`);
-    });
-    const timeout = setTimeout(() => {
-        if (!isResolved) {
-            secureEnds();
-            reject(`createService: Timeout\nFile: ${file}`);
-        }
-    }, (options === null || options === void 0 ? void 0 : options.timeout) || 10000);
-    if (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'number') {
-        setTimeout(() => {
+        });
+        runningProcesses.set(PID, { end, port: portBackup });
+        /* c8 ignore stop */
+        /* c8 ignore start */
+        service.stdout.on('data', (data) => {
+            if (!isResolved && typeof (options === null || options === void 0 ? void 0 : options.startAfter) !== 'number') {
+                const stringData = JSON.stringify(String(data));
+                if (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'undefined' ||
+                    (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'string' &&
+                        stringData.includes(options === null || options === void 0 ? void 0 : options.startAfter))) {
+                    resolve({ end });
+                    clearTimeout(timeout);
+                    isResolved = true;
+                }
+            }
+            (options === null || options === void 0 ? void 0 : options.verbose) && console.log(String(data));
+        });
+        /* c8 ignore stop */
+        /* c8 ignore start */
+        service.stderr.on('data', (data) => {
+            if (!isResolved && typeof (options === null || options === void 0 ? void 0 : options.startAfter) !== 'number') {
+                const stringData = JSON.stringify(String(data));
+                if (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'undefined' ||
+                    (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'string' &&
+                        stringData.includes(options === null || options === void 0 ? void 0 : options.startAfter))) {
+                    resolve({ end });
+                    clearTimeout(timeout);
+                    isResolved = true;
+                }
+            }
+            (options === null || options === void 0 ? void 0 : options.verbose) && console.log(String(data));
+        });
+        /* c8 ignore stop */
+        /* c8 ignore stop */
+        service.on('error', (err) => {
+            end(portBackup);
+            reject(`Service failed to start: ${err}`);
+        });
+        /* c8 ignore stop */
+        /* c8 ignore start */
+        service.on('close', (code) => {
+            if (code !== 0)
+                reject(`Service exited with code ${code}`);
+        });
+        /* c8 ignore stop */
+        const timeout = setTimeout(() => {
             if (!isResolved) {
-                resolve({ end });
-                clearTimeout(timeout);
-                isResolved = true;
+                end(portBackup);
+                reject(`createService: Timeout\nFile: ${file}`);
             }
-        }, options.startAfter);
+        }, (options === null || options === void 0 ? void 0 : options.timeout) || 60000);
+        if (typeof (options === null || options === void 0 ? void 0 : options.startAfter) === 'number') {
+            setTimeout(() => {
+                if (!isResolved) {
+                    resolve({ end });
+                    clearTimeout(timeout);
+                    isResolved = true;
+                }
+            }, options.startAfter);
+        }
     }
+    catch (_a) { }
 });
 /**
  *
@@ -133,19 +173,13 @@ exports.startService = startService;
  *
  * ---
  *
- * `startScript` currently doesn't works for **Bun** and **Deno**.
- *
- * - See: https://github.com/wellwelwel/poku/issues/143
+ * For **Bun**, please see https://github.com/oven-sh/bun/issues/11055
  */
 const startScript = (script, options) => __awaiter(void 0, void 0, void 0, function* () {
     const runner = (options === null || options === void 0 ? void 0 : options.runner) || 'npm';
     const runtimeOptions = (0, runner_js_1.scriptRunner)(runner);
     const runtime = runtimeOptions.shift();
     const runtimeArgs = [...runtimeOptions, script];
-    /* c8 ignore start */
-    if (['bun', 'deno'].includes(runner))
-        throw new Error(`${format_js_1.format.bold('startScript')} currently doesn't works for Bun and Deno.${node_os_1.EOL}See: https://github.com/wellwelwel/poku/issues/143`);
-    /* c8 ignore stop */
-    return yield backgroundProcess(runtime, runtimeArgs, script, Object.assign(Object.assign({}, options), { isScript: true, runner }));
+    return yield backgroundProcess(runtime, runtimeArgs, script, Object.assign(Object.assign({}, options), { runner }));
 });
 exports.startScript = startScript;

package/lib/services/pid.d.ts

@@ -0,0 +1,8 @@
+export declare const killPID: {
+    unix: (PID: number) => Promise<void>;
+    windows: (PID: number) => Promise<void>;
+};
+export declare const findPID: {
+    unix: (port: number) => Promise<number[]>;
+    windows: (port: number) => Promise<number[]>;
+};

package/lib/services/pid.js

@@ -0,0 +1,74 @@
+"use strict";
+/* c8 ignore start */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findPID = exports.killPID = void 0;
+const node_child_process_1 = require("child_process");
+const node_os_1 = require("os");
+exports.killPID = {
+    unix: (PID) => new Promise((resolve) => {
+        try {
+            const service = (0, node_child_process_1.spawn)('kill', ['-9', String(PID)]);
+            service.on('close', () => {
+                resolve(undefined);
+            });
+        }
+        catch (_a) {
+            resolve(undefined);
+        }
+    }),
+    windows: (PID) => new Promise((resolve) => {
+        try {
+            const service = (0, node_child_process_1.spawn)('taskkill', ['/F', '/T', '/PID', String(PID)]);
+            service.on('close', () => {
+                resolve(undefined);
+            });
+        }
+        catch (_a) {
+            resolve(undefined);
+        }
+    }),
+};
+exports.findPID = {
+    unix: (port) => new Promise((resolve) => {
+        try {
+            const PIDs = new Set();
+            const service = (0, node_child_process_1.spawn)('lsof', ['-t', '-i', `:${Number(port)}`]);
+            service.stdout.on('data', (data) => {
+                const output = data.toString().trim().split(node_os_1.EOL);
+                output.forEach((pid) => {
+                    if (pid)
+                        PIDs.add(Number(pid));
+                });
+                service.on('close', () => {
+                    resolve(Array.from(PIDs));
+                });
+            });
+        }
+        catch (_a) { }
+    }),
+    windows: (port) => new Promise((resolve) => {
+        try {
+            const PIDs = new Set();
+            const service = (0, node_child_process_1.spawn)('cmd.exe', [
+                '/c',
+                `netstat -aon | findstr :${Number(port)}`,
+            ]);
+            service.stdout.on('data', (data) => {
+                const output = data.toString().trim();
+                const lines = output.trim().split(node_os_1.EOL);
+                lines.map((line) => {
+                    const tokens = line.trim().split(/\s+/);
+                    PIDs.add(Number(tokens[4]));
+                });
+            });
+            service.on('close', () => {
+                resolve(Array.from(PIDs));
+            });
+            service.stderr.on('data', (data) => {
+                console.error(`Erro: ${data}`);
+            });
+        }
+        catch (_a) { }
+    }),
+};
+/* c8 ignore stop */

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "poku",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "🐷 Poku makes testing easy for Node.js, Bun & Deno at the same time.",
   "main": "./lib/index.js",
   "scripts": {
     "test": "tsx src/bin/index.ts --parallel --debug --include=\"test/unit,test/integration,test/e2e\"",
+    "test:bun": "bun src/bin/index.ts --parallel --platform=bun --debug --include=\"test/unit,test/integration,test/e2e\"",
     "test:c8": "c8 npm run test",
     "test:ci": "tsx ./test/ci.test.ts",
-    "test:node": "FILTER='node-' npm run test:ci",
-    "test:deno": "FILTER='deno-' npm run test:ci",
-    "test:bun": "FILTER='bun-' npm run test:ci",
+    "test:ci:node": "FILTER='node-' npm run test:ci",
+    "test:ci:bun": "FILTER='bun-' npm run test:ci",
+    "test:ci:deno": "FILTER='deno-' npm run test:ci",
     "predocker:deno": "docker compose -f ./test/docker/playground/deno/docker-compose.yml down",
     "docker:deno": "docker compose -f ./test/docker/playground/deno/docker-compose.yml up --build",
     "clear": "shx rm -rf ./lib ./ci ./coverage",