@upstash/redis 0.0.0-ci.9846a4b6d92b334b3956b0947a58e9bef9c92a42-20250303091249 → 0.0.0-ci.9a0f7fcd9dc38c0a4ce2b192f3f9c3542ccc791c-20251125190254

package/cloudflare.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // platforms/cloudflare.ts
@@ -39,11 +29,12 @@ module.exports = __toCommonJS(cloudflare_exports);
 var error_exports = {};
 __export(error_exports, {
   UpstashError: () => UpstashError,
+  UpstashJSONParseError: () => UpstashJSONParseError,
   UrlError: () => UrlError
 });
 var UpstashError = class extends Error {
-  constructor(message) {
-    super(message);
+  constructor(message, options) {
+    super(message, options);
     this.name = "UpstashError";
   }
 };
@@ -55,6 +46,13 @@ var UrlError = class extends Error {
     this.name = "UrlError";
   }
 };
+var UpstashJSONParseError = class extends UpstashError {
+  constructor(body, options) {
+    const truncatedBody = body.length > 200 ? body.slice(0, 200) + "..." : body;
+    super(`Unable to parse response body: ${truncatedBody}`, options);
+    this.name = "UpstashJSONParseError";
+  }
+};
 
 // pkg/util.ts
 function parseRecursive(obj) {
@@ -80,6 +78,14 @@ function parseResponse(result) {
 function deserializeScanResponse(result) {
   return [result[0], ...parseResponse(result.slice(1))];
 }
+function deserializeScanWithTypesResponse(result) {
+  const [cursor, keys] = result;
+  const parsedKeys = [];
+  for (let i = 0; i < keys.length; i += 2) {
+    parsedKeys.push({ key: keys[i], type: keys[i + 1] });
+  }
+  return [cursor, parsedKeys];
+}
 function mergeHeaders(...headers) {
   const merged = {};
   for (const header of headers) {
@@ -144,6 +150,8 @@ var HttpClient = class {
     const requestHeaders = mergeHeaders(this.headers, req.headers ?? {});
     const requestUrl = [this.baseUrl, ...req.path ?? []].join("/");
     const isEventStream = requestHeaders.Accept === "text/event-stream";
+    const signal = req.signal ?? this.options.signal;
+    const isSignalFunction = typeof signal === "function";
     const requestOptions = {
       //@ts-expect-error this should throw due to bun regression
       cache: this.options.cache,
@@ -152,7 +160,7 @@ var HttpClient = class {
       body: JSON.stringify(req.body),
       keepalive: this.options.keepAlive,
       agent: this.options.agent,
-      signal: req.signal ?? this.options.signal,
+      signal: isSignalFunction ? signal() : signal,
       /**
        * Fastly specific
        */
@@ -174,13 +182,15 @@ var HttpClient = class {
         res = await fetch(requestUrl, requestOptions);
         break;
       } catch (error_) {
-        if (this.options.signal?.aborted) {
+        if (requestOptions.signal?.aborted && isSignalFunction) {
+          throw error_;
+        } else if (requestOptions.signal?.aborted) {
           const myBlob = new Blob([
-            JSON.stringify({ result: this.options.signal.reason ?? "Aborted" })
+            JSON.stringify({ result: requestOptions.signal.reason ?? "Aborted" })
           ]);
           const myOptions = {
             status: 200,
-            statusText: this.options.signal.reason ?? "Aborted"
+            statusText: requestOptions.signal.reason ?? "Aborted"
           };
           res = new Response(myBlob, myOptions);
           break;
@@ -195,7 +205,13 @@ var HttpClient = class {
       throw error ?? new Error("Exhausted all retries");
     }
     if (!res.ok) {
-      const body2 = await res.json();
+      let body2;
+      const rawBody2 = await res.text();
+      try {
+        body2 = JSON.parse(rawBody2);
+      } catch (error2) {
+        throw new UpstashJSONParseError(rawBody2, { cause: error2 });
+      }
       throw new UpstashError(`${body2.error}, command was: ${JSON.stringify(req.body)}`);
     }
     if (this.readYourWrites) {
@@ -233,7 +249,13 @@ var HttpClient = class {
       })();
       return { result: 1 };
     }
-    const body = await res.json();
+    let body;
+    const rawBody = await res.text();
+    try {
+      body = JSON.parse(rawBody);
+    } catch (error2) {
+      throw new UpstashJSONParseError(rawBody, { cause: error2 });
+    }
     if (this.readYourWrites) {
       const headers = res.headers;
       this.upstashSyncToken = headers.get("upstash-sync-token") ?? "";
@@ -305,6 +327,24 @@ function merge(obj, key, value) {
 }
 
 // pkg/auto-pipeline.ts
+var EXCLUDE_COMMANDS = /* @__PURE__ */ new Set([
+  "scan",
+  "keys",
+  "flushdb",
+  "flushall",
+  "dbsize",
+  "hscan",
+  "hgetall",
+  "hkeys",
+  "lrange",
+  "sscan",
+  "smembers",
+  "xrange",
+  "xrevrange",
+  "zscan",
+  "zrange",
+  "exec"
+]);
 function createAutoPipelineProxy(_redis, json) {
   const redis = _redis;
   if (!redis.autoPipelineExecutor) {
@@ -319,7 +359,8 @@ function createAutoPipelineProxy(_redis, json) {
         return createAutoPipelineProxy(redis2, true);
       }
       const commandInRedisButNotPipeline = command in redis2 && !(command in redis2.autoPipelineExecutor.pipeline);
-      if (commandInRedisButNotPipeline) {
+      const isCommandExcluded = EXCLUDE_COMMANDS.has(command);
+      if (commandInRedisButNotPipeline || isCommandExcluded) {
         return redis2[command];
       }
       const isFunction = json ? typeof redis2.autoPipelineExecutor.pipeline.json[command] === "function" : typeof redis2.autoPipelineExecutor.pipeline[command] === "function";
@@ -572,6 +613,13 @@ var EchoCommand = class extends Command {
   }
 };
 
+// pkg/commands/evalRo.ts
+var EvalROCommand = class extends Command {
+  constructor([script, keys, args], opts) {
+    super(["eval_ro", script, keys.length, ...keys, ...args ?? []], opts);
+  }
+};
+
 // pkg/commands/eval.ts
 var EvalCommand = class extends Command {
   constructor([script, keys, args], opts) {
@@ -579,6 +627,13 @@ var EvalCommand = class extends Command {
   }
 };
 
+// pkg/commands/evalshaRo.ts
+var EvalshaROCommand = class extends Command {
+  constructor([sha, keys, args], opts) {
+    super(["evalsha_ro", sha, keys.length, ...keys, ...args ?? []], opts);
+  }
+};
+
 // pkg/commands/evalsha.ts
 var EvalshaCommand = class extends Command {
   constructor([sha, keys, args], opts) {
@@ -859,6 +914,122 @@ var HExistsCommand = class extends Command {
   }
 };
 
+// pkg/commands/hexpire.ts
+var HExpireCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields, seconds, option] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(
+      [
+        "hexpire",
+        key,
+        seconds,
+        ...option ? [option] : [],
+        "FIELDS",
+        fieldArray.length,
+        ...fieldArray
+      ],
+      opts
+    );
+  }
+};
+
+// pkg/commands/hexpireat.ts
+var HExpireAtCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields, timestamp, option] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(
+      [
+        "hexpireat",
+        key,
+        timestamp,
+        ...option ? [option] : [],
+        "FIELDS",
+        fieldArray.length,
+        ...fieldArray
+      ],
+      opts
+    );
+  }
+};
+
+// pkg/commands/hexpiretime.ts
+var HExpireTimeCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(["hexpiretime", key, "FIELDS", fieldArray.length, ...fieldArray], opts);
+  }
+};
+
+// pkg/commands/hpersist.ts
+var HPersistCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(["hpersist", key, "FIELDS", fieldArray.length, ...fieldArray], opts);
+  }
+};
+
+// pkg/commands/hpexpire.ts
+var HPExpireCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields, milliseconds, option] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(
+      [
+        "hpexpire",
+        key,
+        milliseconds,
+        ...option ? [option] : [],
+        "FIELDS",
+        fieldArray.length,
+        ...fieldArray
+      ],
+      opts
+    );
+  }
+};
+
+// pkg/commands/hpexpireat.ts
+var HPExpireAtCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields, timestamp, option] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(
+      [
+        "hpexpireat",
+        key,
+        timestamp,
+        ...option ? [option] : [],
+        "FIELDS",
+        fieldArray.length,
+        ...fieldArray
+      ],
+      opts
+    );
+  }
+};
+
+// pkg/commands/hpexpiretime.ts
+var HPExpireTimeCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(["hpexpiretime", key, "FIELDS", fieldArray.length, ...fieldArray], opts);
+  }
+};
+
+// pkg/commands/hpttl.ts
+var HPTtlCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(["hpttl", key, "FIELDS", fieldArray.length, ...fieldArray], opts);
+  }
+};
+
 // pkg/commands/hget.ts
 var HGetCommand = class extends Command {
   constructor(cmd, opts) {
@@ -872,9 +1043,9 @@ function deserialize(result) {
     return null;
   }
   const obj = {};
-  while (result.length >= 2) {
-    const key = result.shift();
-    const value = result.shift();
+  for (let i = 0; i < result.length; i += 2) {
+    const key = result[i];
+    const value = result[i + 1];
     try {
       const valueIsNumberAndNotSafeInteger = !Number.isNaN(Number(value)) && !Number.isSafeInteger(Number(value));
       obj[key] = valueIsNumberAndNotSafeInteger ? value : JSON.parse(value);
@@ -958,9 +1129,9 @@ function deserialize3(result) {
     return null;
   }
   const obj = {};
-  while (result.length >= 2) {
-    const key = result.shift();
-    const value = result.shift();
+  for (let i = 0; i < result.length; i += 2) {
+    const key = result[i];
+    const value = result[i + 1];
     try {
       obj[key] = JSON.parse(value);
     } catch {
@@ -1024,6 +1195,15 @@ var HStrLenCommand = class extends Command {
   }
 };
 
+// pkg/commands/httl.ts
+var HTtlCommand = class extends Command {
+  constructor(cmd, opts) {
+    const [key, fields] = cmd;
+    const fieldArray = Array.isArray(fields) ? fields : [fields];
+    super(["httl", key, "FIELDS", fieldArray.length, ...fieldArray], opts);
+  }
+};
+
 // pkg/commands/hvals.ts
 var HValsCommand = class extends Command {
   constructor(cmd, opts) {
@@ -1143,6 +1323,14 @@ var JsonGetCommand = class extends Command {
   }
 };
 
+// pkg/commands/json_merge.ts
+var JsonMergeCommand = class extends Command {
+  constructor(cmd, opts) {
+    const command = ["JSON.MERGE", ...cmd];
+    super(command, opts);
+  }
+};
+
 // pkg/commands/json_mget.ts
 var JsonMGetCommand = class extends Command {
   constructor(cmd, opts) {
@@ -1503,11 +1691,14 @@ var ScanCommand = class extends Command {
     if (typeof opts?.count === "number") {
       command.push("count", opts.count);
     }
-    if (opts?.type && opts.type.length > 0) {
+    if (opts && "withType" in opts && opts.withType === true) {
+      command.push("withtype");
+    } else if (opts && "type" in opts && opts.type && opts.type.length > 0) {
       command.push("type", opts.type);
     }
     super(command, {
-      deserialize: deserializeScanResponse,
+      // @ts-expect-error ignore types here
+      deserialize: opts?.withType ? deserializeScanWithTypesResponse : deserializeScanResponse,
       ...cmdOpts
     });
   }
@@ -1933,15 +2124,15 @@ var XPendingCommand = class extends Command {
 function deserialize4(result) {
   const obj = {};
   for (const e of result) {
-    while (e.length >= 2) {
-      const streamId = e.shift();
-      const entries = e.shift();
+    for (let i = 0; i < e.length; i += 2) {
+      const streamId = e[i];
+      const entries = e[i + 1];
       if (!(streamId in obj)) {
         obj[streamId] = {};
       }
-      while (entries.length >= 2) {
-        const field = entries.shift();
-        const value = entries.shift();
+      for (let j = 0; j < entries.length; j += 2) {
+        const field = entries[j];
+        const value = entries[j + 1];
         try {
           obj[streamId][field] = JSON.parse(value);
         } catch {
@@ -2030,15 +2221,15 @@ var XRevRangeCommand = class extends Command {
 function deserialize5(result) {
   const obj = {};
   for (const e of result) {
-    while (e.length >= 2) {
-      const streamId = e.shift();
-      const entries = e.shift();
+    for (let i = 0; i < e.length; i += 2) {
+      const streamId = e[i];
+      const entries = e[i + 1];
       if (!(streamId in obj)) {
         obj[streamId] = {};
       }
-      while (entries.length >= 2) {
-        const field = entries.shift();
-        const value = entries.shift();
+      for (let j = 0; j < entries.length; j += 2) {
+        const field = entries[j];
+        const value = entries[j + 1];
         try {
           obj[streamId][field] = JSON.parse(value);
         } catch {
@@ -2323,11 +2514,13 @@ var Subscriber = class extends EventTarget {
   subscriptions;
   client;
   listeners;
-  constructor(client, channels, isPattern = false) {
+  opts;
+  constructor(client, channels, isPattern = false, opts) {
     super();
     this.client = client;
     this.subscriptions = /* @__PURE__ */ new Map();
     this.listeners = /* @__PURE__ */ new Map();
+    this.opts = opts;
     for (const channel of channels) {
       if (isPattern) {
         this.subscribeToPattern(channel);
@@ -2386,7 +2579,7 @@ var Subscriber = class extends EventTarget {
         const channel = messageData.slice(secondCommaIndex + 1, thirdCommaIndex);
         const messageStr = messageData.slice(thirdCommaIndex + 1);
         try {
-          const message = JSON.parse(messageStr);
+          const message = this.opts?.automaticDeserialization === false ? messageStr : JSON.parse(messageStr);
           this.dispatchToListeners("pmessage", { pattern, channel, message });
           this.dispatchToListeners(`pmessage:${pattern}`, { pattern, channel, message });
         } catch (error) {
@@ -2400,7 +2593,7 @@ var Subscriber = class extends EventTarget {
             const count = Number.parseInt(messageStr);
             this.dispatchToListeners(type, count);
           } else {
-            const message = JSON.parse(messageStr);
+            const message = this.opts?.automaticDeserialization === false ? messageStr : parseWithTryCatch(messageStr);
             this.dispatchToListeners(type, { channel, message });
             this.dispatchToListeners(`${type}:${channel}`, { channel, message });
           }
@@ -2473,6 +2666,13 @@ var SubscribeCommand = class extends Command {
     });
   }
 };
+var parseWithTryCatch = (str) => {
+  try {
+    return JSON.parse(str);
+  } catch {
+    return str;
+  }
+};
 
 // pkg/commands/zdiffstore.ts
 var ZDiffStoreCommand = class extends Command {
@@ -2614,10 +2814,18 @@ var Pipeline = class {
    * @see https://redis.io/commands/echo
    */
   echo = (...args) => this.chain(new EchoCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/eval_ro
+   */
+  evalRo = (...args) => this.chain(new EvalROCommand(args, this.commandOptions));
   /**
    * @see https://redis.io/commands/eval
    */
   eval = (...args) => this.chain(new EvalCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/evalsha_ro
+   */
+  evalshaRo = (...args) => this.chain(new EvalshaROCommand(args, this.commandOptions));
   /**
    * @see https://redis.io/commands/evalsha
    */
@@ -2698,6 +2906,42 @@ var Pipeline = class {
    * @see https://redis.io/commands/hexists
    */
   hexists = (...args) => this.chain(new HExistsCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/hexpire
+   */
+  hexpire = (...args) => this.chain(new HExpireCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/hexpireat
+   */
+  hexpireat = (...args) => this.chain(new HExpireAtCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/hexpiretime
+   */
+  hexpiretime = (...args) => this.chain(new HExpireTimeCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/httl
+   */
+  httl = (...args) => this.chain(new HTtlCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/hpexpire
+   */
+  hpexpire = (...args) => this.chain(new HPExpireCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/hpexpireat
+   */
+  hpexpireat = (...args) => this.chain(new HPExpireAtCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/hpexpiretime
+   */
+  hpexpiretime = (...args) => this.chain(new HPExpireTimeCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/hpttl
+   */
+  hpttl = (...args) => this.chain(new HPTtlCommand(args, this.commandOptions));
+  /**
+   * @see https://redis.io/commands/hpersist
+   */
+  hpersist = (...args) => this.chain(new HPersistCommand(args, this.commandOptions));
   /**
    * @see https://redis.io/commands/hget
    */
@@ -3215,6 +3459,10 @@ var Pipeline = class {
        * @see https://redis.io/commands/json.get
        */
       get: (...args) => this.chain(new JsonGetCommand(args, this.commandOptions)),
+      /**
+       * @see https://redis.io/commands/json.merge
+       */
+      merge: (...args) => this.chain(new JsonMergeCommand(args, this.commandOptions)),
       /**
        * @see https://redis.io/commands/json.mget
        */
@@ -3268,27 +3516,43 @@ var Pipeline = class {
 };
 
 // pkg/script.ts
-var import_enc_hex = __toESM(require("crypto-js/enc-hex.js"));
-var import_sha1 = __toESM(require("crypto-js/sha1.js"));
+var import_uncrypto = require("uncrypto");
 var Script = class {
   script;
+  /**
+   * @deprecated This property is initialized to an empty string and will be set in the init method
+   * asynchronously. Do not use this property immidiately after the constructor.
+   *
+   * This property is only exposed for backwards compatibility and will be removed in the
+   * future major release.
+   */
   sha1;
   redis;
   constructor(redis, script) {
     this.redis = redis;
-    this.sha1 = this.digest(script);
     this.script = script;
+    this.sha1 = "";
+    void this.init(script);
+  }
+  /**
+   * Initialize the script by computing its SHA-1 hash.
+   */
+  async init(script) {
+    if (this.sha1) return;
+    this.sha1 = await this.digest(script);
   }
   /**
    * Send an `EVAL` command to redis.
    */
   async eval(keys, args) {
+    await this.init(this.script);
     return await this.redis.eval(this.script, keys, args);
   }
   /**
    * Calculates the sha1 hash of the script and then calls `EVALSHA`.
    */
   async evalsha(keys, args) {
+    await this.init(this.script);
     return await this.redis.evalsha(this.sha1, keys, args);
   }
   /**
@@ -3298,6 +3562,7 @@ var Script = class {
    * Following calls will be able to use the cached script
    */
   async exec(keys, args) {
+    await this.init(this.script);
     const res = await this.redis.evalsha(this.sha1, keys, args).catch(async (error) => {
       if (error instanceof Error && error.message.toLowerCase().includes("noscript")) {
         return await this.redis.eval(this.script, keys, args);
@@ -3309,8 +3574,75 @@ var Script = class {
   /**
    * Compute the sha1 hash of the script and return its hex representation.
    */
-  digest(s) {
-    return import_enc_hex.default.stringify((0, import_sha1.default)(s));
+  async digest(s) {
+    const data = new TextEncoder().encode(s);
+    const hashBuffer = await import_uncrypto.subtle.digest("SHA-1", data);
+    const hashArray = [...new Uint8Array(hashBuffer)];
+    return hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
+  }
+};
+
+// pkg/scriptRo.ts
+var import_uncrypto2 = require("uncrypto");
+var ScriptRO = class {
+  script;
+  /**
+   * @deprecated This property is initialized to an empty string and will be set in the init method
+   * asynchronously. Do not use this property immidiately after the constructor.
+   *
+   * This property is only exposed for backwards compatibility and will be removed in the
+   * future major release.
+   */
+  sha1;
+  redis;
+  constructor(redis, script) {
+    this.redis = redis;
+    this.sha1 = "";
+    this.script = script;
+    void this.init(script);
+  }
+  async init(script) {
+    if (this.sha1) return;
+    this.sha1 = await this.digest(script);
+  }
+  /**
+   * Send an `EVAL_RO` command to redis.
+   */
+  async evalRo(keys, args) {
+    await this.init(this.script);
+    return await this.redis.evalRo(this.script, keys, args);
+  }
+  /**
+   * Calculates the sha1 hash of the script and then calls `EVALSHA_RO`.
+   */
+  async evalshaRo(keys, args) {
+    await this.init(this.script);
+    return await this.redis.evalshaRo(this.sha1, keys, args);
+  }
+  /**
+   * Optimistically try to run `EVALSHA_RO` first.
+   * If the script is not loaded in redis, it will fall back and try again with `EVAL_RO`.
+   *
+   * Following calls will be able to use the cached script
+   */
+  async exec(keys, args) {
+    await this.init(this.script);
+    const res = await this.redis.evalshaRo(this.sha1, keys, args).catch(async (error) => {
+      if (error instanceof Error && error.message.toLowerCase().includes("noscript")) {
+        return await this.redis.evalRo(this.script, keys, args);
+      }
+      throw error;
+    });
+    return res;
+  }
+  /**
+   * Compute the sha1 hash of the script and return its hex representation.
+   */
+  async digest(s) {
+    const data = new TextEncoder().encode(s);
+    const hashBuffer = await import_uncrypto2.subtle.digest("SHA-1", data);
+    const hashArray = [...new Uint8Array(hashBuffer)];
+    return hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
   }
 };
 
@@ -3388,6 +3720,10 @@ var Redis = class {
        * @see https://redis.io/commands/json.get
        */
       get: (...args) => new JsonGetCommand(args, this.opts).exec(this.client),
+      /**
+       * @see https://redis.io/commands/json.merge
+       */
+      merge: (...args) => new JsonMergeCommand(args, this.opts).exec(this.client),
       /**
        * @see https://redis.io/commands/json.mget
        */
@@ -3457,8 +3793,36 @@ var Redis = class {
     } catch {
     }
   };
-  createScript(script) {
-    return new Script(this, script);
+  /**
+   * 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.
+   *
+   * @param script - The script to create
+   * @param opts - Optional options to pass to the script `{ readonly?: boolean }`
+   * @returns A new script
+   *
+   * @example
+   * ```ts
+   * const redis = new Redis({...})
+   *
+   * const script = redis.createScript<string>("return ARGV[1];")
+   * const arg1 = await script.eval([], ["Hello World"])
+   * expect(arg1, "Hello World")
+   * ```
+   * @example
+   * ```ts
+   * const redis = new Redis({...})
+   *
+   * const script = redis.createScript<string>("return ARGV[1];", { readonly: true })
+   * const arg1 = await script.evalRo([], ["Hello World"])
+   * expect(arg1, "Hello World")
+   * ```
+   */
+  createScript(script, opts) {
+    return opts?.readonly ? new ScriptRO(this, script) : new Script(this, script);
   }
   /**
    * Create a new pipeline that allows you to send requests in bulk.
@@ -3545,10 +3909,18 @@ var Redis = class {
    * @see https://redis.io/commands/echo
    */
   echo = (...args) => new EchoCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/eval_ro
+   */
+  evalRo = (...args) => new EvalROCommand(args, this.opts).exec(this.client);
   /**
    * @see https://redis.io/commands/eval
    */
   eval = (...args) => new EvalCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/evalsha_ro
+   */
+  evalshaRo = (...args) => new EvalshaROCommand(args, this.opts).exec(this.client);
   /**
    * @see https://redis.io/commands/evalsha
    */
@@ -3633,6 +4005,42 @@ var Redis = class {
    * @see https://redis.io/commands/hexists
    */
   hexists = (...args) => new HExistsCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/hexpire
+   */
+  hexpire = (...args) => new HExpireCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/hexpireat
+   */
+  hexpireat = (...args) => new HExpireAtCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/hexpiretime
+   */
+  hexpiretime = (...args) => new HExpireTimeCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/httl
+   */
+  httl = (...args) => new HTtlCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/hpexpire
+   */
+  hpexpire = (...args) => new HPExpireCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/hpexpireat
+   */
+  hpexpireat = (...args) => new HPExpireAtCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/hpexpiretime
+   */
+  hpexpiretime = (...args) => new HPExpireTimeCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/hpttl
+   */
+  hpttl = (...args) => new HPTtlCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/hpersist
+   */
+  hpersist = (...args) => new HPersistCommand(args, this.opts).exec(this.client);
   /**
    * @see https://redis.io/commands/hget
    */
@@ -3806,7 +4214,7 @@ var Redis = class {
    */
   psubscribe = (patterns) => {
     const patternArray = Array.isArray(patterns) ? patterns : [patterns];
-    return new Subscriber(this.client, patternArray, true);
+    return new Subscriber(this.client, patternArray, true, this.opts);
   };
   /**
    * @see https://redis.io/commands/pttl
@@ -3844,10 +4252,9 @@ var Redis = class {
    * @see https://redis.io/commands/sadd
    */
   sadd = (key, member, ...members) => new SAddCommand([key, member, ...members], this.opts).exec(this.client);
-  /**
-   * @see https://redis.io/commands/scan
-   */
-  scan = (...args) => new ScanCommand(args, this.opts).exec(this.client);
+  scan(cursor, opts) {
+    return new ScanCommand([cursor, opts], this.opts).exec(this.client);
+  }
   /**
    * @see https://redis.io/commands/scard
    */
@@ -3941,7 +4348,7 @@ var Redis = class {
    */
   subscribe = (channels) => {
     const channelArray = Array.isArray(channels) ? channels : [channels];
-    return new Subscriber(this.client, channelArray);
+    return new Subscriber(this.client, channelArray, false, this.opts);
   };
   /**
    * @see https://redis.io/commands/sunion
@@ -4168,7 +4575,7 @@ var Redis2 = class _Redis extends Redis {
       readYourWrites: config.readYourWrites
     });
     super(client, {
-      enableTelemetry: !env?.UPSTASH_DISABLE_TELEMETRY,
+      enableTelemetry: config.enableTelemetry ?? !env?.UPSTASH_DISABLE_TELEMETRY,
       automaticDeserialization: config.automaticDeserialization,
       latencyLogging: config.latencyLogging,
       enableAutoPipelining: config.enableAutoPipelining