@openfeed/sdk-js 1.3.1 → 1.3.2

package/.releases/CHANGELOG-1.3.2.md

@@ -0,0 +1,10 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+### [1.3.1](https://github.com/openfeed-org/sdk-js/compare/1.3.0...1.3.1) (2025-01-08)
+
+
+### Bug Fixes
+
+* fix type issues ([926eb95](https://github.com/openfeed-org/sdk-js/commit/926eb95db5d3aefa743610c00531438aa8fa46d8))

package/CHANGELOG.md

@@ -2,9 +2,9 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [1.3.1](https://github.com/openfeed-org/sdk-js/compare/1.3.0...1.3.1) (2025-01-08)
+### [1.3.2](https://github.com/openfeed-org/sdk-js/compare/1.3.1...1.3.2) (2025-01-23)
 
 
 ### Bug Fixes
 
-* fix type issues ([926eb95](https://github.com/openfeed-org/sdk-js/commit/926eb95db5d3aefa743610c00531438aa8fa46d8))
+* address issues with subscription type and error subscription messages, expand tests ([8c82453](https://github.com/openfeed-org/sdk-js/commit/8c82453f18435418b30d1f5c37a6106bb1e50a65))

package/DOCUMENTATION.md

@@ -147,7 +147,7 @@ enum SubscriptionType {
     DEPTH_PRICE = 3,
     DEPTH_ORDER = 4,
     TRADES = 5,
-    CUMLATIVE_VOLUME = 6,
+    CUMULATIVE_VOLUME = 6,
     OHLC = 7,
     OHLC_NON_REGULAR = 8,
 }
@@ -158,12 +158,12 @@ enum SubscriptionType {
 Now that we know how to use the listener and client objects, let's put together a little demo that subscribes to all MSFT messages and prints what's happening to the console:
 
 ```ts
-import { OpenFeedClient } from "./connection/connection";
+import { OpenFeedClient } from "./connection/client";
 
 import { Service } from "../generated/openfeed";
 import { SubscriptionType } from "../generated/openfeed_api";
 import { OpenFeedListeners } from "./connection/listeners";
-import { IOpenFeedLogger } from "./connection/connection_interfaces";
+import { IOpenFeedLogger } from "./connection/interfaces";
 
 const connect = async () => {
     const logger: IOpenFeedLogger = console;

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.3.1";
+export declare const version = "1.3.2";

package/dist/index.js

@@ -933,7 +933,6 @@ Long.fromBytesBE = function fromBytesBE(bytes, unsigned) {
     unsigned
   );
 };
-const toT = (obj) => obj;
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -8259,7 +8258,15 @@ class ResolutionSource {
     return this.onError;
   }
 }
-const version = "1.3.1";
+const _CorrelationId = class _CorrelationId {
+};
+__publicField(_CorrelationId, "correlationId", Long.fromNumber(-1));
+__publicField(_CorrelationId, "create", () => {
+  _CorrelationId.correlationId = _CorrelationId.correlationId.add(1);
+  return _CorrelationId.correlationId;
+});
+let CorrelationId = _CorrelationId;
+const toT = (obj) => obj;
 const send = (socket, message) => {
   socket.send(OpenfeedGatewayRequestEncode.encode(toT(message)).finish());
 };
@@ -8276,14 +8283,11 @@ const receive = (msgEvent) => {
   }
   return res;
 };
-const _CorrelationId = class _CorrelationId {
+const TIME = {
+  RECONNECT: 5e3,
+  CONNECTION_TIMEOUT: 15e3,
+  SUBSCRIPTION_RETRY: 100
 };
-__publicField(_CorrelationId, "correlationId", Long.fromNumber(-1));
-__publicField(_CorrelationId, "create", () => {
-  _CorrelationId.correlationId = _CorrelationId.correlationId.add(1);
-  return _CorrelationId.correlationId;
-});
-let CorrelationId = _CorrelationId;
 class DuplicateLoginError extends Error {
   get name() {
     return this.constructor.name;
@@ -8313,7 +8317,7 @@ class OpenFeedConnection {
       for (; ; ) {
         let timeoutId = null;
         const waitPromise = new Promise((resolve) => {
-          timeoutId = setTimeout(resolve, 15e3);
+          timeoutId = setTimeout(resolve, TIME.CONNECTION_TIMEOUT);
         });
         try {
           await Promise.race([waitPromise, this.whenDisconnectedSource.whenCompleted]);
@@ -8484,7 +8488,7 @@ class OpenFeedConnection {
         throw new Error(`Subscription ID ${subscriptionId} does not exist.`);
       }
       const [originalRequest, sub] = subscription;
-      return this.fireUnsubscribeWhenReady(originalRequest, sub);
+      this.fireUnsubscribeWhenReady(originalRequest, sub);
     });
     __publicField(this, "getExchanges", async () => {
       var _a;
@@ -8596,6 +8600,23 @@ class OpenFeedConnection {
     }
   }
 }
+const version = "1.3.2";
+const getClientVersion = async (clientId) => {
+  var _a, _b, _c, _d, _e, _f;
+  let platformDescription;
+  if (typeof window !== "undefined") {
+    platformDescription = navigator.userAgent;
+  } else {
+    const os = await import("./empty-411f875a.js");
+    try {
+      platformDescription = `Node.js ${process.version}; ${(_a = os.version) == null ? void 0 : _a.call(os)} ${(_b = os.release) == null ? void 0 : _b.call(os)}; ${(_c = os.arch) == null ? void 0 : _c.call(os)};`;
+    } catch (e) {
+      platformDescription = `Unknown OS; ${((_d = os.version) == null ? void 0 : _d.call(os)) ?? ""} ${((_e = os.release) == null ? void 0 : _e.call(os)) ?? ""}; ${((_f = os.arch) == null ? void 0 : _f.call(os)) ?? ""};`;
+    }
+  }
+  const clientVersion = `sdk-js:${version};client-id:${clientId ?? "default"};platform:${platformDescription}`;
+  return clientVersion;
+};
 class OpenFeedClient {
   constructor(url, username, password, listeners, logger, clientId) {
     __publicField(this, "socket", null);
@@ -8607,21 +8628,9 @@ class OpenFeedClient {
     __publicField(this, "subscribeResetSource", new ResolutionSource());
     __publicField(this, "subscriptions", /* @__PURE__ */ new Map());
     __publicField(this, "onOpen", async () => {
-      var _a, _b, _c, _d, _e, _f;
       if (!this.socket)
         return;
-      let platformDescription;
-      if (typeof window !== "undefined") {
-        platformDescription = navigator.userAgent;
-      } else {
-        const os = await import("./empty-411f875a.js");
-        try {
-          platformDescription = `Node.js ${process.version}; ${(_a = os.version) == null ? void 0 : _a.call(os)} ${(_b = os.release) == null ? void 0 : _b.call(os)}; ${(_c = os.arch) == null ? void 0 : _c.call(os)};`;
-        } catch (e) {
-          platformDescription = `Unknown OS; ${((_d = os.version) == null ? void 0 : _d.call(os)) ?? ""} ${((_e = os.release) == null ? void 0 : _e.call(os)) ?? ""}; ${((_f = os.arch) == null ? void 0 : _f.call(os)) ?? ""};`;
-        }
-      }
-      const clientVersion = `sdk-js:${version};client-id:${this.clientId ?? "default"};platform:${platformDescription}`;
+      const clientVersion = await getClientVersion(this.clientId);
       const loginRequest = {
         loginRequest: {
           correlationId: CorrelationId.create(),
@@ -8683,7 +8692,6 @@ class OpenFeedClient {
     __publicField(this, "runConnectLoop", async () => {
       var _a, _b;
       for (; ; ) {
-        let timeoutId = null;
         if (this.socket) {
           if (this.socket.readyState !== WebSocket$1.CLOSED && this.socket.readyState !== WebSocket$1.CLOSING) {
             this.socket.close(1e3, "Closed from socket loop");
@@ -8733,15 +8741,9 @@ class OpenFeedClient {
         this.loopResetSource = new ResolutionSource();
         this.subscribeResetSource.resolve();
         this.subscribeResetSource = new ResolutionSource();
-        try {
-          await new Promise((resolve) => {
-            timeoutId = setTimeout(resolve, 5e3);
-          });
-        } finally {
-          if (timeoutId) {
-            clearTimeout(timeoutId);
-          }
-        }
+        await new Promise((resolve) => {
+          setTimeout(resolve, TIME.RECONNECT);
+        });
       }
     });
     __publicField(this, "cleanUp", () => {
@@ -8754,11 +8756,10 @@ class OpenFeedClient {
     __publicField(this, "runSubscribeLoop", async (service2, subscriptionType, snapshotIntervalSeconds, symbols, marketIds, exchanges, channels, cancelSource) => {
       var _a;
       for (; ; ) {
-        let timeoutId = null;
         try {
           const connection = await Promise.race([this.connection, cancelSource.whenCompleted]);
           if (cancelSource.completed || /* can't actually happen */
-          !(connection instanceof OpenFeedConnection)) {
+          !connection) {
             return;
           }
           const subscriptionId = connection.subscribe(
@@ -8781,12 +8782,8 @@ class OpenFeedClient {
         } catch (error) {
           (_a = this.logger) == null ? void 0 : _a.warn("Subscription error:", error);
           await new Promise((resolve) => {
-            timeoutId = setTimeout(resolve, 100);
+            setTimeout(resolve, TIME.SUBSCRIPTION_RETRY);
           });
-        } finally {
-          if (timeoutId) {
-            clearTimeout(timeoutId);
-          }
         }
       }
     });
@@ -8849,7 +8846,6 @@ const IDGetters = [
 ];
 class OpenFeedListeners {
   constructor() {
-    __publicField(this, "instrumentBySymbol", /* @__PURE__ */ new Map());
     __publicField(this, "instrumentByMarketId", /* @__PURE__ */ new Map());
     __publicField(this, "addDetails", (message) => {
       var _a, _b, _c;
@@ -8859,33 +8855,35 @@ class OpenFeedListeners {
         const res = this.instrumentByMarketId.get(marketId.toString());
         return res ?? [void 0, void 0];
       };
+      const includesSymbolSubscription = (arr, item) => {
+        return arr.some(([symbol, type]) => symbol === item[0] && type === item[1]);
+      };
       if (message.subscriptionResponse) {
-        const { marketId, symbol, unsubscribe } = message.subscriptionResponse;
+        const { marketId, symbol, unsubscribe, status, subscriptionType } = message.subscriptionResponse;
         if (marketId !== Long.ZERO) {
           [def, symbols] = getInstrumentDefinition(marketId);
-          if (!unsubscribe) {
-            if (!symbols) {
-              symbols = [symbol];
-            } else if (!symbols.includes(symbol)) {
-              symbols = [...symbols, symbol];
-            }
-          } else {
-            if (symbols) {
-              symbols = symbols.filter((s) => s !== symbol);
-            }
-            if (!symbols) {
-              this.instrumentByMarketId.delete(marketId.toString());
+          if ((status == null ? void 0 : status.result) === Result.SUCCESS) {
+            const currentEntry = [symbol, subscriptionType];
+            if (!unsubscribe) {
+              if (!symbols) {
+                symbols = [currentEntry];
+              } else if (!includesSymbolSubscription(symbols, currentEntry)) {
+                symbols = [...symbols, currentEntry];
+              }
+            } else {
+              if (symbols) {
+                symbols = symbols.filter(([s, t]) => !(s === symbol && t === subscriptionType));
+              }
+              if (!symbols) {
+                this.instrumentByMarketId.delete(marketId.toString());
+              }
             }
-            this.instrumentBySymbol.delete(symbol);
+            this.instrumentByMarketId.set(marketId.toString(), [def, symbols]);
           }
-          this.instrumentByMarketId.set(marketId.toString(), [def, symbols]);
         }
       } else if (message.instrumentDefinition) {
         [def, symbols] = getInstrumentDefinition(message.instrumentDefinition.marketId);
-        const { instrumentDefinition } = message;
         this.instrumentByMarketId.set(message.instrumentDefinition.marketId.toString(), [message.instrumentDefinition, symbols]);
-        this.instrumentBySymbol.set(message.instrumentDefinition.symbol, instrumentDefinition);
-        symbols == null ? void 0 : symbols.forEach((s) => this.instrumentBySymbol.set(s, instrumentDefinition));
       } else if (message.instrumentAction) {
         const { marketId } = ((_a = message.instrumentAction) == null ? void 0 : _a.instrument) ?? {};
         if (message.instrumentAction.action === ActionType.ALIAS_CHANGED && marketId) {
@@ -8894,7 +8892,7 @@ class OpenFeedListeners {
           const newAliasNum = oldAlias.endsWith("*0") ? 0 : Number.parseInt(num, 10) + 1;
           const newAlias = `${root}*${newAliasNum}`;
           [def, symbols] = getInstrumentDefinition(marketId);
-          const newSymbols = (symbols == null ? void 0 : symbols.filter((s) => s !== oldAlias)) ?? [];
+          const newSymbols = (symbols == null ? void 0 : symbols.filter(([s]) => s !== oldAlias)) ?? [];
           if (!newSymbols.length) {
             this.instrumentByMarketId.delete(marketId.toString());
           } else {
@@ -8903,7 +8901,7 @@ class OpenFeedListeners {
           const { marketId: newMarketId } = message.instrumentAction.newInstrument ?? {};
           if (newMarketId) {
             const [newDef, newSym] = getInstrumentDefinition(newMarketId);
-            const newSymbolsFiltered = (newAlias === oldAlias ? newSym : newSym == null ? void 0 : newSym.filter((s) => s !== newAlias)) ?? [];
+            const newSymbolsFiltered = (newAlias === oldAlias ? newSym : newSym == null ? void 0 : newSym.filter(([s]) => s !== newAlias)) ?? [];
             if (!newSymbolsFiltered.length) {
               this.instrumentByMarketId.delete(newMarketId.toString());
             } else {
@@ -8928,7 +8926,8 @@ class OpenFeedListeners {
           }
         }
       }
-      return this.onMessageWithMetadata(message, symbols ?? [], def);
+      const uniqueSymbols = Array.from(new Set((symbols == null ? void 0 : symbols.map(([symbol]) => symbol)) ?? []));
+      return this.onMessageWithMetadata(message, uniqueSymbols, def);
     });
     /* eslint-disable class-methods-use-this */
     __publicField(this, "onConnected", () => {

package/dist/node.js

@@ -4934,7 +4934,7 @@ var require_minimal2 = __commonJS({
   }
 });
 
-// src/connection/connection.ts
+// src/connection/client.ts
 var import_isomorphic_ws = __toESM(require_node(), 1);
 
 // node_modules/long/index.js
@@ -5837,9 +5837,6 @@ Long.fromBytesBE = function fromBytesBE(bytes, unsigned) {
 };
 var long_default = Long;
 
-// src/utilities/messages.ts
-var toT = (obj) => obj;
-
 // generated/openfeed_api.ts
 var import_minimal3 = __toESM(require_minimal2(), 1);
 
@@ -10828,19 +10825,19 @@ var Result = /* @__PURE__ */ ((Result2) => {
   Result2[Result2["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
   return Result2;
 })(Result || {});
-var SubscriptionType = /* @__PURE__ */ ((SubscriptionType2) => {
-  SubscriptionType2[SubscriptionType2["ALL"] = 0] = "ALL";
-  SubscriptionType2[SubscriptionType2["QUOTE"] = 1] = "QUOTE";
-  SubscriptionType2[SubscriptionType2["QUOTE_PARTICIPANT"] = 2] = "QUOTE_PARTICIPANT";
-  SubscriptionType2[SubscriptionType2["DEPTH_PRICE"] = 3] = "DEPTH_PRICE";
-  SubscriptionType2[SubscriptionType2["DEPTH_ORDER"] = 4] = "DEPTH_ORDER";
-  SubscriptionType2[SubscriptionType2["TRADES"] = 5] = "TRADES";
-  SubscriptionType2[SubscriptionType2["CUMULATIVE_VOLUME"] = 6] = "CUMULATIVE_VOLUME";
-  SubscriptionType2[SubscriptionType2["OHLC"] = 7] = "OHLC";
-  SubscriptionType2[SubscriptionType2["OHLC_NON_REGULAR"] = 8] = "OHLC_NON_REGULAR";
-  SubscriptionType2[SubscriptionType2["SETTLEMENT"] = 9] = "SETTLEMENT";
-  SubscriptionType2[SubscriptionType2["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
-  return SubscriptionType2;
+var SubscriptionType = /* @__PURE__ */ ((SubscriptionType3) => {
+  SubscriptionType3[SubscriptionType3["ALL"] = 0] = "ALL";
+  SubscriptionType3[SubscriptionType3["QUOTE"] = 1] = "QUOTE";
+  SubscriptionType3[SubscriptionType3["QUOTE_PARTICIPANT"] = 2] = "QUOTE_PARTICIPANT";
+  SubscriptionType3[SubscriptionType3["DEPTH_PRICE"] = 3] = "DEPTH_PRICE";
+  SubscriptionType3[SubscriptionType3["DEPTH_ORDER"] = 4] = "DEPTH_ORDER";
+  SubscriptionType3[SubscriptionType3["TRADES"] = 5] = "TRADES";
+  SubscriptionType3[SubscriptionType3["CUMULATIVE_VOLUME"] = 6] = "CUMULATIVE_VOLUME";
+  SubscriptionType3[SubscriptionType3["OHLC"] = 7] = "OHLC";
+  SubscriptionType3[SubscriptionType3["OHLC_NON_REGULAR"] = 8] = "OHLC_NON_REGULAR";
+  SubscriptionType3[SubscriptionType3["SETTLEMENT"] = 9] = "SETTLEMENT";
+  SubscriptionType3[SubscriptionType3["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
+  return SubscriptionType3;
 })(SubscriptionType || {});
 var SymbolType = /* @__PURE__ */ ((SymbolType2) => {
   SymbolType2[SymbolType2["BARCHART"] = 0] = "BARCHART";
@@ -11882,10 +11879,19 @@ var ResolutionSource = class {
   }
 };
 
-// generated/version.ts
-var version = "1.3.1";
+// src/utilities/correlation_id.ts
+var CorrelationId = class {
+  static correlationId = long_default.fromNumber(-1);
+  static create = () => {
+    this.correlationId = this.correlationId.add(1);
+    return this.correlationId;
+  };
+};
 
-// src/connection/connection.ts
+// src/utilities/messages.ts
+var toT = (obj) => obj;
+
+// src/utilities/communication.ts
 var send = (socket, message) => {
   socket.send(OpenfeedGatewayRequestEncode.encode(toT(message)).finish());
 };
@@ -11902,13 +11908,15 @@ var receive = (msgEvent) => {
   }
   return res;
 };
-var CorrelationId = class {
-  static correlationId = long_default.fromNumber(-1);
-  static create = () => {
-    this.correlationId = this.correlationId.add(1);
-    return this.correlationId;
-  };
+
+// src/utilities/constants.ts
+var TIME = {
+  RECONNECT: 5e3,
+  CONNECTION_TIMEOUT: 15e3,
+  SUBSCRIPTION_RETRY: 100
 };
+
+// src/connection/errors.ts
 var DuplicateLoginError = class extends Error {
   get name() {
     return this.constructor.name;
@@ -11924,6 +11932,8 @@ var ConnectionDisposedError = class extends Error {
     return this.constructor.name;
   }
 };
+
+// src/connection/connection.ts
 var OpenFeedConnection = class {
   constructor(connectionToken, socket, listeners, logger) {
     this.connectionToken = connectionToken;
@@ -11947,7 +11957,7 @@ var OpenFeedConnection = class {
     for (; ; ) {
       let timeoutId = null;
       const waitPromise = new Promise((resolve) => {
-        timeoutId = setTimeout(resolve, 15e3);
+        timeoutId = setTimeout(resolve, TIME.CONNECTION_TIMEOUT);
       });
       try {
         await Promise.race([waitPromise, this.whenDisconnectedSource.whenCompleted]);
@@ -12136,7 +12146,7 @@ var OpenFeedConnection = class {
       throw new Error(`Subscription ID ${subscriptionId} does not exist.`);
     }
     const [originalRequest, sub] = subscription;
-    return this.fireUnsubscribeWhenReady(originalRequest, sub);
+    this.fireUnsubscribeWhenReady(originalRequest, sub);
   };
   // We are keeping this fire and forget, because our problems
   // would be caused by disconnection, and reconnect will clean up the rest
@@ -12221,6 +12231,29 @@ var OpenFeedConnection = class {
   whenDisconnected = () => this.whenDisconnectedSource.whenCompleted;
   dispose = () => this.disconnect(new ConnectionDisposedError("Disposed"));
 };
+
+// generated/version.ts
+var version = "1.3.2";
+
+// src/utilities/client_version.ts
+var getClientVersion = async (clientId) => {
+  var _a, _b, _c, _d, _e, _f;
+  let platformDescription;
+  if (typeof window !== "undefined") {
+    platformDescription = navigator.userAgent;
+  } else {
+    const os = await import("os");
+    try {
+      platformDescription = `Node.js ${process.version}; ${(_a = os.version) == null ? void 0 : _a.call(os)} ${(_b = os.release) == null ? void 0 : _b.call(os)}; ${(_c = os.arch) == null ? void 0 : _c.call(os)};`;
+    } catch (e) {
+      platformDescription = `Unknown OS; ${((_d = os.version) == null ? void 0 : _d.call(os)) ?? ""} ${((_e = os.release) == null ? void 0 : _e.call(os)) ?? ""}; ${((_f = os.arch) == null ? void 0 : _f.call(os)) ?? ""};`;
+    }
+  }
+  const clientVersion = `sdk-js:${version};client-id:${clientId ?? "default"};platform:${platformDescription}`;
+  return clientVersion;
+};
+
+// src/connection/client.ts
 var OpenFeedClient = class {
   constructor(url, username, password, listeners, logger, clientId) {
     this.url = url;
@@ -12240,21 +12273,9 @@ var OpenFeedClient = class {
   subscribeResetSource = new ResolutionSource();
   subscriptions = /* @__PURE__ */ new Map();
   onOpen = async () => {
-    var _a, _b, _c, _d, _e, _f;
     if (!this.socket)
       return;
-    let platformDescription;
-    if (typeof window !== "undefined") {
-      platformDescription = navigator.userAgent;
-    } else {
-      const os = await import("os");
-      try {
-        platformDescription = `Node.js ${process.version}; ${(_a = os.version) == null ? void 0 : _a.call(os)} ${(_b = os.release) == null ? void 0 : _b.call(os)}; ${(_c = os.arch) == null ? void 0 : _c.call(os)};`;
-      } catch (e) {
-        platformDescription = `Unknown OS; ${((_d = os.version) == null ? void 0 : _d.call(os)) ?? ""} ${((_e = os.release) == null ? void 0 : _e.call(os)) ?? ""}; ${((_f = os.arch) == null ? void 0 : _f.call(os)) ?? ""};`;
-      }
-    }
-    const clientVersion = `sdk-js:${version};client-id:${this.clientId ?? "default"};platform:${platformDescription}`;
+    const clientVersion = await getClientVersion(this.clientId);
     const loginRequest = {
       loginRequest: {
         correlationId: CorrelationId.create(),
@@ -12316,7 +12337,6 @@ var OpenFeedClient = class {
   runConnectLoop = async () => {
     var _a, _b;
     for (; ; ) {
-      let timeoutId = null;
       if (this.socket) {
         if (this.socket.readyState !== import_isomorphic_ws.default.CLOSED && this.socket.readyState !== import_isomorphic_ws.default.CLOSING) {
           this.socket.close(1e3, "Closed from socket loop");
@@ -12366,15 +12386,9 @@ var OpenFeedClient = class {
       this.loopResetSource = new ResolutionSource();
       this.subscribeResetSource.resolve();
       this.subscribeResetSource = new ResolutionSource();
-      try {
-        await new Promise((resolve) => {
-          timeoutId = setTimeout(resolve, 5e3);
-        });
-      } finally {
-        if (timeoutId) {
-          clearTimeout(timeoutId);
-        }
-      }
+      await new Promise((resolve) => {
+        setTimeout(resolve, TIME.RECONNECT);
+      });
     }
   };
   cleanUp = () => {
@@ -12387,11 +12401,10 @@ var OpenFeedClient = class {
   runSubscribeLoop = async (service, subscriptionType, snapshotIntervalSeconds, symbols, marketIds, exchanges, channels, cancelSource) => {
     var _a;
     for (; ; ) {
-      let timeoutId = null;
       try {
         const connection = await Promise.race([this.connection, cancelSource.whenCompleted]);
         if (cancelSource.completed || /* can't actually happen */
-        !(connection instanceof OpenFeedConnection)) {
+        !connection) {
           return;
         }
         const subscriptionId = connection.subscribe(
@@ -12414,12 +12427,8 @@ var OpenFeedClient = class {
       } catch (error) {
         (_a = this.logger) == null ? void 0 : _a.warn("Subscription error:", error);
         await new Promise((resolve) => {
-          timeoutId = setTimeout(resolve, 100);
+          setTimeout(resolve, TIME.SUBSCRIPTION_RETRY);
         });
-      } finally {
-        if (timeoutId) {
-          clearTimeout(timeoutId);
-        }
       }
     }
   };
@@ -12475,7 +12484,6 @@ var IDGetters = [
   }
 ];
 var OpenFeedListeners = class {
-  instrumentBySymbol = /* @__PURE__ */ new Map();
   instrumentByMarketId = /* @__PURE__ */ new Map();
   constructor() {
     this.onMessage = this.addDetails;
@@ -12488,33 +12496,35 @@ var OpenFeedListeners = class {
       const res = this.instrumentByMarketId.get(marketId.toString());
       return res ?? [void 0, void 0];
     };
+    const includesSymbolSubscription = (arr, item) => {
+      return arr.some(([symbol, type]) => symbol === item[0] && type === item[1]);
+    };
     if (message.subscriptionResponse) {
-      const { marketId, symbol, unsubscribe } = message.subscriptionResponse;
+      const { marketId, symbol, unsubscribe, status, subscriptionType } = message.subscriptionResponse;
       if (marketId !== long_default.ZERO) {
         [def, symbols] = getInstrumentDefinition(marketId);
-        if (!unsubscribe) {
-          if (!symbols) {
-            symbols = [symbol];
-          } else if (!symbols.includes(symbol)) {
-            symbols = [...symbols, symbol];
-          }
-        } else {
-          if (symbols) {
-            symbols = symbols.filter((s) => s !== symbol);
-          }
-          if (!symbols) {
-            this.instrumentByMarketId.delete(marketId.toString());
+        if ((status == null ? void 0 : status.result) === 1 /* SUCCESS */) {
+          const currentEntry = [symbol, subscriptionType];
+          if (!unsubscribe) {
+            if (!symbols) {
+              symbols = [currentEntry];
+            } else if (!includesSymbolSubscription(symbols, currentEntry)) {
+              symbols = [...symbols, currentEntry];
+            }
+          } else {
+            if (symbols) {
+              symbols = symbols.filter(([s, t]) => !(s === symbol && t === subscriptionType));
+            }
+            if (!symbols) {
+              this.instrumentByMarketId.delete(marketId.toString());
+            }
           }
-          this.instrumentBySymbol.delete(symbol);
+          this.instrumentByMarketId.set(marketId.toString(), [def, symbols]);
         }
-        this.instrumentByMarketId.set(marketId.toString(), [def, symbols]);
       }
     } else if (message.instrumentDefinition) {
       [def, symbols] = getInstrumentDefinition(message.instrumentDefinition.marketId);
-      const { instrumentDefinition } = message;
       this.instrumentByMarketId.set(message.instrumentDefinition.marketId.toString(), [message.instrumentDefinition, symbols]);
-      this.instrumentBySymbol.set(message.instrumentDefinition.symbol, instrumentDefinition);
-      symbols == null ? void 0 : symbols.forEach((s) => this.instrumentBySymbol.set(s, instrumentDefinition));
     } else if (message.instrumentAction) {
       const { marketId } = ((_a = message.instrumentAction) == null ? void 0 : _a.instrument) ?? {};
       if (message.instrumentAction.action === 4 /* ALIAS_CHANGED */ && marketId) {
@@ -12523,7 +12533,7 @@ var OpenFeedListeners = class {
         const newAliasNum = oldAlias.endsWith("*0") ? 0 : Number.parseInt(num, 10) + 1;
         const newAlias = `${root}*${newAliasNum}`;
         [def, symbols] = getInstrumentDefinition(marketId);
-        const newSymbols = (symbols == null ? void 0 : symbols.filter((s) => s !== oldAlias)) ?? [];
+        const newSymbols = (symbols == null ? void 0 : symbols.filter(([s]) => s !== oldAlias)) ?? [];
         if (!newSymbols.length) {
           this.instrumentByMarketId.delete(marketId.toString());
         } else {
@@ -12532,7 +12542,7 @@ var OpenFeedListeners = class {
         const { marketId: newMarketId } = message.instrumentAction.newInstrument ?? {};
         if (newMarketId) {
           const [newDef, newSym] = getInstrumentDefinition(newMarketId);
-          const newSymbolsFiltered = (newAlias === oldAlias ? newSym : newSym == null ? void 0 : newSym.filter((s) => s !== newAlias)) ?? [];
+          const newSymbolsFiltered = (newAlias === oldAlias ? newSym : newSym == null ? void 0 : newSym.filter(([s]) => s !== newAlias)) ?? [];
           if (!newSymbolsFiltered.length) {
             this.instrumentByMarketId.delete(newMarketId.toString());
           } else {
@@ -12557,7 +12567,8 @@ var OpenFeedListeners = class {
         }
       }
     }
-    return this.onMessageWithMetadata(message, symbols ?? [], def);
+    const uniqueSymbols = Array.from(new Set((symbols == null ? void 0 : symbols.map(([symbol]) => symbol)) ?? []));
+    return this.onMessageWithMetadata(message, uniqueSymbols, def);
   };
   /* eslint-disable class-methods-use-this */
   onConnected = () => {

package/dist/src/connection/client.d.ts

@@ -0,0 +1,32 @@
+import Long from "long";
+import type { SubscriptionType } from "@gen/openfeed_api";
+import type { Service } from "@gen/openfeed";
+import { IOpenFeedClient, IOpenFeedConnection, IOpenFeedLogger } from "./interfaces";
+import { OpenFeedListeners } from "./listeners";
+export declare class OpenFeedClient implements IOpenFeedClient {
+    private readonly url;
+    private readonly username;
+    private readonly password;
+    private readonly listeners;
+    private readonly logger?;
+    private readonly clientId?;
+    private socket;
+    private _connection;
+    private whenConnectedInternalSource;
+    private whenConnectedSource;
+    private loopResetSource;
+    private subscribeResetSource;
+    private readonly subscriptions;
+    constructor(url: string, username: string, password: string, listeners: OpenFeedListeners, logger?: IOpenFeedLogger | undefined, clientId?: string | undefined);
+    private onOpen;
+    private onMessage;
+    private onError;
+    private onClose;
+    private runConnectLoop;
+    private cleanUp;
+    private runSubscribeLoop;
+    subscribe: (service: Service, subscriptionType: SubscriptionType, snapshotIntervalSeconds: number, symbols?: string[] | null, marketIds?: Long[] | null, exchanges?: string[] | null, channels?: number[] | null) => Long;
+    unsubscribe: (subscriptionId: Long) => void;
+    get connection(): Promise<IOpenFeedConnection>;
+    dispose: () => void;
+}

package/dist/src/connection/connection.d.ts

@@ -1,32 +1,34 @@
+import WebSocket from "isomorphic-ws";
 import Long from "long";
-import type { SubscriptionType } from "@gen/openfeed_api";
+import type { ExchangeResponse_Exchange, InstrumentReferenceResponse, SubscriptionType } from "@gen/openfeed_api";
+import type { InstrumentDefinition } from "@gen/openfeed_instrument";
 import type { Service } from "@gen/openfeed";
-import { IOpenFeedClient, IOpenFeedConnection, IOpenFeedLogger } from "./connection_interfaces";
+import { IOpenFeedConnection, IOpenFeedLogger, OpenFeedInstrumentReferenceRequest, OpenFeedInstrumentRequest } from "./interfaces";
 import { OpenFeedListeners } from "./listeners";
-export declare class OpenFeedClient implements IOpenFeedClient {
-    private readonly url;
-    private readonly username;
-    private readonly password;
+export declare class OpenFeedConnection implements IOpenFeedConnection {
+    private readonly connectionToken;
+    private readonly socket;
     private readonly listeners;
     private readonly logger?;
-    private readonly clientId?;
-    private socket;
-    private _connection;
-    private whenConnectedInternalSource;
-    private whenConnectedSource;
-    private loopResetSource;
-    private subscribeResetSource;
-    private readonly subscriptions;
-    constructor(url: string, username: string, password: string, listeners: OpenFeedListeners, logger?: IOpenFeedLogger | undefined, clientId?: string | undefined);
-    private onOpen;
+    private readonly subscriptionRequests;
+    private readonly exchangeRequests;
+    private readonly instrumentRequests;
+    private readonly definitionsInFlight;
+    private readonly instrumentReferenceRequests;
+    private readonly whenDisconnectedSource;
+    constructor(connectionToken: string, socket: WebSocket, listeners: OpenFeedListeners, logger?: IOpenFeedLogger | undefined);
+    private messageTriggered;
+    private runConnectionWatchLoop;
     private onMessage;
+    private disconnect;
     private onError;
     private onClose;
-    private runConnectLoop;
-    private cleanUp;
-    private runSubscribeLoop;
     subscribe: (service: Service, subscriptionType: SubscriptionType, snapshotIntervalSeconds: number, symbols?: string[] | null, marketIds?: Long[] | null, exchanges?: string[] | null, channels?: number[] | null) => Long;
     unsubscribe: (subscriptionId: Long) => void;
-    get connection(): Promise<IOpenFeedConnection>;
+    private fireUnsubscribeWhenReady;
+    getExchanges: () => Promise<ExchangeResponse_Exchange[]>;
+    getInstrument: (request: OpenFeedInstrumentRequest) => Promise<InstrumentDefinition[]>;
+    getInstrumentReference: (request: OpenFeedInstrumentReferenceRequest) => Promise<InstrumentReferenceResponse>;
+    whenDisconnected: () => Promise<void>;
     dispose: () => void;
 }

package/dist/src/connection/errors.d.ts

@@ -0,0 +1,9 @@
+export declare class DuplicateLoginError extends Error {
+    get name(): string;
+}
+export declare class InvalidCredentialsError extends Error {
+    get name(): string;
+}
+export declare class ConnectionDisposedError extends Error {
+    get name(): string;
+}

package/dist/src/connection/listeners.d.ts

@@ -1,9 +1,8 @@
 import { OpenfeedGatewayMessage } from "@gen/openfeed_api";
 import { InstrumentDefinition } from "@gen/openfeed_instrument";
 import { HeartBeat } from "@gen/openfeed";
-import { IOpenFeedConnection } from "./connection_interfaces";
+import { IOpenFeedConnection } from "./interfaces";
 export declare class OpenFeedListeners {
-    private readonly instrumentBySymbol;
     private readonly instrumentByMarketId;
     constructor();
     private addDetails;

package/dist/src/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./connection/connection";
-export * from "./connection/connection_interfaces";
+export * from "./connection/client";
+export * from "./connection/interfaces";
 export * from "./connection/listeners";
 export * from "../generated/index";

package/dist/src/utilities/client_version.d.ts

@@ -0,0 +1 @@
+export declare const getClientVersion: (clientId?: string) => Promise<string>;

package/dist/src/utilities/communication.d.ts

@@ -0,0 +1,5 @@
+import WebSocket from "isomorphic-ws";
+import { OptionalUndefined } from "@src/utilities/messages";
+import type { OpenfeedGatewayMessage, OpenfeedGatewayRequest } from "@gen/openfeed_api";
+export declare const send: (socket: WebSocket, message: OptionalUndefined<OpenfeedGatewayRequest>) => void;
+export declare const receive: (msgEvent: WebSocket.MessageEvent) => OpenfeedGatewayMessage[];

package/dist/src/utilities/constants.d.ts

@@ -0,0 +1,5 @@
+export declare const TIME: {
+    RECONNECT: number;
+    CONNECTION_TIMEOUT: number;
+    SUBSCRIPTION_RETRY: number;
+};

package/dist/src/utilities/correlation_id.d.ts

@@ -0,0 +1,5 @@
+import Long from "long";
+export declare class CorrelationId {
+    private static correlationId;
+    static create: () => Long;
+}

package/dist/test/client.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/connection.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/listeners.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfeed/sdk-js",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "description": "JavaScript SDK for Barchart OpenFeed",
     "main": "dist/node.js",
     "browser": "dist/index.js",
@@ -11,10 +11,11 @@
     "license": "MIT",
     "scripts": {
         "prepare": "husky install",
+        "upgrade:proto": "yarn upgrade proto",
         "generate:proto": "cd node_modules\\proto && ..\\..\\protoc --plugin=..\\..\\node_modules\\.bin\\protoc-gen-ts_proto --ts_proto_opt=outputJsonMethods=false --ts_proto_opt=outputPartialMethods=false --ts_proto_opt=exportCommonSymbols=false --ts_proto_opt=esModuleInterop=true --ts_proto_opt=forceLong=long --ts_proto_opt=useExactTypes=false --ts_proto_out=../../generated *.proto",
         "generate:version": "genversion --es6 -s -d ./generated/version.ts",
         "generate:process": "tsx ./scripts/process.ts",
-        "generate": "yarn generate:proto && yarn generate:process",
+        "generate": "yarn upgrade:proto && yarn generate:proto && yarn generate:process",
         "build:clear": "rimraf dist",
         "build:node": "esbuild --bundle --outfile=dist/node.js --platform=node --target=node16 --format=esm --banner:js=\"import { createRequire } from 'module';const require = createRequire(import.meta.url);\" src/index.ts",
         "build:ts": "yarn generate:version && vite build",
@@ -22,7 +23,8 @@
         "build:test-release": "standard-version --dry-run",
         "build:prepare-release": "standard-version -t ''",
         "run:browser": "yarn generate:version && vite dev",
-        "run:node": "yarn generate:version && tsx ./src/test.ts"
+        "run:node": "yarn generate:version && tsx ./src/test.ts",
+        "test": "jest"
     },
     "devDependencies": {
         "@commitlint/cli": "^18.4.3",
@@ -49,7 +51,8 @@
         "ts-proto": "^1.156.7",
         "tsx": "^3.12.7",
         "typescript": "^5.2.2",
-        "vite": "^4.4.9"
+        "vite": "^4.4.9",
+        "vite-plugin-checker": "^0.8.0"
     },
     "packageManager": "yarn@1.22.19",
     "dependencies": {

package/tsconfig.json

@@ -20,5 +20,5 @@
             "@gen/*": ["./generated/*"]
         }
     },
-    "include": ["./src", "./generated", "./scripts/"]
+    "include": ["./src", "./generated", "./scripts/", "./test/"]
 }