@upstash/redis 0.0.0-ci.ba685120 → 0.0.0-ci.baae64ab-20231010

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,6 @@
 import * as core from "../pkg/redis.js";
 import { HttpClient } from "../pkg/http.js";
+import { VERSION } from "../version.js";
 /**
  * Serverless redis client for upstash.
  */
@@ -15,7 +16,7 @@ export class Redis extends core.Redis {
      * });
      * ```
      */
-    constructor(config) {
+    constructor(config, env) {
         if (config.url.startsWith(" ") ||
             config.url.endsWith(" ") ||
             /\r|\n/.test(config.url)) {
@@ -30,10 +31,17 @@ export class Redis extends core.Redis {
             retry: config.retry,
             baseUrl: config.url,
             headers: { authorization: `Bearer ${config.token}` },
+            responseEncoding: config.responseEncoding,
         });
         super(client, {
+            enableTelemetry: !env?.UPSTASH_DISABLE_TELEMETRY,
             automaticDeserialization: config.automaticDeserialization,
         });
+        // This is only added of the user has not disabled telemetry
+        this.addTelemetry({
+            platform: "cloudflare",
+            sdk: `@upstash/redis@${VERSION}`,
+        });
     }
     /*
      * Create a new Upstash Redis instance from environment variables on cloudflare.
@@ -57,6 +65,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({ ...opts, url, token });
+        return new Redis({ ...opts, url, token }, env);
     }
 }

package/esm/platforms/fastly.js

@@ -1,5 +1,6 @@
 import * as core from "../pkg/redis.js";
 import { HttpClient } from "../pkg/http.js";
+import { VERSION } from "../version.js";
 /**
  * Serverless redis client for upstash.
  */
@@ -32,9 +33,14 @@ export class Redis extends core.Redis {
             retry: config.retry,
             headers: { authorization: `Bearer ${config.token}` },
             options: { backend: config.backend },
+            responseEncoding: config.responseEncoding,
         });
         super(client, {
             automaticDeserialization: config.automaticDeserialization,
         });
+        this.addTelemetry({
+            sdk: `@upstash/redis@${VERSION}`,
+            platform: "fastly",
+        });
     }
 }

package/esm/platforms/node_with_fetch.js

@@ -1,7 +1,21 @@
 // deno-lint-ignore-file
 import * as core from "../pkg/redis.js";
 import { HttpClient, } from "../pkg/http.js";
+import { VERSION } from "../version.js";
 import "isomorphic-fetch";
+// @ts-ignore Deno can't compile
+// import https from "https";
+// @ts-ignore Deno can't compile
+// import http from "http";
+// import "isomorphic-fetch";
+/**
+ * Workaround for nodejs 14, where atob is not included in the standardlib
+ */
+if (typeof atob === "undefined") {
+    global.atob = function (b64) {
+        return Buffer.from(b64, "base64").toString("utf-8");
+    };
+}
 /**
  * Serverless redis client for upstash.
  */
@@ -25,10 +39,21 @@ export class Redis extends core.Redis {
             baseUrl: configOrRequester.url,
             retry: configOrRequester.retry,
             headers: { authorization: `Bearer ${configOrRequester.token}` },
-            // agent: configOrRequester.agent,
+            //  agent: configOrRequester.agent,
+            responseEncoding: configOrRequester.responseEncoding,
         });
         super(client, {
             automaticDeserialization: configOrRequester.automaticDeserialization,
+            enableTelemetry: !process.env.UPSTASH_DISABLE_TELEMETRY,
+        });
+        this.addTelemetry({
+            runtime: `node@${process.version}`,
+            platform: process.env.VERCEL
+                ? "vercel"
+                : process.env.AWS_REGION
+                    ? "aws"
+                    : "unknown",
+            sdk: `@upstash/redis@${VERSION}`,
         });
     }
     /**

package/esm/platforms/nodejs.js

@@ -1,6 +1,15 @@
 // deno-lint-ignore-file
 import * as core from "../pkg/redis.js";
 import { HttpClient, } from "../pkg/http.js";
+import { VERSION } from "../version.js";
+/**
+ * Workaround for nodejs 14, where atob is not included in the standardlib
+ */
+if (typeof atob === "undefined") {
+    global.atob = function (b64) {
+        return Buffer.from(b64, "base64").toString("utf-8");
+    };
+}
 /**
  * Serverless redis client for upstash.
  */
@@ -24,10 +33,24 @@ export class Redis extends core.Redis {
             baseUrl: configOrRequester.url,
             retry: configOrRequester.retry,
             headers: { authorization: `Bearer ${configOrRequester.token}` },
-            // agent: configOrRequester.agent,
+            agent: configOrRequester.agent,
+            responseEncoding: configOrRequester.responseEncoding,
+            cache: configOrRequester.cache || "no-store",
         });
         super(client, {
             automaticDeserialization: configOrRequester.automaticDeserialization,
+            enableTelemetry: !process.env.UPSTASH_DISABLE_TELEMETRY,
+        });
+        this.addTelemetry({
+            runtime: typeof EdgeRuntime === "string"
+                ? "edge-light"
+                : `node@${process.version}`,
+            platform: process.env.VERCEL
+                ? "vercel"
+                : process.env.AWS_REGION
+                    ? "aws"
+                    : "unknown",
+            sdk: `@upstash/redis@${VERSION}`,
         });
     }
     /**

package/esm/version.js

@@ -0,0 +1 @@
+export const VERSION = "v0.0.0-ci.baae64ab-20231010";

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.ba685120",
+  "version": "v0.0.0-ci.baae64ab-20231010",
   "description": "An HTTP/REST based Redis client built on top of Upstash REST API.",
   "repository": {
     "type": "git",
@@ -22,80 +22,75 @@
     "url": "https://github.com/upstash/upstash-redis/issues"
   },
   "homepage": "https://github.com/upstash/upstash-redis#readme",
-  "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"
+      "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": "6 KB"
-    },
-    {
-      "path": "esm/platforms/fastly.js",
-      "limit": "6 KB"
-    },
-    {
-      "path": "esm/platforms/cloudflare.js",
-      "limit": "6 KB"
-    },
-    {
-      "path": "esm/platforms/node_with_fetch.js",
-      "limit": "15 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"
-    },
-    {
-      "path": "script/platforms/node_with_fetch.js",
-      "limit": "15 KB"
-    }
-  ],
   "exports": {
     ".": {
-      "import": "./esm/platforms/nodejs.js",
-      "require": "./script/platforms/nodejs.js",
-      "types": "./types/platforms/nodejs.d.ts"
+      "import": {
+        "types": "./types/platforms/nodejs.d.ts",
+        "default": "./esm/platforms/nodejs.js"
+      },
+      "require": {
+        "types": "./types/platforms/nodejs.d.ts",
+        "default": "./script/platforms/nodejs.js"
+      }
     },
     "./nodejs": {
-      "import": "./esm/platforms/nodejs.js",
-      "require": "./script/platforms/nodejs.js",
-      "types": "./types/platforms/nodejs.d.ts"
+      "import": {
+        "types": "./types/platforms/nodejs.d.ts",
+        "default": "./esm/platforms/nodejs.js"
+      },
+      "require": {
+        "types": "./types/platforms/nodejs.d.ts",
+        "default": "./script/platforms/nodejs.js"
+      }
     },
     "./cloudflare": {
-      "import": "./esm/platforms/cloudflare.js",
-      "require": "./script/platforms/cloudflare.js",
-      "types": "./types/platforms/cloudflare.d.ts"
+      "import": {
+        "types": "./types/platforms/cloudflare.d.ts",
+        "default": "./esm/platforms/cloudflare.js"
+      },
+      "require": {
+        "types": "./types/platforms/cloudflare.d.ts",
+        "default": "./script/platforms/cloudflare.js"
+      }
     },
     "./fastly": {
-      "import": "./esm/platforms/fastly.js",
-      "require": "./script/platforms/fastly.js",
-      "types": "./types/platforms/fastly.d.ts"
+      "import": {
+        "types": "./types/platforms/fastly.d.ts",
+        "default": "./esm/platforms/fastly.js"
+      },
+      "require": {
+        "types": "./types/platforms/fastly.d.ts",
+        "default": "./script/platforms/fastly.js"
+      }
     },
     "./with-fetch": {
-      "import": "./esm/platforms/node_with_fetch.js",
-      "require": "./script/platforms/node_with_fetch.js",
-      "types": "./types/platforms/node_with_fetch.d.ts"
+      "import": {
+        "types": "./types/platforms/node_with_fetch.d.ts",
+        "default": "./esm/platforms/node_with_fetch.js"
+      },
+      "require": {
+        "types": "./types/platforms/node_with_fetch.d.ts",
+        "default": "./script/platforms/node_with_fetch.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; } });