@microsoft/omnichannel-chat-sdk 1.11.6-main.b982edb → 1.11.7-main.14ece7b

package/lib/OmnichannelChatSDK.js

@@ -105,7 +105,6 @@ var loggerUtils_1 = require("./utils/loggerUtils");
 var parsers_1 = require("./utils/parsers");
 var platform_1 = require("./utils/platform");
 var retrieveCollectorUri_1 = require("./telemetry/retrieveCollectorUri");
-var setOcUserAgent_1 = require("./utils/setOcUserAgent");
 var startPolling_1 = require("./commands/startPolling");
 var stopPolling_1 = require("./commands/stopPolling");
 var urlResolvers_1 = require("./utils/urlResolvers");
@@ -118,6 +117,9 @@ var OmnichannelChatSDK = /** @class */ (function () {
         this.ACSClient = null;
         this.AMSClient = null;
         this.sessionId = null;
+        // Operation queue for serializing chat operations
+        this.chatOperationInProgress = false;
+        this.pendingOperations = [];
         this.unqServicesOrgUrl = null;
         this.coreServicesOrgUrl = null;
         this.dynamicsLocationCode = null;
@@ -147,6 +149,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
         this.debugAMS = false;
         this.debugACS = false;
         this.detailedDebugEnabled = false;
+        this.regexCompiledForDataMasking = [];
         this.populateInitChatOptionalParam = function (requestOptionalParams, optionalParams, telemetryEvent) {
             requestOptionalParams.initContext.locale = (0, locale_1.getLocaleStringFromId)(_this.localeId);
             if (optionalParams === null || optionalParams === void 0 ? void 0 : optionalParams.customContext) {
@@ -254,6 +257,59 @@ var OmnichannelChatSDK = /** @class */ (function () {
         }
         loggerUtils_1.default.setRequestId(this.requestId, this.ocSdkLogger, this.acsClientLogger, this.acsAdapterLogger, this.callingSdkLogger, this.amsClientLogger, this.ic3ClientLogger);
     }
+    /**
+     * Executes an operation with mutual exclusion to prevent race conditions
+     * between startChat and endChat operations
+     */
+    OmnichannelChatSDK.prototype.executeWithLock = function (operation) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (resolve, reject) {
+                        var wrappedOperation = function () { return __awaiter(_this, void 0, void 0, function () {
+                            var result, error_1;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, 3, 4]);
+                                        return [4 /*yield*/, operation()];
+                                    case 1:
+                                        result = _a.sent();
+                                        resolve(result);
+                                        return [3 /*break*/, 4];
+                                    case 2:
+                                        error_1 = _a.sent();
+                                        reject(error_1);
+                                        return [3 /*break*/, 4];
+                                    case 3:
+                                        this.chatOperationInProgress = false;
+                                        this.processNextOperation();
+                                        return [7 /*endfinally*/];
+                                    case 4: return [2 /*return*/];
+                                }
+                            });
+                        }); };
+                        if (_this.chatOperationInProgress) {
+                            _this.pendingOperations.push(wrappedOperation);
+                        }
+                        else {
+                            _this.chatOperationInProgress = true;
+                            wrappedOperation();
+                        }
+                    })];
+            });
+        });
+    };
+    /**
+     * Processes the next pending operation in the queue
+     */
+    OmnichannelChatSDK.prototype.processNextOperation = function () {
+        if (this.pendingOperations.length > 0) {
+            this.chatOperationInProgress = true;
+            var nextOperation = this.pendingOperations.shift();
+            nextOperation();
+        }
+    };
     /**
      *
      * @param flag Flag to enable/disable debug log telemetry, will be applied to all components
@@ -441,7 +497,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.parallelInitialization = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
-            var error_1, telemetryData;
+            var error_2, telemetryData;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -462,13 +518,13 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.InitializeChatSDKParallel);
                         return [3 /*break*/, 3];
                     case 2:
-                        error_1 = _a.sent();
+                        error_2 = _a.sent();
                         telemetryData = {
                             RequestId: this.requestId,
-                            ExceptionDetails: (error_1 instanceof ChatSDKError_1.ChatSDKError) ? JSON.stringify(error_1.exceptionDetails) : "".concat(error_1)
+                            ExceptionDetails: (error_2 instanceof ChatSDKError_1.ChatSDKError) ? JSON.stringify(error_2.exceptionDetails) : "".concat(error_2)
                         };
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.InitializeChatSDKParallel, telemetryData);
-                        throw error_1;
+                        throw error_2;
                     case 3: return [2 /*return*/, this.liveChatConfig];
                 }
             });
@@ -495,10 +551,9 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         _j.trys.push([1, 3, , 4]);
                         this.OCSDKProvider = ocsdk_1.SDKProvider;
                         _a = this;
-                        return [4 /*yield*/, ocsdk_1.SDKProvider.getSDK(this.omnichannelConfig, (0, createOcSDKConfiguration_1.default)(useCoreServices), this.ocSdkLogger)];
+                        return [4 /*yield*/, ocsdk_1.SDKProvider.getSDK(this.omnichannelConfig, (0, createOcSDKConfiguration_1.default)(useCoreServices, (_d = this.chatSDKConfig) === null || _d === void 0 ? void 0 : _d.ocUserAgent), this.ocSdkLogger)];
                     case 2:
                         _a.OCClient = _j.sent();
-                        (0, setOcUserAgent_1.default)(this.OCClient, (_d = this.chatSDKConfig) === null || _d === void 0 ? void 0 : _d.ocUserAgent);
                         return [3 /*break*/, 4];
                     case 3:
                         e_2 = _j.sent();
@@ -601,8 +656,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         useCoreServices = (0, CoreServicesUtils_1.isCoreServicesOrgUrl)(this.omnichannelConfig.orgUrl);
                         try {
                             this.OCSDKProvider = ocsdk_1.SDKProvider;
-                            this.OCClient = ocsdk_1.SDKProvider.getSDK(this.omnichannelConfig, (0, createOcSDKConfiguration_1.default)(useCoreServices), this.ocSdkLogger);
-                            (0, setOcUserAgent_1.default)(this.OCClient, (_a = this.chatSDKConfig) === null || _a === void 0 ? void 0 : _a.ocUserAgent);
+                            this.OCClient = ocsdk_1.SDKProvider.getSDK(this.omnichannelConfig, (0, createOcSDKConfiguration_1.default)(useCoreServices, (_a = this.chatSDKConfig) === null || _a === void 0 ? void 0 : _a.ocUserAgent), this.ocSdkLogger);
                         }
                         catch (e) {
                             exceptionThrowers_1.default.throwOmnichannelClientInitializationFailure(e, this.scenarioMarker, TelemetryEvent_1.default.InitializeLoadChatConfig);
@@ -628,7 +682,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getChatReconnectContextWithAuthToken = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var context, reconnectableChatsParams, reconnectableChatsResponse, error_2, exceptionDetails, telemetryData;
+            var context, reconnectableChatsParams, reconnectableChatsResponse, error_3, exceptionDetails, telemetryData;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -659,7 +713,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 4];
                     case 3:
-                        error_2 = _a.sent();
+                        error_3 = _a.sent();
                         exceptionDetails = {
                             response: "OCClientGetReconnectableChatsFailed"
                         };
@@ -668,11 +722,11 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ChatId: this.chatToken.chatId,
                             ExceptionDetails: JSON.stringify(exceptionDetails)
                         };
-                        if ((0, utilities_1.isClientIdNotFoundErrorMessage)(error_2)) {
-                            exceptionThrowers_1.default.throwAuthContactIdNotFoundFailure(error_2, this.scenarioMarker, TelemetryEvent_1.default.GetChatReconnectContextWithAuthToken, telemetryData);
+                        if ((0, utilities_1.isClientIdNotFoundErrorMessage)(error_3)) {
+                            exceptionThrowers_1.default.throwAuthContactIdNotFoundFailure(error_3, this.scenarioMarker, TelemetryEvent_1.default.GetChatReconnectContextWithAuthToken, telemetryData);
                         }
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetChatReconnectContextWithAuthToken, telemetryData);
-                        console.error("OmnichannelChatSDK/GetChatReconnectContextWithAuthToken/error ".concat(error_2));
+                        console.error("OmnichannelChatSDK/GetChatReconnectContextWithAuthToken/error ".concat(error_3));
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/, context];
                 }
@@ -681,7 +735,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getChatReconnectContextWithReconnectId = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
-            var context, reconnectAvailabilityResponse, error_3, exceptionDetails;
+            var context, reconnectAvailabilityResponse, error_4, exceptionDetails;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -716,7 +770,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 4];
                     case 3:
-                        error_3 = _a.sent();
+                        error_4 = _a.sent();
                         exceptionDetails = {
                             response: "OCClientGetReconnectAvailabilityFailed"
                         };
@@ -725,7 +779,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ChatId: this.chatToken.chatId,
                             ExceptionDetails: JSON.stringify(exceptionDetails)
                         });
-                        console.error("OmnichannelChatSDK/GetChatReconnectContextWithReconnectId/error ".concat(error_3));
+                        console.error("OmnichannelChatSDK/GetChatReconnectContextWithReconnectId/error ".concat(error_4));
                         return [3 /*break*/, 4];
                     case 4: 
                     //here the context contains recconnectionId if valid, or redirectionURL if not valid
@@ -780,7 +834,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.startChat = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
-            var shouldReinitIC3Client, _a, reconnectableChatsParams, reconnectableChatsResponse, e_6, telemetryData, conversationDetails, telemetryData, telemetryData, e_7, telemetryData, sessionInitOptionalParams, location_2, sessionInitPromise, createConversationPromise, messagingClientPromise, attachmentClientPromise, error_4;
+            var _this = this;
+            if (optionalParams === void 0) { optionalParams = {}; }
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.executeWithLock(function () { return _this.internalStartChat(optionalParams); })];
+            });
+        });
+    };
+    OmnichannelChatSDK.prototype.internalStartChat = function () {
+        return __awaiter(this, arguments, void 0, function (optionalParams) {
+            var shouldReinitIC3Client, _a, reconnectableChatsParams, reconnectableChatsResponse, e_6, telemetryData, conversationDetails, telemetryData, telemetryData, e_7, telemetryData, sessionInitOptionalParams, location_2, sessionInitPromise, createConversationPromise, messagingClientPromise, attachmentClientPromise, error_5;
             var _this = this;
             var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             if (optionalParams === void 0) { optionalParams = {}; }
@@ -919,7 +982,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         _o.label = 18;
                     case 18:
                         sessionInitPromise = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var error_5, telemetryData;
+                            var error_6, telemetryData;
                             var _a, _b, _c;
                             return __generator(this, function (_d) {
                                 switch (_d.label) {
@@ -933,23 +996,23 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         _d.sent();
                                         return [3 /*break*/, 4];
                                     case 3:
-                                        error_5 = _d.sent();
+                                        error_6 = _d.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
                                         };
                                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                                        if ((error_5 === null || error_5 === void 0 ? void 0 : error_5.isAxiosError) && ((_c = (_b = (_a = error_5.response) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.errorcode) === null || _c === void 0 ? void 0 : _c.toString()) === OmnichannelErrorCodes_1.default.WidgetUseOutsideOperatingHour.toString()) {
-                                            exceptionThrowers_1.default.throwWidgetUseOutsideOperatingHour(error_5, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
+                                        if ((error_6 === null || error_6 === void 0 ? void 0 : error_6.isAxiosError) && ((_c = (_b = (_a = error_6.response) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.errorcode) === null || _c === void 0 ? void 0 : _c.toString()) === OmnichannelErrorCodes_1.default.WidgetUseOutsideOperatingHour.toString()) {
+                                            exceptionThrowers_1.default.throwWidgetUseOutsideOperatingHour(error_6, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         }
-                                        exceptionThrowers_1.default.throwConversationInitializationFailure(error_5, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
+                                        exceptionThrowers_1.default.throwConversationInitializationFailure(error_6, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         return [3 /*break*/, 4];
                                     case 4: return [2 /*return*/];
                                 }
                             });
                         }); };
                         createConversationPromise = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var chatToken, error_6, telemetryData;
+                            var chatToken, error_7, telemetryData;
                             var _a, _b, _c;
                             return __generator(this, function (_d) {
                                 switch (_d.label) {
@@ -967,23 +1030,23 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         }
                                         return [3 /*break*/, 4];
                                     case 3:
-                                        error_6 = _d.sent();
+                                        error_7 = _d.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
                                         };
                                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                                        if ((error_6 === null || error_6 === void 0 ? void 0 : error_6.isAxiosError) && ((_c = (_b = (_a = error_6.response) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.errorcode) === null || _c === void 0 ? void 0 : _c.toString()) === OmnichannelErrorCodes_1.default.WidgetUseOutsideOperatingHour.toString()) {
-                                            exceptionThrowers_1.default.throwWidgetUseOutsideOperatingHour(error_6, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
+                                        if ((error_7 === null || error_7 === void 0 ? void 0 : error_7.isAxiosError) && ((_c = (_b = (_a = error_7.response) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.errorcode) === null || _c === void 0 ? void 0 : _c.toString()) === OmnichannelErrorCodes_1.default.WidgetUseOutsideOperatingHour.toString()) {
+                                            exceptionThrowers_1.default.throwWidgetUseOutsideOperatingHour(error_7, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         }
-                                        exceptionThrowers_1.default.throwConversationInitializationFailure(error_6, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
+                                        exceptionThrowers_1.default.throwConversationInitializationFailure(error_7, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         return [3 /*break*/, 4];
                                     case 4: return [2 /*return*/];
                                 }
                             });
                         }); };
                         messagingClientPromise = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var chatAdapterConfig, error_7, telemetryData, _a, error_8, telemetryData, error_9, telemetryData, _b, error_10, telemetryData;
+                            var chatAdapterConfig, error_8, telemetryData, _a, error_9, telemetryData, error_10, telemetryData, _b, error_11, telemetryData;
                             var _c, _d;
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
@@ -1007,12 +1070,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         _e.sent();
                                         return [3 /*break*/, 4];
                                     case 3:
-                                        error_7 = _e.sent();
+                                        error_8 = _e.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
                                         };
-                                        exceptionThrowers_1.default.throwMessagingClientInitializationFailure(error_7, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
+                                        exceptionThrowers_1.default.throwMessagingClientInitializationFailure(error_8, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         return [3 /*break*/, 4];
                                     case 4:
                                         _e.trys.push([4, 6, , 7]);
@@ -1030,12 +1093,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         });
                                         return [3 /*break*/, 7];
                                     case 6:
-                                        error_8 = _e.sent();
+                                        error_9 = _e.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
                                         };
-                                        exceptionThrowers_1.default.throwMessagingClientConversationJoinFailure(error_8, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
+                                        exceptionThrowers_1.default.throwMessagingClientConversationJoinFailure(error_9, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         return [3 /*break*/, 7];
                                     case 7: return [3 /*break*/, 14];
                                     case 8:
@@ -1049,12 +1112,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         _e.sent();
                                         return [3 /*break*/, 11];
                                     case 10:
-                                        error_9 = _e.sent();
+                                        error_10 = _e.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
                                         };
-                                        exceptionThrowers_1.default.throwMessagingClientInitializationFailure(error_9, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
+                                        exceptionThrowers_1.default.throwMessagingClientInitializationFailure(error_10, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         return [3 /*break*/, 11];
                                     case 11:
                                         _e.trys.push([11, 13, , 14]);
@@ -1068,19 +1131,19 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         });
                                         return [3 /*break*/, 14];
                                     case 13:
-                                        error_10 = _e.sent();
+                                        error_11 = _e.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
                                         };
-                                        exceptionThrowers_1.default.throwMessagingClientConversationJoinFailure(error_10, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
+                                        exceptionThrowers_1.default.throwMessagingClientConversationJoinFailure(error_11, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         return [3 /*break*/, 14];
                                     case 14: return [2 /*return*/];
                                 }
                             });
                         }); };
                         attachmentClientPromise = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var amsClient, error_11, telemetryData;
+                            var amsClient, error_12, telemetryData;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -1100,7 +1163,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         _a.label = 3;
                                     case 3: return [3 /*break*/, 5];
                                     case 4:
-                                        error_11 = _a.sent();
+                                        error_12 = _a.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
@@ -1127,25 +1190,36 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         _o.sent();
                         return [3 /*break*/, 26];
                     case 24:
-                        error_4 = _o.sent();
+                        error_5 = _o.sent();
                         // If conversation joining fails after conversation was created, clean up the conversation
                         // Only cleanup conversations that were freshly created (not existing ones being reconnected to)
-                        return [4 /*yield*/, this.handleConversationJoinFailure(error_4, optionalParams)];
+                        return [4 /*yield*/, this.handleConversationJoinFailure(error_5, optionalParams)];
                     case 25:
                         // If conversation joining fails after conversation was created, clean up the conversation
                         // Only cleanup conversations that were freshly created (not existing ones being reconnected to)
                         _o.sent();
-                        throw error_4; // Re-throw the original error
+                        throw error_5; // Re-throw the original error
                     case 26:
                         if (this.isPersistentChat && !((_l = this.chatSDKConfig.persistentChat) === null || _l === void 0 ? void 0 : _l.disable)) {
                             this.refreshTokenTimer = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
+                                var error_13;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.getChatToken(false)];
+                                        case 0:
+                                            _a.trys.push([0, 2, , 3]);
+                                            return [4 /*yield*/, this.getChatToken(false)];
                                         case 1:
                                             _a.sent();
                                             this.updateChatToken(this.chatToken.token, this.chatToken.regionGTMS);
-                                            return [2 /*return*/];
+                                            return [3 /*break*/, 3];
+                                        case 2:
+                                            error_13 = _a.sent();
+                                            if (this.refreshTokenTimer !== null) {
+                                                clearInterval(this.refreshTokenTimer);
+                                                this.refreshTokenTimer = null;
+                                            }
+                                            return [3 /*break*/, 3];
+                                        case 3: return [2 /*return*/];
                                     }
                                 });
                             }); }, (_m = this.chatSDKConfig.persistentChat) === null || _m === void 0 ? void 0 : _m.tokenUpdateTime);
@@ -1157,7 +1231,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.closeChat = function (endChatOptionalParams) {
         return __awaiter(this, void 0, void 0, function () {
-            var cleanupMetadata, sessionCloseOptionalParams, isReconnectChat, isChatReconnect, error_12;
+            var cleanupMetadata, sessionCloseOptionalParams, isReconnectChat, isChatReconnect, error_14;
             var _a, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -1192,8 +1266,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         _c.sent();
                         return [3 /*break*/, 4];
                     case 3:
-                        error_12 = _c.sent();
-                        exceptionThrowers_1.default.throwConversationClosureFailure(error_12, this.scenarioMarker, TelemetryEvent_1.default.CloseChatSession, __assign(__assign({}, cleanupMetadata), { isSessionEnded: String(!(endChatOptionalParams === null || endChatOptionalParams === void 0 ? void 0 : endChatOptionalParams.isSessionEnded)) }));
+                        error_14 = _c.sent();
+                        exceptionThrowers_1.default.throwConversationClosureFailure(error_14, this.scenarioMarker, TelemetryEvent_1.default.CloseChatSession, __assign(__assign({}, cleanupMetadata), { isSessionEnded: String(!(endChatOptionalParams === null || endChatOptionalParams === void 0 ? void 0 : endChatOptionalParams.isSessionEnded)) }));
                         return [3 /*break*/, 4];
                     case 4:
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.CloseChatSession, cleanupMetadata);
@@ -1205,7 +1279,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.endChat = function () {
         return __awaiter(this, arguments, void 0, function (endChatOptionalParams) {
-            var cleanupMetadata, error_13, telemetryData;
+            var _this = this;
+            if (endChatOptionalParams === void 0) { endChatOptionalParams = {}; }
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.executeWithLock(function () { return _this.internalEndChat(endChatOptionalParams); })];
+            });
+        });
+    };
+    OmnichannelChatSDK.prototype.internalEndChat = function () {
+        return __awaiter(this, arguments, void 0, function (endChatOptionalParams) {
+            var cleanupMetadata, error_15, telemetryData;
             var _a;
             if (endChatOptionalParams === void 0) { endChatOptionalParams = {}; }
             return __generator(this, function (_b) {
@@ -1255,15 +1338,15 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.EndChat, cleanupMetadata);
                         return [3 /*break*/, 7];
                     case 6:
-                        error_13 = _b.sent();
+                        error_15 = _b.sent();
                         telemetryData = {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         };
-                        if (error_13 instanceof ChatSDKError_1.ChatSDKError) {
-                            exceptionThrowers_1.default.throwConversationClosureFailure(new Error(JSON.stringify(error_13.exceptionDetails)), this.scenarioMarker, TelemetryEvent_1.default.EndChat, telemetryData);
+                        if (error_15 instanceof ChatSDKError_1.ChatSDKError) {
+                            exceptionThrowers_1.default.throwConversationClosureFailure(new Error(JSON.stringify(error_15.exceptionDetails)), this.scenarioMarker, TelemetryEvent_1.default.EndChat, telemetryData);
                         }
-                        exceptionThrowers_1.default.throwConversationClosureFailure(error_13, this.scenarioMarker, TelemetryEvent_1.default.EndChat, telemetryData);
+                        exceptionThrowers_1.default.throwConversationClosureFailure(error_15, this.scenarioMarker, TelemetryEvent_1.default.EndChat, telemetryData);
                         return [3 /*break*/, 7];
                     case 7: return [2 /*return*/];
                 }
@@ -1310,7 +1393,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getConversationDetails = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
-            var requestId, chatToken, chatId, reconnectId, sessionId, getLWIDetailsOptionalParams, lwiDetails, state, conversationId, agentAcceptedOn, canRenderPostChat, participantType, liveWorkItemDetails, error_14, telemetryData;
+            var requestId, chatToken, chatId, reconnectId, sessionId, getLWIDetailsOptionalParams, lwiDetails, state, conversationId, agentAcceptedOn, canRenderPostChat, participantType, liveWorkItemDetails, error_16, telemetryData;
             var _a, _b, _c, _d;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_e) {
@@ -1383,15 +1466,15 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, liveWorkItemDetails];
                     case 3:
-                        error_14 = _e.sent();
+                        error_16 = _e.sent();
                         telemetryData = {
                             RequestId: requestId,
                             ChatId: chatId
                         };
-                        if ((0, utilities_1.isClientIdNotFoundErrorMessage)(error_14)) {
-                            exceptionThrowers_1.default.throwAuthContactIdNotFoundFailure(error_14, this.scenarioMarker, TelemetryEvent_1.default.GetConversationDetails, telemetryData);
+                        if ((0, utilities_1.isClientIdNotFoundErrorMessage)(error_16)) {
+                            exceptionThrowers_1.default.throwAuthContactIdNotFoundFailure(error_16, this.scenarioMarker, TelemetryEvent_1.default.GetConversationDetails, telemetryData);
                         }
-                        exceptionSuppressors_1.default.suppressConversationDetailsRetrievalFailure(error_14, this.scenarioMarker, TelemetryEvent_1.default.GetConversationDetails, telemetryData);
+                        exceptionSuppressors_1.default.suppressConversationDetailsRetrievalFailure(error_16, this.scenarioMarker, TelemetryEvent_1.default.GetConversationDetails, telemetryData);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/, {}];
                 }
@@ -1432,7 +1515,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getChatToken = function () {
         return __awaiter(this, arguments, void 0, function (cached, optionalParams) {
-            var getChatTokenOptionalParams, chatToken, error_15, telemetryData;
+            var getChatTokenOptionalParams, chatToken, error_17, telemetryData;
             var _a, _b, _c;
             if (cached === void 0) { cached = true; }
             return __generator(this, function (_d) {
@@ -1474,16 +1557,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 4];
                     case 3:
-                        error_15 = _d.sent();
+                        error_17 = _d.sent();
                         telemetryData = {
                             RequestId: this.requestId,
                             ChatId: (_c = this.chatToken) === null || _c === void 0 ? void 0 : _c.chatId,
                         };
-                        if ((0, utilities_1.isClientIdNotFoundErrorMessage)(error_15)) {
-                            exceptionThrowers_1.default.throwAuthContactIdNotFoundFailure(error_15, this.scenarioMarker, TelemetryEvent_1.default.GetChatToken, telemetryData);
+                        if ((0, utilities_1.isClientIdNotFoundErrorMessage)(error_17)) {
+                            exceptionThrowers_1.default.throwAuthContactIdNotFoundFailure(error_17, this.scenarioMarker, TelemetryEvent_1.default.GetChatToken, telemetryData);
                         }
                         else {
-                            exceptionThrowers_1.default.throwChatTokenRetrievalFailure(error_15, this.scenarioMarker, TelemetryEvent_1.default.GetChatToken, telemetryData);
+                            exceptionThrowers_1.default.throwChatTokenRetrievalFailure(error_17, this.scenarioMarker, TelemetryEvent_1.default.GetChatToken, telemetryData);
                         }
                         return [3 /*break*/, 4];
                     case 4: return [3 /*break*/, 6];
@@ -1613,21 +1696,36 @@ var OmnichannelChatSDK = /** @class */ (function () {
         }
         var content = message.content;
         var match;
-        for (var _i = 0, _a = this.dataMaskingRules.rules; _i < _a.length; _i++) {
-            var maskingRule = _a[_i];
-            var regex = new RegExp(maskingRule.regex, 'g');
-            while ((match = regex.exec(content)) !== null) {
-                var replaceStr = match[0].replace(/./g, this.maskingCharacter);
-                content = content.replace(match[0], replaceStr);
+        if (this.regexCompiledForDataMasking.length === 0) {
+            return message;
+        }
+        for (var _i = 0, _a = this.regexCompiledForDataMasking; _i < _a.length; _i++) {
+            var regex = _a[_i];
+            try {
+                var lastIndex = -1;
+                while ((match = regex.exec(content)) !== null) {
+                    // Prevent infinite loop from zero-width matches
+                    if (regex.lastIndex === lastIndex) {
+                        this.debug && console.warn("[OmnichannelChatSDK][transformMessage] Data masking regex caused zero-width match, skipping rule ".concat(regex));
+                        break;
+                    }
+                    lastIndex = regex.lastIndex;
+                    var replaceStr = match[0].replace(/./g, this.maskingCharacter);
+                    content = content.replace(match[0], replaceStr);
+                }
+                match = null;
+            }
+            catch (error) {
+                // Log error for invalid regex but continue processing other rules
+                this.debug && console.error("[OmnichannelChatSDK][transformMessage] Data masking regex failed for rule ".concat(regex, ": ").concat(error));
             }
-            match = null;
         }
         message.content = content;
         return message;
     };
     OmnichannelChatSDK.prototype.sendMessage = function (message) {
         return __awaiter(this, void 0, void 0, function () {
-            var sendMessageRequest, chatMessage, error_16, exceptionDetails, messageToSend, error_17, exceptionDetails;
+            var sendMessageRequest, chatMessage, error_18, exceptionDetails;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -1640,7 +1738,6 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             exceptionThrowers_1.default.throwUninitializedChatSDK(this.scenarioMarker, TelemetryEvent_1.default.SendMessages);
                         }
                         this.transformMessage(message);
-                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 5];
                         sendMessageRequest = {
                             content: message.content,
                         };
@@ -1663,10 +1760,10 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, chatMessage];
                     case 3:
-                        error_16 = _b.sent();
+                        error_18 = _b.sent();
                         exceptionDetails = {
                             response: ChatSDKError_1.ChatSDKErrorName.ChatSDKSendMessageFailed,
-                            errorObject: "".concat(error_16)
+                            errorObject: "".concat(error_18)
                         };
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendMessages, {
                             RequestId: this.requestId,
@@ -1675,54 +1772,9 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         throw new ChatSDKError_1.ChatSDKError(ChatSDKError_1.ChatSDKErrorName.ChatSDKSendMessageFailed, undefined, {
                             response: ChatSDKError_1.ChatSDKErrorName.ChatSDKSendMessageFailed,
-                            errorObject: "".concat(error_16)
-                        });
-                    case 4: return [3 /*break*/, 9];
-                    case 5:
-                        messageToSend = {
-                            content: message.content,
-                            timestamp: new Date(),
-                            contentType: MessageContentType_1.default.Text,
-                            deliveryMode: DeliveryMode_1.default.Bridged,
-                            messageType: MessageType_1.default.UserMessage,
-                            properties: undefined,
-                            tags: __spreadArray([], MessageTags_1.defaultMessageTags, true),
-                            sender: {
-                                displayName: "Customer",
-                                id: "customer",
-                                type: PersonType_1.default.User
-                            }
-                        };
-                        if (message.tags) {
-                            messageToSend.tags = message.tags;
-                        }
-                        if (message.timestamp) {
-                            messageToSend.timestamp = message.timestamp;
-                        }
-                        _b.label = 6;
-                    case 6:
-                        _b.trys.push([6, 8, , 9]);
-                        return [4 /*yield*/, this.conversation.sendMessage(messageToSend)];
-                    case 7:
-                        _b.sent();
-                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.SendMessages, {
-                            RequestId: this.requestId,
-                            ChatId: this.chatToken.chatId
-                        });
-                        return [3 /*break*/, 9];
-                    case 8:
-                        error_17 = _b.sent();
-                        exceptionDetails = {
-                            response: ChatSDKError_1.ChatSDKErrorName.ChatSDKSendMessageFailed,
-                            errorObject: "".concat(error_17)
-                        };
-                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendMessages, {
-                            RequestId: this.requestId,
-                            ChatId: this.chatToken.chatId,
-                            ExceptionDetails: JSON.stringify(exceptionDetails)
+                            errorObject: "".concat(error_18)
                         });
-                        throw new Error(ChatSDKError_1.ChatSDKErrorName.ChatSDKSendMessageFailed);
-                    case 9: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -1773,12 +1825,17 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             }
                             (_b = this.conversation) === null || _b === void 0 ? void 0 : _b.registerOnNewMessage(function (event) {
                                 var id = event.id;
+                                var isChatMessageEditedEvent = Object.keys(event).includes("editedOn");
+                                console.log("[OmnichannelChatSDK][onNewMessage] New message received", event);
+                                console.log("[OmnichannelChatSDK][onNewMessage] isChatMessageEditedEvent=>", isChatMessageEditedEvent);
                                 var omnichannelMessage = (0, createOmnichannelMessage_1.default)(event, {
                                     liveChatVersion: _this.liveChatVersion,
                                     debug: (_this.detailedDebugEnabled ? _this.debugACS : _this.debug),
                                 });
-                                if (!postedMessages_1.has(id)) {
+                                // send callback for new messages or edited existent messages
+                                if (!postedMessages_1.has(id) || isChatMessageEditedEvent) {
                                     onNewMessageCallback(omnichannelMessage);
+                                    console.log("[OmnichannelChatSDK][onNewMessage] Message posted");
                                     postedMessages_1.add(id);
                                 }
                             }, registerOnNewMessageOptionalParams);
@@ -1801,7 +1858,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.sendTypingEvent = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var error_18;
+            var error_19;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1830,7 +1887,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 5];
                     case 4:
-                        error_18 = _a.sent();
+                        error_19 = _a.sent();
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendTypingEvent, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
@@ -1898,8 +1955,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     OmnichannelChatSDK.prototype.onAgentEndSession = function (onAgentEndSessionCallback) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            var _a;
-            return __generator(this, function (_b) {
+            return __generator(this, function (_a) {
                 this.scenarioMarker.startScenario(TelemetryEvent_1.default.OnAgentEndSession, {
                     RequestId: this.requestId,
                     ChatId: this.chatToken.chatId
@@ -1907,59 +1963,32 @@ var OmnichannelChatSDK = /** @class */ (function () {
                 if (!this.isInitialized) {
                     exceptionThrowers_1.default.throwUninitializedChatSDK(this.scenarioMarker, TelemetryEvent_1.default.OnAgentEndSession);
                 }
-                if (this.liveChatVersion === LiveChatVersion_1.default.V2) {
-                    try {
-                        this.conversation.registerOnThreadUpdate(function (event) { return __awaiter(_this, void 0, void 0, function () {
-                            var liveWorkItemDetails;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, this.getConversationDetails()];
-                                    case 1:
-                                        liveWorkItemDetails = _a.sent();
-                                        if (Object.keys(liveWorkItemDetails).length === 0 || liveWorkItemDetails.state == LiveWorkItemState_1.default.WrapUp || liveWorkItemDetails.state == LiveWorkItemState_1.default.Closed) {
-                                            onAgentEndSessionCallback(event);
-                                            this.stopPolling();
-                                        }
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); });
-                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnAgentEndSession, {
-                            RequestId: this.requestId,
-                            ChatId: this.chatToken.chatId
-                        });
-                    }
-                    catch (error) {
-                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnAgentEndSession, {
-                            RequestId: this.requestId,
-                            ChatId: this.chatToken.chatId
-                        });
-                    }
-                }
-                else {
-                    try {
-                        (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.registerOnThreadUpdate(function (message) {
-                            var members = message.members;
-                            // Agent ending conversation would have 1 member left in the chat thread
-                            if (members.length === 1) {
-                                onAgentEndSessionCallback(message);
-                                if (_this.refreshTokenTimer !== null) {
-                                    clearInterval(_this.refreshTokenTimer);
-                                    _this.refreshTokenTimer = null;
-                                }
+                try {
+                    this.conversation.registerOnThreadUpdate(function (event) { return __awaiter(_this, void 0, void 0, function () {
+                        var liveWorkItemDetails;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.getConversationDetails()];
+                                case 1:
+                                    liveWorkItemDetails = _a.sent();
+                                    if (Object.keys(liveWorkItemDetails).length === 0 || liveWorkItemDetails.state == LiveWorkItemState_1.default.WrapUp || liveWorkItemDetails.state == LiveWorkItemState_1.default.Closed) {
+                                        onAgentEndSessionCallback(event);
+                                        this.stopPolling();
+                                    }
+                                    return [2 /*return*/];
                             }
                         });
-                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnAgentEndSession, {
-                            RequestId: this.requestId,
-                            ChatId: this.chatToken.chatId
-                        });
-                    }
-                    catch (error) {
-                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnAgentEndSession, {
-                            RequestId: this.requestId,
-                            ChatId: this.chatToken.chatId
-                        });
-                    }
+                    }); });
+                    this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnAgentEndSession, {
+                        RequestId: this.requestId,
+                        ChatId: this.chatToken.chatId
+                    });
+                }
+                catch (error) {
+                    this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnAgentEndSession, {
+                        RequestId: this.requestId,
+                        ChatId: this.chatToken.chatId
+                    });
                 }
                 return [2 /*return*/];
             });
@@ -1967,7 +1996,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.uploadFileAttachment = function (fileInfo) {
         return __awaiter(this, void 0, void 0, function () {
-            var amsClient, createObjectResponse, documentId, uploadDocumentResponse, fileIdsProperty, fileMetaProperty, sendMessageRequest, messageToSend, error_19, fileMetadata, messageToSend, error_20;
+            var amsClient, createObjectResponse, documentId, uploadDocumentResponse, fileIdsProperty, fileMetaProperty, sendMessageRequest, messageToSend, error_20, fileMetadata, messageToSend, error_21;
             var _a, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -2036,7 +2065,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, messageToSend];
                     case 6:
-                        error_19 = _c.sent();
+                        error_20 = _c.sent();
                         console.error("OmnichannelChatSDK/uploadFileAttachment/sendMessage/error");
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.UploadFileAttachment, {
                             RequestId: this.requestId,
@@ -2082,8 +2111,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, messageToSend];
                     case 15:
-                        error_20 = _c.sent();
-                        console.error("OmnichannelChatSDK/uploadFileAttachment/error: ".concat(error_20));
+                        error_21 = _c.sent();
+                        console.error("OmnichannelChatSDK/uploadFileAttachment/error: ".concat(error_21));
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.UploadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
@@ -2096,7 +2125,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.downloadFileAttachment = function (fileMetadata) {
         return __awaiter(this, void 0, void 0, function () {
-            var amsClient, response, view_location, viewResponse, _a, downloadedFile, error_21;
+            var amsClient, response, view_location, viewResponse, _a, downloadedFile, error_22;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -2156,8 +2185,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, downloadedFile];
                     case 9:
-                        error_21 = _b.sent();
-                        console.error("OmnichannelChatSDK/downloadFileAttachment/error: ".concat(error_21));
+                        error_22 = _b.sent();
+                        console.error("OmnichannelChatSDK/downloadFileAttachment/error: ".concat(error_22));
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.DownloadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
@@ -2170,7 +2199,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.emailLiveChatTranscript = function (body_1) {
         return __awaiter(this, arguments, void 0, function (body, optionalParams) {
-            var emailTranscriptOptionalParams, requestId, chatToken, chatId, sessionId, emailRequestBody, error_22;
+            var emailTranscriptOptionalParams, requestId, chatToken, chatId, sessionId, emailRequestBody, error_23;
             var _a;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_b) {
@@ -2221,8 +2250,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 4];
                     case 3:
-                        error_22 = _b.sent();
-                        console.error("OmnichannelChatSDK/emailLiveChatTranscript/error: ".concat(error_22));
+                        error_23 = _b.sent();
+                        console.error("OmnichannelChatSDK/emailLiveChatTranscript/error: ".concat(error_23));
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.EmailLiveChatTranscript, {
                             RequestId: requestId,
                             ChatId: chatId
@@ -2235,7 +2264,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getLiveChatTranscript = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
-            var getChatTranscriptOptionalParams, requestId, chatToken, chatId, sessionId, transcriptResponse, error_23, telemetryData;
+            var getChatTranscriptOptionalParams, requestId, chatToken, chatId, sessionId, transcriptResponse, error_24, telemetryData;
             var _a, _b;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_c) {
@@ -2292,12 +2321,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, transcriptResponse];
                     case 3:
-                        error_23 = _c.sent();
+                        error_24 = _c.sent();
                         telemetryData = {
                             RequestId: requestId,
                             ChatId: chatId
                         };
-                        exceptionThrowers_1.default.throwLiveChatTranscriptRetrievalFailure(error_23, this.scenarioMarker, TelemetryEvent_1.default.GetLiveChatTranscript, telemetryData);
+                        exceptionThrowers_1.default.throwLiveChatTranscriptRetrievalFailure(error_24, this.scenarioMarker, TelemetryEvent_1.default.GetLiveChatTranscript, telemetryData);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }
@@ -2412,7 +2441,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getPostChatSurveyContext = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var conversationId, chatConfig, liveWSAndLiveChatEngJoin, msdyn_postconversationsurveyenable, msfp_sourcesurveyidentifier, msfp_botsourcesurveyidentifier, postConversationSurveyOwnerId, postConversationBotSurveyOwnerId, msdyn_surveyprovider, surveyProvider, liveWorkItemDetails, participantJoined, participantType, agentSurveyInviteLinkRequest, botSurveyInviteLinkRequest, optionalParams, agentSurveyInviteLinkResponse, botSurveyInviteLinkResponse, _a, agentSurveyInviteLink, agentFormsProLocale, botSurveyInviteLink, botFormsProLocale, postChatContext, ex_1;
+            var conversationId, chatConfig, liveWSAndLiveChatEngJoin, msdyn_postconversationsurveyenable, msfp_sourcesurveyidentifier, msfp_botsourcesurveyidentifier, postConversationSurveyOwnerId, postConversationBotSurveyOwnerId, msdyn_surveyprovider, surveyProvider, liveWorkItemDetails, participantJoined, participantType, agentSurveyInviteLinkRequest, botSurveyInviteLinkRequest, optionalParams, _a, agentSurveyInviteLinkResponse, botSurveyInviteLinkResponse, agentSurveyInviteLink, agentFormsProLocale, botSurveyInviteLink, botFormsProLocale, postChatContext, ex_1;
             var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             return __generator(this, function (_o) {
                 switch (_o.label) {
@@ -2426,7 +2455,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         }
                         _o.label = 1;
                     case 1:
-                        _o.trys.push([1, 8, , 9]);
+                        _o.trys.push([1, 6, , 7]);
                         chatConfig = this.liveChatConfig;
                         liveWSAndLiveChatEngJoin = chatConfig.LiveWSAndLiveChatEngJoin;
                         msdyn_postconversationsurveyenable = liveWSAndLiveChatEngJoin.msdyn_postconversationsurveyenable, msfp_sourcesurveyidentifier = liveWSAndLiveChatEngJoin.msfp_sourcesurveyidentifier, msfp_botsourcesurveyidentifier = liveWSAndLiveChatEngJoin.msfp_botsourcesurveyidentifier, postConversationSurveyOwnerId = liveWSAndLiveChatEngJoin.postConversationSurveyOwnerId, postConversationBotSurveyOwnerId = liveWSAndLiveChatEngJoin.postConversationBotSurveyOwnerId, msdyn_surveyprovider = liveWSAndLiveChatEngJoin.msdyn_surveyprovider;
@@ -2439,7 +2468,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             });
                             return [2 /*return*/, Promise.reject("GetPostChatSurveyContext : msfp_sourcesurveyidentifier is mandatory for survey provider ".concat(SurveyProvider_1.SurveyProvider.CustomerVoice, "."))];
                         }
-                        if (!((0, parsers_1.parseLowerCaseString)(msdyn_postconversationsurveyenable) === "true")) return [3 /*break*/, 6];
+                        if (!((0, parsers_1.parseLowerCaseString)(msdyn_postconversationsurveyenable) === "true")) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.getConversationDetails()];
                     case 2:
                         liveWorkItemDetails = _o.sent();
@@ -2482,17 +2511,14 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         if (this.authenticatedUserToken) {
                             optionalParams.authenticatedUserToken = this.authenticatedUserToken;
                         }
-                        return [4 /*yield*/, this.OCClient.getSurveyInviteLink(postConversationSurveyOwnerId, agentSurveyInviteLinkRequest, optionalParams)];
+                        return [4 /*yield*/, Promise.all([
+                                this.OCClient.getSurveyInviteLink(postConversationSurveyOwnerId, agentSurveyInviteLinkRequest, optionalParams),
+                                (postConversationBotSurveyOwnerId && msfp_botsourcesurveyidentifier)
+                                    ? this.OCClient.getSurveyInviteLink(postConversationBotSurveyOwnerId, botSurveyInviteLinkRequest, optionalParams)
+                                    : Promise.resolve(null)
+                            ])];
                     case 3:
-                        agentSurveyInviteLinkResponse = _o.sent();
-                        _a = postConversationBotSurveyOwnerId && msfp_botsourcesurveyidentifier;
-                        if (!_a) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.OCClient.getSurveyInviteLink(postConversationBotSurveyOwnerId, botSurveyInviteLinkRequest, optionalParams)];
-                    case 4:
-                        _a = (_o.sent());
-                        _o.label = 5;
-                    case 5:
-                        botSurveyInviteLinkResponse = _a;
+                        _a = _o.sent(), agentSurveyInviteLinkResponse = _a[0], botSurveyInviteLinkResponse = _a[1];
                         agentSurveyInviteLink = void 0, agentFormsProLocale = void 0, botSurveyInviteLink = void 0, botFormsProLocale = void 0;
                         if (agentSurveyInviteLinkResponse != null) {
                             if (agentSurveyInviteLinkResponse.inviteList != null && agentSurveyInviteLinkResponse.inviteList.length == 1) {
@@ -2541,16 +2567,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             });
                             return [2 /*return*/, Promise.reject("surveyInviteLinkResponse is null.")];
                         }
-                        return [3 /*break*/, 7];
-                    case 6:
+                        return [3 /*break*/, 5];
+                    case 4:
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetPostChatSurveyContext, {
                             RequestId: this.requestId,
                             ChatId: (_l = this.chatToken) === null || _l === void 0 ? void 0 : _l.chatId,
                             ExceptionDetails: "Post Chat Survey is disabled. Please check the Omnichannel Administration Portal."
                         });
                         return [2 /*return*/, Promise.reject("Post Chat is disabled from admin side, or chat doesnt have a survey as part of their configuration.")];
-                    case 7: return [3 /*break*/, 9];
-                    case 8:
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
                         ex_1 = _o.sent();
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetPostChatSurveyContext, {
                             ConversationId: conversationId !== null && conversationId !== void 0 ? conversationId : "",
@@ -2559,7 +2585,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ExceptionDetails: JSON.stringify(ex_1)
                         });
                         return [2 /*return*/, Promise.reject("Retrieving post chat context failed " + JSON.stringify(ex_1))];
-                    case 9: return [2 /*return*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -2752,12 +2778,26 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                 regex: value
                             });
                         }
+                        this.compileDataMaskingRegex();
                     }
                 }
                 return [2 /*return*/];
             });
         });
     };
+    OmnichannelChatSDK.prototype.compileDataMaskingRegex = function () {
+        this.regexCompiledForDataMasking = [];
+        for (var _i = 0, _a = this.dataMaskingRules.rules; _i < _a.length; _i++) {
+            var rule = _a[_i];
+            try {
+                var regex = new RegExp(rule.regex, 'g');
+                this.regexCompiledForDataMasking.push(regex);
+            }
+            catch (e) {
+                console.error("Error compiling regex for data masking rule id ".concat(rule.id, ": ").concat(e));
+            }
+        }
+    };
     OmnichannelChatSDK.prototype.setAuthSettingConfig = function (authSettings) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -2836,7 +2876,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getChatConfig = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
-            var sendCacheHeaders, bypassCache, liveChatConfig, error_24, _a;
+            var sendCacheHeaders, bypassCache, liveChatConfig, error_25, _a;
             var _b, _c;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_d) {
@@ -2857,8 +2897,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         this.debug && console.log("[OmnichannelChatSDK][getChatConfig][liveChatVersion] ".concat(this.liveChatVersion));
                         return [2 /*return*/, this.liveChatConfig];
                     case 3:
-                        error_24 = _d.sent();
-                        if (!(0, internalUtils_1.isCoreServicesOrgUrlDNSError)(error_24, this.coreServicesOrgUrl, this.dynamicsLocationCode)) return [3 /*break*/, 6];
+                        error_25 = _d.sent();
+                        if (!(0, internalUtils_1.isCoreServicesOrgUrlDNSError)(error_25, this.coreServicesOrgUrl, this.dynamicsLocationCode)) return [3 /*break*/, 6];
                         this.omnichannelConfig.orgUrl = this.unqServicesOrgUrl;
                         _a = this;
                         return [4 /*yield*/, ocsdk_1.SDKProvider.getSDK(this.omnichannelConfig, (0, createOcSDKConfiguration_1.default)(false), this.ocSdkLogger)];
@@ -2870,10 +2910,10 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         return [3 /*break*/, 7];
                     case 6:
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        if (((_c = (_b = error_24.response) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c.errorcode) && parseInt(error_24.response.headers.errorcode) === OmnichannelErrorCodes_1.default.WidgetNotFound) {
+                        if (((_c = (_b = error_25.response) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c.errorcode) && parseInt(error_25.response.headers.errorcode) === OmnichannelErrorCodes_1.default.WidgetNotFound) {
                             console.warn("No widget with the given app id is present in the system.");
                         }
-                        throw error_24; // Bubble up error by default to throw ChatConfigRetrievalFailure
+                        throw error_25; // Bubble up error by default to throw ChatConfigRetrievalFailure
                     case 7: return [3 /*break*/, 8];
                     case 8: return [2 /*return*/, this.liveChatConfig];
                 }
@@ -2908,7 +2948,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.updateChatToken = function (newToken, newRegionGTMS) {
         return __awaiter(this, void 0, void 0, function () {
-            var sessionInfo, error_25, exceptionDetails;
+            var sessionInfo, error_26, exceptionDetails;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2936,7 +2976,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 5];
                     case 4:
-                        error_25 = _a.sent();
+                        error_26 = _a.sent();
                         exceptionDetails = {
                             response: "UpdateChatTokenFailed"
                         };
@@ -2953,7 +2993,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.setAuthTokenProvider = function (provider_1) {
         return __awaiter(this, arguments, void 0, function (provider, optionalParams) {
-            var token, exceptionDetails, error_26, exceptionDetails, exceptionDetails;
+            var token, exceptionDetails, error_27, exceptionDetails, exceptionDetails;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -2985,12 +3025,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        error_26 = _a.sent();
+                        error_27 = _a.sent();
                         exceptionDetails = {
                             response: ChatSDKError_1.ChatSDKErrorName.GetAuthTokenFailed
                         };
-                        if (error_26.message == ChatSDKError_1.ChatSDKErrorName.UndefinedAuthToken) {
-                            exceptionDetails.response = error_26.message;
+                        if (error_27.message == ChatSDKError_1.ChatSDKErrorName.UndefinedAuthToken) {
+                            exceptionDetails.response = error_27.message;
                         }
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetAuthToken, {
                             ExceptionDetails: JSON.stringify(exceptionDetails)
@@ -3064,7 +3104,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                          * and ensure a retry in startChat won't be affected with
                          * data from a failed session
                          */
-                        return [4 /*yield*/, this.endChat()];
+                        return [4 /*yield*/, this.internalEndChat()];
                     case 2:
                         /**
                          * Calling cleanup to take care of any session cleanup,
@@ -3083,6 +3123,67 @@ var OmnichannelChatSDK = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Get persistent chat history for authenticated users.
+     * @param getPersistentChatHistoryOptionalParams Optional parameters for persistent chat history retrieval.
+     */
+    OmnichannelChatSDK.prototype.getPersistentChatHistory = function () {
+        return __awaiter(this, arguments, void 0, function (getPersistentChatHistoryOptionalParams) {
+            var params, result, error_28, telemetryData;
+            var _a, _b, _c, _d, _e;
+            if (getPersistentChatHistoryOptionalParams === void 0) { getPersistentChatHistoryOptionalParams = {}; }
+            return __generator(this, function (_f) {
+                switch (_f.label) {
+                    case 0:
+                        if (!this.requestId) {
+                            this.requestId = (0, ocsdk_1.uuidv4)();
+                        }
+                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetPersistentChatHistory, {
+                            RequestId: this.requestId
+                        });
+                        if (!this.isInitialized) {
+                            exceptionThrowers_1.default.throwUninitializedChatSDK(this.scenarioMarker, TelemetryEvent_1.default.GetPersistentChatHistory);
+                        }
+                        if (!this.isPersistentChat || ((_a = this.chatSDKConfig.persistentChat) === null || _a === void 0 ? void 0 : _a.disable) === true) {
+                            exceptionThrowers_1.default.throwNotPersistentChatEnabled(this.scenarioMarker, TelemetryEvent_1.default.GetPersistentChatHistory, {
+                                RequestId: this.requestId,
+                                ChatId: (_b = this.chatToken) === null || _b === void 0 ? void 0 : _b.chatId
+                            });
+                        }
+                        if (!this.authenticatedUserToken) {
+                            exceptionThrowers_1.default.throwChatSDKError(ChatSDKError_1.ChatSDKErrorName.AuthenticatedUserTokenNotFound, new Error('Authenticated user token not found'), this.scenarioMarker, TelemetryEvent_1.default.GetPersistentChatHistory, {
+                                RequestId: this.requestId,
+                                ChatId: (_c = this.chatToken) === null || _c === void 0 ? void 0 : _c.chatId
+                            });
+                        }
+                        _f.label = 1;
+                    case 1:
+                        _f.trys.push([1, 3, , 4]);
+                        params = {};
+                        params.pageSize = getPersistentChatHistoryOptionalParams.pageSize || undefined;
+                        params.pageToken = getPersistentChatHistoryOptionalParams.pageToken || undefined;
+                        return [4 /*yield*/, this.OCClient.getPersistentChatHistory(this.requestId, __assign(__assign({}, params), { authenticatedUserToken: this.authenticatedUserToken }))];
+                    case 2:
+                        result = _f.sent();
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetPersistentChatHistory, {
+                            RequestId: this.requestId,
+                            ChatId: (_d = this.chatToken) === null || _d === void 0 ? void 0 : _d.chatId
+                        });
+                        return [2 /*return*/, result];
+                    case 3:
+                        error_28 = _f.sent();
+                        telemetryData = {
+                            RequestId: this.requestId,
+                            ChatId: (_e = this.chatToken) === null || _e === void 0 ? void 0 : _e.chatId,
+                            ErrorMessage: (error_28 === null || error_28 === void 0 ? void 0 : error_28.message) || 'Unknown error' // Added error message for better debugging
+                        };
+                        exceptionThrowers_1.default.throwPersistentChatConversationRetrievalFailure(error_28, this.scenarioMarker, TelemetryEvent_1.default.GetPersistentChatHistory, telemetryData);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return OmnichannelChatSDK;
 }());
 exports.default = OmnichannelChatSDK;