Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ async function initSchema(): Promise<void> {
UNIQUE (endpoint_id, idempotency_key)
)
`);
await d.execute(`CREATE INDEX IF NOT EXISTS idx_webhook_deliveries_retry ON webhook_deliveries (status, next_attempt_at)`);

// ---- webhooks: inbound config + idempotency ledger ---------------------
await d.execute(`
Expand Down
16 changes: 12 additions & 4 deletions lib/webhooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,19 @@ async function recordDelivery(
) {
await db().execute({
sql: `INSERT INTO webhook_deliveries
(endpoint_id, event_type, payload, idempotency_key, status, attempts, response_status, last_error, delivered_at)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, CASE WHEN ?='delivered' THEN datetime('now') END)
(endpoint_id, event_type, payload, idempotency_key, status, attempts, response_status, last_error, next_attempt_at, delivered_at)
VALUES (?, ?, ?, ?, ?, ?, ?, ?,
CASE WHEN ?='failed' THEN datetime('now', '+30 seconds') END,
CASE WHEN ?='delivered' THEN datetime('now') END)
ON CONFLICT (endpoint_id, idempotency_key) DO UPDATE SET
status=excluded.status, attempts=webhook_deliveries.attempts+1,
response_status=excluded.response_status, last_error=excluded.last_error`,
args: [endpointId, type, body, idem, status, attempts, responseStatus, err, status],
response_status=excluded.response_status, last_error=excluded.last_error,
next_attempt_at=CASE
WHEN excluded.status='failed'
THEN datetime('now', '+' || min(1800, 30 * (1 << min(webhook_deliveries.attempts, 6))) || ' seconds')
ELSE NULL
END,
delivered_at=CASE WHEN excluded.status='delivered' THEN datetime('now') ELSE webhook_deliveries.delivered_at END`,
args: [endpointId, type, body, idem, status, attempts, responseStatus, err, status, status],
});
}
Loading