@zlink-systems/framework 0.27.0 → 0.28.0

package/dist/runtime/streams/session-context.js

@@ -306,21 +306,18 @@ class DefaultZLinkSessionActor {
         }
         this.currentRef = ref;
     }
-    async relay(dispatchOrPayload, payloadOrSignal, signal) {
+    async relay(dispatchOrPayload, selectedPayload) {
         const dispatch = isSessionDispatchContext(dispatchOrPayload) ? dispatchOrPayload : undefined;
         let payload;
-        let relaySignal;
         let header;
         if (dispatch === undefined) {
             payload = dispatchOrPayload;
-            relaySignal = payloadOrSignal;
         }
         else {
-            payload = payloadOrSignal;
-            relaySignal = signal;
+            payload = selectedPayload;
             header = sessionDispatchHeader(dispatch);
         }
-        const result = await this.runtime.relay(this, payload, relaySignal, header);
+        const result = await this.runtime.relay(this, payload, header);
         (0, submission_result_1.requireOneWayCompletion)(result, 'Session Actor relay', framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorSessionNotBound);
     }
     notifyDisconnected(signal) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlink-systems/framework",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/api-logs": "^0.221.0",
-    "@zlink-systems/stream-wire": "0.27.0",
-    "@zlink-systems/zlink": "1.14.0"
+    "@zlink-systems/stream-wire": "0.28.0",
+    "@zlink-systems/zlink": "1.15.0"
   }
 }

package/src/contracts/Actors/ZLinkActorClient.ts

@@ -7,7 +7,7 @@ export interface ZLinkActorClient {
 
 export interface ZLinkActorSendCall {
   metadata(key: string, value: string): this;
-  submit(signal?: AbortSignal): Promise<void>;
+  submit(): Promise<void>;
 }
 
 export interface ZLinkActorRequestCall {

package/src/contracts/Channels/Calls.ts

@@ -3,7 +3,7 @@ import type { ZLinkMessageMetadata } from '../Common';
 export interface ZLinkSendCall {
   metadata(key: string, value: string): this;
   metadata(metadata: ZLinkMessageMetadata): this;
-  submit(signal?: AbortSignal): Promise<void>;
+  submit(): Promise<void>;
 }
 
 export interface ZLinkRequestCall {

package/src/contracts/Configuration/Builders.ts

@@ -100,7 +100,6 @@ export interface ZLinkMeshNodeSocketConfig {
   sendHighWaterMark: number;
   receiveHighWaterMark: number;
   receiveTimeoutMs?: number;
-  sendTimeoutMs?: number;
 }
 
 export interface ZLinkStreamSocketConfig {

package/src/contracts/Configuration/Configs.ts

@@ -8,7 +8,6 @@ export interface ZLinkSocketConfig {
   sendHighWaterMark?: number;
   receiveHighWaterMark?: number;
   receiveTimeoutMs?: number;
-  sendTimeoutMs?: number;
 }
 
 export interface ZLinkRouteConfig {

package/src/contracts/Configuration/RegistrationBuilders.ts

@@ -1586,7 +1586,6 @@ interface MutableServerCapabilityOptions {
   weight?: number;
   sendHighWaterMark?: number;
   receiveHighWaterMark?: number;
-  sendTimeoutMs?: number;
   maxMessageSize?: number;
 }
 
@@ -1594,7 +1593,6 @@ interface MutableClientCapabilityOptions {
   manualConnections?: string[];
   sendHighWaterMark?: number;
   receiveHighWaterMark?: number;
-  sendTimeoutMs?: number;
   maxMessageSize?: number;
 }
 
@@ -1690,7 +1688,6 @@ interface MutableSpotRouterCapabilityOptions {
   sendHighWaterMark?: number;
   receiveHighWaterMark?: number;
   receiveTimeoutMs?: number;
-  sendTimeoutMs?: number;
 }
 
 interface MutableSpotPubSubCapabilityOptions {

package/src/contracts/Configuration/RegistrationTypes.ts

@@ -183,7 +183,6 @@ export interface ZLinkChannelOptions {
     readonly weight?: number;
     readonly sendHighWaterMark?: number;
     readonly receiveHighWaterMark?: number;
-    readonly sendTimeoutMs?: number;
     readonly maxMessageSize?: number;
   };
   readonly subscriber?: ZLinkClientCapabilityOptions;
@@ -193,7 +192,6 @@ export interface ZLinkClientCapabilityOptions {
   readonly manualConnections?: readonly string[];
   readonly sendHighWaterMark?: number;
   readonly receiveHighWaterMark?: number;
-  readonly sendTimeoutMs?: number;
   readonly maxMessageSize?: number;
 }
 
@@ -214,7 +212,6 @@ export interface ZLinkRouteMeshChannelOptions {
   readonly weight?: number;
   readonly sendHighWaterMark?: number;
   readonly receiveHighWaterMark?: number;
-  readonly sendTimeoutMs?: number;
   readonly sendHandlers?: readonly ZLinkRouteChannelSendHandlerRegistration[];
   readonly requestHandlers?: readonly ZLinkRouteChannelRequestHandlerRegistration[];
   readonly handlers?: readonly ZLinkRouteChannelHandlerOptions[];
@@ -230,7 +227,6 @@ export interface ZLinkRouteChannelOptions {
   readonly weight?: number;
   readonly sendHighWaterMark?: number;
   readonly receiveHighWaterMark?: number;
-  readonly sendTimeoutMs?: number;
   readonly sendHandlers?: readonly ZLinkRouteChannelSendHandlerRegistration[];
   readonly requestHandlers?: readonly ZLinkRouteChannelRequestHandlerRegistration[];
   readonly handlers?: readonly ZLinkRouteChannelHandlerOptions[];
@@ -430,7 +426,6 @@ export interface ZLinkSpotRouterCapabilityOptions {
   readonly sendHighWaterMark?: number;
   readonly receiveHighWaterMark?: number;
   readonly receiveTimeoutMs?: number;
-  readonly sendTimeoutMs?: number;
 }
 
 export interface ZLinkSpotRouterPeerConnectionOptions {

package/src/contracts/Configuration/RegistrationValidators.ts

@@ -730,14 +730,12 @@ function requireSocketOptions(
   options: {
     readonly sendHighWaterMark?: number;
     readonly receiveHighWaterMark?: number;
-    readonly sendTimeoutMs?: number;
     readonly maxMessageSize?: number;
   }
 ): void {
   requireNonNegativeInteger(`${label} sendHighWaterMark`, options.sendHighWaterMark);
   requireNonNegativeInteger(`${label} receiveHighWaterMark`, options.receiveHighWaterMark);
   requireNonNegativeInteger(`${label} maxMessageSize`, options.maxMessageSize);
-  requireValidSendTimeoutMs(`${label} sendTimeoutMs`, options.sendTimeoutMs);
 }
 
 function requireRouteMeshSocketOptions(
@@ -745,10 +743,8 @@ function requireRouteMeshSocketOptions(
   options: {
     readonly sendHighWaterMark?: number;
     readonly receiveHighWaterMark?: number;
-    readonly sendTimeoutMs?: number;
   }
 ): void {
   requireNonNegativeInteger(`${label} sendHighWaterMark`, options.sendHighWaterMark);
   requireNonNegativeInteger(`${label} receiveHighWaterMark`, options.receiveHighWaterMark);
-  requireValidSendTimeoutMs(`${label} sendTimeoutMs`, options.sendTimeoutMs);
 }

package/src/contracts/Spots/Contracts.ts

@@ -96,7 +96,7 @@ export interface ZLinkSpotSendCall {
   instanceSpot(): this;
   instanceSpot(instanceSpotType: string): this;
   inMesh(meshName: string): this;
-  submit(signal?: AbortSignal): Promise<void>;
+  submit(): Promise<void>;
 }
 
 export interface ZLinkSpotRequestCall {

package/src/contracts/Streams/BoundSessionContracts.ts

@@ -5,5 +5,5 @@ export interface ZLinkBoundSession {
 
 export interface ZLinkBoundSessionSendCall {
   metadata(key: string, value: string): this;
-  submit(signal?: AbortSignal): Promise<void>;
+  submit(): Promise<void>;
 }

package/src/contracts/Streams/IZLinkSession.ts

@@ -42,11 +42,10 @@ export interface ZLinkSessionClient {
 export interface ZLinkSessionSendCall {
   metadata(key: string, value: string): this;
   compress(enabled?: boolean): this;
-  timeout(timeoutMs: number): this;
-  submit(signal?: AbortSignal): Promise<void>;
+  submit(): Promise<void>;
 }
 
 export interface ZLinkSessionReplyCall {
   compress(enabled?: boolean): this;
-  submit(signal?: AbortSignal): Promise<void>;
+  submit(): Promise<void>;
 }

package/src/contracts/Streams/IZLinkSessionActor.ts

@@ -11,11 +11,7 @@ export interface ZLinkSessionActors {
 export interface ZLinkSessionActor {
   readonly actorId: string;
   readonly ref: ActorRef;
-  relay(payload: ZLinkMessage, signal?: AbortSignal): Promise<void>;
-  relay(
-    dispatch: ZLinkSessionDispatchContext,
-    payload: ZLinkMessage,
-    signal?: AbortSignal
-  ): Promise<void>;
+  relay(payload: ZLinkMessage): Promise<void>;
+  relay(dispatch: ZLinkSessionDispatchContext, payload: ZLinkMessage): Promise<void>;
   notifyDisconnected(signal?: AbortSignal): Promise<void>;
 }

package/src/runtime/actors/actor-client.ts

@@ -13,7 +13,7 @@ import {
 
 import { ZLINK_MAX_ACTOR_ID_BYTES } from '../../contracts/Common/CoreTypes';
 import type { Message } from '../../contracts/Common/Message';
-import { awaitWithAbort, throwIfAborted } from '../abort';
+import { throwIfAborted } from '../abort';
 import {
   type ZLinkBackendActorRef,
   type ZLinkBackendMeshNode,
@@ -110,7 +110,7 @@ export class DefaultZLinkActorClient implements ZLinkActorClient {
   sendToActor(actorId: string, message: unknown): ZLinkActorSendCall {
     requireActorId(actorId);
     return new DefaultZLinkActorSendCall(
-      (packetName, metadata, signal) => this.send(actorId, packetName, message, metadata, signal),
+      (packetName, metadata) => this.send(actorId, packetName, message, metadata),
       message
     );
   }
@@ -132,11 +132,9 @@ export class DefaultZLinkActorClient implements ZLinkActorClient {
     actorId: string,
     explicitPacketName: string | undefined,
     message: unknown,
-    metadata: ReadonlyMap<string, string>,
-    signal?: AbortSignal
+    metadata: ReadonlyMap<string, string>
   ): Promise<ZLinkSubmitResult> {
-    throwIfAborted(signal);
-    const route = await this.resolveActorRoute(actorId, signal);
+    const route = await this.resolveActorRoute(actorId);
     const { meshName, actorRef: actor } = route;
     this.throwIfKnownStale(meshName, actor);
     const parts = this.createPacketParts(
@@ -150,9 +148,7 @@ export class DefaultZLinkActorClient implements ZLinkActorClient {
     const routedActor = attachActorMessageFollowContext(actor, messageFollow);
     try {
       const submissionCopies =
-        (await this.options
-          .transportDeliveryGate?.()
-          ?.waitBeforeSubmit(actorId, 'oneWay', signal)) ?? 1;
+        (await this.options.transportDeliveryGate?.()?.waitBeforeSubmit(actorId, 'oneWay')) ?? 1;
       const handoff = this.options.handoffCapture?.(
         meshName,
         actor.actorId,
@@ -172,7 +168,7 @@ export class DefaultZLinkActorClient implements ZLinkActorClient {
           );
           if (duplicate !== undefined) submissions.push(duplicate);
         }
-        await awaitWithAbort(Promise.all(submissions), signal);
+        await Promise.all(submissions);
         return { status: ZLinkSubmitStatus.Submitted };
       }
       const node = this.requireNode(meshName);
@@ -662,8 +658,7 @@ class DefaultZLinkActorSendCall implements ZLinkActorSendCall {
   constructor(
     private readonly submitter: (
       packetName: string | undefined,
-      metadata: ReadonlyMap<string, string>,
-      signal?: AbortSignal
+      metadata: ReadonlyMap<string, string>
     ) => Promise<ZLinkSubmitResult>,
     private readonly message: unknown
   ) {}
@@ -678,13 +673,12 @@ class DefaultZLinkActorSendCall implements ZLinkActorSendCall {
     return this;
   }
 
-  async submit(signal?: AbortSignal): Promise<void> {
+  async submit(): Promise<void> {
     ensureSingleSubmit(this.executed);
     this.executed = true;
     const result = await this.submitter(
       this.packet ?? resolveFrameworkPacketName(this.message, undefined, 'Actor'),
-      this.selectedMetadata,
-      signal
+      this.selectedMetadata
     );
     requireOneWayCompletion(
       result,

package/src/runtime/actors/actor-request-deadline.ts

@@ -1,49 +1,4 @@
-import { awaitWithAbort } from '../abort';
-import {
-  createInternalFrameworkException,
-  ZLinkFrameworkInternalErrorKind
-} from '../framework-errors-internal';
-
-export function remainingActorRequestTimeout(
-  actorId: string,
-  deadlineMs: number | undefined
-): number | undefined {
-  if (deadlineMs === undefined) return undefined;
-  const remaining = deadlineMs - performance.now();
-  if (remaining <= 0) {
-    throw createInternalFrameworkException(
-      ZLinkFrameworkInternalErrorKind.DeadlineExceeded,
-      `Actor request '${actorId}' exceeded its deadline.`
-    );
-  }
-  return Math.max(1, Math.ceil(remaining));
-}
-
-/** Only actual Store, delivery-gate, and handoff waits acquire a deadline handle. */
-export async function waitActorReply<T>(
-  reply: Promise<T>,
-  actorId: string,
-  deadlineMs: number | undefined,
-  signal?: AbortSignal
-): Promise<T> {
-  if (deadlineMs === undefined) return await awaitWithAbort(reply, signal);
-  let timer: ReturnType<typeof setTimeout> | undefined;
-  const timeout = new Promise<never>((_resolve, reject) => {
-    const remaining = remainingActorRequestTimeout(actorId, deadlineMs);
-    timer = setTimeout(
-      () =>
-        reject(
-          createInternalFrameworkException(
-            ZLinkFrameworkInternalErrorKind.DeadlineExceeded,
-            `Actor request '${actorId}' exceeded its deadline.`
-          )
-        ),
-      remaining
-    );
-  });
-  try {
-    return await awaitWithAbort(Promise.race([reply, timeout]), signal);
-  } finally {
-    clearTimeout(timer);
-  }
-}
+export {
+  remainingRequestTimeout as remainingActorRequestTimeout,
+  waitRequestReply as waitActorReply
+} from '../messaging/request-deadline';

package/src/runtime/actors/actor-routed-join-transport.ts

@@ -18,20 +18,18 @@ export interface ZLinkActorRoutedJoinTransport {
     routerChannelId: string,
     targetNodeRid: string,
     packetName: string | undefined,
-    message: unknown,
-    signal?: AbortSignal
+    message: unknown
   ): Promise<ZLinkSubmitResult>;
   submitInfrastructure?(
     routerChannelId: string,
     targetNodeRid: string,
     packetName: string | undefined,
-    message: unknown,
-    signal?: AbortSignal
+    message: unknown
   ): Promise<ZLinkSubmitResult>;
   sendToSpot(
     spotRouteTarget: ZLinkSpotRouteTarget,
     message: unknown,
-    options: { readonly packetName?: string; readonly signal?: AbortSignal }
+    options: { readonly packetName?: string }
   ): Promise<ZLinkSubmitResult>;
   requestRawToSpot?(
     spotRouteTarget: ZLinkSpotRouteTarget,

package/src/runtime/backend/contracts/index.ts

@@ -492,7 +492,6 @@ export interface ZLinkBackendDealerSocket extends ZLinkBackendConnectableSocket
   sendHighWaterMark: number;
   receiveHighWaterMark: number;
   receiveTimeoutMs: number;
-  sendTimeoutMs: number;
   maxMessageSize: number;
   send(message: Message | readonly Message[]): Promise<void>;
   request(message: Message | readonly Message[], timeoutMs?: number): Promise<readonly Message[]>;
@@ -523,7 +522,6 @@ export interface ZLinkBackendRouterSocket extends ZLinkBackendConnectableSocket
   sendHighWaterMark: number;
   receiveHighWaterMark: number;
   receiveTimeoutMs: number;
-  sendTimeoutMs: number;
   maxMessageSize: number;
   setRoutingId(routingId: RoutingId): void;
   recv(flags?: ZLinkBackendRecvFlags): Received | undefined;
@@ -577,7 +575,6 @@ export interface ZLinkBackendStreamPacket {
 }
 
 export interface ZLinkBackendStreamSocket extends ZLinkBackendSocket {
-  readonly sendTimeoutMs: number;
   readonly sendHighWaterMark: number;
   /** Framework stream ingress uses this bound for packet payload validation. */
   maxMessageSize: number;
@@ -588,11 +585,7 @@ export interface ZLinkBackendStreamSocket extends ZLinkBackendSocket {
     payload: Message | readonly Message[],
     flags: ZLinkBackendSendFlags
   ): boolean;
-  submit(
-    routingId: RoutingId,
-    payload: Message | readonly Message[],
-    timeoutMs?: number
-  ): Promise<void>;
+  submit(routingId: RoutingId, payload: Message | readonly Message[]): Promise<void>;
   disconnectPeer(routingId: RoutingId): void;
   bindActor(
     sessionRid: RoutingId,

package/src/runtime/backend/node/node-backend-adapter-support.ts

@@ -1,5 +1,9 @@
 import { constants as osConstants } from 'node:os';
-import { requireOneWayCompletion, ZLinkSubmitStatus } from '../../messaging/submission-result';
+import { waitRequestReply } from '../../messaging/request-deadline';
+import {
+  requireClassicFanoutCompletion,
+  ZLinkSubmitStatus
+} from '../../messaging/submission-result';
 import { loadBinding } from '../node-backend-adapter';
 import { SubmitResult, ZLinkBackendResultError } from '../runtime-values';
 const nativeErrnoValues = osConstants.errno;
@@ -92,7 +96,7 @@ export function submitBindingPublish(
       (translated.result === SubmitResult.Backpressured ||
         translated.result === SubmitResult.NotAdmitted)
     ) {
-      requireOneWayCompletion(
+      requireClassicFanoutCompletion(
         { status: ZLinkSubmitStatus.Backpressured },
         'Classic fanout publish'
       );
@@ -119,6 +123,7 @@ export async function submitBindingAsyncSend(
   operation: ZLinkBindingAsyncSendOperation,
   payload: unknown
 ): Promise<void> {
+  let submission: import('@zlink-systems/zlink').SendSubmission;
   try {
     let current: ZLinkBindingAsyncSendSubmitOperation | undefined;
     const parts = Array.isArray(payload) ? payload : [payload];
@@ -127,9 +132,16 @@ export async function submitBindingAsyncSend(
       current = current === undefined ? operation.message(nativePart) : current.message(nativePart);
     }
     current ??= operation.message(Buffer.alloc(0));
-    await current.submit().admitted;
+    submission = current.submit();
   } catch (error) {
-    throw translateBindingResultError(error);
+    throw translateBindingResultError(error, 'submit');
+  }
+  if (submission.result === SubmitResult.Backpressured) {
+    try {
+      await submission.admitted;
+    } catch (error) {
+      throw translateBindingResultError(error, 'completion');
+    }
   }
 }
 
@@ -156,6 +168,7 @@ export async function submitBindingRequest(
   payload: unknown,
   timeoutMs: number | undefined
 ): Promise<readonly unknown[]> {
+  const deadlineMs = timeoutMs === undefined ? undefined : performance.now() + timeoutMs;
   try {
     let current: ZLinkBindingRequestSubmitOperation | undefined;
     if (Array.isArray(payload)) {
@@ -171,12 +184,39 @@ export async function submitBindingRequest(
     if (timeoutMs !== undefined) {
       current = current.timeout(timeoutMs);
     }
-    return await current.submit().reply;
+    return await bindingRequestReply(current.submit(), deadlineMs);
   } catch (error) {
     throw translateBindingResultError(error);
   }
 }
 
+export async function bindingRequestReply(
+  submission: import('@zlink-systems/zlink').RequestSubmission,
+  deadlineMs: number | undefined
+): Promise<import('@zlink-systems/zlink').Message[]> {
+  const reply = submission.reply;
+  if (submission.result === SubmitResult.Backpressured) {
+    try {
+      const [, replies] = await waitRequestReply(
+        Promise.all([submission.admitted, reply]),
+        'Request',
+        deadlineMs
+      );
+      return replies;
+    } catch (error) {
+      void reply.then(closeBindingReply, () => undefined);
+      throw error;
+    }
+  }
+  return reply;
+}
+
+export function closeBindingReply(
+  replies: readonly import('@zlink-systems/zlink').Message[]
+): void {
+  for (const reply of replies) reply.close();
+}
+
 /**
  * Closes a binding handle once. An already closed or terminated handle counts as
  * closed. A busy close propagates to the caller.

package/src/runtime/backend/node/node-dealer-channel-client-transport.ts

@@ -24,10 +24,8 @@ export class ZLinkDealerChannelClientTransport implements ZLinkChannelClientTran
     channelName: string,
     packetName: string | undefined,
     message: Message,
-    signal?: AbortSignal,
     metadata: ReadonlyMap<string, string> = EMPTY_METADATA
   ): Promise<ZLinkSubmitResult> {
-    throwIfAborted(signal);
     // Call-scoped flow (spec 27 §4): the envelope flow pair does not outlive
     // this outbound call.
     await runWithOutboundFlow(

package/src/runtime/backend/node/node-raw-binding-port.ts

@@ -7,7 +7,6 @@ import {
   createDealerSocket,
   createRouterSocket,
   ReceiveFlowState,
-  SubmitResult,
   type Context,
   type DealerSocket,
   type MonitorEvent,
@@ -18,11 +17,13 @@ import {
   type RequestOperation,
   type RequestSubmitOperation,
   type RouterSocket,
-  type SendOperation,
-  type SendSubmitOperation,
   type Socket
 } from '@zlink-systems/zlink';
-import { translateBindingResultError } from './node-backend-adapter-support';
+import {
+  translateBindingResultError,
+  bindingRequestReply,
+  submitBindingAsyncSend
+} from './node-backend-adapter-support';
 import { isEndpointCloseIgnorableError } from './node-socket-backend-adapter';
 import { ZLinkNodeEventLoopPoller } from './node-event-loop-poller';
 import type {
@@ -266,15 +267,10 @@ class NodeRawRouterPort extends NodeRawSocketPort<RouterSocket> implements ZLink
     this.connect(endpoint);
   }
 
-  async send(targetRid: string, parts: readonly Uint8Array[]): Promise<void> {
+  send(targetRid: string, parts: readonly Uint8Array[]): Promise<void> {
     this.requireOpen();
-    const submission = appendSendParts(
-      this.socket.send(bindingRoutingId(targetRid)),
-      parts
-    ).submit();
-    if (submission.result === SubmitResult.Backpressured) {
-      await submission.admitted;
-    }
+    requireParts(parts);
+    return submitBindingAsyncSend(this.socket.send(bindingRoutingId(targetRid)), parts);
   }
 
   async request(
@@ -283,6 +279,7 @@ class NodeRawRouterPort extends NodeRawSocketPort<RouterSocket> implements ZLink
     timeoutMs: number
   ): Promise<readonly Buffer[]> {
     this.requireOpen();
+    const deadlineMs = performance.now() + timeoutMs;
     let submission: ReturnType<RequestSubmitOperation['submit']>;
     try {
       submission = appendRequestParts(this.socket.request(bindingRoutingId(targetRid)), parts)
@@ -292,7 +289,7 @@ class NodeRawRouterPort extends NodeRawSocketPort<RouterSocket> implements ZLink
       throw translateBindingResultError(error, 'submit');
     }
     try {
-      const replies = await requestReply(submission);
+      const replies = await bindingRequestReply(submission, deadlineMs);
       return copyAndClose(replies);
     } catch (error) {
       throw translateBindingResultError(error, 'completion');
@@ -338,16 +335,15 @@ class NodeRawDealerPort extends NodeRawSocketPort<DealerSocket> implements ZLink
     this.socket.setRoutingId(bindingRoutingId(routingId));
   }
 
-  async send(parts: readonly Uint8Array[]): Promise<void> {
+  send(parts: readonly Uint8Array[]): Promise<void> {
     this.requireOpen();
-    const submission = appendSendParts(this.socket.send(), parts).submit();
-    if (submission.result === SubmitResult.Backpressured) {
-      await submission.admitted;
-    }
+    requireParts(parts);
+    return submitBindingAsyncSend(this.socket.send(), parts);
   }
 
   async request(parts: readonly Uint8Array[], timeoutMs: number): Promise<readonly Buffer[]> {
     this.requireOpen();
+    const deadlineMs = performance.now() + timeoutMs;
     let submission: ReturnType<RequestSubmitOperation['submit']>;
     try {
       submission = appendRequestParts(this.socket.request(), parts).timeout(timeoutMs).submit();
@@ -355,7 +351,7 @@ class NodeRawDealerPort extends NodeRawSocketPort<DealerSocket> implements ZLink
       throw translateBindingResultError(error, 'submit');
     }
     try {
-      const replies = await requestReply(submission);
+      const replies = await bindingRequestReply(submission, deadlineMs);
       return copyAndClose(replies);
     } catch (error) {
       throw translateBindingResultError(error, 'completion');
@@ -368,16 +364,6 @@ class NodeRawDealerPort extends NodeRawSocketPort<DealerSocket> implements ZLink
   }
 }
 
-async function requestReply(
-  submission: ReturnType<RequestSubmitOperation['submit']>
-): Promise<Message[]> {
-  if (submission.result === SubmitResult.Backpressured) {
-    const [, replies] = await Promise.all([submission.admitted, submission.reply]);
-    return replies;
-  }
-  return submission.reply;
-}
-
 class NodeRawMonitorPort implements ZLinkRawMonitorPort {
   private closed = false;
 
@@ -410,18 +396,6 @@ class NodeRawMonitorPort implements ZLinkRawMonitorPort {
   }
 }
 
-function appendSendParts(
-  operation: SendOperation,
-  parts: readonly Uint8Array[]
-): SendSubmitOperation {
-  requireParts(parts);
-  let next = operation.message(parts[0]);
-  for (let index = 1; index < parts.length; index += 1) {
-    next = next.message(parts[index]);
-  }
-  return next;
-}
-
 function appendRequestParts(
   operation: RequestOperation,
   parts: readonly Uint8Array[]

package/src/runtime/backend/node/node-socket-backend-adapter.ts

@@ -194,7 +194,7 @@ export function wrapSocket<T extends { close(): void }>(
       }
       return submitBindingAsyncSend(operation, payload);
     },
-    submit(routingId: unknown, payload: unknown, _timeoutMs?: number): Promise<void> {
+    submit(routingId: unknown, payload: unknown): Promise<void> {
       if (!hasStream) throw new TypeError('Async stream send requires a STREAM socket.');
       return submitBindingAsyncSend(
         (nativeInstance as T & { send(routingId: unknown): ZLinkBindingAsyncSendOperation }).send(