@dainprotocol/cli 1.2.33 → 1.2.34

package/dist/commands/dev.js

@@ -68,6 +68,7 @@ var isFirstStart = true;
 var proxyServer = null;
 var isCleaningUp = false;
 var debounceTimer = null;
+var KILL_TIMEOUT_MS = 5000;
 function isPortAvailable(port) {
     return new Promise(function (resolve) {
         var server = (0, net_1.createServer)()
@@ -75,27 +76,72 @@ function isPortAvailable(port) {
             .on('error', function () { return resolve(false); });
     });
 }
+/**
+ * Kill a child process and wait for it to exit.
+ * Sends SIGTERM first, escalates to SIGKILL after timeout.
+ */
+function killProcess(proc) {
+    return new Promise(function (resolve) {
+        if (!proc.pid || proc.killed) {
+            resolve();
+            return;
+        }
+        var resolved = false;
+        var done = function () {
+            if (resolved)
+                return;
+            resolved = true;
+            clearTimeout(forceKillTimer);
+            resolve();
+        };
+        proc.once('close', done);
+        proc.once('exit', done);
+        proc.kill('SIGTERM');
+        // Escalate to SIGKILL if process doesn't exit within timeout
+        var forceKillTimer = setTimeout(function () {
+            if (!resolved) {
+                try {
+                    proc.kill('SIGKILL');
+                }
+                catch (_a) { }
+                // Resolve after SIGKILL — don't wait forever
+                setTimeout(done, 500);
+            }
+        }, KILL_TIMEOUT_MS);
+    });
+}
 function cleanup() {
-    if (isCleaningUp)
-        return;
-    isCleaningUp = true;
-    if (debounceTimer) {
-        clearTimeout(debounceTimer);
-        debounceTimer = null;
-    }
-    if (childProcess) {
-        childProcess.kill('SIGTERM');
-        childProcess = null;
-    }
-    if (watcher) {
-        watcher.close();
-        watcher = null;
-    }
-    if (mf) {
-        mf.dispose();
-        mf = null;
-    }
-    (0, utils_1.logInfo)('Development server and file watcher stopped.');
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (isCleaningUp)
+                        return [2 /*return*/];
+                    isCleaningUp = true;
+                    if (debounceTimer) {
+                        clearTimeout(debounceTimer);
+                        debounceTimer = null;
+                    }
+                    if (!childProcess) return [3 /*break*/, 2];
+                    return [4 /*yield*/, killProcess(childProcess)];
+                case 1:
+                    _a.sent();
+                    childProcess = null;
+                    _a.label = 2;
+                case 2:
+                    if (watcher) {
+                        watcher.close();
+                        watcher = null;
+                    }
+                    if (mf) {
+                        mf.dispose();
+                        mf = null;
+                    }
+                    (0, utils_1.logInfo)('Development server and file watcher stopped.');
+                    return [2 /*return*/];
+            }
+        });
+    });
 }
 function gracefulShutdown() {
     return __awaiter(this, arguments, void 0, function (exitCode) {
@@ -103,81 +149,95 @@ function gracefulShutdown() {
         if (exitCode === void 0) { exitCode = 0; }
         return __generator(this, function (_b) {
             switch (_b.label) {
-                case 0:
-                    cleanup();
-                    if (!proxyServer) return [3 /*break*/, 4];
-                    _b.label = 1;
+                case 0: return [4 /*yield*/, cleanup()];
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, proxyServer.stop()];
+                    _b.sent();
+                    if (!proxyServer) return [3 /*break*/, 5];
+                    _b.label = 2;
                 case 2:
+                    _b.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, proxyServer.stop()];
+                case 3:
                     _b.sent();
                     (0, utils_1.logInfo)('Proxy server closed.');
-                    return [3 /*break*/, 4];
-                case 3:
-                    _a = _b.sent();
-                    return [3 /*break*/, 4];
+                    return [3 /*break*/, 5];
                 case 4:
+                    _a = _b.sent();
+                    return [3 /*break*/, 5];
+                case 5:
                     process.exit(exitCode);
                     return [2 /*return*/];
             }
         });
     });
 }
-function startProcess(mainFile, envVars, isRestart) {
-    var _a, _b;
-    if (isRestart === void 0) { isRestart = false; }
-    if (childProcess) {
-        childProcess.kill('SIGTERM');
-        childProcess = null;
-    }
-    var spinner = (0, ora_1.default)(isRestart ? 'Restarting development server...' : 'Starting development server...').start();
-    var hasStarted = false;
-    var tsNodePath = path_1.default.join(process.cwd(), 'node_modules', '.bin', 'ts-node');
-    if (!fs_extra_1.default.existsSync(tsNodePath)) {
-        spinner.fail('ts-node not found. Run: npm install ts-node typescript');
-        return;
-    }
-    if (!fs_extra_1.default.existsSync(mainFile)) {
-        spinner.fail("Main file not found: ".concat(mainFile));
-        return;
-    }
-    childProcess = (0, child_process_1.spawn)(tsNodePath, [mainFile], {
-        env: __assign(__assign({}, process.env), envVars),
-        stdio: ['inherit', 'pipe', 'pipe'],
-        shell: false,
-    });
-    var markStarted = function (success) {
-        if (hasStarted)
-            return;
-        hasStarted = true;
-        if (success) {
-            spinner.succeed(isRestart ? 'Development server restarted.' : 'Development server started.');
-            if (tunnelUrl && isFirstStart) {
-                (0, utils_1.displayTunnelUrl)(tunnelUrl);
-                isFirstStart = false;
+function startProcess(mainFile_1, envVars_1) {
+    return __awaiter(this, arguments, void 0, function (mainFile, envVars, isRestart) {
+        var spinner, hasStarted, tsNodePath, markStarted;
+        var _a, _b;
+        if (isRestart === void 0) { isRestart = false; }
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    if (!childProcess) return [3 /*break*/, 2];
+                    return [4 /*yield*/, killProcess(childProcess)];
+                case 1:
+                    _c.sent();
+                    childProcess = null;
+                    _c.label = 2;
+                case 2:
+                    spinner = (0, ora_1.default)(isRestart ? 'Restarting development server...' : 'Starting development server...').start();
+                    hasStarted = false;
+                    tsNodePath = path_1.default.join(process.cwd(), 'node_modules', '.bin', 'ts-node');
+                    if (!fs_extra_1.default.existsSync(tsNodePath)) {
+                        spinner.fail('ts-node not found. Run: npm install ts-node typescript');
+                        return [2 /*return*/];
+                    }
+                    if (!fs_extra_1.default.existsSync(mainFile)) {
+                        spinner.fail("Main file not found: ".concat(mainFile));
+                        return [2 /*return*/];
+                    }
+                    childProcess = (0, child_process_1.spawn)(tsNodePath, [mainFile], {
+                        env: __assign(__assign({}, process.env), envVars),
+                        stdio: ['inherit', 'pipe', 'pipe'],
+                        shell: false,
+                    });
+                    markStarted = function (success) {
+                        if (hasStarted)
+                            return;
+                        hasStarted = true;
+                        if (success) {
+                            spinner.succeed(isRestart ? 'Development server restarted.' : 'Development server started.');
+                            if (tunnelUrl && isFirstStart) {
+                                (0, utils_1.displayTunnelUrl)(tunnelUrl);
+                                isFirstStart = false;
+                            }
+                        }
+                        else {
+                            spinner.fail('Development server error.');
+                        }
+                    };
+                    (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', function (data) { markStarted(true); process.stdout.write(data.toString()); });
+                    (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', function (data) {
+                        var output = data.toString();
+                        markStarted(output.includes('Error:') || output.includes('error:') ? false : true);
+                        process.stderr.write(output);
+                    });
+                    childProcess.on('close', function (code) {
+                        if (code !== 0 && code !== null && !hasStarted)
+                            spinner.fail("Development server exited with code ".concat(code));
+                        childProcess = null;
+                    });
+                    childProcess.on('error', function (error) { spinner.fail("Failed to start: ".concat(error.message)); childProcess = null; });
+                    return [2 /*return*/];
             }
-        }
-        else {
-            spinner.fail('Development server error.');
-        }
-    };
-    (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', function (data) { markStarted(true); process.stdout.write(data.toString()); });
-    (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', function (data) {
-        var output = data.toString();
-        markStarted(output.includes('Error:') || output.includes('error:') ? false : true);
-        process.stderr.write(output);
-    });
-    childProcess.on('close', function (code) {
-        if (code !== 0 && code !== null && !hasStarted)
-            spinner.fail("Development server exited with code ".concat(code));
-        childProcess = null;
+        });
     });
-    childProcess.on('error', function (error) { spinner.fail("Failed to start: ".concat(error.message)); childProcess = null; });
 }
 function dev(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, port, portNumber, runtime, mainFile, resolvedMain, envVars, proxySetup, watchPaths, dainDir, outFile, MFconfig_1, error_1;
+        var config, port, portNumber, runtime, mainFile, resolvedMain, envVars, proxySetup, watchPaths, isRestarting_1, dainDir, outFile, MFconfig_1, error_1;
+        var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -208,7 +268,7 @@ function dev(options) {
                     process.once('unhandledRejection', function (reason) { (0, utils_1.logError)('Unhandled Rejection:', reason); gracefulShutdown(1); });
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 9, , 10]);
+                    _a.trys.push([1, 10, , 11]);
                     return [4 /*yield*/, isPortAvailable(portNumber)];
                 case 2:
                     if (!(_a.sent())) {
@@ -226,29 +286,44 @@ function dev(options) {
                     tunnelUrl = proxySetup.tunnelUrl;
                     _a.label = 4;
                 case 4:
-                    if (!(runtime === 'node')) return [3 /*break*/, 5];
-                    startProcess(mainFile, envVars);
+                    if (!(runtime === 'node')) return [3 /*break*/, 6];
+                    return [4 /*yield*/, startProcess(mainFile, envVars)];
+                case 5:
+                    _a.sent();
                     watchPaths = [
                         path_1.default.dirname(mainFile),
                         config['static-dir'] ? path_1.default.join(process.cwd(), config['static-dir']) : (0, utils_1.getStaticFilesPath)(),
                     ].filter(function (p) { return fs_extra_1.default.existsSync(p); });
+                    isRestarting_1 = false;
                     watcher = chokidar_1.default.watch(watchPaths, { ignored: /(^|[\/\\])\./, persistent: true, ignoreInitial: true });
                     watcher.on('change', function (changedPath) {
                         if (debounceTimer)
                             clearTimeout(debounceTimer);
-                        debounceTimer = setTimeout(function () {
-                            (0, utils_1.logInfo)("File ".concat(changedPath, " changed. Restarting..."));
-                            startProcess(mainFile, envVars, true);
-                        }, 300);
+                        debounceTimer = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (isRestarting_1)
+                                            return [2 /*return*/];
+                                        isRestarting_1 = true;
+                                        (0, utils_1.logInfo)("File ".concat(changedPath, " changed. Restarting..."));
+                                        return [4 /*yield*/, startProcess(mainFile, envVars, true)];
+                                    case 1:
+                                        _a.sent();
+                                        isRestarting_1 = false;
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); }, 300);
                     });
                     (0, utils_1.logInfo)('Watching for file changes...');
-                    return [3 /*break*/, 8];
-                case 5:
-                    if (!(runtime === 'workers')) return [3 /*break*/, 7];
+                    return [3 /*break*/, 9];
+                case 6:
+                    if (!(runtime === 'workers')) return [3 /*break*/, 8];
                     dainDir = path_1.default.join(process.cwd(), '.dain');
                     outFile = path_1.default.join(dainDir, path_1.default.basename(config['main-file'], '.ts') + '.mjs');
                     return [4 /*yield*/, (0, build_1.default)({ config: options.config, runtime: 'workers', watch: true })];
-                case 6:
+                case 7:
                     _a.sent();
                     MFconfig_1 = { scriptPath: outFile, modules: true, port: parseInt(port, 10), log: new miniflare_1.Log(miniflare_1.LogLevel.DEBUG), liveReload: true };
                     mf = new miniflare_1.Miniflare(MFconfig_1);
@@ -262,15 +337,15 @@ function dev(options) {
                         } }, 300);
                     });
                     (0, utils_1.logInfo)('Watching for file changes in source and build directories...');
-                    return [3 /*break*/, 8];
-                case 7: throw new Error("Unsupported runtime: ".concat(runtime));
-                case 8: return [3 /*break*/, 10];
-                case 9:
+                    return [3 /*break*/, 9];
+                case 8: throw new Error("Unsupported runtime: ".concat(runtime));
+                case 9: return [3 /*break*/, 11];
+                case 10:
                     error_1 = _a.sent();
                     (0, utils_1.logError)("Error in dev process for ".concat(runtime, " runtime:"), error_1);
                     gracefulShutdown(1);
-                    return [3 /*break*/, 10];
-                case 10: return [2 /*return*/];
+                    return [3 /*break*/, 11];
+                case 11: return [2 /*return*/];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dainprotocol/cli",
-  "version": "1.2.33",
+  "version": "1.2.34",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -10,6 +10,13 @@
   "bin": {
     "dain": "./dist/index.js"
   },
+  "scripts": {
+    "build": "tsc && cp -r templates dist/",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "prepublishOnly": "pnpm run build && pnpm test"
+  },
   "files": [
     "dist",
     "README.md"
@@ -40,11 +47,5 @@
     "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
-  },
-  "scripts": {
-    "build": "tsc && cp -r templates dist/",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage"
   }
-}
+}