@zlink-systems/framework 0.27.0 → 0.28.0

package/src/runtime/channels/channel-clients.ts

@@ -20,6 +20,7 @@ import {
 import {
   requireOneWayCompletion,
   requirePublishCompletion,
+  requireClassicFanoutCompletion,
   throwAlreadySubmitted,
   ZLinkSubmitStatus,
   type ZLinkSubmitResult
@@ -176,14 +177,13 @@ export class DefaultZLinkRouteClient implements ZLinkRouteClient {
   sendToNode(meshName: string, targetNodeRid: string, message: unknown): ZLinkSendCall {
     return new DefaultZLinkSendCall(
       () => this.requireMesh(meshName),
-      async (packetName, metadata, signal) =>
+      async (packetName, metadata) =>
         normalizeSubmitResult(
           await this.requireTransport().submit(
             meshName,
             targetNodeRid,
             packetName,
             message,
-            signal,
             metadata
           )
         )
@@ -210,7 +210,7 @@ export class DefaultZLinkRouteClient implements ZLinkRouteClient {
   sendToChannel(channelName: string, message: unknown): ZLinkSendCall {
     return new DefaultZLinkSendCall(
       () => this.requireChannelRoute(channelName),
-      async (packetName, metadata, signal) => {
+      async (packetName, metadata) => {
         const route = this.requireChannelRoute(channelName);
         if (route.kind === 'route-mesh') {
           return normalizeSubmitResult(
@@ -219,19 +219,12 @@ export class DefaultZLinkRouteClient implements ZLinkRouteClient {
               channelName,
               packetName,
               message,
-              signal,
               metadata
             )
           );
         }
         return normalizeSubmitResult(
-          await this.requireChannelTransport().send(
-            channelName,
-            packetName,
-            message,
-            signal,
-            metadata
-          )
+          await this.requireChannelTransport().send(channelName, packetName, message, metadata)
         );
       }
     );
@@ -271,9 +264,8 @@ export class DefaultZLinkRouteClient implements ZLinkRouteClient {
       () => {
         this.requireSpotTransport();
       },
-      async (_packetName, metadata, signal) => {
+      async (_packetName, metadata) => {
         await sendToSpotHandle(this.requireSpotTransport(), spot, message, {
-          signal,
           metadata,
           spotRouterChannelIdForMesh: this.spotRouterChannelIdForMesh
         });
@@ -431,8 +423,7 @@ class DefaultZLinkSendCall implements ZLinkSendCall {
     private readonly validate: () => void,
     private readonly submitter: (
       packetName: string | undefined,
-      metadata: ReadonlyMap<string, string>,
-      signal?: AbortSignal
+      metadata: ReadonlyMap<string, string>
     ) => Promise<ZLinkSubmitResult>
   ) {}
 
@@ -450,12 +441,11 @@ class DefaultZLinkSendCall implements ZLinkSendCall {
     return this;
   }
 
-  async submit(signal?: AbortSignal): Promise<void> {
+  async submit(): Promise<void> {
     ensureNotExecuted(this.executed);
     this.validate();
     this.executed = true;
-    throwIfAborted(signal);
-    const result = await this.submitter(undefined, new Map(this.selectedMetadata), signal);
+    const result = await this.submitter(undefined, new Map(this.selectedMetadata));
     requireOneWayCompletion(result, 'One-way send');
   }
 }
@@ -580,6 +570,6 @@ class DefaultZLinkFanoutPublishCall implements ZLinkFanoutPublishCall {
     this.executed = true;
     throwIfAborted(signal);
     const result = await this.submitter(signal);
-    requireOneWayCompletion(result, 'Classic fanout publish');
+    requireClassicFanoutCompletion(result, 'Classic fanout publish');
   }
 }

package/src/runtime/channels/channel-envelope.ts

@@ -86,33 +86,18 @@ export function encodeChannelEnvelopeParts(
   createFlow = true,
   metadata: ReadonlyMap<string, string> = EMPTY_OUTBOUND_METADATA
 ): readonly MessageLike[] {
-  const messageName = resolveFrameworkPacketName(payload, packetName, 'Channel');
-  const encoded = encodePayload(
+  return encodeChannelEnvelopePartsAtDeadline(
+    kind,
+    channelName,
+    packetName,
     payload,
-    codecsForFrameworkPacket(messageName, codecs),
-    messageName,
-    'payload'
+    timeoutMs === undefined ? undefined : Date.now() + timeoutMs,
+    topic,
+    codecs,
+    correlationId,
+    createFlow,
+    metadata
   );
-  const flow = createFlow ? currentOrCreateFlow('Application') : undefined;
-  const envelopeCorrelationId = correlationIdForOutboundKind(kind, correlationId);
-  return [
-    encodeChannelHeader(
-      kind,
-      channelName,
-      messageName,
-      encoded.contentType,
-      envelopeCorrelationId,
-      timeoutMs === undefined ? null : new Date(Date.now() + timeoutMs).toISOString(),
-      topic ?? null,
-      null,
-      null,
-      undefined,
-      applicationMetadataRecord(metadata),
-      flow?.flowId,
-      flow?.flowOrigin
-    ),
-    encoded.message
-  ];
 }
 
 /**
@@ -126,14 +111,17 @@ export function encodeChannelEnvelopePartsAtDeadline(
   channelName: string,
   packetName: string | undefined,
   payload: unknown,
-  deadlineUnixMs: number,
+  deadlineUnixMs: number | undefined,
   topic?: string,
   codecs?: ZLinkChannelEnvelopeCodecRegistry,
   correlationId?: string,
   createFlow = true,
   metadata: ReadonlyMap<string, string> = EMPTY_OUTBOUND_METADATA
 ): readonly MessageLike[] {
-  if (!Number.isSafeInteger(deadlineUnixMs) || deadlineUnixMs <= 0) {
+  if (
+    deadlineUnixMs !== undefined &&
+    (!Number.isSafeInteger(deadlineUnixMs) || deadlineUnixMs <= 0)
+  ) {
     throw new RangeError('deadlineUnixMs must be a positive safe integer.');
   }
   const messageName = resolveFrameworkPacketName(payload, packetName, 'Channel');
@@ -152,7 +140,7 @@ export function encodeChannelEnvelopePartsAtDeadline(
       messageName,
       encoded.contentType,
       envelopeCorrelationId,
-      new Date(deadlineUnixMs).toISOString(),
+      deadlineUnixMs === undefined ? null : new Date(deadlineUnixMs).toISOString(),
       topic ?? null,
       null,
       null,

package/src/runtime/channels/channel-outbound-operations.ts

@@ -4,9 +4,14 @@ import {
   internalFrameworkErrorKind,
   requestResultToPublicErrorKind
 } from '../framework-errors-internal';
+import { waitRequestReply, remainingRequestTimeout } from '../messaging/request-deadline';
 import { isZLinkBackendResultError } from '../backend/runtime-values';
 import type { Message } from '../../contracts/Common/Message';
-import { ZLinkSubmitStatus, type ZLinkSubmitResult } from '../messaging/submission-result';
+import {
+  ZLinkSubmitStatus,
+  classifySubmitResult,
+  type ZLinkSubmitResult
+} from '../messaging/submission-result';
 import {
   ZLinkRuntimeMessageFlowOutcome as ZLinkMessageFlowOutcome,
   type ZLinkRuntimeMessageFlowResult,
@@ -18,6 +23,7 @@ import {
   closeMessages,
   decodeChannelReply,
   encodeChannelEnvelopeParts,
+  encodeChannelEnvelopePartsAtDeadline,
   newChannelCorrelationId,
   type ZLinkChannelEnvelopeCodecRegistry,
   ZLinkChannelMessageKind
@@ -52,13 +58,12 @@ export class ZLinkChannelOutboundOperations {
     channelName: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata: ReadonlyMap<string, string> = EMPTY_OUTBOUND_METADATA
   ): Promise<ZLinkSubmitResult> {
     // Call-scoped flow (spec 27 §4): the envelope encoder and the trace
     // points below share one ambient flow that does not outlive this call.
     return runWithOutboundFlow(this.dispatchServices.flowCreationEnabled(), () =>
-      this.sendScoped(channelName, packetName, message, signal, metadata)
+      this.sendScoped(channelName, packetName, message, metadata)
     );
   }
 
@@ -66,13 +71,11 @@ export class ZLinkChannelOutboundOperations {
     channelName: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata: ReadonlyMap<string, string> = EMPTY_OUTBOUND_METADATA
   ): Promise<ZLinkSubmitResult> {
-    throwIfAborted(signal);
-    const dealer = await this.sockets.awaitClientDealerForOutbound(channelName, signal);
+    const dealer = await this.sockets.awaitClientDealerForOutbound(channelName);
     if (dealer === undefined) {
-      return { status: ZLinkSubmitStatus.TimedOut };
+      return { status: ZLinkSubmitStatus.Shutdown };
     }
     const parts = encodeChannelEnvelopeParts(
       ZLinkChannelMessageKind.Command,
@@ -90,17 +93,8 @@ export class ZLinkChannelOutboundOperations {
       await dealer.send(parts);
     } catch (error) {
       closeMessages(parts);
-      if (isSubmitDeadline(error)) {
-        this.dispatchServices.beginOutbound(ZLinkMessageFlowOutcome.Backpressured)?.trace({
-          surface: ZLinkDispatchErrorSurface.Channel,
-          messageKind: ZLinkDispatchMessageKind.Send,
-          channelName,
-          channelRouteKind: 'client_server',
-          packetName,
-          correlationId: undefined,
-          result: 'backpressured'
-        });
-        return { status: ZLinkSubmitStatus.TimedOut };
+      if (isZLinkBackendResultError(error) && error.operation === 'submit') {
+        return classifySubmitResult(error.result, 'One-way send', error.phase);
       }
       throw error;
     }
@@ -151,6 +145,8 @@ export class ZLinkChannelOutboundOperations {
     signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<TReply> {
+    const deadlineMs = timeoutMs === undefined ? undefined : performance.now() + timeoutMs;
+    const deadlineUnixMs = timeoutMs === undefined ? undefined : Date.now() + timeoutMs;
     let correlationId: string | undefined;
     let selectedServerRid: string | undefined;
     let terminalRecorded = false;
@@ -170,7 +166,16 @@ export class ZLinkChannelOutboundOperations {
     };
     try {
       throwIfAborted(signal);
-      const dealer = await this.sockets.awaitClientDealerForOutbound(channelName, signal);
+      const readyWait = new AbortController();
+      const readySignal =
+        signal === undefined ? readyWait.signal : AbortSignal.any([signal, readyWait.signal]);
+      const dealer = await waitRequestReply(
+        this.sockets.awaitClientDealerForOutbound(channelName, readySignal),
+        `Channel request '${channelName}'`,
+        deadlineMs,
+        signal,
+        () => readyWait.abort()
+      );
       if (dealer === undefined) {
         throw createInternalFrameworkException(
           ZLinkFrameworkInternalErrorKind.DeadlineExceeded,
@@ -180,12 +185,12 @@ export class ZLinkChannelOutboundOperations {
       const serverRid = this.sockets.selectedClientServerRid(channelName, dealer);
       selectedServerRid = serverRid;
       correlationId = newChannelCorrelationId();
-      const parts = encodeChannelEnvelopeParts(
+      const parts = encodeChannelEnvelopePartsAtDeadline(
         ZLinkChannelMessageKind.Request,
         channelName,
         packetName,
         request,
-        timeoutMs,
+        deadlineUnixMs,
         undefined,
         this.codecs,
         correlationId,
@@ -205,7 +210,13 @@ export class ZLinkChannelOutboundOperations {
         let replyParts: readonly Message[] = [];
         try {
           try {
-            replyParts = await awaitWithAbort(dealer.request(parts, timeoutMs), signal);
+            replyParts = await awaitWithAbort(
+              dealer.request(
+                parts,
+                remainingRequestTimeout(`Channel request '${channelName}'`, deadlineMs)
+              ),
+              signal
+            );
           } catch (error) {
             if (signal?.aborted === true) throw error;
             //  Spec 32-framework-error-model:81-92 — classify the backend request
@@ -325,11 +336,10 @@ export class ZLinkChannelOutboundOperations {
     targetNodeRid: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata: ReadonlyMap<string, string> = EMPTY_OUTBOUND_METADATA
   ): Promise<ZLinkSubmitResult> {
     return runWithOutboundFlow(this.dispatchServices.flowCreationEnabled(), () =>
-      this.routeSubmitScoped(routerChannelId, targetNodeRid, packetName, message, signal, metadata)
+      this.routeSubmitScoped(routerChannelId, targetNodeRid, packetName, message, metadata)
     );
   }
 
@@ -338,10 +348,8 @@ export class ZLinkChannelOutboundOperations {
     targetNodeRid: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata: ReadonlyMap<string, string> = EMPTY_OUTBOUND_METADATA
   ): Promise<ZLinkSubmitResult> {
-    throwIfAborted(signal);
     const router = this.sockets.routeRouter(routerChannelId);
     const parts = encodeChannelEnvelopeParts(
       ZLinkChannelMessageKind.Command,
@@ -358,18 +366,8 @@ export class ZLinkChannelOutboundOperations {
     try {
       await router.send(targetNodeRid, parts);
     } catch (error) {
-      if (isSubmitDeadline(error)) {
-        this.dispatchServices.beginOutbound(ZLinkMessageFlowOutcome.Backpressured)?.trace({
-          surface: ZLinkDispatchErrorSurface.RouteMeshChannel,
-          messageKind: ZLinkDispatchMessageKind.Send,
-          channelName: routerChannelId,
-          channelRouteKind: 'route_mesh',
-          packetName,
-          correlationId: undefined,
-          targetRid: targetNodeRid,
-          result: 'backpressured'
-        });
-        return { status: ZLinkSubmitStatus.TimedOut };
+      if (isZLinkBackendResultError(error) && error.operation === 'submit') {
+        return classifySubmitResult(error.result, 'One-way send', error.phase);
       }
       throw error;
     }

package/src/runtime/channels/channel-runtime-manager.ts

@@ -233,10 +233,9 @@ export class ZLinkChannelRuntimeManager {
     channelName: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult> {
-    return this.outbound.send(channelName, packetName, message, signal, metadata);
+    return this.outbound.send(channelName, packetName, message, metadata);
   }
 
   async request<TReply>(
@@ -283,17 +282,9 @@ export class ZLinkChannelRuntimeManager {
     targetNodeRid: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult> {
-    return this.outbound.routeSubmit(
-      routerChannelId,
-      targetNodeRid,
-      packetName,
-      message,
-      signal,
-      metadata
-    );
+    return this.outbound.routeSubmit(routerChannelId, targetNodeRid, packetName, message, metadata);
   }
 
   async routeRequest<TReply>(
@@ -320,18 +311,9 @@ export class ZLinkChannelRuntimeManager {
     spotRouteTarget: ZLinkSpotRouteTarget,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
-    metadata?: ReadonlyMap<string, string>,
-    timeoutMs?: number
+    metadata?: ReadonlyMap<string, string>
   ): Promise<void> {
-    return this.spotRoutes.routeSendToSpot(
-      spotRouteTarget,
-      packetName,
-      message,
-      signal,
-      metadata,
-      timeoutMs
-    );
+    return this.spotRoutes.routeSendToSpot(spotRouteTarget, packetName, message, metadata);
   }
 
   async routeRequestToSpot<TReply>(
@@ -375,18 +357,14 @@ export class ZLinkChannelRuntimeManager {
     spotRouteTarget: ZLinkSpotRouteTarget,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
-    metadata?: ReadonlyMap<string, string>,
-    timeoutMs?: number
+    metadata?: ReadonlyMap<string, string>
   ): Promise<void> {
     return this.spotRoutes.routeSendFromSpotToSpot(
       sourceSpot,
       spotRouteTarget,
       packetName,
       message,
-      signal,
-      metadata,
-      timeoutMs
+      metadata
     );
   }
 

package/src/runtime/channels/channel-socket-options.ts

@@ -59,15 +59,6 @@ class ZLinkLiveSocketConfig implements ZLinkSocketConfig {
     requireValidSendTimeoutMs('receiveTimeoutMs', value);
     this.socket.receiveTimeoutMs = value;
   }
-
-  get sendTimeoutMs(): number {
-    return this.socket.sendTimeoutMs;
-  }
-
-  set sendTimeoutMs(value: number) {
-    validateSendTimeout(value);
-    this.socket.sendTimeoutMs = value;
-  }
 }
 
 class ZLinkServerRuntimeOptions {
@@ -155,7 +146,3 @@ function validateHighWaterMark(value: number, label: string): void {
     throw new ZLinkConfigurationException(`${label} must be a non-negative integer.`);
   }
 }
-
-function validateSendTimeout(value: number): void {
-  requireValidSendTimeoutMs('sendTimeoutMs', value);
-}

package/src/runtime/channels/channel-socket-registry.ts

@@ -300,8 +300,7 @@ export class ZLinkChannelSocketRegistry {
       dealer.setRoutingId(deriveRoutingId(channel.routingId, 'dealer'));
     }
     applySocketConfig(dealer, {
-      ...client,
-      sendTimeoutMs: configuredSendTimeoutMs(client.sendTimeoutMs)
+      ...client
     });
     return dealer;
   }
@@ -455,8 +454,7 @@ export class ZLinkChannelSocketRegistry {
       dealer.setChannelName(channelName);
       dealer.setRoutingId(`cs-client-${randomUUID()}`);
       applySocketConfig(dealer, {
-        ...client,
-        sendTimeoutMs: configuredSendTimeoutMs(client.sendTimeoutMs)
+        ...client
       });
       connection.readablePoller = this.adapter.createReadablePoller(dealer);
       created.push(connection.readablePoller);
@@ -692,7 +690,7 @@ export class ZLinkChannelSocketRegistry {
     return undefined;
   }
 
-  /** Observes discovery changes until the client DEALER admission deadline. */
+  /** Observes discovery changes until a server is ready or the runtime closes. */
   async awaitClientDealerForOutbound(
     channelName: string,
     signal?: AbortSignal
@@ -711,12 +709,8 @@ export class ZLinkChannelSocketRegistry {
     };
     const dealer = select();
     if (dealer !== undefined) return dealer;
-    const sendTimeoutMs = configuredSendTimeoutMs(
-      this.registration.channels.get(channelName)?.client?.sendTimeoutMs
-    );
     return new Promise((resolve, reject) => {
       const cleanup = (): void => {
-        clearTimeout(deadline);
         unsubscribe();
         signal?.removeEventListener('abort', abort);
       };
@@ -737,10 +731,6 @@ export class ZLinkChannelSocketRegistry {
         }
       };
       const unsubscribe = this.clientServerDiscovery.onClientServerChanged(changed);
-      const deadline = setTimeout(() => {
-        cleanup();
-        resolve(undefined);
-      }, sendTimeoutMs);
       signal?.addEventListener('abort', abort, { once: true });
       // Registration and selection share one event-loop turn; recheck after subscribing.
       changed();
@@ -2016,7 +2006,6 @@ function applySocketConfig(
     readonly sendHighWaterMark?: number;
     readonly receiveHighWaterMark?: number;
     readonly receiveTimeoutMs?: number;
-    readonly sendTimeoutMs?: number;
     readonly maxMessageSize?: number;
   }
 ): void {
@@ -2029,9 +2018,6 @@ function applySocketConfig(
   if (config.receiveTimeoutMs !== undefined) {
     socket.receiveTimeoutMs = config.receiveTimeoutMs;
   }
-  if (config.sendTimeoutMs !== undefined) {
-    socket.sendTimeoutMs = config.sendTimeoutMs;
-  }
   if (config.maxMessageSize !== undefined) {
     socket.maxMessageSize = config.maxMessageSize;
   }

package/src/runtime/channels/channel-transports.ts

@@ -66,7 +66,6 @@ export interface ZLinkChannelClientTransport {
     channelName: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): void | ZLinkSubmitResult | Promise<void | ZLinkSubmitResult>;
   request<TReply>(
@@ -123,7 +122,6 @@ export interface ZLinkRouteClientTransport {
     targetNodeRid: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): void | ZLinkSubmitResult | Promise<void | ZLinkSubmitResult>;
   request<TReply>(
@@ -140,7 +138,6 @@ export interface ZLinkRouteClientTransport {
     channelName: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): void | ZLinkSubmitResult | Promise<void | ZLinkSubmitResult>;
   requestToChannel<TReply>(
@@ -157,8 +154,6 @@ export interface ZLinkRouteClientTransport {
     message: unknown,
     options: {
       readonly packetName?: string;
-      readonly timeoutMs?: number;
-      readonly signal?: AbortSignal;
       readonly metadata?: ReadonlyMap<string, string>;
     }
   ): Promise<ZLinkSubmitResult>;
@@ -179,7 +174,6 @@ interface ZLinkChannelTransportRuntime {
     channelName: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult>;
   request<TReply>(
@@ -212,7 +206,6 @@ interface ZLinkChannelTransportRuntime {
     targetNodeRid: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult>;
   routeRequest<TReply>(
@@ -228,18 +221,14 @@ interface ZLinkChannelTransportRuntime {
     spotRouteTarget: ZLinkSpotRouteTarget,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
-    metadata?: ReadonlyMap<string, string>,
-    timeoutMs?: number
+    metadata?: ReadonlyMap<string, string>
   ): Promise<void>;
   routeSendFromSpotToSpot(
     sourceSpot: ZLinkBackendSpot,
     spotRouteTarget: ZLinkSpotRouteTarget,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
-    metadata?: ReadonlyMap<string, string>,
-    timeoutMs?: number
+    metadata?: ReadonlyMap<string, string>
   ): Promise<void>;
   routeRequestToSpot<TReply>(
     spotRouteTarget: ZLinkSpotRouteTarget,
@@ -323,13 +312,12 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
     targetNodeRid: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult> {
     // Call-scoped flow (spec 27 §4): the envelope flow pair lives only for
     // the duration of this outbound call, never in the caller's context.
     return runWithOutboundFlow(this.flowCreationEnabled(), () =>
-      this.submitNode(meshName, targetNodeRid, packetName, message, signal, metadata, false)
+      this.submitNode(meshName, targetNodeRid, packetName, message, metadata, false)
     );
   }
 
@@ -338,11 +326,10 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
     targetNodeRid: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult> {
     return runWithOutboundFlow(this.flowCreationEnabled(), () =>
-      this.submitNode(meshName, targetNodeRid, packetName, message, signal, metadata, true)
+      this.submitNode(meshName, targetNodeRid, packetName, message, metadata, true)
     );
   }
 
@@ -351,7 +338,6 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
     targetNodeRid: string,
     packetName: string | undefined,
     message: unknown,
-    signal: AbortSignal | undefined,
     metadata: ReadonlyMap<string, string> | undefined,
     allowObjectClientTarget: boolean
   ): Promise<ZLinkSubmitResult> {
@@ -362,11 +348,9 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
         targetNodeRid,
         packetName,
         message,
-        signal,
         metadata
       );
     }
-    throwIfAborted(signal);
     if (
       !allowObjectClientTarget &&
       node.isObjectClientNodeDirectTarget?.(toBackendRoutingId(targetNodeRid)) === true
@@ -536,11 +520,10 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
     channelName: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult> {
     return runWithOutboundFlow(this.flowCreationEnabled(), () =>
-      this.submitToChannelScoped(meshName, channelName, packetName, message, signal, metadata)
+      this.submitToChannelScoped(meshName, channelName, packetName, message, metadata)
     );
   }
 
@@ -549,10 +532,8 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
     channelName: string,
     packetName: string | undefined,
     message: unknown,
-    signal?: AbortSignal,
     metadata?: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult> {
-    throwIfAborted(signal);
     const node = this.requireMeshNode(meshName);
     const parts = this.encodeMessage(
       ZLinkChannelMessageKind.Command,
@@ -693,13 +674,10 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
         spotRouteTarget,
         options.packetName,
         message,
-        options.signal,
-        options.metadata,
-        options.timeoutMs
+        options.metadata
       );
       return { status: ZLinkSubmitStatus.Submitted };
     }
-    throwIfAborted(options.signal);
     const operation = `MeshNode '${spotRouteTarget.routerChannelId}' send to Spot '${spotRouteTarget.spotId}'`;
     try {
       const encoded = this.encodeMessage(
@@ -747,8 +725,6 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
     message: unknown,
     options: {
       readonly packetName?: string;
-      readonly timeoutMs?: number;
-      readonly signal?: AbortSignal;
       readonly metadata?: ReadonlyMap<string, string>;
     }
   ): Promise<ZLinkSubmitResult> {
@@ -757,9 +733,7 @@ export class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTransport {
       spotRouteTarget,
       options.packetName,
       message,
-      options.signal,
-      options.metadata,
-      options.timeoutMs
+      options.metadata
     );
     return { status: ZLinkSubmitStatus.Submitted };
   }