@absurd-sqlite/bun-worker 0.2.2-alpha.1 → 0.2.2-alpha.2

package/bun.lock

@@ -6,7 +6,7 @@
       "name": "@absurd-sqlite/bun-worker",
       "dependencies": {
         "@absurd-sqlite/sdk": "next",
-        "absurd-sdk": "~0.0.7",
+        "absurd-sdk": "https://github.com/bcho/absurd/releases/download/sdks%2Ftypescript%2Fv0.0.7/typescript-sdk-v0.0.7.tgz",
         "cac": "^6.7.14",
       },
       "devDependencies": {
@@ -16,11 +16,11 @@
     },
   },
   "packages": {
-    "@absurd-sqlite/sdk": ["@absurd-sqlite/sdk@0.2.1-alpha.1", "", { "dependencies": { "absurd-sdk": "~0.0.7" }, "peerDependencies": { "better-sqlite3": "^12.5.0" } }, "sha512-gIly9R1ZO/9Ja/dDbVupxs5Yd4AXx+iDz5PIsq0qg/GSCCIujxt8VXI4c+BvkbvEY1ew7mpvmZa/ttMkKopFrA=="],
+    "@absurd-sqlite/sdk": ["@absurd-sqlite/sdk@0.2.1-alpha.2", "", { "dependencies": { "absurd-sdk": "https://github.com/bcho/absurd/releases/download/sdks%2Ftypescript%2Fv0.0.7/typescript-sdk-v0.0.7.tgz" }, "peerDependencies": { "better-sqlite3": "^12.5.0" } }, "sha512-+8qBOtV/aoHX7BbzxIkzGpuG/o8RQ73Njyxt8Og04NvevceSeUtQ1IlF1Syil5v8EVMsAa2sshuBU0LzZKW/5A=="],
 
     "@types/node": ["@types/node@25.0.3", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA=="],
 
-    "absurd-sdk": ["absurd-sdk@0.0.7", "", { "peerDependencies": { "pg": "^8.0.0" } }, "sha512-8e+LUdtzLHFMMF5vaVCKfp0aZ21t3aazgVkYUFzhb9kL+/bQkD8Vw68tgEAUz53pT2xfIrScTA9QZXYfC1KDtA=="],
+    "absurd-sdk": ["absurd-sdk@https://github.com/bcho/absurd/releases/download/sdks%2Ftypescript%2Fv0.0.7/typescript-sdk-v0.0.7.tgz", { "peerDependencies": { "pg": "^8.0.0" } }],
 
     "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="],
 

package/dist/index.js

@@ -4772,6 +4772,47 @@ class TimeoutError extends Error {
   }
 }
 
+class LeaseTimerManager {
+  log;
+  taskLabel;
+  fatalOnLeaseTimeout;
+  warnTimer = null;
+  fatalTimer = null;
+  constructor(log, taskLabel, fatalOnLeaseTimeout) {
+    this.log = log;
+    this.taskLabel = taskLabel;
+    this.fatalOnLeaseTimeout = fatalOnLeaseTimeout;
+  }
+  update(leaseSeconds) {
+    this.clear();
+    if (leaseSeconds <= 0) {
+      return;
+    }
+    this.warnTimer = setTimeout(() => {
+      this.log.warn(`task ${this.taskLabel} exceeded claim timeout of ${leaseSeconds}s`);
+    }, leaseSeconds * 1000);
+    if (this.fatalOnLeaseTimeout) {
+      this.fatalTimer = setTimeout(() => {
+        this.log.error(`task ${this.taskLabel} exceeded claim timeout of ${leaseSeconds}s by more than 100%; terminating process`);
+        process.exit(1);
+      }, leaseSeconds * 1000 * 2);
+    }
+  }
+  stop() {
+    this.clear();
+  }
+  clear() {
+    if (this.warnTimer) {
+      clearTimeout(this.warnTimer);
+      this.warnTimer = null;
+    }
+    if (this.fatalTimer) {
+      clearTimeout(this.fatalTimer);
+      this.fatalTimer = null;
+    }
+  }
+}
+
 class TaskContext {
   log;
   taskID;
@@ -4780,8 +4821,9 @@ class TaskContext {
   task;
   checkpointCache;
   claimTimeout;
+  leaseTimer;
   stepNameCounter = new Map;
-  constructor(log, taskID, con, queueName, task, checkpointCache, claimTimeout) {
+  constructor(log, taskID, con, queueName, task, checkpointCache, claimTimeout, leaseTimer) {
     this.log = log;
     this.taskID = taskID;
     this.con = con;
@@ -4789,19 +4831,21 @@ class TaskContext {
     this.task = task;
     this.checkpointCache = checkpointCache;
     this.claimTimeout = claimTimeout;
+    this.leaseTimer = leaseTimer;
   }
   get headers() {
     return this.task.headers ?? {};
   }
   static async create(args) {
-    const { log, taskID, con, queueName, task, claimTimeout } = args;
+    const { log, taskID, con, queueName, task, claimTimeout, leaseTimer } = args;
     const result = await con.query(`SELECT checkpoint_name, state, status, owner_run_id, updated_at
        FROM absurd.get_task_checkpoint_states($1, $2, $3)`, [queueName, task.task_id, task.run_id]);
     const cache = new Map;
     for (const row of result.rows) {
       cache.set(row.checkpoint_name, row.state);
     }
-    return new TaskContext(log, taskID, con, queueName, task, cache, claimTimeout);
+    const ctx = new TaskContext(log, taskID, con, queueName, task, cache, claimTimeout, leaseTimer);
+    return ctx;
   }
   async queryWithCancelCheck(sql, params) {
     try {
@@ -4868,6 +4912,7 @@ class TaskContext {
       this.claimTimeout
     ]);
     this.checkpointCache.set(checkpointName, value);
+    this.recordLeaseExtension(this.claimTimeout);
   }
   async scheduleRun(wakeAt) {
     await this.con.query(`SELECT absurd.schedule_run($1, $2, $3)`, [
@@ -4913,11 +4958,16 @@ class TaskContext {
     throw new SuspendTask;
   }
   async heartbeat(seconds) {
+    const leaseSeconds = seconds ?? this.claimTimeout;
     await this.queryWithCancelCheck(`SELECT absurd.extend_claim($1, $2, $3)`, [
       this.queueName,
       this.task.run_id,
-      seconds ?? this.claimTimeout
+      leaseSeconds
     ]);
+    this.recordLeaseExtension(leaseSeconds);
+  }
+  recordLeaseExtension(leaseSeconds) {
+    this.leaseTimer.update(leaseSeconds);
   }
   async emitEvent(eventName, payload) {
     if (!eventName) {
@@ -5171,30 +5221,20 @@ class Absurd {
     }
   }
   async executeTask(task, claimTimeout, options) {
-    let warnTimer;
-    let fatalTimer;
     const registration = this.registry.get(task.task_name);
+    const taskLabel = `${task.task_name} (${task.task_id})`;
+    const leaseTimer = new LeaseTimerManager(this.log, taskLabel, options?.fatalOnLeaseTimeout ?? false);
     const ctx = await TaskContext.create({
       log: this.log,
       taskID: task.task_id,
       con: this.con,
       queueName: registration?.queue ?? "unknown",
       task,
-      claimTimeout
+      claimTimeout,
+      leaseTimer
     });
+    leaseTimer.update(claimTimeout);
     try {
-      if (claimTimeout > 0) {
-        const taskLabel = `${task.task_name} (${task.task_id})`;
-        warnTimer = setTimeout(() => {
-          this.log.warn(`task ${taskLabel} exceeded claim timeout of ${claimTimeout}s`);
-        }, claimTimeout * 1000);
-        if (options?.fatalOnLeaseTimeout) {
-          fatalTimer = setTimeout(() => {
-            this.log.error(`task ${taskLabel} exceeded claim timeout of ${claimTimeout}s by more than 100%; terminating process`);
-            process.exit(1);
-          }, claimTimeout * 1000 * 2);
-        }
-      }
       if (!registration) {
         throw new Error("Unknown task");
       } else if (registration.queue !== this.queueName) {
@@ -5216,12 +5256,7 @@ class Absurd {
       this.log.error("[absurd] task execution failed:", err);
       await failTaskRun(this.con, this.queueName, task.run_id, err);
     } finally {
-      if (warnTimer) {
-        clearTimeout(warnTimer);
-      }
-      if (fatalTimer) {
-        clearTimeout(fatalTimer);
-      }
+      leaseTimer.stop();
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@absurd-sqlite/bun-worker",
-  "version": "0.2.2-alpha.1",
+  "version": "0.2.2-alpha.2",
   "description": "Bun worker utilities for Absurd-SQLite",
   "type": "module",
   "main": "dist/index.js",
@@ -39,7 +39,7 @@
   "homepage": "https://github.com/b4fun/absurd-sqlite#readme",
   "dependencies": {
     "@absurd-sqlite/sdk": "next",
-    "absurd-sdk": "~0.0.7",
+    "absurd-sdk": "https://github.com/bcho/absurd/releases/download/sdks%2Ftypescript%2Fv0.0.7/typescript-sdk-v0.0.7.tgz",
     "cac": "^6.7.14"
   },
   "devDependencies": {
@@ -49,4 +49,4 @@
   "engines": {
     "bun": ">=1.1.0"
   }
-}
+}

package/test/basic.test.ts

@@ -4,6 +4,7 @@ import {
   expect,
   beforeAll,
   afterEach,
+  jest,
 } from "bun:test";
 import assert from "node:assert/strict";
 import type { Absurd } from "absurd-sdk";
@@ -501,5 +502,56 @@ describe("Basic SDK Operations", () => {
         );
       });
     });
+
+    test("heartbeat keeps task alive past original claim timeout", async () => {
+      const claimTimeout = 1;
+      const extension = 10;
+      const longWorkMs = claimTimeout * 2000 + 100;
+      let heartbeatFired = false;
+
+      absurd.registerTask(
+        { name: "heartbeat-long-task" },
+        async (_params, taskCtx) => {
+          await taskCtx.heartbeat(extension);
+          heartbeatFired = true;
+          await ctx.sleep(longWorkMs);
+          return { ok: true };
+        },
+      );
+
+      const { taskID } = await absurd.spawn("heartbeat-long-task", {});
+
+      const exitSpy = jest
+        .spyOn(process, "exit")
+        .mockImplementation(() => undefined as never);
+
+      const worker = await absurd.startWorker({
+        claimTimeout,
+        concurrency: 1,
+        pollInterval: 0.01,
+        fatalOnLeaseTimeout: true,
+      });
+
+      try {
+        await waitFor(() => expect(heartbeatFired).toBe(true), {
+          timeout: 500,
+        });
+
+        await waitFor(async () => {
+          const task = await ctx.getTask(taskID);
+          expect(task?.state).toBe("completed");
+        }, {
+          timeout: longWorkMs + 2000,
+        });
+
+        const runs = await ctx.getRuns(taskID);
+        expect(runs).toHaveLength(1);
+        expect(runs[0]?.state).toBe("completed");
+        expect(exitSpy).not.toHaveBeenCalled();
+      } finally {
+        await worker.close();
+        exitSpy.mockRestore();
+      }
+    });
   });
 });