@nmakarov/cli-toolkit 0.59.0 → 0.63.0

package/dist/index.js

@@ -3503,13 +3503,15 @@ var CONNECTION_ERROR_CODES = /* @__PURE__ */ new Set([
   "57P02",
   "57P03"
 ]);
-var CONNECTION_ERROR_MESSAGE_RE = /connection (terminated|ended|closed|destroyed|reset|refused|not open)|Connection terminated unexpectedly|Client has encountered a connection error|server closed the connection|Cannot use a pool after calling end|This socket has been ended|connect ECONNRESET|Timeout acquiring a connection/i;
+var CONNECTION_ERROR_MESSAGE_RE = /connection (terminated|ended|closed|destroyed|reset|refused|not open)|Connection terminated unexpectedly|Client has encountered a connection error|server closed the connection|Cannot use a pool after calling end|This socket has been ended|connect ECONNRESET/i;
 var Db = class _Db {
   static async init(context, options = {}) {
     const buildConfig = async () => {
       const defs = {
         dbName: "string",
-        dbProfile: "boolean default false"
+        dbProfile: "boolean default false",
+        /** Cap knex pool size (default 10). Size ≈ expected concurrency + headroom. */
+        dbPoolMax: "number"
       };
       const discovered = context?.params?.getAllForModule?.("db", defs) ?? {};
       const merged = { ...discovered, ...options };
@@ -3568,12 +3570,23 @@ var Db = class _Db {
         context?.args?.env,
         merged.name
       );
+      const poolMaxRaw = merged.dbPoolMax ?? merged.pool?.max;
+      const poolMax = Number(poolMaxRaw);
+      const pool = {
+        ...KNEX_DEFAULTS.pool,
+        ...merged.pool && typeof merged.pool === "object" ? merged.pool : {}
+      };
+      if (Number.isFinite(poolMax) && poolMax >= 1) {
+        pool.max = Math.floor(poolMax);
+      }
       return {
         ...KNEX_DEFAULTS,
         connectionString: dbConnectionString,
         name: displayName,
         profile: !!dbProfile,
-        logger: context.logger
+        logger: context.logger,
+        pool,
+        ...merged.acquireConnectionTimeout != null ? { acquireConnectionTimeout: merged.acquireConnectionTimeout } : {}
       };
     };
     const config2 = context?.params?.runWithModuleAsync ? await context.params.runWithModuleAsync("db", buildConfig) : await buildConfig();
@@ -5026,6 +5039,9 @@ var Logger = class _Logger {
     const message = this.inspectChunks([operation, ...chunks]);
     this.out({ level: "response", message });
   }
+  /**
+   * @returns {boolean} true when the progress line was emitted (not throttled)
+   */
   progress(message, opts) {
     const { prefix, count, total } = opts;
     const paddedTotal = String(total).length;
@@ -5059,7 +5075,9 @@ var Logger = class _Logger {
       if (this.options.progressThrottle && prefix) {
         this.lastProgressTimes[prefix] = Date.now();
       }
+      return true;
     }
+    return false;
   }
   shouldOutputProgress(prefix, count, total) {
     if (!this.options.progressThrottle) {
@@ -5655,10 +5673,47 @@ function isFreshOnline(proc, oldPid) {
   }
   return true;
 }
+async function deletePm2App(appName, options = {}) {
+  const { dryRun = false, logger = console, waitTimeoutMs = 65e3, oldPid = null } = options;
+  if (dryRun) {
+    logger.info(`[dryRun] would pm2 delete ${appName}`);
+    return;
+  }
+  const before = await getPm2Process(appName, { logger });
+  if (!before) {
+    logger.info(`pm2 ${appName}: not present (skip delete)`);
+    return;
+  }
+  await runShell(`pm2 delete "${appName}"`, { logger });
+  await waitPm2(
+    appName,
+    (proc) => {
+      if (proc) return false;
+      if (oldPid != null && isPidAlive(oldPid)) return false;
+      return true;
+    },
+    { timeoutMs: waitTimeoutMs, logger, label: "deleted (process gone)" }
+  );
+  logger.info(`pm2 ${appName} deleted`);
+}
+async function startFromEcosystem(paths, options = {}) {
+  const { dryRun = false, logger = console } = options;
+  if (dryRun) {
+    logger.info(`[dryRun] would pm2 start ${paths.ecosystem} --update-env`);
+    return;
+  }
+  await runShell(
+    `ENV=production NODE_ENV=production pm2 start "${paths.ecosystem}" --update-env`,
+    { logger }
+  );
+  logger.info("pm2 started from ecosystem");
+}
 async function reloadPm2(paths, options = {}) {
   const { dryRun = false, logger = console, appName = null, waitTimeoutMs = 65e3 } = options;
   if (dryRun) {
-    logger.info(`[dryRun] would pm2 startOrReload ${paths.ecosystem} --update-env`);
+    logger.info(
+      `[dryRun] would pm2 delete${appName ? ` ${appName}` : ""} + start ${paths.ecosystem} --update-env`
+    );
     return;
   }
   let oldPid = null;
@@ -5667,14 +5722,15 @@ async function reloadPm2(paths, options = {}) {
     const n = Number(before?.pid);
     if (Number.isFinite(n) && n > 0 && before?.pm2_env?.status === "online") {
       oldPid = n;
-      logger.info(`pm2 ${appName}: reloading (old pid=${oldPid})`);
+      logger.info(`pm2 ${appName}: recreate (old pid=${oldPid})`);
     }
+    await deletePm2App(appName, { dryRun, logger, waitTimeoutMs, oldPid });
+  } else {
+    logger.warn?.(
+      "reloadPm2: appName missing; starting ecosystem without delete (pass appName so script/env always recreate cleanly)"
+    );
   }
-  await runShell(
-    `ENV=production NODE_ENV=production pm2 startOrReload "${paths.ecosystem}" --update-env`,
-    { logger }
-  );
-  logger.info("pm2 reloaded");
+  await startFromEcosystem(paths, { dryRun, logger });
   if (appName) {
     const proc = await waitPm2(
       appName,
@@ -5682,7 +5738,7 @@ async function reloadPm2(paths, options = {}) {
       {
         timeoutMs: waitTimeoutMs,
         logger,
-        label: oldPid ? `online on new pid (old ${oldPid} gone)` : "online after reload"
+        label: oldPid ? `online on new pid (old ${oldPid} gone)` : "online after recreate"
       }
     );
     logger.info(`pm2 ${appName} online pid=${proc?.pid ?? "?"}`);
@@ -5719,14 +5775,15 @@ async function stopPm2(appName, options = {}) {
 async function startPm2(paths, options = {}) {
   const { dryRun = false, logger = console, appName = null, waitTimeoutMs = 65e3 } = options;
   if (dryRun) {
-    logger.info(`[dryRun] would pm2 start ${paths.ecosystem} --update-env`);
+    logger.info(
+      `[dryRun] would pm2 delete${appName ? ` ${appName}` : ""} + start ${paths.ecosystem} --update-env`
+    );
     return;
   }
-  await runShell(
-    `ENV=production NODE_ENV=production pm2 start "${paths.ecosystem}" --update-env`,
-    { logger }
-  );
-  logger.info("pm2 started");
+  if (appName) {
+    await deletePm2App(appName, { dryRun, logger, waitTimeoutMs });
+  }
+  await startFromEcosystem(paths, { dryRun, logger });
   if (appName) {
     const proc = await waitPm2(
       appName,
@@ -5981,7 +6038,7 @@ function buildEnsureEnvScript() {
   return `/**
  * Written by cli-toolkit deploy (init-structure). Do not hand-edit.
  * Preloaded via pm2 node_args --require. Always set (do not only fill when unset):
- * \`pm2 startOrReload --update-env\` can inject a non-production ENV from the
+ * \`pm2 start \u2026 --update-env\` can inject a non-production ENV from the
  * deploy shell / prior dump, and a conditional assign would leave it in place.
  */
 process.env.ENV = "production";
@@ -6347,7 +6404,9 @@ async function rollbackService(service, options = {}) {
     logger.info(`rollback target: v${buildInfo.version} release=${buildInfo.release ?? rollbackTarget.name}`);
   }
   await activateRelease(rollbackTarget.path, paths, { dryRun, logger });
-  await reloadPm2(paths, { dryRun, logger });
+  const appName = service.pm2?.appName ?? null;
+  const waitTimeoutMs = 65e3;
+  await reloadPm2(paths, { dryRun, logger, appName, waitTimeoutMs });
   const summary = `rollback ${activeName} \u2192 ${rollbackTarget.name} dryRun=${dryRun}`;
   if (!dryRun) await appendDeployLog(paths.deployLog, summary);
   return { from: activeName, to: rollbackTarget.name, path: rollbackTarget.path };
@@ -6858,6 +6917,34 @@ async function updateTaskProgress(context, tasksTable, taskId, progress) {
     progress: typeof progress === "string" ? progress : JSON.stringify(progress)
   });
 }
+function createTaskProgressReporter(context, tasksTable, taskId) {
+  let pump = null;
+  let pending = void 0;
+  let hasPending = false;
+  return (progress) => {
+    pending = progress;
+    hasPending = true;
+    if (pump) return pump;
+    pump = (async () => {
+      try {
+        while (hasPending) {
+          hasPending = false;
+          const value = pending;
+          try {
+            await updateTaskProgress(context, tasksTable, taskId, value);
+          } catch (err) {
+            context.logger?.warn?.(
+              `[tasks] progress update failed for ${taskId}: ${err?.message ?? err}`
+            );
+          }
+        }
+      } finally {
+        pump = null;
+      }
+    })();
+    return pump;
+  };
+}
 
 // src/tasks/servicesRegistry.js
 function getDb2(context) {
@@ -8709,7 +8796,8 @@ async function executeClaimedTask(context, tasksTable, historyTable, row, regist
   try {
     taskInstance = new TaskClass(context, row);
     runningTaskInstances.set(row.id, taskInstance);
-    const runResult = await taskInstance.run((progress) => updateTaskProgress(context, tasksTable, row.id, progress));
+    const reportProgress = createTaskProgressReporter(context, tasksTable, row.id);
+    const runResult = await taskInstance.run(reportProgress);
     success = !!runResult?.success;
     results = runResult?.results ?? null;
   } catch (error) {
@@ -9256,6 +9344,7 @@ export {
   controlLaneTaskNames,
   convertPattern,
   createRelease,
+  createTaskProgressReporter,
   defaultFileSynopsisFunction,
   defaultTasksRegistry,
   defaultVersionSynopsisFunction,