@bringg/dashboard-sdk 9.69.0 → 9.69.1

package/dist/Geocoding/GeocodingApi.d.ts

@@ -7,6 +7,6 @@ export default class GeocodingApi {
     autoComplete(address: string): Promise<AutoCompleteResponse>;
     getPlaceDetails(placeId: string): Promise<GetPlaceDetailsResponse>;
     reverseGeocode(lat: number, lng: number): Promise<BringgReverseGeocodedAddress>;
-    subscribeToEvent(eventHandle: any): void;
-    unsubscribeToEvent(eventHandle: any): void;
+    subscribeToEvent(eventHandle: (event: any) => void): void;
+    unsubscribeToEvent(eventHandle: (event: any) => void): void;
 }

package/dist/Geocoding/GeocodingApi.js

@@ -21,7 +21,7 @@ var GeocodingApi = /** @class */ (function () {
         return this.geocodingEntity.reverseGeocode(lat, lng);
     };
     GeocodingApi.prototype.subscribeToEvent = function (eventHandle) {
-        return this.realTime.on(Geocoding_consts_1.RealTimeGeocodingEvents.GEOCODING_CHANGED, eventHandle);
+        this.realTime.on(Geocoding_consts_1.RealTimeGeocodingEvents.GEOCODING_CHANGED, eventHandle);
     };
     GeocodingApi.prototype.unsubscribeToEvent = function (eventHandle) {
         this.realTime.off(Geocoding_consts_1.RealTimeGeocodingEvents.GEOCODING_CHANGED, eventHandle);

package/dist/Geocoding/GeocodingApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeocodingApi.js","sourceRoot":"","sources":["../../src/Geocoding/GeocodingApi.ts"],"names":[],"mappings":";;;;;AAEA,mDAAsD;AAEtD,iEAA2C;AAC3C,uDAA6D;AAE7D;IAIC,sBAAY,OAAgB;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,6BAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnE,CAAC;IAEM,mCAAY,GAAnB,UAAoB,OAAe;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,sCAAe,GAAtB,UAAuB,OAAe;QACrC,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAEM,qCAAc,GAArB,UAAsB,GAAW,EAAE,GAAW;QAC7C,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IAEM,uCAAgB,GAAvB,UAAwB,WAAgB;QACvC,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,0CAAuB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IACjF,CAAC;IAEM,yCAAkB,GAAzB,UAA0B,WAAgB;QACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,0CAAuB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC3E,CAAC;IACF,mBAAC;AAAD,CAAC,AA5BD,IA4BC"}
+{"version":3,"file":"GeocodingApi.js","sourceRoot":"","sources":["../../src/Geocoding/GeocodingApi.ts"],"names":[],"mappings":";;;;;AAEA,mDAAsD;AAEtD,iEAA2C;AAC3C,uDAA6D;AAE7D;IAIC,sBAAY,OAAgB;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,6BAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnE,CAAC;IAEM,mCAAY,GAAnB,UAAoB,OAAe;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,sCAAe,GAAtB,UAAuB,OAAe;QACrC,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAEM,qCAAc,GAArB,UAAsB,GAAW,EAAE,GAAW;QAC7C,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IAEM,uCAAgB,GAAvB,UAAwB,WAAiC;QACxD,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,0CAAuB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC1E,CAAC;IAEM,yCAAkB,GAAzB,UAA0B,WAAiC;QAC1D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,0CAAuB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC3E,CAAC;IACF,mBAAC;AAAD,CAAC,AA5BD,IA4BC"}

package/dist/Services/PersistentConnection.d.ts

@@ -3,6 +3,7 @@ import User from './Identity/User';
 import { PubSubEvent } from './PubSubEvents';
 import { Notifiable, RealtimeConnection } from './RealtimeConnection';
 export declare const REALTIME_CONNECTION_RETRY_TIME = 5000;
+export declare const ENABLE_REALTIME_UNSUBSCRIBE_FIX_FEATURE_FLAG = "enable_realtime_unsubscribe_fix";
 export declare class UserWireMessage {
     id: number;
     auth_token: string;
@@ -12,6 +13,7 @@ export declare class UserWireMessage {
 export default class PersistentConnection implements Notifiable {
     session: Session;
     connection: RealtimeConnection;
+    private readonly wrappedHandlersByEvent;
     static wrapEventHandler(eventName: string, initialHandler: any, additionalHandler?: (string: any, any: any) => void): (any: any) => void;
     static init(session: Session): Promise<PersistentConnection>;
     private constructor();
@@ -25,4 +27,11 @@ export default class PersistentConnection implements Notifiable {
     publish<T>(ev: PubSubEvent<T>, mess: T, ackCallback?: (message: any | undefined) => void): void;
     subscribe<T>(eventType: PubSubEvent<T>, handler: (message: T) => void): void;
     dispose(): Promise<void>;
+    private createWrappedHandler;
+    private isUnsubscribeFixEnabled;
+    private getEventHandlers;
+    private createEventHandlers;
+    private getOrCreateEventHandlers;
+    private subscribeWithWrappedHandler;
+    private unsubscribeWrappedHandler;
 }

package/dist/Services/PersistentConnection.js

@@ -39,12 +39,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserWireMessage = exports.REALTIME_CONNECTION_RETRY_TIME = void 0;
+exports.UserWireMessage = exports.ENABLE_REALTIME_UNSUBSCRIBE_FIX_FEATURE_FLAG = exports.REALTIME_CONNECTION_RETRY_TIME = void 0;
 var Logger_1 = __importDefault(require("../Core/Logger"));
 var Polly_1 = __importDefault(require("../Core/Polly"));
 var PubSubEvents_1 = require("./PubSubEvents");
 var RealtimeConnection_1 = require("./RealtimeConnection");
 exports.REALTIME_CONNECTION_RETRY_TIME = 5000;
+exports.ENABLE_REALTIME_UNSUBSCRIBE_FIX_FEATURE_FLAG = 'enable_realtime_unsubscribe_fix';
 var UserWireMessage = /** @class */ (function () {
     function UserWireMessage(user) {
         this.id = user.id;
@@ -56,6 +57,7 @@ var UserWireMessage = /** @class */ (function () {
 exports.UserWireMessage = UserWireMessage;
 var PersistentConnection = /** @class */ (function () {
     function PersistentConnection(session) {
+        this.wrappedHandlersByEvent = new Map();
         this.session = session;
     }
     PersistentConnection.wrapEventHandler = function (eventName, initialHandler, additionalHandler) {
@@ -138,10 +140,18 @@ var PersistentConnection = /** @class */ (function () {
         connection.socket.emit(ev.name, mess, ackCallback);
     };
     PersistentConnection.prototype.subscribeInternal = function (connection, eventType, handler) {
-        connection.socket.on(eventType.name, PersistentConnection.wrapEventHandler(eventType.name, handler, this.session.sendDataEvent));
+        if (!this.isUnsubscribeFixEnabled()) {
+            connection.socket.on(eventType.name, this.createWrappedHandler(eventType.name, handler));
+            return;
+        }
+        this.subscribeWithWrappedHandler(connection, eventType.name, handler);
     };
     PersistentConnection.prototype.unsubscribe = function (eventType, handler) {
-        this.connection.socket.off(eventType.name, handler);
+        if (!this.isUnsubscribeFixEnabled()) {
+            this.connection.socket.off(eventType.name, handler);
+            return;
+        }
+        this.unsubscribeWrappedHandler(eventType.name, handler);
     };
     PersistentConnection.prototype.publish = function (ev, mess, ackCallback) {
         this.publishInternal(this.connection, ev, mess, ackCallback);
@@ -161,6 +171,55 @@ var PersistentConnection = /** @class */ (function () {
             });
         });
     };
+    PersistentConnection.prototype.createWrappedHandler = function (eventName, handler) {
+        return PersistentConnection.wrapEventHandler(eventName, handler, this.session.sendDataEvent);
+    };
+    PersistentConnection.prototype.isUnsubscribeFixEnabled = function () {
+        var _a;
+        var merchantFeatureFlags = (((_a = this.session.merchant) === null || _a === void 0 ? void 0 : _a.feature_flags) || {});
+        return !!merchantFeatureFlags[exports.ENABLE_REALTIME_UNSUBSCRIBE_FIX_FEATURE_FLAG];
+    };
+    PersistentConnection.prototype.getEventHandlers = function (eventName) {
+        return this.wrappedHandlersByEvent.get(eventName);
+    };
+    PersistentConnection.prototype.createEventHandlers = function (eventName) {
+        var handlers = new Map();
+        this.wrappedHandlersByEvent.set(eventName, handlers);
+        return handlers;
+    };
+    PersistentConnection.prototype.getOrCreateEventHandlers = function (eventName) {
+        var _a;
+        return (_a = this.getEventHandlers(eventName)) !== null && _a !== void 0 ? _a : this.createEventHandlers(eventName);
+    };
+    PersistentConnection.prototype.subscribeWithWrappedHandler = function (connection, eventName, handler) {
+        var eventHandlers = this.getOrCreateEventHandlers(eventName);
+        var originalHandler = handler;
+        if (eventHandlers.has(originalHandler)) {
+            return;
+        }
+        var wrappedHandler = this.createWrappedHandler(eventName, handler);
+        eventHandlers.set(originalHandler, wrappedHandler);
+        connection.socket.on(eventName, wrappedHandler);
+    };
+    PersistentConnection.prototype.unsubscribeWrappedHandler = function (eventName, handler) {
+        if (!handler) {
+            this.connection.socket.off(eventName);
+            this.wrappedHandlersByEvent.delete(eventName);
+            return;
+        }
+        var eventHandlers = this.getEventHandlers(eventName);
+        var originalHandler = handler;
+        var wrappedHandler = eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.get(originalHandler);
+        if (!wrappedHandler) {
+            this.connection.socket.off(eventName, handler);
+            return;
+        }
+        this.connection.socket.off(eventName, wrappedHandler);
+        eventHandlers.delete(originalHandler);
+        if (eventHandlers.size === 0) {
+            this.wrappedHandlersByEvent.delete(eventName);
+        }
+    };
     return PersistentConnection;
 }());
 exports.default = PersistentConnection;

package/dist/Services/PersistentConnection.js.map

@@ -1 +1 @@
-{"version":3,"file":"PersistentConnection.js","sourceRoot":"","sources":["../../src/Services/PersistentConnection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PersistentConnection.js","sourceRoot":"","sources":["../../src/Services/PersistentConnection.ts"],"names":[],"mappings":"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"}

package/dist/Services/ServiceRequest.js

@@ -56,7 +56,7 @@ var lodash_1 = require("lodash");
 var BringgException_1 = require("../Core/BringgException");
 var Logger_1 = __importDefault(require("../Core/Logger"));
 var abort_1 = require("../utils/abort");
-var version = '9.69.0';
+var version = '9.69.1';
 function logErrorResponse(response) {
     var data = response.data, status = response.status;
     try {

package/dist/bringg-dashboard-sdk-cjs2.js

@@ -11248,7 +11248,7 @@ var GeocodingApi = /** @class */ (function () {
         return this.geocodingEntity.reverseGeocode(lat, lng);
     };
     GeocodingApi.prototype.subscribeToEvent = function (eventHandle) {
-        return this.realTime.on(Geocoding_consts_1.RealTimeGeocodingEvents.GEOCODING_CHANGED, eventHandle);
+        this.realTime.on(Geocoding_consts_1.RealTimeGeocodingEvents.GEOCODING_CHANGED, eventHandle);
     };
     GeocodingApi.prototype.unsubscribeToEvent = function (eventHandle) {
         this.realTime.off(Geocoding_consts_1.RealTimeGeocodingEvents.GEOCODING_CHANGED, eventHandle);
@@ -22824,12 +22824,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.UserWireMessage = exports.REALTIME_CONNECTION_RETRY_TIME = void 0;
+exports.UserWireMessage = exports.ENABLE_REALTIME_UNSUBSCRIBE_FIX_FEATURE_FLAG = exports.REALTIME_CONNECTION_RETRY_TIME = void 0;
 var Logger_1 = __importDefault(__webpack_require__(55860));
 var Polly_1 = __importDefault(__webpack_require__(51987));
 var PubSubEvents_1 = __webpack_require__(74102);
 var RealtimeConnection_1 = __webpack_require__(52944);
 exports.REALTIME_CONNECTION_RETRY_TIME = 5000;
+exports.ENABLE_REALTIME_UNSUBSCRIBE_FIX_FEATURE_FLAG = 'enable_realtime_unsubscribe_fix';
 var UserWireMessage = /** @class */ (function () {
     function UserWireMessage(user) {
         this.id = user.id;
@@ -22841,6 +22842,7 @@ var UserWireMessage = /** @class */ (function () {
 exports.UserWireMessage = UserWireMessage;
 var PersistentConnection = /** @class */ (function () {
     function PersistentConnection(session) {
+        this.wrappedHandlersByEvent = new Map();
         this.session = session;
     }
     PersistentConnection.wrapEventHandler = function (eventName, initialHandler, additionalHandler) {
@@ -22923,10 +22925,18 @@ var PersistentConnection = /** @class */ (function () {
         connection.socket.emit(ev.name, mess, ackCallback);
     };
     PersistentConnection.prototype.subscribeInternal = function (connection, eventType, handler) {
-        connection.socket.on(eventType.name, PersistentConnection.wrapEventHandler(eventType.name, handler, this.session.sendDataEvent));
+        if (!this.isUnsubscribeFixEnabled()) {
+            connection.socket.on(eventType.name, this.createWrappedHandler(eventType.name, handler));
+            return;
+        }
+        this.subscribeWithWrappedHandler(connection, eventType.name, handler);
     };
     PersistentConnection.prototype.unsubscribe = function (eventType, handler) {
-        this.connection.socket.off(eventType.name, handler);
+        if (!this.isUnsubscribeFixEnabled()) {
+            this.connection.socket.off(eventType.name, handler);
+            return;
+        }
+        this.unsubscribeWrappedHandler(eventType.name, handler);
     };
     PersistentConnection.prototype.publish = function (ev, mess, ackCallback) {
         this.publishInternal(this.connection, ev, mess, ackCallback);
@@ -22946,6 +22956,55 @@ var PersistentConnection = /** @class */ (function () {
             });
         });
     };
+    PersistentConnection.prototype.createWrappedHandler = function (eventName, handler) {
+        return PersistentConnection.wrapEventHandler(eventName, handler, this.session.sendDataEvent);
+    };
+    PersistentConnection.prototype.isUnsubscribeFixEnabled = function () {
+        var _a;
+        var merchantFeatureFlags = (((_a = this.session.merchant) === null || _a === void 0 ? void 0 : _a.feature_flags) || {});
+        return !!merchantFeatureFlags[exports.ENABLE_REALTIME_UNSUBSCRIBE_FIX_FEATURE_FLAG];
+    };
+    PersistentConnection.prototype.getEventHandlers = function (eventName) {
+        return this.wrappedHandlersByEvent.get(eventName);
+    };
+    PersistentConnection.prototype.createEventHandlers = function (eventName) {
+        var handlers = new Map();
+        this.wrappedHandlersByEvent.set(eventName, handlers);
+        return handlers;
+    };
+    PersistentConnection.prototype.getOrCreateEventHandlers = function (eventName) {
+        var _a;
+        return (_a = this.getEventHandlers(eventName)) !== null && _a !== void 0 ? _a : this.createEventHandlers(eventName);
+    };
+    PersistentConnection.prototype.subscribeWithWrappedHandler = function (connection, eventName, handler) {
+        var eventHandlers = this.getOrCreateEventHandlers(eventName);
+        var originalHandler = handler;
+        if (eventHandlers.has(originalHandler)) {
+            return;
+        }
+        var wrappedHandler = this.createWrappedHandler(eventName, handler);
+        eventHandlers.set(originalHandler, wrappedHandler);
+        connection.socket.on(eventName, wrappedHandler);
+    };
+    PersistentConnection.prototype.unsubscribeWrappedHandler = function (eventName, handler) {
+        if (!handler) {
+            this.connection.socket.off(eventName);
+            this.wrappedHandlersByEvent.delete(eventName);
+            return;
+        }
+        var eventHandlers = this.getEventHandlers(eventName);
+        var originalHandler = handler;
+        var wrappedHandler = eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.get(originalHandler);
+        if (!wrappedHandler) {
+            this.connection.socket.off(eventName, handler);
+            return;
+        }
+        this.connection.socket.off(eventName, wrappedHandler);
+        eventHandlers.delete(originalHandler);
+        if (eventHandlers.size === 0) {
+            this.wrappedHandlersByEvent.delete(eventName);
+        }
+    };
     return PersistentConnection;
 }());
 exports["default"] = PersistentConnection;
@@ -23335,7 +23394,7 @@ var lodash_1 = __webpack_require__(96486);
 var BringgException_1 = __webpack_require__(43605);
 var Logger_1 = __importDefault(__webpack_require__(55860));
 var abort_1 = __webpack_require__(34179);
-var version = '9.69.0';
+var version = '9.69.1';
 function logErrorResponse(response) {
     var data = response.data, status = response.status;
     try {