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

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.f55d85c5",
+  "version": "v0.0.0-ci.fb6b986f-20221006",
   "description": "An HTTP/REST based Redis client built on top of Upstash REST API.",
   "repository": {
     "type": "git",
@@ -16,50 +16,23 @@
     "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"
   },
+  "homepage": "https://github.com/upstash/upstash-redis#readme",
   "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"
-  },
-  "size-limit": [
-    {
-      "path": "esm/platforms/nodejs.js",
-      "limit": "5 KB"
-    },
-    {
-      "path": "esm/platforms/fastly.js",
-      "limit": "5 KB"
-    },
-    {
-      "path": "esm/platforms/cloudflare.js",
-      "limit": "5 KB"
-    },
-    {
-      "path": "script/platforms/nodejs.js",
-      "limit": "10 KB"
-    },
-    {
-      "path": "script/platforms/fastly.js",
-      "limit": "10 KB"
-    },
-    {
-      "path": "script/platforms/cloudflare.js",
-      "limit": "10 KB"
+  "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"
     }
-  ],
+  },
   "exports": {
     ".": {
       "import": "./esm/platforms/nodejs.js",

package/script/deps/deno.land/x/base64@v0.2.1/base.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.init = void 0;
+function getLengths(b64) {
+    const len = b64.length;
+    // if (len % 4 > 0) {
+    //   throw new TypeError("Invalid string. Length must be a multiple of 4");
+    // }
+    // Trim off extra bytes after placeholder bytes are found
+    // See: https://github.com/beatgammit/base64-js/issues/42
+    let validLen = b64.indexOf("=");
+    if (validLen === -1) {
+        validLen = len;
+    }
+    const placeHoldersLen = validLen === len ? 0 : 4 - (validLen % 4);
+    return [validLen, placeHoldersLen];
+}
+function init(lookup, revLookup, urlsafe = false) {
+    function _byteLength(validLen, placeHoldersLen) {
+        return Math.floor(((validLen + placeHoldersLen) * 3) / 4 - placeHoldersLen);
+    }
+    function tripletToBase64(num) {
+        return (lookup[(num >> 18) & 0x3f] +
+            lookup[(num >> 12) & 0x3f] +
+            lookup[(num >> 6) & 0x3f] +
+            lookup[num & 0x3f]);
+    }
+    function encodeChunk(buf, start, end) {
+        const out = new Array((end - start) / 3);
+        for (let i = start, curTriplet = 0; i < end; i += 3) {
+            out[curTriplet++] = tripletToBase64((buf[i] << 16) + (buf[i + 1] << 8) + buf[i + 2]);
+        }
+        return out.join("");
+    }
+    return {
+        // base64 is 4/3 + up to two characters of the original data
+        byteLength(b64) {
+            return _byteLength.apply(null, getLengths(b64));
+        },
+        toUint8Array(b64) {
+            const [validLen, placeHoldersLen] = getLengths(b64);
+            const buf = new Uint8Array(_byteLength(validLen, placeHoldersLen));
+            // If there are placeholders, only get up to the last complete 4 chars
+            const len = placeHoldersLen ? validLen - 4 : validLen;
+            let tmp;
+            let curByte = 0;
+            let i;
+            for (i = 0; i < len; i += 4) {
+                tmp = (revLookup[b64.charCodeAt(i)] << 18) |
+                    (revLookup[b64.charCodeAt(i + 1)] << 12) |
+                    (revLookup[b64.charCodeAt(i + 2)] << 6) |
+                    revLookup[b64.charCodeAt(i + 3)];
+                buf[curByte++] = (tmp >> 16) & 0xff;
+                buf[curByte++] = (tmp >> 8) & 0xff;
+                buf[curByte++] = tmp & 0xff;
+            }
+            if (placeHoldersLen === 2) {
+                tmp = (revLookup[b64.charCodeAt(i)] << 2) |
+                    (revLookup[b64.charCodeAt(i + 1)] >> 4);
+                buf[curByte++] = tmp & 0xff;
+            }
+            else if (placeHoldersLen === 1) {
+                tmp = (revLookup[b64.charCodeAt(i)] << 10) |
+                    (revLookup[b64.charCodeAt(i + 1)] << 4) |
+                    (revLookup[b64.charCodeAt(i + 2)] >> 2);
+                buf[curByte++] = (tmp >> 8) & 0xff;
+                buf[curByte++] = tmp & 0xff;
+            }
+            return buf;
+        },
+        fromUint8Array(buf) {
+            const maxChunkLength = 16383; // Must be multiple of 3
+            const len = buf.length;
+            const extraBytes = len % 3; // If we have 1 byte left, pad 2 bytes
+            const len2 = len - extraBytes;
+            const parts = new Array(Math.ceil(len2 / maxChunkLength) + (extraBytes ? 1 : 0));
+            let curChunk = 0;
+            let chunkEnd;
+            // Go through the array every three bytes, we'll deal with trailing stuff later
+            for (let i = 0; i < len2; i += maxChunkLength) {
+                chunkEnd = i + maxChunkLength;
+                parts[curChunk++] = encodeChunk(buf, i, chunkEnd > len2 ? len2 : chunkEnd);
+            }
+            let tmp;
+            // Pad the end with zeros, but make sure to not forget the extra bytes
+            if (extraBytes === 1) {
+                tmp = buf[len2];
+                parts[curChunk] = lookup[tmp >> 2] + lookup[(tmp << 4) & 0x3f];
+                if (!urlsafe)
+                    parts[curChunk] += "==";
+            }
+            else if (extraBytes === 2) {
+                tmp = (buf[len2] << 8) | (buf[len2 + 1] & 0xff);
+                parts[curChunk] = lookup[tmp >> 10] +
+                    lookup[(tmp >> 4) & 0x3f] +
+                    lookup[(tmp << 2) & 0x3f];
+                if (!urlsafe)
+                    parts[curChunk] += "=";
+            }
+            return parts.join("");
+        },
+    };
+}
+exports.init = init;

package/script/deps/deno.land/x/base64@v0.2.1/base64url.js

@@ -0,0 +1,13 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromUint8Array = exports.toUint8Array = exports.byteLength = void 0;
+const base_js_1 = require("./base.js");
+const lookup = [];
+const revLookup = [];
+const code = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+for (let i = 0, l = code.length; i < l; ++i) {
+    lookup[i] = code[i];
+    revLookup[code.charCodeAt(i)] = i;
+}
+_a = (0, base_js_1.init)(lookup, revLookup, true), exports.byteLength = _a.byteLength, exports.toUint8Array = _a.toUint8Array, exports.fromUint8Array = _a.fromUint8Array;

package/script/deps/deno.land/x/sha1@v1.0.3/deps.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decode = exports.encode = void 0;
+var mod_js_1 = require("../../../denopkg.com/chiefbiiko/std-encoding@v1.0.0/mod.js");
+Object.defineProperty(exports, "encode", { enumerable: true, get: function () { return mod_js_1.encode; } });
+Object.defineProperty(exports, "decode", { enumerable: true, get: function () { return mod_js_1.decode; } });

package/script/deps/deno.land/x/sha1@v1.0.3/mod.js

@@ -0,0 +1,196 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sha1 = exports.SHA1 = exports.BYTES = void 0;
+const deps_js_1 = require("./deps.js");
+function rotl(x, n) {
+    return (x << n) | (x >>> (32 - n));
+}
+/** Byte length of a SHA1 digest. */
+exports.BYTES = 20;
+/**  A class representation of the SHA1 algorithm. */
+class SHA1 {
+    /** Creates a SHA1 instance. */
+    constructor() {
+        Object.defineProperty(this, "hashSize", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: exports.BYTES
+        });
+        Object.defineProperty(this, "_buf", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Uint8Array(64)
+        });
+        Object.defineProperty(this, "_bufIdx", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_count", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_K", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Uint32Array([0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6])
+        });
+        Object.defineProperty(this, "_H", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_finalized", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.init();
+    }
+    /** Reduces the four input numbers to a single one. */
+    static F(t, b, c, d) {
+        if (t <= 19) {
+            return (b & c) | (~b & d);
+        }
+        else if (t <= 39) {
+            return b ^ c ^ d;
+        }
+        else if (t <= 59) {
+            return (b & c) | (b & d) | (c & d);
+        }
+        else {
+            return b ^ c ^ d;
+        }
+    }
+    /** Initializes a hash instance. */
+    init() {
+        // prettier-ignore
+        this._H = new Uint32Array([
+            0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0
+        ]);
+        this._bufIdx = 0;
+        this._count = new Uint32Array(2);
+        this._buf.fill(0);
+        this._finalized = false;
+        return this;
+    }
+    /** Updates a hash with additional message data. */
+    update(msg, inputEncoding) {
+        if (msg === null) {
+            throw new TypeError("msg must be a string or Uint8Array.");
+        }
+        else if (typeof msg === "string") {
+            msg = (0, deps_js_1.encode)(msg, inputEncoding);
+        }
+        // process the msg as many times as possible, the rest is stored in the buffer
+        // message is processed in 512 bit (64 byte chunks)
+        for (let i = 0; i < msg.length; i++) {
+            this._buf[this._bufIdx++] = msg[i];
+            if (this._bufIdx === 64) {
+                this.transform();
+                this._bufIdx = 0;
+            }
+        }
+        // counter update (number of message bits)
+        const c = this._count;
+        if ((c[0] += msg.length << 3) < msg.length << 3) {
+            c[1]++;
+        }
+        c[1] += msg.length >>> 29;
+        return this;
+    }
+    /** Finalizes a hash with additional message data. */
+    digest(outputEncoding) {
+        if (this._finalized) {
+            throw new Error("digest has already been called.");
+        }
+        this._finalized = true;
+        // append '1'
+        const b = this._buf;
+        let idx = this._bufIdx;
+        b[idx++] = 0x80;
+        // zeropad up to byte pos 56
+        while (idx !== 56) {
+            if (idx === 64) {
+                this.transform();
+                idx = 0;
+            }
+            b[idx++] = 0;
+        }
+        // append length in bits
+        const c = this._count;
+        b[56] = (c[1] >>> 24) & 0xff;
+        b[57] = (c[1] >>> 16) & 0xff;
+        b[58] = (c[1] >>> 8) & 0xff;
+        b[59] = (c[1] >>> 0) & 0xff;
+        b[60] = (c[0] >>> 24) & 0xff;
+        b[61] = (c[0] >>> 16) & 0xff;
+        b[62] = (c[0] >>> 8) & 0xff;
+        b[63] = (c[0] >>> 0) & 0xff;
+        this.transform();
+        // return the hash as byte array (20 bytes)
+        const hash = new Uint8Array(exports.BYTES);
+        for (let i = 0; i < 5; i++) {
+            hash[(i << 2) + 0] = (this._H[i] >>> 24) & 0xff;
+            hash[(i << 2) + 1] = (this._H[i] >>> 16) & 0xff;
+            hash[(i << 2) + 2] = (this._H[i] >>> 8) & 0xff;
+            hash[(i << 2) + 3] = (this._H[i] >>> 0) & 0xff;
+        }
+        // clear internal states and prepare for new hash
+        this.init();
+        return outputEncoding ? (0, deps_js_1.decode)(hash, outputEncoding) : hash;
+    }
+    /** Performs one transformation cycle. */
+    transform() {
+        const h = this._H;
+        let a = h[0];
+        let b = h[1];
+        let c = h[2];
+        let d = h[3];
+        let e = h[4];
+        // convert byte buffer to words
+        const w = new Uint32Array(80);
+        for (let i = 0; i < 16; i++) {
+            w[i] =
+                this._buf[(i << 2) + 3] |
+                    (this._buf[(i << 2) + 2] << 8) |
+                    (this._buf[(i << 2) + 1] << 16) |
+                    (this._buf[i << 2] << 24);
+        }
+        for (let t = 0; t < 80; t++) {
+            if (t >= 16) {
+                w[t] = rotl(w[t - 3] ^ w[t - 8] ^ w[t - 14] ^ w[t - 16], 1);
+            }
+            const tmp = (rotl(a, 5) +
+                SHA1.F(t, b, c, d) +
+                e +
+                w[t] +
+                this._K[Math.floor(t / 20)]) |
+                0;
+            e = d;
+            d = c;
+            c = rotl(b, 30);
+            b = a;
+            a = tmp;
+        }
+        h[0] = (h[0] + a) | 0;
+        h[1] = (h[1] + b) | 0;
+        h[2] = (h[2] + c) | 0;
+        h[3] = (h[3] + d) | 0;
+        h[4] = (h[4] + e) | 0;
+    }
+}
+exports.SHA1 = SHA1;
+/** Generates a SHA1 hash of the input data. */
+function sha1(msg, inputEncoding, outputEncoding) {
+    return new SHA1().update(msg, inputEncoding).digest(outputEncoding);
+}
+exports.sha1 = sha1;

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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encode = exports.decode = void 0;
+const base64url_js_1 = require("../../../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. */
+function decode(buf, encoding = "utf8") {
+    if (/^utf-?8$/i.test(encoding)) {
+        return decoder.decode(buf);
+    }
+    else if (/^base64$/i.test(encoding)) {
+        return (0, base64url_js_1.fromUint8Array)(buf);
+    }
+    else if (/^hex(?:adecimal)?$/i.test(encoding)) {
+        return toHexString(buf);
+    }
+    else {
+        throw new TypeError("Unsupported string encoding.");
+    }
+}
+exports.decode = decode;
+function encode(str, encoding = "utf8") {
+    if (/^utf-?8$/i.test(encoding)) {
+        return encoder.encode(str);
+    }
+    else if (/^base64$/i.test(encoding)) {
+        return (0, base64url_js_1.toUint8Array)(str);
+    }
+    else if (/^hex(?:adecimal)?$/i.test(encoding)) {
+        return fromHexString(str);
+    }
+    else {
+        throw new TypeError("Unsupported string encoding.");
+    }
+}
+exports.encode = encode;

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/scan.js

@@ -14,6 +14,9 @@ class ScanCommand extends command_js_1.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/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/set.js

@@ -9,17 +9,29 @@ class SetCommand extends command_js_1.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/script/pkg/commands/zmscore.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZMScoreCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/zmscore
+ */
+class ZMScoreCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        const [key, members] = cmd;
+        super(["zmscore", key, ...members], opts);
+    }
+}
+exports.ZMScoreCommand = ZMScoreCommand;

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");
         }