@openfeed/sdk-js 1.1.5 → 1.2.0

package/.releases/CHANGELOG-1.1.6.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.1.5](https://github.com/openfeed-org/sdk-js/compare/1.1.4...1.1.5) (2023-12-22)
+
+
+### Bug Fixes
+
+* new approach for listening to alias changes ([69f2d7d](https://github.com/openfeed-org/sdk-js/commit/69f2d7d6e5b64d7abeb6c6cda052c6e7f512aef3))

package/.releases/CHANGELOG-1.2.0.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.1.6](https://github.com/openfeed-org/sdk-js/compare/1.1.5...1.1.6) (2024-02-27)
+
+
+### Bug Fixes
+
+* enhance unsubscription flow to prevent duplicate race condition ([863a4fe](https://github.com/openfeed-org/sdk-js/commit/863a4fe5e2ff27613b70a9f1638df211fd796acc))

package/CHANGELOG.md

@@ -2,9 +2,14 @@
 
 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.1.5](https://github.com/openfeed-org/sdk-js/compare/1.1.4...1.1.5) (2023-12-22)
+## [1.2.0](https://github.com/openfeed-org/sdk-js/compare/1.1.6...1.2.0) (2024-03-25)
+
+
+### Features
+
+* update proto and generate ts files ([cee34a2](https://github.com/openfeed-org/sdk-js/commit/cee34a2f35a5e35ab6c28f9d65dbe71800727819))
 
 
 ### Bug Fixes
 
-* new approach for listening to alias changes ([69f2d7d](https://github.com/openfeed-org/sdk-js/commit/69f2d7d6e5b64d7abeb6c6cda052c6e7f512aef3))
+* enhance alias change handling to prevent loss of subscriptions ([3714a15](https://github.com/openfeed-org/sdk-js/commit/3714a15f57e1da81876d2c18828823df452b524d))

package/dist/generated/openfeed.d.ts

@@ -124,7 +124,7 @@ export declare enum ActionType {
  * message types
  */
 export interface OpenfeedMessage {
-    /** / Nanoecond unix epoch at time of message transmission (UTC) */
+    /** / Nano second unix epoch at time of message transmission (UTC) */
     sendingTime: Long;
     /**
      * / The total number of markets available on this channel
@@ -991,6 +991,7 @@ export interface InstrumentAction {
     tradeDate: number;
     action: ActionType;
     message: string;
+    oldAlias: string;
     instrument: InstrumentDefinition | undefined;
     newInstrument: InstrumentDefinition | undefined;
 }

package/dist/generated/openfeed_api.d.ts

@@ -21,6 +21,7 @@ export declare enum Result {
     INSUFFICIENT_PRIVILEGES = 125,
     AUTHENTICATION_REQUIRED = 126,
     GENERIC_FAILURE = 127,
+    INVALID_USERNAME = 128,
     UNRECOGNIZED = -1
 }
 export declare enum SubscriptionType {
@@ -49,6 +50,7 @@ export interface OpenfeedGatewayRequest {
     instrumentRequest?: InstrumentRequest | undefined;
     instrumentReferenceRequest?: InstrumentReferenceRequest | undefined;
     exchangeRequest?: ExchangeRequest | undefined;
+    listSubscriptionsRequest?: ListSubscriptionsRequest | undefined;
 }
 /** / Openfeed Server Response */
 export interface OpenfeedGatewayMessage {
@@ -66,6 +68,7 @@ export interface OpenfeedGatewayMessage {
     ohlc?: Ohlc | undefined;
     exchangeResponse?: ExchangeResponse | undefined;
     instrumentAction?: InstrumentAction | undefined;
+    listSubscriptionsResponse?: ListSubscriptionsResponse | undefined;
 }
 /**
  * //////////////////
@@ -213,6 +216,34 @@ export interface SubscriptionResponse {
     unsubscribe: boolean;
     snapshotIntervalSeconds: number;
 }
+/** / List Subscriptions for a user */
+export interface ListSubscriptionsRequest {
+    correlationId: Long;
+    token: string;
+    username: string;
+}
+export interface ListSubscriptionsResponse {
+    correlationId: Long;
+    status: Status | undefined;
+    username: string;
+    sessions: ListSubscriptionsResponse_Session[];
+}
+export interface ListSubscriptionsResponse_Session {
+    /** / Nano second unix epoch */
+    loginTime: Long;
+    token: string;
+    clientVersion: string;
+    marketSubscriptions: ListSubscriptionsResponse_Subscription[];
+    exchangeSubscriptions: ListSubscriptionsResponse_Subscription[];
+}
+export interface ListSubscriptionsResponse_Subscription {
+    subscriptionId: string;
+    symbolId: string;
+    marketId: Long;
+    symbols: string[];
+    exchange: string;
+    root: string;
+}
 export declare const OpenfeedGatewayRequestEncode: {
     encode(message: OpenfeedGatewayRequest, writer?: _m0.Writer): _m0.Writer;
 }, OpenfeedGatewayRequestDecode: {
@@ -303,3 +334,23 @@ export declare const SubscriptionResponseEncode: {
 }, SubscriptionResponseDecode: {
     decode(input: _m0.Reader | Uint8Array, length?: number): SubscriptionResponse;
 };
+export declare const ListSubscriptionsRequestEncode: {
+    encode(message: ListSubscriptionsRequest, writer?: _m0.Writer): _m0.Writer;
+}, ListSubscriptionsRequestDecode: {
+    decode(input: _m0.Reader | Uint8Array, length?: number): ListSubscriptionsRequest;
+};
+export declare const ListSubscriptionsResponseEncode: {
+    encode(message: ListSubscriptionsResponse, writer?: _m0.Writer): _m0.Writer;
+}, ListSubscriptionsResponseDecode: {
+    decode(input: _m0.Reader | Uint8Array, length?: number): ListSubscriptionsResponse;
+};
+export declare const ListSubscriptionsResponse_SessionEncode: {
+    encode(message: ListSubscriptionsResponse_Session, writer?: _m0.Writer): _m0.Writer;
+}, ListSubscriptionsResponse_SessionDecode: {
+    decode(input: _m0.Reader | Uint8Array, length?: number): ListSubscriptionsResponse_Session;
+};
+export declare const ListSubscriptionsResponse_SubscriptionEncode: {
+    encode(message: ListSubscriptionsResponse_Subscription, writer?: _m0.Writer): _m0.Writer;
+}, ListSubscriptionsResponse_SubscriptionDecode: {
+    decode(input: _m0.Reader | Uint8Array, length?: number): ListSubscriptionsResponse_Subscription;
+};

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.1.5";
+export declare const version = "1.2.0";

package/dist/index.js

@@ -7054,6 +7054,7 @@ function createBaseInstrumentAction() {
     tradeDate: 0,
     action: 0,
     message: "",
+    oldAlias: "",
     instrument: void 0,
     newInstrument: void 0
   };
@@ -7090,6 +7091,12 @@ const InstrumentActionDecode = {
           }
           message.message = reader2.string();
           continue;
+        case 5:
+          if (tag !== 42) {
+            break;
+          }
+          message.oldAlias = reader2.string();
+          continue;
         case 10:
           if (tag !== 82) {
             break;
@@ -7190,6 +7197,7 @@ var Result = /* @__PURE__ */ ((Result2) => {
   Result2[Result2["INSUFFICIENT_PRIVILEGES"] = 125] = "INSUFFICIENT_PRIVILEGES";
   Result2[Result2["AUTHENTICATION_REQUIRED"] = 126] = "AUTHENTICATION_REQUIRED";
   Result2[Result2["GENERIC_FAILURE"] = 127] = "GENERIC_FAILURE";
+  Result2[Result2["INVALID_USERNAME"] = 128] = "INVALID_USERNAME";
   Result2[Result2["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
   return Result2;
 })(Result || {});
@@ -7232,6 +7240,9 @@ const OpenfeedGatewayRequestEncode = {
     if (message.exchangeRequest !== void 0) {
       ExchangeRequestEncode.encode(message.exchangeRequest, writer2.uint32(50).fork()).ldelim();
     }
+    if (message.listSubscriptionsRequest !== void 0) {
+      ListSubscriptionsRequestEncode.encode(message.listSubscriptionsRequest, writer2.uint32(58).fork()).ldelim();
+    }
     return writer2;
   }
 };
@@ -7250,7 +7261,8 @@ function createBaseOpenfeedGatewayMessage() {
     volumeAtPrice: void 0,
     ohlc: void 0,
     exchangeResponse: void 0,
-    instrumentAction: void 0
+    instrumentAction: void 0,
+    listSubscriptionsResponse: void 0
   };
 }
 const OpenfeedGatewayMessageDecode = {
@@ -7345,6 +7357,12 @@ const OpenfeedGatewayMessageDecode = {
           }
           message.instrumentAction = InstrumentActionDecode.decode(reader2, reader2.uint32());
           continue;
+        case 15:
+          if (tag !== 122) {
+            break;
+          }
+          message.listSubscriptionsResponse = ListSubscriptionsResponseDecode.decode(reader2, reader2.uint32());
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -7993,6 +8011,170 @@ const SubscriptionResponseDecode = {
     return message;
   }
 };
+const ListSubscriptionsRequestEncode = {
+  encode(message, writer2 = _m0.Writer.create()) {
+    if (!message.correlationId.isZero()) {
+      writer2.uint32(8).sint64(message.correlationId);
+    }
+    if (message.token !== "") {
+      writer2.uint32(18).string(message.token);
+    }
+    if (message.username !== "") {
+      writer2.uint32(26).string(message.username);
+    }
+    return writer2;
+  }
+};
+function createBaseListSubscriptionsResponse() {
+  return { correlationId: Long.ZERO, status: void 0, username: "", sessions: [] };
+}
+const ListSubscriptionsResponseDecode = {
+  decode(input, length) {
+    const reader2 = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end2 = length === void 0 ? reader2.len : reader2.pos + length;
+    const message = createBaseListSubscriptionsResponse();
+    while (reader2.pos < end2) {
+      const tag = reader2.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+          message.correlationId = reader2.sint64();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+          message.status = StatusDecode.decode(reader2, reader2.uint32());
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+          message.username = reader2.string();
+          continue;
+        case 10:
+          if (tag !== 82) {
+            break;
+          }
+          message.sessions.push(ListSubscriptionsResponse_SessionDecode.decode(reader2, reader2.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader2.skipType(tag & 7);
+    }
+    return message;
+  }
+};
+function createBaseListSubscriptionsResponse_Session() {
+  return { loginTime: Long.ZERO, token: "", clientVersion: "", marketSubscriptions: [], exchangeSubscriptions: [] };
+}
+const ListSubscriptionsResponse_SessionDecode = {
+  decode(input, length) {
+    const reader2 = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end2 = length === void 0 ? reader2.len : reader2.pos + length;
+    const message = createBaseListSubscriptionsResponse_Session();
+    while (reader2.pos < end2) {
+      const tag = reader2.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+          message.loginTime = reader2.sint64();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+          message.token = reader2.string();
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+          message.clientVersion = reader2.string();
+          continue;
+        case 10:
+          if (tag !== 82) {
+            break;
+          }
+          message.marketSubscriptions.push(ListSubscriptionsResponse_SubscriptionDecode.decode(reader2, reader2.uint32()));
+          continue;
+        case 11:
+          if (tag !== 90) {
+            break;
+          }
+          message.exchangeSubscriptions.push(ListSubscriptionsResponse_SubscriptionDecode.decode(reader2, reader2.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader2.skipType(tag & 7);
+    }
+    return message;
+  }
+};
+function createBaseListSubscriptionsResponse_Subscription() {
+  return { subscriptionId: "", symbolId: "", marketId: Long.ZERO, symbols: [], exchange: "", root: "" };
+}
+const ListSubscriptionsResponse_SubscriptionDecode = {
+  decode(input, length) {
+    const reader2 = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end2 = length === void 0 ? reader2.len : reader2.pos + length;
+    const message = createBaseListSubscriptionsResponse_Subscription();
+    while (reader2.pos < end2) {
+      const tag = reader2.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+          message.subscriptionId = reader2.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+          message.symbolId = reader2.string();
+          continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+          message.marketId = reader2.sint64();
+          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+          message.symbols.push(reader2.string());
+          continue;
+        case 10:
+          if (tag !== 82) {
+            break;
+          }
+          message.exchange = reader2.string();
+          continue;
+        case 11:
+          if (tag !== 90) {
+            break;
+          }
+          message.root = reader2.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader2.skipType(tag & 7);
+    }
+    return message;
+  }
+};
 if (_m0.util.Long !== Long) {
   _m0.util.Long = Long;
   _m0.configure();
@@ -8031,7 +8213,7 @@ class ResolutionSource {
     return this.onError;
   }
 }
-const version = "1.1.5";
+const version = "1.2.0";
 const send = (socket, message) => {
   socket.send(OpenfeedGatewayRequestEncode.encode(toT(message)).finish());
 };
@@ -8073,7 +8255,7 @@ class ConnectionDisposedError extends Error {
 }
 class OpenFeedConnection {
   constructor(connectionToken, socket, listeners, logger) {
-    __publicField(this, "subscriptions", /* @__PURE__ */ new Map());
+    __publicField(this, "subscriptionRequests", /* @__PURE__ */ new Map());
     __publicField(this, "exchangeRequests", /* @__PURE__ */ new Map());
     __publicField(this, "instrumentRequests", /* @__PURE__ */ new Map());
     __publicField(this, "definitionsInFlight", /* @__PURE__ */ new Map());
@@ -8157,6 +8339,16 @@ class OpenFeedConnection {
             request.resolve(message.exchangeResponse);
             continue;
           }
+          if (message.subscriptionResponse) {
+            const { correlationId, unsubscribe } = message.subscriptionResponse;
+            if (!unsubscribe) {
+              const request = this.subscriptionRequests.get(correlationId.toString());
+              if (!request)
+                throw new Error(`Subscription response ID ${correlationId} not found`);
+              const [, sub] = request;
+              sub.resolve();
+            }
+          }
           this.listeners.onMessage(message);
         }
       } catch (error) {
@@ -8229,7 +8421,8 @@ class OpenFeedConnection {
         requests: requests.map((r) => toT(r)),
         unsubscribe: false
       };
-      this.subscriptions.set(correlationId.toString(), subscriptionRequest);
+      const source = new ResolutionSource();
+      this.subscriptionRequests.set(correlationId.toString(), [subscriptionRequest, source]);
       send(this.socket, { subscriptionRequest });
       return correlationId;
     });
@@ -8237,13 +8430,12 @@ class OpenFeedConnection {
       if (this.whenDisconnectedSource.completed) {
         throw new ConnectionDisposedError("This connection was closed");
       }
-      const subscription = this.subscriptions.get(subscriptionId.toString());
+      const subscription = this.subscriptionRequests.get(subscriptionId.toString());
       if (!subscription) {
         throw new Error(`Subscription ID ${subscriptionId} does not exist.`);
       }
-      const subscriptionRequest = { ...subscription, unsubscribe: true };
-      send(this.socket, { subscriptionRequest });
-      this.subscriptions.delete(subscriptionId.toString());
+      const [originalRequest, sub] = subscription;
+      this.fireUnsubscribeWhenReady(originalRequest, sub);
     });
     __publicField(this, "getExchanges", async () => {
       var _a;
@@ -8342,6 +8534,18 @@ class OpenFeedConnection {
     this.socket.close(1e3, error.message);
     this.whenDisconnectedSource.reject(error);
   }
+  // We are keeping this fire and forget, because our problems
+  // would be caused by disconnection, and reconnect will clean up the rest
+  async fireUnsubscribeWhenReady(originalRequest, sub) {
+    try {
+      await sub.whenCompleted;
+      const subscriptionRequest = { ...originalRequest, unsubscribe: true };
+      send(this.socket, { subscriptionRequest });
+    } catch (e) {
+    } finally {
+      this.subscriptionRequests.delete(originalRequest.correlationId.toString());
+    }
+  }
 }
 class OpenFeedClient {
   constructor(url, username, password, listeners, logger, clientId) {
@@ -8607,14 +8811,25 @@ class OpenFeedListeners {
         return res ?? [void 0, void 0];
       };
       if (message.subscriptionResponse) {
-        if (message.subscriptionResponse != null && message.subscriptionResponse.marketId !== Long.ZERO) {
-          [def, symbols] = getInstrumentDefinition(message.subscriptionResponse.marketId);
-          if (!symbols) {
-            symbols = [message.subscriptionResponse.symbol];
-          } else if (!symbols.includes(message.subscriptionResponse.symbol)) {
-            symbols = [...symbols, message.subscriptionResponse.symbol];
-          }
-          this.instrumentByMarketId.set(message.subscriptionResponse.marketId.toString(), [def, symbols]);
+        const { marketId, symbol, unsubscribe } = 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());
+            }
+            this.instrumentBySymbol.delete(symbol);
+          }
+          this.instrumentByMarketId.set(marketId.toString(), [def, symbols]);
         }
       } else if (message.instrumentDefinition) {
         [def, symbols] = getInstrumentDefinition(message.instrumentDefinition.marketId);
@@ -8625,13 +8840,27 @@ class OpenFeedListeners {
       } else if (message.instrumentAction) {
         const { marketId } = ((_a = message.instrumentAction) == null ? void 0 : _a.instrument) ?? {};
         if (message.instrumentAction.action === ActionType.ALIAS_CHANGED && marketId) {
+          const { oldAlias } = message.instrumentAction;
+          const [root, num] = oldAlias.split("*");
+          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.includes("*"))) ?? [];
+          const newSymbols = (symbols == null ? void 0 : symbols.filter((s) => s !== oldAlias)) ?? [];
           if (!newSymbols.length) {
             this.instrumentByMarketId.delete(marketId.toString());
           } else {
             this.instrumentByMarketId.set(marketId.toString(), [def, newSymbols]);
           }
+          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)) ?? [];
+            if (!newSymbolsFiltered.length) {
+              this.instrumentByMarketId.delete(newMarketId.toString());
+            } else {
+              this.instrumentByMarketId.set(newMarketId.toString(), [newDef, newSymbolsFiltered]);
+            }
+          }
         }
         if (message.instrumentAction.action === ActionType.EXCHANGE_MOVE && marketId) {
           [def, symbols] = getInstrumentDefinition(marketId);

package/dist/node.js

@@ -10672,6 +10672,7 @@ function createBaseInstrumentAction() {
     tradeDate: 0,
     action: 0,
     message: "",
+    oldAlias: "",
     instrument: void 0,
     newInstrument: void 0
   };
@@ -10708,6 +10709,12 @@ var InstrumentActionDecode = {
           }
           message.message = reader.string();
           continue;
+        case 5:
+          if (tag !== 42) {
+            break;
+          }
+          message.oldAlias = reader.string();
+          continue;
         case 10:
           if (tag !== 82) {
             break;
@@ -10810,6 +10817,7 @@ var Result = /* @__PURE__ */ ((Result2) => {
   Result2[Result2["INSUFFICIENT_PRIVILEGES"] = 125] = "INSUFFICIENT_PRIVILEGES";
   Result2[Result2["AUTHENTICATION_REQUIRED"] = 126] = "AUTHENTICATION_REQUIRED";
   Result2[Result2["GENERIC_FAILURE"] = 127] = "GENERIC_FAILURE";
+  Result2[Result2["INVALID_USERNAME"] = 128] = "INVALID_USERNAME";
   Result2[Result2["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
   return Result2;
 })(Result || {});
@@ -10852,6 +10860,9 @@ var OpenfeedGatewayRequestEncode = {
     if (message.exchangeRequest !== void 0) {
       ExchangeRequestEncode.encode(message.exchangeRequest, writer.uint32(50).fork()).ldelim();
     }
+    if (message.listSubscriptionsRequest !== void 0) {
+      ListSubscriptionsRequestEncode.encode(message.listSubscriptionsRequest, writer.uint32(58).fork()).ldelim();
+    }
     return writer;
   }
 };
@@ -10870,7 +10881,8 @@ function createBaseOpenfeedGatewayMessage() {
     volumeAtPrice: void 0,
     ohlc: void 0,
     exchangeResponse: void 0,
-    instrumentAction: void 0
+    instrumentAction: void 0,
+    listSubscriptionsResponse: void 0
   };
 }
 var OpenfeedGatewayMessageDecode = {
@@ -10965,6 +10977,12 @@ var OpenfeedGatewayMessageDecode = {
           }
           message.instrumentAction = InstrumentActionDecode.decode(reader, reader.uint32());
           continue;
+        case 15:
+          if (tag !== 122) {
+            break;
+          }
+          message.listSubscriptionsResponse = ListSubscriptionsResponseDecode.decode(reader, reader.uint32());
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -11613,6 +11631,170 @@ var SubscriptionResponseDecode = {
     return message;
   }
 };
+var ListSubscriptionsRequestEncode = {
+  encode(message, writer = import_minimal3.default.Writer.create()) {
+    if (!message.correlationId.isZero()) {
+      writer.uint32(8).sint64(message.correlationId);
+    }
+    if (message.token !== "") {
+      writer.uint32(18).string(message.token);
+    }
+    if (message.username !== "") {
+      writer.uint32(26).string(message.username);
+    }
+    return writer;
+  }
+};
+function createBaseListSubscriptionsResponse() {
+  return { correlationId: long_default.ZERO, status: void 0, username: "", sessions: [] };
+}
+var ListSubscriptionsResponseDecode = {
+  decode(input, length) {
+    const reader = input instanceof import_minimal3.default.Reader ? input : import_minimal3.default.Reader.create(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseListSubscriptionsResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+          message.correlationId = reader.sint64();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+          message.status = StatusDecode.decode(reader, reader.uint32());
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+          message.username = reader.string();
+          continue;
+        case 10:
+          if (tag !== 82) {
+            break;
+          }
+          message.sessions.push(ListSubscriptionsResponse_SessionDecode.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+};
+function createBaseListSubscriptionsResponse_Session() {
+  return { loginTime: long_default.ZERO, token: "", clientVersion: "", marketSubscriptions: [], exchangeSubscriptions: [] };
+}
+var ListSubscriptionsResponse_SessionDecode = {
+  decode(input, length) {
+    const reader = input instanceof import_minimal3.default.Reader ? input : import_minimal3.default.Reader.create(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseListSubscriptionsResponse_Session();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+          message.loginTime = reader.sint64();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+          message.token = reader.string();
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+          message.clientVersion = reader.string();
+          continue;
+        case 10:
+          if (tag !== 82) {
+            break;
+          }
+          message.marketSubscriptions.push(ListSubscriptionsResponse_SubscriptionDecode.decode(reader, reader.uint32()));
+          continue;
+        case 11:
+          if (tag !== 90) {
+            break;
+          }
+          message.exchangeSubscriptions.push(ListSubscriptionsResponse_SubscriptionDecode.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+};
+function createBaseListSubscriptionsResponse_Subscription() {
+  return { subscriptionId: "", symbolId: "", marketId: long_default.ZERO, symbols: [], exchange: "", root: "" };
+}
+var ListSubscriptionsResponse_SubscriptionDecode = {
+  decode(input, length) {
+    const reader = input instanceof import_minimal3.default.Reader ? input : import_minimal3.default.Reader.create(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseListSubscriptionsResponse_Subscription();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+          message.subscriptionId = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+          message.symbolId = reader.string();
+          continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+          message.marketId = reader.sint64();
+          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+          message.symbols.push(reader.string());
+          continue;
+        case 10:
+          if (tag !== 82) {
+            break;
+          }
+          message.exchange = reader.string();
+          continue;
+        case 11:
+          if (tag !== 90) {
+            break;
+          }
+          message.root = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+};
 if (import_minimal3.default.util.Long !== long_default) {
   import_minimal3.default.util.Long = long_default;
   import_minimal3.default.configure();
@@ -11655,7 +11837,7 @@ var ResolutionSource = class {
 };
 
 // generated/version.ts
-var version = "1.1.5";
+var version = "1.2.0";
 
 // src/connection/connection.ts
 var send = (socket, message) => {
@@ -11707,7 +11889,7 @@ var OpenFeedConnection = class {
     this.socket.onclose = this.onClose;
     this.runConnectionWatchLoop();
   }
-  subscriptions = /* @__PURE__ */ new Map();
+  subscriptionRequests = /* @__PURE__ */ new Map();
   exchangeRequests = /* @__PURE__ */ new Map();
   instrumentRequests = /* @__PURE__ */ new Map();
   definitionsInFlight = /* @__PURE__ */ new Map();
@@ -11791,6 +11973,16 @@ var OpenFeedConnection = class {
           request.resolve(message.exchangeResponse);
           continue;
         }
+        if (message.subscriptionResponse) {
+          const { correlationId, unsubscribe } = message.subscriptionResponse;
+          if (!unsubscribe) {
+            const request = this.subscriptionRequests.get(correlationId.toString());
+            if (!request)
+              throw new Error(`Subscription response ID ${correlationId} not found`);
+            const [, sub] = request;
+            sub.resolve();
+          }
+        }
         this.listeners.onMessage(message);
       }
     } catch (error) {
@@ -11881,7 +12073,8 @@ var OpenFeedConnection = class {
       requests: requests.map((r) => toT(r)),
       unsubscribe: false
     };
-    this.subscriptions.set(correlationId.toString(), subscriptionRequest);
+    const source = new ResolutionSource();
+    this.subscriptionRequests.set(correlationId.toString(), [subscriptionRequest, source]);
     send(this.socket, { subscriptionRequest });
     return correlationId;
   };
@@ -11889,14 +12082,25 @@ var OpenFeedConnection = class {
     if (this.whenDisconnectedSource.completed) {
       throw new ConnectionDisposedError("This connection was closed");
     }
-    const subscription = this.subscriptions.get(subscriptionId.toString());
+    const subscription = this.subscriptionRequests.get(subscriptionId.toString());
     if (!subscription) {
       throw new Error(`Subscription ID ${subscriptionId} does not exist.`);
     }
-    const subscriptionRequest = { ...subscription, unsubscribe: true };
-    send(this.socket, { subscriptionRequest });
-    this.subscriptions.delete(subscriptionId.toString());
+    const [originalRequest, sub] = subscription;
+    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
+  async fireUnsubscribeWhenReady(originalRequest, sub) {
+    try {
+      await sub.whenCompleted;
+      const subscriptionRequest = { ...originalRequest, unsubscribe: true };
+      send(this.socket, { subscriptionRequest });
+    } catch (e) {
+    } finally {
+      this.subscriptionRequests.delete(originalRequest.correlationId.toString());
+    }
+  }
   getExchanges = async () => {
     var _a;
     if (this.whenDisconnectedSource.completed) {
@@ -12236,14 +12440,25 @@ var OpenFeedListeners = class {
       return res ?? [void 0, void 0];
     };
     if (message.subscriptionResponse) {
-      if (message.subscriptionResponse != null && message.subscriptionResponse.marketId !== long_default.ZERO) {
-        [def, symbols] = getInstrumentDefinition(message.subscriptionResponse.marketId);
-        if (!symbols) {
-          symbols = [message.subscriptionResponse.symbol];
-        } else if (!symbols.includes(message.subscriptionResponse.symbol)) {
-          symbols = [...symbols, message.subscriptionResponse.symbol];
+      const { marketId, symbol, unsubscribe } = 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());
+          }
+          this.instrumentBySymbol.delete(symbol);
         }
-        this.instrumentByMarketId.set(message.subscriptionResponse.marketId.toString(), [def, symbols]);
+        this.instrumentByMarketId.set(marketId.toString(), [def, symbols]);
       }
     } else if (message.instrumentDefinition) {
       [def, symbols] = getInstrumentDefinition(message.instrumentDefinition.marketId);
@@ -12254,13 +12469,27 @@ var OpenFeedListeners = class {
     } else if (message.instrumentAction) {
       const { marketId } = ((_a = message.instrumentAction) == null ? void 0 : _a.instrument) ?? {};
       if (message.instrumentAction.action === 4 /* ALIAS_CHANGED */ && marketId) {
+        const { oldAlias } = message.instrumentAction;
+        const [root, num] = oldAlias.split("*");
+        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.includes("*"))) ?? [];
+        const newSymbols = (symbols == null ? void 0 : symbols.filter((s) => s !== oldAlias)) ?? [];
         if (!newSymbols.length) {
           this.instrumentByMarketId.delete(marketId.toString());
         } else {
           this.instrumentByMarketId.set(marketId.toString(), [def, newSymbols]);
         }
+        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)) ?? [];
+          if (!newSymbolsFiltered.length) {
+            this.instrumentByMarketId.delete(newMarketId.toString());
+          } else {
+            this.instrumentByMarketId.set(newMarketId.toString(), [newDef, newSymbolsFiltered]);
+          }
+        }
       }
       if (message.instrumentAction.action === 3 /* EXCHANGE_MOVE */ && marketId) {
         [def, symbols] = getInstrumentDefinition(marketId);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfeed/sdk-js",
-    "version": "1.1.5",
+    "version": "1.2.0",
     "description": "JavaScript SDK for Barchart OpenFeed",
     "main": "dist/node.js",
     "browser": "dist/index.js",