@factset/frontgate-js-sdk 7.0.0 → 7.0.1

package/dist/lib/node/message/request/PingRequest.js

@@ -24,4 +24,3 @@ class PingRequest {
 exports.PingRequest = PingRequest;
 PingRequest.NAME = 'PingRequest';
 PingRequest.VERSION = 3;
-//# sourceMappingURL=PingRequest.js.map

package/dist/lib/node/message/request/TransportLayerClientRequestHeader.js

@@ -110,4 +110,3 @@ TransportLayerClientRequestHeader.FLAG_VALUE = {
     subscription_use_pull_permissions: 64,
     allow_chunked_response: 128,
 };
-//# sourceMappingURL=TransportLayerClientRequestHeader.js.map

package/dist/lib/node/message/request/index.js

@@ -23,4 +23,3 @@ __exportStar(require("./HTTPProxyRequest"), exports);
 __exportStar(require("./PingRequest"), exports);
 __exportStar(require("./TransportLayerClientRequestHeader"), exports);
 __exportStar(require("./raw"), exports);
-//# sourceMappingURL=index.js.map

package/dist/lib/node/message/request/raw/RawRequest.js

@@ -19,4 +19,3 @@ class RawRequest extends AbstractMdg2Request_1.AbstractMdg2Request {
     }
 }
 exports.RawRequest = RawRequest;
-//# sourceMappingURL=RawRequest.js.map

package/dist/lib/node/message/request/raw/example/CreateNotationSearchRequest.js

@@ -569,4 +569,3 @@ const createNotationSearchRequest = () => ({
     },
 });
 exports.createNotationSearchRequest = createNotationSearchRequest;
-//# sourceMappingURL=CreateNotationSearchRequest.js.map

package/dist/lib/node/message/request/raw/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./RawRequest"), exports);
-//# sourceMappingURL=index.js.map

package/dist/lib/node/message/response/AuthenticationResponse.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=AuthenticationResponse.js.map

package/dist/lib/node/message/response/AuthenticationTokenResponse.js

@@ -23,4 +23,3 @@ class AuthenticationTokenResponse extends Mdg2Response_1.Mdg2Response {
     }
 }
 exports.AuthenticationTokenResponse = AuthenticationTokenResponse;
-//# sourceMappingURL=AuthenticationTokenResponse.js.map

package/dist/lib/node/message/response/ConfigurationResponse.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=ConfigurationResponse.js.map

package/dist/lib/node/message/response/DisconnectionMessage.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=DisconnectionMessage.js.map

package/dist/lib/node/message/response/ErrorResponse.js

@@ -11,4 +11,3 @@ class ErrorResponse extends Mdg2Response_1.Mdg2Response {
     }
 }
 exports.ErrorResponse = ErrorResponse;
-//# sourceMappingURL=ErrorResponse.js.map

package/dist/lib/node/message/response/HTTPProxyResponse.js

@@ -31,4 +31,3 @@ class HTTPProxyResponse extends Mdg2Response_1.Mdg2Response {
     }
 }
 exports.HTTPProxyResponse = HTTPProxyResponse;
-//# sourceMappingURL=HTTPProxyResponse.js.map

package/dist/lib/node/message/response/HighLevelResponse.js

@@ -26,4 +26,3 @@ class HighLevelResponse extends Mdg2Response_1.Mdg2Response {
     }
 }
 exports.HighLevelResponse = HighLevelResponse;
-//# sourceMappingURL=HighLevelResponse.js.map

package/dist/lib/node/message/response/Mdg2Response.js

@@ -29,4 +29,3 @@ class Mdg2Response {
     }
 }
 exports.Mdg2Response = Mdg2Response;
-//# sourceMappingURL=Mdg2Response.js.map

package/dist/lib/node/message/response/PingResponse.js

@@ -33,4 +33,3 @@ class PingResponse {
 exports.PingResponse = PingResponse;
 PingResponse.NAME = 'Foundation::PingResponse';
 PingResponse.VERSION = 2;
-//# sourceMappingURL=PingResponse.js.map

package/dist/lib/node/message/response/index.js

@@ -22,4 +22,3 @@ __exportStar(require("./HighLevelResponse"), exports);
 __exportStar(require("./HTTPProxyResponse"), exports);
 __exportStar(require("./Mdg2Response"), exports);
 __exportStar(require("./PingResponse"), exports);
-//# sourceMappingURL=index.js.map

package/dist/lib/node/message/types/Time.js

@@ -10,4 +10,3 @@ var TimeOptions;
 function timeToMilliseconds(time) {
     return time.toString().slice(0, -3);
 }
-//# sourceMappingURL=Time.js.map

package/dist/lib/node/message/types/TransportLayerClientRequestHeaderFlag.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=TransportLayerClientRequestHeaderFlag.js.map

package/dist/lib/node/message/types/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./TransportLayerClientRequestHeaderFlag"), exports);
 __exportStar(require("./Time"), exports);
-//# sourceMappingURL=index.js.map

package/dist/lib/node/message/update/HighLevelUpdate.js

@@ -20,4 +20,3 @@ class HighLevelUpdate extends response_1.Mdg2Response {
     }
 }
 exports.HighLevelUpdate = HighLevelUpdate;
-//# sourceMappingURL=HighLevelUpdate.js.map

package/dist/lib/node/message/update/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./HighLevelUpdate"), exports);
-//# sourceMappingURL=index.js.map

package/dist/lib/node/mixins/AuthTokenRequestMixin.js

@@ -44,4 +44,3 @@ const authTokenRequest = () => {
     });
 };
 exports.authTokenRequest = authTokenRequest;
-//# sourceMappingURL=AuthTokenRequestMixin.js.map

package/dist/lib/node/mixins/EndpointRequestMixin.js

@@ -88,4 +88,3 @@ const endpointRequest = (config) => {
     });
 };
 exports.endpointRequest = endpointRequest;
-//# sourceMappingURL=EndpointRequestMixin.js.map

package/dist/lib/node/mixins/HTTPProxyRequestMixin.js

@@ -48,4 +48,3 @@ const httpProxyRequest = () => {
     });
 };
 exports.httpProxyRequest = httpProxyRequest;
-//# sourceMappingURL=HTTPProxyRequestMixin.js.map

package/dist/lib/node/mixins/LoggerMixin.js

@@ -20,4 +20,3 @@ const logger = (logger, logLevel) => {
     });
 };
 exports.logger = logger;
-//# sourceMappingURL=LoggerMixin.js.map

package/dist/lib/node/mixins/MessageCompressorMixin.js

@@ -47,4 +47,3 @@ const messageCompressor = () => {
     });
 };
 exports.messageCompressor = messageCompressor;
-//# sourceMappingURL=MessageCompressorMixin.js.map

package/dist/lib/node/mixins/OpenTelemetryMixin.js

@@ -67,4 +67,3 @@ const encodeSpanContext = (spanContext) => {
     return buffer;
 };
 exports.encodeSpanContext = encodeSpanContext;
-//# sourceMappingURL=OpenTelemetryMixin.js.map

package/dist/lib/node/mixins/PingMixin.js

@@ -32,4 +32,3 @@ const pingRequests = () => {
     });
 };
 exports.pingRequests = pingRequests;
-//# sourceMappingURL=PingMixin.js.map

package/dist/lib/node/mixins/ReconnectMixin.js

@@ -73,4 +73,3 @@ const reconnect = (reconnectDelaysInMs) => {
     });
 };
 exports.reconnect = reconnect;
-//# sourceMappingURL=ReconnectMixin.js.map

package/dist/lib/node/mixins/RemoteLoggerMixin.js

@@ -31,4 +31,3 @@ const remotelogger = (identifier) => {
     });
 };
 exports.remotelogger = remotelogger;
-//# sourceMappingURL=RemoteLoggerMixin.js.map

package/dist/lib/node/mixins/RequestMixin.js

@@ -32,4 +32,3 @@ const requests = () => {
     });
 };
 exports.requests = requests;
-//# sourceMappingURL=RequestMixin.js.map

package/dist/lib/node/mixins/auth/AppAuthMixin.js

@@ -112,4 +112,3 @@ const appAuth = (idApplication, idUser, clientCredentials, deploymentStage) => {
     });
 };
 exports.appAuth = appAuth;
-//# sourceMappingURL=AppAuthMixin.js.map

package/dist/lib/node/mixins/auth/CookieTokenAuthMixin.js

@@ -48,4 +48,3 @@ const cookieTokenAuth = (secondFactor) => {
     });
 };
 exports.cookieTokenAuth = cookieTokenAuth;
-//# sourceMappingURL=CookieTokenAuthMixin.js.map

package/dist/lib/node/mixins/auth/FetchAuthenticationMixin.js

@@ -49,7 +49,7 @@ const fetchAuth = (config, input, init) => {
                         void this.hooks.callHook('frontgateConnection:setIdUser', authentication_1.ID_USER_AUTHENTICATED);
                         this.log(logger_1.LogLevel.DEBUG, 'Fetching connection configuration');
                         const fetchConfig = await __classPrivateFieldGet(this, _instances, "m", _fetchConnectionConfiguration).call(this);
-                        this.log(logger_1.LogLevel.DEBUG, 'Connection configuration received', config);
+                        this.log(logger_1.LogLevel.DEBUG, 'Connection configuration received', fetchConfig);
                         settings.url = fetchConfig.url;
                         if (fetchConfig.authtenticationType === 'token' && fetchConfig.authenticationToken) {
                             __classPrivateFieldSet(this, _token, fetchConfig.authenticationToken, "f");
@@ -129,4 +129,3 @@ const fetchAuth = (config, input, init) => {
     });
 };
 exports.fetchAuth = fetchAuth;
-//# sourceMappingURL=FetchAuthenticationMixin.js.map

package/dist/lib/node/mixins/auth/SessionAuthMixin.js

@@ -222,4 +222,3 @@ const sessionAuth = (config, idApplication, username, password, deploymentStage)
     });
 };
 exports.sessionAuth = sessionAuth;
-//# sourceMappingURL=SessionAuthMixin.js.map

package/dist/lib/node/mixins/auth/TokenAuthMixin.js

@@ -61,4 +61,3 @@ const tokenAuth = (token) => {
     });
 };
 exports.tokenAuth = tokenAuth;
-//# sourceMappingURL=TokenAuthMixin.js.map

package/dist/lib/node/mixins/auth/UserCredentialAuthMixin.js

@@ -115,4 +115,3 @@ const userCredentialAuth = (idApplication, username, credentials, deploymentStag
     });
 };
 exports.userCredentialAuth = userCredentialAuth;
-//# sourceMappingURL=UserCredentialAuthMixin.js.map

package/dist/lib/node/mixins/auth/UserPasswordAuthMixin.js

@@ -112,4 +112,3 @@ const userPasswordAuth = (idApplication, username, password, deploymentStage) =>
     });
 };
 exports.userPasswordAuth = userPasswordAuth;
-//# sourceMappingURL=UserPasswordAuthMixin.js.map

package/dist/lib/node/mixins/auth/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./CookieTokenAuthMixin"), exports);
 __exportStar(require("./TokenAuthMixin"), exports);
 __exportStar(require("./FetchAuthenticationMixin"), exports);
-//# sourceMappingURL=index.js.map

package/dist/lib/node/mixins/connection/FrontgateWSMixin.js

@@ -338,4 +338,3 @@ const wsConnection = (conf) => {
     });
 };
 exports.wsConnection = wsConnection;
-//# sourceMappingURL=FrontgateWSMixin.js.map

package/dist/lib/node/mixins/connection/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FrontgateWSMixin"), exports);
-//# sourceMappingURL=index.js.map

package/dist/lib/node/mixins/index.js

@@ -37,4 +37,3 @@ const createExtendedMixinFactory = (mixinFactory, options) => {
     return extendedMixinFactory;
 };
 exports.createExtendedMixinFactory = createExtendedMixinFactory;
-//# sourceMappingURL=index.js.map

package/dist/lib/node/mixins/subscription/DataObserver.js

@@ -119,4 +119,3 @@ class FrontgateClientEndpointDataObserver extends FrontgateClientDataObserver {
     }
 }
 exports.FrontgateClientEndpointDataObserver = FrontgateClientEndpointDataObserver;
-//# sourceMappingURL=DataObserver.js.map

package/dist/lib/node/mixins/subscription/EndpointSubscriptionMixin.js

@@ -12,23 +12,33 @@ const message_1 = require("../../message");
 const functions_1 = require("../../util/functions");
 const endpointSubscriptions = (originalConfig) => {
     const mixinEndpointSubscribable = (Base) => {
-        var _subscriptions, _a;
+        var _subscriptions, _subscriptionCounts, _inFlights, _a;
         const config = { ...originalConfig };
         return _a = class extends Base {
                 constructor() {
                     super(...arguments);
                     _subscriptions.set(this, new Map());
+                    _subscriptionCounts.set(this, new Map());
+                    _inFlights.set(this, new Map());
                 }
                 async observeEndpoint(method, path, data, requestOptions) {
                     const key = `${method}:${path}:${JSON.stringify(data)}:${JSON.stringify(requestOptions ?? {})}`;
+                    if (__classPrivateFieldGet(this, _inFlights, "f").has(key)) {
+                        const inFlightPromise = __classPrivateFieldGet(this, _inFlights, "f").get(key);
+                        this.log(logger_1.LogLevel.INFO, `Catching inflight subscription for ${key}`);
+                        const subscriptionCount = __classPrivateFieldGet(this, _subscriptionCounts, "f").get(key) ?? 0;
+                        __classPrivateFieldGet(this, _subscriptionCounts, "f").set(key, subscriptionCount + 1);
+                        return inFlightPromise;
+                    }
                     const timeOutInMs = config.timeout ?? this.defaultTimeoutInMs;
                     const resubscribeTimeout = config.subscriptionResubscribeTimeout ?? 1000;
                     if (__classPrivateFieldGet(this, _subscriptions, "f").has(key)) {
                         const subscription = __classPrivateFieldGet(this, _subscriptions, "f").get(key);
+                        const subscriptionCount = __classPrivateFieldGet(this, _subscriptionCounts, "f").get(key) ?? 0;
                         if (subscription) {
-                            subscription.count++;
+                            __classPrivateFieldGet(this, _subscriptionCounts, "f").set(key, subscriptionCount + 1);
                             this.log(logger_1.LogLevel.INFO, `Reusing existing subscription for ${key}`);
-                            return subscription.observer;
+                            return subscription;
                         }
                     }
                     this.log(logger_1.LogLevel.INFO, `Creating new subscription for ${key}`);
@@ -39,153 +49,170 @@ const endpointSubscriptions = (originalConfig) => {
                         callbackType: 'job',
                         callbackId: '',
                     };
-                    await this.hooks.callHook('frontgateConnection:sendMessage', subscriptionMsg);
                     const promise = new Promise((resolve, reject) => {
-                        this.hooks.hookOnce(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (response) => {
-                            if (!response.Message.includes('HighLevelResponse')) {
-                                this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${response.Message}`);
-                                reject(new message_1.ErrorResponse(JSON.stringify(response)));
-                                return;
-                            }
-                            let hlResponseData;
-                            try {
-                                hlResponseData = JSON.parse(response.body.value);
-                            }
-                            catch (e) {
-                                this.log(logger_1.LogLevel.ERROR, `Failed to parse response: ${response.body.value}`);
-                                this.log(logger_1.LogLevel.ERROR, e);
-                                reject(e);
-                                return;
-                            }
-                            const observer = new __1.FrontgateClientEndpointDataObserver(response.header.id_job, hlResponseData);
-                            let removeMessageUpdateHook = this.hooks.hook(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (update) => {
-                                if (!update.Message.includes('HighLevelUpdate')) {
-                                    if (update.Message.includes('SubscriptionLoss')) {
-                                        this.log(logger_1.LogLevel.DEBUG, `Received: ${update.Message}`);
-                                        setTimeout(() => {
-                                            void resubscribe();
-                                        }, (0, functions_1.addRandomnessToTime)(resubscribeTimeout));
-                                        removeMessageUpdateHook();
-                                        return;
-                                    }
+                        this.hooks
+                            .callHook('frontgateConnection:sendMessage', subscriptionMsg)
+                            .then(() => {
+                            this.hooks.hookOnce(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (response) => {
+                                if (!response.Message.includes('HighLevelResponse')) {
                                     this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${response.Message}`);
-                                    observer.pushError(new message_1.ErrorResponse(JSON.stringify(update)));
-                                    removeMessageUpdateHook();
+                                    reject(new message_1.ErrorResponse(JSON.stringify(response)));
                                     return;
                                 }
-                                let hlUpdate;
+                                let hlResponseData;
                                 try {
-                                    hlUpdate = new message_1.HighLevelUpdate(update);
+                                    hlResponseData = JSON.parse(response.body.value);
                                 }
                                 catch (e) {
-                                    this.log(logger_1.LogLevel.ERROR, `Failed to parse response: ${update.body.value}`);
-                                    observer.pushError(e);
+                                    this.log(logger_1.LogLevel.ERROR, `Failed to parse response: ${response.body.value}`);
+                                    this.log(logger_1.LogLevel.ERROR, e);
+                                    reject(e);
                                     return;
                                 }
-                                observer.pushPatchData(hlUpdate.data);
-                            });
-                            const resubscribe = async () => {
-                                removeMessageUpdateHook();
-                                this.log(logger_1.LogLevel.INFO, `Resubscribing to ${key} due to reconnect`);
-                                await this.hooks.callHook('frontgateConnection:sendMessage', subscriptionMsg);
-                                const resubscribePromise = new Promise((res, rej) => {
-                                    this.hooks.hookOnce(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (resp) => {
-                                        if (!response.Message.includes('HighLevelResponse')) {
-                                            const err = new message_1.ErrorResponse(resp);
-                                            this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${resp.Message}`);
+                                const observer = new __1.FrontgateClientEndpointDataObserver(response.header.id_job, hlResponseData);
+                                let removeMessageUpdateHook = this.hooks.hook(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (update) => {
+                                    if (!update.Message.includes('HighLevelUpdate')) {
+                                        if (update.Message.includes('SubscriptionLoss')) {
+                                            this.log(logger_1.LogLevel.DEBUG, `Received: ${update.Message}`);
+                                            setTimeout(() => {
+                                                void resubscribe();
+                                            }, (0, functions_1.addRandomnessToTime)(resubscribeTimeout));
                                             removeMessageUpdateHook();
-                                            rej(err);
                                             return;
                                         }
-                                        this.log(logger_1.LogLevel.INFO, `Resubscribed to ${key} with ${resp.header.id_job}`);
-                                        observer.idJob = resp.header.id_job;
-                                        removeMessageUpdateHook = this.hooks.hook(`frontgateConnection:response:${resp.header.id_job}`, (update) => {
-                                            if (!update.Message.includes('HighLevelUpdate')) {
-                                                if (update.Message.includes('SubscriptionLoss')) {
-                                                    this.log(logger_1.LogLevel.DEBUG, `Received: ${update.Message}`);
-                                                    setTimeout(() => {
-                                                        void resubscribe();
-                                                    }, (0, functions_1.addRandomnessToTime)(resubscribeTimeout));
-                                                    return;
-                                                }
-                                                this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${update.Message}`);
-                                                const err = new message_1.ErrorResponse(update);
-                                                observer.pushError(err);
-                                                return;
-                                            }
-                                            let hlUpdate;
-                                            try {
-                                                hlUpdate = new message_1.HighLevelUpdate(update);
-                                            }
-                                            catch (e) {
-                                                this.log(logger_1.LogLevel.ERROR, `Failed to parse response: ${update.body.value}`);
-                                                observer.pushError(e);
+                                        this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${response.Message}`);
+                                        observer.pushError(new message_1.ErrorResponse(JSON.stringify(update)));
+                                        removeMessageUpdateHook();
+                                        return;
+                                    }
+                                    let hlUpdate;
+                                    try {
+                                        hlUpdate = new message_1.HighLevelUpdate(update);
+                                    }
+                                    catch (e) {
+                                        this.log(logger_1.LogLevel.ERROR, `Failed to parse response: ${update.body.value}`);
+                                        observer.pushError(e);
+                                        return;
+                                    }
+                                    observer.pushPatchData(hlUpdate.data);
+                                });
+                                const resubscribe = async () => {
+                                    removeMessageUpdateHook();
+                                    this.log(logger_1.LogLevel.INFO, `Resubscribing to ${key} due to reconnect`);
+                                    await this.hooks.callHook('frontgateConnection:sendMessage', subscriptionMsg);
+                                    const resubscribePromise = new Promise((res, rej) => {
+                                        this.hooks.hookOnce(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (resp) => {
+                                            if (!response.Message.includes('HighLevelResponse')) {
+                                                const err = new message_1.ErrorResponse(resp);
+                                                this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${resp.Message}`);
+                                                removeMessageUpdateHook();
+                                                rej(err);
                                                 return;
                                             }
-                                            observer.unsubscribe = () => {
-                                                const subscription = __classPrivateFieldGet(this, _subscriptions, "f").get(key);
-                                                if (subscription) {
-                                                    subscription.count--;
-                                                    if (subscription.count > 0) {
-                                                        this.log(logger_1.LogLevel.INFO, `Not unsubscribing from ${key} as there are still ${subscription.count} subscribers`);
+                                            this.log(logger_1.LogLevel.INFO, `Resubscribed to ${key} with ${resp.header.id_job}`);
+                                            observer.idJob = resp.header.id_job;
+                                            removeMessageUpdateHook = this.hooks.hook(`frontgateConnection:response:${resp.header.id_job}`, (update) => {
+                                                if (!update.Message.includes('HighLevelUpdate')) {
+                                                    if (update.Message.includes('SubscriptionLoss')) {
+                                                        this.log(logger_1.LogLevel.DEBUG, `Received: ${update.Message}`);
+                                                        setTimeout(() => {
+                                                            void resubscribe();
+                                                        }, (0, functions_1.addRandomnessToTime)(resubscribeTimeout));
                                                         return;
                                                     }
-                                                    __classPrivateFieldGet(this, _subscriptions, "f").delete(key);
+                                                    this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${update.Message}`);
+                                                    const err = new message_1.ErrorResponse(update);
+                                                    observer.pushError(err);
+                                                    return;
+                                                }
+                                                let hlUpdate;
+                                                try {
+                                                    hlUpdate = new message_1.HighLevelUpdate(update);
                                                 }
-                                                this.log(logger_1.LogLevel.INFO, `Unsubscribing from ${key}`);
-                                                const cancelationRequest = new message_1.CancelSubscriptionRequest(observer.idJob);
-                                                const unsubscribeMsg = {
-                                                    message: cancelationRequest.getPtlMessage(),
-                                                    callbackType: 'job',
-                                                    callbackId: '',
+                                                catch (e) {
+                                                    this.log(logger_1.LogLevel.ERROR, `Failed to parse response: ${update.body.value}`);
+                                                    observer.pushError(e);
+                                                    return;
+                                                }
+                                                observer.unsubscribe = () => {
+                                                    const subscription = __classPrivateFieldGet(this, _subscriptions, "f").get(key);
+                                                    if (subscription) {
+                                                        const subcounts = __classPrivateFieldGet(this, _subscriptionCounts, "f").get(key) ?? 0;
+                                                        __classPrivateFieldGet(this, _subscriptionCounts, "f").set(key, subcounts - 1);
+                                                        if (subcounts - 1 > 0) {
+                                                            this.log(logger_1.LogLevel.INFO, `Not unsubscribing from ${key} as there are still ${subcounts} subscribers`);
+                                                            return;
+                                                        }
+                                                        __classPrivateFieldGet(this, _subscriptions, "f").delete(key);
+                                                        __classPrivateFieldGet(this, _subscriptionCounts, "f").delete(key);
+                                                    }
+                                                    this.log(logger_1.LogLevel.INFO, `Unsubscribing from ${key}`);
+                                                    const cancelationRequest = new message_1.CancelSubscriptionRequest(observer.idJob);
+                                                    const unsubscribeMsg = {
+                                                        message: cancelationRequest.getPtlMessage(),
+                                                        callbackType: 'job',
+                                                        callbackId: '',
+                                                    };
+                                                    void this.hooks.callHook('frontgateConnection:sendMessage', unsubscribeMsg);
+                                                    removeMessageUpdateHook();
+                                                    removeReconnectHook();
                                                 };
-                                                void this.hooks.callHook('frontgateConnection:sendMessage', unsubscribeMsg);
-                                                removeMessageUpdateHook();
-                                                removeReconnectHook();
-                                            };
-                                            observer.pushPatchData(hlUpdate.data);
+                                                observer.pushPatchData(hlUpdate.data);
+                                            });
+                                            res();
                                         });
-                                        res();
                                     });
-                                });
-                                try {
-                                    await (0, functions_1.useTimeout)(timeOutInMs, 'Request timeout reached', resubscribePromise);
-                                }
-                                catch (e) {
-                                    observer.pushError(new message_1.ErrorResponse({ Message: 'Reconnect failed', Error: e }));
-                                }
-                            };
-                            const removeReconnectHook = this.hooks.hook('reconnect:success', resubscribe);
-                            observer.unsubscribe = () => {
-                                const subscription = __classPrivateFieldGet(this, _subscriptions, "f").get(key);
-                                if (subscription) {
-                                    subscription.count--;
-                                    if (subscription.count > 0) {
-                                        this.log(logger_1.LogLevel.INFO, `Not unsubscribing from ${key} as there are still ${subscription.count} subscribers`);
-                                        return;
+                                    try {
+                                        await (0, functions_1.useTimeout)(timeOutInMs, 'Request timeout reached', resubscribePromise);
                                     }
-                                    __classPrivateFieldGet(this, _subscriptions, "f").delete(key);
-                                }
-                                this.log(logger_1.LogLevel.INFO, `Unsubscribing from ${key}`);
-                                const cancelationRequest = new message_1.CancelSubscriptionRequest(observer.idJob);
-                                const unsubscribeMsg = {
-                                    message: cancelationRequest.getPtlMessage(),
-                                    callbackType: 'job',
-                                    callbackId: '',
+                                    catch (e) {
+                                        observer.pushError(new message_1.ErrorResponse({ Message: 'Reconnect failed', Error: e }));
+                                    }
+                                };
+                                const removeReconnectHook = this.hooks.hook('reconnect:success', resubscribe);
+                                observer.unsubscribe = () => {
+                                    const subscription = __classPrivateFieldGet(this, _subscriptions, "f").get(key);
+                                    if (subscription) {
+                                        const subcounts = __classPrivateFieldGet(this, _subscriptionCounts, "f").get(key) ?? 0;
+                                        __classPrivateFieldGet(this, _subscriptionCounts, "f").set(key, subcounts - 1);
+                                        if (subcounts - 1 > 0) {
+                                            this.log(logger_1.LogLevel.INFO, `Not unsubscribing from ${key} as there are still ${subcounts} subscribers`);
+                                            return;
+                                        }
+                                        __classPrivateFieldGet(this, _subscriptions, "f").delete(key);
+                                        __classPrivateFieldGet(this, _subscriptionCounts, "f").delete(key);
+                                    }
+                                    this.log(logger_1.LogLevel.INFO, `Unsubscribing from ${key}`);
+                                    const cancelationRequest = new message_1.CancelSubscriptionRequest(observer.idJob);
+                                    const unsubscribeMsg = {
+                                        message: cancelationRequest.getPtlMessage(),
+                                        callbackType: 'job',
+                                        callbackId: '',
+                                    };
+                                    void this.hooks.callHook('frontgateConnection:sendMessage', unsubscribeMsg);
+                                    removeMessageUpdateHook();
+                                    removeReconnectHook();
                                 };
-                                void this.hooks.callHook('frontgateConnection:sendMessage', unsubscribeMsg);
-                                removeMessageUpdateHook();
-                                removeReconnectHook();
-                            };
-                            __classPrivateFieldGet(this, _subscriptions, "f").set(key, { observer, count: 1 });
-                            resolve(observer);
+                                __classPrivateFieldGet(this, _subscriptions, "f").set(key, observer);
+                                const currentSubscounts = __classPrivateFieldGet(this, _subscriptionCounts, "f").get(key) ?? 0;
+                                __classPrivateFieldGet(this, _subscriptionCounts, "f").set(key, currentSubscounts + 1);
+                                __classPrivateFieldGet(this, _inFlights, "f").delete(key);
+                                resolve(observer);
+                            });
+                        })
+                            .catch((e) => {
+                            reject(e);
                         });
                     });
                     const rejectReason = `Request timeout reached (${timeOutInMs} ms) for ${subscriptionMsg.message.Message}`;
-                    return (0, functions_1.useTimeout)(timeOutInMs, rejectReason, promise);
+                    const wrappedTimeoutPromise = (0, functions_1.useTimeout)(timeOutInMs, rejectReason, promise);
+                    __classPrivateFieldGet(this, _inFlights, "f").set(key, wrappedTimeoutPromise);
+                    return wrappedTimeoutPromise;
                 }
             },
             _subscriptions = new WeakMap(),
+            _subscriptionCounts = new WeakMap(),
+            _inFlights = new WeakMap(),
             _a;
     };
     return (0, __1.createExtendedMixinFactory)(mixinEndpointSubscribable, {
@@ -194,4 +221,3 @@ const endpointSubscriptions = (originalConfig) => {
     });
 };
 exports.endpointSubscriptions = endpointSubscriptions;
-//# sourceMappingURL=EndpointSubscriptionMixin.js.map