@nmakarov/cli-toolkit 0.51.0 → 0.55.0

package/dist/cli-runner.js

@@ -2634,7 +2634,10 @@ async function init(flow2, opts = {}) {
     context.isStop = () => stop;
     context = await setupModules(context, opts);
     const stopAfter = context.args.get("stopAfter");
-    const stopAllowance = context.params.get("stopAllowance", "number default 5");
+    const stopAllowanceSec = Number(context.params.get("stopAllowance", "number default 60"));
+    const stopAllowanceMs = (Number.isFinite(stopAllowanceSec) && stopAllowanceSec >= 0 ? stopAllowanceSec : 60) * 1e3;
+    context.stopAllowanceSec = stopAllowanceSec;
+    context.stopAllowanceMs = stopAllowanceMs;
     if (stopAfter === "init") {
       printAllParameters(context);
       process.exit(0);
@@ -2648,8 +2651,10 @@ async function init(flow2, opts = {}) {
         sigintCount = 1;
         firstSigintAt = now;
         stop = true;
-        context.logger.info(`>> emitting stop with allowance ${stopAllowance}`);
-        context.emitter.emit("stop", stopAllowance);
+        context.logger.info(
+          `>> emitting stop with allowance ${stopAllowanceSec}s (${stopAllowanceMs}ms)`
+        );
+        context.emitter.emit("stop", stopAllowanceMs);
         return;
       }
       if (now - firstSigintAt < 250) return;
@@ -2660,8 +2665,10 @@ async function init(flow2, opts = {}) {
     process.on("SIGTERM", () => {
       if (!context || stop) return;
       stop = true;
-      context.logger.info(`>> SIGTERM: emitting stop with allowance ${stopAllowance}`);
-      context.emitter.emit("stop", stopAllowance);
+      context.logger.info(
+        `>> SIGTERM: emitting stop with allowance ${stopAllowanceSec}s (${stopAllowanceMs}ms)`
+      );
+      context.emitter.emit("stop", stopAllowanceMs);
     });
     await flow2(context);
   } catch (error) {
@@ -2689,6 +2696,8 @@ async function init(flow2, opts = {}) {
     }
     if (process.exitCode && process.exitCode !== 0) {
       process.exit(process.exitCode);
+    } else if (stop) {
+      process.exit(0);
     }
   }
 }
@@ -6135,7 +6144,7 @@ var TaskStopRunner = class extends AbstractTask {
    */
   static async resolveCustomParams(context, overrides = {}) {
     const merged = AbstractTask._mergeTypedParams(context, "task-stop", {
-      allowanceMs: "number default 5000"
+      allowanceMs: "number default 60000"
     }, overrides);
     const allowanceMs = Number(merged.allowanceMs);
     if (!Number.isFinite(allowanceMs) || allowanceMs < 0) {
@@ -6149,7 +6158,7 @@ var TaskStopRunner = class extends AbstractTask {
    * @returns {Promise<{ success: true, results: { stopRunner: true, allowanceMs: number, message: string } }>}
    */
   async run() {
-    const allowanceMs = Number(this.task?.params?.allowanceMs ?? 5e3);
+    const allowanceMs = Number(this.task?.params?.allowanceMs ?? 6e4);
     this.context.logger.warn?.(`[TaskStopRunner] stop requested (allowanceMs=${allowanceMs})`);
     return {
       success: true,
@@ -6767,7 +6776,7 @@ async function executeClaimedTask(context, tasksTable, historyTable, row, regist
     await db(tasksTable).where({ id: row.id }).delete();
   }
   const stopRunnerRequested = !!(results && typeof results === "object" && results.stopRunner === true);
-  const stopAllowanceMs = stopRunnerRequested ? Number(results.allowanceMs ?? 5e3) : 0;
+  const stopAllowanceMs = stopRunnerRequested ? Number(results.allowanceMs ?? 6e4) : 0;
   return { stopRunnerRequested, stopAllowanceMs };
 }
 function shuffleTaskRowsInPlace(rows) {
@@ -6857,7 +6866,7 @@ async function runTasksLoop(context, options) {
   const runningTaskInstances = /* @__PURE__ */ new Map();
   let runningControlPromise = null;
   let stopRequested = false;
-  let stopAllowanceMs = 5e3;
+  let stopAllowanceMs = Number(context.stopAllowanceMs) > 0 ? Number(context.stopAllowanceMs) : 6e4;
   context.tasksRunnerStop = false;
   let registryReg = null;
   let registryInterval = null;
@@ -6924,7 +6933,7 @@ async function runTasksLoop(context, options) {
           ).then(async (outcome) => {
             if (outcome.stopRunnerRequested && !stopRequested) {
               stopRequested = true;
-              stopAllowanceMs = outcome.stopAllowanceMs || 5e3;
+              stopAllowanceMs = outcome.stopAllowanceMs || stopAllowanceMs;
               context.tasksRunnerStop = true;
               await signalRunningTasksStop(context, runningTaskInstances, stopAllowanceMs);
             }
@@ -6950,7 +6959,7 @@ async function runTasksLoop(context, options) {
         const p = executeClaimedTask(context, tasksTable, historyTable, claimed, registry, runningTaskInstances).then(async (outcome) => {
           if (outcome.stopRunnerRequested && !stopRequested) {
             stopRequested = true;
-            stopAllowanceMs = outcome.stopAllowanceMs || 5e3;
+            stopAllowanceMs = outcome.stopAllowanceMs || stopAllowanceMs;
             context.tasksRunnerStop = true;
             await signalRunningTasksStop(context, runningTaskInstances, stopAllowanceMs);
           }
@@ -6971,7 +6980,9 @@ async function runTasksLoop(context, options) {
       }
     }
     if (context.isStop() && !stopRequested) {
-      await signalRunningTasksStop(context, runningTaskInstances, 5e3);
+      stopRequested = true;
+      stopAllowanceMs = Number(context.stopAllowanceMs) > 0 ? Number(context.stopAllowanceMs) : stopAllowanceMs;
+      await signalRunningTasksStop(context, runningTaskInstances, stopAllowanceMs);
     }
     if (runningPromises.size > 0) {
       if (stopRequested) {