dinwwwh · Oct 22, 2026 · Oct 20, 2026 · Oct 20, 2026 · Oct 21, 2026 · Oct 22, 2026
diff --git a/apps/content/docs/helpers/publisher.mdx b/apps/content/docs/helpers/publisher.mdx
@@ -79,14 +79,14 @@ const publisher = new MemoryPublisher<Events>({
     enabled: false,
 
     /**
-     * How long (in seconds) to retain events for resume.
+     * How long to retain events for resume, in milliseconds.
      *
      * Expired events are cleaned up lazily for performance reasons, so
      * some events may remain available slightly longer than this period.
      *
-     * @default 300 (5 min)
+     * @default 300000 (5 min)
      */
-    seconds: 300
+    ttl: 300_000
   }
 })
 ```
@@ -140,14 +140,14 @@ const publisher = new RedisPublisher<Events>(client, {
     enabled: false,
 
     /**
-     * How long (in seconds) to retain events for resume.
+     * How long to retain events for resume, in milliseconds.
      *
      * Expired events are cleaned up lazily for performance reasons, so
      * some events may remain available slightly longer than this period.
      *
-     * @default 300 (5 min)
+     * @default 300000 (5 min)
      */
-    seconds: 300
+    ttl: 300_000
   }
 })
 ```
@@ -186,14 +186,14 @@ const publisher = new UpstashPublisher<Events>(redis, {
     enabled: false,
 
     /**
-     * How long (in seconds) to retain events for resume.
+     * How long to retain events for resume, in milliseconds.
      *
      * Expired events are cleaned up lazily for performance reasons, so
      * some events may remain available slightly longer than this period.
      *
-     * @default 300 (5 min)
+     * @default 300000 (5 min)
      */
-    seconds: 300
+    ttl: 300_000
   }
 })
 ```
@@ -243,14 +243,14 @@ const publisher = new BunRedisPublisher<Events>(redis, {
     enabled: false,
 
     /**
-     * How long (in seconds) to retain events for resume.
+     * How long to retain events for resume, in milliseconds.
      *
      * Expired events are cleaned up lazily for performance reasons, so
      * some events may remain available slightly longer than this period.
      *
-     * @default 300 (5 min)
+     * @default 300000 (5 min)
      */
-    seconds: 300
+    ttl: 300_000
   }
 })
 ```
@@ -275,25 +275,25 @@ export class PublisherDO extends DurablePublisherObject {
         enabled: false,
 
         /**
-         * How long (in seconds) to retain events for resume.
+         * How long to retain events for resume, in milliseconds.
          *
          * Expired events are cleaned up lazily for performance reasons, so
          * some events may remain available slightly longer than this period.
          *
-         * @default 300 (5 min)
+         * @default 300000 (5 min)
          */
-        seconds: 300,
+        ttl: 300_000,
 
         /**
-         * Interval (in seconds) between cleanup checks for the Durable Object.
+         * Interval between cleanup checks for the Durable Object, in milliseconds.
          *
          * At each interval, verify whether the Durable Object is inactive
          * (no active WebSocket connections and no stored events). If inactive, all
          * data is deleted to free resources; otherwise, another check is scheduled.
          *
-         * @default 6 * 60 * 60 (6 hours)
+         * @default 6 * 60 * 60 * 1000 (6 hours)
          */
-        cleanupIntervalSeconds: 6 * 60 * 60,
+        cleanupInterval: 6 * 60 * 60 * 1000,
 
         /**
          * Prefix for the resume storage table schema.
@@ -345,7 +345,7 @@ Some adapters can resume events missed while a subscriber is offline. This featu
 const publisher = new MemoryPublisher({
   resume: {
     enabled: true, // Enable resuming missed events
-    seconds: 60 * 5, // TTL in seconds
+    ttl: 5 * 60 * 1000, // How long to retain events, in milliseconds
   }
 })
 

diff --git a/apps/content/docs/helpers/ratelimit.mdx b/apps/content/docs/helpers/ratelimit.mdx
@@ -19,7 +19,7 @@ The core concept is the `RateLimiter` interface, which defines a standard way to
 | -------------------------------------- | ------------- | --------------------------------------------------------------------------------------------------------- |
 | [`MemoryRateLimiter`](#memory)         | ✅            | In-memory storage                                                                                         |
 | [`RedisRateLimiter`](#redis)           | ✅            | [Redis](https://github.com/redis/redis)                                                                   |
-| [`UpstashRateLimiter`](#upstash)       | ✅            | [Upstash Rate Limit](https://www.npmjs.com/package/@upstash/ratelimit)                                    |
+| [`UpstashRateLimiter`](#upstash)       | ✅            | [Upstash Redis](https://github.com/upstash/redis-js)                                                      |
 | [`BunRedisRateLimiter`](#bun-redis)    | ✅            | [Bun's Redis](https://bun.com/docs/runtime/redis)                                                         |
 | [`CloudflareRateLimiter`](#cloudflare) | ❌            | [Cloudflare's Rate Limiting](https://developers.cloudflare.com/workers/runtime-apis/bindings/rate-limit/) |
 
@@ -50,16 +50,13 @@ if (!result.success) {
 
 ### Blocking Mode
 
-Some adapters support blocking mode, which waits until capacity becomes available instead of rejecting requests immediately.
+Some adapters support blocking mode, which waits until capacity becomes available instead of rejecting requests immediately. Set `timeout` to how long a request may wait, in milliseconds. A request still fails right away when its window will not reset before the timeout elapses.
 
 ```ts
 const limiter = new MemoryRateLimiter({
   maxRequests: 10,
   window: 60000,
-  blockingUntilReady: {
-    enabled: true, // Disabled by default
-    timeout: 5000, // Wait up to 5 seconds
-  },
+  timeout: 5000, // Wait up to 5 seconds, 0 (no waiting) by default
 })
 ```
 
@@ -169,19 +166,13 @@ const limiter = new MemoryRateLimiter({
    */
   window: 60000,
 
-  blockingUntilReady: {
-    /**
-     * Block until the request may pass or timeout is reached.
-     *
-     * @default false
-     */
-    enabled: false,
-
-    /**
-     * milliseconds
-     */
-    timeout: 5000
-  },
+  /**
+   * How long to wait for capacity to become available, in milliseconds.
+   * Gives up right away when the window will not reset before the timeout elapses.
+   *
+   * @default 0
+   */
+  timeout: 0,
 })
 ```
 
@@ -217,68 +208,53 @@ const limiter = new RedisRateLimiter(client, {
    */
   window: 60000,
 
-  blockingUntilReady: {
-    /**
-     * Block until the request may pass or timeout is reached.
-     *
-     * @default false
-     */
-    enabled: false,
-
-    /**
-     * milliseconds
-     */
-    timeout: 5000
-  },
+  /**
+   * How long to wait for capacity to become available, in milliseconds.
+   * Gives up right away when the window will not reset before the timeout elapses.
+   *
+   * @default 0
+   */
+  timeout: 0,
 })
 ```
 
 ### Upstash
 
-Delegates to an `@upstash/ratelimit` instance, so the algorithm and limits are configured there. A good fit for serverless and edge runtimes.
+Stores counters in Upstash Redis, so it shares counters with `RedisRateLimiter`. A good fit for serverless and edge runtimes.
 
-````ts
-import { Ratelimit } from '@upstash/ratelimit'
-import { Redis } from '@upstash/redis'
+```ts
 import { UpstashRateLimiter } from '@orpc/ratelimit/upstash'
+import { Redis } from '@upstash/redis'
 
 const redis = Redis.fromEnv()
-const ratelimit = new Ratelimit({
-  redis,
-  limiter: Ratelimit.slidingWindow(10, '60 s'),
-  prefix: 'orpc:', // Optional key prefix
-})
 
-const limiter = new UpstashRateLimiter(ratelimit, {
-  blockingUntilReady: {
-    /**
-     * Block until the request may pass or timeout is reached.
-     *
-     * @default false
-     */
-    enabled: false,
-
-    /**
-     * milliseconds
-     */
-    timeout: 5000
-  },
+const limiter = new UpstashRateLimiter(redis, {
+  /**
+   * The prefix to use for Redis keys.
+   *
+   * @default ''
+   */
+  prefix: '',
 
   /**
-   * For the MultiRegion setup we do some synchronizing in the background, after returning the current limit.
-   * Or when analytics is enabled, we send the analytics asynchronously after returning the limit.
-   * In most case you can simply ignore this.
+   * Maximum number of requests allowed within the window.
+   */
+  maxRequests: 10,
+
+  /**
+   * The duration of the fixed window in milliseconds.
+   */
+  window: 60000,
+
+  /**
+   * How long to wait for capacity to become available, in milliseconds.
+   * Gives up right away when the window will not reset before the timeout elapses.
    *
-   * On Vercel Edge or Cloudflare workers, you might need `.bind` before assign:
-   * ```ts
-   * const ratelimiter = new UpstashRateLimiter(ratelimit, {
-   *   waitUntil: ctx.waitUntil.bind(ctx),
-   * })
-   * ```
+   * @default 0
    */
-  waitUntil: undefined
+  timeout: 0,
 })
-````
+```
 
 ### Bun Redis
 
@@ -306,19 +282,13 @@ const limiter = new BunRedisRateLimiter(redis, {
    */
   window: 60000,
 
-  blockingUntilReady: {
-    /**
-     * Block until the request may pass or timeout is reached.
-     *
-     * @default false
-     */
-    enabled: false,
-
-    /**
-     * milliseconds
-     */
-    timeout: 5000
-  },
+  /**
+   * How long to wait for capacity to become available, in milliseconds.
+   * Gives up right away when the window will not reset before the timeout elapses.
+   *
+   * @default 0
+   */
+  timeout: 0,
 })
 ```
 

diff --git a/apps/content/docs/migrations/from-v1.mdx b/apps/content/docs/migrations/from-v1.mdx
@@ -1236,7 +1236,7 @@ Base64Url, Cookie, Encryption, and Signing helpers are unchanged in `@orpc/serve
 
 ### Publisher
 
-The package is now `@orpc/publisher`. The resume option was restructured, `customJsonSerializers` became a `serializer` instance (see [RPC JSON Serializer](/docs/rpc/serializer#rpc-json-serializer)), and the Redis adapter switched from `ioredis` to `node-redis`. See [Publisher Helpers](/docs/helpers/publisher).
+The package is now `@orpc/publisher`. `resumeRetentionSeconds` became `resume.ttl`, in milliseconds, `customJsonSerializers` became a `serializer` instance (see [RPC JSON Serializer](/docs/rpc/serializer#rpc-json-serializer)), and the Redis adapter switched from `ioredis` to `node-redis`. See [Publisher Helpers](/docs/helpers/publisher).
 
 <CodeGroup>
 
@@ -1245,7 +1245,7 @@ import { RedisPublisher } from '@orpc/publisher/redis'
 
 const publisher = new RedisPublisher(client, {
   subscriber,
-  resume: { enabled: true, seconds: 300 },
+  resume: { enabled: true, ttl: 300_000 },
 })
 ```
 
@@ -1261,7 +1261,7 @@ const publisher = new IORedisPublisher({
 
 </CodeGroup>
 
-The Durable Object adapter moved to `@orpc/cloudflare`, with `PublisherDurableObject` renamed to `DurablePublisherObject`.
+The Durable Object adapter moved to `@orpc/cloudflare`, with `PublisherDurableObject` renamed to `DurablePublisherObject`. Its `resume` options are in milliseconds too: `retentionSeconds` became `ttl`, and `cleanupIntervalSeconds` became `cleanupInterval`.
 
 ### Rate Limit
 
@@ -1299,6 +1299,38 @@ const example = os
 
 </CodeGroup>
 
+Blocking mode is now a flat `timeout` option: replace `blockingUntilReady: { enabled: true, timeout }` with `timeout`.
+
+`UpstashRateLimiter` now takes an Upstash `Redis` client, like the other Upstash adapters, instead of an `@upstash/ratelimit` instance. It enforces a fixed window with `maxRequests` and `window`, shares counters with `RedisRateLimiter`, and no longer takes `waitUntil`.
+
+<CodeGroup>
+
+```ts v2
+import { UpstashRateLimiter } from '@orpc/ratelimit/upstash'
+import { Redis } from '@upstash/redis'
+
+const limiter = new UpstashRateLimiter(Redis.fromEnv(), {
+  maxRequests: 10,
+  window: 60_000,
+  timeout: 5_000,
+})
+```
+
+```ts v1
+import { UpstashRatelimiter } from '@orpc/experimental-ratelimit/upstash-ratelimit'
+import { Ratelimit } from '@upstash/ratelimit'
+import { Redis } from '@upstash/redis'
+
+const limiter = new UpstashRatelimiter(new Ratelimit({
+  redis: Redis.fromEnv(),
+  limiter: Ratelimit.fixedWindow(10, '60 s'),
+}), {
+  blockingUntilReady: { enabled: true, timeout: 5_000 },
+})
+```
+
+</CodeGroup>
+
 The Cloudflare rate limiter moved to `@orpc/cloudflare`.
 
 ## Deprecated Alias Cheat Sheet