@procedures/client 0.2.3 → 0.4.0

package/dist/client/middleware/retry.d.ts

@@ -4,8 +4,10 @@
  * Protocol-agnostic retry with exponential backoff and jitter.
  * Works with any transport!
  */
-import type { ResponseItem, TypedClientMiddleware } from "../types.js";
+import type { Method, ResponseItem, TypedClientMiddleware } from "../types.js";
 import type { RetryContext } from "./contexts.js";
+import { type Clock } from "../../clock.js";
+import { type Duration } from "../../duration.js";
 /**
  * Retry middleware options.
  */
@@ -16,30 +18,62 @@ export interface RetryOptions {
      */
     maxRetries?: number;
     /**
-     * Base delay in milliseconds for exponential backoff.
+     * The clock of the backoff and of the budget (roadmap R35). The default is the clock of the
+     * platform. A test gives a fake clock.
+     */
+    clock?: Clock;
+    /**
+     * Base delay for exponential backoff, for example `ms(500)`.
      * Actual delay will be: baseDelay * 2^attempt + jitter
-     * @default 1000
+     * @default 1 second
      */
-    retryDelay?: number;
+    retryDelay?: Duration;
     /**
      * The factor of the delay from one attempt to the next.
      * @default 2
      */
     backoffMultiplier?: number;
     /**
-     * The longest delay between two attempts, in milliseconds.
+     * The longest delay between two attempts.
      * @default no limit
      */
-    maxDelay?: number;
+    maxDelay?: Duration;
     /**
-     * Maximum jitter as a fraction of the delay (0-1).
-     * Adds randomness to prevent thundering herd.
-     * @default 0.1 (10% jitter)
+     * The random part of each delay, from 0 to 1. With 1 (full jitter), the delay is a random time
+     * from 0 to the backoff, so the clients that failed together do not retry together. 0 gives the
+     * backoff exactly.
+     * @default 1 (full jitter; roadmap R12: before, 0.1 gave a delay within 10 percent of the backoff)
      */
     jitter?: number;
+    /**
+     * The retry budget of this middleware: each call adds `ratio` of a retry to the budget, and each
+     * retry takes one. When the budget is empty, an error goes to the caller without a retry, so a
+     * failing service gets at most `ratio` more requests, not `maxRetries` times more. Besides the
+     * budget, `minPerSecond` retries a second are always allowed. `false` turns the budget off.
+     * @default { ratio: 0.2, minPerSecond: 10 }
+     */
+    budget?: {
+        ratio?: number;
+        minPerSecond?: number;
+    } | false;
+    /**
+     * The calls that the middleware can send again after a try with an indeterminate outcome: the
+     * request left, and no answer came (a reset, a closed connection, the timeout of one try). The
+     * server can have run such a call, so only an idempotent call goes again (roadmap R1).
+     *
+     * - a function: true for an idempotent method. `idempotentIn(registry)` reads the effects of
+     *   the procedures that the client knows.
+     * - `true`: every call. Use it only with a server that removes duplicate calls by their
+     *   idempotency key (`ProcedureServer` does).
+     * - absent: only a call with `retry: { idempotent: true }` in its context.
+     *
+     * A try that did not leave the client (a refused connection) and an error that the server
+     * marks retryable go again in each case.
+     */
+    idempotent?: boolean | ((method: Method) => boolean | undefined);
     /**
      * Custom function to determine if a request should be retried.
-     * Takes precedence over Status.retryable flag.
+     * Takes precedence over Status.retryable flag. The rule of `idempotent` still applies.
      *
      * @param item - The response item
      * @param attempt - Current attempt number (0-indexed)
@@ -88,7 +122,7 @@ export interface RetryOptions {
  * @example
  * ```typescript
  * // Create middleware with defaults
- * client.use(createRetryMiddleware({ maxRetries: 3 }));
+ * client.use(createRetryMiddleware({ maxRetries: 3, retryDelay: ms(500) }));
  *
  * // Override per-call via context
  * await client.call(method, payload, {

package/dist/client/middleware/retry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../../src/client/middleware/retry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAA+B,YAAY,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlD;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IAExE;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,CACd,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,EAC3B,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAEtG;;;;;OAKG;IACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC5E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,YAAiB,GAAG,qBAAqB,CAAC,YAAY,EAAE,EAAE,CAAC,CAiIzG"}
+{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../../src/client/middleware/retry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAA+B,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC5G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAa,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvD,OAAO,EAA0B,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG1E;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;;;OAIG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,KAAK,CAAC;IAE3D;;;;;;;;;;;;;OAaG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,GAAG,SAAS,CAAC,CAAC;IAEjE;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IAExE;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,CACd,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,EAC3B,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAEtG;;;;;OAKG;IACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC5E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,YAAiB,GAAG,qBAAqB,CAAC,YAAY,EAAE,EAAE,CAAC,CA4MzG"}

package/dist/client/middleware/retry.js

@@ -4,7 +4,12 @@
  * Protocol-agnostic retry with exponential backoff and jitter.
  * Works with any transport!
  */
-import { abortedItem, sleep, thrownItem } from "./items.js";
+import { abortedItem, deliveryOf, retryAfterOf, sleep, thrownItem } from "./items.js";
+import { realClock } from "../../clock.js";
+import { backoffDelay } from "@mark1russell7/service/backoff";
+import { IDEMPOTENCY_KEY_METADATA, idempotencyKeyOf, newIdempotencyKey } from "../../procedures/idempotency.js";
+import { isDuration, optionalMs } from "../../duration.js";
+import { TIMER_DEFAULTS } from "../../timers.js";
 /**
  * Create retry middleware with exponential backoff and jitter.
  *
@@ -24,7 +29,7 @@ import { abortedItem, sleep, thrownItem } from "./items.js";
  * @example
  * ```typescript
  * // Create middleware with defaults
- * client.use(createRetryMiddleware({ maxRetries: 3 }));
+ * client.use(createRetryMiddleware({ maxRetries: 3, retryDelay: ms(500) }));
  *
  * // Override per-call via context
  * await client.call(method, payload, {
@@ -33,45 +38,112 @@ import { abortedItem, sleep, thrownItem } from "./items.js";
  * ```
  */
 export function createRetryMiddleware(options = {}) {
-    const { retryDelay: defaultRetryDelay = 1000, jitter: defaultJitter = 0.1, shouldRetry: customShouldRetry, onBeforeRetry, onAfterRetry, } = options;
-    const defaultMaxRetries = options.maxRetries ?? 3;
-    const defaultMultiplier = options.backoffMultiplier ?? 2;
-    const defaultMaxDelay = options.maxDelay ?? Number.POSITIVE_INFINITY;
-    /** The overrides of one call (`retry: { ... }` in its context). Before, only maxAttempts was read. */
+    const defaultRetryDelay = optionalMs(options.retryDelay, "retryDelay") ?? TIMER_DEFAULTS.retry.retryDelayMs;
+    const { jitter: defaultJitter = 1, shouldRetry: customShouldRetry, onBeforeRetry, onAfterRetry, idempotent: idempotentOption, } = options;
+    const defaultMaxRetries = options.maxRetries ?? TIMER_DEFAULTS.retry.maxRetries;
+    const defaultMultiplier = options.backoffMultiplier ?? TIMER_DEFAULTS.retry.backoffMultiplier;
+    const defaultMaxDelay = optionalMs(options.maxDelay, "maxDelay") ?? TIMER_DEFAULTS.retry.maxDelayMs;
+    /**
+     * The overrides of one call (`retry: { ... }` in its context), with the delays in milliseconds.
+     * Before, only maxAttempts was read.
+     */
     const overridesOf = (value) => {
         if (typeof value !== "object" || value === null)
             return {};
         const out = {};
-        for (const key of ["maxAttempts", "delay", "backoffMultiplier", "maxDelay"]) {
+        for (const key of ["maxAttempts", "backoffMultiplier"]) {
             const field = value[key];
             if (typeof field === "number" && Number.isFinite(field) && field >= 0)
                 out[key] = field;
         }
+        for (const key of ["delay", "maxDelay"]) {
+            const field = value[key];
+            if (field !== undefined) {
+                if (!isDuration(field))
+                    throw new TypeError(`retry.${key} must be a duration such as ms(500) (roadmap R11)`);
+                out[key] = optionalMs(field, `retry.${key}`);
+            }
+        }
         return out;
     };
-    /** The backoff delay of an attempt: exponential, with jitter, at most the maximum delay */
-    const backoffDelay = (attempt, overrides) => {
-        const baseDelay = (overrides.delay ?? defaultRetryDelay) * Math.pow(overrides.backoffMultiplier ?? defaultMultiplier, attempt);
-        const jitterAmount = defaultJitter * baseDelay * (Math.random() * 2 - 1);
-        return Math.max(0, Math.min(overrides.maxDelay ?? defaultMaxDelay, baseDelay + jitterAmount));
+    /**
+     * The backoff delay of an attempt (from 0): exponential, at most the maximum delay, with the
+     * random part of `jitter` (full jitter by default). The backoff is `backoffDelay` of
+     * `@mark1russell7/service/backoff` (roadmap R37), whose tries start at 1.
+     */
+    const retryDelayOf = (attempt, overrides) => backoffDelay({
+        base: overrides.delay ?? defaultRetryDelay,
+        factor: overrides.backoffMultiplier ?? defaultMultiplier,
+        cap: overrides.maxDelay ?? defaultMaxDelay,
+        jitter: { kind: "subtract", fraction: Math.min(1, Math.max(0, defaultJitter)) },
+    }, attempt + 1);
+    // The retry budget (R12): a balance of retries that each call fills by `ratio`
+    const budget = options.budget === false ? undefined : { ratio: options.budget?.ratio ?? 0.2, minPerSecond: options.budget?.minPerSecond ?? 10 };
+    const budgetCap = budget ? Math.max(1, budget.ratio * 100) : 0;
+    let balance = budgetCap;
+    const clock = options.clock ?? realClock;
+    let secondStart = clock.now();
+    let retriesThisSecond = 0;
+    /** This function takes one retry from the budget, or gives false when the budget is empty. */
+    const takeRetry = () => {
+        if (!budget)
+            return true;
+        if (balance >= 1) {
+            balance -= 1;
+            return true;
+        }
+        const now = clock.now();
+        if (now - secondStart >= 1000) {
+            secondStart = now;
+            retriesThisSecond = 0;
+        }
+        if (retriesThisSecond < budget.minPerSecond) {
+            retriesThisSecond++;
+            return true;
+        }
+        return false;
+    };
+    /** True when the call can go again after an indeterminate try: the call says so, or the option. */
+    const isIdempotent = (method, value) => {
+        const own = typeof value === "object" && value !== null ? value.idempotent : undefined;
+        if (typeof own === "boolean")
+            return own;
+        if (typeof idempotentOption === "function")
+            return idempotentOption(method) === true;
+        return idempotentOption === true;
     };
     return (next) => {
         return async function* (context) {
             // Read from metadata first (user-provided context), then fall back to options
-            const overrides = overridesOf(context.message.metadata.retry);
-            const maxRetries = overrides.maxAttempts ?? defaultMaxRetries;
-            const shouldRetryItem = (item, attempt) => customShouldRetry
-                ? customShouldRetry(item, attempt)
-                : item.status.type === "error" && item.status.retryable;
+            const given = context.message.metadata.retry;
+            const overrides = overridesOf(given);
+            // maxAttempts counts the attempts: the first try and the retries (R12: before, the override
+            // was used as the number of retries, against its name and its documentation)
+            const maxRetries = overrides.maxAttempts !== undefined ? Math.max(0, overrides.maxAttempts - 1) : defaultMaxRetries;
+            if (budget)
+                balance = Math.min(budgetCap, balance + budget.ratio);
+            const idempotent = isIdempotent(context.message.method, context.message.metadata.retry);
+            const shouldRetryItem = (item, attempt) => {
+                const wanted = customShouldRetry
+                    ? customShouldRetry(item, attempt)
+                    : item.status.type === "error" && item.status.retryable;
+                // A request that can have run goes again only when the call is idempotent (R1). Before,
+                // a reset or a timeout of one try sent a write again.
+                return wanted && (deliveryOf(item) !== "indeterminate" || idempotent);
+            };
             const signal = context.message.signal;
             const baseId = context.message.id;
+            // One key for all the tries of the call: a server that removes duplicates runs it one time
+            const idempotencyKey = idempotencyKeyOf(context.message.metadata) ?? newIdempotencyKey();
+            context.message.metadata[IDEMPOTENCY_KEY_METADATA] = idempotencyKey;
             let attempt = 0;
             for (;;) {
                 // Update retry metadata with current state
                 context.message.metadata.retry = {
-                    ...overrides,
+                    ...(typeof given === "object" && given !== null ? given : {}),
                     attempt,
-                    maxAttempts: maxRetries,
+                    maxAttempts: maxRetries + 1,
+                    idempotent,
                 };
                 // Each attempt gets its own request id. The id correlates the frames of one attempt
                 // on the wire: a cancelled attempt can still answer under its id (deep dive TRN-8/9).
@@ -120,7 +192,15 @@ export function createRetryMiddleware(options = {}) {
                     }
                     return;
                 }
-                let delay = backoffDelay(attempt, overrides);
+                // The budget is empty: the error goes to the caller (R12)
+                if (!takeRetry()) {
+                    yield retryItem;
+                    if (onAfterRetry)
+                        await onAfterRetry(false, attempt);
+                    return;
+                }
+                // A server that asks for a wait (Retry-After) gets at least that wait (R12)
+                let delay = Math.max(retryDelayOf(attempt, overrides), retryAfterOf(retryItem) ?? 0);
                 // Before retry hook
                 if (onBeforeRetry) {
                     const hookResult = await onBeforeRetry(retryItem, attempt);
@@ -138,7 +218,7 @@ export function createRetryMiddleware(options = {}) {
                     }
                 }
                 // The backoff stops at once when the caller aborts (deep dive TRN-8)
-                if (!(await sleep(delay, signal))) {
+                if (!(await sleep(delay, signal, clock))) {
                     yield abortedItem(context.message.id);
                     return;
                 }

package/dist/client/middleware/retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/client/middleware/retry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAsE5D;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAO,GAAiB,EAAE;IAC9D,MAAM,EACJ,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACpC,MAAM,EAAE,aAAa,GAAG,GAAG,EAC3B,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EACb,YAAY,GACb,GAAG,OAAO,CAAC;IACZ,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC;IAClD,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC,iBAAiB,CAAC;IAErE,sGAAsG;IACtG,MAAM,WAAW,GAAG,CAAC,KAAc,EAAoG,EAAE;QACvI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAC3D,MAAM,GAAG,GAAqG,EAAE,CAAC;QACjH,KAAK,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,mBAAmB,EAAE,UAAU,CAAU,EAAE,CAAC;YACrF,MAAM,KAAK,GAAI,KAAiC,CAAC,GAAG,CAAC,CAAC;YACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC1F,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,2FAA2F;IAC3F,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,SAAyC,EAAU,EAAE;QAC1F,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,KAAK,IAAI,iBAAiB,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,IAAI,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAC/H,MAAM,YAAY,GAAG,aAAa,GAAG,SAAS,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,IAAI,eAAe,EAAE,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC;IAEF,OAAO,CAAa,IAA8B,EAA4B,EAAE;QAC9E,OAAO,KAAK,SAAS,CAAC,EAAE,OAA4B;YAClD,8EAA8E;YAC9E,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC9D,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,IAAI,iBAAiB,CAAC;YAC9D,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAE,OAAe,EAAW,EAAE,CAC7E,iBAAiB;gBACf,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC;gBAClC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YACtC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAElC,IAAI,OAAO,GAAG,CAAC,CAAC;YAChB,SAAS,CAAC;gBACR,2CAA2C;gBAC3C,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG;oBAC/B,GAAG,SAAS;oBACZ,OAAO;oBACP,WAAW,EAAE,UAAU;iBACxB,CAAC;gBACF,oFAAoF;gBACpF,sFAAsF;gBACtF,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,SAAS,OAAO,EAAE,CAAC;gBAE1E,oCAAoC;gBACpC,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;oBACpB,MAAM,WAAW,CAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC5C,OAAO;gBACT,CAAC;gBAED,iFAAiF;gBACjF,gFAAgF;gBAChF,iFAAiF;gBACjF,iEAAiE;gBACjE,IAAI,OAAO,GAAG,KAAK,CAAC;gBACpB,IAAI,QAAwC,CAAC;gBAC7C,IAAI,SAAyC,CAAC;gBAC9C,IAAI,CAAC;oBACH,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;wBACvC,IAAI,CAAC,OAAO,IAAI,OAAO,GAAG,UAAU,IAAI,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;4BACvE,SAAS,GAAG,IAAI,CAAC;4BACjB,MAAM;wBACR,CAAC;wBACD,OAAO,GAAG,IAAI,CAAC;wBACf,QAAQ,GAAG,IAAI,CAAC;wBAChB,MAAM,IAAI,CAAC;oBACb,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,SAAS,GAAG,MAAM,EAAE,OAAO,IAAI,CAAC,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;oBAC7F,IAAI,OAAO,IAAI,SAAS,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;wBAClD,MAAM,KAAK,CAAC;oBACd,CAAC;oBACD,mFAAmF;oBACnF,+EAA+E;oBAC/E,mDAAmD;oBACnD,MAAM,IAAI,GAAG,UAAU,CAAO,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;oBACzD,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;wBACpC,MAAM,KAAK,CAAC;oBACd,CAAC;oBACD,SAAS,GAAG,IAAI,CAAC;gBACnB,CAAC;gBAED,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC5B,sDAAsD;oBACtD,IAAI,YAAY,EAAE,CAAC;wBACjB,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,OAAO,CAAC,CAAC;oBACnE,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,IAAI,KAAK,GAAG,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBAE7C,oBAAoB;gBACpB,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;oBAC3D,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;wBAC5B,yDAAyD;wBACzD,MAAM,SAAS,CAAC;wBAChB,IAAI,YAAY,EAAE,CAAC;4BACjB,MAAM,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;wBACrC,CAAC;wBACD,OAAO;oBACT,CAAC;oBAED,uCAAuC;oBACvC,IAAI,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;wBACrC,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC;oBAC7B,CAAC;gBACH,CAAC;gBAED,qEAAqE;gBACrE,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;oBAClC,MAAM,WAAW,CAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC5C,OAAO;gBACT,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/client/middleware/retry.ts"],"names":[],"mappings":"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"}

package/dist/client/middleware/timeout.d.ts

@@ -6,21 +6,22 @@
  */
 import type { TypedClientMiddleware } from "../types.js";
 import type { TimeoutContext } from "./contexts.js";
+import { type Duration } from "../../duration.js";
 /**
  * Timeout middleware options.
  */
 export interface TimeoutOptions {
     /**
-     * Timeout in milliseconds for the entire request (including retries).
+     * The time of the entire request (including retries), for example `seconds(10)`.
      * @default undefined (no overall timeout)
      */
-    overall?: number;
+    overall?: Duration | undefined;
     /**
-     * Timeout in milliseconds for each individual attempt.
+     * The time of each individual attempt, for example `seconds(2)`.
      * Useful with retry middleware for per-attempt timeouts.
      * @default undefined (no per-attempt timeout)
      */
-    perAttempt?: number;
+    perAttempt?: Duration | undefined;
     /**
      * Custom timeout error message.
      * @default "Request timeout"
@@ -41,11 +42,11 @@ export interface TimeoutOptions {
  * @example
  * ```typescript
  * // Create middleware with default timeout
- * client.use(createOverallTimeoutMiddleware({ overall: 5000 }));
+ * client.use(createOverallTimeoutMiddleware({ overall: seconds(5) }));
  *
  * // Override per-call via context
  * await client.call(method, payload, {
- *   context: { timeout: { overall: 10000 } }
+ *   context: { timeout: { overall: seconds(10) } }
  * });
  * ```
  */
@@ -64,11 +65,11 @@ export declare function createOverallTimeoutMiddleware(options: Pick<TimeoutOpti
  * @example
  * ```typescript
  * // Create middleware with default timeout
- * client.use(createTimeoutMiddleware({ perAttempt: 1000 }));
+ * client.use(createTimeoutMiddleware({ perAttempt: seconds(1) }));
  *
  * // Override per-call via context
  * await client.call(method, payload, {
- *   context: { timeout: { perAttempt: 2000 } }
+ *   context: { timeout: { perAttempt: seconds(2) } }
  * });
  * ```
  */
@@ -76,15 +77,17 @@ export declare function createTimeoutMiddleware(options: Pick<TimeoutOptions, "p
 /**
  * Create combined timeout middleware with both overall and per-attempt timeouts.
  *
+ * @deprecated Use `resilience({ overall, perAttempt, retry })`. This function puts the two
+ * timeouts in one slot, so a retry middleware that you add with another `use()` cannot sit
+ * between them: the retry is outside both, or inside both. `resilience` puts the retry between
+ * them (roadmap R10).
+ *
  * @param options - Timeout configuration
  * @returns Middleware function
  *
  * @example
  * ```typescript
- * client.use(createCombinedTimeoutMiddleware({
- *   overall: 5000,     // 5 seconds total
- *   perAttempt: 1000   // 1 second per attempt
- * }));
+ * client.use(resilience({ overall: seconds(5), perAttempt: seconds(1), retry: { maxRetries: 2 } }));
  * ```
  */
 export declare function createCombinedTimeoutMiddleware(options: TimeoutOptions): TypedClientMiddleware<TimeoutContext, {}>;

package/dist/client/middleware/timeout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../src/client/middleware/timeout.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAA+D,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEtH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA2JD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,SAAS,CAAC,GAAG,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAmB9I;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,GAAG,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAmB1I;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,cAAc,GAAG,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAmBlH"}
+{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../src/client/middleware/timeout.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAA6C,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAE/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAElC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAgKD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,SAAS,CAAC,GAAG,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAqB9I;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,GAAG,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAyB1I;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,cAAc,GAAG,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAGlH"}

package/dist/client/middleware/timeout.js

@@ -4,7 +4,10 @@
  * Protocol-agnostic timeout handling with per-request and overall timeouts.
  * Works with any transport!
  */
-import { ABORTED_FIRST, errorItem, nextOrAbort } from "./items.js";
+import { ABORTED_FIRST, abortedItem, errorItem, nextOrAbort, withDelivery } from "./items.js";
+import { deadlineOf, narrowDeadline, restoreDeadline } from "../deadline.js";
+import { resilience } from "./resilience.js";
+import { optionalMs } from "../../duration.js";
 /**
  * Compose multiple AbortSignals into one.
  *
@@ -55,15 +58,16 @@ function composeAbortSignals(...signals) {
             // Fall through to manual composition if AbortSignal.any() fails
         }
     }
-    // Fallback: Manual composition for older environments
+    // Fallback: Manual composition for older environments. The composed signal keeps the reason of
+    // the signal that aborted, as with AbortSignal.any() (before, it got a new AbortError).
     const controller = new AbortController();
     const abortListeners = [];
     for (const signal of validSignals) {
         if (signal.aborted) {
-            controller.abort();
+            controller.abort(signal.reason);
             break;
         }
-        const listener = () => controller.abort();
+        const listener = () => controller.abort(signal.reason);
         signal.addEventListener("abort", listener, { once: true });
         abortListeners.push(() => signal.removeEventListener("abort", listener));
     }
@@ -77,7 +81,8 @@ function composeAbortSignals(...signals) {
 /**
  * Run `next` with a timeout. When the time runs out, the request's signal aborts, and the
  * reader gets one TIMEOUT error item in place of the transport's ABORTED item or thrown error.
- * The middleware does not wait for a transport that ignores the signal.
+ * The middleware does not wait for a transport that ignores the signal: not after the timeout,
+ * and not after an abort of the caller, which gives an ABORTED item.
  *
  * Before, the middleware waited for a thrown error, but the transports yield error items: the
  * reader got "ABORTED" (not retryable), so a per-attempt timeout with retry never retried, and
@@ -86,47 +91,49 @@ function composeAbortSignals(...signals) {
 async function* runWithTimeout(next, context, ms, message, retryable) {
     const timeoutController = new AbortController();
     const timeoutId = setTimeout(() => timeoutController.abort(), ms);
+    // The overall timeout is the deadline of the call: the transport sends its remaining time to
+    // the server (roadmap R10). The timeout of one try is not: the server keeps a keyed write
+    // until the next try can get its result, and the request signal stops another call.
+    const deadlineBefore = retryable ? deadlineOf(context.message.metadata) : narrowDeadline(context.message.metadata, Date.now() + ms);
     // Compose with existing signal
     const originalSignal = context.message.signal;
     const { controller: composedController, cleanup } = composeAbortSignals(originalSignal, timeoutController.signal);
     context.message.signal = composedController.signal;
     const timedOut = () => timeoutController.signal.aborted && !originalSignal?.aborted;
-    const timeoutItem = () => errorItem(context.message.id, "TIMEOUT", message, retryable);
+    // The request left before the time ran out: the server can still run it (R1)
+    const timeoutItem = () => withDelivery(errorItem(context.message.id, "TIMEOUT", message, retryable), "indeterminate");
     const iterator = next(context)[Symbol.asyncIterator]();
     // "running": a next() may be pending; "done": the iterator ended; "abandoned": the timeout won
     let phase = "running";
     try {
         for (;;) {
-            const result = await nextOrAbort(iterator, timeoutController.signal);
+            // The timeout and the abort of the caller both end the wait (roadmap R30: before, the wait
+            // ignored the abort of the caller, so a transport that ignored the signal kept the caller
+            // waiting until the timeout, and the caller got TIMEOUT for its own abort)
+            const result = await nextOrAbort(iterator, composedController.signal);
             if (result === ABORTED_FIRST) {
                 phase = "abandoned";
-                // The transport did not stop in time: end it in the background, and give the timeout
+                // The transport did not stop in time: end it in the background, and give the timeout or the abort
                 void Promise.resolve(iterator.return?.()).catch(() => undefined);
-                yield timeoutItem();
+                yield timedOut() ? timeoutItem() : abortedItem(context.message.id);
                 return;
             }
             if (result.done) {
                 phase = "done";
                 return;
             }
-            if (result.value.status.type === "error" && timedOut()) {
-                // The transport saw the aborted signal and reported ABORTED: it is a timeout
-                yield timeoutItem();
-                return;
-            }
+            // An item or an error of the transport comes before the abort. `nextOrAbort` adds its abort
+            // listener before it calls `next()`, so a later abort gives ABORTED_FIRST, not an item.
             yield result.value;
         }
     }
     catch (error) {
         phase = "done";
-        if (timedOut()) {
-            yield timeoutItem();
-            return;
-        }
         throw error;
     }
     finally {
         clearTimeout(timeoutId);
+        restoreDeadline(context.message.metadata, deadlineBefore);
         cleanup();
         // Restore the caller's original signal; we only swapped in the composed signal for this
         // attempt. Leaving the (possibly aborted) composed signal in place poisons subsequent
@@ -156,21 +163,22 @@ async function* runWithTimeout(next, context, ms, message, retryable) {
  * @example
  * ```typescript
  * // Create middleware with default timeout
- * client.use(createOverallTimeoutMiddleware({ overall: 5000 }));
+ * client.use(createOverallTimeoutMiddleware({ overall: seconds(5) }));
  *
  * // Override per-call via context
  * await client.call(method, payload, {
- *   context: { timeout: { overall: 10000 } }
+ *   context: { timeout: { overall: seconds(10) } }
  * });
  * ```
  */
 export function createOverallTimeoutMiddleware(options) {
-    const { overall: defaultOverall, message = "Overall request timeout" } = options;
+    const { message = "Overall request timeout" } = options;
+    const defaultOverall = optionalMs(options.overall, "overall");
     return (next) => {
         return async function* (context) {
             // Read from metadata first (user-provided context), then fall back to options
-            const overall = context.message.metadata.timeout?.overall
-                ?? defaultOverall;
+            const overall = optionalMs(context.message.metadata.timeout?.overall, "timeout.overall") ??
+                defaultOverall;
             if (!overall) {
                 // No timeout - passthrough
                 yield* next(context);
@@ -195,59 +203,53 @@ export function createOverallTimeoutMiddleware(options) {
  * @example
  * ```typescript
  * // Create middleware with default timeout
- * client.use(createTimeoutMiddleware({ perAttempt: 1000 }));
+ * client.use(createTimeoutMiddleware({ perAttempt: seconds(1) }));
  *
  * // Override per-call via context
  * await client.call(method, payload, {
- *   context: { timeout: { perAttempt: 2000 } }
+ *   context: { timeout: { perAttempt: seconds(2) } }
  * });
  * ```
  */
 export function createTimeoutMiddleware(options) {
-    const { perAttempt: defaultPerAttempt, message = "Request timeout" } = options;
+    const { message = "Request timeout" } = options;
+    const defaultPerAttempt = optionalMs(options.perAttempt, "perAttempt");
     return (next) => {
         return async function* (context) {
             // Read from metadata first (user-provided context), then fall back to options
-            const perAttempt = context.message.metadata.timeout?.perAttempt
-                ?? defaultPerAttempt;
+            const perAttempt = optionalMs(context.message.metadata.timeout?.perAttempt, "timeout.perAttempt") ??
+                defaultPerAttempt;
             if (!perAttempt) {
                 // No timeout - passthrough
                 yield* next(context);
                 return;
             }
+            // The limit of one try is at most the remaining time of the call (roadmap R10)
+            const deadline = deadlineOf(context.message.metadata);
+            const limit = deadline === undefined ? perAttempt : Math.max(0, Math.min(perAttempt, deadline - Date.now()));
             // A retry middleware outside this one can start a new attempt
-            yield* runWithTimeout(next, context, perAttempt, message, true);
+            yield* runWithTimeout(next, context, limit, message, true);
         };
     };
 }
 /**
  * Create combined timeout middleware with both overall and per-attempt timeouts.
  *
+ * @deprecated Use `resilience({ overall, perAttempt, retry })`. This function puts the two
+ * timeouts in one slot, so a retry middleware that you add with another `use()` cannot sit
+ * between them: the retry is outside both, or inside both. `resilience` puts the retry between
+ * them (roadmap R10).
+ *
  * @param options - Timeout configuration
  * @returns Middleware function
  *
  * @example
  * ```typescript
- * client.use(createCombinedTimeoutMiddleware({
- *   overall: 5000,     // 5 seconds total
- *   perAttempt: 1000   // 1 second per attempt
- * }));
+ * client.use(resilience({ overall: seconds(5), perAttempt: seconds(1), retry: { maxRetries: 2 } }));
  * ```
  */
 export function createCombinedTimeoutMiddleware(options) {
     const { overall, perAttempt, message = "Request timeout" } = options;
-    return (next) => {
-        // Compose both timeout middlewares
-        let composed = next;
-        if (perAttempt) {
-            const perAttemptMiddleware = createTimeoutMiddleware({ perAttempt, message: `${message} (per-attempt)` });
-            composed = perAttemptMiddleware(composed);
-        }
-        if (overall) {
-            const overallMiddleware = createOverallTimeoutMiddleware({ overall, message: `${message} (overall)` });
-            composed = overallMiddleware(composed);
-        }
-        return composed;
-    };
+    return resilience({ overall, perAttempt, message });
 }
 //# sourceMappingURL=timeout.js.map