@zlink-systems/framework 0.30.0 → 0.30.1

package/dist/runtime/channels/channel-dispatch-pipeline.js

@@ -30,8 +30,10 @@ class ZLinkChannelDispatchPipeline {
         }
         try {
             const flow = (0, flow_context_1.createInboundFlow)(dispatch.fields.flowId, dispatch.fields.flowOrigin, this.options.dispatchErrors.flow.flowCreationEnabled(), undefined);
-            const invocation = await (0, flow_context_1.runWithFlow)(flow, () => this.invoke(dispatch.envelope, dispatch.codecs, dispatch.handler, dispatch.context, dispatch.fields, dispatch.signal));
-            if (invocation.handlerInvoked) {
+            const invocation = await (flow === undefined
+                ? this.invoke(dispatch.envelope, dispatch.codecs, dispatch.handler, dispatch.context, dispatch.fields, dispatch.signal)
+                : (0, flow_context_1.runWithFlow)(flow, () => this.invoke(dispatch.envelope, dispatch.codecs, dispatch.handler, dispatch.context, dispatch.fields, dispatch.signal)));
+            if (invocation !== HANDLER_FILTER_REJECTED) {
                 this.trace(ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Completed, dispatch.fields);
             }
         }
@@ -58,11 +60,13 @@ class ZLinkChannelDispatchPipeline {
         let reply;
         try {
             const flow = (0, flow_context_1.createInboundFlow)(dispatch.fields.flowId, dispatch.fields.flowOrigin, this.options.dispatchErrors.flow.flowCreationEnabled(), undefined);
-            const invocation = await (0, flow_context_1.runWithFlow)(flow, () => this.invoke(dispatch.envelope, dispatch.codecs, dispatch.handler, dispatch.context, dispatch.fields, dispatch.signal));
-            if (!invocation.handlerInvoked) {
+            const invocation = await (flow === undefined
+                ? this.invoke(dispatch.envelope, dispatch.codecs, dispatch.handler, dispatch.context, dispatch.fields, dispatch.signal)
+                : (0, flow_context_1.runWithFlow)(flow, () => this.invoke(dispatch.envelope, dispatch.codecs, dispatch.handler, dispatch.context, dispatch.fields, dispatch.signal)));
+            if (invocation === HANDLER_FILTER_REJECTED) {
                 throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RequestRejected, `A handler filter rejected '${this.options.channelName}:${dispatch.fields.packetName}'.`);
             }
-            reply = invocation.value;
+            reply = invocation;
         }
         catch (error) {
             try {
@@ -78,7 +82,9 @@ class ZLinkChannelDispatchPipeline {
             return;
         }
         try {
-            await dispatch.writeReply(reply);
+            const written = dispatch.writeReply(reply);
+            if (written !== undefined)
+                await written;
             this.trace(ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Replied, dispatch.fields);
         }
         catch (error) {
@@ -99,8 +105,7 @@ class ZLinkChannelDispatchPipeline {
      */
     async dispatchMalformed(input) {
         const { info } = input;
-        const isRequest = info.kind === 1 /* ZLinkChannelMessageKind.Request */ ||
-            (info.kind === undefined && input.transportRequest);
+        const isRequest = input.transportRequest;
         let replied = false;
         if (isRequest && input.writeProtocolError !== undefined && info.correlationId !== undefined) {
             const protocolError = new contracts_1.ZLinkFrameworkException(contracts_1.ZLinkFrameworkErrorKind.ProtocolError, `Channel '${this.options.channelName}' received a malformed envelope.`);
@@ -126,15 +131,18 @@ class ZLinkChannelDispatchPipeline {
             error: input.error
         });
     }
-    async invoke(envelope, codecs, handler, context, fields, signal) {
+    invoke(envelope, codecs, handler, context, fields, signal) {
         (0, application_job_queue_scope_1.releaseApplicationJobPermitBeforeHandler)();
         if (this.filters.length === 0) {
             //  Fast path for the dominant unfiltered dispatch: skip the filter
             //  context object and chain machinery entirely.
             const payload = (0, channel_envelope_1.decodeChannelPayload)(envelope, codecs);
             this.trace(ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Dispatched, fields);
-            return { handlerInvoked: true, value: await handler.handle(payload, context) };
+            return handler.handle(payload, context);
         }
+        return this.invokeFiltered(envelope, codecs, handler, context, fields, signal);
+    }
+    async invokeFiltered(envelope, codecs, handler, context, fields, signal) {
         let value;
         const handlerInvoked = await (0, handlers_1.invokeZLinkHandlerFilters)(this.filters, this.createFilterContext(context, fields), async () => {
             // Filters are the channel admission gate. Decode only after they have
@@ -143,7 +151,7 @@ class ZLinkChannelDispatchPipeline {
             this.trace(ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Dispatched, fields);
             value = await handler.handle(payload, context);
         }, signal);
-        return { handlerInvoked, value };
+        return handlerInvoked ? value : HANDLER_FILTER_REJECTED;
     }
     createFilterContext(context, fields) {
         const dispatchKind = this.dispatchKind(context, fields);
@@ -222,6 +230,7 @@ class ZLinkChannelDispatchPipeline {
     }
 }
 exports.ZLinkChannelDispatchPipeline = ZLinkChannelDispatchPipeline;
+const HANDLER_FILTER_REJECTED = Symbol('handler-filter-rejected');
 const DEFAULT_UNHANDLED_DISPATCH = {
     request: contracts_1.ZLinkUnhandledDispatchAction.ReplyError,
     send: contracts_1.ZLinkUnhandledDispatchAction.LogAndDrop,

package/dist/runtime/channels/channel-dispatch-services.d.ts

@@ -43,6 +43,7 @@ export declare class ZLinkChannelDispatchServices {
     channelSendHandler(handlerType: Type): ZLinkChannelSendHandler;
     routeRequestHandler(handlerType: Type): ZLinkRouteRuntimeRequestHandler;
     routeSendHandler(handlerType: Type): ZLinkRouteRuntimeSendHandler;
+    private invokeScopeFreeHandler;
     private invokeHandlerFilters;
     private withHandlerScope;
     beginOutbound(outcome: ZLinkMessageFlowOutcome, result?: ZLinkRuntimeMessageFlowResult): ZLinkChannelOutboundTracePoint | undefined;

package/dist/runtime/channels/channel-dispatch-services.js

@@ -48,6 +48,13 @@ class ZLinkChannelDispatchServices {
         return this.handlerFiltersValue;
     }
     channelRequestHandler(handlerType) {
+        const activate = this.registration.filterTypes.length === 0
+            ? (0, handler_instance_scope_1.prepareHandlerInstance)(this.providerResolver, handlerType)
+            : undefined;
+        if (activate !== undefined)
+            return {
+                handle: (payload, context) => this.invokeScopeFreeHandler(activate, payload, context)
+            };
         return {
             handle: (payload, context) => this.withHandlerScope(context, async (scope) => {
                 const handler = await scope.resolve(handlerType);
@@ -56,6 +63,13 @@ class ZLinkChannelDispatchServices {
         };
     }
     channelSendHandler(handlerType) {
+        const activate = this.registration.filterTypes.length === 0
+            ? (0, handler_instance_scope_1.prepareHandlerInstance)(this.providerResolver, handlerType)
+            : undefined;
+        if (activate !== undefined)
+            return {
+                handle: (payload, context) => this.invokeScopeFreeHandler(activate, payload, context)
+            };
         return {
             handle: (payload, context) => this.withHandlerScope(context, async (scope) => {
                 const handler = await scope.resolve(handlerType);
@@ -64,6 +78,13 @@ class ZLinkChannelDispatchServices {
         };
     }
     routeRequestHandler(handlerType) {
+        const activate = this.registration.filterTypes.length === 0
+            ? (0, handler_instance_scope_1.prepareHandlerInstance)(this.providerResolver, handlerType)
+            : undefined;
+        if (activate !== undefined)
+            return {
+                handle: (payload, context) => this.invokeScopeFreeHandler(activate, payload, context)
+            };
         return {
             handle: (payload, context) => this.withHandlerScope(context, async (scope) => {
                 const handler = await scope.resolve(handlerType);
@@ -72,6 +93,13 @@ class ZLinkChannelDispatchServices {
         };
     }
     routeSendHandler(handlerType) {
+        const activate = this.registration.filterTypes.length === 0
+            ? (0, handler_instance_scope_1.prepareHandlerInstance)(this.providerResolver, handlerType)
+            : undefined;
+        if (activate !== undefined)
+            return {
+                handle: (payload, context) => this.invokeScopeFreeHandler(activate, payload, context)
+            };
         return {
             handle: (payload, context) => this.withHandlerScope(context, async (scope) => {
                 const handler = await scope.resolve(handlerType);
@@ -79,6 +107,23 @@ class ZLinkChannelDispatchServices {
             })
         };
     }
+    invokeScopeFreeHandler(activate, payload, context) {
+        const handler = activate();
+        const cleanup = (0, handler_instance_scope_1.handlerInstanceCleanup)(handler);
+        if (cleanup === undefined)
+            return handler.handle(payload, context);
+        let result;
+        try {
+            result = handler.handle(payload, context);
+        }
+        catch (error) {
+            const disposed = cleanup.call(handler);
+            return Promise.resolve(disposed).then(() => {
+                throw error;
+            });
+        }
+        return Promise.resolve(result).finally(() => cleanup.call(handler));
+    }
     async invokeHandlerFilters(context, next, signal) {
         const scoped = (0, handler_filter_scope_1.handlerFilterScope)(this.providerResolver);
         if (scoped !== undefined) {

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

@@ -1,6 +1,6 @@
 import type { RoutingId, ZLinkMessageContext, ZLinkHandlerFilter, ZLinkPublishMessageContext, ZLinkRouteMessageContext, ZLinkUnhandledDispatchOptions } from '../../contracts';
 import type { Message } from '../../contracts/Common/Message';
-import type { ReceiveRecord } from '../foundation/service-runtime-contracts';
+import { type ReceiveRecord } from '../foundation/service-runtime-contracts';
 import { type ZLinkRouteChannelOptions } from '../configuration';
 import type { ZLinkBackendSpotRouteBridge } from '../backend/contracts';
 import type { ZLinkRuntimeMetrics } from '../diagnostics';

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

@@ -5,12 +5,14 @@ exports.collectRouteChannelHandlers = collectRouteChannelHandlers;
 const contracts_1 = require("../../contracts");
 const ZLinkDispatchOptions_1 = require("../../contracts/Dispatch/ZLinkDispatchOptions");
 const runtime_values_1 = require("../backend/runtime-values");
+const service_runtime_contracts_1 = require("../foundation/service-runtime-contracts");
 const configuration_1 = require("../configuration");
 const channel_envelope_1 = require("./channel-envelope");
 const channel_envelope_inspection_1 = require("./channel-envelope-inspection");
 const channel_multipart_1 = require("./channel-multipart");
 const channel_framework_packets_1 = require("./channel-framework-packets");
 const channel_dispatch_pipeline_1 = require("./channel-dispatch-pipeline");
+const completedChannelReply = Promise.resolve();
 class ZLinkChannelRequestDispatcher {
     options;
     pipeline;
@@ -49,7 +51,7 @@ class ZLinkChannelRequestDispatcher {
             await this.pipeline.dispatchMalformed({
                 info,
                 error,
-                transportRequest: replyToken !== null,
+                transportRequest: replyToken != null,
                 writeProtocolError: replyToken === null
                     ? undefined
                     : (protocolError) => this.submitReply((0, channel_multipart_1.appendParts)(router.reply(received.routingId, replyToken), (0, channel_envelope_1.encodeChannelErrorReplyParts)((0, channel_envelope_inspection_1.malformedProtocolErrorRequestHeader)(this.options.channelName, info), protocolError)), signal)
@@ -124,9 +126,9 @@ class ZLinkChannelRequestDispatcher {
             writeError: (error) => this.submitReply((0, channel_multipart_1.appendParts)(router.reply(received.routingId, replyToken), (0, channel_envelope_1.encodeChannelErrorReplyParts)(envelope.header, error)), signal)
         });
     }
-    async dispatchMesh(record, signal) {
+    dispatchMesh(record, signal) {
         if (record.parts.length === 0 || record.parts[0].data().length === 0) {
-            return;
+            return completedChannelReply;
         }
         let envelope;
         try {
@@ -134,16 +136,15 @@ class ZLinkChannelRequestDispatcher {
         }
         catch (error) {
             const info = (0, channel_envelope_inspection_1.inspectMalformedChannelHeader)(record.parts, this.flowEnabled());
-            await this.pipeline.dispatchMalformed({
+            return this.pipeline.dispatchMalformed({
                 info,
                 error,
-                transportRequest: false,
+                transportRequest: isMeshRequest(record),
                 sourceRid: record.sourceNodeRid == null ? undefined : String(record.sourceNodeRid),
                 writeProtocolError: async (protocolError) => {
                     requireMeshReplyAccepted(record.reply((0, channel_envelope_1.encodeChannelErrorReplyParts)((0, channel_envelope_inspection_1.malformedProtocolErrorRequestHeader)(this.options.channelName, info), protocolError)));
                 }
             });
-            return;
         }
         const packetName = envelope.packetName;
         if (packetName === undefined) {
@@ -151,7 +152,7 @@ class ZLinkChannelRequestDispatcher {
         }
         const correlationId = envelope.header.correlationId ?? undefined;
         if (envelope.header.kind === 3 /* ZLinkChannelMessageKind.Command */) {
-            await this.pipeline.dispatchOneWay({
+            return this.pipeline.dispatchOneWay({
                 fields: {
                     messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Send,
                     packetName,
@@ -165,10 +166,9 @@ class ZLinkChannelRequestDispatcher {
                 context: this.createMeshContext(envelope, record.sourceNodeRid),
                 signal
             });
-            return;
         }
         if (envelope.header.kind !== 1 /* ZLinkChannelMessageKind.Request */) {
-            return;
+            return completedChannelReply;
         }
         const fields = {
             messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Request,
@@ -177,7 +177,7 @@ class ZLinkChannelRequestDispatcher {
             flowId: envelope.header.flowId,
             flowOrigin: envelope.header.flowOrigin
         };
-        await this.pipeline.dispatchRequest({
+        return this.pipeline.dispatchRequest({
             fields,
             envelope,
             codecs: this.options.codecs,
@@ -185,10 +185,10 @@ class ZLinkChannelRequestDispatcher {
             context: this.createMeshContext(envelope, record.sourceNodeRid),
             signal,
             missingHandlerMessage: `No channel request handler is registered for '${this.options.channelName}:${packetName}'.`,
-            writeReply: async (reply) => {
+            writeReply: (reply) => {
                 requireMeshReplyAccepted(record.reply((0, channel_envelope_1.encodeChannelReplyParts)(envelope.header, reply, this.options.codecs)));
             },
-            writeError: async (error) => {
+            writeError: (error) => {
                 requireMeshReplyAccepted(record.reply((0, channel_envelope_1.encodeChannelErrorReplyParts)(envelope.header, error)));
             }
         });
@@ -198,7 +198,7 @@ class ZLinkChannelRequestDispatcher {
         if (operation.submit() === false) {
             throw new configuration_1.ZLinkConfigurationException('Channel reply was not accepted by Core.');
         }
-        return Promise.resolve();
+        return completedChannelReply;
     }
     createMeshContext(envelope, sourceNodeRid) {
         const base = {
@@ -381,7 +381,7 @@ class ZLinkRoutePacketDispatcher {
             await this.pipeline.dispatchMalformed({
                 info,
                 error,
-                transportRequest: replyToken !== null,
+                transportRequest: replyToken != null,
                 sourceRid: String(received.routingId),
                 writeProtocolError: replyToken === null
                     ? undefined
@@ -452,9 +452,9 @@ class ZLinkRoutePacketDispatcher {
             writeError: (error) => this.submitReply((0, channel_multipart_1.appendParts)(router.reply(received.routingId, replyToken), (0, channel_envelope_1.encodeChannelErrorReplyParts)(envelope.header, error)))
         });
     }
-    async dispatchMesh(record, signal) {
+    dispatchMesh(record, signal) {
         if (record.parts.length === 0 || record.parts[0].data().length === 0) {
-            return;
+            return completedChannelReply;
         }
         let envelope;
         try {
@@ -462,16 +462,15 @@ class ZLinkRoutePacketDispatcher {
         }
         catch (error) {
             const info = (0, channel_envelope_inspection_1.inspectMalformedChannelHeader)(record.parts, this.flowEnabled());
-            await this.pipeline.dispatchMalformed({
+            return this.pipeline.dispatchMalformed({
                 info,
                 error,
-                transportRequest: false,
+                transportRequest: isMeshRequest(record),
                 sourceRid: record.sourceNodeRid == null ? undefined : String(record.sourceNodeRid),
                 writeProtocolError: async (protocolError) => {
                     requireMeshReplyAccepted(record.reply((0, channel_envelope_1.encodeChannelErrorReplyParts)((0, channel_envelope_inspection_1.malformedProtocolErrorRequestHeader)(this.routerChannelId, info), protocolError)));
                 }
             });
-            return;
         }
         const packetName = envelope.packetName;
         if (packetName === undefined) {
@@ -480,11 +479,10 @@ class ZLinkRoutePacketDispatcher {
         const sourceNodeRid = String(record.sourceNodeRid ?? '');
         const correlationId = envelope.header.correlationId ?? undefined;
         if (envelope.header.kind === 3 /* ZLinkChannelMessageKind.Command */) {
-            await this.dispatchMeshCommand(envelope, packetName, sourceNodeRid, record.sourceNodeRid, signal);
-            return;
+            return this.dispatchMeshCommand(envelope, packetName, sourceNodeRid, record.sourceNodeRid, signal);
         }
         if (envelope.header.kind !== 1 /* ZLinkChannelMessageKind.Request */) {
-            return;
+            return completedChannelReply;
         }
         const fields = {
             messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Request,
@@ -495,7 +493,7 @@ class ZLinkRoutePacketDispatcher {
             flowOrigin: envelope.header.flowOrigin
         };
         const codecs = (0, channel_framework_packets_1.codecsForFrameworkPacket)(packetName, this.codecs);
-        await this.pipeline.dispatchRequest({
+        return this.pipeline.dispatchRequest({
             fields,
             envelope,
             codecs,
@@ -503,10 +501,10 @@ class ZLinkRoutePacketDispatcher {
             context: this.createRouteContext(envelope, record.sourceNodeRid),
             signal,
             missingHandlerMessage: `No routed request handler is registered for '${this.routerChannelId}:${packetName}'.`,
-            writeReply: async (reply) => {
+            writeReply: (reply) => {
                 requireMeshReplyAccepted(record.reply((0, channel_envelope_1.encodeChannelReplyParts)(envelope.header, reply, codecs)));
             },
-            writeError: async (error) => {
+            writeError: (error) => {
                 requireMeshReplyAccepted(record.reply((0, channel_envelope_1.encodeChannelErrorReplyParts)(envelope.header, error)));
             }
         });
@@ -558,7 +556,7 @@ class ZLinkRoutePacketDispatcher {
         if (operation.submit() === false) {
             throw new configuration_1.ZLinkConfigurationException('Route reply was not accepted by Core.');
         }
-        return Promise.resolve();
+        return completedChannelReply;
     }
     createRouteContext(envelope, sourceRid) {
         const sourceNodeRid = String(sourceRid ?? '');
@@ -573,3 +571,6 @@ class ZLinkRoutePacketDispatcher {
     }
 }
 exports.ZLinkRoutePacketDispatcher = ZLinkRoutePacketDispatcher;
+function isMeshRequest(record) {
+    return record.kind === service_runtime_contracts_1.ReceiveKind.NodeRequest || record.kind === service_runtime_contracts_1.ReceiveKind.ChannelRequest;
+}

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

@@ -1,6 +1,6 @@
 import type { Message } from '../../contracts/Common/Message';
 import type { ZLinkFlowOrigin } from '../../contracts';
-import { ZLinkChannelMessageKind, type ZLinkChannelEnvelopeHeader } from './channel-envelope';
+import { type ZLinkChannelEnvelopeHeader } from './channel-envelope';
 export declare function tryDecodeChannelHeader(parts: readonly Message[], flowEnabled?: boolean): ZLinkChannelEnvelopeHeader | undefined;
 /**
  * Identifiers salvaged from a malformed channel envelope. Spec 27 §7: a
@@ -9,7 +9,6 @@ export declare function tryDecodeChannelHeader(parts: readonly Message[], flowEn
  * present only when it is individually well-formed.
  */
 export interface ZLinkMalformedChannelHeaderInfo {
-    readonly kind?: ZLinkChannelMessageKind;
     readonly channelName?: string;
     readonly messageName?: string;
     readonly correlationId?: string;

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;
 }