49ff234954
* feat(webhooks): dispatch on emit instead of waiting for the next cron tick The webhook dispatcher ran only on a per-minute cron, so the floor on delivery latency was up to 60 seconds plus the request. An external consumer that wanted to react as a transaction landed had only one alternative: polling /api/events, which the 100 rpm per-key limit makes expensive and which still cannot beat the tick interval. Schedules one dispatch cycle as soon as deliveries are enqueued. The cron is unchanged and remains the retry and sweep path; this only moves the first attempt forward. Wired into the event-bus fanout plus the two routes that enqueue a delivery directly: the :test verb, whose entire purpose is telling someone whether their receiver works, and the manual delivery retry. Three properties are load-bearing and covered by tests. The kick is never awaited, because eventBus.emit is awaited at ~99 call sites including journal_entry.committed and each delivery can burn a 10 s receiver timeout. It coalesces per function instance, so a bulk booking that emits once per row does not schedule one claim round trip per row. It claims 5 rows rather than the cron's 50, because it runs on the tail of a user-facing request. Double delivery is not a risk: claim_due_webhook_deliveries already claims FOR UPDATE SKIP LOCKED and flips rows to in_flight in the same statement, so a kick racing the cron sees disjoint rows. Does not close #1201, which asks for a realtime stream for API consumers. This is the cheap half. Refs #1201 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * docs(webhooks): stop claiming the kick makes double delivery impossible Adversarial review of the previous commit caught an overstatement in its own comments. SKIP LOCKED keeps a kick and the cron from claiming the same row at the same moment, but claim_due_webhook_deliveries autocommits before any POST is issued, so from then on ownership is only status='in_flight' and a later cycle's recoverStuckInFlight sweep can re-arm a row still queued behind an earlier cycle's serial loop. Delivery is at-least-once, which is what the public docs already tell receivers ("the same delivery id may arrive more than once ... idempotency is on you"). The comments contradicted that. No behaviour change. The kick does not create this window: the cron claims 50 rows serially against the same 20 s stuck threshold, which is wider than what a batch of 5 can open. Refs #1201 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
197 lines
7.2 KiB
TypeScript
197 lines
7.2 KiB
TypeScript
/**
|
|
* Webhook event-bus handler.
|
|
*
|
|
* Subscribes to every CoreEventType the v1 API surface emits and converts
|
|
* each emission into N rows in `webhook_deliveries`: one per active webhook
|
|
* subscribed to (company_id, event_type). A dispatch cycle is then scheduled
|
|
* immediately (see dispatch-kick.ts); the per-minute cron stays as the retry
|
|
* and sweep path.
|
|
*
|
|
* Wired from lib/init.ts via registerWebhookHandler() so every API route
|
|
* that calls ensureInitialized() gets the subscription wired exactly once.
|
|
*
|
|
* Design notes:
|
|
* - We do NOT block the emitting route on delivery insert: the handler
|
|
* runs inside Promise.allSettled in the bus (see lib/events/bus.ts), so
|
|
* a DB insert failure is logged but doesn't crash the emitter.
|
|
* - We capture `previous_attributes` only for events whose payload carries
|
|
* both a prior and current shape. Phase 6 PR-1 emits null for everything:
|
|
* adding the diff is a follow-up that requires touching each route's
|
|
* emit() call site to capture the prior row.
|
|
* - Service-role client because this code runs from the bus, outside any
|
|
* authenticated Supabase context.
|
|
*/
|
|
|
|
import { eventBus } from '@/lib/events/bus'
|
|
import type { CoreEventType } from '@/lib/events/types'
|
|
import { createServiceClientNoCookies } from '@/lib/auth/api-keys'
|
|
import { createLogger } from '@/lib/logger'
|
|
import { API_V1_VERSION } from '@/lib/api/v1/version'
|
|
import { kickWebhookDispatch } from './dispatch-kick'
|
|
|
|
const log = createLogger('webhooks/handler')
|
|
|
|
/**
|
|
* Set of event types that the v1 webhook surface delivers. Restricted to the
|
|
* resource-state-change events that are useful to external integrations;
|
|
* MCP telemetry events and internal-only flows (event_log writes, etc.) are
|
|
* deliberately excluded.
|
|
*
|
|
* Adding a new event type to this set is a public-API change: bump
|
|
* API_V1_VERSION + add to the changelog when you do.
|
|
*/
|
|
const PUBLIC_WEBHOOK_EVENTS = new Set<CoreEventType>([
|
|
'invoice.created',
|
|
'invoice.sent',
|
|
'invoice.paid',
|
|
'credit_note.created',
|
|
'customer.created',
|
|
'supplier.created',
|
|
'supplier_invoice.registered',
|
|
'supplier_invoice.approved',
|
|
'supplier_invoice.paid',
|
|
'supplier_invoice.credited',
|
|
'supplier_invoice.uncredited',
|
|
'transaction.categorized',
|
|
'transaction.reconciled',
|
|
'journal_entry.committed',
|
|
'journal_entry.reversed',
|
|
'journal_entry.corrected',
|
|
'period.locked',
|
|
'period.unlocked',
|
|
'period.year_closed',
|
|
'salary_run.created',
|
|
'salary_run.approved',
|
|
'salary_run.booked',
|
|
'agi.generated',
|
|
'document.uploaded',
|
|
])
|
|
|
|
let registered = false
|
|
|
|
/**
|
|
* Subscribe the webhook handler to every event in PUBLIC_WEBHOOK_EVENTS.
|
|
* Idempotent: safe to call from ensureInitialized() across hot reloads.
|
|
*/
|
|
export function registerWebhookHandler(): void {
|
|
if (registered) return
|
|
registered = true
|
|
|
|
for (const eventType of PUBLIC_WEBHOOK_EVENTS) {
|
|
eventBus.on(eventType, async (payload) => {
|
|
// payload type depends on eventType but every variant carries
|
|
// companyId: the only field we structurally need here.
|
|
const companyId = (payload as { companyId?: string }).companyId
|
|
if (!companyId) {
|
|
// Surface as an error: every CoreEvent payload variant types
|
|
// companyId as required, so a missing value indicates an emit-site
|
|
// bug that silently breaks webhook delivery for that event. Logging
|
|
// at error level ensures it shows up in monitoring rather than
|
|
// disappearing into routine warn-noise.
|
|
log.error('event missing companyId: webhook fanout skipped', new Error('missing companyId'), { eventType })
|
|
return
|
|
}
|
|
|
|
try {
|
|
await fanOutToWebhooks({
|
|
eventType,
|
|
companyId,
|
|
payload: minimisePayload(payload as Record<string, unknown>),
|
|
})
|
|
} catch (err) {
|
|
log.error('webhook fanout failed', err as Error, { eventType, companyId })
|
|
}
|
|
})
|
|
}
|
|
|
|
log.info('webhook handler registered', { eventCount: PUBLIC_WEBHOOK_EVENTS.size })
|
|
}
|
|
|
|
/**
|
|
* Drop fields from the in-process event payload that have no value to an
|
|
* external webhook receiver. Currently strips:
|
|
* - userId: an internal Supabase auth.users.id UUID: no value to the
|
|
* receiver, identifies the gnubok-side actor not the resource. The
|
|
* companyId stays (it's the tenant scope, useful for multi-tenant
|
|
* receivers).
|
|
*
|
|
* Centralising the projection here means a future tightening (e.g.
|
|
* stripping personnummer fields from payroll payloads) lands in one
|
|
* place rather than per-emit-site. GDPR Art.5(1)(c) data minimisation.
|
|
*/
|
|
export function minimisePayload(payload: Record<string, unknown>): Record<string, unknown> {
|
|
const projected: Record<string, unknown> = {}
|
|
for (const [key, value] of Object.entries(payload)) {
|
|
if (key === 'userId') continue
|
|
projected[key] = value
|
|
}
|
|
return projected
|
|
}
|
|
|
|
/**
|
|
* Look up active webhooks for (companyId, eventType) and insert one
|
|
* webhook_deliveries row per match. Pending rows are picked up by the
|
|
* dispatcher cron at next-minute boundary.
|
|
*/
|
|
async function fanOutToWebhooks(args: {
|
|
eventType: string
|
|
companyId: string
|
|
payload: Record<string, unknown>
|
|
}): Promise<void> {
|
|
const supabase = createServiceClientNoCookies()
|
|
|
|
const { data: webhooks, error: fetchErr } = await supabase
|
|
.from('webhooks')
|
|
.select('id, secret, api_version_pinned')
|
|
.eq('company_id', args.companyId)
|
|
.eq('event_type', args.eventType)
|
|
.eq('active', true)
|
|
.is('disabled_at', null)
|
|
|
|
if (fetchErr) {
|
|
log.error('webhook lookup failed', fetchErr as Error, {
|
|
companyId: args.companyId,
|
|
eventType: args.eventType,
|
|
})
|
|
return
|
|
}
|
|
if (!webhooks || webhooks.length === 0) return
|
|
|
|
// Synthesise a correlation id for the fanout batch. The event bus is
|
|
// async: by the time we reach here the originating route's request
|
|
// context is gone, so we can't recover the live request_id. A fresh
|
|
// 'whfan_<uuid>' keeps the BFNAR 2013:2 kap 8 § behandlingshistorik
|
|
// requirement satisfied (the column is never NULL on a fresh insert)
|
|
// and lets a per-fanout audit query group the rows that came from the
|
|
// same emission. Threading the originating request_id into the event
|
|
// payload itself is a future-direction improvement.
|
|
const fanoutId = `whfan_${crypto.randomUUID()}`
|
|
|
|
const rows = webhooks.map((w) => ({
|
|
webhook_id: (w as { id: string }).id,
|
|
company_id: args.companyId,
|
|
event_type: args.eventType,
|
|
payload: args.payload,
|
|
api_version: (w as { api_version_pinned: string }).api_version_pinned ?? API_V1_VERSION,
|
|
// previous_attributes is null in Phase 6 PR-1; populated in a follow-up
|
|
// when each route's emit() call captures the prior row.
|
|
previous_attributes: null,
|
|
request_id: fanoutId,
|
|
}))
|
|
|
|
const { error: insertErr } = await supabase.from('webhook_deliveries').insert(rows)
|
|
if (insertErr) {
|
|
log.error('webhook_deliveries insert failed', insertErr as Error, {
|
|
companyId: args.companyId,
|
|
eventType: args.eventType,
|
|
webhookCount: rows.length,
|
|
})
|
|
return
|
|
}
|
|
|
|
// Deliver now instead of waiting for the next cron tick (#1201). Scheduled,
|
|
// never awaited: see lib/webhooks/dispatch-kick.ts for why the emitter must
|
|
// not block on a receiver's HTTP endpoint.
|
|
kickWebhookDispatch()
|
|
}
|