Fix leading 0x in websocket logic (#25)

* Handle leading 0x when sub/unsub

* Bump pyth-common-js version to 0.4.0

Author: ali-bahjati

pyth-common-js/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/pyth-common-js",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Pyth Network Common Utils in JS",
   "author": {
     "name": "Pyth Data Association"

pyth-common-js/package.json

@@ -4,7 +4,7 @@ import axiosRetry from "axios-retry";
 import * as WebSocket from "isomorphic-ws";
 import { Logger } from "ts-log";
 import { ResilientWebSocket } from "./ResillientWebSocket";
-import { makeWebsocketUrl } from "./utils";
+import { makeWebsocketUrl, removeLeading0xIfExists } from "./utils";
 
 export type DurationInMs = number;
 
@@ -147,6 +147,8 @@ export class PriceServiceConnection {
       await this.startWebSocket();
     }
 
+    priceIds = priceIds.map((priceId) => removeLeading0xIfExists(priceId));
+
     const newPriceIds: HexString[] = [];
 
     for (const id of priceIds) {
@@ -185,6 +187,8 @@ export class PriceServiceConnection {
       await this.startWebSocket();
     }
 
+    priceIds = priceIds.map((priceId) => removeLeading0xIfExists(priceId));
+
     const removedPriceIds: HexString[] = [];
 
     for (const id of priceIds) {

pyth-common-js/src/PriceServiceConnection.ts

@@ -1,3 +1,5 @@
+import { HexString } from "@pythnetwork/pyth-sdk-js";
+
 /**
  * Convert http(s) endpoint to ws(s) endpoint.
  *
@@ -12,3 +14,11 @@ export function makeWebsocketUrl(endpoint: string) {
 
   return url.toString();
 }
+
+export function removeLeading0xIfExists(id: HexString): HexString {
+  if (id.startsWith("0x")) {
+    return id.substring(2);
+  } else {
+    return id;
+  }
+}