Skip to content

Commit 91c7c47

Browse files
MarcoDotIOclaude
andauthored
fix(server): truncated webhook delivery bodies no longer end in a replacement character (#26070)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 1758072 commit 91c7c47

2 files changed

Lines changed: 31 additions & 1 deletion

File tree

‎apps/server/src/scheduledTasks/ScheduledTaskService.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,8 +1456,11 @@ export const layer = Layer.effect(
14561456
const truncated = request.body.byteLength > WEBHOOK_DELIVERY_LOG_BODY_LIMIT;
14571457
return {
14581458
truncated,
1459+
// Streaming decode drops a character the byte limit split, instead of ending in U+FFFD.
14591460
body: truncated
1460-
? new TextDecoder().decode(request.body.subarray(0, WEBHOOK_DELIVERY_LOG_BODY_LIMIT))
1461+
? new TextDecoder().decode(request.body.subarray(0, WEBHOOK_DELIVERY_LOG_BODY_LIMIT), {
1462+
stream: true,
1463+
})
14611464
: request.bodyText,
14621465
};
14631466
};

‎apps/server/src/scheduledTasks/ScheduledTaskService.webhook.test.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,33 @@ it.effect("keeps credential headers and query values out of the delivery log", (
481481
),
482482
);
483483

484+
it.effect("drops a character split by the delivery log's body limit", () =>
485+
withService(({ service }) =>
486+
Effect.gen(function* () {
487+
const { task } = yield* service.upsert(yield* webhookTaskInput({ enabled: false }));
488+
const limit = 64 * 1024;
489+
const euro = new TextEncoder().encode("€");
490+
const body = new Uint8Array(limit - 1 + euro.length).fill(0x61);
491+
body.set(euro, limit - 1);
492+
yield* service.triggerWebhook(
493+
requestFor(task, { body, bodyText: new TextDecoder().decode(body) }),
494+
);
495+
const [summary] = (yield* service.listWebhookDeliveries({
496+
id: task.id,
497+
acceptAnyOutcome: true,
498+
})).deliveries;
499+
const { delivery } = yield* service.getWebhookDelivery({
500+
id: task.id,
501+
deliveryId: summary!.id,
502+
});
503+
assert.isTrue(delivery.bodyTruncated);
504+
assert.equal(delivery.bodyBytes, body.byteLength);
505+
assert.equal(delivery.body.slice(-3), "aaa");
506+
assert.equal(delivery.body.length, limit - 1);
507+
}),
508+
),
509+
);
510+
484511
const queuedDeliveryCases = [
485512
{
486513
change: "paused",

0 commit comments

Comments
 (0)