@orion-js/dogs 4.6.6 → 4.6.7

package/dist/index.js

@@ -850,39 +850,102 @@ var Executor = class {
     return job.lockTime ?? jobToRun.lockTime;
   }
   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 = logger3.addMetadata({
       jobName: jobToRun.name,
       jobId: jobToRun.jobId
     });
+    let staleTimeout;
+    let watchdogCleared = false;
+    let staleReported = false;
+    let pendingExtraTime;
+    let renewalRunning = false;
+    let renewalPromise;
+    const clearCurrentStaleTimeout = () => {
+      if (staleTimeout === void 0) return;
+      clearTimeout(staleTimeout);
+      staleTimeout = void 0;
+    };
+    const reportStale = () => {
+      if (staleReported) return;
+      staleReported = true;
+      watchdogCleared = true;
+      pendingExtraTime = void 0;
+      clearCurrentStaleTimeout();
+      onStale();
+    };
+    const armStaleTimeout = (lockedUntil) => {
+      var _a;
+      if (watchdogCleared || staleReported || !isExecutionActive()) return;
+      clearCurrentStaleTimeout();
+      staleTimeout = setTimeout(
+        () => {
+          staleTimeout = void 0;
+          reportStale();
+        },
+        Math.max(0, lockedUntil - Date.now())
+      );
+      (_a = staleTimeout.unref) == null ? void 0 : _a.call(staleTimeout);
+    };
+    const runRenewals = async () => {
+      try {
+        while (pendingExtraTime !== void 0) {
+          const extraTime = pendingExtraTime;
+          pendingExtraTime = void 0;
+          if (watchdogCleared || staleReported || !isExecutionActive()) {
+            clearCurrentStaleTimeout();
+            return;
+          }
+          clearCurrentStaleTimeout();
+          const lockedUntil = Date.now() + extraTime;
+          let didExtend = false;
+          try {
+            didExtend = await this.jobsRepo.extendLockTime(
+              jobToRun.jobId,
+              extraTime,
+              jobToRun.lockId
+            );
+          } catch (error) {
+            reportStale();
+            throw error;
+          }
+          if (!didExtend) {
+            reportStale();
+            return;
+          }
+          if (watchdogCleared || staleReported || !isExecutionActive()) {
+            pendingExtraTime = void 0;
+            clearCurrentStaleTimeout();
+            return;
+          }
+          armStaleTimeout(lockedUntil);
+        }
+      } finally {
+        renewalRunning = false;
+        renewalPromise = void 0;
+      }
+    };
+    armStaleTimeout(Date.now() + effectiveLockTime);
     return {
       definition: job,
       record: jobToRun,
       tries: jobToRun.tries || 0,
-      clearStaleTimeout: () => clearTimeout(staleTimeout),
-      extendLockTime: async (extraTime) => {
-        var _a2;
-        if (!isExecutionActive()) {
+      clearStaleTimeout: () => {
+        watchdogCleared = true;
+        pendingExtraTime = void 0;
+        clearCurrentStaleTimeout();
+      },
+      extendLockTime: (extraTime) => {
+        if (watchdogCleared || staleReported || !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;
+          return Promise.resolve();
         }
-        if (!didExtend) {
-          onStale();
-          return;
+        pendingExtraTime = Math.max(pendingExtraTime ?? extraTime, extraTime);
+        if (!renewalRunning) {
+          renewalRunning = true;
+          renewalPromise = runRenewals();
         }
-        staleTimeout = setTimeout(() => onStale(), extraTime);
-        (_a2 = staleTimeout.unref) == null ? void 0 : _a2.call(staleTimeout);
+        return renewalPromise ?? Promise.resolve();
       },
       logger: contextLogger
     };