@zlink-systems/framework 0.29.1 → 0.30.1

package/dist/runtime/channels/channel-envelope-inspection.js

@@ -29,15 +29,12 @@ function inspectMalformedChannelHeader(parts, flowEnabled) {
     catch {
         return {};
     }
-    if (header.formatMarker !== channel_envelope_1.ZLINK_CHANNEL_FORMAT_MARKER)
-        return {};
     const flowId = typeof header.flowId === 'string' && CHANNEL_FLOW_ID_PATTERN.test(header.flowId)
         ? header.flowId
         : undefined;
     const flowOrigin = salvageFlowOrigin(header.flowOrigin);
     const flowPairValid = flowEnabled && flowId !== undefined && flowOrigin !== undefined;
     return {
-        kind: salvageChannelKind(header.kind),
         channelName: salvageString(header.channelName),
         messageName: salvageString(header.messageName),
         correlationId: salvageCorrelationId(header.correlationId),
@@ -66,23 +63,11 @@ function malformedProtocolErrorRequestHeader(channelName, info) {
     };
 }
 const CHANNEL_FLOW_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
-function salvageChannelKind(value) {
-    return value === 1 /* ZLinkChannelMessageKind.Request */ ||
-        value === 2 /* ZLinkChannelMessageKind.Response */ ||
-        value === 3 /* ZLinkChannelMessageKind.Command */ ||
-        value === 4 /* ZLinkChannelMessageKind.Publish */ ||
-        value === 5 /* ZLinkChannelMessageKind.Error */
-        ? value
-        : undefined;
-}
 function salvageString(value) {
     return typeof value === 'string' && value.length > 0 ? value : undefined;
 }
 function salvageCorrelationId(value) {
-    if (typeof value !== 'string')
-        return undefined;
-    const byteLength = Buffer.byteLength(value, 'utf8');
-    return byteLength >= 1 && byteLength <= 64 && /^[\x00-\x7f]*$/.test(value) ? value : undefined;
+    return typeof value === 'string' && (0, channel_envelope_1.isValidChannelCorrelationId)(value) ? value : undefined;
 }
 function salvageFlowOrigin(value) {
     switch (value) {

package/dist/runtime/channels/channel-envelope.d.ts

@@ -71,3 +71,4 @@ export declare function decodeChannelEnvelope(parts: readonly Message[], decoded
 export declare function decodeChannelPayload(envelope: ZLinkChannelEnvelope, codecs?: ZLinkChannelEnvelopeCodecRegistry): unknown;
 export declare function closeMessages(parts: readonly MessageLike[]): void;
 export declare function decodeChannelHeader(parts: readonly Message[], flowEnabled?: boolean): ZLinkChannelEnvelopeHeader;
+export declare function isValidChannelCorrelationId(value: string): boolean;

package/dist/runtime/channels/channel-envelope.js

@@ -13,6 +13,8 @@ exports.decodeChannelEnvelope = decodeChannelEnvelope;
 exports.decodeChannelPayload = decodeChannelPayload;
 exports.closeMessages = closeMessages;
 exports.decodeChannelHeader = decodeChannelHeader;
+exports.isValidChannelCorrelationId = isValidChannelCorrelationId;
+const runtime_message_1 = require("../backend/runtime-message");
 const node_crypto_1 = require("node:crypto");
 const node_buffer_1 = require("node:buffer");
 const contracts_1 = require("../../contracts");
@@ -34,6 +36,13 @@ exports.ZLINK_CHANNEL_FORMAT_MARKER = 0xf2;
 const EMPTY_OUTBOUND_METADATA = new Map();
 exports.JSON_CONTENT_TYPE = 'application/json';
 exports.BINARY_CONTENT_TYPE = 'application/octet-stream';
+const preparedChannelHeaders = new WeakMap();
+const CHANNEL_CORRELATION_FIELD = ',"correlationId":';
+const CHANNEL_DEADLINE_FIELD = ',"deadline":';
+const CHANNEL_CORRELATION_TEXT_LENGTH = 32;
+const PREPARED_CHANNEL_CORRELATION = '0'.repeat(CHANNEL_CORRELATION_TEXT_LENGTH);
+const PREPARED_CHANNEL_DEADLINE = '2000-01-01T00:00:00.000Z';
+const CHANNEL_CORRELATION_TEXT = /^[0-9a-f]{32}$/;
 function newChannelCorrelationId() {
     return (0, node_crypto_1.randomUUID)().replaceAll('-', '');
 }
@@ -56,7 +65,7 @@ function encodeChannelEnvelopePartsAtDeadline(kind, channelName, packetName, pay
     const flow = createFlow ? (0, flow_context_1.currentOrCreateFlow)('Application') : undefined;
     const envelopeCorrelationId = correlationIdForOutboundKind(kind, correlationId);
     return [
-        encodeChannelHeader(kind, channelName, messageName, encoded.contentType, envelopeCorrelationId, deadlineUnixMs === undefined ? null : new Date(deadlineUnixMs).toISOString(), topic ?? null, null, null, undefined, applicationMetadataRecord(metadata), flow?.flowId, flow?.flowOrigin),
+        encodeChannelHeader(kind, channelName, messageName, encoded.contentType, envelopeCorrelationId, deadlineUnixMs === undefined ? null : new Date(deadlineUnixMs).toISOString(), topic ?? null, null, null, undefined, applicationMetadataRecord(metadata), flow?.flowId, flow?.flowOrigin, codecs),
         encoded.message
     ];
 }
@@ -72,7 +81,7 @@ function encodeChannelPublishEnvelopeParts(channelName, topic, packetName, paylo
 function encodeChannelReplyParts(request, payload, codecs) {
     const encoded = encodePayload(payload ?? Buffer.alloc(0), (0, channel_framework_packets_1.codecsForFrameworkPacket)(request.messageName, codecs), request.messageName, 'reply');
     return [
-        encodeChannelHeader(2 /* ZLinkChannelMessageKind.Response */, request.channelName, request.messageName, encoded.contentType, request.correlationId, null, null, undefined, undefined, undefined, EMPTY_APPLICATION_METADATA, request.flowId, request.flowOrigin),
+        encodeChannelHeader(2 /* ZLinkChannelMessageKind.Response */, request.channelName, request.messageName, encoded.contentType, request.correlationId, null, null, undefined, undefined, undefined, EMPTY_APPLICATION_METADATA, request.flowId, request.flowOrigin, codecs),
         encoded.message
     ];
 }
@@ -137,7 +146,7 @@ function decodeChannelReply(parts, codecs) {
         return undefined;
     }
     if (header.contentType === exports.BINARY_CONTENT_TYPE) {
-        return Buffer.from(parts[1].data());
+        return runtime_message_1.ZLinkBufferMessage.retainPayload(parts[1]);
     }
     if (serializer !== undefined) {
         return serializer.deserialize(contracts_1.ZLinkEncodedPayload.from(parts[1].data()), Object);
@@ -270,7 +279,33 @@ function isMessage(value) {
 function encodeJsonBytes(value, schema) {
     return Buffer.from((0, framework_json_v1_1.stringifyFrameworkJsonV1)(value, schema));
 }
-function encodeChannelHeader(kind, channelName, messageName, contentType, correlationId, deadline, topic, errorCode, errorMessage, source, metadata, flowId, flowOrigin) {
+function encodeChannelHeader(kind, channelName, messageName, contentType, correlationId, deadline, topic, errorCode, errorMessage, source, metadata, flowId, flowOrigin, codecs) {
+    if (codecs !== undefined &&
+        metadata === EMPTY_APPLICATION_METADATA &&
+        flowId === undefined &&
+        flowOrigin === undefined &&
+        topic === null &&
+        source === undefined &&
+        ((kind === 3 /* ZLinkChannelMessageKind.Command */ &&
+            correlationId === null &&
+            deadline === null &&
+            errorCode === null &&
+            errorMessage === null) ||
+            (kind === 1 /* ZLinkChannelMessageKind.Request */ &&
+                correlationId !== null &&
+                CHANNEL_CORRELATION_TEXT.test(correlationId) &&
+                deadline !== null &&
+                deadline.length === PREPARED_CHANNEL_DEADLINE.length &&
+                errorCode === null &&
+                errorMessage === null) ||
+            (kind === 2 /* ZLinkChannelMessageKind.Response */ &&
+                correlationId !== null &&
+                CHANNEL_CORRELATION_TEXT.test(correlationId) &&
+                deadline === null &&
+                errorCode === undefined &&
+                errorMessage === undefined))) {
+        return preparedChannelHeader(codecs, kind, channelName, messageName, contentType, correlationId, deadline, errorCode, errorMessage);
+    }
     // The wire has a fixed field order. Measure escaped UTF-8 first, then write
     // each field once into the only header Buffer: no header object, whole JSON
     // string, or post-encode byte copy exists on the outbound path.
@@ -281,6 +316,42 @@ function encodeChannelHeader(kind, channelName, messageName, contentType, correl
     writeChannelHeader(writer, kind, channelName, messageName, contentType, correlationId, deadline, topic, errorCode, errorMessage, source, metadata, flowId, flowOrigin);
     return result;
 }
+function preparedChannelHeader(codecs, kind, channelName, messageName, contentType, correlationId, deadline, errorCode, errorMessage) {
+    let channels = preparedChannelHeaders.get(codecs.serializers);
+    if (channels === undefined)
+        preparedChannelHeaders.set(codecs.serializers, (channels = new Map()));
+    let packets = channels.get(channelName);
+    if (packets === undefined)
+        channels.set(channelName, (packets = new Map()));
+    let contentTypes = packets.get(messageName);
+    if (contentTypes === undefined)
+        packets.set(messageName, (contentTypes = new Map()));
+    let kinds = contentTypes.get(contentType);
+    if (kinds === undefined)
+        contentTypes.set(contentType, (kinds = new Map()));
+    let deadlines = kinds.get(kind);
+    if (deadlines === undefined)
+        kinds.set(kind, (deadlines = new Map()));
+    const hasDeadline = deadline !== null;
+    let prepared = deadlines.get(hasDeadline);
+    if (prepared === undefined) {
+        const bytes = encodeChannelHeader(kind, channelName, messageName, contentType, correlationId === null ? null : PREPARED_CHANNEL_CORRELATION, hasDeadline ? PREPARED_CHANNEL_DEADLINE : null, null, errorCode, errorMessage, undefined, EMPTY_APPLICATION_METADATA, undefined, undefined);
+        prepared = {
+            bytes,
+            correlationOffset: bytes.indexOf(CHANNEL_CORRELATION_FIELD) + CHANNEL_CORRELATION_FIELD.length + 1,
+            deadlineOffset: bytes.indexOf(CHANNEL_DEADLINE_FIELD) + CHANNEL_DEADLINE_FIELD.length + 1
+        };
+        deadlines.set(hasDeadline, prepared);
+    }
+    if (correlationId === null)
+        return prepared.bytes;
+    const bytes = Buffer.alloc(prepared.bytes.byteLength);
+    prepared.bytes.copy(bytes);
+    bytes.write(correlationId, prepared.correlationOffset, CHANNEL_CORRELATION_TEXT_LENGTH, 'ascii');
+    if (deadline !== null)
+        bytes.write(deadline, prepared.deadlineOffset, PREPARED_CHANNEL_DEADLINE.length, 'ascii');
+    return bytes;
+}
 function writeChannelHeader(writer, kind, channelName, messageName, contentType, correlationId, deadline, topic, errorCode, errorMessage, source, metadata, flowId, flowOrigin) {
     writer.append('{"formatMarker":');
     writer.append(String(exports.ZLINK_CHANNEL_FORMAT_MARKER));
@@ -292,9 +363,9 @@ function writeChannelHeader(writer, kind, channelName, messageName, contentType,
     writer.string(messageName);
     writer.append(',"contentType":');
     writer.string(contentType);
-    writer.append(',"correlationId":');
+    writer.append(CHANNEL_CORRELATION_FIELD);
     writer.nullableString(correlationId);
-    writer.append(',"deadline":');
+    writer.append(CHANNEL_DEADLINE_FIELD);
     writer.nullableString(deadline);
     writer.append(',"topic":');
     writer.nullableString(topic);
@@ -681,9 +752,13 @@ function validateCorrelationForKind(kind, correlationId) {
         throw new configuration_1.ZLinkConfigurationException(`Channel ${channelKindName(kind)} must not contain correlationId.`);
     }
 }
+const MAXIMUM_CORRELATION_ID_BYTES = 64;
+function isValidChannelCorrelationId(value) {
+    const byteLength = Buffer.byteLength(value, 'utf8');
+    return (byteLength >= 1 && byteLength <= MAXIMUM_CORRELATION_ID_BYTES && /^[\x00-\x7f]*$/.test(value));
+}
 function validateCorrelationValue(correlationId) {
-    const byteLength = Buffer.byteLength(correlationId, 'utf8');
-    if (byteLength < 1 || byteLength > 64 || !/^[\x00-\x7f]*$/.test(correlationId)) {
+    if (!isValidChannelCorrelationId(correlationId)) {
         throw new configuration_1.ZLinkConfigurationException('Channel envelope correlationId must be a non-empty ASCII value of at most 64 bytes.');
     }
 }

package/dist/runtime/channels/channel-outbound-operations.d.ts

@@ -13,7 +13,7 @@ export declare class ZLinkChannelOutboundOperations {
     send(channelName: string, packetName: string | undefined, message: unknown, metadata?: ReadonlyMap<string, string>): Promise<ZLinkSubmitResult>;
     private sendScoped;
     private traceSend;
-    request<TReply>(channelName: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>): Promise<TReply>;
+    request<TReply>(channelName: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>, onAdmitted?: () => void): Promise<TReply>;
     private requestScoped;
     tryPublish(channelName: string, topic: string, packetName: string | undefined, event: unknown, metadata?: ReadonlyMap<string, string>): ZLinkSubmitResult;
     private tryPublishScoped;
@@ -22,7 +22,7 @@ export declare class ZLinkChannelOutboundOperations {
     routeSubmit(routerChannelId: string, targetNodeRid: string, packetName: string | undefined, message: unknown, metadata?: ReadonlyMap<string, string>): Promise<ZLinkSubmitResult>;
     private routeSubmitScoped;
     private traceRouteSend;
-    routeRequest<TReply>(routerChannelId: string, targetNodeRid: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>): Promise<TReply>;
+    routeRequest<TReply>(routerChannelId: string, targetNodeRid: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>, onAdmitted?: () => void): Promise<TReply>;
     private routeRequestScoped;
     private measureRequest;
 }

package/dist/runtime/channels/channel-outbound-operations.js

@@ -68,10 +68,10 @@ class ZLinkChannelOutboundOperations {
             correlationId: undefined
         });
     }
-    request(channelName, packetName, request, timeoutMs, signal, metadata) {
-        return keepChannelRequestAlive((0, flow_context_1.runWithOutboundFlow)(this.dispatchServices.flowCreationEnabled(), () => this.requestScoped(channelName, packetName, request, timeoutMs, signal, metadata)));
+    request(channelName, packetName, request, timeoutMs, signal, metadata, onAdmitted) {
+        return keepChannelRequestAlive((0, flow_context_1.runWithOutboundFlow)(this.dispatchServices.flowCreationEnabled(), () => this.requestScoped(channelName, packetName, request, timeoutMs, signal, metadata, onAdmitted)));
     }
-    async requestScoped(channelName, packetName, request, timeoutMs, signal, metadata) {
+    async requestScoped(channelName, packetName, request, timeoutMs, signal, metadata, onAdmitted) {
         const deadlineMs = timeoutMs === undefined ? undefined : performance.now() + timeoutMs;
         const deadlineUnixMs = timeoutMs === undefined ? undefined : Date.now() + timeoutMs;
         let correlationId;
@@ -117,7 +117,7 @@ class ZLinkChannelOutboundOperations {
                 let replyParts = [];
                 try {
                     try {
-                        replyParts = await (0, abort_1.awaitWithAbort)(dealer.request(parts, (0, request_deadline_1.remainingRequestTimeout)(`Channel request '${channelName}'`, deadlineMs)), signal);
+                        replyParts = await (0, abort_1.awaitWithAbort)(dealer.request(parts, (0, request_deadline_1.remainingRequestTimeout)(`Channel request '${channelName}'`, deadlineMs), onAdmitted), signal);
                     }
                     catch (error) {
                         if (signal?.aborted === true)
@@ -205,10 +205,10 @@ class ZLinkChannelOutboundOperations {
             targetRid: targetNodeRid
         });
     }
-    routeRequest(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata) {
-        return (0, flow_context_1.runWithOutboundFlow)(this.dispatchServices.flowCreationEnabled(), () => this.routeRequestScoped(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata));
+    routeRequest(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata, onAdmitted) {
+        return (0, flow_context_1.runWithOutboundFlow)(this.dispatchServices.flowCreationEnabled(), () => this.routeRequestScoped(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata, onAdmitted));
     }
-    async routeRequestScoped(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata) {
+    async routeRequestScoped(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata, onAdmitted) {
         let correlationId;
         let router;
         let terminalRecorded = false;
@@ -245,7 +245,7 @@ class ZLinkChannelOutboundOperations {
                 targetRid: targetNodeRid
             });
             const reply = await this.measureRequest(routerChannelId, async () => {
-                const replyParts = await (0, abort_1.awaitWithAbort)(router.request(targetNodeRid, parts, timeoutMs), signal);
+                const replyParts = await (0, abort_1.awaitWithAbort)(router.request(targetNodeRid, parts, timeoutMs, onAdmitted), signal);
                 try {
                     return (0, channel_envelope_1.decodeChannelReply)(replyParts, this.codecs);
                 }

package/dist/runtime/channels/channel-receive-loops.js

@@ -258,7 +258,7 @@ class ZLinkChannelReceiveLoop {
     }
     async acquirePermit(signal) {
         try {
-            return await this.applicationJobQueue.acquire(signal);
+            return await this.applicationJobQueue.acquire(signal, 'remote');
         }
         catch (error) {
             if (this.isStopped() || signal.aborted)
@@ -448,7 +448,7 @@ class ZLinkSubscriberReceiveLoop {
     }
     async acquirePermit(signal) {
         try {
-            return await this.applicationJobQueue.acquire(signal);
+            return await this.applicationJobQueue.acquire(signal, 'remote');
         }
         catch (error) {
             if (this.isStopped() || signal.aborted)
@@ -640,7 +640,7 @@ class ZLinkRouteReceiveLoop {
     }
     async acquirePermit(signal) {
         try {
-            return await this.applicationJobQueue.acquire(signal);
+            return await this.applicationJobQueue.acquire(signal, 'remote');
         }
         catch (error) {
             if (this.isStopped() || signal.aborted)

package/dist/runtime/channels/channel-runtime-lifecycle.js

@@ -332,7 +332,8 @@ class ZLinkChannelRuntimeLifecycle {
                 unhandled: this.options.registration.dispatch?.unhandled
             });
             const spotRouteBridge = this.createSpotRouteBridgeForRouter(channelName, router);
-            const loop = new channel_receive_loops_1.ZLinkChannelReceiveLoop(channelName, router, dispatcher, spotRouteBridge, (received, socket) => this.options.sockets.tryHandleClientServerControl(channelName, received, socket), this.options.adapter.createReadablePoller(router), this.options.applicationJobQueue, (error) => taskRunner.errorSink.reportRuntimeTaskException(`channel:${channelName}:dispatch`, error), this.receiveRoundRobin, this.applicationDispatchQueue(channelName));
+            const serverPeers = this.options.sockets.clientServerServerPeersForChannel(channelName);
+            const loop = new channel_receive_loops_1.ZLinkChannelReceiveLoop(channelName, router, dispatcher, spotRouteBridge, (received, socket) => this.options.sockets.tryHandleClientServerControl(channelName, received, socket, serverPeers), this.options.adapter.createReadablePoller(router), this.options.applicationJobQueue, (error) => taskRunner.errorSink.reportRuntimeTaskException(`channel:${channelName}:dispatch`, error), this.receiveRoundRobin, this.applicationDispatchQueue(channelName));
             this.channelReceiveLoops.push(loop);
             tasks.push(taskRunner.run(`channel:${channelName}`, (signal) => loop.run(signal)));
         }

package/dist/runtime/channels/channel-runtime-manager.d.ts

@@ -45,17 +45,17 @@ export declare class ZLinkChannelRuntimeManager {
     dispatchLocalMeshRoute(meshName: string, sourceNodeRid: RoutingId, parts: readonly Message[], signal?: AbortSignal): Promise<void>;
     canDispatchLocalMeshRoute(meshName: string): boolean;
     send(channelName: string, packetName: string | undefined, message: unknown, metadata?: ReadonlyMap<string, string>): Promise<ZLinkSubmitResult>;
-    request<TReply>(channelName: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>): Promise<TReply>;
+    request<TReply>(channelName: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>, onAdmitted?: () => void): Promise<TReply>;
     tryPublish(channelName: string, topic: string, packetName: string | undefined, event: unknown, metadata?: ReadonlyMap<string, string>): ZLinkSubmitResult;
     publish(channelName: string, topic: string, packetName: string | undefined, event: unknown, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>): Promise<ZLinkSubmitResult>;
     routeSubmit(routerChannelId: string, targetNodeRid: string, packetName: string | undefined, message: unknown, metadata?: ReadonlyMap<string, string>): Promise<ZLinkSubmitResult>;
-    routeRequest<TReply>(routerChannelId: string, targetNodeRid: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>): Promise<TReply>;
+    routeRequest<TReply>(routerChannelId: string, targetNodeRid: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>, onAdmitted?: () => void): Promise<TReply>;
     routeSendToSpot(spotRouteTarget: ZLinkSpotRouteTarget, packetName: string | undefined, message: unknown, metadata?: ReadonlyMap<string, string>): Promise<void>;
-    routeRequestToSpot<TReply>(spotRouteTarget: ZLinkSpotRouteTarget, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>): Promise<TReply>;
-    routeRequestFromSpotToSpot<TReply>(sourceSpot: ZLinkBackendSpot, spotRouteTarget: ZLinkSpotRouteTarget, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal): Promise<TReply>;
+    routeRequestToSpot<TReply>(spotRouteTarget: ZLinkSpotRouteTarget, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>, onAdmitted?: () => void): Promise<TReply>;
+    routeRequestFromSpotToSpot<TReply>(sourceSpot: ZLinkBackendSpot, spotRouteTarget: ZLinkSpotRouteTarget, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, onAdmitted?: () => void): Promise<TReply>;
     routeSendFromSpotToSpot(sourceSpot: ZLinkBackendSpot, spotRouteTarget: ZLinkSpotRouteTarget, packetName: string | undefined, message: unknown, metadata?: ReadonlyMap<string, string>): Promise<void>;
-    routeRequestRawFromSpotToSpot(sourceSpot: ZLinkBackendSpot, spotRouteTarget: ZLinkSpotRouteTarget, request: Message, timeoutMs: number | undefined, signal?: AbortSignal): Promise<readonly Message[]>;
-    routeRequestRawToSpot(spotRouteTarget: ZLinkSpotRouteTarget, request: Message, timeoutMs: number | undefined, signal?: AbortSignal): Promise<readonly Message[]>;
+    routeRequestRawFromSpotToSpot(sourceSpot: ZLinkBackendSpot, spotRouteTarget: ZLinkSpotRouteTarget, request: Message, timeoutMs: number | undefined, signal?: AbortSignal, onAdmitted?: () => void): Promise<readonly Message[]>;
+    routeRequestRawToSpot(spotRouteTarget: ZLinkSpotRouteTarget, request: Message, timeoutMs: number | undefined, signal?: AbortSignal, onAdmitted?: () => void): Promise<readonly Message[]>;
     canRouteChannel(routerChannelId: string): boolean;
     canRoutePacketChannel(routerChannelId: string): boolean;
     dispose(signal?: AbortSignal): Promise<void>;

package/dist/runtime/channels/channel-runtime-manager.js

@@ -141,8 +141,8 @@ class ZLinkChannelRuntimeManager {
     send(channelName, packetName, message, metadata) {
         return this.outbound.send(channelName, packetName, message, metadata);
     }
-    async request(channelName, packetName, request, timeoutMs, signal, metadata) {
-        return this.outbound.request(channelName, packetName, request, timeoutMs, signal, metadata);
+    async request(channelName, packetName, request, timeoutMs, signal, metadata, onAdmitted) {
+        return this.outbound.request(channelName, packetName, request, timeoutMs, signal, metadata, onAdmitted);
     }
     tryPublish(channelName, topic, packetName, event, metadata) {
         return this.outbound.tryPublish(channelName, topic, packetName, event, metadata);
@@ -153,26 +153,26 @@ class ZLinkChannelRuntimeManager {
     routeSubmit(routerChannelId, targetNodeRid, packetName, message, metadata) {
         return this.outbound.routeSubmit(routerChannelId, targetNodeRid, packetName, message, metadata);
     }
-    async routeRequest(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata) {
-        return this.outbound.routeRequest(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata);
+    async routeRequest(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata, onAdmitted) {
+        return this.outbound.routeRequest(routerChannelId, targetNodeRid, packetName, request, timeoutMs, signal, metadata, onAdmitted);
     }
     async routeSendToSpot(spotRouteTarget, packetName, message, metadata) {
         return this.spotRoutes.routeSendToSpot(spotRouteTarget, packetName, message, metadata);
     }
-    async routeRequestToSpot(spotRouteTarget, packetName, request, timeoutMs, signal, metadata) {
-        return this.spotRoutes.routeRequestToSpot(spotRouteTarget, packetName, request, timeoutMs, signal, metadata);
+    async routeRequestToSpot(spotRouteTarget, packetName, request, timeoutMs, signal, metadata, onAdmitted) {
+        return this.spotRoutes.routeRequestToSpot(spotRouteTarget, packetName, request, timeoutMs, signal, metadata, onAdmitted);
     }
-    async routeRequestFromSpotToSpot(sourceSpot, spotRouteTarget, packetName, request, timeoutMs, signal) {
-        return this.spotRoutes.routeRequestFromSpotToSpot(sourceSpot, spotRouteTarget, packetName, request, timeoutMs, signal);
+    async routeRequestFromSpotToSpot(sourceSpot, spotRouteTarget, packetName, request, timeoutMs, signal, onAdmitted) {
+        return this.spotRoutes.routeRequestFromSpotToSpot(sourceSpot, spotRouteTarget, packetName, request, timeoutMs, signal, onAdmitted);
     }
     async routeSendFromSpotToSpot(sourceSpot, spotRouteTarget, packetName, message, metadata) {
         return this.spotRoutes.routeSendFromSpotToSpot(sourceSpot, spotRouteTarget, packetName, message, metadata);
     }
-    async routeRequestRawFromSpotToSpot(sourceSpot, spotRouteTarget, request, timeoutMs, signal) {
-        return this.spotRoutes.routeRequestRawFromSpotToSpot(sourceSpot, spotRouteTarget, request, timeoutMs, signal);
+    async routeRequestRawFromSpotToSpot(sourceSpot, spotRouteTarget, request, timeoutMs, signal, onAdmitted) {
+        return this.spotRoutes.routeRequestRawFromSpotToSpot(sourceSpot, spotRouteTarget, request, timeoutMs, signal, onAdmitted);
     }
-    async routeRequestRawToSpot(spotRouteTarget, request, timeoutMs, signal) {
-        return this.spotRoutes.routeRequestRawToSpot(spotRouteTarget, request, timeoutMs, signal);
+    async routeRequestRawToSpot(spotRouteTarget, request, timeoutMs, signal, onAdmitted) {
+        return this.spotRoutes.routeRequestRawToSpot(spotRouteTarget, request, timeoutMs, signal, onAdmitted);
     }
     canRouteChannel(routerChannelId) {
         return this.spotRoutes.canRouteChannel(routerChannelId);

package/dist/runtime/channels/channel-socket-registry.d.ts

@@ -1,9 +1,10 @@
-import { type ZLinkClientServerServerDescriptor, type ZLinkFanoutPublisherDescriptor } from '../../contracts';
+import { type RoutingId, type ZLinkClientServerServerDescriptor, type ZLinkFanoutPublisherDescriptor } from '../../contracts';
 import type { Message } from '../../contracts/Common/Message';
 import type { ZLinkBackendContext, ZLinkBackendDealerSocket, ZLinkBackendPublisherSocket, ZLinkBackendRouterSocket, ZLinkBackendSocketMonitor, ZLinkBackendSubscriberSocket, ZLinkChannelBackendAdapter, ZLinkMonitoringBackendAdapter } from '../backend/contracts';
 import { type ZLinkFrameworkRegistration } from '../configuration';
 import { ZLinkListenerRecords } from '../foundation/listener-records';
 import { ServiceDiscoveryRegistry } from '../foundation/service-discovery-registry';
+import { ServiceLivenessConnection } from '../foundation/service-liveness-registry';
 import type { ApplicationJobQueue } from '../host/application-job-queue';
 import type { ZLinkChannelEnvelopeHeader } from './channel-envelope';
 export interface ZLinkClientServerServerSocketIdentity {
@@ -20,6 +21,12 @@ export interface ZLinkFanoutConnectionCallbacks {
     readonly onReady: () => void;
     readonly onTerminated: (reason: 'disconnect' | 'deadline' | 'protocol') => void;
 }
+interface ClientServerServerPeer {
+    readonly channelName: string;
+    readonly routingId: RoutingId;
+    readonly normalizedEffectiveMaxMessageBytes: number;
+    readonly liveness: ServiceLivenessConnection;
+}
 export declare class ZLinkChannelSocketRegistry {
     private readonly registration;
     private readonly adapter;
@@ -39,7 +46,6 @@ export declare class ZLinkChannelSocketRegistry {
     private readonly clientServerServerDescriptors;
     private readonly clientServerPublicWeights;
     private readonly routeMeshPublicWeights;
-    private readonly clientServerAdmittedClients;
     private readonly clientServerServerPeers;
     private readonly disposal;
     private readonly ownedResources;
@@ -83,11 +89,12 @@ export declare class ZLinkChannelSocketRegistry {
     removeFanoutPublisher(descriptor: ZLinkFanoutPublisherDescriptor, connectionId: string): boolean;
     setClientServerServerDescriptor(descriptor: ZLinkClientServerServerDescriptor | undefined, channelName: string): void;
     private notifyClientServerTopology;
+    clientServerServerPeersForChannel(channelName: string): Map<RoutingId, ClientServerServerPeer>;
     tryHandleClientServerControl(channelName: string, received: {
         readonly parts: readonly Message[];
         readonly replyToken: unknown | null;
         readonly routingId: unknown;
-    }, router: ZLinkBackendRouterSocket): boolean;
+    }, router: ZLinkBackendRouterSocket, peers?: Map<string, ClientServerServerPeer>): boolean;
     tickClientServerLiveness(nowMs?: number): void;
     openFanoutSubscriberConnection(channelName: string, connectionId: string, endpoint: string, callbacks: ZLinkFanoutConnectionCallbacks): ZLinkBackendSubscriberSocket;
     closeFanoutSubscriberConnection(connectionId: string): Promise<void>;