@standardserver/peer 0.0.22 → 0.0.23

package/dist/index.d.mts

@@ -257,7 +257,7 @@ declare class EventStreamTransmitter {
     private readonly iterator;
     private readonly messageId;
     private readonly send;
-    private isCompleted;
+    private isDone;
     constructor(iterator: AsyncIterator<unknown>, messageId: string, send: (message: PeerEventStreamMessage) => Promise<void>);
     cancel(): Promise<void>;
     transmit(): Promise<void>;
@@ -285,6 +285,7 @@ declare class ServerPeer {
     message(message: ClientPeerSendMessage, handleRequest: (request: StandardLazyRequest) => Promise<StandardResponse>): Promise<void>;
     close(reason?: unknown): Promise<void>;
     private closeById;
+    private cancelById;
 }
 
 declare function isPeerMessage(maybe: unknown): maybe is PeerMessage;

package/dist/index.d.ts

@@ -257,7 +257,7 @@ declare class EventStreamTransmitter {
     private readonly iterator;
     private readonly messageId;
     private readonly send;
-    private isCompleted;
+    private isDone;
     constructor(iterator: AsyncIterator<unknown>, messageId: string, send: (message: PeerEventStreamMessage) => Promise<void>);
     cancel(): Promise<void>;
     transmit(): Promise<void>;
@@ -285,6 +285,7 @@ declare class ServerPeer {
     message(message: ClientPeerSendMessage, handleRequest: (request: StandardLazyRequest) => Promise<StandardResponse>): Promise<void>;
     close(reason?: unknown): Promise<void>;
     private closeById;
+    private cancelById;
 }
 
 declare function isPeerMessage(maybe: unknown): maybe is PeerMessage;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { AsyncIteratorClass, isTypescriptObject, isAsyncIteratorObject, Queue, SequentialIdGenerator, omit, emitUnhandledRejection, AbortError, stringifyJSON } from '@standardserver/shared';
+import { AsyncIteratorClass, isTypescriptObject, isAsyncIteratorObject, Queue, SequentialIdGenerator, omit, AbortError, stringifyJSON } from '@standardserver/shared';
 import { withEventMeta, ErrorEvent, unwrapEvent, generateContentDisposition, flattenStandardHeader, getFilenameFromContentDisposition, isStandardRequest, isStandardResponse } from '@standardserver/core';
 
 function toEventIterator(queue, cleanup) {
@@ -36,10 +36,10 @@ class EventStreamTransmitter {
     this.messageId = messageId;
     this.send = send;
   }
-  isCompleted = false;
+  isDone = false;
   async cancel() {
-    if (!this.isCompleted) {
-      this.isCompleted = true;
+    if (!this.isDone) {
+      this.isDone = true;
       await this.iterator.return?.();
     }
   }
@@ -47,43 +47,41 @@ class EventStreamTransmitter {
     while (true) {
       try {
         const item = await this.iterator.next();
-        if (this.isCompleted) {
+        if (this.isDone) {
           return;
         }
-        const [data, meta] = unwrapEvent(item.value);
+        if (item.done) {
+          this.isDone = true;
+        }
         try {
+          const [data, meta] = unwrapEvent(item.value);
           await this.send({
             kind: "event-stream",
             id: this.messageId,
             json: { ...meta, event: item.done ? "close" : "message", data }
           });
         } catch (error) {
-          if (!item.done) {
-            await this.cancel();
-          }
+          await this.cancel();
           throw error;
         }
-        if (item.done) {
-          this.isCompleted = true;
+        if (this.isDone) {
           return;
         }
       } catch (error) {
-        if (this.isCompleted) {
-          throw error;
-        }
         if (error instanceof ErrorEvent) {
-          const [resolvedError, meta] = unwrapEvent(error);
-          await this.send({
-            kind: "event-stream",
-            id: this.messageId,
-            json: { ...meta, event: "error", data: resolvedError.data }
-          });
-          this.isCompleted = true;
+          if (!this.isDone) {
+            this.isDone = true;
+            const [resolvedError, meta] = unwrapEvent(error);
+            await this.send({
+              kind: "event-stream",
+              id: this.messageId,
+              json: { ...meta, event: "error", data: resolvedError.data }
+            });
+          }
           return;
-        } else {
-          this.isCompleted = true;
-          throw error;
         }
+        this.isDone = true;
+        throw error;
       }
     }
   }
@@ -117,40 +115,40 @@ class OctetStreamTransmitter {
     this.send = send;
     this.reader = stream.getReader();
   }
-  isCompleted = false;
+  isDone = false;
   reader;
   async cancel() {
-    if (!this.isCompleted) {
-      this.isCompleted = true;
+    if (!this.isDone) {
+      this.isDone = true;
       await this.reader.cancel();
     }
   }
   async transmit() {
     while (true) {
       try {
-        const { done, value } = await this.reader.read();
-        if (this.isCompleted) {
+        const item = await this.reader.read();
+        if (this.isDone) {
           return;
         }
+        if (item.done) {
+          this.isDone = true;
+        }
         try {
           await this.send({
-            json: { close: done },
-            binary: value,
+            json: { close: item.done },
+            binary: item.value,
             kind: "octet-stream",
             id: this.messageId
           });
         } catch (err) {
-          if (!done) {
-            await this.cancel();
-          }
+          await this.cancel();
           throw err;
         }
-        if (done) {
-          this.isCompleted = true;
+        if (this.isDone) {
           return;
         }
       } catch (error) {
-        this.isCompleted = true;
+        this.isDone = true;
         throw error;
       }
     }
@@ -279,8 +277,6 @@ class ClientPeer {
         void transmitter.transmit().catch(async (error) => {
           if (state.eventStreamTransmitter) {
             await this.abortById(id, error);
-          } else {
-            emitUnhandledRejection(error);
           }
         });
       } else if (request.body instanceof ReadableStream) {
@@ -289,10 +285,7 @@ class ClientPeer {
         void transmitter.transmit().catch(async (error) => {
           if (state.octetStreamTransmitter) {
             await this.abortById(id, error);
-          } else {
-            emitUnhandledRejection(error);
           }
-          /* v8 ignore stop -- @preserve */
         });
       }
     } catch (reason) {
@@ -619,23 +612,25 @@ class ServerPeer {
         } else {
           const transmitter = new EventStreamTransmitter(response.body, message.id, this.send);
           state.eventStreamTransmitter = transmitter;
-          await transmitter.transmit();
+          await transmitter.transmit().catch(async (reason) => {
+            if (state.eventStreamTransmitter) {
+              await this.cancelById(message.id, reason);
+            }
+          });
         }
       } else if (response.body instanceof ReadableStream) {
         const transmitter = new OctetStreamTransmitter(response.body, message.id, this.send);
         state.octetStreamTransmitter = transmitter;
-        await transmitter.transmit();
+        await transmitter.transmit().catch(async (reason) => {
+          if (state.octetStreamTransmitter) {
+            await this.cancelById(message.id, reason);
+          }
+        });
       }
       state.controller = void 0;
       await this.closeById(id);
     } catch (reason) {
-      await Promise.all([
-        /**
-         * Do not need to send cancel message if request was closed or aborted
-         */
-        this.requests.has(message.id) ? this.send({ id: message.id, kind: "cancel" }) : void 0,
-        this.closeById(id, reason)
-      ]);
+      await this.cancelById(message.id, reason);
       throw reason;
     }
   }
@@ -666,6 +661,15 @@ class ServerPeer {
     state.octetStreamTransmitter = void 0;
     await Promise.all(promises);
   }
+  async cancelById(id, reason) {
+    await Promise.all([
+      /**
+       * Do not need to send cancel message if request was closed or aborted
+       */
+      this.requests.has(id) ? this.send({ id, kind: "cancel" }) : void 0,
+      this.closeById(id, reason)
+    ]);
+  }
 }
 
 export { ClientPeer, EventStreamTransmitter, HibernationEventIterator, ServerPeer, decodePeerMessage, encodePeerMessage, isClientPeerSendMessage, isPeerCancelMessage, isPeerEventStreamMessage, isPeerMessage, isPeerOctetStreamMessage, isPeerRequestMessage, isPeerResponseMessage, isPeerStreamCancelMessage, isServerPeerSendMessage, toEventIterator };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardserver/peer",
   "type": "module",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "license": "MIT",
   "homepage": "https://standardserver.dev",
   "repository": {
@@ -22,8 +22,8 @@
     "dist"
   ],
   "dependencies": {
-    "@standardserver/core": "0.0.22",
-    "@standardserver/shared": "0.0.22"
+    "@standardserver/shared": "0.0.23",
+    "@standardserver/core": "0.0.23"
   },
   "scripts": {
     "build": "unbuild",