queue-jobs-worker 1.0.2 → 1.0.3

package/dist/index.js

@@ -75,7 +75,7 @@ function hashToJob(h) {
   if (h["cron"]) job.cron = h["cron"];
   return job;
 }
-var PREFIX, k, CLAIM_LUA, RECOVER_STALLED_LUA, RedisStorageAdapter;
+var PREFIX, k, CLAIM_LUA, RECOVER_STALLED_LUA, RENEW_LOCK_LUA, RedisStorageAdapter;
 var init_redis_adapter = __esm({
   "src/storage/redis.adapter.ts"() {
     PREFIX = "qjw:";
@@ -159,6 +159,24 @@ redis.call('HSET', job_key,
 redis.call('SREM', active_set,   job_id)
 redis.call('ZADD', waiting_zset, priority_score, job_id)
 return 1
+`;
+    RENEW_LOCK_LUA = `
+local job_key = KEYS[1]
+local lock_id = ARGV[1]
+local new_exp = ARGV[2]
+local now_iso = ARGV[3]
+
+local fields = redis.call('HMGET', job_key, 'status', 'lockId', 'lockExpiresAt')
+local status = fields[1] or ''
+local current_lock = fields[2] or ''
+local current_exp = fields[3] or ''
+
+if status ~= 'active' then return 0 end
+if current_lock ~= lock_id then return 0 end
+if current_exp == '' or current_exp <= now_iso then return 0 end
+
+redis.call('HSET', job_key, 'lockExpiresAt', new_exp, 'updatedAt', now_iso)
+return 1
 `;
     RedisStorageAdapter = class {
       client;
@@ -249,12 +267,28 @@ return 1
         return hashToJob(hash);
       }
       // -------------------------------------------------------------------------
+      // Renew lock
+      // -------------------------------------------------------------------------
+      async renewLock(jobId, lockId, lockDuration) {
+        const nowMs = Date.now();
+        const nowIso = new Date(nowMs).toISOString();
+        const newExpiresAt = new Date(nowMs + lockDuration).toISOString();
+        const res = await this.client.eval(RENEW_LOCK_LUA, {
+          keys: [k.job(jobId)],
+          arguments: [lockId, newExpiresAt, nowIso]
+        });
+        return Number(res) === 1;
+      }
+      // -------------------------------------------------------------------------
       // Complete
       // -------------------------------------------------------------------------
-      async complete(jobId) {
+      async complete(jobId, lockId) {
         const now = (/* @__PURE__ */ new Date()).toISOString();
         const hash = await this.client.hGetAll(k.job(jobId));
-        if (!hash) return;
+        if (!hash || Object.keys(hash).length === 0) return;
+        if (lockId !== void 0) {
+          if (hash["status"] !== "active" || hash["lockId"] !== lockId) return;
+        }
         const queue = hash["queue"] ?? "";
         const multi = this.client.multi();
         multi.hSet(k.job(jobId), {
@@ -274,7 +308,10 @@ return 1
       async requeue(input) {
         const now = (/* @__PURE__ */ new Date()).toISOString();
         const hash = await this.client.hGetAll(k.job(input.jobId));
-        if (!hash) return;
+        if (!hash || Object.keys(hash).length === 0) return;
+        if (input.lockId !== void 0) {
+          if (hash["status"] !== "active" || hash["lockId"] !== input.lockId) return;
+        }
         const queue = hash["queue"] ?? "";
         const attempts = JSON.parse(hash["attempts"] ?? "[]");
         attempts.push({
@@ -307,7 +344,10 @@ return 1
       async moveToDlq(input) {
         const now = (/* @__PURE__ */ new Date()).toISOString();
         const hash = await this.client.hGetAll(k.job(input.jobId));
-        if (!hash) return;
+        if (!hash || Object.keys(hash).length === 0) return;
+        if (input.lockId !== void 0) {
+          if (hash["status"] !== "active" || hash["lockId"] !== input.lockId) return;
+        }
         const queue = hash["queue"] ?? "";
         const attempts = JSON.parse(hash["attempts"] ?? "[]");
         attempts.push({
@@ -334,7 +374,12 @@ return 1
       // -------------------------------------------------------------------------
       // Release lock
       // -------------------------------------------------------------------------
-      async releaseLock(jobId) {
+      async releaseLock(jobId, lockId) {
+        const hash = await this.client.hGetAll(k.job(jobId));
+        if (!hash || Object.keys(hash).length === 0) return;
+        if (lockId !== void 0) {
+          if (hash["status"] !== "active" || hash["lockId"] !== lockId) return;
+        }
         const now = (/* @__PURE__ */ new Date()).toISOString();
         await this.client.hSet(k.job(jobId), {
           lockId: "",
@@ -661,16 +706,40 @@ CREATE TABLE IF NOT EXISTS qjw_rate_limits (
         }
       }
       // -------------------------------------------------------------------------
-      // Complete
+      // Renew lock
       // -------------------------------------------------------------------------
-      async complete(jobId) {
-        await this.pool.query(
+      async renewLock(jobId, lockId, lockDuration) {
+        const newLockExpiresAt = new Date(Date.now() + lockDuration).toISOString();
+        const res = await this.pool.query(
           `UPDATE qjw_jobs
-       SET status = 'completed', lock_id = NULL, lock_expires_at = NULL,
-           completed_at = NOW(), updated_at = NOW()
-       WHERE id = $1`,
-          [jobId]
+       SET lock_expires_at = $1::timestamptz,
+           updated_at = NOW()
+       WHERE id = $2 AND status = 'active' AND lock_id = $3 AND lock_expires_at > NOW()`,
+          [newLockExpiresAt, jobId, lockId]
         );
+        return (res.rowCount ?? 0) > 0;
+      }
+      // -------------------------------------------------------------------------
+      // Complete
+      // -------------------------------------------------------------------------
+      async complete(jobId, lockId) {
+        if (lockId !== void 0) {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status = 'completed', lock_id = NULL, lock_expires_at = NULL,
+             completed_at = NOW(), updated_at = NOW()
+         WHERE id = $1 AND status = 'active' AND lock_id = $2`,
+            [jobId, lockId]
+          );
+        } else {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status = 'completed', lock_id = NULL, lock_expires_at = NULL,
+             completed_at = NOW(), updated_at = NOW()
+         WHERE id = $1`,
+            [jobId]
+          );
+        }
       }
       // -------------------------------------------------------------------------
       // Requeue
@@ -684,18 +753,33 @@ CREATE TABLE IF NOT EXISTS qjw_rate_limits (
           error: input.error,
           ...input.stack !== void 0 ? { stack: input.stack } : {}
         };
-        await this.pool.query(
-          `UPDATE qjw_jobs
-       SET status         = 'waiting',
-           attempts_made  = attempts_made + 1,
-           attempts       = attempts || $1::jsonb,
-           run_at         = $2::timestamptz,
-           lock_id        = NULL,
-           lock_expires_at = NULL,
-           updated_at     = NOW()
-       WHERE id = $3`,
-          [JSON.stringify([attempt]), input.runAt, input.jobId]
-        );
+        if (input.lockId !== void 0) {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status          = 'waiting',
+             attempts_made   = $1,
+             attempts        = attempts || $2::jsonb,
+             run_at          = $3::timestamptz,
+             lock_id         = NULL,
+             lock_expires_at = NULL,
+             updated_at      = NOW()
+         WHERE id = $4 AND status = 'active' AND lock_id = $5`,
+            [input.attemptNumber, JSON.stringify([attempt]), input.runAt, input.jobId, input.lockId]
+          );
+        } else {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status         = 'waiting',
+             attempts_made  = $1,
+             attempts       = attempts || $2::jsonb,
+             run_at         = $3::timestamptz,
+             lock_id        = NULL,
+             lock_expires_at = NULL,
+             updated_at     = NOW()
+         WHERE id = $4`,
+            [input.attemptNumber, JSON.stringify([attempt]), input.runAt, input.jobId]
+          );
+        }
       }
       // -------------------------------------------------------------------------
       // Move to DLQ
@@ -709,29 +793,53 @@ CREATE TABLE IF NOT EXISTS qjw_rate_limits (
           error: input.error,
           ...input.stack !== void 0 ? { stack: input.stack } : {}
         };
-        await this.pool.query(
-          `UPDATE qjw_jobs
-       SET status          = 'dead',
-           attempts_made   = attempts_made + 1,
-           attempts        = attempts || $1::jsonb,
-           lock_id         = NULL,
-           lock_expires_at = NULL,
-           failed_at       = NOW(),
-           updated_at      = NOW()
-       WHERE id = $2`,
-          [JSON.stringify([attempt]), input.jobId]
-        );
+        if (input.lockId !== void 0) {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status          = 'dead',
+             attempts_made   = $1,
+             attempts        = attempts || $2::jsonb,
+             lock_id         = NULL,
+             lock_expires_at = NULL,
+             failed_at       = NOW(),
+             updated_at      = NOW()
+         WHERE id = $3 AND status = 'active' AND lock_id = $4`,
+            [input.attemptNumber, JSON.stringify([attempt]), input.jobId, input.lockId]
+          );
+        } else {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status          = 'dead',
+             attempts_made   = $1,
+             attempts        = attempts || $2::jsonb,
+             lock_id         = NULL,
+             lock_expires_at = NULL,
+             failed_at       = NOW(),
+             updated_at      = NOW()
+         WHERE id = $3`,
+            [input.attemptNumber, JSON.stringify([attempt]), input.jobId]
+          );
+        }
       }
       // -------------------------------------------------------------------------
       // Release lock
       // -------------------------------------------------------------------------
-      async releaseLock(jobId) {
-        await this.pool.query(
-          `UPDATE qjw_jobs
-       SET lock_id = NULL, lock_expires_at = NOW(), updated_at = NOW()
-       WHERE id = $1`,
-          [jobId]
-        );
+      async releaseLock(jobId, lockId) {
+        if (lockId !== void 0) {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET lock_id = NULL, lock_expires_at = NOW(), updated_at = NOW()
+         WHERE id = $1 AND status = 'active' AND lock_id = $2`,
+            [jobId, lockId]
+          );
+        } else {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET lock_id = NULL, lock_expires_at = NOW(), updated_at = NOW()
+         WHERE id = $1`,
+            [jobId]
+          );
+        }
       }
       // -------------------------------------------------------------------------
       // Recover stalled jobs
@@ -1012,16 +1120,39 @@ CREATE TABLE IF NOT EXISTS qjw_rate_limits (
         }
       }
       // -------------------------------------------------------------------------
-      // Complete
+      // Renew lock
       // -------------------------------------------------------------------------
-      async complete(jobId) {
-        await this.pool.query(
+      async renewLock(jobId, lockId, lockDuration) {
+        const newLockExpiresAt = new Date(Date.now() + lockDuration).toISOString().slice(0, 23).replace("T", " ");
+        const [result] = await this.pool.query(
           `UPDATE qjw_jobs
-       SET status = 'completed', lock_id = NULL, lock_expires_at = NULL,
-           completed_at = NOW(3), updated_at = NOW(3)
-       WHERE id = ?`,
-          [jobId]
+       SET lock_expires_at = ?, updated_at = NOW(3)
+       WHERE id = ? AND status = 'active' AND lock_id = ? AND lock_expires_at > NOW(3)`,
+          [newLockExpiresAt, jobId, lockId]
         );
+        return result.affectedRows > 0;
+      }
+      // -------------------------------------------------------------------------
+      // Complete
+      // -------------------------------------------------------------------------
+      async complete(jobId, lockId) {
+        if (lockId !== void 0) {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status = 'completed', lock_id = NULL, lock_expires_at = NULL,
+             completed_at = NOW(3), updated_at = NOW(3)
+         WHERE id = ? AND status = 'active' AND lock_id = ?`,
+            [jobId, lockId]
+          );
+        } else {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status = 'completed', lock_id = NULL, lock_expires_at = NULL,
+             completed_at = NOW(3), updated_at = NOW(3)
+         WHERE id = ?`,
+            [jobId]
+          );
+        }
       }
       // -------------------------------------------------------------------------
       // Requeue
@@ -1035,18 +1166,33 @@ CREATE TABLE IF NOT EXISTS qjw_rate_limits (
           error: input.error,
           ...input.stack !== void 0 ? { stack: input.stack } : {}
         });
-        await this.pool.query(
-          `UPDATE qjw_jobs
-       SET status          = 'waiting',
-           attempts_made   = attempts_made + 1,
-           attempts        = JSON_ARRAY_APPEND(attempts, '$', CAST(? AS JSON)),
-           run_at          = ?,
-           lock_id         = NULL,
-           lock_expires_at = NULL,
-           updated_at      = NOW(3)
-       WHERE id = ?`,
-          [attempt, input.runAt, input.jobId]
-        );
+        if (input.lockId !== void 0) {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status          = 'waiting',
+             attempts_made   = attempts_made + 1,
+             attempts        = JSON_ARRAY_APPEND(attempts, '$', CAST(? AS JSON)),
+             run_at          = ?,
+             lock_id         = NULL,
+             lock_expires_at = NULL,
+             updated_at      = NOW(3)
+         WHERE id = ? AND status = 'active' AND lock_id = ?`,
+            [attempt, input.runAt, input.jobId, input.lockId]
+          );
+        } else {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status          = 'waiting',
+             attempts_made   = attempts_made + 1,
+             attempts        = JSON_ARRAY_APPEND(attempts, '$', CAST(? AS JSON)),
+             run_at          = ?,
+             lock_id         = NULL,
+             lock_expires_at = NULL,
+             updated_at      = NOW(3)
+         WHERE id = ?`,
+            [attempt, input.runAt, input.jobId]
+          );
+        }
       }
       // -------------------------------------------------------------------------
       // Move to DLQ
@@ -1060,29 +1206,53 @@ CREATE TABLE IF NOT EXISTS qjw_rate_limits (
           error: input.error,
           ...input.stack !== void 0 ? { stack: input.stack } : {}
         });
-        await this.pool.query(
-          `UPDATE qjw_jobs
-       SET status          = 'dead',
-           attempts_made   = attempts_made + 1,
-           attempts        = JSON_ARRAY_APPEND(attempts, '$', CAST(? AS JSON)),
-           lock_id         = NULL,
-           lock_expires_at = NULL,
-           failed_at       = NOW(3),
-           updated_at      = NOW(3)
-       WHERE id = ?`,
-          [attempt, input.jobId]
-        );
+        if (input.lockId !== void 0) {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status          = 'dead',
+             attempts_made   = attempts_made + 1,
+             attempts        = JSON_ARRAY_APPEND(attempts, '$', CAST(? AS JSON)),
+             lock_id         = NULL,
+             lock_expires_at = NULL,
+             failed_at       = NOW(3),
+             updated_at      = NOW(3)
+         WHERE id = ? AND status = 'active' AND lock_id = ?`,
+            [attempt, input.jobId, input.lockId]
+          );
+        } else {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET status          = 'dead',
+             attempts_made   = attempts_made + 1,
+             attempts        = JSON_ARRAY_APPEND(attempts, '$', CAST(? AS JSON)),
+             lock_id         = NULL,
+             lock_expires_at = NULL,
+             failed_at       = NOW(3),
+             updated_at      = NOW(3)
+         WHERE id = ?`,
+            [attempt, input.jobId]
+          );
+        }
       }
       // -------------------------------------------------------------------------
       // Release lock
       // -------------------------------------------------------------------------
-      async releaseLock(jobId) {
-        await this.pool.query(
-          `UPDATE qjw_jobs
-       SET lock_id = NULL, lock_expires_at = NOW(3), updated_at = NOW(3)
-       WHERE id = ?`,
-          [jobId]
-        );
+      async releaseLock(jobId, lockId) {
+        if (lockId !== void 0) {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET lock_id = NULL, lock_expires_at = NOW(3), updated_at = NOW(3)
+         WHERE id = ? AND status = 'active' AND lock_id = ?`,
+            [jobId, lockId]
+          );
+        } else {
+          await this.pool.query(
+            `UPDATE qjw_jobs
+         SET lock_id = NULL, lock_expires_at = NOW(3), updated_at = NOW(3)
+         WHERE id = ?`,
+            [jobId]
+          );
+        }
       }
       // -------------------------------------------------------------------------
       // Recover stalled jobs  (atomic — SELECT … FOR UPDATE inside transaction)
@@ -1473,7 +1643,7 @@ var Worker = class {
     if (this.activeJobIds.size > 0) {
       await Promise.all(
         Array.from(this.activeJobIds).map(
-          (jobId) => this.storage.releaseLock(jobId).catch(() => {
+          (jobId) => this.storage.releaseLock(jobId, this.id).catch(() => {
           })
         )
       );
@@ -1525,7 +1695,7 @@ var Worker = class {
         now
       );
       if (!allowed) {
-        await this.storage.releaseLock(raw.id);
+        await this.storage.releaseLock(raw.id, this.id);
         return false;
       }
     }
@@ -1545,16 +1715,35 @@ var Worker = class {
       await this.handleFailure(job, error);
       return;
     }
+    const abortController = new AbortController();
     let timeoutHandle = null;
+    let lockRenewTimer = null;
+    const lockRenewInterval = Math.max(100, Math.floor(this.config.lockDuration / 2));
+    lockRenewTimer = setInterval(async () => {
+      try {
+        const renewed = await this.storage.renewLock(job.id, this.id, this.config.lockDuration);
+        if (!renewed && lockRenewTimer) {
+          clearInterval(lockRenewTimer);
+          lockRenewTimer = null;
+        }
+      } catch {
+      }
+    }, lockRenewInterval);
     try {
       await new Promise((resolve, reject) => {
         timeoutHandle = setTimeout(() => {
-          reject(new Error(`Job timed out after ${job.timeout}ms`));
+          const timeoutError = new Error(`Job timed out after ${job.timeout}ms`);
+          abortController.abort(timeoutError);
+          reject(timeoutError);
         }, job.timeout);
-        Promise.resolve(processor(job)).then(resolve, reject);
+        Promise.resolve(processor(job, abortController.signal)).then(resolve, reject);
       });
       if (timeoutHandle) clearTimeout(timeoutHandle);
-      await this.storage.complete(job.id);
+      if (lockRenewTimer) {
+        clearInterval(lockRenewTimer);
+        lockRenewTimer = null;
+      }
+      await this.storage.complete(job.id, this.id);
       const completedData = await this.storage.getJob(job.id) ?? job._data;
       this.emitter.emit("job:completed", completedData);
       if (job.cron) {
@@ -1562,9 +1751,17 @@ var Worker = class {
       }
     } catch (err) {
       if (timeoutHandle) clearTimeout(timeoutHandle);
+      if (lockRenewTimer) {
+        clearInterval(lockRenewTimer);
+        lockRenewTimer = null;
+      }
       const error = err instanceof Error ? err : new Error(String(err));
       await this.handleFailure(job, error);
     } finally {
+      if (lockRenewTimer) {
+        clearInterval(lockRenewTimer);
+        lockRenewTimer = null;
+      }
       this.activeJobIds.delete(job.id);
       this.activeCount -= 1;
       if (this.activeCount === 0 && this.drainResolve) {
@@ -1630,6 +1827,7 @@ var Worker = class {
         runAt,
         error: error.message,
         attemptNumber,
+        lockId: this.id,
         ...error.stack !== void 0 && { stack: error.stack }
       });
       const updated = await this.storage.getJob(job.id);
@@ -1641,6 +1839,7 @@ var Worker = class {
         jobId: job.id,
         error: error.message,
         attemptNumber,
+        lockId: this.id,
         ...error.stack !== void 0 && { stack: error.stack }
       });
       const dead = await this.storage.getJob(job.id);
@@ -1900,10 +2099,29 @@ var InMemoryStorageAdapter = class {
     return job;
   }
   // -------------------------------------------------------------------------
+  // Renew lock
+  // -------------------------------------------------------------------------
+  async renewLock(jobId, lockId, lockDuration) {
+    const job = this.jobs.get(jobId);
+    if (!job) return false;
+    if (job.status !== "active" || job.lockId !== lockId) return false;
+    const nowMs = Date.now();
+    if (job.lockExpiresAt !== null && new Date(job.lockExpiresAt).getTime() <= nowMs) {
+      return false;
+    }
+    job.lockExpiresAt = new Date(nowMs + lockDuration).toISOString();
+    job.updatedAt = new Date(nowMs).toISOString();
+    return true;
+  }
+  // -------------------------------------------------------------------------
   // Complete
   // -------------------------------------------------------------------------
-  async complete(jobId) {
-    const job = this.requireJob(jobId);
+  async complete(jobId, lockId) {
+    const job = this.jobs.get(jobId);
+    if (!job) return;
+    if (lockId !== void 0 && (job.status !== "active" || job.lockId !== lockId)) {
+      return;
+    }
     const now = (/* @__PURE__ */ new Date()).toISOString();
     job.status = "completed";
     job.lockId = null;
@@ -1915,7 +2133,11 @@ var InMemoryStorageAdapter = class {
   // Requeue (retry)
   // -------------------------------------------------------------------------
   async requeue(input) {
-    const job = this.requireJob(input.jobId);
+    const job = this.jobs.get(input.jobId);
+    if (!job) return;
+    if (input.lockId !== void 0 && (job.status !== "active" || job.lockId !== input.lockId)) {
+      return;
+    }
     const now = (/* @__PURE__ */ new Date()).toISOString();
     job.attempts.push({
       attempt: input.attemptNumber,
@@ -1935,7 +2157,11 @@ var InMemoryStorageAdapter = class {
   // Move to DLQ
   // -------------------------------------------------------------------------
   async moveToDlq(input) {
-    const job = this.requireJob(input.jobId);
+    const job = this.jobs.get(input.jobId);
+    if (!job) return;
+    if (input.lockId !== void 0 && (job.status !== "active" || job.lockId !== input.lockId)) {
+      return;
+    }
     const now = (/* @__PURE__ */ new Date()).toISOString();
     job.attempts.push({
       attempt: input.attemptNumber,
@@ -1954,9 +2180,12 @@ var InMemoryStorageAdapter = class {
   // -------------------------------------------------------------------------
   // Release lock
   // -------------------------------------------------------------------------
-  async releaseLock(jobId) {
+  async releaseLock(jobId, lockId) {
     const job = this.jobs.get(jobId);
     if (!job) return;
+    if (lockId !== void 0 && (job.status !== "active" || job.lockId !== lockId)) {
+      return;
+    }
     const now = (/* @__PURE__ */ new Date()).toISOString();
     job.lockId = null;
     job.lockExpiresAt = now;