@hookflo/tern 3.0.9-beta → 3.0.13-beta

package/dist/upstash/queue.js

@@ -39,17 +39,79 @@ exports.handleProcess = handleProcess;
 exports.handleQueuedRequest = handleQueuedRequest;
 const QStash = __importStar(require("@upstash/qstash"));
 const index_1 = require("../index");
-function createQStashReceiver(queueConfig) {
-    const receiverExport = QStash.Receiver
-        ?? QStash.default?.Receiver;
+async function dynamicImport(modulePath) {
+    return new Function('modulePath', 'return import(modulePath);')(modulePath);
+}
+async function loadQStashModules() {
+    const optionalImports = await Promise.allSettled([
+        dynamicImport('@upstash/qstash'),
+        dynamicImport('@upstash/qstash/nextjs'),
+        dynamicImport('@upstash/qstash/nuxt'),
+        dynamicImport('@upstash/qstash/sveltekit'),
+        dynamicImport('@upstash/qstash/cloudflare'),
+    ]);
+    return [
+        QStash,
+        ...optionalImports.flatMap((result) => (result.status === 'fulfilled' ? [result.value] : [])),
+    ];
+}
+function resolveModuleExport(modules, key) {
+    for (const moduleRef of modules) {
+        const directExport = moduleRef[key];
+        if (typeof directExport === 'function') {
+            return directExport;
+        }
+        const defaultExport = moduleRef.default?.[key];
+        if (typeof defaultExport === 'function') {
+            return defaultExport;
+        }
+    }
+    return undefined;
+}
+function resolveNestedConstructor(modules, key) {
+    const seen = new Set();
+    const queue = [...modules];
+    while (queue.length) {
+        const current = queue.shift();
+        if (!current || typeof current !== 'object' || seen.has(current)) {
+            continue;
+        }
+        seen.add(current);
+        const record = current;
+        const candidate = record[key];
+        if (typeof candidate === 'function') {
+            return candidate;
+        }
+        for (const value of Object.values(record)) {
+            if (value && typeof value === 'object') {
+                queue.push(value);
+            }
+        }
+    }
+    return undefined;
+}
+async function createQStashReceiver(queueConfig) {
+    const modules = await loadQStashModules();
+    const receiverExport = resolveModuleExport(modules, 'Receiver')
+        ?? resolveNestedConstructor(modules, 'Receiver');
     if (typeof receiverExport !== 'function') {
-        throw new Error('[tern] Incompatible @upstash/qstash version: Receiver export not found. Please upgrade to a version that exports Receiver.');
+        throw new Error('[tern] Incompatible @upstash/qstash version: Receiver export not found. Ensure @upstash/qstash is installed and up-to-date.');
     }
     return new receiverExport({
         currentSigningKey: queueConfig.signingKey,
         nextSigningKey: queueConfig.nextSigningKey,
     });
 }
+async function createQStashClient(queueConfig) {
+    const modules = await loadQStashModules();
+    const clientExport = resolveModuleExport(modules, 'Client');
+    const resolvedClientExport = clientExport
+        ?? resolveNestedConstructor(modules, 'Client');
+    if (typeof resolvedClientExport !== 'function') {
+        throw new Error('[tern] Incompatible @upstash/qstash version: Client export not found. Ensure @upstash/qstash is installed and up-to-date.');
+    }
+    return new resolvedClientExport({ token: queueConfig.token });
+}
 function nonRetryableResponse(message, status = 489) {
     return new Response(JSON.stringify({ error: message }), {
         status,
@@ -76,7 +138,7 @@ async function handleReceive(request, platform, secret, queueConfig, toleranceIn
     if (!verificationResult.isValid) {
         return nonRetryableResponse(verificationResult.error || 'Webhook signature verification failed');
     }
-    const client = new QStash.Client({ token: queueConfig.token });
+    const client = await createQStashClient(queueConfig);
     const queuedMessage = {
         platform,
         payload: verificationResult.payload,
@@ -105,7 +167,7 @@ async function handleProcess(request, handler, queueConfig) {
         return new Response(JSON.stringify({ error: 'Missing Upstash-Signature header' }), { status: 401, headers: { 'Content-Type': 'application/json' } });
     }
     const rawBody = await request.text();
-    const receiver = createQStashReceiver(queueConfig);
+    const receiver = await createQStashReceiver(queueConfig);
     try {
         const verification = await receiver.verify({
             signature,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hookflo/tern",
-  "version": "3.0.9-beta",
+  "version": "3.0.13-beta",
   "description": "A robust, scalable webhook verification framework supporting multiple platforms and signature algorithms",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,6 @@
     "@types/node": "20.0.0",
     "@typescript-eslint/eslint-plugin": "^8.39.0",
     "@typescript-eslint/parser": "^8.39.0",
-    "@upstash/qstash": "^2.9.0",
     "eslint": "^8.57.1",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.32.0",
@@ -124,12 +123,7 @@
       ]
     }
   },
-  "peerDependencies": {
-    "@upstash/qstash": ">=2.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@upstash/qstash": {
-      "optional": true
-    }
+  "dependencies": {
+    "@upstash/qstash": "^2.9.0"
   }
 }