@upstash/qstash 2.1.11 → 2.2.0

package/dist/nextjs.d.mts

@@ -19,5 +19,7 @@ type VerifySignatureConfig = {
 };
 declare function verifySignature(handler: NextApiHandler, config?: VerifySignatureConfig): NextApiHandler;
 declare function verifySignatureEdge(handler: (req: NextRequest, nfe?: NextFetchEvent) => NextResponse | Promise<NextResponse>, config?: VerifySignatureConfig): (req: NextRequest, nfe: NextFetchEvent) => Promise<NextResponse<unknown>>;
+type VerifySignatureAppRouterResponse = NextResponse | Promise<NextResponse>;
+declare function verifySignatureAppRouter(handler: ((req: Request) => VerifySignatureAppRouterResponse) | ((req: NextRequest) => VerifySignatureAppRouterResponse), config?: VerifySignatureConfig): (req: NextRequest | Request) => Promise<NextResponse<unknown>>;
 
-export { VerifySignatureConfig, verifySignature, verifySignatureEdge };
+export { VerifySignatureConfig, verifySignature, verifySignatureAppRouter, verifySignatureEdge };

package/dist/nextjs.d.ts

@@ -19,5 +19,7 @@ type VerifySignatureConfig = {
 };
 declare function verifySignature(handler: NextApiHandler, config?: VerifySignatureConfig): NextApiHandler;
 declare function verifySignatureEdge(handler: (req: NextRequest, nfe?: NextFetchEvent) => NextResponse | Promise<NextResponse>, config?: VerifySignatureConfig): (req: NextRequest, nfe: NextFetchEvent) => Promise<NextResponse<unknown>>;
+type VerifySignatureAppRouterResponse = NextResponse | Promise<NextResponse>;
+declare function verifySignatureAppRouter(handler: ((req: Request) => VerifySignatureAppRouterResponse) | ((req: NextRequest) => VerifySignatureAppRouterResponse), config?: VerifySignatureConfig): (req: NextRequest | Request) => Promise<NextResponse<unknown>>;
 
-export { VerifySignatureConfig, verifySignature, verifySignatureEdge };
+export { VerifySignatureConfig, verifySignature, verifySignatureAppRouter, verifySignatureEdge };

package/dist/nextjs.js

@@ -113,20 +113,52 @@ function verifySignatureEdge(handler, config) {
     if (!isValid) {
       return new (0, _server.NextResponse)(new TextEncoder().encode("invalid signature"), { status: 403 });
     }
-    let parsedBody = void 0;
-    try {
-      if (req.headers.get("content-type") === "application/json") {
-        parsedBody = JSON.parse(body);
-      } else {
-        parsedBody = body;
-      }
-    } catch (e) {
-      parsedBody = body;
-    }
     return handler(reqClone, nfe);
   });
 }
+function verifySignatureAppRouter(handler, config) {
+  var _a, _b;
+  const currentSigningKey = (_a = config == null ? void 0 : config.currentSigningKey) != null ? _a : process.env.QSTASH_CURRENT_SIGNING_KEY;
+  if (!currentSigningKey) {
+    throw new Error(
+      "currentSigningKey is required, either in the config or as env variable QSTASH_CURRENT_SIGNING_KEY"
+    );
+  }
+  const nextSigningKey = (_b = config == null ? void 0 : config.nextSigningKey) != null ? _b : process.env.QSTASH_NEXT_SIGNING_KEY;
+  if (!nextSigningKey) {
+    throw new Error(
+      "nextSigningKey is required, either in the config or as env variable QSTASH_NEXT_SIGNING_KEY"
+    );
+  }
+  const receiver = new (0, _chunkEROSIHWEjs.Receiver)({
+    currentSigningKey,
+    nextSigningKey
+  });
+  return (req) => _chunkEROSIHWEjs.__async.call(void 0, this, null, function* () {
+    const reqClone = req.clone();
+    const signature = req.headers.get("upstash-signature");
+    if (!signature) {
+      return new (0, _server.NextResponse)(new TextEncoder().encode("`Upstash-Signature` header is missing"), {
+        status: 403
+      });
+    }
+    if (typeof signature !== "string") {
+      throw new Error("`Upstash-Signature` header is not a string");
+    }
+    const body = yield req.text();
+    const isValid = yield receiver.verify({
+      signature,
+      body,
+      clockTolerance: config == null ? void 0 : config.clockTolerance
+    });
+    if (!isValid) {
+      return new (0, _server.NextResponse)(new TextEncoder().encode("invalid signature"), { status: 403 });
+    }
+    return handler(reqClone);
+  });
+}
+
 
 
 
-exports.verifySignature = verifySignature; exports.verifySignatureEdge = verifySignatureEdge;
+exports.verifySignature = verifySignature; exports.verifySignatureAppRouter = verifySignatureAppRouter; exports.verifySignatureEdge = verifySignatureEdge;

package/dist/nextjs.mjs

@@ -113,20 +113,52 @@ function verifySignatureEdge(handler, config) {
     if (!isValid) {
       return new NextResponse(new TextEncoder().encode("invalid signature"), { status: 403 });
     }
-    let parsedBody = void 0;
-    try {
-      if (req.headers.get("content-type") === "application/json") {
-        parsedBody = JSON.parse(body);
-      } else {
-        parsedBody = body;
-      }
-    } catch (e) {
-      parsedBody = body;
-    }
     return handler(reqClone, nfe);
   });
 }
+function verifySignatureAppRouter(handler, config) {
+  var _a, _b;
+  const currentSigningKey = (_a = config == null ? void 0 : config.currentSigningKey) != null ? _a : process.env.QSTASH_CURRENT_SIGNING_KEY;
+  if (!currentSigningKey) {
+    throw new Error(
+      "currentSigningKey is required, either in the config or as env variable QSTASH_CURRENT_SIGNING_KEY"
+    );
+  }
+  const nextSigningKey = (_b = config == null ? void 0 : config.nextSigningKey) != null ? _b : process.env.QSTASH_NEXT_SIGNING_KEY;
+  if (!nextSigningKey) {
+    throw new Error(
+      "nextSigningKey is required, either in the config or as env variable QSTASH_NEXT_SIGNING_KEY"
+    );
+  }
+  const receiver = new Receiver({
+    currentSigningKey,
+    nextSigningKey
+  });
+  return (req) => __async(this, null, function* () {
+    const reqClone = req.clone();
+    const signature = req.headers.get("upstash-signature");
+    if (!signature) {
+      return new NextResponse(new TextEncoder().encode("`Upstash-Signature` header is missing"), {
+        status: 403
+      });
+    }
+    if (typeof signature !== "string") {
+      throw new Error("`Upstash-Signature` header is not a string");
+    }
+    const body = yield req.text();
+    const isValid = yield receiver.verify({
+      signature,
+      body,
+      clockTolerance: config == null ? void 0 : config.clockTolerance
+    });
+    if (!isValid) {
+      return new NextResponse(new TextEncoder().encode("invalid signature"), { status: 403 });
+    }
+    return handler(reqClone);
+  });
+}
 export {
   verifySignature,
+  verifySignatureAppRouter,
   verifySignatureEdge
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upstash/qstash",
-  "version": "v2.1.11",
+  "version": "v2.2.0",
   "description": "Official Typescript client for QStash",
   "repository": {
     "type": "git",
@@ -26,15 +26,15 @@
     "dist"
   ],
   "devDependencies": {
-    "@types/crypto-js": "^4.1.1",
+    "@biomejs/biome": "^1.3.3",
+    "@types/crypto-js": "^4.2.0",
     "@types/node": "^20.5.7",
-    "next": "^13.4.19",
-    "rome": "12.1.3",
+    "next": "^14.0.2",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
     "jose": "^4.14.4"
   },
   "typesVersions": {