@orpc/publisher 2.0.0-beta.40 → 2.0.0-beta.41

package/README.md

@@ -85,7 +85,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
 
 <table>
   <tr>
-   <td width="2000"><a href="https://screenshotone.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener" title="The screenshot API for developers"><img src="https://avatars.githubusercontent.com/u/97035603?v=4" width="64" align="left" hspace="12" alt="ScreenshotOne.com"/><b>ScreenshotOne.com</b></a><br /><sub>The screenshot API for developers</sub></td>
+   <td width="2000"><a href="https://screenshotone.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="The screenshot API for developers"><img src="https://avatars.githubusercontent.com/u/97035603?v=4" width="64" align="left" hspace="12" alt="ScreenshotOne.com"/><b>ScreenshotOne.com</b></a><br /><sub>The screenshot API for developers</sub></td>
   </tr>
   <tr>
    <td width="2000"><a href="https://yuzu.health/careers?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="We&#39;re hiring NYC based engineers"><img src="https://avatars.githubusercontent.com/u/102488956?v=4" width="64" align="left" hspace="12" alt="Yuzu"/><b>Yuzu</b></a><br /><sub>We&#39;re hiring NYC based engineers</sub></td>
@@ -127,19 +127,18 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://soymilk.party/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="あわわわとーにゅ"><img src="https://avatars.githubusercontent.com/u/17376330?u=de3353804be889f009f7e0a1582daf04d0ab292d&amp;v=4" width="139" alt="あわわわとーにゅ"/><br />あわわわとーにゅ</a></td>
    <td align="center"><a href="https://github.com/nicognaW?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="nk"><img src="https://avatars.githubusercontent.com/u/66731869?u=4699bda3a9092d3ec34fbd959450767bcc8b8b6d&amp;v=4" width="139" alt="nk"/><br />nk</a></td>
    <td align="center"><a href="https://supastarter.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="supastarter"><img src="https://avatars.githubusercontent.com/u/110960143?v=4" width="139" alt="supastarter"/><br />supastarter</a></td>
-   <td align="center"><a href="https://github.com/divmgl?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Dexter Miguel"><img src="https://avatars.githubusercontent.com/u/5452298?u=645993204be8696c085ecf0d228c3062efe2ed65&amp;v=4" width="139" alt="Dexter Miguel"/><br />Dexter Miguel</a></td>
    <td align="center"><a href="https://github.com/herrfugbaum?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="herrfugbaum"><img src="https://avatars.githubusercontent.com/u/12859776?u=644dc1666d0220bc0468eb0de3c56b919f635b16&amp;v=4" width="139" alt="herrfugbaum"/><br />herrfugbaum</a></td>
+   <td align="center"><a href="https://laststance.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryota Murakami"><img src="https://avatars.githubusercontent.com/u/5501268?u=599389e03340734325726ca3f8f423c021d47d7f&amp;v=4" width="139" alt="Ryota Murakami"/><br />Ryota Murakami</a></td>
   </tr>
   <tr>
-   <td align="center"><a href="https://laststance.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryota Murakami"><img src="https://avatars.githubusercontent.com/u/5501268?u=599389e03340734325726ca3f8f423c021d47d7f&amp;v=4" width="139" alt="Ryota Murakami"/><br />Ryota Murakami</a></td>
    <td align="center"><a href="https://cra.mr/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="David Cramer"><img src="https://avatars.githubusercontent.com/u/23610?v=4" width="139" alt="David Cramer"/><br />David Cramer</a></td>
    <td align="center"><a href="https://valerii15298.github.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Valerii Petryniak"><img src="https://avatars.githubusercontent.com/u/44531564?u=88ac74d9bacd20401518441907acad21063cd397&amp;v=4" width="139" alt="Valerii Petryniak"/><br />Valerii Petryniak</a></td>
    <td align="center"><a href="https://letstri.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Valerii Strilets"><img src="https://avatars.githubusercontent.com/u/13253748?u=c7b10399ccc8f8081e24db94ec32cd9858e86ac3&amp;v=4" width="139" alt="Valerii Strilets"/><br />Valerii Strilets</a></td>
    <td align="center"><a href="https://blacklight.sh/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kyle Mistele"><img src="https://avatars.githubusercontent.com/u/18430555?u=3afebeb81de666e35aaac3ed46f14159d7603ffb&amp;v=4" width="139" alt="Kyle Mistele"/><br />Kyle Mistele</a></td>
    <td align="center"><a href="https://github.com/christ12938?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="christ12938"><img src="https://avatars.githubusercontent.com/u/25758598?v=4" width="139" alt="christ12938"/><br />christ12938</a></td>
+   <td align="center"><a href="https://github.com/Ryanjso?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryan Soderberg"><img src="https://avatars.githubusercontent.com/u/39172778?u=5ed913c31d57e7221b75784abcad48c7ebddde27&amp;v=4" width="139" alt="Ryan Soderberg"/><br />Ryan Soderberg</a></td>
   </tr>
   <tr>
-   <td align="center"><a href="https://github.com/Ryanjso?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryan Soderberg"><img src="https://avatars.githubusercontent.com/u/39172778?u=5ed913c31d57e7221b75784abcad48c7ebddde27&amp;v=4" width="139" alt="Ryan Soderberg"/><br />Ryan Soderberg</a></td>
    <td align="center"><a href="https://github.com/itigoore01?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="shota"><img src="https://avatars.githubusercontent.com/u/11831107?u=c976a6dc7e055eb026304c46c99100ed22b0c8e0&amp;v=4" width="139" alt="shota"/><br />shota</a></td>
    <td align="center"><a href="https://github.com/ellis-driscoll?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ellis Driscoll"><img src="https://avatars.githubusercontent.com/u/70685966?u=c5f95bc33b5991d9744abe00052542e4a2ed3cb9&amp;v=4" width="139" alt="Ellis Driscoll"/><br />Ellis Driscoll</a></td>
    <td align="center"><a href="https://github.com/hoangbn?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Hoang Nguyen"><img src="https://avatars.githubusercontent.com/u/38968280?u=c90084c6de65c56facabab7ba13a72a49ddbc3e4&amp;v=4" width="139" alt="Hoang Nguyen"/><br />Hoang Nguyen</a></td>
@@ -173,12 +172,13 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://kellychan.im/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="119" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
    <td align="center"><a href="https://guyariely.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Guy Ariely"><img src="https://avatars.githubusercontent.com/u/42813496?u=edb6b7f563bf28e160a290832e7da57c0506f8ca&amp;v=4" width="119" alt="Guy Ariely"/><br />Guy Ariely</a></td>
    <td align="center"><a href="https://paulsenon.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="PaulSenon"><img src="https://avatars.githubusercontent.com/u/19531087?u=6385741eb91d200b8c513ec6045482e301767ca6&amp;v=4" width="119" alt="PaulSenon"/><br />PaulSenon</a></td>
+   <td align="center"><a href="https://nakasyou.how/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Shotaro Nakamura"><img src="https://avatars.githubusercontent.com/u/79000684?u=f644df3f29f0e8677a90967115774564f1d9d6ab&amp;v=4" width="119" alt="Shotaro Nakamura"/><br />Shotaro Nakamura</a></td>
    <td align="center"><a href="https://piscis.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&amp;v=4" width="119" alt="Alex"/><br />Alex</a></td>
    <td align="center"><a href="https://opensource.gubanov.eu/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=c5f2daf7ebece498e85c83367bb37b4e10e2649d&amp;v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
   </tr>
 </table>
 
-With thanks to [36 past sponsors](https://htmlpreview.github.io/?https://github.com/middleapi/static/blob/main/sponsors.svg) who helped get oRPC here.
+With thanks to [38 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
 
 ## References
 

package/dist/adapters/base-redis.d.mts

@@ -9,7 +9,8 @@ import { RPCJsonSerializer } from '@orpc/client';
  */
 interface BaseRedisPublisherOptions extends PublisherOptions {
     /**
-     * The prefix to use for Redis keys.
+     * The prefix to use for Redis keys and Pub/Sub channels.
+     * Set it to isolate events when several apps share one Redis instance.
      *
      * @default ''
      */
@@ -64,25 +65,6 @@ interface RedisStreamEntry {
      */
     data: unknown;
 }
-/**
- * Trimming to apply to a Redis Stream while adding an entry.
- *
- * @see {@link https://orpc.dev/docs/helpers/publisher#adapters | Publisher Helpers - Adapters}
- */
-interface RedisStreamTrimOptions {
-    /**
-     * Entries with an ID lower than this one are removed (`XTRIM key MINID minId`).
-     */
-    minId: string;
-    /**
-     * Whether trimming is exact (`=`) or approximate (`~`).
-     */
-    exactness: '~' | '=';
-    /**
-     * Time to live to set on the stream key, in seconds (`EXPIRE key seconds`).
-     */
-    expireSeconds: number;
-}
 /**
  * Base class for Redis-backed publisher adapters. It owns the key naming, the
  * message format, and the resume logic, so every adapter built on it can exchange
@@ -119,11 +101,11 @@ declare abstract class BaseRedisPublisher<T extends Record<string, object>> exte
      */
     protected abstract subscribeChannel(channel: string, listener: (message: unknown) => void, onError?: (error: ThrowableError) => void): Promise<() => Promise<void>>;
     /**
-     * Appends an entry to a stream (`XADD key * data <data>`) and resolves with its ID.
-     * When `trim` is provided, also trims the stream and refreshes its TTL,
-     * preferably within the same round trip.
+     * Runs a Lua script (`EVAL script numkeys key [key ...] arg [arg ...]`) and resolves with its reply.
+     * The publish script also uses its key as the Pub/Sub channel, so a client that prefixes
+     * keys must prefix channels the same way.
      */
-    protected abstract addStreamEntry(key: string, data: string, trim?: RedisStreamTrimOptions): Promise<string>;
+    protected abstract evalScript(script: string, keys: string[], args: string[]): Promise<unknown>;
     /**
      * Reads the entries with an ID greater than `lastId` (`XREAD STREAMS key lastId`), oldest first.
      */
@@ -135,4 +117,4 @@ declare abstract class BaseRedisPublisher<T extends Record<string, object>> exte
 }
 
 export { BaseRedisPublisher };
-export type { BaseRedisPublisherOptions, RedisStreamEntry, RedisStreamTrimOptions };
+export type { BaseRedisPublisherOptions, RedisStreamEntry };

package/dist/adapters/base-redis.d.ts

@@ -9,7 +9,8 @@ import { RPCJsonSerializer } from '@orpc/client';
  */
 interface BaseRedisPublisherOptions extends PublisherOptions {
     /**
-     * The prefix to use for Redis keys.
+     * The prefix to use for Redis keys and Pub/Sub channels.
+     * Set it to isolate events when several apps share one Redis instance.
      *
      * @default ''
      */
@@ -64,25 +65,6 @@ interface RedisStreamEntry {
      */
     data: unknown;
 }
-/**
- * Trimming to apply to a Redis Stream while adding an entry.
- *
- * @see {@link https://orpc.dev/docs/helpers/publisher#adapters | Publisher Helpers - Adapters}
- */
-interface RedisStreamTrimOptions {
-    /**
-     * Entries with an ID lower than this one are removed (`XTRIM key MINID minId`).
-     */
-    minId: string;
-    /**
-     * Whether trimming is exact (`=`) or approximate (`~`).
-     */
-    exactness: '~' | '=';
-    /**
-     * Time to live to set on the stream key, in seconds (`EXPIRE key seconds`).
-     */
-    expireSeconds: number;
-}
 /**
  * Base class for Redis-backed publisher adapters. It owns the key naming, the
  * message format, and the resume logic, so every adapter built on it can exchange
@@ -119,11 +101,11 @@ declare abstract class BaseRedisPublisher<T extends Record<string, object>> exte
      */
     protected abstract subscribeChannel(channel: string, listener: (message: unknown) => void, onError?: (error: ThrowableError) => void): Promise<() => Promise<void>>;
     /**
-     * Appends an entry to a stream (`XADD key * data <data>`) and resolves with its ID.
-     * When `trim` is provided, also trims the stream and refreshes its TTL,
-     * preferably within the same round trip.
+     * Runs a Lua script (`EVAL script numkeys key [key ...] arg [arg ...]`) and resolves with its reply.
+     * The publish script also uses its key as the Pub/Sub channel, so a client that prefixes
+     * keys must prefix channels the same way.
      */
-    protected abstract addStreamEntry(key: string, data: string, trim?: RedisStreamTrimOptions): Promise<string>;
+    protected abstract evalScript(script: string, keys: string[], args: string[]): Promise<unknown>;
     /**
      * Reads the entries with an ID greater than `lastId` (`XREAD STREAMS key lastId`), oldest first.
      */
@@ -135,4 +117,4 @@ declare abstract class BaseRedisPublisher<T extends Record<string, object>> exte
 }
 
 export { BaseRedisPublisher };
-export type { BaseRedisPublisherOptions, RedisStreamEntry, RedisStreamTrimOptions };
+export type { BaseRedisPublisherOptions, RedisStreamEntry };

package/dist/adapters/base-redis.mjs

@@ -1,8 +1,9 @@
 import { RPCJsonSerializer } from '@orpc/client';
 import { stringifyJSON, once, parseEmptyableJSON } from '@orpc/shared';
 import { unwrapEvent, withEventMeta, getEventMeta } from '@standard-server/core';
-import { P as Publisher } from '../shared/publisher.BSQf8ybR.mjs';
+import { P as Publisher } from '../shared/publisher.DcPG7zl6.mjs';
 
+const PUBLISH_SCRIPT = `local id=redis.call('XADD',KEYS[1],'*','data',ARGV[1]) if ARGV[2] then redis.call('XTRIM',KEYS[1],'MINID',ARGV[2],ARGV[3]) redis.call('EXPIRE',KEYS[1],ARGV[4]) end redis.call('PUBLISH',KEYS[1],'{"data":'..ARGV[1]..',"id":"'..id..'"}')`;
 class BaseRedisPublisher extends Publisher {
   prefix;
   serializer;
@@ -23,28 +24,29 @@ class BaseRedisPublisher extends Publisher {
   async publish(event, payload) {
     const channel = `${this.prefix}${event}`;
     const data = this.serializePayload(payload);
-    let id;
-    if (this.resumeEnabled) {
-      const now = Date.now();
-      const windowMs = this.resumeSeconds * 1e3;
-      for (const [trimmedChannel, trimTime] of this.lastTrimTimes) {
-        if (trimTime + windowMs < now) {
-          this.lastTrimTimes.delete(trimmedChannel);
-        }
-      }
-      if (this.lastTrimTimes.has(channel)) {
-        id = await this.addStreamEntry(channel, stringifyJSON(data));
-      } else {
-        this.lastTrimTimes.set(channel, now);
-        id = await this.addStreamEntry(channel, stringifyJSON(data), {
-          minId: `${now - windowMs}-0`,
-          exactness: this.xTrimExactness,
-          // 2x so entries added late in a window outlive it until the next trim refreshes the TTL.
-          expireSeconds: this.resumeSeconds * 2
-        });
+    if (!this.resumeEnabled) {
+      await this.publishMessage(channel, stringifyJSON({ data }));
+      return;
+    }
+    const now = Date.now();
+    const windowMs = this.resumeSeconds * 1e3;
+    for (const [trimmedChannel, trimTime] of this.lastTrimTimes) {
+      if (trimTime + windowMs >= now) {
+        break;
       }
+      this.lastTrimTimes.delete(trimmedChannel);
+    }
+    const args = [stringifyJSON(data)];
+    if (!this.lastTrimTimes.has(channel)) {
+      this.lastTrimTimes.set(channel, now);
+      args.push(
+        this.xTrimExactness,
+        `${now - windowMs}-0`,
+        // 2x so entries added late in a window outlive it until the next trim refreshes the TTL.
+        String(this.resumeSeconds * 2)
+      );
     }
-    await this.publishMessage(channel, stringifyJSON({ data, id }));
+    await this.evalScript(PUBLISH_SCRIPT, [channel], args);
   }
   async subscribeListener(event, listener, { lastEventId, onError } = {}) {
     const channel = `${this.prefix}${event}`;

package/dist/adapters/memory.mjs

@@ -1,6 +1,6 @@
 import { SequentialIdGenerator, once, compareSequentialIds } from '@orpc/shared';
 import { unwrapEvent, withEventMeta, getEventMeta } from '@standard-server/core';
-import { P as Publisher } from '../shared/publisher.BSQf8ybR.mjs';
+import { P as Publisher } from '../shared/publisher.DcPG7zl6.mjs';
 
 class MemoryPublisher extends Publisher {
   listenersMap = /* @__PURE__ */ new Map();
@@ -25,8 +25,7 @@ class MemoryPublisher extends Publisher {
       payload = withEventMeta(original, { ...meta, id: this.idGenerator.generate() });
       bucket.push({ expiresAt, payload });
     }
-    const listeners = this.listenersMap.get(event);
-    listeners?.forEach((listener) => listener(payload));
+    this.listenersMap.get(event)?.forEach((listener) => listener(payload));
   }
   async subscribeListener(event, listener, options) {
     this.cleanup();
@@ -45,9 +44,13 @@ class MemoryPublisher extends Publisher {
     }
     listeners.push(listener);
     return once(async () => {
-      listeners.splice(listeners.indexOf(listener), 1);
-      if (listeners.length === 0) {
+      const current = this.listenersMap.get(event);
+      const index = current.indexOf(listener);
+      const remaining = current.filter((_, i) => i !== index);
+      if (remaining.length === 0) {
         this.listenersMap.delete(event);
+      } else {
+        this.listenersMap.set(event, remaining);
       }
     });
   }

package/dist/adapters/redis.d.mts

@@ -1,5 +1,5 @@
 import { RedisClientType } from 'redis';
-import { BaseRedisPublisher, BaseRedisPublisherOptions, RedisStreamTrimOptions, RedisStreamEntry } from './base-redis.mjs';
+import { BaseRedisPublisher, BaseRedisPublisherOptions, RedisStreamEntry } from './base-redis.mjs';
 import '@orpc/shared';
 import '../index.mjs';
 import '@orpc/client';
@@ -23,10 +23,15 @@ interface RedisPublisherOptions extends BaseRedisPublisherOptions {
 declare class RedisPublisher<T extends Record<string, object>> extends BaseRedisPublisher<T> {
     private readonly redis;
     private readonly subscriber;
+    /**
+     * node-redis applies `keyPrefix` to keys but not channels, while the publish script
+     * publishes on its key, so channels need the same prefix.
+     */
+    private readonly channelPrefix;
     constructor(redis: RedisClientType<any, any, any, any, any>, { subscriber, ...options }?: RedisPublisherOptions);
     protected publishMessage(channel: string, message: string): Promise<void>;
     protected subscribeChannel(channel: string, listener: (message: unknown) => void): Promise<() => Promise<void>>;
-    protected addStreamEntry(key: string, data: string, trim?: RedisStreamTrimOptions): Promise<string>;
+    protected evalScript(script: string, keys: string[], args: string[]): Promise<unknown>;
     protected readStreamEntries(key: string, lastId: string): Promise<RedisStreamEntry[]>;
 }
 

package/dist/adapters/redis.d.ts

@@ -1,5 +1,5 @@
 import { RedisClientType } from 'redis';
-import { BaseRedisPublisher, BaseRedisPublisherOptions, RedisStreamTrimOptions, RedisStreamEntry } from './base-redis.js';
+import { BaseRedisPublisher, BaseRedisPublisherOptions, RedisStreamEntry } from './base-redis.js';
 import '@orpc/shared';
 import '../index.js';
 import '@orpc/client';
@@ -23,10 +23,15 @@ interface RedisPublisherOptions extends BaseRedisPublisherOptions {
 declare class RedisPublisher<T extends Record<string, object>> extends BaseRedisPublisher<T> {
     private readonly redis;
     private readonly subscriber;
+    /**
+     * node-redis applies `keyPrefix` to keys but not channels, while the publish script
+     * publishes on its key, so channels need the same prefix.
+     */
+    private readonly channelPrefix;
     constructor(redis: RedisClientType<any, any, any, any, any>, { subscriber, ...options }?: RedisPublisherOptions);
     protected publishMessage(channel: string, message: string): Promise<void>;
     protected subscribeChannel(channel: string, listener: (message: unknown) => void): Promise<() => Promise<void>>;
-    protected addStreamEntry(key: string, data: string, trim?: RedisStreamTrimOptions): Promise<string>;
+    protected evalScript(script: string, keys: string[], args: string[]): Promise<unknown>;
     protected readStreamEntries(key: string, lastId: string): Promise<RedisStreamEntry[]>;
 }
 

package/dist/adapters/redis.mjs

@@ -2,33 +2,40 @@ import { BaseRedisPublisher } from './base-redis.mjs';
 import '@orpc/client';
 import '@orpc/shared';
 import '@standard-server/core';
-import '../shared/publisher.BSQf8ybR.mjs';
+import '../shared/publisher.DcPG7zl6.mjs';
 
 class RedisPublisher extends BaseRedisPublisher {
   constructor(redis, { subscriber, ...options } = {}) {
     super(options);
     this.redis = redis;
+    const keyPrefix = redis.options?.keyPrefix;
+    if (keyPrefix !== void 0 && typeof keyPrefix !== "string") {
+      throw new TypeError("RedisPublisher only supports a string keyPrefix on the Redis client.");
+    }
     this.subscriber = subscriber ?? redis.duplicate();
+    this.channelPrefix = keyPrefix ?? "";
   }
   subscriber;
+  /**
+   * node-redis applies `keyPrefix` to keys but not channels, while the publish script
+   * publishes on its key, so channels need the same prefix.
+   */
+  channelPrefix;
   async publishMessage(channel, message) {
     await connectIfNeeded(this.redis);
-    await this.redis.publish(channel, message);
+    await this.redis.publish(`${this.channelPrefix}${channel}`, message);
   }
   async subscribeChannel(channel, listener) {
+    const prefixedChannel = `${this.channelPrefix}${channel}`;
     await connectIfNeeded(this.subscriber);
-    await this.subscriber.subscribe(channel, listener);
+    await this.subscriber.subscribe(prefixedChannel, listener);
     return async () => {
-      await this.subscriber.unsubscribe(channel, listener);
+      await this.subscriber.unsubscribe(prefixedChannel, listener);
     };
   }
-  async addStreamEntry(key, data, trim) {
+  async evalScript(script, keys, args) {
     await connectIfNeeded(this.redis);
-    if (!trim) {
-      return await this.redis.xAdd(key, "*", { data });
-    }
-    const [id] = await this.redis.multi().xAdd(key, "*", { data }).xTrim(key, "MINID", trim.minId, { strategyModifier: trim.exactness }).expire(key, trim.expireSeconds).exec();
-    return id;
+    return await this.redis.eval(script, { keys, arguments: args });
   }
   async readStreamEntries(key, lastId) {
     await connectIfNeeded(this.redis);

package/dist/adapters/upstash.d.mts

@@ -1,6 +1,6 @@
 import { ThrowableError } from '@orpc/shared';
 import { Redis } from '@upstash/redis';
-import { BaseRedisPublisher, BaseRedisPublisherOptions, RedisStreamTrimOptions, RedisStreamEntry } from './base-redis.mjs';
+import { BaseRedisPublisher, BaseRedisPublisherOptions, RedisStreamEntry } from './base-redis.mjs';
 import '../index.mjs';
 import '@orpc/client';
 
@@ -21,7 +21,7 @@ declare class UpstashPublisher<T extends Record<string, object>> extends BaseRed
     constructor(redis: Redis, options?: UpstashPublisherOptions);
     protected publishMessage(channel: string, message: string): Promise<void>;
     protected subscribeChannel(channel: string, listener: (message: unknown) => void, onError?: (error: ThrowableError) => void): Promise<() => Promise<void>>;
-    protected addStreamEntry(key: string, data: string, trim?: RedisStreamTrimOptions): Promise<string>;
+    protected evalScript(script: string, keys: string[], args: string[]): Promise<unknown>;
     protected readStreamEntries(key: string, lastId: string): Promise<RedisStreamEntry[]>;
     private subscribeIfNeeded;
     private unsubscribeIfUnused;

package/dist/adapters/upstash.d.ts

@@ -1,6 +1,6 @@
 import { ThrowableError } from '@orpc/shared';
 import { Redis } from '@upstash/redis';
-import { BaseRedisPublisher, BaseRedisPublisherOptions, RedisStreamTrimOptions, RedisStreamEntry } from './base-redis.js';
+import { BaseRedisPublisher, BaseRedisPublisherOptions, RedisStreamEntry } from './base-redis.js';
 import '../index.js';
 import '@orpc/client';
 
@@ -21,7 +21,7 @@ declare class UpstashPublisher<T extends Record<string, object>> extends BaseRed
     constructor(redis: Redis, options?: UpstashPublisherOptions);
     protected publishMessage(channel: string, message: string): Promise<void>;
     protected subscribeChannel(channel: string, listener: (message: unknown) => void, onError?: (error: ThrowableError) => void): Promise<() => Promise<void>>;
-    protected addStreamEntry(key: string, data: string, trim?: RedisStreamTrimOptions): Promise<string>;
+    protected evalScript(script: string, keys: string[], args: string[]): Promise<unknown>;
     protected readStreamEntries(key: string, lastId: string): Promise<RedisStreamEntry[]>;
     private subscribeIfNeeded;
     private unsubscribeIfUnused;

package/dist/adapters/upstash.mjs

@@ -2,7 +2,7 @@ import { promiseWithResolvers } from '@orpc/shared';
 import { BaseRedisPublisher } from './base-redis.mjs';
 import '@orpc/client';
 import '@standard-server/core';
-import '../shared/publisher.BSQf8ybR.mjs';
+import '../shared/publisher.DcPG7zl6.mjs';
 
 class UpstashPublisher extends BaseRedisPublisher {
   constructor(redis, options = {}) {
@@ -36,12 +36,8 @@ class UpstashPublisher extends BaseRedisPublisher {
       await this.unsubscribeIfUnused(channel);
     };
   }
-  async addStreamEntry(key, data, trim) {
-    if (!trim) {
-      return this.redis.xadd(key, "*", { data });
-    }
-    const [id] = await this.redis.multi().xadd(key, "*", { data }).xtrim(key, { strategy: "MINID", exactness: trim.exactness, threshold: trim.minId }).expire(key, trim.expireSeconds).exec();
-    return id;
+  async evalScript(script, keys, args) {
+    return await this.redis.eval(script, keys, args);
   }
   async readStreamEntries(key, lastId) {
     const results = await this.redis.xread(key, lastId);

package/dist/index.d.mts

@@ -6,6 +6,8 @@ interface PublisherOptions {
      *
      * If the buffer exceeds this limit, the oldest event is dropped.
      * This prevents unbounded memory growth if consumers process events slowly.
+     * Missed events the adapter replays for `lastEventId` while subscribing are all kept,
+     * and the limit then applies to how much further behind the consumer falls.
      *
      * Set to:
      * - `0`: Disable buffering. Events must be consumed before the next one arrives.
@@ -42,6 +44,8 @@ declare abstract class Publisher<T extends Record<string, object>> {
     /**
      * Subscribes to a specific event using a callback function.
      * Returns an unsubscribe function to remove the listener.
+     * Events missed since `lastEventId` should reach the listener before the returned promise
+     * resolves, so iterator subscribers keep them all regardless of `maxBufferedEvents`.
      *
      * @remarks
      * This method should be protected to avoid conflicts with `subscribe` method

package/dist/index.d.ts

@@ -6,6 +6,8 @@ interface PublisherOptions {
      *
      * If the buffer exceeds this limit, the oldest event is dropped.
      * This prevents unbounded memory growth if consumers process events slowly.
+     * Missed events the adapter replays for `lastEventId` while subscribing are all kept,
+     * and the limit then applies to how much further behind the consumer falls.
      *
      * Set to:
      * - `0`: Disable buffering. Events must be consumed before the next one arrives.
@@ -42,6 +44,8 @@ declare abstract class Publisher<T extends Record<string, object>> {
     /**
      * Subscribes to a specific event using a callback function.
      * Returns an unsubscribe function to remove the listener.
+     * Events missed since `lastEventId` should reach the listener before the returned promise
+     * resolves, so iterator subscribers keep them all regardless of `maxBufferedEvents`.
      *
      * @remarks
      * This method should be protected to avoid conflicts with `subscribe` method

package/dist/index.mjs

@@ -1,2 +1,2 @@
-export { P as Publisher } from './shared/publisher.BSQf8ybR.mjs';
+export { P as Publisher } from './shared/publisher.DcPG7zl6.mjs';
 import '@orpc/shared';

package/dist/shared/{publisher.BSQf8ybR.mjs → publisher.DcPG7zl6.mjs}

@@ -1,4 +1,4 @@
-import { AsyncIteratorClass } from '@orpc/shared';
+import { throwIfAborted, AsyncIteratorClass } from '@orpc/shared';
 
 class Publisher {
   maxBufferedEvents;
@@ -11,10 +11,13 @@ class Publisher {
     }
     const signal = listenerOrOptions?.signal;
     const maxBufferedEvents = listenerOrOptions?.maxBufferedEvents ?? this.maxBufferedEvents;
-    signal?.throwIfAborted();
-    const bufferedEvents = [];
+    throwIfAborted(signal);
+    const resuming = listenerOrOptions?.lastEventId !== void 0;
+    const bufferedEvents = new Queue();
     const pullResolvers = [];
-    const unsubscribePromise = this.subscribeListener(event, (payload) => {
+    let bufferFloor = 0;
+    let bufferLimit = resuming ? Infinity : maxBufferedEvents;
+    const subscription = this.subscribeListener(event, (payload) => {
       if (signal?.aborted) {
         return;
       }
@@ -23,14 +26,18 @@ class Publisher {
         resolver.resolve({ done: false, value: payload });
       } else {
         bufferedEvents.push(payload);
-        if (bufferedEvents.length > maxBufferedEvents) {
+        if (bufferedEvents.length > bufferLimit) {
           bufferedEvents.shift();
         }
       }
     }, {
       lastEventId: listenerOrOptions?.lastEventId,
       onError: (error) => terminate({ kind: "error", error })
-    }).catch((error) => terminate({ kind: "error", error }));
+    });
+    const unsubscribePromise = (resuming ? subscription.finally(() => {
+      bufferFloor = bufferedEvents.length;
+      bufferLimit = bufferFloor + maxBufferedEvents;
+    }) : subscription).catch((error) => terminate({ kind: "error", error }));
     const abortListener = () => terminate({ kind: "error", error: signal.reason });
     signal?.addEventListener("abort", abortListener);
     let terminalState;
@@ -47,7 +54,7 @@ class Publisher {
       }
       if (signal?.aborted) {
         pullResolvers.length = 0;
-        bufferedEvents.length = 0;
+        bufferedEvents.clear();
       }
       await unsubscribePromise.then((unsubscribe) => unsubscribe?.());
     }
@@ -56,8 +63,13 @@ class Publisher {
         if (terminalState?.kind === "cancelled") {
           return { done: true, value: void 0 };
         }
-        if (bufferedEvents.length > 0) {
-          return { done: false, value: bufferedEvents.shift() };
+        const value = bufferedEvents.shift();
+        if (value !== void 0) {
+          if (bufferedEvents.length < bufferFloor) {
+            bufferFloor = bufferedEvents.length;
+            bufferLimit = bufferFloor + maxBufferedEvents;
+          }
+          return { done: false, value };
         }
         if (terminalState?.kind === "error") {
           throw terminalState.error;
@@ -70,5 +82,31 @@ class Publisher {
     );
   }
 }
+class Queue {
+  items = [];
+  head = 0;
+  get length() {
+    return this.items.length - this.head;
+  }
+  push(item) {
+    this.items.push(item);
+  }
+  shift() {
+    if (this.head === this.items.length) {
+      return void 0;
+    }
+    const item = this.items[this.head];
+    this.items[this.head++] = void 0;
+    if (this.head >= 32 && this.head * 2 >= this.items.length) {
+      this.items.splice(0, this.head);
+      this.head = 0;
+    }
+    return item;
+  }
+  clear() {
+    this.items.length = 0;
+    this.head = 0;
+  }
+}
 
 export { Publisher as P };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/publisher",
   "type": "module",
-  "version": "2.0.0-beta.40",
+  "version": "2.0.0-beta.41",
   "description": "Typesafe pub/sub for oRPC event streaming, with memory, Redis, and Upstash adapters",
   "license": "MIT",
   "funding": [
@@ -70,9 +70,9 @@
     }
   },
   "dependencies": {
-    "@orpc/client": "2.0.0-beta.40",
-    "@orpc/shared": "2.0.0-beta.40",
-    "@standard-server/core": "~0.9.2"
+    "@orpc/client": "2.0.0-beta.41",
+    "@orpc/shared": "2.0.0-beta.41",
+    "@standard-server/core": "~0.10.0"
   },
   "devDependencies": {
     "@upstash/redis": "^1.38.2",