@orion-js/dogs 4.5.1 → 4.6.2

package/dist/index.cjs

@@ -115,6 +115,11 @@ var JobRecordSchema = (0, import_schema.schemaWithName)("JobRecord", {
   nextRunAt: { type: "date" },
   lastRunAt: { type: "date", optional: true },
   lockedUntil: { type: "date", optional: true },
+  /**
+   * Identifies the execution that currently owns the lock. Mutations from an execution must match
+   * this value so a stale execution cannot modify a newer claim.
+   */
+  lockId: { type: "string", optional: true },
   tries: { type: "number", optional: true },
   params: { type: "blackbox", optional: true },
   /**
@@ -137,6 +142,35 @@ var JobRecordSchema = (0, import_schema.schemaWithName)("JobRecord", {
 var DEFAULT_MAX_TRIES_REACHED_RETENTION_MS = 1e3 * 60 * 60 * 24 * 7;
 
 // src/repos/JobsRepo.ts
+var JOB_ACQUISITION_HINTS = {
+  byJobName: {
+    jobName: 1,
+    priority: -1,
+    nextRunAt: 1
+  },
+  globalPriority: {
+    priority: -1,
+    nextRunAt: 1
+  }
+};
+var INITIAL_JOB_ACQUISITION_HINT = "byJobName";
+var CANDIDATE_JOB_ACQUISITION_HINT = "globalPriority";
+var JOB_ACQUISITION_SORT = {
+  priority: -1,
+  nextRunAt: 1
+};
+function getJobAcquisitionSelector(jobNames, now) {
+  return {
+    jobName: { $in: jobNames },
+    nextRunAt: { $lte: now },
+    $and: [
+      { $or: [{ lockedUntil: { $exists: false } }, { lockedUntil: { $lte: now } }] },
+      // Exclude event jobs that have reached max tries. Recurrent jobs keep running even
+      // if old records still have this status from previous versions.
+      { $or: [{ type: { $ne: "event" } }, { status: { $ne: "maxTriesReached" } }] }
+    ]
+  };
+}
 var _jobs_dec, _JobsRepo_decorators, _init;
 _JobsRepo_decorators = [(0, import_mongodb.Repository)()], _jobs_dec = [(0, import_mongodb.MongoCollection)({
   idGeneration: "uuid",
@@ -144,11 +178,10 @@ _JobsRepo_decorators = [(0, import_mongodb.Repository)()], _jobs_dec = [(0, impo
   schema: JobRecordSchema,
   indexes: [
     {
-      keys: {
-        jobName: 1,
-        priority: -1,
-        nextRunAt: 1
-      }
+      keys: JOB_ACQUISITION_HINTS.byJobName
+    },
+    {
+      keys: JOB_ACQUISITION_HINTS.globalPriority
     },
     {
       keys: {
@@ -181,29 +214,20 @@ var JobsRepo = class {
   constructor() {
     __publicField(this, "jobs", __runInitializers(_init, 8, this)), __runInitializers(_init, 11, this);
   }
-  async getJobAndLock(jobNames, lockTime) {
-    const lockedUntil = new Date(Date.now() + lockTime);
+  async getJobAndLock(jobNames, lockTime, hint = INITIAL_JOB_ACQUISITION_HINT) {
+    const executionId = (0, import_helpers.generateId)();
+    const now = /* @__PURE__ */ new Date();
+    const lockedUntil = new Date(now.getTime() + lockTime);
     const job = await this.jobs.findOneAndUpdate(
+      getJobAcquisitionSelector(jobNames, now),
       {
-        jobName: { $in: jobNames },
-        nextRunAt: { $lte: /* @__PURE__ */ new Date() },
-        $and: [
-          { $or: [{ lockedUntil: { $exists: false } }, { lockedUntil: { $lte: /* @__PURE__ */ new Date() } }] },
-          // Exclude event jobs that have reached max tries. Recurrent jobs keep running even
-          // if old records still have this status from previous versions.
-          { $or: [{ type: { $ne: "event" } }, { status: { $ne: "maxTriesReached" } }] }
-        ]
-      },
-      {
-        $set: { lockedUntil, lastRunAt: /* @__PURE__ */ new Date() },
+        $set: { lockId: executionId, lockedUntil, lastRunAt: now },
         $inc: { tries: 1 }
       },
       {
         mongoOptions: {
-          sort: {
-            priority: -1,
-            nextRunAt: 1
-          },
+          hint: JOB_ACQUISITION_HINTS[hint],
+          sort: JOB_ACQUISITION_SORT,
           returnDocument: "before"
         }
       }
@@ -216,7 +240,8 @@ var JobsRepo = class {
     }
     return {
       jobId: job._id,
-      executionId: (0, import_helpers.generateId)(),
+      executionId,
+      lockId: executionId,
       name: job.jobName,
       params: job.params,
       type: job.type,
@@ -227,8 +252,24 @@ var JobsRepo = class {
       wasStale
     };
   }
-  async setJobRecordPriority(jobId, priority) {
-    await this.jobs.updateOne(jobId, { $set: { priority } });
+  async getJobAcquisitionExecutionTime(jobNames, hint) {
+    var _a;
+    const explain = await this.jobs.find(getJobAcquisitionSelector(jobNames, /* @__PURE__ */ new Date()), {
+      hint: JOB_ACQUISITION_HINTS[hint],
+      maxTimeMS: 1e3,
+      readPreference: "primary"
+    }).sort(JOB_ACQUISITION_SORT).limit(1).explain("executionStats");
+    const executionTimeMillis = (_a = explain.executionStats) == null ? void 0 : _a.executionTimeMillis;
+    if (typeof executionTimeMillis !== "number" || !Number.isFinite(executionTimeMillis)) {
+      throw new Error(`Explain for acquisition hint "${hint}" returned no execution time`);
+    }
+    return executionTimeMillis;
+  }
+  async setJobRecordPriority(jobId, priority, lockId) {
+    const result = await this.jobs.updateOne(lockId ? { _id: jobId, lockId } : jobId, {
+      $set: { priority }
+    });
+    return result.matchedCount > 0;
   }
   async scheduleNextRun(options) {
     const updator = {
@@ -237,22 +278,31 @@ var JobsRepo = class {
         priority: options.priority,
         ...options.resetTries ? { tries: 0 } : {}
       },
-      $unset: { lockedUntil: "" }
+      $unset: { lockId: "", lockedUntil: "" }
     };
-    await this.jobs.updateOne(options.jobId, updator);
+    const result = await this.jobs.updateOne(
+      options.lockId ? { _id: options.jobId, lockId: options.lockId } : options.jobId,
+      updator
+    );
+    return result.matchedCount > 0;
   }
-  async deleteEventJob(jobId) {
-    await this.jobs.deleteOne({ _id: jobId, type: "event" });
+  async deleteEventJob(jobId, lockId) {
+    const result = await this.jobs.deleteOne({
+      _id: jobId,
+      type: "event",
+      ...lockId ? { lockId } : {}
+    });
+    return result.deletedCount > 0;
   }
   /**
    * Marks an event job as having reached its maximum tries limit.
    * The job won't be picked up for execution and MongoDB will delete it after
    * the configured retention period.
    */
-  async markJobAsMaxTriesReached(jobId, retentionMs = DEFAULT_MAX_TRIES_REACHED_RETENTION_MS) {
+  async markJobAsMaxTriesReached(jobId, retentionMs = DEFAULT_MAX_TRIES_REACHED_RETENTION_MS, lockId) {
     const maxTriesReachedAt = /* @__PURE__ */ new Date();
-    await this.jobs.updateOne(
-      { _id: jobId, type: "event" },
+    const result = await this.jobs.updateOne(
+      { _id: jobId, type: "event", ...lockId ? { lockId } : {} },
       {
         $set: {
           status: "maxTriesReached",
@@ -260,11 +310,13 @@ var JobsRepo = class {
           ...retentionMs === null ? {} : { expiresAt: new Date(maxTriesReachedAt.getTime() + retentionMs) }
         },
         $unset: {
+          lockId: "",
           lockedUntil: "",
           ...retentionMs === null ? { expiresAt: "" } : {}
         }
       }
     );
+    return result.matchedCount > 0;
   }
   /**
    * Applies the current retention configuration to existing maxTriesReached
@@ -293,23 +345,22 @@ var JobsRepo = class {
       }
     ]);
   }
-  async extendLockTime(jobId, extraTime) {
-    await this.updateLockTime(jobId, extraTime);
+  async extendLockTime(jobId, extraTime, lockId) {
+    return this.updateLockTime(jobId, extraTime, lockId);
   }
   /**
    * Updates the lock time for a job to the specified duration from now.
    * Can be used to both extend or shorten the lock time.
    */
-  async updateLockTime(jobId, lockDuration) {
+  async updateLockTime(jobId, lockDuration, lockId) {
     const lockedUntil = new Date(Date.now() + lockDuration);
-    await this.jobs.updateOne(
-      {
-        _id: jobId
-      },
+    const result = await this.jobs.updateOne(
+      { _id: jobId, ...lockId ? { lockId } : {} },
       {
         $set: { lockedUntil }
       }
     );
+    return result.matchedCount > 0;
   }
   async unlockAllJobs() {
     const result = await this.jobs.updateMany(
@@ -317,7 +368,7 @@ var JobsRepo = class {
         lockedUntil: { $exists: true }
       },
       {
-        $unset: { lockedUntil: "" }
+        $unset: { lockId: "", lockedUntil: "" }
       }
     );
     return result.modifiedCount;
@@ -623,11 +674,15 @@ var Executor = class {
   getEffectiveLockTime(job, jobToRun) {
     return job.lockTime ?? jobToRun.lockTime;
   }
-  getContext(job, jobToRun, onStale) {
+  getContext(job, jobToRun, onStale, isExecutionActive) {
     var _a;
     const effectiveLockTime = this.getEffectiveLockTime(job, jobToRun);
     let staleTimeout = setTimeout(() => onStale(), effectiveLockTime);
     (_a = staleTimeout.unref) == null ? void 0 : _a.call(staleTimeout);
+    const contextLogger = import_logger3.logger.addMetadata({
+      jobName: jobToRun.name,
+      jobId: jobToRun.jobId
+    });
     return {
       definition: job,
       record: jobToRun,
@@ -635,15 +690,26 @@ var Executor = class {
       clearStaleTimeout: () => clearTimeout(staleTimeout),
       extendLockTime: async (extraTime) => {
         var _a2;
+        if (!isExecutionActive()) {
+          contextLogger.warn(`Will not extend lock for stale execution "${jobToRun.executionId}"`);
+          return;
+        }
         clearTimeout(staleTimeout);
+        let didExtend = false;
+        try {
+          didExtend = await this.jobsRepo.extendLockTime(jobToRun.jobId, extraTime, jobToRun.lockId);
+        } catch (error) {
+          onStale();
+          throw error;
+        }
+        if (!didExtend) {
+          onStale();
+          return;
+        }
         staleTimeout = setTimeout(() => onStale(), extraTime);
         (_a2 = staleTimeout.unref) == null ? void 0 : _a2.call(staleTimeout);
-        await this.jobsRepo.extendLockTime(jobToRun.jobId, extraTime);
       },
-      logger: import_logger3.logger.addMetadata({
-        jobName: jobToRun.name,
-        jobId: jobToRun.jobId
-      })
+      logger: contextLogger
     };
   }
   getJobDefinition(jobToRun, jobs) {
@@ -675,8 +741,16 @@ var Executor = class {
     jobLogger.warn(
       `Job "${jobToRun.name}" has exceeded max tries (${jobToRun.tries}). Marking as maxTriesReached.`
     );
-    await this.jobsRepo.markJobAsMaxTriesReached(jobToRun.jobId, retentionMs);
-    if (!onMaxTriesReached) return;
+    const didMark = await this.jobsRepo.markJobAsMaxTriesReached(
+      jobToRun.jobId,
+      retentionMs,
+      jobToRun.lockId
+    );
+    if (!didMark) {
+      jobLogger.warn(`Could not mark job "${jobToRun.name}" because its lock is no longer owned`);
+      return false;
+    }
+    if (!onMaxTriesReached) return true;
     try {
       await onMaxTriesReached(jobToRun);
     } catch (callbackError) {
@@ -684,30 +758,33 @@ var Executor = class {
         error: callbackError
       });
     }
+    return true;
   }
   async onError(error, job, jobToRun, context) {
     const scheduleRecurrent = async () => {
       if (job.type === "recurrent") {
-        await this.jobsRepo.scheduleNextRun({
+        return this.jobsRepo.scheduleNextRun({
           jobId: jobToRun.jobId,
           nextRunAt: getNextRunDate(job),
           resetTries: true,
-          priority: job.priority
+          priority: job.priority,
+          lockId: jobToRun.lockId
         });
       }
+      return true;
     };
     const handleRetry = async (nextRunAt) => {
-      await this.jobsRepo.scheduleNextRun({
+      return this.jobsRepo.scheduleNextRun({
         jobId: jobToRun.jobId,
         nextRunAt,
         resetTries: false,
-        priority: job.type === "recurrent" ? job.priority : jobToRun.priority
+        priority: job.type === "recurrent" ? job.priority : jobToRun.priority,
+        lockId: jobToRun.lockId
       });
     };
     if (!job.onError) {
       context.logger.error(`Error executing job "${jobToRun.name}"`, { error });
-      await scheduleRecurrent();
-      return;
+      return scheduleRecurrent();
     }
     context.logger.info(`Error executing job "${jobToRun.name}"`, { error });
     const result = await job.onError(
@@ -716,12 +793,12 @@ var Executor = class {
       context
     );
     if (result.action === "dismiss") {
-      await scheduleRecurrent();
-      return;
+      return scheduleRecurrent();
     }
     if (result.action === "retry") {
-      await handleRetry(getNextRunDate(result));
+      return handleRetry(getNextRunDate(result));
     }
+    return true;
   }
   async saveExecution(options) {
     const { startedAt, status, errorMessage, result, job, jobToRun } = options;
@@ -751,19 +828,21 @@ var Executor = class {
   async afterExecutionSuccess(job, jobToRun, context) {
     if (job.type === "recurrent") {
       context.logger.debug(`Scheduling next run for recurrent job "${jobToRun.name}"`);
-      await this.jobsRepo.scheduleNextRun({
+      return this.jobsRepo.scheduleNextRun({
         jobId: jobToRun.jobId,
         nextRunAt: getNextRunDate(job),
         resetTries: true,
-        priority: job.priority
+        priority: job.priority,
+        lockId: jobToRun.lockId
       });
     }
     if (job.type === "event") {
       context.logger.debug(`Removing event job after success "${jobToRun.name}"`);
-      await this.jobsRepo.deleteEventJob(jobToRun.jobId);
+      return this.jobsRepo.deleteEventJob(jobToRun.jobId, jobToRun.lockId);
     }
+    return false;
   }
-  async executeJob(config, jobToRun, respawnWorker) {
+  async executeJob(config, jobToRun, onExecutionStale) {
     const job = this.getJobDefinition(jobToRun, config.jobs);
     if (!job) return;
     if (job.type === "event") {
@@ -779,33 +858,64 @@ var Executor = class {
     }
     const effectiveLockTime = this.getEffectiveLockTime(job, jobToRun);
     if (effectiveLockTime !== jobToRun.lockTime) {
-      await this.jobsRepo.updateLockTime(jobToRun.jobId, effectiveLockTime);
+      const didUpdateLock = await this.jobsRepo.updateLockTime(
+        jobToRun.jobId,
+        effectiveLockTime,
+        jobToRun.lockId
+      );
+      if (!didUpdateLock) {
+        import_logger3.logger.warn(`Will not execute job "${jobToRun.name}" because its lock is no longer owned`);
+        return;
+      }
     }
     const tracer = import_api.trace.getTracer("orionjs.dogs", "1.0");
     await tracer.startActiveSpan(`job.${jobToRun.name}.${jobToRun.executionId}`, async (span) => {
       try {
         const startedAt = /* @__PURE__ */ new Date();
-        const onStale = async () => {
-          if (job.onStale) {
-            context.logger.info(`Job "${jobToRun.name}" is stale`);
-            job.onStale(jobToRun.params, context);
-          } else {
-            context.logger.error(`Job "${jobToRun.name}" is stale`);
-          }
-          await this.jobsRepo.setJobRecordPriority(jobToRun.jobId, 0);
-          void respawnWorker();
-          void this.saveExecution({
-            startedAt,
-            status: "stale",
-            result: null,
-            errorMessage: null,
-            job,
-            jobToRun
-          }).catch((error) => {
-            context.logger.error("Error saving stale execution history", { error });
+        let executionStatus = "running";
+        let staleHandlingPromise;
+        let context;
+        const markAsStale = () => {
+          if (executionStatus === "stale") return staleHandlingPromise;
+          executionStatus = "stale";
+          context.clearStaleTimeout();
+          staleHandlingPromise = (async () => {
+            context.logger.warn(`Job "${jobToRun.name}" is stale`);
+            if (job.onStale) {
+              void Promise.resolve(job.onStale(jobToRun.params, context)).catch((error) => {
+                context.logger.error(`Error in onStale callback for job "${jobToRun.name}"`, {
+                  error
+                });
+              });
+            }
+            try {
+              await this.jobsRepo.setJobRecordPriority(jobToRun.jobId, 0, jobToRun.lockId);
+            } catch (error) {
+              context.logger.error(`Error lowering priority for stale job "${jobToRun.name}"`, {
+                error
+              });
+            } finally {
+              onExecutionStale();
+            }
+            await this.saveExecution({
+              startedAt,
+              status: "stale",
+              result: null,
+              errorMessage: null,
+              job,
+              jobToRun
+            });
+          })().catch((error) => {
+            context.logger.error("Error handling stale execution", { error });
           });
+          return staleHandlingPromise;
         };
-        const context = this.getContext(job, jobToRun, onStale);
+        context = this.getContext(
+          job,
+          jobToRun,
+          () => void markAsStale(),
+          () => executionStatus === "running"
+        );
         const extraContext = {
           controllerType: "job",
           jobName: jobToRun.name,
@@ -821,6 +931,18 @@ var Executor = class {
             });
             const result = await job.resolve(jobToRun.params, context);
             context.clearStaleTimeout();
+            if (executionStatus === "stale") {
+              await staleHandlingPromise;
+              context.logger.warn(
+                `Ignoring late success from stale execution "${jobToRun.executionId}"`
+              );
+              return;
+            }
+            const stillOwnsJob = await this.afterExecutionSuccess(job, jobToRun, context);
+            if (!stillOwnsJob) {
+              await markAsStale();
+              return;
+            }
             void this.saveExecution({
               startedAt,
               status: "success",
@@ -831,9 +953,21 @@ var Executor = class {
             }).catch((error) => {
               context.logger.error("Error saving successful execution history", { error });
             });
-            await this.afterExecutionSuccess(job, jobToRun, context);
           } catch (error) {
             context.clearStaleTimeout();
+            if (executionStatus === "stale") {
+              await staleHandlingPromise;
+              context.logger.warn(
+                `Ignoring late error from stale execution "${jobToRun.executionId}"`,
+                { error }
+              );
+              return;
+            }
+            const stillOwnsJob = await this.onError(error, job, jobToRun, context);
+            if (!stillOwnsJob) {
+              await markAsStale();
+              return;
+            }
             void this.saveExecution({
               startedAt,
               status: "error",
@@ -844,7 +978,6 @@ var Executor = class {
             }).catch((saveError) => {
               context.logger.error("Error saving failed execution history", { error: saveError });
             });
-            await this.onError(error, job, jobToRun, context);
           }
         });
       } catch (error) {
@@ -870,6 +1003,7 @@ var _executor_dec, _jobsRepo_dec3, _WorkerService_decorators, _init5;
 _WorkerService_decorators = [(0, import_services3.Service)()], _jobsRepo_dec3 = [(0, import_services3.Inject)(() => JobsRepo)], _executor_dec = [(0, import_services3.Inject)(() => Executor)];
 var WorkerService = class {
   constructor() {
+    __publicField(this, "jobAcquisitionHintProbeIntervalMs", 30 * 60 * 1e3);
     __publicField(this, "jobsRepo", __runInitializers(_init5, 8, this)), __runInitializers(_init5, 11, this);
     __publicField(this, "executor", __runInitializers(_init5, 12, this)), __runInitializers(_init5, 15, this);
   }
@@ -904,87 +1038,242 @@ var WorkerService = class {
     }
     workersInstance.runningJobsByName.set(jobName, currentExecutions - 1);
   }
-  async withJobAcquisitionLock(workersInstance, callback) {
-    const previousLock = workersInstance.jobAcquisitionLock;
-    let releaseLock;
-    workersInstance.jobAcquisitionLock = new Promise((resolve) => {
-      releaseLock = resolve;
-    });
-    await previousLock;
-    try {
-      return await callback();
-    } finally {
-      releaseLock();
+  releaseExecutionCapacity(workersInstance, execution, nextStatus) {
+    if (execution.status !== "running") return;
+    execution.status = nextStatus;
+    workersInstance.activeExecutions.delete(execution.job.executionId);
+    this.releaseJobExecution(workersInstance, execution.job.name);
+    execution.releaseCapacity();
+    if (nextStatus === "stale") {
+      workersInstance.staleExecutions.set(execution.job.executionId, execution);
     }
   }
-  async getJobAndReserveExecution(config, workersInstance, jobNames) {
-    return this.withJobAcquisitionLock(workersInstance, async () => {
-      const availableJobNames = this.getAvailableJobNames(config, workersInstance, jobNames);
-      if (availableJobNames.length === 0) return;
-      const jobToRun = await this.jobsRepo.getJobAndLock(availableJobNames, config.defaultLockTime);
-      if (!jobToRun) return;
-      this.reserveJobExecution(workersInstance, jobToRun.name);
-      return jobToRun;
+  startExecution(config, workersInstance, jobToRun) {
+    let releaseCapacity;
+    const capacityPromise = new Promise((resolve) => {
+      releaseCapacity = resolve;
+    });
+    const execution = {
+      job: jobToRun,
+      promise: Promise.resolve(),
+      capacityPromise,
+      releaseCapacity,
+      status: "running"
+    };
+    this.reserveJobExecution(workersInstance, jobToRun.name);
+    workersInstance.activeExecutions.set(jobToRun.executionId, execution);
+    import_logger4.logger.debug(`Starting job execution "${jobToRun.executionId}"`, jobToRun);
+    const executionPromise = this.executor.executeJob(config, jobToRun, () => {
+      this.releaseExecutionCapacity(workersInstance, execution, "stale");
+    });
+    execution.promise = executionPromise;
+    void executionPromise.catch((error) => {
+      import_logger4.logger.error(`Unhandled error executing job "${jobToRun.name}"`, { error });
+    }).finally(() => {
+      if (execution.status === "running") {
+        this.releaseExecutionCapacity(workersInstance, execution, "finished");
+      } else if (execution.status === "stale") {
+        workersInstance.staleExecutions.delete(jobToRun.executionId);
+      }
     });
   }
-  async runWorkerLoop(config, workersInstance, workerInstance, jobNames, executeConfig) {
-    const jobToRun = await this.getJobAndReserveExecution(config, workersInstance, jobNames);
-    if (!jobToRun) {
-      import_logger4.logger.debug("No job to run");
-      return false;
-    }
-    import_logger4.logger.debug(`Got job [w${workerInstance.workerIndex}] to run:`, jobToRun);
-    try {
-      await this.executor.executeJob(executeConfig, jobToRun, workerInstance.respawn);
-    } finally {
-      this.releaseJobExecution(workersInstance, jobToRun.name);
-    }
-    return true;
+  async waitForPollOrStop(config, workersInstance) {
+    await Promise.race([(0, import_helpers2.sleep)(config.pollInterval), workersInstance.stopSignal]);
   }
-  async startWorker(config, workersInstance, workerInstance) {
-    const names = this.getJobNames(config.jobs);
-    import_logger4.logger.debug(
-      `Running worker loop [w${workerInstance.workerIndex}] for jobs "${names.join(", ")}"...`
+  async waitForCapacityOrStop(workersInstance) {
+    const capacityPromises = Array.from(
+      workersInstance.activeExecutions.values(),
+      (execution) => execution.capacityPromise
     );
+    if (capacityPromises.length === 0) return;
+    await Promise.race([...capacityPromises, workersInstance.stopSignal]);
+  }
+  async runSchedulerLoop(config, workersInstance) {
+    const jobNames = this.getJobNames(config.jobs);
     const executeConfig = {
       jobs: config.jobs,
       maxTries: config.maxTries,
       maxTriesReachedRetentionMs: config.maxTriesReachedRetentionMs,
       onMaxTriesReached: config.onMaxTriesReached
     };
-    while (true) {
-      if (!workerInstance.running) {
-        import_logger4.logger.info(`Got signal to stop. Stopping worker [w${workerInstance.workerIndex}]...`);
-        return;
-      }
+    import_logger4.logger.debug(`Running scheduler loop for jobs "${jobNames.join(", ")}"...`);
+    while (workersInstance.running) {
+      let didMiss = false;
+      let allJobNamesAtCapacity = false;
       try {
-        const didRun = await this.runWorkerLoop(
-          config,
-          workersInstance,
-          workerInstance,
-          names,
-          executeConfig
-        );
-        if (!didRun) await (0, import_helpers2.sleep)(config.pollInterval);
-        if (didRun) await (0, import_helpers2.sleep)(config.cooldownPeriod);
+        while (workersInstance.activeExecutions.size < config.workersCount) {
+          const availableJobNames = this.getAvailableJobNames(config, workersInstance, jobNames);
+          if (availableJobNames.length === 0) {
+            allJobNamesAtCapacity = workersInstance.activeExecutions.size > 0;
+            break;
+          }
+          const jobToRun = await this.jobsRepo.getJobAndLock(
+            availableJobNames,
+            config.defaultLockTime,
+            workersInstance.jobAcquisitionHint
+          );
+          if (!jobToRun) {
+            import_logger4.logger.debug("No job to run");
+            didMiss = true;
+            break;
+          }
+          this.startExecution(executeConfig, workersInstance, jobToRun);
+          if (!workersInstance.running) break;
+        }
       } catch (error) {
-        import_logger4.logger.error("Error in job runner.", { error });
-        await (0, import_helpers2.sleep)(config.pollInterval);
+        import_logger4.logger.error("Error in job scheduler.", { error });
+        didMiss = true;
+      }
+      if (!workersInstance.running) return;
+      const concurrencyIsFull = workersInstance.activeExecutions.size >= config.workersCount && workersInstance.activeExecutions.size > 0;
+      if (concurrencyIsFull || allJobNamesAtCapacity) {
+        await this.waitForCapacityOrStop(workersInstance);
+      } else if (didMiss || workersInstance.activeExecutions.size === 0) {
+        await this.waitForPollOrStop(config, workersInstance);
+      }
+    }
+  }
+  getOtherJobAcquisitionHint(hint) {
+    return hint === INITIAL_JOB_ACQUISITION_HINT ? CANDIDATE_JOB_ACQUISITION_HINT : INITIAL_JOB_ACQUISITION_HINT;
+  }
+  getMedian(values) {
+    const sortedValues = [...values].sort((left, right) => left - right);
+    return sortedValues[Math.floor(sortedValues.length / 2)];
+  }
+  resetPendingJobAcquisitionHint(workersInstance) {
+    workersInstance.pendingJobAcquisitionHint = void 0;
+    workersInstance.pendingJobAcquisitionHintWins = 0;
+  }
+  async runJobAcquisitionHintProbe(config, workersInstance) {
+    const jobNames = this.getJobNames(config.jobs);
+    if (jobNames.length === 0 || !workersInstance.running) return;
+    const byHint = {
+      [INITIAL_JOB_ACQUISITION_HINT]: [],
+      [CANDIDATE_JOB_ACQUISITION_HINT]: []
+    };
+    const startsWithInitialHint = workersInstance.jobAcquisitionHintProbeCycle % 2 === 0;
+    const firstHint = startsWithInitialHint ? INITIAL_JOB_ACQUISITION_HINT : CANDIDATE_JOB_ACQUISITION_HINT;
+    const secondHint = this.getOtherJobAcquisitionHint(firstHint);
+    workersInstance.jobAcquisitionHintProbeCycle++;
+    try {
+      for (let sample = 0; sample < 3; sample++) {
+        for (const hint of [firstHint, secondHint]) {
+          if (!workersInstance.running) return;
+          const executionTimeMillis = await this.jobsRepo.getJobAcquisitionExecutionTime(
+            jobNames,
+            hint
+          );
+          if (!workersInstance.running) return;
+          byHint[hint].push(executionTimeMillis);
+        }
       }
+    } catch (error) {
+      this.resetPendingJobAcquisitionHint(workersInstance);
+      if (workersInstance.running) {
+        import_logger4.logger.warn("Job acquisition hint probe failed; keeping the current hint.", { error });
+      }
+      return;
+    }
+    const currentHint = workersInstance.jobAcquisitionHint;
+    const otherHint = this.getOtherJobAcquisitionHint(currentHint);
+    const currentMedian = this.getMedian(byHint[currentHint]);
+    const otherMedian = this.getMedian(byHint[otherHint]);
+    const winner = otherMedian < currentMedian ? otherHint : currentHint;
+    if (!workersInstance.hasCompletedInitialJobAcquisitionHintProbe) {
+      workersInstance.hasCompletedInitialJobAcquisitionHintProbe = true;
+      workersInstance.jobAcquisitionHint = winner;
+      this.resetPendingJobAcquisitionHint(workersInstance);
+      import_logger4.logger.info(`Selected job acquisition hint "${winner}" after startup probe.`);
+      return;
+    }
+    if (winner === currentHint) {
+      this.resetPendingJobAcquisitionHint(workersInstance);
+      import_logger4.logger.debug(`Keeping job acquisition hint "${currentHint}" after probe.`);
+      return;
+    }
+    if (workersInstance.pendingJobAcquisitionHint === winner) {
+      workersInstance.pendingJobAcquisitionHintWins++;
+    } else {
+      workersInstance.pendingJobAcquisitionHint = winner;
+      workersInstance.pendingJobAcquisitionHintWins = 1;
+    }
+    if (workersInstance.pendingJobAcquisitionHintWins < 2) {
+      import_logger4.logger.debug(
+        `Keeping job acquisition hint "${currentHint}"; "${winner}" has one consecutive probe win.`
+      );
+      return;
+    }
+    workersInstance.jobAcquisitionHint = winner;
+    this.resetPendingJobAcquisitionHint(workersInstance);
+    import_logger4.logger.info(`Changed job acquisition hint from "${currentHint}" to "${winner}".`);
+  }
+  async waitForNextJobAcquisitionHintProbe(workersInstance) {
+    await new Promise((resolve) => {
+      let resolved = false;
+      const finishWait = () => {
+        if (resolved) return;
+        resolved = true;
+        clearTimeout(workersInstance.jobAcquisitionHintProbeTimer);
+        workersInstance.jobAcquisitionHintProbeTimer = void 0;
+        workersInstance.cancelJobAcquisitionHintProbeWait = void 0;
+        resolve();
+      };
+      workersInstance.jobAcquisitionHintProbeTimer = setTimeout(
+        finishWait,
+        this.jobAcquisitionHintProbeIntervalMs
+      );
+      workersInstance.cancelJobAcquisitionHintProbeWait = finishWait;
+    });
+  }
+  async runJobAcquisitionHintProbeLoop(config, workersInstance) {
+    if (this.getJobNames(config.jobs).length === 0) return;
+    while (workersInstance.running) {
+      await this.runJobAcquisitionHintProbe(config, workersInstance);
+      if (!workersInstance.running) return;
+      await this.waitForNextJobAcquisitionHintProbe(workersInstance);
     }
   }
   createWorkersInstanceDefinition(config) {
+    let signalStop;
+    const stopSignal = new Promise((resolve) => {
+      signalStop = resolve;
+    });
     const workersInstance = {
       running: true,
       workersCount: config.workersCount,
-      workers: [],
+      activeExecutions: /* @__PURE__ */ new Map(),
+      staleExecutions: /* @__PURE__ */ new Map(),
       runningJobsByName: /* @__PURE__ */ new Map(),
-      jobAcquisitionLock: Promise.resolve(),
+      jobAcquisitionHint: INITIAL_JOB_ACQUISITION_HINT,
+      jobAcquisitionHintProbeCycle: 0,
+      hasCompletedInitialJobAcquisitionHintProbe: false,
+      pendingJobAcquisitionHintWins: 0,
+      jobAcquisitionHintProbePromise: Promise.resolve(),
+      schedulerPromise: Promise.resolve(),
+      stopSignal,
+      signalStop,
+      get runningExecutions() {
+        return this.activeExecutions.size;
+      },
       stop: async () => {
-        import_logger4.logger.info("Stopping workers...");
-        workersInstance.running = false;
-        const stopingPromises = workersInstance.workers.map((worker) => worker.stop());
-        await Promise.all(stopingPromises);
+        if (workersInstance.stopPromise) return workersInstance.stopPromise;
+        workersInstance.stopPromise = (async () => {
+          var _a;
+          import_logger4.logger.info("Stopping job scheduler...");
+          workersInstance.running = false;
+          workersInstance.signalStop();
+          (_a = workersInstance.cancelJobAcquisitionHintProbeWait) == null ? void 0 : _a.call(workersInstance);
+          await Promise.all([
+            workersInstance.schedulerPromise,
+            workersInstance.jobAcquisitionHintProbePromise
+          ]);
+          const activeCapacity = Array.from(
+            workersInstance.activeExecutions.values(),
+            (execution) => execution.capacityPromise
+          );
+          await Promise.all(activeCapacity);
+        })();
+        return workersInstance.stopPromise;
       }
     };
     return workersInstance;
@@ -998,44 +1287,17 @@ var WorkerService = class {
       })
     );
   }
-  async startANewWorker(config, workersInstance, workerIndex = workersInstance.workers.length) {
-    if (!workersInstance.running) {
-      return;
-    }
-    const workerInstance = {
-      running: true,
-      workerIndex,
-      stop: async () => {
-        import_logger4.logger.info(`Stopping worker [w${workerIndex}]...`);
-        workerInstance.running = false;
-        await workerInstance.promise;
-      },
-      respawn: async () => {
-        import_logger4.logger.info(`Respawning worker [w${workerIndex}]...`);
-        workerInstance.running = false;
-        await this.startANewWorker(config, workersInstance, workerIndex);
-      }
-    };
-    const workerPromise = this.startWorker(config, workersInstance, workerInstance);
-    workerInstance.promise = workerPromise;
-    workersInstance.workers[workerIndex] = workerInstance;
-  }
-  async runWorkers(config, workersInstance) {
+  async runScheduler(config, workersInstance) {
     import_logger4.logger.debug("Will ensure maxTriesReached retention and TTL index");
-    const ensureRetentionPromise = this.jobsRepo.ensureMaxTriesReachedRetention(config.maxTriesReachedRetentionMs).catch((error) => import_logger4.logger.error("Error ensuring maxTriesReached retention", { error }));
+    void this.jobsRepo.ensureMaxTriesReachedRetention(config.maxTriesReachedRetentionMs).catch((error) => import_logger4.logger.error("Error ensuring maxTriesReached retention", { error }));
     import_logger4.logger.debug("Will ensure records for recurrent jobs");
     await this.ensureRecords(config);
-    const workersCount = config.workersCount;
-    const workerWord = workersCount === 1 ? "worker" : "workers";
-    import_logger4.logger.info(`Starting ${workersCount} ${workerWord}`);
-    for (let workerIndex = 0; workerIndex < workersCount; workerIndex++) {
-      this.startANewWorker(config, workersInstance, workerIndex);
-    }
-    await ensureRetentionPromise;
+    import_logger4.logger.info(`Starting job scheduler with concurrency ${config.workersCount}`);
+    await this.runSchedulerLoop(config, workersInstance);
   }
   /**
-   * Starts the job workers with the provided configuration.
-   * @param userConfig - Configuration for the workers. Required field: jobs
+   * Starts one job scheduler with the provided concurrency configuration.
+   * @param userConfig - Configuration for the scheduler. Required field: jobs
    */
   startWorkers(userConfig) {
     const maxTriesReachedRetentionMs = userConfig.maxTriesReachedRetentionMs === void 0 ? DEFAULT_MAX_TRIES_REACHED_RETENTION_MS : userConfig.maxTriesReachedRetentionMs;
@@ -1043,7 +1305,6 @@ var WorkerService = class {
       throw new Error("maxTriesReachedRetentionMs must be null, zero, or a positive number");
     }
     const config = {
-      cooldownPeriod: 100,
       pollInterval: 3e3,
       workersCount: 4,
       defaultLockTime: 30 * 1e3,
@@ -1052,8 +1313,18 @@ var WorkerService = class {
     };
     setNameToJobs(config.jobs);
     const workersInstance = this.createWorkersInstanceDefinition(config);
-    import_logger4.logger.debug("Starting workers", config);
-    this.runWorkers(config, workersInstance);
+    import_logger4.logger.debug("Starting job scheduler", config);
+    workersInstance.jobAcquisitionHintProbePromise = this.runJobAcquisitionHintProbeLoop(
+      config,
+      workersInstance
+    );
+    workersInstance.schedulerPromise = this.runScheduler(config, workersInstance).catch((error) => {
+      var _a;
+      workersInstance.running = false;
+      workersInstance.signalStop();
+      (_a = workersInstance.cancelJobAcquisitionHintProbeWait) == null ? void 0 : _a.call(workersInstance);
+      import_logger4.logger.error("Job scheduler stopped after an unexpected error.", { error });
+    });
     return workersInstance;
   }
 };