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

package/dist/sqlite.d.ts

@@ -1,15 +1,7 @@
 import { Database } from "bun:sqlite";
-import type { Queryable } from "@absurd-sqlite/sdk";
-import type { SQLiteRestBindParams } from "@absurd-sqlite/sdk";
-export declare class BunSqliteConnection implements Queryable {
-    private readonly db;
-    private readonly maxRetries;
-    private readonly baseRetryDelayMs;
-    constructor(db: Database);
-    query<R extends object = Record<string, any>>(sql: string, params?: SQLiteRestBindParams): Promise<{
-        rows: R[];
-    }>;
-    exec(sql: string, params?: SQLiteRestBindParams): Promise<void>;
-    private runWithRetry;
+import type { SQLiteConnectionOptions } from "@absurd-sqlite/sdk";
+import { SQLiteConnection } from "@absurd-sqlite/sdk";
+export declare class BunSqliteConnection extends SQLiteConnection {
+    constructor(db: Database, options?: SQLiteConnectionOptions);
 }
 //# sourceMappingURL=sqlite.d.ts.map

package/dist/sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../src/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAGV,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,mBAAoB,YAAW,SAAS;IACnD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAW;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAK;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAM;gBAE3B,EAAE,EAAE,QAAQ;IAIlB,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChD,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,oBAAoB,GAC5B,OAAO,CAAC;QAAE,IAAI,EAAE,CAAC,EAAE,CAAA;KAAE,CAAC;IAiBnB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;YAWvD,YAAY;CAc3B"}
+{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../src/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAGV,uBAAuB,EAIxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,mBAAoB,SAAQ,gBAAgB;gBAC3C,EAAE,EAAE,QAAQ,EAAE,OAAO,GAAE,uBAA4B;CAIhE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@absurd-sqlite/bun-worker",
-  "version": "0.2.2-alpha.1",
+  "version": "0.3.0-alpha.0",
   "description": "Bun worker utilities for Absurd-SQLite",
   "type": "module",
   "main": "dist/index.js",
@@ -39,11 +39,10 @@
   "homepage": "https://github.com/b4fun/absurd-sqlite#readme",
   "dependencies": {
     "@absurd-sqlite/sdk": "next",
-    "absurd-sdk": "~0.0.7",
     "cac": "^6.7.14"
   },
   "devDependencies": {
-    "bun-types": "^1.3.5",
+    "bun-types": "^1.3.6",
     "typescript": "^5.9.3"
   },
   "engines": {

package/src/index.ts

@@ -1,12 +1,15 @@
-import { Absurd, type WorkerOptions } from "absurd-sdk";
 import { Database } from "bun:sqlite";
-import type { AbsurdClient } from "@absurd-sqlite/sdk";
+import {
+  Absurd,
+  type AbsurdClient,
+  type WorkerOptions,
+} from "@absurd-sqlite/sdk";
 import { cac } from "cac";
 
 import { BunSqliteConnection } from "./sqlite";
 
 export type { AbsurdClient } from "@absurd-sqlite/sdk";
-export type { WorkerOptions } from "absurd-sdk";
+export type { WorkerOptions } from "@absurd-sqlite/sdk";
 
 export {
   downloadExtension,
@@ -101,12 +104,10 @@ export default async function run(setupFunction: SetupFunction): Promise<void> {
   }
 
   const db = new Database(dbPath);
-  (db as unknown as { loadExtension(path: string): void }).loadExtension(
-    extensionPath
-  );
+  db.loadExtension(extensionPath);
 
   const conn = new BunSqliteConnection(db);
-  const absurd = new Absurd({ db: conn });
+  const absurd = new Absurd(conn);
 
   await setupFunction(absurd);
 

package/src/sqlite.ts

@@ -1,112 +1,138 @@
 import { Database } from "bun:sqlite";
 
-import type { Queryable } from "@absurd-sqlite/sdk";
 import type {
-  SQLiteBindParams,
   SQLiteBindValue,
-  SQLiteRestBindParams,
+  SQLiteColumnDefinition,
+  SQLiteConnectionOptions,
+  SQLiteDatabase,
+  SQLiteStatement,
+  SQLiteValueCodec,
 } from "@absurd-sqlite/sdk";
+import { SQLiteConnection } from "@absurd-sqlite/sdk";
 
-export class BunSqliteConnection implements Queryable {
-  private readonly db: Database;
-  private readonly maxRetries = 5;
-  private readonly baseRetryDelayMs = 50;
+export class BunSqliteConnection extends SQLiteConnection {
+  constructor(db: Database, options: SQLiteConnectionOptions = {}) {
+    const valueCodec = buildValueCodec(options.valueCodec);
+    super(new BunSqliteDatabase(db), { ...options, valueCodec });
+  }
+}
+
+class BunSqliteDatabase implements SQLiteDatabase {
+  constructor(private readonly db: Database) {}
 
-  constructor(db: Database) {
-    this.db = db;
+  prepare<Result extends object = Record<string, any>>(
+    sql: string
+  ): SQLiteStatement<Result> {
+    const statement = this.db.prepare(sql);
+    return new BunSqliteStatement(statement, isReadonlyQuery(sql));
   }
 
-  async query<R extends object = Record<string, any>>(
-    sql: string,
-    params?: SQLiteRestBindParams
-  ): Promise<{ rows: R[] }> {
-    const { sql: sqliteQuery, paramOrder } = rewritePostgresQuery(sql);
-    const sqliteParams = rewritePostgresParams(
-      normalizeParams(params),
-      paramOrder
-    );
+  close(): void {
+    this.db.close();
+  }
 
-    const statement = this.db.query(sqliteQuery);
-    const rows = await this.runWithRetry(() =>
-      statement.all(...sqliteParams).map((row) =>
-        decodeRowValues(row as Record<string, unknown>)
-      )
+  loadExtension(path: string): void {
+    (this.db as unknown as { loadExtension(path: string): void }).loadExtension(
+      path
     );
+  }
+}
+
+class BunSqliteStatement<Result extends object = Record<string, any>>
+  implements SQLiteStatement<Result>
+{
+  readonly readonly: boolean;
 
-    return { rows: rows as R[] };
+  constructor(
+    private readonly stmt: ReturnType<Database["prepare"]>,
+    readonlyFlag: boolean
+  ) {
+    this.readonly = readonlyFlag;
   }
 
-  async exec(sql: string, params?: SQLiteRestBindParams): Promise<void> {
-    const { sql: sqliteQuery, paramOrder } = rewritePostgresQuery(sql);
-    const sqliteParams = rewritePostgresParams(
-      normalizeParams(params),
-      paramOrder
-    );
+  columns(): SQLiteColumnDefinition[] {
+    const columnNames = this.stmt.columnNames ?? [];
+    const declaredTypes = this.stmt.declaredTypes ?? [];
+    return columnNames.map((name, index) => ({
+      name,
+      column: null,
+      table: null,
+      database: null,
+      type: normalizeColumnType(declaredTypes[index] ?? null),
+    }));
+  }
 
-    const statement = this.db.query(sqliteQuery);
-    await this.runWithRetry(() => statement.run(...sqliteParams));
-  }
-
-  private async runWithRetry<T>(operation: () => T): Promise<T> {
-    let attempt = 0;
-    while (true) {
-      try {
-        return operation();
-      } catch (err) {
-        if (!isRetryableSQLiteError(err) || attempt >= this.maxRetries) {
-          throw err;
-        }
-        attempt++;
-        await delay(this.baseRetryDelayMs * attempt);
-      }
-    }
+  all(...args: any[]): Result[] {
+    const normalizedArgs = normalizeStatementArgs(args);
+    return this.stmt.all(...normalizedArgs) as Result[];
+  }
+
+  run(...args: any[]): unknown {
+    const normalizedArgs = normalizeStatementArgs(args);
+    return this.stmt.run(...normalizedArgs);
   }
 }
 
-function rewritePostgresQuery(text: string): {
-  sql: string;
-  paramOrder: number[];
-} {
-  const paramOrder: number[] = [];
-  const sql = text
-    .replace(/\$(\d+)/g, (_, index) => {
-      paramOrder.push(Number(index));
-      return "?";
-    })
-    .replace(/absurd\.(\w+)/g, "absurd_$1");
-
-  return { sql, paramOrder };
+function buildValueCodec(
+  overrides?: SQLiteValueCodec
+): SQLiteValueCodec {
+  return {
+    encodeParam: overrides?.encodeParam ?? encodeColumnValue,
+    decodeColumn: overrides?.decodeColumn ?? decodeColumnValue,
+    decodeRow: overrides?.decodeRow ?? decodeRowValues,
+  };
 }
 
-function rewritePostgresParams<I = any>(
-  params: SQLiteBindValue[],
-  paramOrder: number[]
-): I[] {
-  if (paramOrder.length === 0) {
-    return params.map((value) => encodeColumnValue(value)) as I[];
+function normalizeStatementArgs(args: any[]): any[] {
+  if (args.length !== 1) {
+    return args;
+  }
+  const params = args[0];
+  if (!params || typeof params !== "object" || Array.isArray(params)) {
+    return args;
   }
+  const normalized: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(params)) {
+    normalized[normalizeParamKey(key)] = value;
+  }
+  return [normalized];
+}
 
-  return paramOrder.map((index) => {
-    const value = params[index - 1];
-    return encodeColumnValue(value) as I;
-  });
+function normalizeParamKey(key: string): string {
+  if (key.startsWith("$") || key.startsWith(":") || key.startsWith("@")) {
+    return key;
+  }
+  return `:${key}`;
 }
 
-function decodeRowValues<R extends object = any>(
-  row: Record<string, unknown>
-): R {
+function decodeRowValues<R extends object = any>(args: {
+  row: Record<string, unknown>;
+  columns?: SQLiteColumnDefinition[];
+  decodeColumn?: (args: {
+    value: unknown;
+    columnName: string;
+    columnType: string | null;
+  }) => unknown;
+}): R {
   const decodedRow: any = {};
-  for (const [columnName, rawValue] of Object.entries(row)) {
-    decodedRow[columnName] = decodeColumnValue(rawValue, columnName);
+  for (const [columnName, rawValue] of Object.entries(args.row)) {
+    decodedRow[columnName] = decodeColumnValue({
+      value: rawValue,
+      columnName,
+      columnType: null,
+    });
   }
 
   return decodedRow as R;
 }
 
-function decodeColumnValue<V = any>(
-  value: unknown | V,
-  columnName: string
-): V | null {
+function decodeColumnValue<V = any>(args: {
+  value: unknown | V;
+  columnName: string;
+  columnType: string | null;
+  verbose?: (...args: any[]) => void;
+}): V | null {
+  const { value, columnName } = args;
   if (value === null || value === undefined) {
     return null;
   }
@@ -128,8 +154,7 @@ function decodeColumnValue<V = any>(
   }
 
   if (value instanceof Uint8Array || value instanceof ArrayBuffer) {
-    const bytes =
-      value instanceof Uint8Array ? value : new Uint8Array(value);
+    const bytes = value instanceof Uint8Array ? value : new Uint8Array(value);
     const decoded = new TextDecoder().decode(bytes);
     return tryDecodeJson(decoded) ?? (value as V);
   }
@@ -145,7 +170,7 @@ function tryDecodeJson<V = any>(value: string): V | null {
   }
 }
 
-function encodeColumnValue(value: any): any {
+function encodeColumnValue(value: SQLiteBindValue): SQLiteBindValue {
   if (value instanceof Date) {
     return value.toISOString();
   }
@@ -159,60 +184,23 @@ function isTimestampColumn(columnName: string): boolean {
   return columnName.endsWith("_at");
 }
 
-function normalizeParams(
-  params?: SQLiteRestBindParams
-): SQLiteBindValue[] {
-  if (!params) {
-    return [];
-  }
-
-  if (params.length === 1 && isBindParams(params[0])) {
-    const inner = params[0];
-    if (Array.isArray(inner)) {
-      return inner;
-    }
-    return Object.values(inner);
-  }
-
-  return params as SQLiteBindValue[];
-}
-
-function isBindParams(value: unknown): value is SQLiteBindParams {
-  if (Array.isArray(value)) {
-    return true;
-  }
-  if (!value || typeof value !== "object") {
-    return false;
-  }
-  const tag = Object.prototype.toString.call(value);
-  return tag === "[object Object]";
+function isReadonlyQuery(sql: string): boolean {
+  const trimmed = sql.trim().toLowerCase();
+  return (
+    trimmed.startsWith("select") ||
+    trimmed.startsWith("with") ||
+    trimmed.startsWith("pragma") ||
+    trimmed.startsWith("explain")
+  );
 }
 
-const sqliteRetryableErrorCodes = new Set(["SQLITE_BUSY", "SQLITE_LOCKED"]);
-const sqliteRetryableErrnos = new Set([5, 6]);
-
-function isRetryableSQLiteError(err: unknown): boolean {
-  if (!err || typeof err !== "object") {
-    return false;
-  }
-
-  const code = (err as any).code;
-  if (typeof code === "string") {
-    for (const retryableCode of sqliteRetryableErrorCodes) {
-      if (code.startsWith(retryableCode)) {
-        return true;
-      }
-    }
+function normalizeColumnType(value: string | null): string | null {
+  if (!value) {
+    return null;
   }
-
-  const errno = (err as any).errno;
-  if (typeof errno === "number" && sqliteRetryableErrnos.has(errno)) {
-    return true;
+  const lowered = value.toLowerCase();
+  if (lowered === "null") {
+    return null;
   }
-
-  return false;
-}
-
-function delay(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return lowered;
 }

package/test/basic.test.ts

@@ -4,9 +4,10 @@ import {
   expect,
   beforeAll,
   afterEach,
+  jest,
 } from "bun:test";
 import assert from "node:assert/strict";
-import type { Absurd } from "absurd-sdk";
+import type { Absurd } from "@absurd-sqlite/sdk";
 import { createTestAbsurd, randomName, type TestContext } from "./setup";
 import { EventEmitter, once } from "events";
 import { waitFor } from "./wait-for";
@@ -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();
+      }
+    });
   });
 });

package/test/events.test.ts

@@ -1,7 +1,7 @@
 import { describe, test, expect, beforeAll, afterEach } from "bun:test";
-import type { Absurd } from "absurd-sdk";
+import type { Absurd } from "@absurd-sqlite/sdk";
 import { createTestAbsurd, randomName, type TestContext } from "./setup";
-import { TimeoutError } from "absurd-sdk";
+import { TimeoutError } from "@absurd-sqlite/sdk";
 
 describe("Event system", () => {
   let ctx: TestContext;

package/test/hooks.test.ts

@@ -1,6 +1,6 @@
 import { describe, test, expect, beforeAll, afterEach } from "bun:test";
 import { AsyncLocalStorage } from "node:async_hooks";
-import type { Absurd, SpawnOptions } from "absurd-sdk";
+import type { Absurd, SpawnOptions } from "@absurd-sqlite/sdk";
 import { createTestAbsurd, randomName, type TestContext } from "./setup";
 
 describe("Hooks", () => {

package/test/idempotent.test.ts

@@ -1,5 +1,5 @@
 import { describe, test, expect, beforeAll, afterEach } from "bun:test";
-import type { Absurd } from "absurd-sdk";
+import type { Absurd } from "@absurd-sqlite/sdk";
 import { createTestAbsurd, randomName, type TestContext } from "./setup";
 
 describe("Idempotent Task Spawning", () => {

package/test/index.test.ts

@@ -3,7 +3,7 @@ import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, describe, expect, it } from "bun:test";
-import { Absurd } from "absurd-sdk";
+import { Absurd } from "@absurd-sqlite/sdk";
 
 import { BunSqliteConnection } from "../src/sqlite";
 import { loadExtension } from "./setup";
@@ -29,7 +29,7 @@ describe("Absurd", () => {
   it("creates and lists queues using the sqlite extension", async () => {
     const db = createDatabaseWithMigrations();
     const conn = new BunSqliteConnection(db);
-    const absurd = new Absurd({ db: conn });
+    const absurd = new Absurd(conn);
 
     await absurd.createQueue("alpha");
     await absurd.createQueue("beta");
@@ -52,7 +52,7 @@ describe("Absurd", () => {
   it("closes workers without affecting the sqlite database", async () => {
     const db = createDatabaseWithMigrations();
     const conn = new BunSqliteConnection(db);
-    const absurd = new Absurd({ db: conn });
+    const absurd = new Absurd(conn);
 
     await absurd.close();
 

package/test/retry.test.ts

@@ -1,5 +1,5 @@
 import { describe, test, expect, beforeAll, afterEach } from "bun:test";
-import type { Absurd } from "absurd-sdk";
+import type { Absurd } from "@absurd-sqlite/sdk";
 import { createTestAbsurd, randomName, type TestContext } from "./setup";
 
 describe("Retry and cancellation", () => {

package/test/setup.ts

@@ -8,7 +8,7 @@ import {
   Absurd,
   type AbsurdHooks,
   type JsonValue,
-} from "absurd-sdk";
+} from "@absurd-sqlite/sdk";
 
 import { BunSqliteConnection } from "../src/sqlite";
 
@@ -263,10 +263,7 @@ export async function createTestAbsurd(
   queueName: string = "default"
 ): Promise<TestContext> {
   const fixture = createFixture();
-  const absurd = new Absurd({
-    db: fixture.conn,
-    queueName,
-  });
+  const absurd = new Absurd(fixture.conn, { queueName });
 
   await absurd.createQueue(queueName);
 
@@ -335,8 +332,7 @@ export async function createTestAbsurd(
     expectCancelledError: (promise: Promise<unknown>) =>
       expectCancelledError(promise),
     createClient: (options) => {
-      const client = new Absurd({
-        db: fixture.conn,
+      const client = new Absurd(fixture.conn, {
         queueName: options?.queueName ?? queueName,
         hooks: options?.hooks,
       });

package/test/sqlite.test.ts

@@ -26,12 +26,14 @@ describe("BunSqliteConnection", () => {
     db.close();
   });
 
-  it("returns empty rows for non-reader statements", async () => {
+  it("throws when query is used for non-reader statements", async () => {
     const db = new Database(":memory:");
     const conn = new BunSqliteConnection(db);
 
-    const { rows } = await conn.query("CREATE TABLE t (id)");
-    expect(rows).toEqual([]);
+    await expect(conn.query("CREATE TABLE t (id)")).rejects.toThrow(
+      "only statements that return data"
+    );
+    await conn.exec("CREATE TABLE t (id)");
 
     await conn.exec("INSERT INTO t (id) VALUES ($1)", [1]);
     const { rows: inserted } = await conn.query<{ id: number }>(
@@ -146,14 +148,14 @@ describe("BunSqliteConnection", () => {
       }),
     };
 
-    const querySpy = jest.fn().mockReturnValue(statement as any);
-    const db = { query: querySpy } as unknown as Database;
+    const prepareSpy = jest.fn().mockReturnValue(statement as any);
+    const db = { prepare: prepareSpy } as unknown as Database;
     const conn = new BunSqliteConnection(db);
 
     await expect(
       conn.exec("UPDATE locked_table SET value = $1 WHERE id = $2", [1, 1])
     ).resolves.toBeUndefined();
     expect(statement.run).toHaveBeenCalledTimes(2);
-    expect(querySpy).toHaveBeenCalledTimes(1);
+    expect(prepareSpy).toHaveBeenCalledTimes(1);
   });
 });

package/test/step.test.ts

@@ -1,5 +1,5 @@
 import { describe, test, expect, beforeAll, afterEach, jest } from "bun:test";
-import type { Absurd } from "absurd-sdk";
+import type { Absurd } from "@absurd-sqlite/sdk";
 import { createTestAbsurd, randomName, type TestContext } from "./setup";
 
 describe("Step functionality", () => {

package/test/worker.test.ts

@@ -2,7 +2,7 @@ import { describe, it, expect, beforeAll, afterEach, jest } from "bun:test";
 import { EventEmitter, once } from "events";
 import type { TestContext } from "./setup";
 import { createTestAbsurd, randomName } from "./setup";
-import type { Absurd } from "absurd-sdk";
+import type { Absurd } from "@absurd-sqlite/sdk";
 import { waitFor } from "./wait-for";
 
 describe("Worker", () => {