@@ -61,6 +61,20 @@ export const WEBHOOK_ROUTE_PREFIX = "/api/hooks";
6161const WEBHOOK_DELIVERY_RETENTION = 50 ;
6262/** Kept apart from the rest, so a stream of filtered requests can't evict real deliveries. */
6363const WEBHOOK_FILTERED_DELIVERY_RETENTION = 20 ;
64+ /** The outcomes clients decoded before outcomes became open-ended. */
65+ const LEGACY_DELIVERY_OUTCOMES : ReadonlySet < string > = new Set ( [
66+ "accepted" ,
67+ "dispatch_failed" ,
68+ "rejected_signature" ,
69+ "disabled" ,
70+ "rate_limited" ,
71+ "expired" ,
72+ ] ) ;
73+ /**
74+ * Filtered requests take no run slot, so this bounds the log writes they
75+ * cause instead; past it a filtered request is only counted in metrics.
76+ */
77+ const WEBHOOK_FILTERED_LOG_PER_MINUTE = 10 ;
6478const WEBHOOK_DELIVERY_LOG_BODY_LIMIT = 64 * 1024 ;
6579const WEBHOOK_DELIVERY_LOG_PROMPT_LIMIT = 64 * 1024 ;
6680const WEBHOOK_MAX_QUEUED_PER_TASK = 20 ;
@@ -391,6 +405,9 @@ export const layer = Layer.effect(
391405 // finish late release their own count, never a recreated task's.
392406 const webhookQueued = yield * Ref . make < ReadonlyMap < string , number > > ( new Map ( ) ) ;
393407 const webhookRateWindows = yield * Ref . make < ReadonlyMap < ScheduledTaskId , RateWindow > > ( new Map ( ) ) ;
408+ const webhookFilteredLogWindows = yield * Ref . make <
409+ ReadonlyMap < ScheduledTaskId , ReadonlyArray < number > >
410+ > ( new Map ( ) ) ;
394411 const activeRuns = yield * Ref . make < ReadonlySet < ScheduledTaskId > > ( new Set ( ) ) ;
395412 // Sliding(1) coalesces the dirty-signal: every notification triggers a
396413 // full list() re-emit anyway, so a slow subscriber only ever needs the
@@ -1125,6 +1142,11 @@ export const layer = Layer.effect(
11251142 next . delete ( id ) ;
11261143 return next ;
11271144 } ) ,
1145+ Ref . update ( webhookFilteredLogWindows , ( windows ) => {
1146+ const next = new Map ( windows ) ;
1147+ next . delete ( id ) ;
1148+ return next ;
1149+ } ) ,
11281150 Ref . update ( webhookPermits , ( permits ) => {
11291151 const next = new Map ( permits ) ;
11301152 next . delete ( id ) ;
@@ -1236,7 +1258,12 @@ export const layer = Layer.effect(
12361258 WHERE task_id = ${ input . id }
12371259 ORDER BY received_at DESC, rowid DESC
12381260 ` . pipe (
1239- Effect . map ( ( rows ) => ( { deliveries : rows . map ( decodeDeliverySummary ) } ) ) ,
1261+ Effect . map ( ( rows ) => ( {
1262+ deliveries : ( input . acceptAnyOutcome === true
1263+ ? rows
1264+ : rows . filter ( ( row ) => LEGACY_DELIVERY_OUTCOMES . has ( row . outcome ) )
1265+ ) . map ( decodeDeliverySummary ) ,
1266+ } ) ) ,
12401267 Effect . mapError ( ( cause ) =>
12411268 taskError ( "Could not list webhook deliveries." , { taskId : input . id , cause } ) ,
12421269 ) ,
@@ -1372,6 +1399,18 @@ export const layer = Layer.effect(
13721399 } ,
13731400 ) ;
13741401
1402+ /** Sliding one-minute window of filtered requests written to the delivery log. */
1403+ const takeFilteredLogSlot = ( id : ScheduledTaskId , nowMs : number ) =>
1404+ Ref . modify (
1405+ webhookFilteredLogWindows ,
1406+ ( windows ) : readonly [ boolean , ReadonlyMap < ScheduledTaskId , ReadonlyArray < number > > ] => {
1407+ const recent = ( windows . get ( id ) ?? [ ] ) . filter ( ( at ) => nowMs - at < 60_000 ) ;
1408+ return recent . length >= WEBHOOK_FILTERED_LOG_PER_MINUTE
1409+ ? [ false , windows ]
1410+ : [ true , new Map ( windows ) . set ( id , [ ...recent , nowMs ] ) ] ;
1411+ } ,
1412+ ) ;
1413+
13751414 const webhookPermit = Effect . fn ( "ScheduledTaskService.webhookPermit" ) ( function * (
13761415 id : ScheduledTaskId ,
13771416 ) {
@@ -1558,10 +1597,12 @@ export const layer = Layer.effect(
15581597 if ( task . enabled && signatureVerified && ! tooOld ) {
15591598 const failedFilter = findFailedWebhookFilter ( schedule . filters ?? [ ] , request ) ;
15601599 if ( failedFilter !== null ) {
1561- yield * log ( "filtered" , {
1562- signatureVerified : signature !== null ,
1563- error : describeFailedWebhookFilter ( failedFilter ) ,
1564- } ) ;
1600+ if ( yield * takeFilteredLogSlot ( task . id , DateTime . toEpochMillis ( now ) ) ) {
1601+ yield * log ( "filtered" , {
1602+ signatureVerified : signature !== null ,
1603+ error : describeFailedWebhookFilter ( failedFilter ) ,
1604+ } ) ;
1605+ }
15651606 yield * observe ( "filtered" ) ;
15661607 return yield * releaseClaim ( {
15671608 _tag : "accepted" as const ,
0 commit comments