@upstash/redis 0.0.0-ci.e1d39d33 → 0.0.0-ci.efe72030

package/esm/platforms/node_with_fetch.js

@@ -1,6 +1,6 @@
 // deno-lint-ignore-file
 import * as core from "../pkg/redis.js";
-import { UpstashError } from "../pkg/error.js";
+import { HttpClient, } from "../pkg/http.js";
 import "isomorphic-fetch";
 /**
  * Serverless redis client for upstash.
@@ -21,8 +21,9 @@ export class Redis extends core.Redis {
             /\r|\n/.test(configOrRequester.token)) {
             console.warn("The redis token contains whitespace or newline, which can cause errors!");
         }
-        const client = defaultRequester({
+        const client = new HttpClient({
             baseUrl: configOrRequester.url,
+            retry: configOrRequester.retry,
             headers: { authorization: `Bearer ${configOrRequester.token}` },
             // agent: configOrRequester.agent,
         });
@@ -54,28 +55,6 @@ export class Redis extends core.Redis {
         if (!token) {
             throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`");
         }
-        return new Redis({ url, token, ...config });
+        return new Redis({ ...config, url, token });
     }
 }
-function defaultRequester(config) {
-    return {
-        request: async function (req) {
-            if (!req.path) {
-                req.path = [];
-            }
-            const res = await fetch([config.baseUrl, ...req.path].join("/"), {
-                method: "POST",
-                headers: { "Content-Type": "application/json", ...config.headers },
-                body: JSON.stringify(req.body),
-                keepalive: true,
-                // @ts-ignore
-                agent: config.agent,
-            });
-            const body = (await res.json());
-            if (!res.ok) {
-                throw new UpstashError(body.error);
-            }
-            return body;
-        },
-    };
-}

package/esm/platforms/nodejs.js

@@ -1,6 +1,6 @@
 // deno-lint-ignore-file
 import * as core from "../pkg/redis.js";
-import { UpstashError } from "../pkg/error.js";
+import { HttpClient, } from "../pkg/http.js";
 /**
  * Serverless redis client for upstash.
  */
@@ -20,8 +20,9 @@ export class Redis extends core.Redis {
             /\r|\n/.test(configOrRequester.token)) {
             console.warn("The redis token contains whitespace or newline, which can cause errors!");
         }
-        const client = defaultRequester({
+        const client = new HttpClient({
             baseUrl: configOrRequester.url,
+            retry: configOrRequester.retry,
             headers: { authorization: `Bearer ${configOrRequester.token}` },
             // agent: configOrRequester.agent,
         });
@@ -53,28 +54,6 @@ export class Redis extends core.Redis {
         if (!token) {
             throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`");
         }
-        return new Redis({ url, token, ...config });
+        return new Redis({ ...config, url, token });
     }
 }
-function defaultRequester(config) {
-    return {
-        request: async function (req) {
-            if (!req.path) {
-                req.path = [];
-            }
-            const res = await fetch([config.baseUrl, ...req.path].join("/"), {
-                method: "POST",
-                headers: { "Content-Type": "application/json", ...config.headers },
-                body: JSON.stringify(req.body),
-                keepalive: true,
-                // @ts-ignore
-                agent: config.agent,
-            });
-            const body = (await res.json());
-            if (!res.ok) {
-                throw new UpstashError(body.error);
-            }
-            return body;
-        },
-    };
-}

package/package.json

@@ -3,7 +3,7 @@
   "main": "./script/platforms/nodejs.js",
   "types": "./types/platforms/nodejs.d.ts",
   "name": "@upstash/redis",
-  "version": "v0.0.0-ci.e1d39d33",
+  "version": "v0.0.0-ci.efe72030",
   "description": "An HTTP/REST based Redis client built on top of Upstash REST API.",
   "repository": {
     "type": "git",
@@ -16,36 +16,43 @@
     "edge",
     "upstash"
   ],
-  "author": "Andreas Thomas <andreas.thomas@chronark.com>",
+  "author": "Andreas Thomas <dev@chronark.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/upstash/upstash-redis/issues"
   },
-  "dependencies": {
-    "isomorphic-fetch": "^3.0.0"
-  },
   "homepage": "https://github.com/upstash/upstash-redis#readme",
-  "browser": {
-    "isomorphic-fetch": false,
-    "http": false,
-    "https": false
-  },
   "devDependencies": {
     "@size-limit/preset-small-lib": "latest",
     "size-limit": "latest"
   },
+  "dependencies": {
+    "isomorphic-fetch": "^3.0.0"
+  },
+  "typesVersions": {
+    "*": {
+      "nodejs": "./types/platforms/nodejs.d.ts",
+      "cloudflare": "./types/platforms/cloudflare.d.ts",
+      "fastly": "./types/platforms/fastly.d.ts",
+      "with-fetch": "./types/platforms/node_with_fetch.d.ts"
+    }
+  },
   "size-limit": [
     {
       "path": "esm/platforms/nodejs.js",
-      "limit": "5 KB"
+      "limit": "6 KB"
     },
     {
       "path": "esm/platforms/fastly.js",
-      "limit": "5 KB"
+      "limit": "6 KB"
     },
     {
       "path": "esm/platforms/cloudflare.js",
-      "limit": "5 KB"
+      "limit": "6 KB"
+    },
+    {
+      "path": "esm/platforms/node_with_fetch.js",
+      "limit": "15 KB"
     },
     {
       "path": "script/platforms/nodejs.js",
@@ -58,6 +65,10 @@
     {
       "path": "script/platforms/cloudflare.js",
       "limit": "10 KB"
+    },
+    {
+      "path": "script/platforms/node_with_fetch.js",
+      "limit": "15 KB"
     }
   ],
   "exports": {

package/script/pkg/commands/lpos.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LPosCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/lpos
+ */
+class LPosCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        const args = ["lpos", cmd[0], cmd[1]];
+        if (typeof cmd[2]?.rank === "number") {
+            args.push("rank", cmd[2].rank);
+        }
+        if (typeof cmd[2]?.count === "number") {
+            args.push("count", cmd[2].count);
+        }
+        if (typeof cmd[2]?.maxLen === "number") {
+            args.push("maxLen", cmd[2].maxLen);
+        }
+        super(args, opts);
+    }
+}
+exports.LPosCommand = LPosCommand;

package/script/pkg/commands/mod.js

@@ -58,6 +58,7 @@ __exportStar(require("./lindex.js"), exports);
 __exportStar(require("./linsert.js"), exports);
 __exportStar(require("./llen.js"), exports);
 __exportStar(require("./lpop.js"), exports);
+__exportStar(require("./lpos.js"), exports);
 __exportStar(require("./lpush.js"), exports);
 __exportStar(require("./lpushx.js"), exports);
 __exportStar(require("./lrange.js"), exports);

package/script/pkg/commands/script_exists.js

@@ -8,16 +8,7 @@ const command_js_1 = require("./command.js");
 class ScriptExistsCommand extends command_js_1.Command {
     constructor(hashes, opts) {
         super(["script", "exists", ...hashes], {
-            deserialize: (result) => {
-                /**
-                 * This isn't very pretty but it does the job.
-                 * The user facing api is clean and will return a single `string` if they provided
-                 * a single script hash, and an array of strings of the same length when given an
-                 * array of hashes.
-                 */
-                const parsed = result;
-                return parsed.length === 1 ? parsed[0] : parsed;
-            },
+            deserialize: (result) => result,
             ...opts,
         });
     }

package/script/pkg/commands/sdiffstore.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDiffStoreCommand = void 0;
 const command_js_1 = require("./command.js");
 /**
- * @see https://redis.io/commands/sdiffstpre
+ * @see https://redis.io/commands/sdiffstore
  */
 class SDiffStoreCommand extends command_js_1.Command {
     constructor(cmd, opts) {

package/script/pkg/commands/zrange.js

@@ -15,6 +15,12 @@ class ZRangeCommand extends command_js_1.Command {
         if (opts?.byLex) {
             command.push("bylex");
         }
+        if (opts?.rev) {
+            command.push("rev");
+        }
+        if (typeof opts?.count !== "undefined" && typeof opts?.offset !== "undefined") {
+            command.push("limit", opts.offset, opts.count);
+        }
         if (opts?.withScores) {
             command.push("withscores");
         }

package/script/pkg/http.js

@@ -22,14 +22,30 @@ class HttpClient {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "retry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.baseUrl = config.baseUrl.replace(/\/$/, "");
         this.headers = { "Content-Type": "application/json", ...config.headers };
-        this.options = config.options;
+        this.options = { backend: config.options?.backend };
+        if (typeof config?.retry === "boolean" && config?.retry === false) {
+            this.retry = {
+                attempts: 1,
+                backoff: () => 0,
+            };
+        }
+        else {
+            this.retry = {
+                attempts: config?.retry?.retries ?? 5,
+                backoff: config?.retry?.backoff ??
+                    ((retryCount) => Math.exp(retryCount) * 50),
+            };
+        }
     }
     async request(req) {
-        if (!req.path) {
-            req.path = [];
-        }
         const requestOptions = {
             method: "POST",
             headers: this.headers,
@@ -40,9 +56,21 @@ class HttpClient {
              */
             backend: this.options?.backend,
         };
-        // fetch is defined by isomorphic fetch
-        // eslint-disable-next-line no-undef
-        const res = await fetch([this.baseUrl, ...req.path].join("/"), requestOptions);
+        let res = null;
+        let error = null;
+        for (let i = 0; i <= this.retry.attempts; i++) {
+            try {
+                res = await fetch([this.baseUrl, ...(req.path ?? [])].join("/"), requestOptions);
+                break;
+            }
+            catch (err) {
+                error = err;
+                await new Promise((r) => setTimeout(r, this.retry.backoff(i)));
+            }
+        }
+        if (!res) {
+            throw error ?? new Error("Exhausted all retries");
+        }
         const body = (await res.json());
         if (!res.ok) {
             throw new error_js_1.UpstashError(body.error);

package/script/pkg/pipeline.js

@@ -478,6 +478,15 @@ class Pipeline {
             writable: true,
             value: (...args) => this.chain(new mod_js_1.LPopCommand(args, this.commandOptions))
         });
+        /**
+         * @see https://redis.io/commands/lpos
+         */
+        Object.defineProperty(this, "lpos", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => this.chain(new mod_js_1.LPosCommand(args, this.commandOptions))
+        });
         /**
          * @see https://redis.io/commands/lpush
          */

package/script/pkg/redis.js

@@ -31,6 +31,18 @@ class Redis {
             writable: true,
             value: void 0
         });
+        /**
+         * Wrap a new middleware around the HTTP client.
+         */
+        Object.defineProperty(this, "use", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (middleware) => {
+                const makeRequest = this.client.request.bind(this.client);
+                this.client.request = (req) => middleware(req, makeRequest);
+            }
+        });
         /**
          * Create a new pipeline that allows you to send requests in bulk.
          *
@@ -429,6 +441,15 @@ class Redis {
             writable: true,
             value: (...args) => new mod_js_1.LPopCommand(args, this.opts).exec(this.client)
         });
+        /**
+         * @see https://redis.io/commands/lpos
+         */
+        Object.defineProperty(this, "lpos", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new mod_js_1.LPosCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/lpush
          */

package/script/platforms/cloudflare.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Redis = void 0;
 const core = __importStar(require("../pkg/redis.js"));
-const error_js_1 = require("../pkg/error.js");
+const http_js_1 = require("../pkg/http.js");
 /**
  * Serverless redis client for upstash.
  */
@@ -52,7 +52,8 @@ class Redis extends core.Redis {
             /\r|\n/.test(config.token)) {
             console.warn("The redis token contains whitespace or newline, which can cause errors!");
         }
-        const client = defaultRequester({
+        const client = new http_js_1.HttpClient({
+            retry: config.retry,
             baseUrl: config.url,
             headers: { authorization: `Bearer ${config.token}` },
         });
@@ -70,9 +71,8 @@ class Redis extends core.Redis {
      * ```ts
      * const redis = Redis.fromEnv(env)
      * ```
-     *
      */
-    static fromEnv(env) {
+    static fromEnv(env, opts) {
         // @ts-ignore These will be defined by cloudflare
         const url = env?.UPSTASH_REDIS_REST_URL ?? UPSTASH_REDIS_REST_URL;
         // @ts-ignore These will be defined by cloudflare
@@ -83,27 +83,7 @@ class Redis extends core.Redis {
         if (!token) {
             throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`. Please add it via `wrangler secret put UPSTASH_REDIS_REST_TOKEN`");
         }
-        return new Redis({ url, token });
+        return new Redis({ ...opts, url, token });
     }
 }
 exports.Redis = Redis;
-function defaultRequester(config) {
-    return {
-        request: async function (req) {
-            if (!req.path) {
-                req.path = [];
-            }
-            const res = await fetch([config.baseUrl, ...req.path].join("/"), {
-                method: "POST",
-                headers: { "Content-Type": "application/json", ...config.headers },
-                body: JSON.stringify(req.body),
-                keepalive: true,
-            });
-            const body = (await res.json());
-            if (!res.ok) {
-                throw new error_js_1.UpstashError(body.error);
-            }
-            return body;
-        },
-    };
-}

package/script/platforms/fastly.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Redis = void 0;
 const core = __importStar(require("../pkg/redis.js"));
-const error_js_1 = require("../pkg/error.js");
+const http_js_1 = require("../pkg/http.js");
 /**
  * Serverless redis client for upstash.
  */
@@ -53,10 +53,11 @@ class Redis extends core.Redis {
             /\r|\n/.test(config.token)) {
             console.warn("The redis token contains whitespace or newline, which can cause errors!");
         }
-        const client = defaultRequester({
+        const client = new http_js_1.HttpClient({
             baseUrl: config.url,
+            retry: config.retry,
             headers: { authorization: `Bearer ${config.token}` },
-            backend: config.backend,
+            options: { backend: config.backend },
         });
         super(client, {
             automaticDeserialization: config.automaticDeserialization,
@@ -64,25 +65,3 @@ class Redis extends core.Redis {
     }
 }
 exports.Redis = Redis;
-function defaultRequester(config) {
-    return {
-        request: async function (req) {
-            if (!req.path) {
-                req.path = [];
-            }
-            const res = await fetch([config.baseUrl, ...req.path].join("/"), {
-                method: "POST",
-                headers: { "Content-Type": "application/json", ...config.headers },
-                body: JSON.stringify(req.body),
-                keepalive: true,
-                // @ts-expect-error fastly requires `backend`
-                backend: config.backend,
-            });
-            const body = (await res.json());
-            if (!res.ok) {
-                throw new error_js_1.UpstashError(body.error);
-            }
-            return body;
-        },
-    };
-}

package/script/platforms/node_with_fetch.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Redis = void 0;
 const core = __importStar(require("../pkg/redis.js"));
-const error_js_1 = require("../pkg/error.js");
+const http_js_1 = require("../pkg/http.js");
 require("isomorphic-fetch");
 /**
  * Serverless redis client for upstash.
@@ -47,8 +47,9 @@ class Redis extends core.Redis {
             /\r|\n/.test(configOrRequester.token)) {
             console.warn("The redis token contains whitespace or newline, which can cause errors!");
         }
-        const client = defaultRequester({
+        const client = new http_js_1.HttpClient({
             baseUrl: configOrRequester.url,
+            retry: configOrRequester.retry,
             headers: { authorization: `Bearer ${configOrRequester.token}` },
             // agent: configOrRequester.agent,
         });
@@ -80,29 +81,7 @@ class Redis extends core.Redis {
         if (!token) {
             throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`");
         }
-        return new Redis({ url, token, ...config });
+        return new Redis({ ...config, url, token });
     }
 }
 exports.Redis = Redis;
-function defaultRequester(config) {
-    return {
-        request: async function (req) {
-            if (!req.path) {
-                req.path = [];
-            }
-            const res = await fetch([config.baseUrl, ...req.path].join("/"), {
-                method: "POST",
-                headers: { "Content-Type": "application/json", ...config.headers },
-                body: JSON.stringify(req.body),
-                keepalive: true,
-                // @ts-ignore
-                agent: config.agent,
-            });
-            const body = (await res.json());
-            if (!res.ok) {
-                throw new error_js_1.UpstashError(body.error);
-            }
-            return body;
-        },
-    };
-}

package/script/platforms/nodejs.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Redis = void 0;
 const core = __importStar(require("../pkg/redis.js"));
-const error_js_1 = require("../pkg/error.js");
+const http_js_1 = require("../pkg/http.js");
 /**
  * Serverless redis client for upstash.
  */
@@ -46,8 +46,9 @@ class Redis extends core.Redis {
             /\r|\n/.test(configOrRequester.token)) {
             console.warn("The redis token contains whitespace or newline, which can cause errors!");
         }
-        const client = defaultRequester({
+        const client = new http_js_1.HttpClient({
             baseUrl: configOrRequester.url,
+            retry: configOrRequester.retry,
             headers: { authorization: `Bearer ${configOrRequester.token}` },
             // agent: configOrRequester.agent,
         });
@@ -79,29 +80,7 @@ class Redis extends core.Redis {
         if (!token) {
             throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`");
         }
-        return new Redis({ url, token, ...config });
+        return new Redis({ ...config, url, token });
     }
 }
 exports.Redis = Redis;
-function defaultRequester(config) {
-    return {
-        request: async function (req) {
-            if (!req.path) {
-                req.path = [];
-            }
-            const res = await fetch([config.baseUrl, ...req.path].join("/"), {
-                method: "POST",
-                headers: { "Content-Type": "application/json", ...config.headers },
-                body: JSON.stringify(req.body),
-                keepalive: true,
-                // @ts-ignore
-                agent: config.agent,
-            });
-            const body = (await res.json());
-            if (!res.ok) {
-                throw new error_js_1.UpstashError(body.error);
-            }
-            return body;
-        },
-    };
-}

package/types/pkg/commands/bitop.d.ts

@@ -6,7 +6,6 @@ export declare class BitOpCommand extends Command<number, number> {
     constructor(cmd: [
         op: "and" | "or" | "xor",
         destinationKey: string,
-        sourceKey: string,
         ...sourceKeys: string[]
     ], opts?: CommandOptions<number, number>);
     constructor(cmd: [op: "not", destinationKey: string, sourceKey: string], opts?: CommandOptions<number, number>);

package/types/pkg/commands/bitpos.d.ts

@@ -3,5 +3,5 @@ import { Command, CommandOptions } from "./command.js";
  * @see https://redis.io/commands/bitpos
  */
 export declare class BitPosCommand extends Command<number, number> {
-    constructor(cmd: [key: string, start: number, end: number], opts?: CommandOptions<number, number>);
+    constructor(cmd: [key: string, bit: 0 | 1, start?: number, end?: number], opts?: CommandOptions<number, number>);
 }

package/types/pkg/commands/hmset.d.ts

@@ -2,8 +2,8 @@ import { Command, CommandOptions } from "./command.js";
 /**
  * @see https://redis.io/commands/hmset
  */
-export declare class HMSetCommand<TData> extends Command<number, number> {
+export declare class HMSetCommand<TData> extends Command<"OK", "OK"> {
     constructor([key, kv]: [key: string, kv: {
         [field: string]: TData;
-    }], opts?: CommandOptions<number, number>);
+    }], opts?: CommandOptions<"OK", "OK">);
 }

package/types/pkg/commands/lpop.d.ts

@@ -3,5 +3,5 @@ import { Command, CommandOptions } from "./command.js";
  * @see https://redis.io/commands/lpop
  */
 export declare class LPopCommand<TData = string> extends Command<unknown | null, TData | null> {
-    constructor(cmd: [key: string], opts?: CommandOptions<unknown | null, TData | null>);
+    constructor(cmd: [key: string, count?: number], opts?: CommandOptions<unknown | null, TData | null>);
 }

package/types/pkg/commands/lpos.d.ts

@@ -0,0 +1,15 @@
+import { Command, CommandOptions } from "./command.js";
+/**
+ * @see https://redis.io/commands/lpos
+ */
+export declare class LPosCommand<TData = number> extends Command<TData, TData> {
+    constructor(cmd: [
+        key: string,
+        element: unknown,
+        opts?: {
+            rank?: number;
+            count?: number;
+            maxLen?: number;
+        }
+    ], opts?: CommandOptions<TData, TData>);
+}

package/types/pkg/commands/mget.d.ts

@@ -3,5 +3,5 @@ import { Command, CommandOptions } from "./command.js";
  * @see https://redis.io/commands/mget
  */
 export declare class MGetCommand<TData extends unknown[]> extends Command<(string | null)[], TData> {
-    constructor(cmd: [...keys: [string, ...string[]]], opts?: CommandOptions<(string | null)[], TData>);
+    constructor(cmd: [...keys: string[]], opts?: CommandOptions<(string | null)[], TData>);
 }

package/types/pkg/commands/mod.d.ts

@@ -42,6 +42,7 @@ export * from "./lindex.js";
 export * from "./linsert.js";
 export * from "./llen.js";
 export * from "./lpop.js";
+export * from "./lpos.js";
 export * from "./lpush.js";
 export * from "./lpushx.js";
 export * from "./lrange.js";

package/types/pkg/commands/rpop.d.ts

@@ -2,6 +2,6 @@ import { Command, CommandOptions } from "./command.js";
 /**
  * @see https://redis.io/commands/rpop
  */
-export declare class RPopCommand<TData = string> extends Command<unknown | null, TData | null> {
-    constructor(cmd: [key: string], opts?: CommandOptions<unknown | null, TData | null>);
+export declare class RPopCommand<TData extends unknown | unknown[] = string> extends Command<unknown | null, TData | null> {
+    constructor(cmd: [key: string, count?: number], opts?: CommandOptions<unknown | null, TData | null>);
 }

package/types/pkg/commands/script_exists.d.ts

@@ -1,9 +1,7 @@
 import { Command, CommandOptions } from "./command.js";
-declare type TupleOfLength<T, L extends number, R extends T[] = []> = R["length"] extends L ? R : TupleOfLength<T, L, [...R, T]>;
 /**
  * @see https://redis.io/commands/script-exists
  */
-export declare class ScriptExistsCommand<T extends [string, ...string[]]> extends Command<T extends [string] ? string : TupleOfLength<string, T["length"]>, TupleOfLength<string, T["length"]>> {
-    constructor(hashes: T, opts?: CommandOptions<T extends [string] ? string : TupleOfLength<string, T["length"]>, TupleOfLength<string, T["length"]>>);
+export declare class ScriptExistsCommand<T extends string[]> extends Command<string[], number[]> {
+    constructor(hashes: T, opts?: CommandOptions<string[], number[]>);
 }
-export {};