@qodalis/cli-server-jobs 2.3.0 → 2.4.1

package/public-api.mjs

@@ -166,6 +166,24 @@ function formatRelativeTime(isoString) {
   if (diff < 864e5) return `${Math.round(diff / 36e5)}h ago`;
   return `${Math.round(diff / 864e5)}d ago`;
 }
+function formatSpan(value) {
+  if (value === null || value === void 0 || value === "") return null;
+  if (typeof value === "string") return value;
+  if (!Number.isFinite(value) || value < 0) return null;
+  const units = [[864e5, "d"], [36e5, "h"], [6e4, "m"], [1e3, "s"]];
+  for (const [size, unit] of units) {
+    if (value >= size && value % size === 0) return `${value / size}${unit}`;
+  }
+  return value >= 1e3 ? `${(value / 1e3).toFixed(1)}s` : `${value}ms`;
+}
+function formatRunning(job) {
+  const running = job.runningExecutionIds?.length ?? (job.currentExecutionId ? 1 : 0);
+  const max = job.maxConcurrentRuns ?? 1;
+  if (running === 0 && !job.queued) return null;
+  const parts = [max > 1 ? `${running}/${max} running` : `${running} running`];
+  if (job.queued) parts.push("1 queued");
+  return parts.join(", ");
+}
 function formatDuration(ms) {
   if (ms == null) return "-";
   if (ms < 1e3) return `${ms}ms`;
@@ -531,6 +549,11 @@ var CliJobsCommandProcessor = class {
                 t.t("cli.server.jobs.edit.help.change_job_step_step", "Change a job step by step: description, group, cron schedule or interval, max retries, timeout and overlap policy (skip, queue or cancel). Press Enter to keep a value and Ctrl+C or Escape to cancel; nothing changes until you confirm. A job on several servers needs --server.")
               );
               context.writer.writeln();
+              writeWrapped(
+                context,
+                t.t("cli.server.jobs.edit.help.max_concurrent_runs", "Max concurrent runs: how many runs of the job may go at the same time (1 by default). When that many are running, the overlap policy decides what happens to the next one.")
+              );
+              context.writer.writeln();
               writeUsage(context, [
                 ["server jobs edit <name|id>", ""]
               ]);
@@ -622,7 +645,7 @@ var CliJobsCommandProcessor = class {
           j.name,
           j.group ?? "-",
           statusColor(j.status, context.writer),
-          j.schedule ?? (j.interval ? `every ${j.interval}ms` : "-"),
+          j.schedule ?? (formatSpan(j.interval) ? `every ${formatSpan(j.interval)}` : "-"),
           formatRelativeTime(j.lastRunAt),
           formatRelativeTime(j.nextRunAt),
           formatDuration(j.lastRunDuration)
@@ -660,12 +683,16 @@ var CliJobsCommandProcessor = class {
         ["Status", statusColor(job.status, context.writer)],
         [
           "Schedule",
-          job.schedule ?? (job.interval ? `every ${job.interval}ms` : "-")
+          job.schedule ?? (formatSpan(job.interval) ? `every ${formatSpan(job.interval)}` : "-")
         ],
         ["Max Retries", String(job.maxRetries)],
-        ["Timeout", job.timeout ? `${job.timeout}ms` : "none"],
+        ["Timeout", formatSpan(job.timeout) ?? "none"],
         ["Overlap Policy", job.overlapPolicy],
-        ["Current Execution", job.currentExecutionId ?? "none"],
+        ["Max Concurrent Runs", String(job.maxConcurrentRuns ?? 1)],
+        [
+          "Running",
+          job.runningExecutionIds && job.runningExecutionIds.length > 1 ? `${formatRunning(job)}: ${job.runningExecutionIds.join(", ")}` : formatRunning(job) && job.currentExecutionId ? `${formatRunning(job)} (${job.currentExecutionId})` : formatRunning(job) ?? "none"
+        ],
         ["Next Run", formatRelativeTime(job.nextRunAt)],
         ["Last Run", formatRelativeTime(job.lastRunAt)],
         [
@@ -909,7 +936,7 @@ var CliJobsCommandProcessor = class {
       const newGroup = await ask(`Group [${job.group ?? "none"}]: `);
       if (newGroup == null) return cancelled();
       if (newGroup) update.group = newGroup;
-      const currentSchedule = job.schedule ?? (job.interval ? `interval: ${job.interval}ms` : "none");
+      const currentSchedule = job.schedule ?? (formatSpan(job.interval) ? `interval: ${formatSpan(job.interval)}` : "none");
       const newSchedule = await ask(
         `Cron schedule [${currentSchedule}]: `
       );
@@ -917,7 +944,7 @@ var CliJobsCommandProcessor = class {
       if (newSchedule) update.schedule = newSchedule;
       if (!newSchedule) {
         const newInterval = await ask(
-          `Interval (e.g. 30s, 5m) [${job.interval ? `${job.interval}ms` : "none"}]: `
+          `Interval (e.g. 30s, 5m) [${formatSpan(job.interval) ?? "none"}]: `
         );
         if (newInterval == null) return cancelled();
         if (newInterval) update.interval = newInterval;
@@ -931,7 +958,7 @@ var CliJobsCommandProcessor = class {
         }
       }
       const newTimeout = await ask(
-        `Timeout (e.g. 5m, 1h) [${job.timeout ? `${job.timeout}ms` : "none"}]: `
+        `Timeout (e.g. 5m, 1h) [${formatSpan(job.timeout) ?? "none"}]: `
       );
       if (newTimeout == null) return cancelled();
       if (newTimeout) update.timeout = newTimeout;
@@ -942,6 +969,20 @@ var CliJobsCommandProcessor = class {
       if (newOverlap && ["skip", "queue", "cancel"].includes(newOverlap.toLowerCase())) {
         update.overlapPolicy = newOverlap.toLowerCase();
       }
+      const newMax = await ask(
+        `Max concurrent runs [${job.maxConcurrentRuns ?? 1}]: `
+      );
+      if (newMax == null) return cancelled();
+      if (newMax) {
+        const parsed = Number(newMax);
+        if (Number.isInteger(parsed) && parsed >= 1) {
+          update.maxConcurrentRuns = parsed;
+        } else {
+          context.writer.writeWarning(
+            "Max concurrent runs must be a whole number of at least 1; kept as it was."
+          );
+        }
+      }
       if (Object.keys(update).length === 0) {
         context.writer.writeInfo("No changes made.");
         return;
@@ -1175,7 +1216,7 @@ var CliJobNameCompletionProvider = class {
 };
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.3.0";
+var LIBRARY_VERSION = "2.4.1";
 var API_VERSION = 2;
 var completionProvider = new CliJobNameCompletionProvider();
 var jobsModule = {
@@ -1194,6 +1235,6 @@ var jobsModule = {
   }
 };
 
-export { API_VERSION, CliJobNameCompletionProvider, CliJobsCommandProcessor, CliJobsService, LIBRARY_VERSION, jobsModule };
+export { API_VERSION, CliJobNameCompletionProvider, CliJobsCommandProcessor, CliJobsService, LIBRARY_VERSION, formatRunning, formatSpan, jobsModule };
 //# sourceMappingURL=public-api.mjs.map
 //# sourceMappingURL=public-api.mjs.map