starpc 0.22.1 → 0.22.3

package/dist/srpc/client.js

@@ -44,7 +44,7 @@ export class Client {
             .then(async (call) => {
             return writeToPushable(call.rpcDataSource, serverData);
         })
-            .catch(serverData.throw.bind(serverData));
+            .catch(err => serverData.end(err));
         return serverData;
     }
     // bidirectionalStreamingRequest starts a two-way streaming request.
@@ -57,13 +57,13 @@ export class Client {
                 for await (const message of call.rpcDataSource) {
                     serverData.push(message);
                 }
+                serverData.end();
             }
             catch (err) {
-                serverData.throw(err);
+                serverData.end(err);
             }
-            serverData.end();
         })
-            .catch(serverData.throw.bind(serverData));
+            .catch(err => serverData.end(err));
         return serverData;
     }
     // startRpc is a common utility function to begin a rpc call.

package/dist/srpc/common-rpc.d.ts

@@ -9,6 +9,7 @@ export declare class CommonRPC {
     private readonly _rpcDataSource;
     protected service?: string;
     protected method?: string;
+    private closed?;
     constructor();
     writeCallData(data?: Uint8Array, complete?: boolean, error?: string): Promise<void>;
     writeCallCancel(): Promise<void>;

package/dist/srpc/common-rpc.js

@@ -116,6 +116,10 @@ export class CommonRPC {
     }
     // close closes the call, optionally with an error.
     async close(err) {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
         try {
             await this.writeCallCancel();
         }
@@ -141,15 +145,11 @@ export class CommonRPC {
                         await this.handlePacket(msg);
                     }
                 }
+                this._rpcDataSource.end();
             }
             catch (err) {
-                const anyErr = err;
-                if (anyErr?.code !== 'ERR_STREAM_RESET' &&
-                    anyErr?.code !== 'ERR_STREAM_ABORT') {
-                    this.close(err);
-                }
+                this.close(err);
             }
-            this._rpcDataSource.end();
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.22.1",
+  "version": "0.22.3",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {

package/srpc/client.ts

@@ -70,7 +70,7 @@ export class Client implements TsProtoRpc {
       .then(async (call) => {
         return writeToPushable(call.rpcDataSource, serverData)
       })
-      .catch(serverData.throw.bind(serverData))
+      .catch(err => serverData.end(err))
     return serverData
   }
 
@@ -89,12 +89,12 @@ export class Client implements TsProtoRpc {
           for await (const message of call.rpcDataSource) {
             serverData.push(message)
           }
+          serverData.end()
         } catch (err) {
-          serverData.throw(err as Error)
+          serverData.end(err as Error)
         }
-        serverData.end()
       })
-      .catch(serverData.throw.bind(serverData))
+      .catch(err => serverData.end(err))
     return serverData
   }
 

package/srpc/common-rpc.ts

@@ -28,6 +28,9 @@ export class CommonRPC {
   // method is the rpc method
   protected method?: string
 
+  // closed indicates this rpc has been closed already.
+  private closed?: boolean
+
   constructor() {
     this.sink = this._createSink()
     this.source = this._source
@@ -150,6 +153,10 @@ export class CommonRPC {
 
   // close closes the call, optionally with an error.
   public async close(err?: Error) {
+    if (this.closed) {
+      return
+    }
+    this.closed = true
     try {
       await this.writeCallCancel()
     } finally {
@@ -174,16 +181,10 @@ export class CommonRPC {
             await this.handlePacket(msg)
           }
         }
+        this._rpcDataSource.end()
       } catch (err) {
-        const anyErr = err as any
-        if (
-          anyErr?.code !== 'ERR_STREAM_RESET' &&
-          anyErr?.code !== 'ERR_STREAM_ABORT'
-        ) {
-          this.close(err as Error)
-        }
+        this.close(err as Error)
       }
-      this._rpcDataSource.end()
     }
   }
 }