@hookflo/tern 3.0.13-beta → 3.0.17-beta

package/dist/index.js

@@ -134,7 +134,7 @@ class WebhookVerificationService {
     }
     static resolveCanonicalEventId(platform, metadata) {
         const rawId = this.resolveRawEventId(platform, metadata);
-        return `${platform}:${rawId}`;
+        return `${platform}_${rawId}`;
     }
     static resolveRawEventId(platform, metadata) {
         const candidate = metadata?.id || metadata?.delivery || metadata?.requestId || metadata?.timestamp;

package/dist/upstash/controls.d.ts

@@ -1,6 +1,6 @@
 import { DLQMessage, EventFilter, ReplayResult, TernControlsConfig, TernEvent } from './types';
 export declare function createTernControls(config: TernControlsConfig): {
     dlq(): Promise<DLQMessage[]>;
-    replay(messageId: string): Promise<ReplayResult>;
+    replay(dlqId: string): Promise<ReplayResult>;
     events(filter?: EventFilter): Promise<TernEvent[]>;
 };

package/dist/upstash/controls.js

@@ -2,6 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTernControls = createTernControls;
 const QSTASH_API_BASE = 'https://qstash.upstash.io/v2';
+function parseBody(body) {
+    if (!body)
+        return undefined;
+    if (typeof body === 'object') {
+        return body;
+    }
+    if (typeof body === 'string') {
+        try {
+            return JSON.parse(body);
+        }
+        catch {
+            try {
+                const decoded = Buffer.from(body, 'base64').toString('utf8');
+                return JSON.parse(decoded);
+            }
+            catch {
+                return undefined;
+            }
+        }
+    }
+    return undefined;
+}
+function resolvePlatform(message) {
+    const headers = message.headers;
+    const headerPlatform = headers?.['x-tern-platform'] ?? headers?.['X-Tern-Platform'];
+    if (typeof headerPlatform === 'string' && headerPlatform.trim().length > 0) {
+        return headerPlatform;
+    }
+    const body = parseBody(message.body);
+    const bodyPlatform = body?.platform;
+    if (typeof bodyPlatform === 'string' && bodyPlatform.trim().length > 0) {
+        return bodyPlatform;
+    }
+    return 'unknown';
+}
 function createHeaders(token) {
     return {
         Authorization: `Bearer ${token}`,
@@ -23,31 +58,34 @@ function createTernControls(config) {
                 headers: createHeaders(config.token),
             });
             if (!response.ok) {
-                throw new Error(`[tern] Failed to fetch DLQ messages: ${response.status} ${response.statusText}`);
+                throw new Error(`[tern] Failed to fetch DLQ: ${response.status} ${response.statusText}`);
             }
             const data = await response.json();
             const messages = data.messages || [];
             return messages.map((message) => ({
                 id: String(message.messageId || message.id || ''),
-                platform: String(message.body && typeof message.body === 'object' ? message.body.platform || 'unknown' : 'unknown'),
-                payload: message.body && typeof message.body === 'object' ? message.body.payload : undefined,
+                dlqId: String(message.dlqId || ''),
+                platform: resolvePlatform(message),
+                payload: parseBody(message.body)?.payload,
                 failedAt: String(message.updatedAt || message.createdAt || new Date().toISOString()),
                 attempts: Number(message.retried || message.attempts || 0),
                 error: typeof message.error === 'string' ? message.error : undefined,
             }));
         },
-        async replay(messageId) {
-            const response = await fetch(`${QSTASH_API_BASE}/dlq/${messageId}`, {
-                method: 'POST',
+        async replay(dlqId) {
+            if (!dlqId || dlqId.trim() === '') {
+                throw new Error('[tern] replay() requires a dlqId, not a messageId. Get dlqId from controls.dlq()');
+            }
+            const response = await fetch(`${QSTASH_API_BASE}/dlq/${dlqId}`, {
+                method: 'DELETE',
                 headers: createHeaders(config.token),
             });
             if (!response.ok) {
-                throw new Error(`[tern] Failed to replay DLQ message ${messageId}: ${response.status} ${response.statusText}`);
+                throw new Error(`[tern] Failed to replay DLQ message ${dlqId}: ${response.status} ${response.statusText}`);
             }
-            const data = await response.json();
             return {
                 success: true,
-                messageId: String(data.messageId || messageId),
+                messageId: dlqId,
                 replayedAt: new Date().toISOString(),
             };
         },
@@ -64,7 +102,7 @@ function createTernControls(config) {
                 const status = deriveStatus(String(message.state || message.status || 'retrying'));
                 return {
                     id: String(message.messageId || message.id || ''),
-                    platform: String(message.body && typeof message.body === 'object' ? message.body.platform || 'unknown' : 'unknown'),
+                    platform: resolvePlatform(message),
                     status,
                     attempts: Number(message.retried || message.attempts || 0),
                     createdAt: String(message.createdAt || new Date().toISOString()),

package/dist/upstash/queue.js

@@ -133,6 +133,44 @@ function resolveQueueConfig(queue) {
     }
     return queue;
 }
+function toStableJson(value) {
+    if (Array.isArray(value)) {
+        return `[${value.map((item) => toStableJson(item)).join(',')}]`;
+    }
+    if (value && typeof value === 'object') {
+        const entries = Object.entries(value)
+            .sort(([a], [b]) => a.localeCompare(b))
+            .map(([key, nested]) => `${JSON.stringify(key)}:${toStableJson(nested)}`);
+        return `{${entries.join(',')}}`;
+    }
+    return JSON.stringify(value);
+}
+async function resolveDeduplicationId(request, verificationResult) {
+    const payload = verificationResult.payload;
+    const headers = request.headers;
+    const payloadId = typeof payload?.id === 'string' ? payload.id : null;
+    const payloadRequestId = typeof payload?.request_id === 'string' ? payload.request_id : null;
+    const nestedPayloadId = payload?.data && typeof payload.data === 'object' && typeof payload.data.id === 'string'
+        ? payload.data.id
+        : null;
+    const explicit = headers.get('x-webhook-id') ||
+        headers.get('x-github-delivery') ||
+        headers.get('idempotency-key') ||
+        headers.get('upstash-deduplication-id') ||
+        verificationResult.eventId ||
+        (typeof verificationResult.metadata?.id === 'string' ? verificationResult.metadata.id : null) ||
+        payloadId ||
+        payloadRequestId ||
+        nestedPayloadId;
+    if (explicit)
+        return explicit;
+    const raw = toStableJson(payload || {});
+    const buffer = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(raw));
+    const hash = Array.from(new Uint8Array(buffer))
+        .map((byte) => byte.toString(16).padStart(2, '0'))
+        .join('');
+    return hash.slice(0, 32);
+}
 async function handleReceive(request, platform, secret, queueConfig, toleranceInSeconds) {
     const verificationResult = await index_1.WebhookVerificationService.verifyWithPlatformConfig(request.clone(), platform, secret, toleranceInSeconds);
     if (!verificationResult.isValid) {
@@ -144,13 +182,17 @@ async function handleReceive(request, platform, secret, queueConfig, toleranceIn
         payload: verificationResult.payload,
         metadata: verificationResult.metadata || {},
     };
-    const idempotencyKey = request.headers.get('idempotency-key') ||
-        request.headers.get('x-webhook-id') ||
-        undefined;
+    const deduplicationId = await resolveDeduplicationId(request, verificationResult);
+    if (process.env.NODE_ENV !== 'production') {
+        console.log(`[tern] deduplication-id: ${deduplicationId} (platform: ${platform})`);
+    }
     const publishPayload = {
         url: request.url,
         body: queuedMessage,
-        deduplicationId: idempotencyKey,
+        deduplicationId,
+        headers: {
+            'x-tern-platform': platform,
+        },
     };
     if (queueConfig.retries !== undefined) {
         publishPayload.retries = queueConfig.retries;

package/dist/upstash/types.d.ts

@@ -16,6 +16,7 @@ export interface TernControlsConfig {
 }
 export interface DLQMessage {
     id: string;
+    dlqId: string;
     platform: string;
     payload: unknown;
     failedAt: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hookflo/tern",
-  "version": "3.0.13-beta",
+  "version": "3.0.17-beta",
   "description": "A robust, scalable webhook verification framework supporting multiple platforms and signature algorithms",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",