Skip to content

fix(selfhost): expose queue snapshots on bindings #1973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JSONbored merged 1 commit into from
Jul 1, 2026
Merged

fix(selfhost): expose queue snapshots on bindings #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/selfhost/pg-queue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,15 @@ export function createPgQueue(
): Promise<void> {
for (const m of messages) await enqueue(m.body, m.delaySeconds ?? 0);
},
} as unknown as Queue;
async snapshot() {
const res = await pool.query(
`SELECT payload, status, run_after FROM ${TABLE} WHERE status IN ('pending','processing','dead')`,
);
return buildSelfHostQueueSnapshot(
res.rows as Array<{ payload: string; status: string; run_after: string | number }>,
);
},
} as unknown as Queue & { snapshot(): Promise<SelfHostQueueSnapshot> };

return {
binding,
Expand Down Expand Up @@ -573,14 +581,7 @@ export function createPgQueue(
async stats() {
return readQueueStats();
},
async snapshot() {
const res = await pool.query(
`SELECT payload, status, run_after FROM ${TABLE} WHERE status IN ('pending','processing','dead')`,
);
return buildSelfHostQueueSnapshot(
res.rows as Array<{ payload: string; status: string; run_after: string | number }>,
);
},
snapshot: binding.snapshot,
};

async function reclaimExpiredProcessingJobs(): Promise<number> {
Expand Down
19 changes: 10 additions & 9 deletions src/selfhost/sqlite-queue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,15 @@ export function createSqliteQueue(
): Promise<void> {
for (const m of messages) enqueue(m.body, m.delaySeconds ?? 0);
},
} as unknown as Queue;
snapshot() {
return buildSelfHostQueueSnapshot(
driver.query(
`SELECT payload, status, run_after FROM ${TABLE} WHERE status IN ('pending','processing','dead')`,
[],
).rows as Array<{ payload: string; status: string; run_after: number }>,
);
},
} as unknown as Queue & { snapshot(): SelfHostQueueSnapshot };

return {
binding,
Expand Down Expand Up @@ -521,14 +529,7 @@ export function createSqliteQueue(
stats() {
return readQueueStats(driver);
},
snapshot() {
return buildSelfHostQueueSnapshot(
driver.query(
`SELECT payload, status, run_after FROM ${TABLE} WHERE status IN ('pending','processing','dead')`,
[],
).rows as Array<{ payload: string; status: string; run_after: number }>,
);
},
snapshot: binding.snapshot,
};
}

Expand Down
12 changes: 12 additions & 0 deletions test/unit/selfhost-pg-queue.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import type { Pool, QueryResult } from "pg";
import { createPgQueue } from "../../src/selfhost/pg-queue";
import { queueSnapshotFromBinding } from "../../src/selfhost/queue-common";
import { renderMetrics, resetMetrics } from "../../src/selfhost/metrics";
import { RetryableJobError } from "../../src/queue/retryable";
import type { JobMessage } from "../../src/types";
Expand Down Expand Up @@ -1338,8 +1339,18 @@ describe("createPgQueue (durable #977)", () => {
],
rowCount: 4,
});
m.fn.mockResolvedValueOnce({
rows: [
{ payload: JSON.stringify(msg("agent-regate-pr")), status: "pending", run_after: String(now - 1) },
{ payload: JSON.stringify(msg("agent-regate-pr")), status: "processing", run_after: String(now - 1) },
{ payload: JSON.stringify(msg("github-webhook")), status: "pending", run_after: String(now + 60_000) },
{ payload: JSON.stringify(msg("rag-index-repo")), status: "dead", run_after: String(now - 1) },
],
rowCount: 4,
});

const snapshot = await q.snapshot();
const bindingSnapshot = await queueSnapshotFromBinding(q.binding);

expect(snapshot.totals).toMatchObject({ pending: 2, processing: 1, dead: 1 });
expect(snapshot.byType).toEqual(
Expand All @@ -1350,5 +1361,6 @@ describe("createPgQueue (durable #977)", () => {
{ type: "rag-index-repo", status: "dead", count: 1, due: 0 },
]),
);
expect(bindingSnapshot).toEqual(snapshot);
});
});
3 changes: 3 additions & 0 deletions test/unit/selfhost-sqlite-queue.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DatabaseSync } from "node:sqlite";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { nodeSqliteDriver } from "../../src/selfhost/d1-adapter";
import { createSqliteQueue } from "../../src/selfhost/sqlite-queue";
import { queueSnapshotFromBinding } from "../../src/selfhost/queue-common";
import { renderMetrics, resetMetrics } from "../../src/selfhost/metrics";
import { RetryableJobError } from "../../src/queue/retryable";
import type { JobMessage } from "../../src/types";
Expand Down Expand Up @@ -837,6 +838,7 @@ describe("createSqliteQueue (durable #980)", () => {
);

const snapshot = q.snapshot();
const bindingSnapshot = await queueSnapshotFromBinding(q.binding);

expect(snapshot.totals).toMatchObject({ pending: 2, processing: 1, dead: 1 });
expect(snapshot.byType).toEqual(
Expand All @@ -847,6 +849,7 @@ describe("createSqliteQueue (durable #980)", () => {
{ type: "rag-index-repo", status: "dead", count: 1, due: 0 },
]),
);
expect(bindingSnapshot).toEqual(snapshot);
});

it("coalesces recurring maintenance jobs by semantic scope and keeps distinct scopes separate", async () => {
Expand Down
Loading