tasktui 1.0.8 → 1.0.22

package/dist/app.js

@@ -17,13 +17,13 @@ function handleMove(steps) {
         render(state);
     }
 }
-function loadAndProcessConfig(configPath) {
+async function loadAndProcessConfig(configPath) {
     try {
         const config = loadConfig(configPath);
         state.config = config;
         const tasks = config?.tasks ?? {};
         if (!Object.keys(tasks).length && state.init) {
-            cleanup(state);
+            await cleanup(state);
             process.exit(0);
         }
         state.init = true;
@@ -60,8 +60,8 @@ ui.screen.key(['up', 'k'], () => {
 ui.screen.key(['down', 'j'], () => {
     handleMove(1);
 });
-ui.screen.key(['C-c', 'q'], () => {
-    cleanup(state);
+ui.screen.key(['C-c', 'q'], async () => {
+    await cleanup(state);
     process.exit(0);
 });
 ui.screen.key('m', () => {

package/dist/tasks.d.ts

@@ -2,4 +2,4 @@ import { AppState } from './state.js';
 import { Task } from './types.js';
 export declare function ensureDependencies(task: string, deps: string[], state: AppState): boolean;
 export declare function spawnTask(name: string, task: Task, state: AppState, onUpdate: () => void): void;
-export declare function cleanup(state: AppState): void;
+export declare function cleanup(state: AppState): Promise<void>;

package/dist/tasks.js

@@ -82,10 +82,24 @@ function checkQueue(state, onUpdate) {
     }
     state.queue = next;
 }
-export function cleanup(state) {
-    for (const [_, proc] of state.childProcesses.entries()) {
-        if (!proc.killed) {
-            proc.kill('SIGTERM');
+export async function cleanup(state) {
+    const processes = [...state.childProcesses.entries()].filter(([_, proc]) => !proc.killed);
+    if (processes.length === 0)
+        return;
+    const exitPromises = processes.map(([_, proc]) => new Promise((resolve) => {
+        proc.on('close', resolve);
+        proc.kill('SIGTERM');
+    }));
+    const timeout = new Promise((resolve) => setTimeout(() => resolve('timeout'), 5000));
+    const result = await Promise.race([
+        Promise.all(exitPromises).then(() => 'done'),
+        timeout,
+    ]);
+    if (result === 'timeout') {
+        for (const [_, proc] of processes) {
+            if (!proc.killed) {
+                proc.kill('SIGKILL');
+            }
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tasktui",
   "description": "Run tasks in a multiplexed terminal with dependency management.",
-  "version": "1.0.8",
+  "version": "1.0.22",
   "license": "MIT",
   "bin": "dist/cli.js",
   "type": "module",