@nmakarov/cli-toolkit 0.50.0 → 0.53.0

package/dist/tasks.js

@@ -2617,7 +2617,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) {
@@ -2631,7 +2631,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,
@@ -3316,7 +3316,7 @@ function normalizeRegistry(registry) {
   if (registry instanceof TasksRegistry) return registry;
   return new TasksRegistry().addMany(registry);
 }
-async function enqueueStopTask(context, serviceGroup, queueName = "tasks", allowanceMs = 5e3) {
+async function enqueueStopTask(context, serviceGroup, queueName = "tasks", allowanceMs = 6e4) {
   return enqueueTask(context, {
     queueName,
     name: "stopRunner",
@@ -3455,7 +3455,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) {
@@ -3545,7 +3545,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;
@@ -3612,7 +3612,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);
             }
@@ -3638,7 +3638,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);
           }
@@ -3659,7 +3659,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) {