fix(webhook-engine): mark orphaned deliveries failed and return the friendly id on duplicates

If enqueuing the routing job throws after the delivery row is created, the row is now marked FAILED instead of being left PENDING with nothing to process it. And a duplicate ingest now responds with the delivery's friendly id (whd_...), matching a first delivery, rather than the internal row id.

Author: ericallam

internal-packages/webhook-engine/src/engine/index.ts

@@ -234,14 +234,14 @@ export class WebhookEngine {
 
     const claimed = await this.frontGate.set(
       gateKey,
-      id,
+      friendlyId,
       "EX",
       this.#frontGateClaimTtlSeconds(),
       "NX"
     );
     if (claimed !== "OK") {
       const existing = await this.frontGate.get(gateKey);
-      return { outcome: "duplicate", deliveryId: existing ?? id };
+      return { outcome: "duplicate", deliveryId: existing ?? friendlyId };
     }
 
     const { filtered, reason } = this.#evaluateFilter(
@@ -256,6 +256,7 @@ export class WebhookEngine {
       ([key, value]) => key.toLowerCase() === "x-trigger-test" && Boolean(value)
     );
 
+    let rowCreated = false;
     try {
       await this.prisma.webhookDelivery.create({
         data: {
@@ -278,6 +279,7 @@ export class WebhookEngine {
           filterReason: reason,
         },
       });
+      rowCreated = true;
 
       if (filtered) {
         this.deliveryFilteredCounter.add(1);
@@ -291,11 +293,19 @@ export class WebhookEngine {
       }
     } catch (error) {
       await this.frontGate.del(gateKey).catch(() => {});
+      if (rowCreated) {
+        await this.prisma.webhookDelivery
+          .update({
+            where: { id_createdAt: { id, createdAt } },
+            data: { status: "FAILED", errorMessage: String(error), processedAt: new Date() },
+          })
+          .catch(() => {});
+      }
       return { outcome: "enqueue_failed", error: String(error) };
     }
 
     await this.frontGate
-      .set(gateKey, id, "EX", this.#frontGateTtlSeconds(artifact))
+      .set(gateKey, friendlyId, "EX", this.#frontGateTtlSeconds(artifact))
       .catch(() => {});
 
     return { outcome: "accepted", deliveryId: id, deliveryFriendlyId: friendlyId };

internal-packages/webhook-engine/src/engine/ingest.test.ts

@@ -372,7 +372,7 @@ containerTestWithIsolatedRedisNoClickhouse(
         typeof a,
         { outcome: "duplicate" }
       >;
-      expect(duplicate.deliveryId).toBe(accepted.deliveryId);
+      expect(duplicate.deliveryId).toBe(accepted.deliveryFriendlyId);
 
       const rows = await prisma.webhookDelivery.findMany({
         where: { webhookEndpointId: endpoint.id },