@procedures/client 0.2.2 → 0.3.0

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,23 +91,31 @@ 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) {
@@ -127,6 +140,7 @@ async function* runWithTimeout(next, context, ms, message, retryable) {
     }
     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 +170,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 +210,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

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

@@ -1 +1 @@
-{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../src/client/middleware/timeout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../src/client/middleware/timeout.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../../src/client/middleware/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,sDAAsD;IACtD,eAAe,CAAC,EAAE,MAAM,MAAM,CAAC;IAE/B,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,MAAM,CAAC;IAE9B,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAEnE,+BAA+B;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AASD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,cAAmB,GAC3B,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAsC3C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,IAAI,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAWzF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAWP"}
+{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../../src/client/middleware/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,sDAAsD;IACtD,eAAe,CAAC,EAAE,MAAM,MAAM,CAAC;IAE/B,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,MAAM,CAAC;IAE9B,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAEnE,+BAA+B;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AASD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,cAAmB,GAC3B,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CA8C3C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,IAAI,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC,CAWzF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAWP"}

package/dist/client/middleware/tracing.js

@@ -11,6 +11,7 @@
  *
  * Compatible with OpenTelemetry, Jaeger, and custom tracing systems.
  */
+import { TRACEPARENT_METADATA_KEY, formatTraceparent, isW3cIds, newSpanId, newTraceId, parseTraceparent } from "../../tracing/traceparent.js";
 /**
  * Generate a simple unique ID (UUID v4 subset)
  */
@@ -74,12 +75,14 @@ function generateId() {
  * ```
  */
 export function createTracingMiddleware(options = {}) {
-    const { generateTraceId = generateId, generateSpanId = generateId, getCurrentTrace, serviceName, } = options;
+    // W3C ids by default, so the server continues the trace (roadmap R16)
+    const { generateTraceId = newTraceId, generateSpanId = newSpanId, getCurrentTrace, serviceName, } = options;
     return (next) => async function* (context) {
         // Check if there's already tracing metadata
         if (!context.message.metadata.tracing) {
-            // Try to get current trace context
-            const currentTrace = getCurrentTrace?.();
+            // Try to get current trace context: the function of the options, or the trace context of
+            // the caller (a call that a handler makes on a server carries the span of that handler)
+            const currentTrace = getCurrentTrace?.() ?? parseTraceparent(context.message.metadata[TRACEPARENT_METADATA_KEY]) ?? null;
             if (currentTrace) {
                 // Continue existing trace (create child span)
                 context.message.metadata.tracing = {
@@ -100,6 +103,11 @@ export function createTracingMiddleware(options = {}) {
                 context.message.metadata["serviceName"] = serviceName;
             }
         }
+        // The W3C trace context of the call: the server continues this trace (R16)
+        const tracing = context.message.metadata.tracing;
+        if (tracing && isW3cIds(tracing.traceId, tracing.spanId)) {
+            context.message.metadata[TRACEPARENT_METADATA_KEY] = formatTraceparent(tracing.traceId, tracing.spanId);
+        }
         // Continue middleware chain
         yield* next(context);
     };

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

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/client/middleware/tracing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/client/middleware/tracing.ts"],"names":[],"mappings":"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"}

package/dist/client/types.d.ts

@@ -22,7 +22,13 @@ export interface Method {
     service: string;
     /** Operation name (e.g., "get", "create", "update", "delete", "watch") */
     operation: string;
-    /** Optional version (e.g., "v1", "v2") */
+    /**
+     * Optional version (e.g., "v1", "v2").
+     *
+     * @deprecated The wire protocol (v1, roadmap R25) has no version of a procedure: the server
+     * ignores this field. A URL strategy can put it in the path. Use a new path for a procedure
+     * that changes in a way that is not compatible.
+     */
     version?: string;
 }
 /**
@@ -58,6 +64,8 @@ export interface Metadata {
     retry?: {
         attempt: number;
         maxAttempts: number;
+        /** True: a second run of the call changes nothing more, so a retry is safe */
+        idempotent?: boolean;
     };
     /** Extensible for custom fields */
     [key: string]: unknown;

package/dist/client/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD;;;;;;;;GAQG;AACH,MAAM,WAAW,MAAM;IACrB,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAEhB,0EAA0E;IAC1E,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,QAAQ;IACvB,kCAAkC;IAClC,OAAO,CAAC,EAAE;QACR,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IAEF,2CAA2C;IAC3C,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IAEF,4BAA4B;IAC5B,OAAO,CAAC,EAAE;QACR,8CAA8C;QAC9C,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,wDAAwD;QACxD,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF,oDAAoD;IACpD,KAAK,CAAC,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,8EAA8E;QAC9E,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IAEF,mCAAmC;IACnC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,WAAW,OAAO,CAAC,QAAQ,GAAG,OAAO;IACzC,oCAAoC;IACpC,EAAE,EAAE,MAAM,CAAC;IAEX,uBAAuB;IACvB,MAAM,EAAE,MAAM,CAAC;IAEf,6BAA6B;IAC7B,OAAO,EAAE,QAAQ,CAAC;IAElB,gDAAgD;IAChD,QAAQ,EAAE,QAAQ,CAAC;IAEnB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,MAAM,MAAM,GACd;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B,CAAC;AAEN;;;;;GAKG;AACH,MAAM,WAAW,YAAY,CAAC,QAAQ,GAAG,OAAO;IAC9C,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAC;IAEX,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IAEf,8BAA8B;IAC9B,OAAO,EAAE,QAAQ,CAAC;IAElB,gDAAgD;IAChD,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,SAAS;IACxB,kEAAkE;IAClE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IAE5E;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa,CAAC,IAAI,GAAG,OAAO;IAC3C,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,MAAM,YAAY,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,GAAG,OAAO,IAAI,CACzD,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,KACzB,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;AAEvC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,MAAM,gBAAgB,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,GAAG,OAAO,IAAI,CAC7D,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,KAC3B,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAE9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,MAAM,qBAAqB,CAC/B,SAAS,GAAG,EAAE,EACd,SAAS,GAAG,EAAE,EACd,IAAI,GAAG,OAAO,EACd,IAAI,GAAG,OAAO,IACZ,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG;IACjC;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAEhC;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,SAAS,qBAAqB,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GACvF,CAAC,GACD,EAAE,CAAC;AAEP;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GACvF,CAAC,GACD,EAAE,CAAC;AAEP;;;GAGG;AACH,MAAM,MAAM,kBAAkB,CAC5B,WAAW,SAAS,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC7D,mBAAmB,IACjB,kBAAkB,CAAC,WAAW,CAAC,SAAS,mBAAmB,GAC3D,WAAW,GACX,KAAK,CAAC;AAEV;;;GAGG;AACH,MAAM,MAAM,iBAAiB,CAC3B,WAAW,SAAS,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC7D,mBAAmB,IACjB,mBAAmB,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;AAE1D;;GAEG;AACH,qBAAa,WAAY,SAAQ,KAAK;aAElB,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC;aAC1C,UAAU,EAAE,MAAM;IAFpC,YACkB,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC,EAC1C,UAAU,EAAE,MAAM,EAInC;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;CACF;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,+BAA+B;IAC/B,SAAS,EAAE,SAAS,CAAC;IAErB,+CAA+C;IAC/C,eAAe,CAAC,EAAE,QAAQ,CAAC;IAE3B,0DAA0D;IAC1D,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;OAGG;IACH,YAAY,CAAC,EAAE,SAAS,WAAW,EAAE,CAAC;IAEtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB,2DAA2D;IAC3D,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC"}

package/dist/client/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuTH;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,KAAK;IAElB,MAAM;IACN,UAAU;IAF5B,YACkB,MAA0C,EAC1C,UAAkB;QAElC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;sBAHN,MAAM;0BACN,UAAU;QAG1B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;IAC/B,CAAC;CACF"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA+TH;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,KAAK;IAElB,MAAM;IACN,UAAU;IAF5B,YACkB,MAA0C,EAC1C,UAAkB;QAElC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;sBAHN,MAAM;0BACN,UAAU;QAG1B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;IAC/B,CAAC;CACF"}

package/dist/clock.d.ts

@@ -0,0 +1,19 @@
+/**
+ * The clock of the core (roadmap R35). The retry, the circuit breaker and the WebSocket client
+ * read the time and start their timers only through a clock. Thus a test gives a fake clock, and
+ * the timing is exact and repeatable.
+ *
+ * The clock comes from `@mark1russell7/service/clock` (roadmap R37). The entry imports nothing
+ * else, and it has 228 bytes of gzip. The `fakeClock` of `@mark1russell7/service/testing` fits here.
+ * A `Cancel` of the platform also has `unref`. The circuit breaker uses it for its reset: a breaker
+ * must not keep a process alive for its reset time (BUGS-2026-07 M4).
+ */
+import { type Cancel, type Clock } from "@mark1russell7/service/clock";
+export type { Cancel, Clock };
+/**
+ * The clock of the platform: `performance.now()` and `setTimeout`. Its timers keep a Node process
+ * alive, as `setTimeout` does: a script that waits for a retry does not end during the wait. The
+ * `realClock` of the service package is different: its timers do not keep a process alive.
+ */
+export declare const realClock: Clock;
+//# sourceMappingURL=clock.d.ts.map

package/dist/clock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clock.d.ts","sourceRoot":"","sources":["../src/clock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAiB,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEtF,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAE9B;;;;GAIG;AACH,eAAO,MAAM,SAAS,EAAE,KAAuB,CAAC"}

package/dist/clock.js

@@ -0,0 +1,18 @@
+/**
+ * The clock of the core (roadmap R35). The retry, the circuit breaker and the WebSocket client
+ * read the time and start their timers only through a clock. Thus a test gives a fake clock, and
+ * the timing is exact and repeatable.
+ *
+ * The clock comes from `@mark1russell7/service/clock` (roadmap R37). The entry imports nothing
+ * else, and it has 228 bytes of gzip. The `fakeClock` of `@mark1russell7/service/testing` fits here.
+ * A `Cancel` of the platform also has `unref`. The circuit breaker uses it for its reset: a breaker
+ * must not keep a process alive for its reset time (BUGS-2026-07 M4).
+ */
+import { platformClock } from "@mark1russell7/service/clock";
+/**
+ * The clock of the platform: `performance.now()` and `setTimeout`. Its timers keep a Node process
+ * alive, as `setTimeout` does: a script that waits for a retry does not end during the wait. The
+ * `realClock` of the service package is different: its timers do not keep a process alive.
+ */
+export const realClock = platformClock();
+//# sourceMappingURL=clock.js.map

package/dist/clock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clock.js","sourceRoot":"","sources":["../src/clock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,aAAa,EAA2B,MAAM,8BAA8B,CAAC;AAItF;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAU,aAAa,EAAE,CAAC"}

package/dist/duration.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Typed durations (roadmap R11).
+ *
+ * Each public option of this package that is a time takes a `Duration`: a quantity of
+ * `@mark1russell7/quantity` with a time unit. A plain number is a type error, so `timeout: 5`
+ * cannot mean five milliseconds in one place and five seconds in another. The wire keeps
+ * milliseconds (`procedure-timeout`), and the internals convert each duration one time, when an
+ * option is read.
+ *
+ * `@mark1russell7/quantity` has no `Duration` type yet. This alias narrows its `Quantity` to the
+ * time units, so the type also refuses `{ value: 5, unit: "kg" }`.
+ */
+import { type Quantity } from "@mark1russell7/quantity";
+/** The canonical time units of `@mark1russell7/quantity` that a duration of this package uses. */
+export type TimeUnit = "ns" | "us" | "ms" | "s" | "min" | "h" | "d";
+/** A time: a quantity with a time unit. */
+export type Duration = Quantity & {
+    readonly unit: TimeUnit;
+};
+/** This function makes a duration of milliseconds. */
+export declare const ms: (value: number) => Duration;
+/** This function makes a duration of seconds. */
+export declare const seconds: (value: number) => Duration;
+/** This function makes a duration of minutes. */
+export declare const minutes: (value: number) => Duration;
+/** This function makes a duration of hours. */
+export declare const hours: (value: number) => Duration;
+/** True when a value is a duration: a finite number with a time unit. */
+export declare function isDuration(value: unknown): value is Duration;
+/**
+ * The number of milliseconds of a duration. A value that is not a duration (a plain number, or
+ * a quantity of another kind) throws a `TypeError` that names the option.
+ */
+export declare function toMs(duration: Duration, option?: string): number;
+/** The milliseconds of an optional duration, or undefined. */
+export declare function optionalMs(duration: Duration | undefined, option?: string): number | undefined;
+//# sourceMappingURL=duration.d.ts.map

package/dist/duration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"duration.d.ts","sourceRoot":"","sources":["../src/duration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAqB,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAE3E,kGAAkG;AAClG,MAAM,MAAM,QAAQ,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,GAAG,KAAK,GAAG,GAAG,GAAG,GAAG,CAAC;AAEpE,2CAA2C;AAC3C,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAI9D,sDAAsD;AACtD,eAAO,MAAM,EAAE,UAAW,MAAM,KAAG,QAA6C,CAAC;AACjF,iDAAiD;AACjD,eAAO,MAAM,OAAO,UAAW,MAAM,KAAG,QAA4C,CAAC;AACrF,iDAAiD;AACjD,eAAO,MAAM,OAAO,UAAW,MAAM,KAAG,QAA8C,CAAC;AACvF,+CAA+C;AAC/C,eAAO,MAAM,KAAK,UAAW,MAAM,KAAG,QAA4C,CAAC;AAEnF,yEAAyE;AACzE,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAI5D;AAED;;;GAGG;AACH,wBAAgB,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAa,GAAG,MAAM,CAOpE;AAED,8DAA8D;AAC9D,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE9F"}

package/dist/duration.js

@@ -0,0 +1,44 @@
+/**
+ * Typed durations (roadmap R11).
+ *
+ * Each public option of this package that is a time takes a `Duration`: a quantity of
+ * `@mark1russell7/quantity` with a time unit. A plain number is a type error, so `timeout: 5`
+ * cannot mean five milliseconds in one place and five seconds in another. The wire keeps
+ * milliseconds (`procedure-timeout`), and the internals convert each duration one time, when an
+ * option is read.
+ *
+ * `@mark1russell7/quantity` has no `Duration` type yet. This alias narrows its `Quantity` to the
+ * time units, so the type also refuses `{ value: 5, unit: "kg" }`.
+ */
+import { quantity, valueIn } from "@mark1russell7/quantity";
+const TIME_UNITS = new Set(["ns", "us", "ms", "s", "min", "h", "d"]);
+/** This function makes a duration of milliseconds. */
+export const ms = (value) => quantity(value, "ms");
+/** This function makes a duration of seconds. */
+export const seconds = (value) => quantity(value, "s");
+/** This function makes a duration of minutes. */
+export const minutes = (value) => quantity(value, "min");
+/** This function makes a duration of hours. */
+export const hours = (value) => quantity(value, "h");
+/** True when a value is a duration: a finite number with a time unit. */
+export function isDuration(value) {
+    if (value === null || typeof value !== "object")
+        return false;
+    const { value: amount, unit } = value;
+    return typeof amount === "number" && Number.isFinite(amount) && typeof unit === "string" && TIME_UNITS.has(unit);
+}
+/**
+ * The number of milliseconds of a duration. A value that is not a duration (a plain number, or
+ * a quantity of another kind) throws a `TypeError` that names the option.
+ */
+export function toMs(duration, option = "duration") {
+    if (!isDuration(duration)) {
+        throw new TypeError(`${option} must be a duration such as ms(500) or seconds(2), got ${JSON.stringify(duration)}. Plain numbers are not durations (roadmap R11).`);
+    }
+    return valueIn(duration, "ms");
+}
+/** The milliseconds of an optional duration, or undefined. */
+export function optionalMs(duration, option) {
+    return duration === undefined ? undefined : toMs(duration, option);
+}
+//# sourceMappingURL=duration.js.map

package/dist/duration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"duration.js","sourceRoot":"","sources":["../src/duration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAiB,MAAM,yBAAyB,CAAC;AAQ3E,MAAM,UAAU,GAAwB,IAAI,GAAG,CAAW,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAEpG,sDAAsD;AACtD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAa,EAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAa,CAAC;AACjF,iDAAiD;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAa,EAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAa,CAAC;AACrF,iDAAiD;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAa,EAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAa,CAAC;AACvF,+CAA+C;AAC/C,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,KAAa,EAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAa,CAAC;AAEnF,yEAAyE;AACzE,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAA4C,CAAC;IAC7E,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACnH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,IAAI,CAAC,QAAkB,EAAE,MAAM,GAAG,UAAU;IAC1D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,SAAS,CACjB,GAAG,MAAM,0DAA0D,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,kDAAkD,CAC9I,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,UAAU,CAAC,QAA8B,EAAE,MAAe;IACxE,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACrE,CAAC"}

package/dist/machines.d.ts

@@ -0,0 +1,90 @@
+/**
+ * The state machines of the core as data (roadmap R35): the connection of the WebSocket client
+ * and the circuit breaker. The documents have the format `mark1russell7.machine/1` of
+ * `@mark1russell7/algebra`. They are the specification, and the code implements them. Their knobs
+ * are the default times of the core (`TIMER_DEFAULTS`), and their timers say which knob gives each
+ * wait.
+ *
+ * The code reports each change of its state as a `MachineTransition` (the option `onTransition`).
+ * `replayTransitions()` replays the reports of a run against a document, so a test finds each
+ * change that the document does not allow. It uses `replay` of `@mark1russell7/algebra/replay`
+ * (roadmap R37). That entry imports nothing else, and it has 418 bytes of gzip.
+ */
+/** A change of state that the code reports. It has the fields of a lifecycle event of `@mark1russell7/service`. */
+export interface MachineTransition {
+    /** The id of the document. */
+    readonly machine: string;
+    /** The instance: one connection, one breaker. */
+    readonly instance: string;
+    readonly from: string;
+    readonly on: string;
+    readonly to: string;
+    /** The time of the clock of the instance, in milliseconds. */
+    readonly at: number;
+}
+/** A time of a timer: one knob, in a unit. */
+export interface MachineDuration {
+    readonly knob: string;
+    readonly unit: string;
+}
+/** A timer of a document: the events that start and stop it, and the event that it gives. */
+export interface MachineTimer {
+    readonly duration: MachineDuration;
+    readonly arms: readonly string[];
+    readonly cancels?: readonly string[] | undefined;
+    readonly fires: string;
+    /** A timer that starts again after it fires, with a longer wait each time. */
+    readonly backoff?: {
+        readonly resets: readonly string[];
+    } | undefined;
+    readonly note?: string | undefined;
+}
+/** A transition of a document. */
+export interface MachineTransitionDef {
+    readonly id: string;
+    readonly from: string | readonly string[];
+    readonly on: string | readonly string[];
+    readonly to: string;
+    readonly timer?: string | undefined;
+    readonly note?: string | undefined;
+}
+/** A machine document: the subset of `mark1russell7.machine/1` that the core uses. */
+export interface MachineDocument {
+    readonly format: "mark1russell7.machine/1";
+    readonly id: string;
+    readonly title: string;
+    readonly layer: "self";
+    readonly version: string;
+    readonly sources: ReadonlyArray<{
+        readonly ref: string;
+        readonly rung: "implemented";
+    }>;
+    readonly states: Readonly<Record<string, {
+        readonly initial?: boolean;
+        readonly final?: boolean;
+        readonly note?: string;
+    }>>;
+    readonly events: Readonly<Record<string, {
+        readonly kind: "rx" | "tx" | "app" | "timer" | "local";
+        readonly note?: string;
+    }>>;
+    readonly knobs: Readonly<Record<string, {
+        readonly key: string;
+        readonly scope: string;
+        readonly unit: string | null;
+        readonly default: number | null;
+    }>>;
+    readonly timers: Readonly<Record<string, MachineTimer>>;
+    readonly transitions: readonly MachineTransitionDef[];
+}
+/** The connection of the WebSocket client (`WebSocketTransport`). */
+export declare const WEBSOCKET_CONNECTION_MACHINE: MachineDocument;
+/** The circuit breaker (`createCircuitBreakerMiddleware`). */
+export declare const CIRCUIT_BREAKER_MACHINE: MachineDocument;
+/**
+ * This function replays the reported transitions of one document. Each instance starts in the
+ * state that its first transition leaves. Each transition must leave the state where the replay
+ * is, and the document must allow it. The function gives each disagreement.
+ */
+export declare function replayTransitions(machine: MachineDocument, events: readonly MachineTransition[]): string[];
+//# sourceMappingURL=machines.d.ts.map

package/dist/machines.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"machines.d.ts","sourceRoot":"","sources":["../src/machines.ts"],"names":[],"mappings":"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"}