@zlink-systems/framework 0.30.3 → 0.32.0

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

@@ -9,14 +9,50 @@ const application_job_queue_scope_1 = require("../application-jobs/application-j
 const serial_execution_queue_1 = require("../execution/serial-execution-queue");
 function createChannelApplicationDispatchQueue() {
     return new serial_execution_queue_1.ZLinkSerialExecutionQueue(async (record) => {
+        const permit = record.context;
+        const previousPermit = (0, application_job_queue_scope_1.enterApplicationJobPermitScope)(permit);
         try {
-            record.resolve(await record.operation());
+            void Promise.resolve(record.operation()).then((value) => {
+                try {
+                    record.resolve(value);
+                }
+                finally {
+                    try {
+                        record.release();
+                    }
+                    finally {
+                        (0, application_job_queue_scope_1.releaseApplicationJobPermitTurn)(permit);
+                    }
+                }
+            }, (error) => {
+                try {
+                    record.reject(error);
+                }
+                finally {
+                    try {
+                        record.release();
+                    }
+                    finally {
+                        (0, application_job_queue_scope_1.releaseApplicationJobPermitTurn)(permit);
+                    }
+                }
+            });
         }
         catch (error) {
-            record.reject(error);
+            try {
+                record.reject(error);
+            }
+            finally {
+                try {
+                    record.release();
+                }
+                finally {
+                    (0, application_job_queue_scope_1.releaseApplicationJobPermitTurn)(permit);
+                }
+            }
         }
         finally {
-            record.release();
+            (0, application_job_queue_scope_1.leaveApplicationJobPermitScope)(previousPermit);
         }
     });
 }
@@ -118,6 +154,7 @@ class ZLinkChannelReceiveLoop {
     applicationJobQueue;
     roundRobin;
     applicationDispatchQueue;
+    receivedAtClock;
     //  The loop awaits between the two reads and stop() can land in that gap.
     //  Reading through a method keeps the second check honest; a field read stays
     //  narrowed to false across the await and is treated as dead code.
@@ -130,7 +167,7 @@ class ZLinkChannelReceiveLoop {
     receiveOwner;
     rawReceiveReservations;
     capacityStop = new AbortController();
-    constructor(channelName, router, dispatcher, spotRouteBridge, infrastructureHandler, poller, applicationJobQueue, reportError, roundRobin, applicationDispatchQueue = createChannelApplicationDispatchQueue()) {
+    constructor(channelName, router, dispatcher, spotRouteBridge, infrastructureHandler, poller, applicationJobQueue, reportError, roundRobin, applicationDispatchQueue = createChannelApplicationDispatchQueue(), receivedAtClock = () => new Date()) {
         this.channelName = channelName;
         this.router = router;
         this.dispatcher = dispatcher;
@@ -140,6 +177,7 @@ class ZLinkChannelReceiveLoop {
         this.applicationJobQueue = applicationJobQueue;
         this.roundRobin = roundRobin;
         this.applicationDispatchQueue = applicationDispatchQueue;
+        this.receivedAtClock = receivedAtClock;
         this.inFlight = new channel_receive_task_tracker_1.ZLinkReceiveTaskTracker(reportError);
         this.receiveOwner = roundRobin?.register() ?? Symbol('channel-receive-owner');
         this.rawReceiveReservations = new ZLinkRawReceiveReservationPool(exports.ZLINK_CHANNEL_RAW_RECEIVE_RESERVATION_LIMIT);
@@ -161,87 +199,89 @@ class ZLinkChannelReceiveLoop {
     }
     async runLoop(signal) {
         const batch = new ZLinkReceiveBatchBudget();
+        const rotation = this.applicationJobQueue.createReceiveRotation(RECEIVE_BATCH_MESSAGE_LIMIT, 'remote');
         const capacitySignal = signal === undefined
             ? this.capacityStop.signal
             : AbortSignal.any([signal, this.capacityStop.signal]);
-        while (!this.isStopped() && signal?.aborted !== true) {
+        while (!this.isStopped() && !signalAborted(capacitySignal)) {
             if (!this.poller.wait(0)) {
                 this.roundRobin?.setReady(this.receiveOwner, false);
-                this.roundRobin?.release(this.receiveOwner);
-                batch.reset();
-                if (!(await this.poller.waitForReadable(capacitySignal)))
-                    break;
-                continue;
-            }
-            const applicationJobPermit = await this.acquirePermit(capacitySignal);
-            if (applicationJobPermit === undefined)
-                break;
-            // Readiness can become stale while admission waits. The nonblocking
-            // recv below owns the empty-result check and returns the permit then.
-            this.roundRobin?.setReady(this.receiveOwner, true);
-            if (this.roundRobin?.tryAcquire(this.receiveOwner) === false) {
-                applicationJobPermit.releaseAfterInternalProcessing();
-                await waitReceiveLoopTurn();
-                continue;
-            }
-            const releaseRawReceive = this.roundRobin === undefined
-                ? this.rawReceiveReservations.tryAcquire()
-                : this.roundRobin.tryAcquireRawReceiveReservation();
-            if (releaseRawReceive === undefined) {
-                applicationJobPermit.releaseAfterInternalProcessing();
-                this.roundRobin?.release(this.receiveOwner);
-                await waitReceiveLoopTurn();
-                continue;
-            }
-            const received = this.router.recv(1);
-            if (received == null) {
-                this.poller.markDrained();
-                applicationJobPermit.releaseAfterInternalProcessing();
-                releaseRawReceive();
-                this.roundRobin?.setReady(this.receiveOwner, false);
-                this.roundRobin?.release(this.receiveOwner);
-                batch.reset();
                 if (!(await this.poller.waitForReadable(capacitySignal)))
                     break;
                 continue;
             }
-            const receivedBytes = messageBytes(received.parts);
-            let classification;
             try {
-                classification = this.classify(received);
-            }
-            catch (error) {
-                applicationJobPermit.releaseAfterInternalProcessing();
-                releaseRawReceive();
-                received.close();
-                this.inFlight.track(Promise.reject(error));
-                continue;
-            }
-            if (classification.kind === 'consumed') {
-                applicationJobPermit.releaseAfterInternalProcessing();
-                releaseRawReceive();
-                if (classification.closeReceived)
-                    received.close();
-                if (batch.record(receivedBytes)) {
-                    this.roundRobin?.release(this.receiveOwner);
-                    await batch.yieldAndReset();
+                await rotation.acquire(capacitySignal);
+                this.roundRobin?.setReady(this.receiveOwner, true);
+                if (this.roundRobin?.tryAcquire(this.receiveOwner) !== false) {
+                    batch.reset();
+                    while (!this.isStopped() && !signalAborted(capacitySignal)) {
+                        const applicationJobPermit = rotation.take();
+                        if (applicationJobPermit === undefined)
+                            break;
+                        const releaseRawReceive = this.roundRobin === undefined
+                            ? this.rawReceiveReservations.tryAcquire()
+                            : this.roundRobin.tryAcquireRawReceiveReservation();
+                        if (releaseRawReceive === undefined) {
+                            applicationJobPermit.releaseAfterInternalProcessing();
+                            break;
+                        }
+                        try {
+                            // Readiness can become stale during admission; recv owns no_data.
+                            const received = this.router.recv(1);
+                            if (received == null) {
+                                this.poller.markDrained();
+                                this.roundRobin?.setReady(this.receiveOwner, false);
+                                break;
+                            }
+                            const receivedAt = this.receivedAtClock();
+                            const receivedBytes = messageBytes(received.parts);
+                            let classification;
+                            try {
+                                classification = this.classify(received);
+                            }
+                            catch (error) {
+                                received.close();
+                                this.inFlight.track(Promise.reject(error));
+                                if (batch.record(receivedBytes))
+                                    break;
+                                continue;
+                            }
+                            if (classification.kind === 'consumed') {
+                                applicationJobPermit.releaseAfterInternalProcessing();
+                                if (classification.closeReceived)
+                                    received.close();
+                            }
+                            else if (this.isStopped() || signalAborted(capacitySignal)) {
+                                received.close();
+                                break;
+                            }
+                            else {
+                                applicationJobPermit.markApplicationQueued();
+                                const task = this.applicationDispatchQueue.submitPreAdmitted(() => this.dispatchAndClose(received, signal, classification.decodedHeader, true, undefined, receivedAt), undefined, applicationJobPermit);
+                                this.inFlight.track(task);
+                            }
+                            if (batch.record(receivedBytes))
+                                break;
+                        }
+                        finally {
+                            releaseRawReceive();
+                            // A queued record owns its lease until its dispatch turn ends.
+                            // Reserved leases (no_data, control, failure, stop) return here.
+                            applicationJobPermit.releaseUnqueued();
+                        }
+                    }
                 }
-                continue;
             }
-            if (this.isStopped() || signalAborted(signal)) {
-                applicationJobPermit.releaseAfterInternalProcessing();
-                releaseRawReceive();
-                received.close();
-                break;
+            catch (error) {
+                if (!this.isStopped() && !signalAborted(capacitySignal))
+                    throw error;
             }
-            applicationJobPermit.markApplicationQueued();
-            const task = (0, application_job_queue_scope_1.runWithApplicationJobPermit)(applicationJobPermit, () => this.applicationDispatchQueue.submitPreAdmitted((0, application_job_queue_scope_1.bindApplicationJobPermit)(() => this.dispatchAndClose(received, signal, classification.decodedHeader, true))));
-            releaseRawReceive();
-            this.inFlight.track(task);
-            if (batch.record(receivedBytes)) {
+            finally {
+                rotation.releaseUnused();
                 this.roundRobin?.release(this.receiveOwner);
-                await batch.yieldAndReset();
             }
+            await waitReceiveLoopTurn();
         }
     }
     async stop() {
@@ -256,17 +296,7 @@ class ZLinkChannelReceiveLoop {
             this.poller.dispose();
         }
     }
-    async acquirePermit(signal) {
-        try {
-            return await this.applicationJobQueue.acquire(signal, 'remote');
-        }
-        catch (error) {
-            if (this.isStopped() || signal.aborted)
-                return undefined;
-            throw error;
-        }
-    }
-    async dispatchAndClose(received, signal, decodedHeader, infrastructureChecked = false, releaseRawReceive) {
+    async dispatchAndClose(received, signal, decodedHeader, infrastructureChecked = false, releaseRawReceive, receivedAt = this.receivedAtClock()) {
         let closeReceived = true;
         try {
             if (!infrastructureChecked) {
@@ -277,7 +307,7 @@ class ZLinkChannelReceiveLoop {
                 }
                 decodedHeader = classification.decodedHeader;
             }
-            const consumed = await this.dispatcher.dispatch(received, this.router, signal, decodedHeader);
+            const consumed = await this.dispatcher.dispatch(received, this.router, signal, decodedHeader, receivedAt);
             if (consumed === true) {
                 closeReceived = false;
             }
@@ -310,6 +340,7 @@ class ZLinkSubscriberReceiveLoop {
     infrastructureHandler;
     roundRobin;
     applicationDispatchQueue;
+    receivedAtClock;
     //  The loop awaits between the two reads and stop() can land in that gap.
     //  Reading through a method keeps the second check honest; a field read stays
     //  narrowed to false across the await and is treated as dead code.
@@ -322,7 +353,7 @@ class ZLinkSubscriberReceiveLoop {
     receiveOwner;
     rawReceiveReservations;
     capacityStop = new AbortController();
-    constructor(adapter, subscriber, dispatcher, applicationJobQueue, infrastructureHandler, roundRobin, reportError, applicationDispatchQueue = createChannelApplicationDispatchQueue()) {
+    constructor(adapter, subscriber, dispatcher, applicationJobQueue, infrastructureHandler, roundRobin, reportError, applicationDispatchQueue = createChannelApplicationDispatchQueue(), receivedAtClock = () => new Date()) {
         this.adapter = adapter;
         this.subscriber = subscriber;
         this.dispatcher = dispatcher;
@@ -330,6 +361,7 @@ class ZLinkSubscriberReceiveLoop {
         this.infrastructureHandler = infrastructureHandler;
         this.roundRobin = roundRobin;
         this.applicationDispatchQueue = applicationDispatchQueue;
+        this.receivedAtClock = receivedAtClock;
         this.inFlight = new channel_receive_task_tracker_1.ZLinkReceiveTaskTracker(reportError);
         this.poller = adapter.createReadablePoller(subscriber);
         this.receiveOwner = roundRobin?.register() ?? Symbol('subscriber-receive-owner');
@@ -396,6 +428,7 @@ class ZLinkSubscriberReceiveLoop {
                     break;
                 continue;
             }
+            const receivedAt = this.receivedAtClock();
             const receivedBytes = messageBytes(topicMessage.parts);
             let classification;
             try {
@@ -425,7 +458,7 @@ class ZLinkSubscriberReceiveLoop {
                 break;
             }
             applicationJobPermit.markApplicationQueued();
-            const task = (0, application_job_queue_scope_1.runWithApplicationJobPermit)(applicationJobPermit, () => this.applicationDispatchQueue.submitPreAdmitted((0, application_job_queue_scope_1.bindApplicationJobPermit)(() => this.dispatchAndClose(topicMessage, signal, classification.decodedHeader, true))));
+            const task = this.applicationDispatchQueue.submitPreAdmitted(() => this.dispatchAndClose(topicMessage, signal, classification.decodedHeader, true, undefined, receivedAt), undefined, applicationJobPermit);
             releaseRawReceive();
             this.inFlight.track(task);
             if (batch.record(receivedBytes)) {
@@ -456,7 +489,7 @@ class ZLinkSubscriberReceiveLoop {
             throw error;
         }
     }
-    async dispatchAndClose(topicMessage, signal, decodedHeader, infrastructureChecked = false, releaseRawReceive) {
+    async dispatchAndClose(topicMessage, signal, decodedHeader, infrastructureChecked = false, releaseRawReceive, receivedAt = this.receivedAtClock()) {
         try {
             if (!infrastructureChecked) {
                 const classification = this.classify(topicMessage);
@@ -464,7 +497,7 @@ class ZLinkSubscriberReceiveLoop {
                     return;
                 decodedHeader = classification.decodedHeader;
             }
-            await this.dispatcher.dispatch(topicMessage, signal, decodedHeader);
+            await this.dispatcher.dispatch(topicMessage, signal, decodedHeader, receivedAt);
         }
         finally {
             releaseRawReceive?.();
@@ -489,6 +522,7 @@ class ZLinkRouteReceiveLoop {
     applicationJobQueue;
     roundRobin;
     applicationDispatchQueue;
+    receivedAtClock;
     //  The loop awaits between the two reads and stop() can land in that gap.
     //  Reading through a method keeps the second check honest; a field read stays
     //  narrowed to false across the await and is treated as dead code.
@@ -501,13 +535,14 @@ class ZLinkRouteReceiveLoop {
     receiveOwner;
     rawReceiveReservations;
     capacityStop = new AbortController();
-    constructor(router, dispatcher, poller, applicationJobQueue, roundRobin, reportError, applicationDispatchQueue = createChannelApplicationDispatchQueue()) {
+    constructor(router, dispatcher, poller, applicationJobQueue, roundRobin, reportError, applicationDispatchQueue = createChannelApplicationDispatchQueue(), receivedAtClock = () => new Date()) {
         this.router = router;
         this.dispatcher = dispatcher;
         this.poller = poller;
         this.applicationJobQueue = applicationJobQueue;
         this.roundRobin = roundRobin;
         this.applicationDispatchQueue = applicationDispatchQueue;
+        this.receivedAtClock = receivedAtClock;
         this.inFlight = new channel_receive_task_tracker_1.ZLinkReceiveTaskTracker(reportError);
         this.receiveOwner = roundRobin?.register() ?? Symbol('route-receive-owner');
         this.rawReceiveReservations = new ZLinkRawReceiveReservationPool(exports.ZLINK_CHANNEL_RAW_RECEIVE_RESERVATION_LIMIT);
@@ -565,6 +600,7 @@ class ZLinkRouteReceiveLoop {
                     break;
                 continue;
             }
+            const receivedAt = this.receivedAtClock();
             const receivedBytes = messageBytes(received.parts);
             let infrastructure;
             try {
@@ -617,7 +653,7 @@ class ZLinkRouteReceiveLoop {
                 break;
             }
             applicationJobPermit.markApplicationQueued();
-            const task = (0, application_job_queue_scope_1.runWithApplicationJobPermit)(applicationJobPermit, () => this.applicationDispatchQueue.submitPreAdmitted((0, application_job_queue_scope_1.bindApplicationJobPermit)(() => this.dispatchAndClose(received, signal, true))));
+            const task = this.applicationDispatchQueue.submitPreAdmitted(() => this.dispatchAndClose(received, signal, true, undefined, receivedAt), undefined, applicationJobPermit);
             releaseRawReceive();
             this.inFlight.track(task);
             if (batch.record(receivedBytes)) {
@@ -648,10 +684,10 @@ class ZLinkRouteReceiveLoop {
             throw error;
         }
     }
-    async dispatchAndClose(received, signal, infrastructureChecked = false, releaseRawReceive) {
+    async dispatchAndClose(received, signal, infrastructureChecked = false, releaseRawReceive, receivedAt = this.receivedAtClock()) {
         let closeReceived = true;
         try {
-            const consumed = await this.dispatcher.dispatch(received, this.router, signal, (0, channel_envelope_inspection_1.tryDecodeChannelHeader)(received.parts, this.dispatcher.flowEnabled?.() ?? true), infrastructureChecked);
+            const consumed = await this.dispatcher.dispatch(received, this.router, signal, (0, channel_envelope_inspection_1.tryDecodeChannelHeader)(received.parts, this.dispatcher.flowEnabled?.() ?? true), infrastructureChecked, receivedAt);
             if (consumed === true) {
                 closeReceived = false;
             }

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

@@ -7,12 +7,30 @@ import { ZLinkLocationRuntime, type ZLinkLocationEventSink, type ZLinkLocationRu
 import type { Message } from '../../contracts/Common/Message';
 import type { ReceiveRecord } from '../foundation/service-runtime-contracts';
 import type { RoutingId } from '../../contracts';
-import { type ZLinkRouteRuntimeRequestHandler, type ZLinkRouteRuntimeSendHandler } from './channel-dispatchers';
+import { ZLinkChannelPublishDispatcher, type ZLinkRouteRuntimeRequestHandler, type ZLinkRouteRuntimeSendHandler } from './channel-dispatchers';
+import { ZLinkSubscriberReceiveLoop } from './channel-receive-loops';
 import { ZLinkChannelDispatchServices } from './channel-dispatch-services';
 import type { ZLinkChannelEnvelopeCodecRegistry } from './channel-envelope';
 import { ZLinkChannelSocketRegistry } from './channel-socket-registry';
 import { ZLinkSpotRouteDispatchStrategy } from './spot-route-dispatch-strategy';
 import type { ApplicationJobQueue } from '../host/application-job-queue';
+interface ManualFanoutSubscriberState {
+    readonly channelName: string;
+    readonly endpoint: string;
+    readonly index: number;
+    readonly connectionId: string;
+    readonly taskRunner: ZLinkRuntimeTaskRunner;
+    readonly dispatcher: ZLinkChannelPublishDispatcher;
+    desired: boolean;
+    transition: Promise<void>;
+    openingToken?: symbol;
+    active?: ManualFanoutSubscriberActive;
+    stopping?: ManualFanoutSubscriberActive;
+}
+interface ManualFanoutSubscriberActive {
+    readonly token: symbol;
+    readonly loop: ZLinkSubscriberReceiveLoop;
+}
 export interface ZLinkChannelRuntimeLifecycleOptions {
     readonly registration: ZLinkFrameworkRegistration;
     readonly adapter: ZLinkChannelBackendAdapter;
@@ -31,10 +49,9 @@ export declare class ZLinkChannelRuntimeLifecycle {
     private readonly receiveRoundRobin;
     private readonly channelReceiveLoops;
     private readonly subscriberReceiveLoops;
-    private readonly manualFanoutSubscribers;
+    readonly manualFanoutSubscribers: Map<string, ManualFanoutSubscriberState>;
     private readonly manualFanoutSubscriberOwners;
     private readonly routeReceiveLoops;
-    private readonly applicationDispatchQueues;
     private readonly meshChannelDispatchers;
     private readonly meshRouteDispatchers;
     private nextManualFanoutIndex;
@@ -50,7 +67,7 @@ export declare class ZLinkChannelRuntimeLifecycle {
         lifecycleGeneration: bigint;
         descriptorRevision: bigint;
         advertisedEndpoint: string;
-        state: "error" | "preparing" | "serving" | "stopped" | "retiring";
+        state: "error" | "preparing" | "serving" | "retiring" | "stopped";
     }[] | undefined;
     configureLocationAutoConnect(runtime: ZLinkLocationRuntime, stores: ZLinkLocationRuntimeStores, options: ZLinkLocationOptionOverrides, events?: ZLinkLocationEventSink): void;
     private beginLocationAutoConnectCore;
@@ -68,12 +85,11 @@ export declare class ZLinkChannelRuntimeLifecycle {
     dispose(signal?: AbortSignal): Promise<void>;
     private disposeCore;
     private beginDisposeCore;
-    private applicationDispatchQueue;
     private openOutboundSockets;
     private startChannelReceivers;
     private startSubscriberReceivers;
     private getOrCreateManualFanoutSubscriber;
-    private requestManualFanoutConnect;
+    requestManualFanoutConnect(channelName: string, endpoint: string, taskRunner: ZLinkRuntimeTaskRunner, dispatcher: ZLinkChannelPublishDispatcher): void;
     private requestManualFanoutDisconnect;
     private enqueueManualFanoutTransition;
     private openManualFanoutSubscriber;
@@ -87,3 +103,4 @@ export declare class ZLinkChannelRuntimeLifecycle {
     private startRouteReceivers;
     private createSpotRouteBridgeForRouter;
 }
+export {};

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

@@ -20,7 +20,6 @@ class ZLinkChannelRuntimeLifecycle {
     manualFanoutSubscribers = new Map();
     manualFanoutSubscriberOwners = new Set();
     routeReceiveLoops = [];
-    applicationDispatchQueues = new Map();
     meshChannelDispatchers = new Map();
     meshRouteDispatchers = new Map();
     nextManualFanoutIndex = 0;
@@ -120,11 +119,13 @@ class ZLinkChannelRuntimeLifecycle {
                 ...(mesh.routeSendHandlers ?? []).map((registration) => ({
                     kind: 'send',
                     packetName: registration.packetName,
+                    messageType: registration.messageType,
                     handler: this.options.dispatchServices.routeSendHandler(registration.handlerType)
                 })),
                 ...(mesh.routeRequestHandlers ?? []).map((registration) => ({
                     kind: 'request',
                     packetName: registration.packetName,
+                    messageType: registration.messageType,
                     handler: this.options.dispatchServices.routeRequestHandler(registration.handlerType)
                 })),
                 ...[...(this.options.internalRouteSendHandlers?.entries() ?? [])].map(([packetName, handler]) => ({
@@ -159,17 +160,28 @@ class ZLinkChannelRuntimeLifecycle {
                     routeMesh: true,
                     codecs: this.options.codecs,
                     dispatchErrors: this.options.dispatchServices.dispatchErrorReporter(taskRunner.errorSink),
-                    handlers: new Map(channel.requestHandlers?.map((handler) => [
-                        handler.packetName,
-                        handler.handler ??
-                            adaptRouteRequestHandler(this.options.dispatchServices.routeRequestHandler(handler.handlerType))
-                    ])),
-                    sendHandlers: new Map(channel.sendHandlers?.map((handler) => [
-                        handler.packetName,
-                        handler
-                            .handler ??
-                            adaptRouteSendHandler(this.options.dispatchServices.routeSendHandler(handler.handlerType))
-                    ])),
+                    handlers: new Map(channel.requestHandlers?.map((handler) => {
+                        const configuredHandler = handler.handler;
+                        return [
+                            handler.packetName,
+                            {
+                                messageType: handler.messageType,
+                                handler: configuredHandler ??
+                                    adaptRouteRequestHandler(this.options.dispatchServices.routeRequestHandler(handler.handlerType))
+                            }
+                        ];
+                    })),
+                    sendHandlers: new Map(channel.sendHandlers?.map((handler) => {
+                        const configuredHandler = handler.handler;
+                        return [
+                            handler.packetName,
+                            {
+                                messageType: handler.messageType,
+                                handler: configuredHandler ??
+                                    adaptRouteSendHandler(this.options.dispatchServices.routeSendHandler(handler.handlerType))
+                            }
+                        ];
+                    })),
                     filters: this.options.dispatchServices.handlerFilters(),
                     unhandled: this.options.registration.dispatch?.unhandled
                 }));
@@ -215,7 +227,6 @@ class ZLinkChannelRuntimeLifecycle {
             ...work.routeLoops.map((loop) => loop.stop()),
             ...work.manualTransitions
         ]));
-        const applicationStopped = await (0, state_lane_1.startOutsideStateLane)(() => Promise.allSettled(work.applicationDispatchQueues.map((queue) => queue.close())));
         const descriptorStopped = work.clientServerLocation === undefined
             ? []
             : await (0, state_lane_1.startOutsideStateLane)(() => Promise.allSettled([work.clientServerLocation?.stop(signal)]));
@@ -228,7 +239,6 @@ class ZLinkChannelRuntimeLifecycle {
         ]));
         const errors = [
             ...transportStopped,
-            ...applicationStopped,
             ...descriptorStopped,
             ...fanoutDescriptorStopped,
             ...cleanup
@@ -245,7 +255,6 @@ class ZLinkChannelRuntimeLifecycle {
             this.channelReceiveLoops.length = 0;
             this.subscriberReceiveLoops.length = 0;
             this.routeReceiveLoops.length = 0;
-            this.applicationDispatchQueues.clear();
             this.clientServerLocation = undefined;
             this.fanoutLocation = undefined;
             this.taskRunner = undefined;
@@ -268,7 +277,6 @@ class ZLinkChannelRuntimeLifecycle {
         const subscriberLoops = [...this.subscriberReceiveLoops].filter((loop) => !manualLoops.has(loop));
         const manualTransitions = manualStates.map((state) => this.drainManualFanoutSubscriberCore(state));
         const routeLoops = [...this.routeReceiveLoops];
-        const applicationDispatchQueues = [...this.applicationDispatchQueues.values()];
         const clientServerLocation = this.clientServerLocation;
         const fanoutLocation = this.fanoutLocation;
         const spotRouteBridges = [...this.options.spotRouteBridges.values()];
@@ -277,20 +285,11 @@ class ZLinkChannelRuntimeLifecycle {
             subscriberLoops,
             manualTransitions,
             routeLoops,
-            applicationDispatchQueues,
             clientServerLocation,
             fanoutLocation,
             spotRouteBridges
         };
     }
-    applicationDispatchQueue(channelName) {
-        let queue = this.applicationDispatchQueues.get(channelName);
-        if (queue === undefined) {
-            queue = (0, channel_receive_loops_1.createChannelApplicationDispatchQueue)();
-            this.applicationDispatchQueues.set(channelName, queue);
-        }
-        return queue;
-    }
     openOutboundSockets() {
         // The process-local Server is an independent peer source. Location Store
         // discovery may later alias the same admitted identity, but startup and
@@ -318,20 +317,26 @@ class ZLinkChannelRuntimeLifecycle {
                 dispatchErrors: this.options.dispatchServices.dispatchErrorReporter(taskRunner.errorSink),
                 handlers: new Map(channel.requestHandlers?.map((handler) => [
                     handler.packetName,
-                    handler.handler ??
-                        this.options.dispatchServices.channelRequestHandler(requireChannelHandlerType(handler.handlerType, channelName, handler.packetName))
+                    {
+                        messageType: handler.messageType,
+                        handler: handler.handler ??
+                            this.options.dispatchServices.channelRequestHandler(requireChannelHandlerType(handler.handlerType, channelName, handler.packetName))
+                    }
                 ])),
                 sendHandlers: new Map(channel.sendHandlers?.map((handler) => [
                     handler.packetName,
-                    handler.handler ??
-                        this.options.dispatchServices.channelSendHandler(requireChannelHandlerType(handler.handlerType, channelName, handler.packetName))
+                    {
+                        messageType: handler.messageType,
+                        handler: handler.handler ??
+                            this.options.dispatchServices.channelSendHandler(requireChannelHandlerType(handler.handlerType, channelName, handler.packetName))
+                    }
                 ])),
                 filters: this.options.dispatchServices.handlerFilters(),
                 unhandled: this.options.registration.dispatch?.unhandled
             });
             const spotRouteBridge = this.createSpotRouteBridgeForRouter(channelName, router);
             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));
+            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.channelReceiveLoops.push(loop);
             tasks.push(taskRunner.run(`channel:${channelName}`, (signal) => loop.run(signal)));
         }
@@ -350,7 +355,10 @@ class ZLinkChannelRuntimeLifecycle {
                 channelName,
                 codecs: this.options.codecs,
                 dispatchErrors: this.options.dispatchServices.dispatchErrorReporter(taskRunner.errorSink),
-                handlers: new Map(channel.publishHandlers?.map((handler) => [handler.packetName, handler.handler])),
+                handlers: new Map(channel.publishHandlers?.map((handler) => [
+                    handler.packetName,
+                    { handler: handler.handler, messageType: handler.messageType }
+                ])),
                 filters: this.options.dispatchServices.handlerFilters(),
                 unhandled: this.options.registration.dispatch?.unhandled,
                 metrics: this.options.dispatchServices.metrics()
@@ -463,7 +471,7 @@ class ZLinkChannelRuntimeLifecycle {
                     });
                 }
             });
-            loop = new channel_receive_loops_1.ZLinkSubscriberReceiveLoop(this.options.adapter, subscriber, dispatcher, this.options.applicationJobQueue, (message) => this.options.sockets.handleFanoutInboundResult(connectionId, message, subscriber), this.receiveRoundRobin, (error) => taskRunner.errorSink.reportRuntimeTaskException(`subscriber:${state.channelName}:manual:${state.index}:dispatch`, error), this.applicationDispatchQueue(channelName));
+            loop = new channel_receive_loops_1.ZLinkSubscriberReceiveLoop(this.options.adapter, subscriber, dispatcher, this.options.applicationJobQueue, (message) => this.options.sockets.handleFanoutInboundResult(connectionId, message, subscriber), this.receiveRoundRobin, (error) => taskRunner.errorSink.reportRuntimeTaskException(`subscriber:${state.channelName}:manual:${state.index}:dispatch`, error));
             state.openingToken = undefined;
             state.active = { token, loop };
             this.subscriberReceiveLoops.push(loop);
@@ -535,12 +543,15 @@ class ZLinkChannelRuntimeLifecycle {
             channelName,
             codecs: this.options.codecs,
             dispatchErrors: this.options.dispatchServices.dispatchErrorReporter(taskRunner.errorSink),
-            handlers: new Map(channel.publishHandlers?.map((handler) => [handler.packetName, handler.handler])),
+            handlers: new Map(channel.publishHandlers?.map((handler) => [
+                handler.packetName,
+                { handler: handler.handler, messageType: handler.messageType }
+            ])),
             filters: this.options.dispatchServices.handlerFilters(),
             unhandled: this.options.registration.dispatch?.unhandled,
             metrics: this.options.dispatchServices.metrics()
         });
-        const loop = new channel_receive_loops_1.ZLinkSubscriberReceiveLoop(this.options.adapter, subscriber, dispatcher, this.options.applicationJobQueue, (message) => this.options.sockets.handleFanoutInboundResult(connectionId, message, subscriber), undefined, (error) => taskRunner.errorSink.reportRuntimeTaskException(`subscriber:${channelName}:automatic:${connectionId}:dispatch`, error), this.applicationDispatchQueue(channelName));
+        const loop = new channel_receive_loops_1.ZLinkSubscriberReceiveLoop(this.options.adapter, subscriber, dispatcher, this.options.applicationJobQueue, (message) => this.options.sockets.handleFanoutInboundResult(connectionId, message, subscriber), undefined, (error) => taskRunner.errorSink.reportRuntimeTaskException(`subscriber:${channelName}:automatic:${connectionId}:dispatch`, error));
         this.subscriberReceiveLoops.push(loop);
         void taskRunner.run(`subscriber:${channelName}:automatic:${connectionId}`, (signal) => loop.run(signal));
         return async () => {
@@ -586,7 +597,7 @@ class ZLinkChannelRuntimeLifecycle {
                 unhandled: this.options.registration.dispatch?.unhandled,
                 spotRouteBridge
             });
-            const loop = new channel_receive_loops_1.ZLinkRouteReceiveLoop(router, dispatcher, this.options.adapter.createReadablePoller(router), this.options.applicationJobQueue, this.receiveRoundRobin, (error) => taskRunner.errorSink.reportRuntimeTaskException(`route:${routeChannel.routerChannelId}:dispatch`, error), this.applicationDispatchQueue(routeChannel.routerChannelId));
+            const loop = new channel_receive_loops_1.ZLinkRouteReceiveLoop(router, dispatcher, this.options.adapter.createReadablePoller(router), this.options.applicationJobQueue, this.receiveRoundRobin, (error) => taskRunner.errorSink.reportRuntimeTaskException(`route:${routeChannel.routerChannelId}:dispatch`, error));
             this.routeReceiveLoops.push(loop);
             tasks.push(taskRunner.run(`route:${routeChannel.routerChannelId}`, (signal) => loop.run(signal)));
         }
@@ -607,9 +618,7 @@ class ZLinkChannelRuntimeLifecycle {
 }
 exports.ZLinkChannelRuntimeLifecycle = ZLinkChannelRuntimeLifecycle;
 function adaptRouteRequestHandler(handler) {
-    return {
-        handle: async (payload, context) => handler.handle(payload, context)
-    };
+    return { handle: async (payload, context) => handler.handle(payload, context) };
 }
 function adaptRouteSendHandler(handler) {
     return {