@zlink-systems/framework 0.26.0 → 0.27.0

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

@@ -95,24 +95,25 @@ class NodeRawHostPort implements ZLinkRawHostPort {
     if (this.state === 'closed') return;
     this.state = 'stopping';
     const failures: unknown[] = [];
-    for (const resource of this.resources.splice(0).reverse()) {
+    for (const resource of [...this.resources].reverse()) {
       try {
         resource.close();
+        this.resources.splice(this.resources.indexOf(resource), 1);
       } catch (error) {
         failures.push(error);
       }
     }
-    if (this.ownsContext) {
+    if (this.ownsContext && failures.length === 0) {
       try {
         this.context.close();
       } catch (error) {
         failures.push(error);
       }
     }
-    this.state = 'closed';
     if (failures.length > 0) {
       throw new AggregateError(failures, 'Raw binding host cleanup failed.');
     }
+    this.state = 'closed';
   }
 
   private own<T extends { close(): void }>(resource: T): T {
@@ -140,7 +141,7 @@ abstract class NodeRawSocketPort<TSocket extends Socket> implements ZLinkRawSock
     this.eventLoopPoller = new ZLinkNodeEventLoopPoller(socket, true, () => {}, pollRoute);
   }
 
-  setReadableHandler(handler: () => void): void {
+  setReadableHandler(handler: (receiveReady: boolean, routeReady: boolean) => void): void {
     this.requireOpen();
     this.eventLoopPoller.setReadableHandler(handler);
   }
@@ -211,17 +212,16 @@ abstract class NodeRawSocketPort<TSocket extends Socket> implements ZLinkRawSock
         failures.push(error);
       }
     }
+    if (failures.length > 0) {
+      throw new AggregateError(failures, 'Raw socket cleanup failed.');
+    }
     this.endpoints.clear();
     try {
       this.socket.close();
     } catch (error) {
-      failures.push(error);
+      throw new AggregateError([error], 'Raw socket cleanup failed.');
     }
     this.closed = true;
-    if (failures.length > 0) {
-      console.error('Raw socket cleanup causes:', failures);
-      throw new AggregateError(failures, 'Raw socket cleanup failed.');
-    }
   }
 
   protected requireOpen(): void {
@@ -283,16 +283,19 @@ class NodeRawRouterPort extends NodeRawSocketPort<RouterSocket> implements ZLink
     timeoutMs: number
   ): Promise<readonly Buffer[]> {
     this.requireOpen();
+    let submission: ReturnType<RequestSubmitOperation['submit']>;
     try {
-      const replies = await appendRequestParts(
-        this.socket.request(bindingRoutingId(targetRid)),
-        parts
-      )
+      submission = appendRequestParts(this.socket.request(bindingRoutingId(targetRid)), parts)
         .timeout(timeoutMs)
-        .submit().reply;
+        .submit();
+    } catch (error) {
+      throw translateBindingResultError(error, 'submit');
+    }
+    try {
+      const replies = await requestReply(submission);
       return copyAndClose(replies);
     } catch (error) {
-      throw translateBindingResultError(error);
+      throw translateBindingResultError(error, 'completion');
     }
   }
 
@@ -345,10 +348,18 @@ class NodeRawDealerPort extends NodeRawSocketPort<DealerSocket> implements ZLink
 
   async request(parts: readonly Uint8Array[], timeoutMs: number): Promise<readonly Buffer[]> {
     this.requireOpen();
-    const replies = await appendRequestParts(this.socket.request(), parts)
-      .timeout(timeoutMs)
-      .submit().reply;
-    return copyAndClose(replies);
+    let submission: ReturnType<RequestSubmitOperation['submit']>;
+    try {
+      submission = appendRequestParts(this.socket.request(), parts).timeout(timeoutMs).submit();
+    } catch (error) {
+      throw translateBindingResultError(error, 'submit');
+    }
+    try {
+      const replies = await requestReply(submission);
+      return copyAndClose(replies);
+    } catch (error) {
+      throw translateBindingResultError(error, 'completion');
+    }
   }
 
   receive(dontWait = false): ZLinkRawReceivedRecord | undefined {
@@ -357,6 +368,16 @@ 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;
 
@@ -383,9 +404,9 @@ class NodeRawMonitorPort implements ZLinkRawMonitorPort {
 
   close(): void {
     if (this.closed) return;
+    this.monitor.close();
     this.closed = true;
     this.release();
-    this.monitor.close();
   }
 }