@zlink-systems/framework 0.30.3 → 0.32.0

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

@@ -30,7 +30,7 @@ class ZLinkChannelRequestDispatcher {
     flowEnabled() {
         return this.options.dispatchErrors.flow.flowCreationEnabled();
     }
-    async dispatch(received, router, signal, decodedHeader) {
+    async dispatch(received, router, signal, decodedHeader, receivedAt = this.options.receivedAtClock?.() ?? new Date()) {
         if (received.spotId !== null && received.spotId !== undefined) {
             if (received.send === undefined) {
                 throw new configuration_1.ZLinkConfigurationException('Routed SPOT packet is missing a local SPOT delivery context.');
@@ -78,13 +78,15 @@ class ZLinkChannelRequestDispatcher {
                 contentType: envelope.header.contentType,
                 packetName,
                 metadata: (0, contracts_1.zlinkMessageMetadata)(envelope.header.metadata),
-                correlationId
+                correlationId,
+                receivedAt
             };
             await this.pipeline.dispatchOneWay({
                 fields,
                 envelope,
                 codecs: this.options.codecs,
-                handler,
+                handler: handler?.handler,
+                messageType: handler?.messageType,
                 context,
                 signal
             });
@@ -112,13 +114,15 @@ class ZLinkChannelRequestDispatcher {
             contentType: envelope.header.contentType,
             packetName,
             metadata: (0, contracts_1.zlinkMessageMetadata)(envelope.header.metadata),
-            correlationId
+            correlationId,
+            receivedAt
         };
         await this.pipeline.dispatchRequest({
             fields: requestFields,
             envelope,
             codecs: this.options.codecs,
-            handler,
+            handler: handler?.handler,
+            messageType: handler?.messageType,
             context,
             signal,
             missingHandlerMessage: `No channel request handler is registered for '${this.options.channelName}:${packetName}'.`,
@@ -152,6 +156,7 @@ class ZLinkChannelRequestDispatcher {
         }
         const correlationId = envelope.header.correlationId ?? undefined;
         if (envelope.header.kind === 3 /* ZLinkChannelMessageKind.Command */) {
+            const handler = this.options.sendHandlers?.get(packetName);
             return this.pipeline.dispatchOneWay({
                 fields: {
                     messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Send,
@@ -162,8 +167,9 @@ class ZLinkChannelRequestDispatcher {
                 },
                 envelope,
                 codecs: this.options.codecs,
-                handler: this.options.sendHandlers?.get(packetName),
-                context: this.createMeshContext(envelope, record.sourceNodeRid),
+                handler: handler?.handler,
+                messageType: handler?.messageType,
+                context: this.createMeshContext(envelope, record.sourceNodeRid, record.receivedAt),
                 signal
             }, admit);
         }
@@ -177,7 +183,7 @@ class ZLinkChannelRequestDispatcher {
             flowId: envelope.header.flowId,
             flowOrigin: envelope.header.flowOrigin
         };
-        return this.pipeline.dispatchRequest(new ZLinkMeshRequestDispatch(fields, envelope, this.options.codecs, this.options.handlers.get(packetName), this.createMeshContext(envelope, record.sourceNodeRid), signal, record, 'channel', this.options.channelName), admit);
+        return this.pipeline.dispatchRequest(new ZLinkMeshRequestDispatch(fields, envelope, this.options.codecs, this.options.handlers.get(packetName), this.createMeshContext(envelope, record.sourceNodeRid, record.receivedAt), signal, record, 'channel', this.options.channelName), admit);
     }
     submitReply(operation, signal) {
         void signal;
@@ -186,14 +192,15 @@ class ZLinkChannelRequestDispatcher {
         }
         return completedChannelReply;
     }
-    createMeshContext(envelope, sourceNodeRid) {
+    createMeshContext(envelope, sourceNodeRid, receivedAt) {
         const base = {
             meshName: this.options.meshName,
             channelName: this.options.channelName,
             contentType: envelope.header.contentType,
             packetName: envelope.packetName,
             metadata: (0, contracts_1.zlinkMessageMetadata)(envelope.header.metadata),
-            correlationId: envelope.header.correlationId ?? undefined
+            correlationId: envelope.header.correlationId ?? undefined,
+            receivedAt: receivedAt ?? this.options.receivedAtClock?.() ?? new Date()
         };
         if (this.options.routeMesh !== true) {
             return base;
@@ -215,23 +222,29 @@ class ZLinkMeshRequestDispatch {
     fields;
     envelope;
     codecs;
-    handler;
+    registration;
     context;
     signal;
     record;
     handlerSurface;
     channelName;
-    constructor(fields, envelope, codecs, handler, context, signal, record, handlerSurface, channelName) {
+    constructor(fields, envelope, codecs, registration, context, signal, record, handlerSurface, channelName) {
         this.fields = fields;
         this.envelope = envelope;
         this.codecs = codecs;
-        this.handler = handler;
+        this.registration = registration;
         this.context = context;
         this.signal = signal;
         this.record = record;
         this.handlerSurface = handlerSurface;
         this.channelName = channelName;
     }
+    get handler() {
+        return this.registration?.handler;
+    }
+    get messageType() {
+        return this.registration?.messageType;
+    }
     get missingHandlerMessage() {
         return `No ${this.handlerSurface} request handler is registered for '${this.channelName}:${this.fields.packetName}'.`;
     }
@@ -260,7 +273,7 @@ class ZLinkChannelPublishDispatcher {
             unhandled: options.unhandled
         });
     }
-    async dispatch(topicMessage, signal, decodedHeader) {
+    async dispatch(topicMessage, signal, decodedHeader, receivedAt = this.options.receivedAtClock?.() ?? new Date()) {
         if (topicMessage.parts.length === 0 || topicMessage.parts[0].data().length === 0) {
             return;
         }
@@ -305,13 +318,15 @@ class ZLinkChannelPublishDispatcher {
             topic: publishTopic,
             source: publishSource,
             metadata: (0, contracts_1.zlinkMessageMetadata)(envelope.header.metadata),
-            correlationId: publishCorr
+            correlationId: publishCorr,
+            receivedAt
         };
         await this.pipeline.dispatchOneWay({
             fields,
             envelope,
             codecs: this.options.codecs,
-            handler,
+            handler: handler?.handler,
+            messageType: handler?.messageType,
             context,
             signal
         });
@@ -321,15 +336,13 @@ exports.ZLinkChannelPublishDispatcher = ZLinkChannelPublishDispatcher;
 function collectRouteChannelHandlers(routeChannel) {
     return [
         ...(routeChannel.handlers ?? []),
-        ...(routeChannel.sendHandlers ?? []).map((handler) => ({
+        ...(routeChannel.sendHandlers ?? []).map((registration) => ({
             kind: 'send',
-            packetName: handler.packetName,
-            handler: handler.handler
+            ...registration
         })),
-        ...(routeChannel.requestHandlers ?? []).map((handler) => ({
+        ...(routeChannel.requestHandlers ?? []).map((registration) => ({
             kind: 'request',
-            packetName: handler.packetName,
-            handler: handler.handler
+            ...registration
         }))
     ];
 }
@@ -337,10 +350,12 @@ class ZLinkRoutePacketDispatcher {
     sendHandlers = new Map();
     requestHandlers = new Map();
     codecs;
+    receivedAtClock;
     pipeline;
     constructor(options) {
         this.routerChannelId = options.routerChannelId;
         this.codecs = options.codecs;
+        this.receivedAtClock = options.receivedAtClock ?? (() => new Date());
         this.dispatchErrors = options.dispatchErrors;
         this.pipeline = new channel_dispatch_pipeline_1.ZLinkChannelDispatchPipeline({
             dispatchErrors: options.dispatchErrors,
@@ -355,7 +370,7 @@ class ZLinkRoutePacketDispatcher {
             if (target.has(handler.packetName)) {
                 throw new configuration_1.ZLinkConfigurationException(`Duplicate routed handler '${options.routerChannelId}:${handler.kind}:${handler.packetName}'.`);
             }
-            target.set(handler.packetName, handler.handler);
+            target.set(handler.packetName, handler);
         }
     }
     routerChannelId;
@@ -380,7 +395,7 @@ class ZLinkRoutePacketDispatcher {
         }
         return false;
     }
-    async dispatch(received, router, signal, decodedHeader, infrastructureChecked = false) {
+    async dispatch(received, router, signal, decodedHeader, infrastructureChecked = false, receivedAt = this.receivedAtClock()) {
         const channelHeader = decodedHeader ?? (0, channel_envelope_inspection_1.tryDecodeChannelHeader)(received.parts, this.flowEnabled());
         if (!infrastructureChecked) {
             const infrastructure = this.dispatchInfrastructure(received);
@@ -431,8 +446,9 @@ class ZLinkRoutePacketDispatcher {
                 fields,
                 envelope,
                 codecs: (0, channel_framework_packets_1.codecsForFrameworkPacket)(packetName, this.codecs),
-                handler,
-                context: this.createRouteContext(envelope, received.routingId),
+                handler: handler?.handler,
+                messageType: handler?.messageType,
+                context: this.createRouteContext(envelope, received.routingId, receivedAt),
                 signal
             });
             return;
@@ -466,8 +482,9 @@ class ZLinkRoutePacketDispatcher {
             fields: requestFields,
             envelope,
             codecs,
-            handler,
-            context: this.createRouteContext(envelope, received.routingId),
+            handler: handler?.handler,
+            messageType: handler?.messageType,
+            context: this.createRouteContext(envelope, received.routingId, receivedAt),
             signal,
             missingHandlerMessage: `No routed request handler is registered for '${this.routerChannelId}:${packetName}'.`,
             writeReply: (reply) => this.submitReply((0, channel_multipart_1.appendParts)(router.reply(received.routingId, replyToken), (0, channel_envelope_1.encodeChannelReplyParts)(envelope.header, reply, codecs))),
@@ -501,7 +518,7 @@ class ZLinkRoutePacketDispatcher {
         const sourceNodeRid = String(record.sourceNodeRid ?? '');
         const correlationId = envelope.header.correlationId ?? undefined;
         if (envelope.header.kind === 3 /* ZLinkChannelMessageKind.Command */) {
-            return this.dispatchMeshCommand(envelope, packetName, sourceNodeRid, record.sourceNodeRid, signal, admit);
+            return this.dispatchMeshCommand(envelope, packetName, sourceNodeRid, record.sourceNodeRid, signal, admit, record.receivedAt ?? this.receivedAtClock());
         }
         if (envelope.header.kind !== 1 /* ZLinkChannelMessageKind.Request */) {
             return completedChannelReply;
@@ -514,9 +531,10 @@ class ZLinkRoutePacketDispatcher {
             flowId: envelope.header.flowId,
             flowOrigin: envelope.header.flowOrigin
         };
-        return this.pipeline.dispatchRequest(new ZLinkMeshRequestDispatch(fields, envelope, (0, channel_framework_packets_1.codecsForFrameworkPacket)(packetName, this.codecs), this.requestHandlers.get(packetName), this.createRouteContext(envelope, record.sourceNodeRid), signal, record, 'routed', this.routerChannelId), admit);
+        return this.pipeline.dispatchRequest(new ZLinkMeshRequestDispatch(fields, envelope, (0, channel_framework_packets_1.codecsForFrameworkPacket)(packetName, this.codecs), this.requestHandlers.get(packetName), this.createRouteContext(envelope, record.sourceNodeRid, record.receivedAt), signal, record, 'routed', this.routerChannelId), admit);
     }
     async dispatchLocalCommand(parts, sourceNodeRid, signal) {
+        const receivedAt = this.receivedAtClock();
         if (parts.length === 0 || parts[0].data().length === 0)
             return;
         let envelope;
@@ -540,9 +558,10 @@ class ZLinkRoutePacketDispatcher {
         if (packetName === undefined) {
             throw new configuration_1.ZLinkConfigurationException('Route packet is missing packetName.');
         }
-        await this.dispatchMeshCommand(envelope, packetName, String(sourceNodeRid), sourceNodeRid, signal);
+        await this.dispatchMeshCommand(envelope, packetName, String(sourceNodeRid), sourceNodeRid, signal, undefined, receivedAt);
     }
-    dispatchMeshCommand(envelope, packetName, sourceRid, sourceNodeRid, signal, admit) {
+    dispatchMeshCommand(envelope, packetName, sourceRid, sourceNodeRid, signal, admit, receivedAt = this.receivedAtClock()) {
+        const handler = this.sendHandlers.get(packetName);
         return this.pipeline.dispatchOneWay({
             fields: {
                 messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Send,
@@ -554,8 +573,9 @@ class ZLinkRoutePacketDispatcher {
             },
             envelope,
             codecs: (0, channel_framework_packets_1.codecsForFrameworkPacket)(packetName, this.codecs),
-            handler: this.sendHandlers.get(packetName),
-            context: this.createRouteContext(envelope, sourceNodeRid),
+            handler: handler?.handler,
+            messageType: handler?.messageType,
+            context: this.createRouteContext(envelope, sourceNodeRid, receivedAt),
             signal
         }, admit);
     }
@@ -565,7 +585,7 @@ class ZLinkRoutePacketDispatcher {
         }
         return completedChannelReply;
     }
-    createRouteContext(envelope, sourceRid) {
+    createRouteContext(envelope, sourceRid, receivedAt = this.receivedAtClock()) {
         const sourceNodeRid = String(sourceRid ?? '');
         return {
             meshName: this.routerChannelId,
@@ -573,7 +593,8 @@ class ZLinkRoutePacketDispatcher {
             contentType: envelope.header.contentType,
             sourceNodeRid,
             metadata: (0, contracts_1.zlinkMessageMetadata)(envelope.header.metadata),
-            correlationId: envelope.header.correlationId ?? undefined
+            correlationId: envelope.header.correlationId ?? undefined,
+            receivedAt
         };
     }
 }

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

@@ -1,6 +1,6 @@
 import type { Message } from '../../contracts/Common/Message';
 import type { ZLinkBackendMessageLike as MessageLike } from '../backend/runtime-values';
-import { ZLinkFrameworkErrorKind, type ZLinkMessageSerializer, type ZLinkFlowOrigin } from '../../contracts';
+import { type Type, ZLinkFrameworkErrorKind, type ZLinkMessageSerializer, type ZLinkFlowOrigin } from '../../contracts';
 export declare const ZLINK_CHANNEL_FORMAT_MARKER = 242;
 export declare const JSON_CONTENT_TYPE = "application/json";
 export declare const BINARY_CONTENT_TYPE = "application/octet-stream";
@@ -69,7 +69,7 @@ export interface ZLinkChannelDecodedError extends Error {
 export declare function encodeChannelErrorReplyParts(request: ZLinkChannelEnvelopeHeader, error: unknown, metadata?: Readonly<Record<string, string>>): readonly MessageLike[];
 export declare function decodeChannelReply<TReply>(parts: readonly Message[], codecs?: ZLinkChannelEnvelopeCodecRegistry): TReply;
 export declare function decodeChannelEnvelope(parts: readonly Message[], decodedHeader?: ZLinkChannelEnvelopeHeader, flowEnabled?: boolean): ZLinkChannelEnvelope;
-export declare function decodeChannelPayload(envelope: ZLinkChannelEnvelope, codecs?: ZLinkChannelEnvelopeCodecRegistry): unknown;
+export declare function decodeChannelPayload(envelope: ZLinkChannelEnvelope, codecs?: ZLinkChannelEnvelopeCodecRegistry, messageType?: Type): 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;