fix: add support for out of band errors with no id

open-rpc · Sep 10, 2021 · 0c4a63d · 0c4a63d
1 parent 9bc2827
commit 0c4a63d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/containers/Inspector.tsx b/src/containers/Inspector.tsx
@@ -88,7 +88,7 @@ const defaultTransports: ITransport[] = [
   },
 ];
 
-const errorToJSON = (error: JSONRPCError | any, id: string | number): any => {
+const errorToJSON = (error: JSONRPCError | any, id?: string | number | null): any => {
   const isError = error instanceof Error;
   if (!isError) {
     return;
@@ -256,6 +256,17 @@ const Inspector: React.FC<IProps> = (props) => {
         setLogs((prevLogs) => [...prevLogs, notificationObj]);
         setTabLogs(tabIndex, [...(tabs[tabIndex].logs || []), notificationObj]);
       });
+      transport.subscribe("error", (error: any) => {
+        const responseTimestamp = new Date();
+        const notificationObj: JSONRPCLog = {
+          type: "response",
+          method: "",
+          timestamp: responseTimestamp,
+          payload: errorToJSON(error, error.id),
+        };
+        setLogs((prevLogs) => [...prevLogs, notificationObj]);
+        setTabLogs(tabIndex, [...(tabs[tabIndex].logs || []), notificationObj]);
+      });
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [transport]);

diff --git a/src/hooks/useTransport.ts b/src/hooks/useTransport.ts
@@ -59,6 +59,9 @@ const getTransportFromType = async (
         intermediateTransport.subscribe("notification", (data: IJSONRPCNotificationResponse) => {
           this.transportRequestManager.transportEventChannel.emit("notification", data);
         });
+        intermediateTransport.subscribe("error", (data: JSONRPCError) => {
+          this.transportRequestManager.transportEventChannel.emit("error", data);
+        });
         return results;
       }
       public sendData(data: IJSONRPCData): Promise<any> {