feat(): wrap emit in error handler, emit array events as before, fix mark price type guard

Author: tiagosiebler

src/util/BaseWSClient.ts

@@ -137,13 +137,19 @@ function getFinalEmittable(
   }
 
   if (Array.isArray(emittable.event)) {
-    const { event, ...others } = emittable;
-    return {
-      ...others,
-      event: event.map((subEvent) =>
-        getFinalEmittable(subEvent, wsKey, isWSAPIResponse),
-      ),
-    };
+    // Some topics just emit an array.
+    // This is consistent with how it was before the WS API upgrade:
+    return emittable.event.map((subEvent) =>
+      getFinalEmittable(subEvent, wsKey, isWSAPIResponse),
+    );
+
+    // const { event, ...others } = emittable;
+    // return {
+    //   ...others,
+    //   event: event.map((subEvent) =>
+    //     getFinalEmittable(subEvent, wsKey, isWSAPIResponse),
+    //   ),
+    // };
   }
 
   if (emittable.event) {
@@ -1196,7 +1202,22 @@ export abstract class BaseWebsocketClient<
           }
 
           // Other event types are automatically emitted here
-          this.emit(emittable.eventType, emittableFinalEvent);
+          // this.logger.trace(
+          //   `onWsMessage().emit(${emittable.eventType})`,
+          //   emittableFinalEvent,
+          // );
+          try {
+            this.emit(emittable.eventType, emittableFinalEvent);
+          } catch (e) {
+            this.logger.error(
+              `Exception in onWsMessage().emit(${emittable.eventType}) handler:`,
+              e,
+            );
+          }
+          // this.logger.trace(
+          //   `onWsMessage().emit(${emittable.eventType}).done()`,
+          //   emittableFinalEvent,
+          // );
         }
 
         return;

src/util/typeGuards.ts

@@ -61,7 +61,7 @@ export function isWsFormattedMarkPriceUpdateArray(
   return (
     Array.isArray(data) &&
     data.length !== 0 &&
-    data[0].eventType === 'markPriceUpdate'
+    ['markPriceUpdate', 'markPrice'].includes(data[0].eventType)
   );
 }