@appweaver/cli 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appweaver/cli",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Appweaver - the backend framework for AI-first development (@cli)",
   "author": "Luka Matosevic",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "@sinclair/typebox": "0.34.49",
     "@sinclair/typebox-codegen": "0.11.1",
     "commander": "15.0.0",
+    "fkill": "10.0.3",
     "glob": "13.0.6",
     "prettier": "3.8.4",
     "rimraf": "6.1.3",
-    "tree-kill": "1.2.2",
     "ts-node": "10.9.2",
     "tsc-alias": "1.8.17",
     "tsc-watch": "7.2.0"

package/start/start-project.js

@@ -69,18 +69,19 @@ async function startBunProject(mainFilePath, watch) {
  */
 async function watchNodeProject(mainFilePath, projectFile) {
     let abortController;
+    let runningProcess;
     const watch = new client_1.TscWatchClient();
     // Handler for every successful compilation of watched code, aborts previous
     // process and starts a new one
     watch.on('success', async () => {
-        if (abortController) {
-            abortController.abort();
-        }
+        abortController?.abort();
+        // Wait for the previous process to fully terminate before starting a new one
+        await runningProcess;
         abortController = new AbortController();
         // Replace import alias paths in compiled code
         await (0, tsc_alias_1.replaceTscAliasPaths)({ configFile: projectFile });
         // Start the main application process
-        await (0, utils_1.runProcess)('node', [mainFilePath], {
+        runningProcess = (0, utils_1.runProcess)('node', [mainFilePath], {
             signal: abortController.signal
         });
     });
@@ -116,9 +117,7 @@ async function watchBunProcess() {
     let debounceTimer;
     // Starts a new process and aborts the previous one
     async function start() {
-        if (abortController) {
-            abortController.abort();
-        }
+        abortController?.abort();
         abortController = new AbortController();
         await (0, utils_1.runProcess)('bun', [common_1.config.APP_MAIN_FILE_PATH], {
             signal: abortController.signal

package/utils/process-util.d.ts

@@ -6,7 +6,7 @@
  * @param {Object} [params={ quiet: false }] - Configurations for how the process should run.
  * @param {boolean} [params.quiet=false] - If true, suppresses the process output.
  * @param {AbortSignal} [params.signal] - Optional AbortSignal to terminate the running process.
- * @return {Promise<number>} A promise that resolves with the exit code of the process or 1 on error.
+ * @return {Promise<number>} A promise that resolves with the exit code of the process.
  */
 export declare function runProcess(cmd: string, args?: string[], params?: {
     quiet?: boolean;

package/utils/process-util.js

@@ -8,7 +8,7 @@ exports.assertEnv = assertEnv;
 exports.assertEnvs = assertEnvs;
 exports.isBunProcess = isBunProcess;
 const node_child_process_1 = require("node:child_process");
-const tree_kill_1 = __importDefault(require("tree-kill"));
+const fkill_1 = __importDefault(require("fkill"));
 const common_1 = require("@appweaver/common");
 /**
  * Executes a shell command with optional arguments and configuration parameters.
@@ -18,7 +18,7 @@ const common_1 = require("@appweaver/common");
  * @param {Object} [params={ quiet: false }] - Configurations for how the process should run.
  * @param {boolean} [params.quiet=false] - If true, suppresses the process output.
  * @param {AbortSignal} [params.signal] - Optional AbortSignal to terminate the running process.
- * @return {Promise<number>} A promise that resolves with the exit code of the process or 1 on error.
+ * @return {Promise<number>} A promise that resolves with the exit code of the process.
  */
 function runProcess(cmd, args = [], params = {}) {
     const { quiet = false, signal } = params;
@@ -32,19 +32,27 @@ function runProcess(cmd, args = [], params = {}) {
             shell: true,
             env: { ...process.env, WEAVER_CLI: undefined }
         });
+        let aborted = false;
         if (signal) {
-            const abortHandler = () => {
+            const abortHandler = async () => {
                 if (child.pid) {
-                    (0, tree_kill_1.default)(child.pid, () => {
-                        resolve(0);
-                    });
+                    aborted = true;
+                    try {
+                        await (0, fkill_1.default)(child.pid, { force: true, tree: true });
+                    }
+                    catch (e) {
+                        console.error('Failed to kill process:', e);
+                    }
+                    resolve(0);
                 }
             };
             signal.addEventListener('abort', abortHandler, { once: true });
         }
         child.on('error', reject);
         child.on('close', (code) => {
-            resolve(code ?? 99);
+            if (!aborted) {
+                resolve(code ?? 99);
+            }
         });
     });
 }