Bubble up errors by passing them through.

open-rpc · Mar 21, 2023 · 8e14099 · 8e14099
1 parent f443070
commit 8e14099
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/transports/EventEmitterTransport.ts b/src/transports/EventEmitterTransport.ts
@@ -31,7 +31,9 @@ class EventEmitterTransport extends Transport {
       this.transportRequestManager.settlePendingRequest(notifications);
       return prom;
     } catch (e) {
-      const responseErr = new JSONRPCError(e.message, ERR_UNKNOWN, e);
+      const responseErr = e instanceof JSONRPCError
+        ? e
+        : new JSONRPCError(e.message, ERR_UNKNOWN, e);
       this.transportRequestManager.settlePendingRequest(notifications, responseErr);
       return Promise.reject(responseErr);
     }

diff --git a/src/transports/HTTPTransport.ts b/src/transports/HTTPTransport.ts
@@ -60,7 +60,9 @@ class HTTPTransport extends Transport {
         return Promise.reject(responseErr);
       }
     } catch (e) {
-      const responseErr = new JSONRPCError(e.message, ERR_UNKNOWN, e);
+      const responseErr = e instanceof JSONRPCError
+        ? e
+        : new JSONRPCError(e.message, ERR_UNKNOWN, e);
       this.transportRequestManager.settlePendingRequest(
         notifications,
         responseErr

diff --git a/src/transports/TransportRequestManager.ts b/src/transports/TransportRequestManager.ts
@@ -67,7 +67,9 @@ export class TransportRequestManager {
       }
       return this.resolveRes(data, emitError);
     } catch (e) {
-      const err = new JSONRPCError("Bad response format", ERR_UNKNOWN, payload);
+      const err = e instanceof JSONRPCError
+        ? e
+        : new JSONRPCError("Bad response format", ERR_UNKNOWN, payload);
       if (emitError) {
         this.transportEventChannel.emit("error", err);
       }

diff --git a/src/transports/WebSocketTransport.ts b/src/transports/WebSocketTransport.ts
@@ -33,8 +33,9 @@ class WebSocketTransport extends Transport {
       this.connection.send(JSON.stringify(this.parseData(data)));
       this.transportRequestManager.settlePendingRequest(notifications);
     } catch (err) {
-      const jsonError = new JSONRPCError((err as any).message, ERR_UNKNOWN, err);
-
+      const jsonError = err instanceof JSONRPCError
+        ? err
+        : new JSONRPCError(e.message, ERR_UNKNOWN, err);
       this.transportRequestManager.settlePendingRequest(notifications, jsonError);
       this.transportRequestManager.settlePendingRequest(getBatchRequests(data), jsonError);