@factset/frontgate-js-sdk 7.1.4 → 7.1.6

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

@@ -13,7 +13,6 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var _FrontgateClientDataObserver_data, _FrontgateClientDataObserver_nextFn, _FrontgateClientDataObserver_errorFn;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FrontgateClientEndpointDataObserver = exports.FrontgateClientDataObserver = void 0;
-const response_1 = require("../../message/response");
 const getParentAndKey = (obj, path) => {
     const parts = path.split('/').slice(1);
     let parent = obj;
@@ -114,7 +113,7 @@ class FrontgateClientEndpointDataObserver extends FrontgateClientDataObserver {
             super.pushData(data);
         }
         catch (e) {
-            super.pushError(new response_1.ErrorResponse(e.message));
+            super.pushError(new Error('Failed to apply patch', { cause: e }));
         }
     }
 }

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

@@ -7,6 +7,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.endpointSubscriptions = void 0;
 const __1 = require("../");
+const errors_1 = require("../../common/errors");
 const logger_1 = require("../../logger");
 const message_1 = require("../../message");
 const functions_1 = require("../../util/functions");
@@ -55,9 +56,9 @@ const endpointSubscriptions = (originalConfig) => {
                             .callHook('frontgateConnection:sendMessage', subscriptionMsg)
                             .then(() => {
                             this.hooks.hookOnce(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (response) => {
-                                if (!response.Message.includes('HighLevelResponse')) {
+                                if (response.Message !== 'Foundation::HighLevelResponse' && response.Message !== 'HighLevelResponse') {
                                     this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${response.Message}`);
-                                    reject(new message_1.ErrorResponse(JSON.stringify(response)));
+                                    reject(new errors_1.UnexpectedResponseError(response));
                                     return;
                                 }
                                 let hlResponseData;
@@ -82,7 +83,7 @@ const endpointSubscriptions = (originalConfig) => {
                                     return;
                                 }
                                 let removeMessageUpdateHook = this.hooks.hook(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (update) => {
-                                    if (!update.Message.includes('HighLevelUpdate')) {
+                                    if (update.Message !== 'Foundation::HighLevelUpdate' && update.Message !== 'HighLevelUpdate') {
                                         if (update.Message.includes('SubscriptionLoss')) {
                                             this.log(logger_1.LogLevel.DEBUG, `Received: ${update.Message}`);
                                             setTimeout(() => {
@@ -92,7 +93,7 @@ const endpointSubscriptions = (originalConfig) => {
                                             return;
                                         }
                                         this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${response.Message}`);
-                                        observer.pushError(new message_1.ErrorResponse(JSON.stringify(update)));
+                                        observer.pushError(new errors_1.UnexpectedResponseError(update));
                                         removeMessageUpdateHook();
                                         return;
                                     }
@@ -102,7 +103,7 @@ const endpointSubscriptions = (originalConfig) => {
                                     }
                                     catch (e) {
                                         this.log(logger_1.LogLevel.ERROR, `Failed to parse response: ${update.body.value}`);
-                                        observer.pushError(e);
+                                        observer.pushError(new Error('Failed to parse response', { cause: e }));
                                         return;
                                     }
                                     observer.pushPatchData(hlUpdate.data);
@@ -114,8 +115,8 @@ const endpointSubscriptions = (originalConfig) => {
                                     let removeResubscribeHookOnce;
                                     const resubscribePromise = new Promise((res, rej) => {
                                         removeResubscribeHookOnce = this.hooks.hookOnce(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (resp) => {
-                                            if (!resp.Message.includes('HighLevelResponse')) {
-                                                const err = new message_1.ErrorResponse(resp);
+                                            if (resp.Message !== 'Foundation::HighLevelResponse' && resp.Message !== 'HighLevelResponse') {
+                                                const err = new errors_1.UnexpectedResponseError(resp);
                                                 this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${resp.Message}`);
                                                 removeMessageUpdateHook();
                                                 rej(err);
@@ -139,7 +140,7 @@ const endpointSubscriptions = (originalConfig) => {
                                                 return;
                                             }
                                             removeMessageUpdateHook = this.hooks.hook(`frontgateConnection:response:${resp.header.id_job}`, (update) => {
-                                                if (!update.Message.includes('HighLevelUpdate')) {
+                                                if (update.Message !== 'Foundation::HighLevelUpdate' && update.Message !== 'HighLevelUpdate') {
                                                     if (update.Message.includes('SubscriptionLoss')) {
                                                         this.log(logger_1.LogLevel.DEBUG, `Received: ${update.Message}`);
                                                         setTimeout(() => {
@@ -148,7 +149,7 @@ const endpointSubscriptions = (originalConfig) => {
                                                         return;
                                                     }
                                                     this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${update.Message}`);
-                                                    const err = new message_1.ErrorResponse(update);
+                                                    const err = new errors_1.UnexpectedResponseError(update);
                                                     observer.pushError(err);
                                                     return;
                                                 }
@@ -158,7 +159,7 @@ const endpointSubscriptions = (originalConfig) => {
                                                 }
                                                 catch (e) {
                                                     this.log(logger_1.LogLevel.ERROR, `Failed to parse response: ${update.body.value}`);
-                                                    observer.pushError(e);
+                                                    observer.pushError(new Error('Failed to parse response', { cause: e }));
                                                     return;
                                                 }
                                                 observer.pushPatchData(hlUpdate.data);
@@ -172,7 +173,7 @@ const endpointSubscriptions = (originalConfig) => {
                                     catch (e) {
                                         removeResubscribeHookOnce?.();
                                         subscriptionZombie = true;
-                                        observer.pushError(new message_1.ErrorResponse({ Message: 'Resubscribe failed', Error: e }));
+                                        observer.pushError(new Error('Resubscribe failed', { cause: e }));
                                     }
                                 };
                                 const removeReconnectHook = this.hooks.hook('reconnect:success', resubscribe);

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

@@ -7,9 +7,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rawSubscriptions = void 0;
 const __1 = require("../");
+const interfaces_1 = require("../../message/interfaces");
 const logger_1 = require("../../logger");
 const message_1 = require("../../message");
 const functions_1 = require("../../util/functions");
+const errors_1 = require("../../common/errors");
 const rawSubscriptions = () => {
     const mixinRawSubscribable = (Base) => {
         var _instances, _subscriptions, _rawSubscriptionHelper, _a;
@@ -48,20 +50,27 @@ const rawSubscriptions = () => {
                 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('Error') || response.Message.includes('PermissionDenied')) {
+                        if (response.Message.includes('Error') || response.Message.includes('PermissionDenied') || !(0, interfaces_1.hasJobIdInHeader)(response)) {
                             this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${response.Message}`);
-                            reject(new Error(`Unexpected response: ${response.Message}`));
+                            reject(new errors_1.UnexpectedResponseError(response));
                             return;
                         }
-                        const subscriptionKey = subscriptionType === 'connection' ? `${response.header.id_service}-${request.getPtlMessage().id_notation}` : response.header.id_job;
+                        let subscriptionKey = response.header.id_job.toString();
+                        let idService = -1;
+                        let idNotation = -1;
+                        if (subscriptionType === 'connection' && (0, interfaces_1.isServiceAndNotationBased)(response)) {
+                            idService = response.header.id_service;
+                            idNotation = response.id_notation;
+                            subscriptionKey = `${idService}-${idNotation}`;
+                        }
                         const cancelationRequest = typeof CancelationRequestConstructor === 'undefined'
                             ? new message_1.CancelSubscriptionRequest(response.header.id_job)
-                            : new CancelationRequestConstructor(response.header.id_service, request.getPtlMessage().id_notation);
+                            : new CancelationRequestConstructor(idService, idNotation);
                         const observer = new __1.FrontgateClientDataObserver(response.header.id_job, response);
                         let removeMessageUpdateHook = this.hooks.hook(`frontgateConnection:response:${subscriptionKey}`, (update) => {
-                            if (update.Message.includes('Error') || update.Message.includes('PermissionDenied')) {
+                            if (update.Message === 'Foundation::ErrorResponse') {
                                 this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${response.Message}`);
-                                observer.pushError(new message_1.ErrorResponse(JSON.stringify(update)));
+                                observer.pushError(new errors_1.UnexpectedResponseError(update));
                                 return;
                             }
                             observer.pushData(update);
@@ -72,22 +81,26 @@ const rawSubscriptions = () => {
                             await this.hooks.callHook('frontgateConnection:sendMessage', subscriptionMsg);
                             const resubscribePromise = new Promise((res, rej) => {
                                 this.hooks.hookOnce(`frontgateConnection:response:${subscriptionMsg.callbackId}`, (resubscribeResponse) => {
-                                    if (resubscribeResponse.Message.includes('Error') || resubscribeResponse.Message.includes('PermissionDenied')) {
-                                        const err = new message_1.ErrorResponse(resubscribeResponse);
+                                    if (resubscribeResponse.Message === 'Foundation::ErrorResponse' || !(0, interfaces_1.hasJobIdInHeader)(resubscribeResponse)) {
+                                        const err = new errors_1.UnexpectedResponseError(resubscribeResponse);
                                         this.log(logger_1.LogLevel.ERROR, `Unexpected resp: ${resubscribeResponse.Message}`);
                                         rej(err);
                                         return;
                                     }
-                                    const resubscriptionKey = subscriptionType === 'connection' ? `${resubscribeResponse.header.id_service}-${request.getPtlMessage().id_notation}` : resubscribeResponse.header.id_job;
+                                    let resubscriptionKey = response.header.id_job.toString();
+                                    if (subscriptionType === 'connection' && (0, interfaces_1.isServiceAndNotationBased)(resubscribeResponse)) {
+                                        idService = resubscribeResponse.header.id_service;
+                                        idNotation = resubscribeResponse.id_notation;
+                                        resubscriptionKey = `${idService}-${idNotation}`;
+                                    }
                                     const resubscriptionCancelationRequest = typeof CancelationRequestConstructor === 'undefined'
                                         ? new message_1.CancelSubscriptionRequest(resubscribeResponse.header.id_job)
-                                        : new CancelationRequestConstructor(resubscribeResponse.header.id_service, request.getPtlMessage().id_notation);
+                                        : new CancelationRequestConstructor(idService, idNotation);
                                     observer.idJob = resubscribeResponse.header.id_job;
                                     removeMessageUpdateHook = this.hooks.hook(`frontgateConnection:response:${resubscriptionKey}`, (update) => {
-                                        if (update.Message.includes('Error') || update.Message.includes('PermissionDenied')) {
+                                        if (update.Message === 'Foundation::ErrorResponse') {
                                             this.log(logger_1.LogLevel.ERROR, `Unexpected response: ${update.Message}`);
-                                            const err = new message_1.ErrorResponse(update);
-                                            observer.pushError(err);
+                                            observer.pushError(new errors_1.UnexpectedResponseError(update));
                                             return;
                                         }
                                         observer.unsubscribe = () => {
@@ -119,7 +132,7 @@ const rawSubscriptions = () => {
                                 await (0, functions_1.useTimeout)(timeOutInMs, 'Request timeout reached', resubscribePromise);
                             }
                             catch (e) {
-                                observer.pushError(new message_1.ErrorResponse({ Message: 'Reconnect failed', Error: e }));
+                                observer.pushError(new Error('Reconnect Failed', { cause: e }));
                             }
                         });
                         observer.unsubscribe = () => {

package/dist/lib/node/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_JSON = void 0;
-exports.PACKAGE_JSON = { version: '7.1.4', package: '@factset/frontgate-js-sdk' };
+exports.PACKAGE_JSON = { version: '7.1.6', package: '@factset/frontgate-js-sdk' };

package/dist/lib/types/common/errors.d.ts

@@ -1,9 +1,5 @@
-export interface CustomError {
-    message: string;
-    name: string;
-    code: number;
-}
-export declare class TimeoutError extends Error implements CustomError {
-    code: number;
-    constructor(message?: string, error?: Error);
+import type { PtlMessage } from '../message/interfaces';
+export declare class UnexpectedResponseError extends Error {
+    response: PtlMessage;
+    constructor(response: PtlMessage);
 }

package/dist/lib/types/common/interfaces/index.d.ts

@@ -1,4 +1,3 @@
 export * from './result/RequestResult';
 export * from './result/HighLevelRequestResult';
 export * from './result/HTTPProxyRequestResult';
-export type { PtlMessage } from './PtlMessage';

package/dist/lib/types/index.d.ts

@@ -1,6 +1,7 @@
 export * from './authentication';
 export * from './connection';
 export * from './message';
+export * from './message/interfaces';
 export * from './common/interfaces';
 export * from './common/types';
 export * from './logger';