@upstash/qstash 0.0.12 → 0.0.17

package/README.md

@@ -23,11 +23,18 @@ See
 [the list of APIs](https://docs.upstash.com/features/restapi#rest---redis-api-compatibility)
 supported.
 
+## Status of the SDK
+
+It is currently in beta and we are actively collecting feedback from the
+community. Please report any issues you encounter or feature requests in the
+[GitHub issues](https://github.com/upstash/sdk-qstash-ts/issues) or talk to us
+on [Discord](https://discord.gg/w9SenAtbme). Thank you!
+
 ## How does qStash work?
 
-qStash is the message broker between your serverless apps. You send a HTTP
+qStash is the message broker between your serverless apps. You send aa HTTP
 request to qStash, that includes a destination, a payload and optional settings.
-We store your message durable and will deliver it to the destination server via
+We store your message durable and will deliver it to the destination API via
 HTTP. In case the destination is not ready to receive the message, we will retry
 the message later, to guarentee at-least-once delivery.
 
@@ -47,43 +54,51 @@ npm install @upstash/qstash
 import { Redis } from "https://deno.land/x/upstash_qstash/mod.ts";
 ```
 
-### Activate qStash
+### Get your authorization token
 
-Go to [upstash](https://console.upstash.com/qstash) and activate qStash.
+Go to [upstash](https://console.upstash.com/qstash) and copy the token.
 
 ## Basic Usage:
 
 ### Publishing a message
 
 ```ts
-import { Client } from "@upstash/qstash"
-
-const q = new Client({
-  token: <QSTASH_TOKEN>,
-})
-
-const res = await q.publishJSON({
-    body: { hello: "world" },
-})
+import { Client } from "@upstash/qstash";
+/**
+ * Import a fetch polyfill only if you are using node prior to v18.
+ * This is not necessary for nextjs, deno or cloudflare workers.
+ */
+import "isomorphic-fetch";
+
+const c = new Client({
+  token: "<QSTASH_TOKEN>",
+});
 
-console.log(res.messageId)
+const res = await c.publishJSON({
+  destination: "https://my-api...",
+  body: {
+    hello: "world",
+  },
+});
+console.log(res);
+// { messageId: "msg_xxxxxxxxxxxxxxxx" }
 ```
 
-### Consuming a message
+### Receiving a message
 
 How to consume a message depends on your http server. QStash does not receive
 the http request directly, but should be called by you as the first step in your
 handler function.
 
 ```ts
-import { Consumer } from "@upstash/qstash";
+import { Receiver } from "@upstash/qstash";
 
-const c = new Consumer({
+const r = new Receiver({
   currentSigningKey: "..",
   nextSigningKey: "..",
 });
 
-const isValid = await c.verify({
+const isValid = await r.verify({
   /**
    * The signature from the `Upstash-Signature` header.
    */
@@ -103,17 +118,8 @@ const isValid = await c.verify({
 
 ## Docs
 
-See [the documentation](https://docs.upstash.com/features/qstash) for details.
+See [the documentation](https://docs.upstash.com/qstash) for details.
 
 ## Contributing
 
 ### [Install Deno](https://deno.land/#installation)
-
-### Running tests
-
-```sh
-QSTASH_TOKEN=".." deno test -A
-```
-
-```
-```

package/esm/entrypoints/cloudflare.js

@@ -1,12 +1,12 @@
 // dnt-shim-ignore
-import * as c from "../pkg/consumer.js";
+import * as r from "../pkg/receiver.js";
 export * from "../pkg/client/client.js";
-export class Consumer extends c.Consumer {
+export class Receiver extends r.Receiver {
     constructor(config) {
         super({
             ...config,
             // dnt-shim-ignore
-            subtleCrypto: crypto.subtle
+            subtleCrypto: crypto.subtle,
         });
     }
 }

package/esm/entrypoints/nextjs.js

@@ -1,7 +1,5 @@
 import * as dntShim from "../_dnt.shims.js";
-// @ts-ignore Deno can't compile
-import { buffer } from "micro";
-import { Consumer } from "../pkg/consumer.js";
+import { Receiver } from "../pkg/receiver.js";
 export function verifySignature(handler, config) {
     const currentSigningKey = config?.currentSigningKey ??
         // @ts-ignore Deno can't compile
@@ -15,10 +13,10 @@ export function verifySignature(handler, config) {
     if (!nextSigningKey) {
         throw new Error("nextSigningKey is required, either in the config or as env variable QSTASH_NEXT_SIGNING_KEY");
     }
-    const consumer = new Consumer({
+    const receiver = new Receiver({
         currentSigningKey,
         nextSigningKey,
-        subtleCrypto: dntShim.crypto.subtle
+        subtleCrypto: dntShim.crypto.subtle,
     });
     return async (req, res) => {
         const signature = req.headers["upstash-signature"];
@@ -28,10 +26,16 @@ export function verifySignature(handler, config) {
         if (typeof signature !== "string") {
             throw new Error("`Upstash-Signature` header is not a string");
         }
-        const body = (await buffer(req)).toString();
-        console.log(req.headers);
-        const url = config?.url ?? new URL(req.url, `https://${process.env.VERCEL_URL}`).href;
-        const isValid = await consumer.verify({ signature, body, url });
+        const chunks = [];
+        for await (const chunk of req) {
+            chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
+        }
+        const body = Buffer.concat(chunks).toString("utf-8");
+        // const url = config?.url ?? new URL(
+        //   req.url!,
+        //   `https://${process.env.VERCEL_URL}`,
+        // ).href;
+        const isValid = await receiver.verify({ signature, body });
         if (!isValid) {
             res.status(400);
             res.send("Invalid signature");
@@ -47,7 +51,6 @@ export function verifySignature(handler, config) {
         }
         catch {
             req.body = body;
-            console.log("body is not json");
         }
         return handler(req, res);
     };

package/esm/entrypoints/nodejs.js

@@ -0,0 +1,13 @@
+// dnt-shim-ignore
+import * as dntShim from "../_dnt.shims.js";
+import * as r from "../pkg/receiver.js";
+export * from "../pkg/client/client.js";
+export class Receiver extends r.Receiver {
+    constructor(config) {
+        super({
+            ...config,
+            // use the shimmed one from deno
+            subtleCrypto: dntShim.crypto.subtle,
+        });
+    }
+}

package/esm/pkg/client/client.js

@@ -15,7 +15,7 @@ export class Client {
             baseUrl: config.baseUrl
                 ? config.baseUrl.replace(/\/$/, "")
                 : "https://qstash.upstash.io",
-            authorization: config.token,
+            authorization: `Bearer ${config.token}`,
         });
     }
     /**

package/esm/pkg/client/http.js

@@ -43,7 +43,7 @@ export class HttpClient {
     }
     async request(req) {
         const headers = new Headers(req.headers);
-        headers.set("Upstash-Authorization", `Bearer ${this.authorization}`);
+        headers.set("Authorization", this.authorization);
         const requestOptions = {
             method: req.method,
             headers,

package/esm/pkg/{consumer.js → receiver.js}

@@ -63,11 +63,10 @@ export class Consumer {
             throw new SignatureError("signature does not match");
         }
         const p = JSON.parse(new TextDecoder().decode(base64Url.decode(payload)));
-        console.log(JSON.stringify(p, null, 2));
         if (p.iss !== "Upstash") {
             throw new SignatureError(`invalid issuer: ${p.iss}`);
         }
-        if (p.sub !== req.url) {
+        if (typeof req.url !== "undefined" && p.sub !== req.url) {
             throw new SignatureError(`invalid subject: ${p.sub}, want: ${req.url}`);
         }
         const now = Math.floor(Date.now() / 1000);

package/package.json

@@ -1,9 +1,9 @@
 {
-  "module": "./esm/entrypoints/nextjs.js",
-  "main": "./script/entrypoints/nextjs.js",
-  "types": "./types/entrypoints/nextjs.d.ts",
+  "module": "./esm/entrypoints/nodejs.js",
+  "main": "./script/entrypoints/nodejs.js",
+  "types": "./types/entrypoints/nodejs.d.ts",
   "name": "@upstash/qstash",
-  "version": "v0.0.12",
+  "version": "v0.0.17",
   "description": "Official Deno/Typescript client for qStash",
   "repository": {
     "type": "git",
@@ -22,28 +22,42 @@
     "url": "https://github.com/upstash/sdk-qstash-ts/issues"
   },
   "homepage": "https://github.com/upstash/sdk-qstash-ts#readme",
-  "peerDependencies": {
-    "micro": "latest"
-  },
   "typesVersions": {
     "*": {
-      "nextjs": "./types/entrypoints/nextjs.d.ts",
-      "cloudflare": "./types/entrypoints/cloudflare.d.ts"
+      "nodejs": [
+        "./types/entrypoints/nodejs.d.ts"
+      ],
+      "cloudflare": [
+        "./types/entrypoints/cloudflare.d.ts"
+      ],
+      "nextjs": [
+        "./types/entrypoints/nextjs.d.ts"
+      ]
     }
   },
   "exports": {
-    "./nextjs": {
-      "import": "./esm/entrypoints/nextjs.js",
-      "require": "./script/entrypoints/nextjs.js",
-      "types": "./types/entrypoints/nextjs.d.ts"
+    ".": {
+      "import": "./esm/entrypoints/nodejs.js",
+      "require": "./script/entrypoints/nodejs.js",
+      "types": "./types/entrypoints/nodejs.d.ts"
+    },
+    "./nodejs": {
+      "import": "./esm/entrypoints/nodejs.js",
+      "require": "./script/entrypoints/nodejs.js",
+      "types": "./types/entrypoints/nodejs.d.ts"
     },
     "./cloudflare": {
       "import": "./esm/entrypoints/cloudflare.js",
       "require": "./script/entrypoints/cloudflare.js",
       "types": "./types/entrypoints/cloudflare.d.ts"
+    },
+    "./nextjs": {
+      "import": "./esm/entrypoints/nextjs.js",
+      "require": "./script/entrypoints/nextjs.js",
+      "types": "./types/entrypoints/nextjs.d.ts"
     }
   },
   "dependencies": {
-    "@deno/shim-crypto": "~0.3.1"
+    "@deno/shim-crypto": "~0.3.0"
   }
 }

package/script/entrypoints/cloudflare.js

@@ -27,16 +27,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Consumer = void 0;
-const c = __importStar(require("../pkg/consumer.js"));
+exports.Receiver = void 0;
+const r = __importStar(require("../pkg/receiver.js"));
 __exportStar(require("../pkg/client/client.js"), exports);
-class Consumer extends c.Consumer {
+class Receiver extends r.Receiver {
     constructor(config) {
         super({
             ...config,
             // dnt-shim-ignore
-            subtleCrypto: crypto.subtle
+            subtleCrypto: crypto.subtle,
         });
     }
 }
-exports.Consumer = Consumer;
+exports.Receiver = Receiver;

package/script/entrypoints/nextjs.js

@@ -25,9 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifySignature = void 0;
 const dntShim = __importStar(require("../_dnt.shims.js"));
-// @ts-ignore Deno can't compile
-const micro_1 = require("micro");
-const consumer_js_1 = require("../pkg/consumer.js");
+const receiver_js_1 = require("../pkg/receiver.js");
 function verifySignature(handler, config) {
     const currentSigningKey = config?.currentSigningKey ??
         // @ts-ignore Deno can't compile
@@ -41,10 +39,10 @@ function verifySignature(handler, config) {
     if (!nextSigningKey) {
         throw new Error("nextSigningKey is required, either in the config or as env variable QSTASH_NEXT_SIGNING_KEY");
     }
-    const consumer = new consumer_js_1.Consumer({
+    const receiver = new receiver_js_1.Receiver({
         currentSigningKey,
         nextSigningKey,
-        subtleCrypto: dntShim.crypto.subtle
+        subtleCrypto: dntShim.crypto.subtle,
     });
     return async (req, res) => {
         const signature = req.headers["upstash-signature"];
@@ -54,10 +52,16 @@ function verifySignature(handler, config) {
         if (typeof signature !== "string") {
             throw new Error("`Upstash-Signature` header is not a string");
         }
-        const body = (await (0, micro_1.buffer)(req)).toString();
-        console.log(req.headers);
-        const url = config?.url ?? new URL(req.url, `https://${process.env.VERCEL_URL}`).href;
-        const isValid = await consumer.verify({ signature, body, url });
+        const chunks = [];
+        for await (const chunk of req) {
+            chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
+        }
+        const body = Buffer.concat(chunks).toString("utf-8");
+        // const url = config?.url ?? new URL(
+        //   req.url!,
+        //   `https://${process.env.VERCEL_URL}`,
+        // ).href;
+        const isValid = await receiver.verify({ signature, body });
         if (!isValid) {
             res.status(400);
             res.send("Invalid signature");
@@ -73,7 +77,6 @@ function verifySignature(handler, config) {
         }
         catch {
             req.body = body;
-            console.log("body is not json");
         }
         return handler(req, res);
     };

package/script/entrypoints/nodejs.js

@@ -0,0 +1,43 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Receiver = void 0;
+// dnt-shim-ignore
+const dntShim = __importStar(require("../_dnt.shims.js"));
+const r = __importStar(require("../pkg/receiver.js"));
+__exportStar(require("../pkg/client/client.js"), exports);
+class Receiver extends r.Receiver {
+    constructor(config) {
+        super({
+            ...config,
+            // use the shimmed one from deno
+            subtleCrypto: dntShim.crypto.subtle,
+        });
+    }
+}
+exports.Receiver = Receiver;

package/script/pkg/client/client.js

@@ -18,7 +18,7 @@ class Client {
             baseUrl: config.baseUrl
                 ? config.baseUrl.replace(/\/$/, "")
                 : "https://qstash.upstash.io",
-            authorization: config.token,
+            authorization: `Bearer ${config.token}`,
         });
     }
     /**

package/script/pkg/client/http.js

@@ -46,7 +46,7 @@ class HttpClient {
     }
     async request(req) {
         const headers = new Headers(req.headers);
-        headers.set("Upstash-Authorization", `Bearer ${this.authorization}`);
+        headers.set("Authorization", this.authorization);
         const requestOptions = {
             method: req.method,
             headers,

package/script/pkg/{consumer.js → receiver.js}

@@ -67,11 +67,10 @@ class Consumer {
             throw new SignatureError("signature does not match");
         }
         const p = JSON.parse(new TextDecoder().decode(deps_js_1.base64Url.decode(payload)));
-        console.log(JSON.stringify(p, null, 2));
         if (p.iss !== "Upstash") {
             throw new SignatureError(`invalid issuer: ${p.iss}`);
         }
-        if (p.sub !== req.url) {
+        if (typeof req.url !== "undefined" && p.sub !== req.url) {
             throw new SignatureError(`invalid subject: ${p.sub}, want: ${req.url}`);
         }
         const now = Math.floor(Date.now() / 1000);

package/types/deps/deno.land/std@0.147.0/crypto/mod.d.ts

@@ -23,7 +23,7 @@ declare const stdCrypto: {
         encrypt: (algorithm: dntShim.AlgorithmIdentifier | dntShim.RsaOaepParams | dntShim.AesCtrParams | dntShim.AesCbcParams | dntShim.AesGcmParams, key: dntShim.CryptoKey, data: dntShim.BufferSource) => Promise<any>;
         exportKey: {
             (format: "jwk", key: dntShim.CryptoKey): Promise<dntShim.JsonWebKey>;
-            (format: "pkcs8" | "raw" | "spki", key: dntShim.CryptoKey): Promise<ArrayBuffer>;
+            (format: "raw" | "pkcs8" | "spki", key: dntShim.CryptoKey): Promise<ArrayBuffer>;
         };
         generateKey: {
             (algorithm: dntShim.RsaHashedKeyGenParams | dntShim.EcKeyGenParams, extractable: boolean, keyUsages: readonly dntShim.KeyUsage[]): Promise<dntShim.CryptoKeyPair>;
@@ -32,7 +32,7 @@ declare const stdCrypto: {
         };
         importKey: {
             (format: "jwk", keyData: dntShim.JsonWebKey, algorithm: dntShim.AlgorithmIdentifier | dntShim.HmacImportParams | dntShim.RsaHashedImportParams | dntShim.EcKeyImportParams | dntShim.AesKeyAlgorithm, extractable: boolean, keyUsages: readonly dntShim.KeyUsage[]): Promise<dntShim.CryptoKey>;
-            (format: "pkcs8" | "raw" | "spki", keyData: dntShim.BufferSource, algorithm: dntShim.AlgorithmIdentifier | dntShim.HmacImportParams | dntShim.RsaHashedImportParams | dntShim.EcKeyImportParams | dntShim.AesKeyAlgorithm, extractable: boolean, keyUsages: dntShim.KeyUsage[]): Promise<dntShim.CryptoKey>;
+            (format: "raw" | "pkcs8" | "spki", keyData: dntShim.BufferSource, algorithm: dntShim.AlgorithmIdentifier | dntShim.HmacImportParams | dntShim.RsaHashedImportParams | dntShim.EcKeyImportParams | dntShim.AesKeyAlgorithm, extractable: boolean, keyUsages: dntShim.KeyUsage[]): Promise<dntShim.CryptoKey>;
         };
         sign: (algorithm: dntShim.AlgorithmIdentifier | dntShim.RsaPssParams | dntShim.EcdsaParams, key: dntShim.CryptoKey, data: dntShim.BufferSource) => Promise<ArrayBuffer>;
         unwrapKey: (format: dntShim.KeyFormat, wrappedKey: dntShim.BufferSource, unwrappingKey: dntShim.CryptoKey, unwrapAlgorithm: dntShim.AlgorithmIdentifier | dntShim.RsaOaepParams | dntShim.AesCtrParams | dntShim.AesCbcParams | dntShim.AesGcmParams, unwrappedKeyAlgorithm: dntShim.AlgorithmIdentifier | dntShim.HmacImportParams | dntShim.RsaHashedImportParams | dntShim.EcKeyImportParams | dntShim.AesKeyAlgorithm, extractable: boolean, keyUsages: dntShim.KeyUsage[]) => Promise<dntShim.CryptoKey>;

package/types/entrypoints/cloudflare.d.ts

@@ -1,5 +1,5 @@
-import * as c from "../pkg/consumer.js";
+import * as r from "../pkg/receiver.js";
 export * from "../pkg/client/client.js";
-export declare class Consumer extends c.Consumer {
-    constructor(config: Omit<c.ConsumerConfig, "crypto">);
+export declare class Receiver extends r.Receiver {
+    constructor(config: Omit<r.ReceiverConfig, "crypto">);
 }

package/types/entrypoints/nodejs.d.ts

@@ -0,0 +1,5 @@
+import * as r from "../pkg/receiver.js";
+export * from "../pkg/client/client.js";
+export declare class Receiver extends r.Receiver {
+    constructor(config: Omit<r.ReceiverConfig, "crypto">);
+}

package/types/pkg/client/client.d.ts

@@ -4,7 +4,7 @@ import { Messages } from "./messages.js";
 import { Schedules } from "./schedules.js";
 import { Endpoints } from "./endpoints.js";
 import type { Log } from "./types.js";
-import type { HeadersInit, BodyInit } from "../../deps/raw.githubusercontent.com/microsoft/TypeScript/main/lib/lib.dom";
+import type { BodyInit, HeadersInit } from "../../deps/raw.githubusercontent.com/microsoft/TypeScript/main/lib/lib.dom";
 export declare type ClientConfig = {
     /**
      * Url of the qstash api server.

package/types/pkg/client/http.d.ts

@@ -1,4 +1,4 @@
-import type { HeadersInit, BodyInit } from "../../deps/raw.githubusercontent.com/microsoft/TypeScript/main/lib/lib.dom";
+import type { BodyInit, HeadersInit } from "../../deps/raw.githubusercontent.com/microsoft/TypeScript/main/lib/lib.dom";
 export declare type UpstashRequest = {
     /**
      * The path to the resource.

package/types/pkg/{consumer.d.ts → receiver.d.ts}

@@ -26,7 +26,7 @@ export declare type VerifyRequest = {
     /**
      * URL of the endpoint where the request was sent to.
      */
-    url: string;
+    url?: string;
 };
 export declare class SignatureError extends Error {
     constructor(message: string);