@upstash/redis 0.0.0-ci.f55d85c5 → 0.0.0-ci.fb6b986f-20221006

package/esm/deps/denopkg.com/chiefbiiko/std-encoding@v1.0.0/mod.js

@@ -0,0 +1,50 @@
+import { toUint8Array, fromUint8Array } from "../../../deno.land/x/base64@v0.2.1/base64url.js";
+const decoder = new TextDecoder();
+const encoder = new TextEncoder();
+/** Serializes a Uint8Array to a hexadecimal string. */
+function toHexString(buf) {
+    return buf.reduce((hex, byte) => `${hex}${byte < 16 ? "0" : ""}${byte.toString(16)}`, "");
+}
+/** Deserializes a Uint8Array from a hexadecimal string. */
+function fromHexString(hex) {
+    const len = hex.length;
+    if (len % 2 || !/^[0-9a-fA-F]+$/.test(hex)) {
+        throw new TypeError("Invalid hex string.");
+    }
+    hex = hex.toLowerCase();
+    const buf = new Uint8Array(Math.floor(len / 2));
+    const end = len / 2;
+    for (let i = 0; i < end; ++i) {
+        buf[i] = parseInt(hex.substr(i * 2, 2), 16);
+    }
+    return buf;
+}
+/** Decodes a Uint8Array to utf8-, base64-, or hex-encoded string. */
+export function decode(buf, encoding = "utf8") {
+    if (/^utf-?8$/i.test(encoding)) {
+        return decoder.decode(buf);
+    }
+    else if (/^base64$/i.test(encoding)) {
+        return fromUint8Array(buf);
+    }
+    else if (/^hex(?:adecimal)?$/i.test(encoding)) {
+        return toHexString(buf);
+    }
+    else {
+        throw new TypeError("Unsupported string encoding.");
+    }
+}
+export function encode(str, encoding = "utf8") {
+    if (/^utf-?8$/i.test(encoding)) {
+        return encoder.encode(str);
+    }
+    else if (/^base64$/i.test(encoding)) {
+        return toUint8Array(str);
+    }
+    else if (/^hex(?:adecimal)?$/i.test(encoding)) {
+        return fromHexString(str);
+    }
+    else {
+        throw new TypeError("Unsupported string encoding.");
+    }
+}

package/esm/pkg/commands/lpos.js

@@ -0,0 +1,19 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/lpos
+ */
+export class LPosCommand extends 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);
+    }
+}

package/esm/pkg/commands/mod.js

@@ -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/esm/pkg/commands/scan.js

@@ -11,6 +11,9 @@ export class ScanCommand extends Command {
         if (typeof opts?.count === "number") {
             command.push("count", opts.count);
         }
+        if (opts?.type && opts.type.length > 0) {
+            command.push("type", opts.type);
+        }
         super(command, cmdOpts);
     }
 }

package/esm/pkg/commands/script_exists.js

@@ -5,16 +5,7 @@ import { Command } from "./command.js";
 export class ScriptExistsCommand extends 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/esm/pkg/commands/sdiffstore.js

@@ -1,6 +1,6 @@
 import { Command } from "./command.js";
 /**
- * @see https://redis.io/commands/sdiffstpre
+ * @see https://redis.io/commands/sdiffstore
  */
 export class SDiffStoreCommand extends Command {
     constructor(cmd, opts) {

package/esm/pkg/commands/set.js

@@ -6,17 +6,29 @@ export class SetCommand extends Command {
     constructor([key, value, opts], cmdOpts) {
         const command = ["set", key, value];
         if (opts) {
+            if ("nx" in opts && opts.nx) {
+                command.push("nx");
+            }
+            else if ("xx" in opts && opts.xx) {
+                command.push("xx");
+            }
+            if ("get" in opts && opts.get) {
+                command.push("get");
+            }
             if ("ex" in opts && typeof opts.ex === "number") {
                 command.push("ex", opts.ex);
             }
             else if ("px" in opts && typeof opts.px === "number") {
                 command.push("px", opts.px);
             }
-            if ("nx" in opts && opts.nx) {
-                command.push("nx");
+            else if ("exat" in opts && typeof opts.exat === "number") {
+                command.push("exat", opts.exat);
             }
-            else if ("xx" in opts && opts.xx) {
-                command.push("xx");
+            else if ("pxat" in opts && typeof opts.pxat === "number") {
+                command.push("pxat", opts.pxat);
+            }
+            else if ("keepTtl" in opts && opts.keepTtl) {
+                command.push("keepTtl", opts.keepTtl);
             }
         }
         super(command, cmdOpts);

package/esm/pkg/commands/zmscore.js

@@ -0,0 +1,10 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/zmscore
+ */
+export class ZMScoreCommand extends Command {
+    constructor(cmd, opts) {
+        const [key, members] = cmd;
+        super(["zmscore", key, ...members], opts);
+    }
+}

package/esm/pkg/commands/zrange.js

@@ -12,6 +12,12 @@ export class ZRangeCommand extends 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/esm/pkg/http.js

@@ -19,14 +19,34 @@ export 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.headers = {
+            "Content-Type": "application/json",
+            "Upstash-Encoding": "base64",
+            ...config.headers,
+        };
+        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,
@@ -37,13 +57,72 @@ export 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 UpstashError(body.error);
         }
-        return body;
+        return Array.isArray(body) ? body.map(decode) : decode(body);
+    }
+}
+function base64decode(b64) {
+    let dec = "";
+    try {
+        dec = atob(b64).split("").map((c) => "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2)).join("");
+    }
+    catch (e) {
+        console.warn(`Unable to decode base64 [${dec}]: ${e.message}`);
+        return dec;
+    }
+    try {
+        return decodeURIComponent(dec);
+    }
+    catch (e) {
+        console.warn(`Unable to decode URI [${dec}]: ${e.message}`);
+        return dec;
+    }
+}
+function decode(raw) {
+    let result = undefined;
+    switch (typeof raw.result) {
+        case "undefined":
+            return raw;
+        case "number":
+            result = raw.result;
+            break;
+        case "object":
+            if (Array.isArray(raw.result)) {
+                result = raw.result.map((v) => typeof v === "string"
+                    ? base64decode(v)
+                    : Array.isArray(v)
+                        ? v.map(base64decode)
+                        : v);
+            }
+            else {
+                // If it's not an array it must be null
+                // Apparently null is an object in javascript
+                result = null;
+            }
+            break;
+        case "string":
+            result = raw.result === "OK" ? "OK" : base64decode(raw.result);
+            break;
+        default:
+            break;
     }
+    return { result, error: raw.error };
 }

package/esm/pkg/pipeline.js

@@ -1,5 +1,6 @@
-import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GetBitCommand, GetCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LPopCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionStoreCommand, } from "./commands/mod.js";
+import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GetBitCommand, GetCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LPopCommand, LPosCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionStoreCommand, } from "./commands/mod.js";
 import { UpstashError } from "./error.js";
+import { ZMScoreCommand } from "./commands/zmscore.js";
 /**
  * Upstash REST API supports command pipelining to send multiple commands in
  * batch, instead of sending each command one by one and waiting for a response.
@@ -475,6 +476,15 @@ export class Pipeline {
             writable: true,
             value: (...args) => this.chain(new 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 LPosCommand(args, this.commandOptions))
+        });
         /**
          * @see https://redis.io/commands/lpush
          */
@@ -1002,6 +1012,15 @@ export class Pipeline {
             writable: true,
             value: (...args) => this.chain(new ZLexCountCommand(args, this.commandOptions))
         });
+        /**
+         * @see https://redis.io/commands/zmscore
+         */
+        Object.defineProperty(this, "zmscore", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => this.chain(new ZMScoreCommand(args, this.commandOptions))
+        });
         /**
          * @see https://redis.io/commands/zpopmax
          */

package/esm/pkg/redis.js

@@ -1,5 +1,7 @@
-import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GetBitCommand, GetCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LPopCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionStoreCommand, } from "./commands/mod.js";
+import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GetBitCommand, GetCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LPopCommand, LPosCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionStoreCommand, } from "./commands/mod.js";
 import { Pipeline } from "./pipeline.js";
+import { Script } from "./script.js";
+import { ZMScoreCommand } from "./commands/zmscore.js";
 /**
  * Serverless redis client for upstash.
  */
@@ -28,6 +30,18 @@ export 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.
          *
@@ -426,6 +440,15 @@ export class Redis {
             writable: true,
             value: (...args) => new 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 LPosCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/lpush
          */
@@ -953,6 +976,15 @@ export class Redis {
             writable: true,
             value: (...args) => new ZLexCountCommand(args, this.opts).exec(this.client)
         });
+        /**
+         * @see https://redis.io/commands/zmscore
+         */
+        Object.defineProperty(this, "zmscore", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new ZMScoreCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/zpopmax
          */
@@ -1064,4 +1096,7 @@ export class Redis {
         this.client = client;
         this.opts = opts;
     }
+    createScript(script) {
+        return new Script(this, script);
+    }
 }

package/esm/pkg/script.js

@@ -0,0 +1,77 @@
+import { sha1 as digest } from "../deps/deno.land/x/sha1@v1.0.3/mod.js";
+/**
+ * Creates a new script.
+ *
+ * Scripts offer the ability to optimistically try to execute a script without having to send the
+ * entire script to the server. If the script is loaded on the server, it tries again by sending
+ * the entire script. Afterwards, the script is cached on the server.
+ *
+ * @example
+ * ```ts
+ * const redis = new Redis({...})
+ *
+ * const script = redis.createScript<string>("return ARGV[1];")
+ * const arg1 = await script.eval([], ["Hello World"])
+ * assertEquals(arg1, "Hello World")
+ * ```
+ */
+export class Script {
+    constructor(redis, script) {
+        Object.defineProperty(this, "script", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "sha1", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "redis", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.redis = redis;
+        this.sha1 = this.digest(script);
+        this.script = script;
+    }
+    /**
+     * Send an `EVAL` command to redis.
+     */
+    async eval(keys, args) {
+        return await this.redis.eval(this.script, keys, args);
+    }
+    /**
+     * Calculates the sha1 hash of the script and then calls `EVALSHA`.
+     */
+    async evalsha(keys, args) {
+        return await this.redis.evalsha(this.sha1, keys, args);
+    }
+    /**
+     * Optimistically try to run `EVALSHA` first.
+     * If the script is not loaded in redis, it will fall back and try again with `EVAL`.
+     *
+     * Following calls will be able to use the cached script
+     */
+    async exec(keys, args) {
+        const res = await this.redis.evalsha(this.sha1, keys, args).catch(async (err) => {
+            if (err instanceof Error &&
+                err.message.toLowerCase().includes("noscript")) {
+                return await this.redis.eval(this.script, keys, args);
+            }
+            throw err;
+        });
+        return res;
+    }
+    /**
+     * Compute the sha1 hash of the script and return its hex representation.
+     */
+    digest(s) {
+        const hash = digest(s, "utf8", "hex");
+        return typeof hash === "string" ? hash : new TextDecoder().decode(hash);
+    }
+}

package/esm/platforms/cloudflare.js

@@ -1,5 +1,5 @@
 import * as core from "../pkg/redis.js";
-import { UpstashError } from "../pkg/error.js";
+import { HttpClient } from "../pkg/http.js";
 /**
  * Serverless redis client for upstash.
  */
@@ -26,7 +26,8 @@ export 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 HttpClient({
+            retry: config.retry,
             baseUrl: config.url,
             headers: { authorization: `Bearer ${config.token}` },
         });
@@ -44,9 +45,8 @@ export 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
@@ -57,26 +57,6 @@ export 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 });
     }
 }
-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 UpstashError(body.error);
-            }
-            return body;
-        },
-    };
-}

package/esm/platforms/fastly.js

@@ -1,5 +1,5 @@
 import * as core from "../pkg/redis.js";
-import { UpstashError } from "../pkg/error.js";
+import { HttpClient } from "../pkg/http.js";
 /**
  * Serverless redis client for upstash.
  */
@@ -27,35 +27,14 @@ export 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 HttpClient({
             baseUrl: config.url,
+            retry: config.retry,
             headers: { authorization: `Bearer ${config.token}` },
-            backend: config.backend,
+            options: { backend: config.backend },
         });
         super(client, {
             automaticDeserialization: config.automaticDeserialization,
         });
     }
 }
-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 UpstashError(body.error);
-            }
-            return body;
-        },
-    };
-}

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;
-        },
-    };
-}