fix(srpc): ts: catch error in invokefn

Signed-off-by: Christian Stewart <christian@paral.in>
aperturerobotics · Dec 4, 2022 · fefdae7 · fefdae7
1 parent 65ab343
commit fefdae7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {

diff --git a/srpc/server-rpc.ts b/srpc/server-rpc.ts
@@ -45,11 +45,13 @@ export class ServerRPC extends CommonRPC {
   }
 
   // invokeRPC starts invoking the RPC handler.
-  private invokeRPC(invokeFn: InvokeFn) {
+  private async invokeRPC(invokeFn: InvokeFn) {
     const dataSink = this._createDataSink()
-    invokeFn(this.rpcDataSource, dataSink).catch((err) => {
-      this.close(err)
-    })
+    try {
+      await invokeFn(this.rpcDataSource, dataSink)
+    } catch (err) {
+      this.close(err as Error)
+    }
   }
 
   // _createDataSink creates a sink for outgoing data packets.