@upstash/redis 1.34.4 → 1.34.5

package/nodejs.js

@@ -56,6 +56,43 @@ var UrlError = class extends Error {
   }
 };
 
+// pkg/util.ts
+function parseRecursive(obj) {
+  const parsed = Array.isArray(obj) ? obj.map((o) => {
+    try {
+      return parseRecursive(o);
+    } catch {
+      return o;
+    }
+  }) : JSON.parse(obj);
+  if (typeof parsed === "number" && parsed.toString() !== obj) {
+    return obj;
+  }
+  return parsed;
+}
+function parseResponse(result) {
+  try {
+    return parseRecursive(result);
+  } catch {
+    return result;
+  }
+}
+function deserializeScanResponse(result) {
+  return [result[0], ...parseResponse(result.slice(1))];
+}
+function mergeHeaders(...headers) {
+  const merged = {};
+  for (const header of headers) {
+    if (!header) continue;
+    for (const [key, value] of Object.entries(header)) {
+      if (value !== void 0 && value !== null) {
+        merged[key] = value;
+      }
+    }
+  }
+  return merged;
+}
+
 // pkg/http.ts
 var HttpClient = class {
   baseUrl;
@@ -104,15 +141,18 @@ var HttpClient = class {
     this.headers = merge(this.headers, "Upstash-Telemetry-Sdk", telemetry.sdk);
   }
   async request(req) {
+    const requestHeaders = mergeHeaders(this.headers, req.headers ?? {});
+    const requestUrl = [this.baseUrl, ...req.path ?? []].join("/");
+    const isEventStream = requestHeaders.Accept === "text/event-stream";
     const requestOptions = {
       //@ts-expect-error this should throw due to bun regression
       cache: this.options.cache,
       method: "POST",
-      headers: this.headers,
+      headers: requestHeaders,
       body: JSON.stringify(req.body),
       keepalive: this.options.keepAlive,
       agent: this.options.agent,
-      signal: this.options.signal,
+      signal: req.signal ?? this.options.signal,
       /**
        * Fastly specific
        */
@@ -131,7 +171,7 @@ var HttpClient = class {
     let error = null;
     for (let i = 0; i <= this.retry.attempts; i++) {
       try {
-        res = await fetch([this.baseUrl, ...req.path ?? []].join("/"), requestOptions);
+        res = await fetch(requestUrl, requestOptions);
         break;
       } catch (error_) {
         if (this.options.signal?.aborted) {
@@ -154,14 +194,46 @@ var HttpClient = class {
     if (!res) {
       throw error ?? new Error("Exhausted all retries");
     }
-    const body = await res.json();
     if (!res.ok) {
-      throw new UpstashError(`${body.error}, command was: ${JSON.stringify(req.body)}`);
+      const body2 = await res.json();
+      throw new UpstashError(`${body2.error}, command was: ${JSON.stringify(req.body)}`);
     }
     if (this.readYourWrites) {
       const headers = res.headers;
       this.upstashSyncToken = headers.get("upstash-sync-token") ?? "";
     }
+    if (isEventStream && req && req.onMessage && res.body) {
+      const reader = res.body.getReader();
+      const decoder = new TextDecoder();
+      (async () => {
+        try {
+          while (true) {
+            const { value, done } = await reader.read();
+            if (done) break;
+            const chunk = decoder.decode(value);
+            const lines = chunk.split("\n");
+            for (const line of lines) {
+              if (line.startsWith("data: ")) {
+                const data = line.slice(6);
+                req.onMessage?.(data);
+              }
+            }
+          }
+        } catch (error2) {
+          if (error2 instanceof Error && error2.name === "AbortError") {
+          } else {
+            console.error("Stream reading error:", error2);
+          }
+        } finally {
+          try {
+            await reader.cancel();
+          } catch {
+          }
+        }
+      })();
+      return { result: 1 };
+    }
+    const body = await res.json();
     if (this.readYourWrites) {
       const headers = res.headers;
       this.upstashSyncToken = headers.get("upstash-sync-token") ?? "";
@@ -311,31 +383,6 @@ var AutoPipelineExecutor = class {
   }
 };
 
-// pkg/util.ts
-function parseRecursive(obj) {
-  const parsed = Array.isArray(obj) ? obj.map((o) => {
-    try {
-      return parseRecursive(o);
-    } catch {
-      return o;
-    }
-  }) : JSON.parse(obj);
-  if (typeof parsed === "number" && parsed.toString() !== obj) {
-    return obj;
-  }
-  return parsed;
-}
-function parseResponse(result) {
-  try {
-    return parseRecursive(result);
-  } catch {
-    return result;
-  }
-}
-function deserializeScanResponse(result) {
-  return [result[0], ...parseResponse(result.slice(1))];
-}
-
 // pkg/commands/command.ts
 var defaultSerializer = (c) => {
   switch (typeof c) {
@@ -353,6 +400,11 @@ var Command = class {
   command;
   serialize;
   deserialize;
+  headers;
+  path;
+  onMessage;
+  isStreaming;
+  signal;
   /**
    * Create a new command instance.
    *
@@ -362,6 +414,11 @@ var Command = class {
     this.serialize = defaultSerializer;
     this.deserialize = opts?.automaticDeserialization === void 0 || opts.automaticDeserialization ? opts?.deserialize ?? parseResponse : (x) => x;
     this.command = command.map((c) => this.serialize(c));
+    this.headers = opts?.headers;
+    this.path = opts?.path;
+    this.onMessage = opts?.streamOptions?.onMessage;
+    this.isStreaming = opts?.streamOptions?.isStreaming ?? false;
+    this.signal = opts?.streamOptions?.signal;
     if (opts?.latencyLogging) {
       const originalExec = this.exec.bind(this);
       this.exec = async (client) => {
@@ -382,7 +439,12 @@ var Command = class {
   async exec(client) {
     const { result, error } = await client.request({
       body: this.command,
-      upstashSyncToken: client.upstashSyncToken
+      path: this.path,
+      upstashSyncToken: client.upstashSyncToken,
+      headers: this.headers,
+      onMessage: this.onMessage,
+      isStreaming: this.isStreaming,
+      signal: this.signal
     });
     if (error) {
       throw new UpstashError(error);
@@ -2235,6 +2297,183 @@ var ZUnionStoreCommand = class extends Command {
   }
 };
 
+// pkg/commands/psubscribe.ts
+var PSubscribeCommand = class extends Command {
+  constructor(cmd, opts) {
+    const sseHeaders = {
+      Accept: "text/event-stream",
+      "Cache-Control": "no-cache",
+      Connection: "keep-alive"
+    };
+    super([], {
+      ...opts,
+      headers: sseHeaders,
+      path: ["psubscribe", ...cmd],
+      streamOptions: {
+        isStreaming: true,
+        onMessage: opts?.streamOptions?.onMessage,
+        signal: opts?.streamOptions?.signal
+      }
+    });
+  }
+};
+
+// pkg/commands/subscribe.ts
+var Subscriber = class extends EventTarget {
+  subscriptions;
+  client;
+  listeners;
+  constructor(client, channels, isPattern = false) {
+    super();
+    this.client = client;
+    this.subscriptions = /* @__PURE__ */ new Map();
+    this.listeners = /* @__PURE__ */ new Map();
+    for (const channel of channels) {
+      if (isPattern) {
+        this.subscribeToPattern(channel);
+      } else {
+        this.subscribeToChannel(channel);
+      }
+    }
+  }
+  subscribeToChannel(channel) {
+    const controller = new AbortController();
+    const command = new SubscribeCommand([channel], {
+      streamOptions: {
+        signal: controller.signal,
+        onMessage: (data) => this.handleMessage(data, false)
+      }
+    });
+    command.exec(this.client).catch((error) => {
+      if (error.name !== "AbortError") {
+        this.dispatchToListeners("error", error);
+      }
+    });
+    this.subscriptions.set(channel, {
+      command,
+      controller,
+      isPattern: false
+    });
+  }
+  subscribeToPattern(pattern) {
+    const controller = new AbortController();
+    const command = new PSubscribeCommand([pattern], {
+      streamOptions: {
+        signal: controller.signal,
+        onMessage: (data) => this.handleMessage(data, true)
+      }
+    });
+    command.exec(this.client).catch((error) => {
+      if (error.name !== "AbortError") {
+        this.dispatchToListeners("error", error);
+      }
+    });
+    this.subscriptions.set(pattern, {
+      command,
+      controller,
+      isPattern: true
+    });
+  }
+  handleMessage(data, isPattern) {
+    const messageData = data.replace(/^data:\s*/, "");
+    const firstCommaIndex = messageData.indexOf(",");
+    const secondCommaIndex = messageData.indexOf(",", firstCommaIndex + 1);
+    const thirdCommaIndex = isPattern ? messageData.indexOf(",", secondCommaIndex + 1) : -1;
+    if (firstCommaIndex !== -1 && secondCommaIndex !== -1) {
+      const type = messageData.slice(0, firstCommaIndex);
+      if (isPattern && type === "pmessage" && thirdCommaIndex !== -1) {
+        const pattern = messageData.slice(firstCommaIndex + 1, secondCommaIndex);
+        const channel = messageData.slice(secondCommaIndex + 1, thirdCommaIndex);
+        const messageStr = messageData.slice(thirdCommaIndex + 1);
+        try {
+          const message = JSON.parse(messageStr);
+          this.dispatchToListeners("pmessage", { pattern, channel, message });
+          this.dispatchToListeners(`pmessage:${pattern}`, { pattern, channel, message });
+        } catch (error) {
+          this.dispatchToListeners("error", new Error(`Failed to parse message: ${error}`));
+        }
+      } else {
+        const channel = messageData.slice(firstCommaIndex + 1, secondCommaIndex);
+        const messageStr = messageData.slice(secondCommaIndex + 1);
+        try {
+          if (type === "subscribe" || type === "psubscribe" || type === "unsubscribe" || type === "punsubscribe") {
+            const count = Number.parseInt(messageStr);
+            this.dispatchToListeners(type, count);
+          } else {
+            const message = JSON.parse(messageStr);
+            this.dispatchToListeners(type, { channel, message });
+            this.dispatchToListeners(`${type}:${channel}`, { channel, message });
+          }
+        } catch (error) {
+          this.dispatchToListeners("error", new Error(`Failed to parse message: ${error}`));
+        }
+      }
+    }
+  }
+  dispatchToListeners(type, data) {
+    const listeners = this.listeners.get(type);
+    if (listeners) {
+      for (const listener of listeners) {
+        listener(data);
+      }
+    }
+  }
+  on(type, listener) {
+    if (!this.listeners.has(type)) {
+      this.listeners.set(type, /* @__PURE__ */ new Set());
+    }
+    this.listeners.get(type)?.add(listener);
+  }
+  removeAllListeners() {
+    this.listeners.clear();
+  }
+  async unsubscribe(channels) {
+    if (channels) {
+      for (const channel of channels) {
+        const subscription = this.subscriptions.get(channel);
+        if (subscription) {
+          try {
+            subscription.controller.abort();
+          } catch {
+          }
+          this.subscriptions.delete(channel);
+        }
+      }
+    } else {
+      for (const subscription of this.subscriptions.values()) {
+        try {
+          subscription.controller.abort();
+        } catch {
+        }
+      }
+      this.subscriptions.clear();
+      this.removeAllListeners();
+    }
+  }
+  getSubscribedChannels() {
+    return [...this.subscriptions.keys()];
+  }
+};
+var SubscribeCommand = class extends Command {
+  constructor(cmd, opts) {
+    const sseHeaders = {
+      Accept: "text/event-stream",
+      "Cache-Control": "no-cache",
+      Connection: "keep-alive"
+    };
+    super([], {
+      ...opts,
+      headers: sseHeaders,
+      path: ["subscribe", ...cmd],
+      streamOptions: {
+        isStreaming: true,
+        onMessage: opts?.streamOptions?.onMessage,
+        signal: opts?.streamOptions?.signal
+      }
+    });
+  }
+};
+
 // pkg/commands/zdiffstore.ts
 var ZDiffStoreCommand = class extends Command {
   constructor(cmd, opts) {
@@ -3562,6 +3801,13 @@ var Redis = class {
    * @see https://redis.io/commands/psetex
    */
   psetex = (key, ttl, value) => new PSetEXCommand([key, ttl, value], this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/psubscribe
+   */
+  psubscribe = (patterns) => {
+    const patternArray = Array.isArray(patterns) ? patterns : [patterns];
+    return new Subscriber(this.client, patternArray, true);
+  };
   /**
    * @see https://redis.io/commands/pttl
    */
@@ -3690,6 +3936,13 @@ var Redis = class {
    * @see https://redis.io/commands/strlen
    */
   strlen = (...args) => new StrLenCommand(args, this.opts).exec(this.client);
+  /**
+   * @see https://redis.io/commands/subscribe
+   */
+  subscribe = (channels) => {
+    const channelArray = Array.isArray(channels) ? channels : [channels];
+    return new Subscriber(this.client, channelArray);
+  };
   /**
    * @see https://redis.io/commands/sunion
    */
@@ -3871,7 +4124,7 @@ var Redis = class {
 };
 
 // version.ts
-var VERSION = "v1.34.4";
+var VERSION = "v1.34.5";
 
 // platforms/nodejs.ts
 if (typeof atob === "undefined") {

package/nodejs.mjs

@@ -3,7 +3,7 @@ import {
   Redis,
   VERSION,
   error_exports
-} from "./chunk-T6D4KAGH.mjs";
+} from "./chunk-NAQE7K3X.mjs";
 
 // platforms/nodejs.ts
 if (typeof atob === "undefined") {

package/package.json

@@ -1 +1 @@
-{"name":"@upstash/redis","version":"v1.34.4","main":"./nodejs.js","module":"./nodejs.mjs","types":"./nodejs.d.ts","exports":{".":{"import":"./nodejs.mjs","require":"./nodejs.js"},"./node":{"import":"./nodejs.mjs","require":"./nodejs.js"},"./cloudflare":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./cloudflare.js":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./cloudflare.mjs":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./fastly":{"import":"./fastly.mjs","require":"./fastly.js"},"./fastly.js":{"import":"./fastly.mjs","require":"./fastly.js"},"./fastly.mjs":{"import":"./fastly.mjs","require":"./fastly.js"}},"description":"An HTTP/REST based Redis client built on top of Upstash REST API.","repository":{"type":"git","url":"git+https://github.com/upstash/upstash-redis.git"},"keywords":["redis","database","serverless","edge","upstash"],"files":["./*"],"scripts":{"build":"tsup && cp package.json README.md LICENSE dist/","test":"bun test pkg","fmt":"prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"","lint":"eslint \"**/*.{js,ts,tsx}\" --quiet --fix","format":"prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"","format:check":"prettier --check \"**/*.{ts,tsx,js,jsx,json,md}\"","lint:fix":"eslint . -c .ts,.tsx,.js,.jsx --fix","commit":"cz","lint:format":"bun run lint:fix && bun run format","check-exports":"bun run build && cd dist && attw -P"},"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","devDependencies":{"@biomejs/biome":"latest","@commitlint/cli":"^19.3.0","@commitlint/config-conventional":"^19.2.2","@types/crypto-js":"^4.1.3","@typescript-eslint/eslint-plugin":"8.4.0","@typescript-eslint/parser":"8.4.0","bun-types":"1.0.33","eslint":"9.10.0","eslint-plugin-unicorn":"55.0.0","husky":"^9.1.1","prettier":"^3.3.3","tsup":"^8.2.3","typescript":"latest"},"dependencies":{"crypto-js":"^4.2.0"}}
+{"name":"@upstash/redis","version":"v1.34.5","main":"./nodejs.js","module":"./nodejs.mjs","types":"./nodejs.d.ts","exports":{".":{"import":"./nodejs.mjs","require":"./nodejs.js"},"./node":{"import":"./nodejs.mjs","require":"./nodejs.js"},"./cloudflare":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./cloudflare.js":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./cloudflare.mjs":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./fastly":{"import":"./fastly.mjs","require":"./fastly.js"},"./fastly.js":{"import":"./fastly.mjs","require":"./fastly.js"},"./fastly.mjs":{"import":"./fastly.mjs","require":"./fastly.js"}},"description":"An HTTP/REST based Redis client built on top of Upstash REST API.","repository":{"type":"git","url":"git+https://github.com/upstash/upstash-redis.git"},"keywords":["redis","database","serverless","edge","upstash"],"files":["./*"],"scripts":{"build":"tsup && cp package.json README.md LICENSE dist/","test":"bun test pkg","fmt":"prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"","lint":"eslint \"**/*.{js,ts,tsx}\" --quiet --fix","format":"prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"","format:check":"prettier --check \"**/*.{ts,tsx,js,jsx,json,md}\"","lint:fix":"eslint . -c .ts,.tsx,.js,.jsx --fix","commit":"cz","lint:format":"bun run lint:fix && bun run format","check-exports":"bun run build && cd dist && attw -P"},"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","devDependencies":{"@biomejs/biome":"latest","@commitlint/cli":"^19.3.0","@commitlint/config-conventional":"^19.2.2","@types/crypto-js":"^4.1.3","@typescript-eslint/eslint-plugin":"8.4.0","@typescript-eslint/parser":"8.4.0","bun-types":"1.0.33","eslint":"9.10.0","eslint-plugin-unicorn":"55.0.0","husky":"^9.1.1","prettier":"^3.3.3","tsup":"^8.2.3","typescript":"latest"},"dependencies":{"crypto-js":"^4.2.0"}}

package/{zmscore-C3G81zLz.d.mts → zmscore-BdNsMd17.d.mts}

@@ -36,7 +36,23 @@ type UpstashRequest = {
      * Request body will be serialized to json
      */
     body?: unknown;
+    /**
+     * Additional headers for the request
+     */
+    headers?: Record<string, string>;
     upstashSyncToken?: string;
+    /**
+     * Callback for handling streaming messages
+     */
+    onMessage?: (data: string) => void;
+    /**
+     * Whether this request expects a streaming response
+     */
+    isStreaming?: boolean;
+    /**
+     * Abort signal for the request
+     */
+    signal?: AbortSignal;
 };
 type UpstashResponse<TResult> = {
     result?: TResult;
@@ -119,6 +135,31 @@ type CommandOptions<TResult, TData> = {
      */
     automaticDeserialization?: boolean;
     latencyLogging?: boolean;
+    /**
+     * Additional headers to be sent with the request
+     */
+    headers?: Record<string, string>;
+    /**
+     * Path to append to the URL
+     */
+    path?: string[];
+    /**
+     * Options for streaming requests, mainly used for subscribe, monitor commands
+     **/
+    streamOptions?: {
+        /**
+         * Callback to be called when a message is received
+         */
+        onMessage?: (data: string) => void;
+        /**
+         * Whether the request is streaming
+         */
+        isStreaming?: boolean;
+        /**
+         * Signal to abort the request
+         */
+        signal?: AbortSignal;
+    };
 };
 /**
  * Command offers default (de)serialization and the exec method to all commands.
@@ -130,6 +171,11 @@ declare class Command<TResult, TData> {
     readonly command: (string | number | boolean)[];
     readonly serialize: Serialize;
     readonly deserialize: Deserialize<TResult, TData>;
+    protected readonly headers?: Record<string, string>;
+    protected readonly path?: string[];
+    protected readonly onMessage?: (data: string) => void;
+    protected readonly isStreaming: boolean;
+    protected readonly signal?: AbortSignal;
     /**
      * Create a new command instance.
      *
@@ -1643,6 +1689,42 @@ declare class ZScoreCommand<TData> extends Command<string | null, number | null>
     constructor(cmd: [key: string, member: TData], opts?: CommandOptions<string | null, number | null>);
 }
 
+type BaseMessageData<TMessage> = {
+    channel: string;
+    message: TMessage;
+};
+type PatternMessageData<TMessage> = BaseMessageData<TMessage> & {
+    pattern: string;
+};
+type SubscriptionCountEvent = number;
+type MessageEventMap<TMessage> = {
+    message: BaseMessageData<TMessage>;
+    subscribe: SubscriptionCountEvent;
+    unsubscribe: SubscriptionCountEvent;
+    pmessage: PatternMessageData<TMessage>;
+    psubscribe: SubscriptionCountEvent;
+    punsubscribe: SubscriptionCountEvent;
+    error: Error;
+    [key: `message:${string}`]: BaseMessageData<TMessage>;
+    [key: `pmessage:${string}`]: PatternMessageData<TMessage>;
+};
+type EventType = keyof MessageEventMap<any>;
+type Listener<TMessage, T extends EventType> = (event: MessageEventMap<TMessage>[T]) => void;
+declare class Subscriber<TMessage = any> extends EventTarget {
+    private subscriptions;
+    private client;
+    private listeners;
+    constructor(client: Requester, channels: string[], isPattern?: boolean);
+    private subscribeToChannel;
+    private subscribeToPattern;
+    private handleMessage;
+    private dispatchToListeners;
+    on<T extends keyof MessageEventMap<TMessage>>(type: T, listener: Listener<TMessage, T>): void;
+    removeAllListeners(): void;
+    unsubscribe(channels?: string[]): Promise<void>;
+    getSubscribedChannels(): string[];
+}
+
 type InferResponseData<T extends unknown[]> = {
     [K in keyof T]: T[K] extends Command<any, infer TData> ? TData : unknown;
 };
@@ -3236,6 +3318,10 @@ declare class Redis {
      * @see https://redis.io/commands/psetex
      */
     psetex: <TData>(key: string, ttl: number, value: TData) => Promise<string>;
+    /**
+     * @see https://redis.io/commands/psubscribe
+     */
+    psubscribe: <TMessage>(patterns: string | string[]) => Subscriber<TMessage>;
     /**
      * @see https://redis.io/commands/pttl
      */
@@ -3364,6 +3450,10 @@ declare class Redis {
      * @see https://redis.io/commands/strlen
      */
     strlen: (key: string) => Promise<number>;
+    /**
+     * @see https://redis.io/commands/subscribe
+     */
+    subscribe: <TMessage>(channels: string | string[]) => Subscriber<TMessage>;
     /**
      * @see https://redis.io/commands/sunion
      */

package/{zmscore-C3G81zLz.d.ts → zmscore-BdNsMd17.d.ts}

@@ -36,7 +36,23 @@ type UpstashRequest = {
      * Request body will be serialized to json
      */
     body?: unknown;
+    /**
+     * Additional headers for the request
+     */
+    headers?: Record<string, string>;
     upstashSyncToken?: string;
+    /**
+     * Callback for handling streaming messages
+     */
+    onMessage?: (data: string) => void;
+    /**
+     * Whether this request expects a streaming response
+     */
+    isStreaming?: boolean;
+    /**
+     * Abort signal for the request
+     */
+    signal?: AbortSignal;
 };
 type UpstashResponse<TResult> = {
     result?: TResult;
@@ -119,6 +135,31 @@ type CommandOptions<TResult, TData> = {
      */
     automaticDeserialization?: boolean;
     latencyLogging?: boolean;
+    /**
+     * Additional headers to be sent with the request
+     */
+    headers?: Record<string, string>;
+    /**
+     * Path to append to the URL
+     */
+    path?: string[];
+    /**
+     * Options for streaming requests, mainly used for subscribe, monitor commands
+     **/
+    streamOptions?: {
+        /**
+         * Callback to be called when a message is received
+         */
+        onMessage?: (data: string) => void;
+        /**
+         * Whether the request is streaming
+         */
+        isStreaming?: boolean;
+        /**
+         * Signal to abort the request
+         */
+        signal?: AbortSignal;
+    };
 };
 /**
  * Command offers default (de)serialization and the exec method to all commands.
@@ -130,6 +171,11 @@ declare class Command<TResult, TData> {
     readonly command: (string | number | boolean)[];
     readonly serialize: Serialize;
     readonly deserialize: Deserialize<TResult, TData>;
+    protected readonly headers?: Record<string, string>;
+    protected readonly path?: string[];
+    protected readonly onMessage?: (data: string) => void;
+    protected readonly isStreaming: boolean;
+    protected readonly signal?: AbortSignal;
     /**
      * Create a new command instance.
      *
@@ -1643,6 +1689,42 @@ declare class ZScoreCommand<TData> extends Command<string | null, number | null>
     constructor(cmd: [key: string, member: TData], opts?: CommandOptions<string | null, number | null>);
 }
 
+type BaseMessageData<TMessage> = {
+    channel: string;
+    message: TMessage;
+};
+type PatternMessageData<TMessage> = BaseMessageData<TMessage> & {
+    pattern: string;
+};
+type SubscriptionCountEvent = number;
+type MessageEventMap<TMessage> = {
+    message: BaseMessageData<TMessage>;
+    subscribe: SubscriptionCountEvent;
+    unsubscribe: SubscriptionCountEvent;
+    pmessage: PatternMessageData<TMessage>;
+    psubscribe: SubscriptionCountEvent;
+    punsubscribe: SubscriptionCountEvent;
+    error: Error;
+    [key: `message:${string}`]: BaseMessageData<TMessage>;
+    [key: `pmessage:${string}`]: PatternMessageData<TMessage>;
+};
+type EventType = keyof MessageEventMap<any>;
+type Listener<TMessage, T extends EventType> = (event: MessageEventMap<TMessage>[T]) => void;
+declare class Subscriber<TMessage = any> extends EventTarget {
+    private subscriptions;
+    private client;
+    private listeners;
+    constructor(client: Requester, channels: string[], isPattern?: boolean);
+    private subscribeToChannel;
+    private subscribeToPattern;
+    private handleMessage;
+    private dispatchToListeners;
+    on<T extends keyof MessageEventMap<TMessage>>(type: T, listener: Listener<TMessage, T>): void;
+    removeAllListeners(): void;
+    unsubscribe(channels?: string[]): Promise<void>;
+    getSubscribedChannels(): string[];
+}
+
 type InferResponseData<T extends unknown[]> = {
     [K in keyof T]: T[K] extends Command<any, infer TData> ? TData : unknown;
 };
@@ -3236,6 +3318,10 @@ declare class Redis {
      * @see https://redis.io/commands/psetex
      */
     psetex: <TData>(key: string, ttl: number, value: TData) => Promise<string>;
+    /**
+     * @see https://redis.io/commands/psubscribe
+     */
+    psubscribe: <TMessage>(patterns: string | string[]) => Subscriber<TMessage>;
     /**
      * @see https://redis.io/commands/pttl
      */
@@ -3364,6 +3450,10 @@ declare class Redis {
      * @see https://redis.io/commands/strlen
      */
     strlen: (key: string) => Promise<number>;
+    /**
+     * @see https://redis.io/commands/subscribe
+     */
+    subscribe: <TMessage>(channels: string | string[]) => Subscriber<TMessage>;
     /**
      * @see https://redis.io/commands/sunion
      */