Skip to content

fix: persist and replay original status code in idempotency layer #10

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

Open
tmchow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: persist and replay original status code in idempotency layer #10

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
4 changes: 2 additions & 2 deletions server/agent-routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ function maybeReplayIdempotentMutation(
);
return { handled: true, idempotencyKey, requestHash };
}
sendMutationResponse(res, 200, existing.response, { route: mutationRoute, slug });
sendMutationResponse(res, existing.statusCode ?? 200, existing.response, { route: mutationRoute, slug });
return { handled: true, idempotencyKey, requestHash };
}

Expand All @@ -432,7 +432,7 @@ function storeIdempotentMutationResult(
): void {
if (!replay.idempotencyKey) return;
if (status < 200 || status >= 300) return;
storeIdempotencyResult(slug, routeKey, replay.idempotencyKey, body, replay.requestHash);
storeIdempotencyResult(slug, routeKey, replay.idempotencyKey, body, replay.requestHash, { statusCode: status });
}

function routeRequiresMutation(method: string, path: string): boolean {
Expand Down
7 changes: 4 additions & 3 deletions server/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,14 +1973,14 @@ export function getStoredIdempotencyRecord(
documentSlug: string,
route: string,
idempotencyKey: string,
): { response: Record<string, unknown>; requestHash: string | null } | null {
): { response: Record<string, unknown>; requestHash: string | null; statusCode: number } | null {
const d = getDb();
const coordinatorRow = d.prepare(`
SELECT response_json, request_hash
SELECT response_json, request_hash, status_code
FROM ${MUTATION_IDEMPOTENCY_TABLE}
WHERE idempotency_key = ? AND document_slug = ? AND route = ?
LIMIT 1
`).get(idempotencyKey, documentSlug, route) as { response_json?: string; request_hash?: string | null } | undefined;
`).get(idempotencyKey, documentSlug, route) as { response_json?: string; request_hash?: string | null; status_code?: number | null } | undefined;
const legacyRow = d.prepare(`
SELECT response_json, request_hash
FROM idempotency_keys
Expand Down Expand Up @@ -2010,6 +2010,7 @@ export function getStoredIdempotencyRecord(
return {
response,
requestHash: typeof row.request_hash === 'string' ? row.request_hash : null,
statusCode: typeof (row as { status_code?: number | null }).status_code === 'number' ? (row as { status_code: number }).status_code : 200,
};
} catch {
return null;
Expand Down