@zlink-systems/framework 0.29.1 → 0.30.1

package/dist/runtime/backend/runtime-values.d.ts

@@ -36,6 +36,7 @@ export type SubmitResult = (typeof SubmitResult)[keyof typeof SubmitResult];
 export type ZLinkBackendSendFlags = number;
 export type ZLinkBackendRecvFlags = number;
 export declare const ZLINK_BACKEND_SEND_NONE: ZLinkBackendSendFlags;
+export declare const ZLINK_BACKEND_SEND_DONT_WAIT: ZLinkBackendSendFlags;
 export declare const ZLINK_BACKEND_RECV_DONT_WAIT: ZLinkBackendRecvFlags;
 export declare class ZLinkBackendResultError extends Error {
     readonly operation: 'request' | 'submit';

package/dist/runtime/backend/runtime-values.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZLinkBackendResultError = exports.ZLINK_BACKEND_RECV_DONT_WAIT = exports.ZLINK_BACKEND_SEND_NONE = exports.SubmitResult = exports.RequestResult = void 0;
+exports.ZLinkBackendResultError = exports.ZLINK_BACKEND_RECV_DONT_WAIT = exports.ZLINK_BACKEND_SEND_DONT_WAIT = exports.ZLINK_BACKEND_SEND_NONE = exports.SubmitResult = exports.RequestResult = void 0;
 exports.isZLinkBackendResultError = isZLinkBackendResultError;
 exports.isBackendNotConnectedError = isBackendNotConnectedError;
 exports.isBackendRequestTimeoutError = isBackendRequestTimeoutError;
@@ -37,6 +37,7 @@ exports.SubmitResult = Object.freeze({
     NotAdmitted: 13
 });
 exports.ZLINK_BACKEND_SEND_NONE = 0;
+exports.ZLINK_BACKEND_SEND_DONT_WAIT = 1;
 exports.ZLINK_BACKEND_RECV_DONT_WAIT = 1;
 class ZLinkBackendResultError extends Error {
     operation;

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

@@ -35,6 +35,7 @@ export declare class DefaultZLinkRouteClient implements ZLinkRouteClient {
     private readonly transport?;
     private readonly spotRouterChannelIdForMesh;
     private readonly channelTransport?;
+    private readonly nodeSends;
     constructor(registration: ZLinkFrameworkRegistration, transport?: ZLinkRouteClientTransport | undefined, spotRouterChannelIdForMesh?: (meshName: string) => string, channelTransport?: ZLinkChannelClientTransportSource | undefined);
     sendToNode(meshName: string, targetNodeRid: string, message: unknown): ZLinkSendCall;
     requestToNode(meshName: string, targetNodeRid: string, request: unknown): ZLinkRequestCall;

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

@@ -4,6 +4,7 @@ exports.DefaultZLinkSpotPublisherClient = exports.DefaultZLinkRouteClient = expo
 exports.resolveChannelRoute = resolveChannelRoute;
 exports.requireUniqueRouteMeshChannel = requireUniqueRouteMeshChannel;
 const Registration_1 = require("../../contracts/Configuration/Registration");
+const request_result_1 = require("../messaging/request-result");
 const configuration_1 = require("../configuration");
 const framework_errors_internal_1 = require("../framework-errors-internal");
 const submission_result_1 = require("../messaging/submission-result");
@@ -79,6 +80,7 @@ class DefaultZLinkRouteClient {
     transport;
     spotRouterChannelIdForMesh;
     channelTransport;
+    nodeSends = new Map();
     constructor(registration, transport, spotRouterChannelIdForMesh = (meshName) => meshName, channelTransport) {
         this.registration = registration;
         this.transport = transport;
@@ -86,10 +88,23 @@ class DefaultZLinkRouteClient {
         this.channelTransport = channelTransport;
     }
     sendToNode(meshName, targetNodeRid, message) {
-        return new DefaultZLinkSendCall(() => this.requireMesh(meshName), async (packetName, metadata) => normalizeSubmitResult(await this.requireTransport().submit(meshName, targetNodeRid, packetName, message, metadata)));
+        let targets = this.nodeSends.get(meshName);
+        if (targets === undefined)
+            this.nodeSends.set(meshName, (targets = new Map()));
+        let prepared = targets.get(targetNodeRid);
+        if (prepared === undefined) {
+            prepared = {
+                validate: () => {
+                    this.requireMesh(meshName);
+                },
+                submit: (packetName, metadata, payload) => normalizeSubmitResult(this.requireTransport().submit(meshName, targetNodeRid, packetName, payload, metadata))
+            };
+            targets.set(targetNodeRid, prepared);
+        }
+        return new DefaultZLinkSendCall(prepared.validate, prepared.submit, message);
     }
     requestToNode(meshName, targetNodeRid, request) {
-        return new DefaultZLinkRequestCall(() => this.requireMesh(meshName), (packetName, timeoutMs, metadata, signal) => this.requireTransport().request(meshName, targetNodeRid, packetName, request, timeoutMs, signal, metadata), this.defaultRequestTimeout(meshName));
+        return new DefaultZLinkRequestCall(() => this.requireMesh(meshName), (packetName, timeoutMs, metadata, signal, onAdmitted) => this.requireTransport().request(meshName, targetNodeRid, packetName, request, timeoutMs, signal, metadata, onAdmitted), this.defaultRequestTimeout(meshName));
     }
     sendToChannel(channelName, message) {
         return new DefaultZLinkSendCall(() => this.requireChannelRoute(channelName), async (packetName, metadata) => {
@@ -101,12 +116,12 @@ class DefaultZLinkRouteClient {
         });
     }
     requestToChannel(channelName, request) {
-        return new DefaultZLinkRequestCall(() => this.requireChannelRoute(channelName), (packetName, timeoutMs, metadata, signal) => {
+        return new DefaultZLinkRequestCall(() => this.requireChannelRoute(channelName), (packetName, timeoutMs, metadata, signal, onAdmitted) => {
             const route = this.requireChannelRoute(channelName);
             if (route.kind === 'route-mesh') {
-                return this.requireTransport().requestToChannel(route.meshName, channelName, packetName, request, timeoutMs, signal, metadata);
+                return this.requireTransport().requestToChannel(route.meshName, channelName, packetName, request, timeoutMs, signal, metadata, onAdmitted);
             }
-            return this.requireChannelTransport().request(channelName, packetName, request, timeoutMs, signal, metadata);
+            return this.requireChannelTransport().request(channelName, packetName, request, timeoutMs, signal, metadata, onAdmitted);
         }, this.defaultRequestTimeoutForChannel(channelName));
     }
     sendToSpot(spot, message) {
@@ -123,10 +138,11 @@ class DefaultZLinkRouteClient {
     requestToSpot(spot, request) {
         return new DefaultZLinkRequestCall(() => {
             this.requireSpotTransport();
-        }, (_packetName, timeoutMs, metadata, signal) => (0, spot_outbound_1.requestToSpotHandle)(this.requireSpotTransport(), spot, request, {
+        }, (_packetName, timeoutMs, metadata, signal, onAdmitted) => (0, spot_outbound_1.requestToSpotHandle)(this.requireSpotTransport(), spot, request, {
             timeoutMs,
             signal,
             metadata,
+            onAdmitted,
             spotRouterChannelIdForMesh: this.spotRouterChannelIdForMesh
         }), this.registration.requestTimeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS);
     }
@@ -217,14 +233,17 @@ exports.DefaultZLinkSpotPublisherClient = DefaultZLinkSpotPublisherClient;
 class DefaultZLinkSendCall {
     validate;
     submitter;
-    selectedMetadata = new Map();
+    message;
+    selectedMetadata;
     executed = false;
-    constructor(validate, submitter) {
+    constructor(validate, submitter, message) {
         this.validate = validate;
         this.submitter = submitter;
+        this.message = message;
     }
     metadata(keyOrMetadata, value) {
         ensureNotExecuted(this.executed);
+        this.selectedMetadata ??= new Map();
         if (typeof keyOrMetadata === 'string') {
             this.selectedMetadata.set(keyOrMetadata, value);
         }
@@ -235,12 +254,20 @@ class DefaultZLinkSendCall {
         }
         return this;
     }
-    async submit() {
-        ensureNotExecuted(this.executed);
-        this.validate();
-        this.executed = true;
-        const result = await this.submitter(undefined, new Map(this.selectedMetadata));
-        (0, submission_result_1.requireOneWayCompletion)(result, 'One-way send');
+    submit() {
+        try {
+            ensureNotExecuted(this.executed);
+            this.validate();
+            this.executed = true;
+            const result = this.submitter(undefined, this.selectedMetadata ?? EMPTY_CALL_METADATA, this.message);
+            if (result instanceof Promise)
+                return result.then(completeOneWaySend);
+            completeOneWaySend(result);
+            return completedOneWaySend;
+        }
+        catch (error) {
+            return Promise.reject(error);
+        }
     }
 }
 function ensureNotExecuted(executed) {
@@ -248,15 +275,22 @@ function ensureNotExecuted(executed) {
         (0, submission_result_1.throwAlreadySubmitted)('ZLink call');
     }
 }
+const EMPTY_CALL_METADATA = new Map();
+const completedOneWaySend = Promise.resolve();
+function completeOneWaySend(result) {
+    (0, submission_result_1.requireOneWayCompletion)(result, 'One-way send');
+}
 function normalizeSubmitResult(result) {
-    return result ?? { status: submission_result_1.ZLinkSubmitStatus.Submitted };
+    return result instanceof Promise
+        ? result.then((value) => value ?? submission_result_1.submittedResult)
+        : (result ?? submission_result_1.submittedResult);
 }
 class DefaultZLinkRequestCall {
     validate;
     submitter;
     defaultRequestTimeoutMs;
     timeoutMs;
-    selectedMetadata = new Map();
+    selectedMetadata;
     turn = (0, execution_1.captureZLinkSpotSerialTurn)();
     constructor(validate, submitter, defaultRequestTimeoutMs) {
         this.validate = validate;
@@ -264,6 +298,7 @@ class DefaultZLinkRequestCall {
         this.defaultRequestTimeoutMs = defaultRequestTimeoutMs;
     }
     metadata(keyOrMetadata, value) {
+        this.selectedMetadata ??= new Map();
         if (typeof keyOrMetadata === 'string') {
             this.selectedMetadata.set(keyOrMetadata, value);
         }
@@ -278,16 +313,18 @@ class DefaultZLinkRequestCall {
         this.timeoutMs = timeoutMs;
         return this;
     }
-    async submit(signal) {
-        (0, abort_1.throwIfAborted)(signal);
-        this.validate();
-        return this.submitter(undefined, this.timeoutMs ?? this.defaultRequestTimeoutMs, new Map(this.selectedMetadata), signal);
+    submit(signal) {
+        return (0, request_result_1.createZLinkRequest)((onAdmitted) => {
+            (0, abort_1.throwIfAborted)(signal);
+            this.validate();
+            return this.submitter(undefined, this.timeoutMs ?? this.defaultRequestTimeoutMs, this.selectedMetadata === undefined ? EMPTY_CALL_METADATA : new Map(this.selectedMetadata), signal, onAdmitted);
+        });
     }
     async yield(signal) {
         const turn = (0, execution_1.requireZLinkYieldTurn)(this.turn);
         (0, abort_1.throwIfAborted)(signal);
         this.validate();
-        const pending = this.submitter(undefined, this.timeoutMs ?? this.defaultRequestTimeoutMs, new Map(this.selectedMetadata), signal);
+        const pending = this.submitter(undefined, this.timeoutMs ?? this.defaultRequestTimeoutMs, this.selectedMetadata === undefined ? EMPTY_CALL_METADATA : new Map(this.selectedMetadata), signal);
         return turn.yieldPromise(pending);
     }
 }

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

@@ -39,8 +39,8 @@ interface ZLinkRequestDispatch<TContext extends ZLinkMessageContext> {
     readonly context: TContext;
     readonly signal?: AbortSignal;
     readonly missingHandlerMessage: string;
-    readonly writeReply: (reply: unknown) => Promise<void>;
-    readonly writeError: (error: unknown) => Promise<void>;
+    readonly writeReply: (reply: unknown) => void | Promise<void>;
+    readonly writeError: (error: unknown) => void | Promise<void>;
 }
 export declare class ZLinkChannelDispatchPipeline {
     private readonly options;
@@ -66,6 +66,7 @@ export declare class ZLinkChannelDispatchPipeline {
         readonly writeProtocolError?: (error: ZLinkFrameworkException) => Promise<void>;
     }): Promise<void>;
     private invoke;
+    private invokeFiltered;
     private createFilterContext;
     private dispatchKind;
     private report;

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;