@microsoft/omnichannel-chat-sdk 1.11.7-main.3418dc3 → 1.11.7-main.80a4f46

package/lib/OmnichannelChatSDK.d.ts

@@ -84,6 +84,7 @@ declare class OmnichannelChatSDK {
     private debugAMS;
     private debugACS;
     private detailedDebugEnabled;
+    private regexCompiledForDataMasking;
     constructor(omnichannelConfig: OmnichannelConfig, chatSDKConfig?: ChatSDKConfig);
     /**
      * Executes an operation with mutual exclusion to prevent race conditions
@@ -165,6 +166,7 @@ declare class OmnichannelChatSDK {
     private getIC3Client;
     private setPrechatConfigurations;
     private setDataMaskingConfiguration;
+    private compileDataMaskingRegex;
     private setAuthSettingConfig;
     private setPersistentChatConfiguration;
     private setLocaleIdConfiguration;

package/lib/OmnichannelChatSDK.js

@@ -150,6 +150,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) {
@@ -1687,21 +1688,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_17, exceptionDetails, messageToSend, error_18, exceptionDetails;
+            var sendMessageRequest, chatMessage, error_17, exceptionDetails;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -1714,7 +1730,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,
                         };
@@ -1751,52 +1766,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             response: ChatSDKError_1.ChatSDKErrorName.ChatSDKSendMessageFailed,
                             errorObject: "".concat(error_17)
                         });
-                    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_18 = _b.sent();
-                        exceptionDetails = {
-                            response: ChatSDKError_1.ChatSDKErrorName.ChatSDKSendMessageFailed,
-                            errorObject: "".concat(error_18)
-                        };
-                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendMessages, {
-                            RequestId: this.requestId,
-                            ChatId: this.chatToken.chatId,
-                            ExceptionDetails: JSON.stringify(exceptionDetails)
-                        });
-                        throw new Error(ChatSDKError_1.ChatSDKErrorName.ChatSDKSendMessageFailed);
-                    case 9: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -1875,7 +1845,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.sendTypingEvent = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var error_19;
+            var error_18;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1904,7 +1874,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 5];
                     case 4:
-                        error_19 = _a.sent();
+                        error_18 = _a.sent();
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendTypingEvent, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
@@ -2013,7 +1983,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_20, fileMetadata, messageToSend, error_21;
+            var amsClient, createObjectResponse, documentId, uploadDocumentResponse, fileIdsProperty, fileMetaProperty, sendMessageRequest, messageToSend, error_19, fileMetadata, messageToSend, error_20;
             var _a, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -2082,7 +2052,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, messageToSend];
                     case 6:
-                        error_20 = _c.sent();
+                        error_19 = _c.sent();
                         console.error("OmnichannelChatSDK/uploadFileAttachment/sendMessage/error");
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.UploadFileAttachment, {
                             RequestId: this.requestId,
@@ -2128,8 +2098,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, messageToSend];
                     case 15:
-                        error_21 = _c.sent();
-                        console.error("OmnichannelChatSDK/uploadFileAttachment/error: ".concat(error_21));
+                        error_20 = _c.sent();
+                        console.error("OmnichannelChatSDK/uploadFileAttachment/error: ".concat(error_20));
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.UploadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
@@ -2142,7 +2112,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_22;
+            var amsClient, response, view_location, viewResponse, _a, downloadedFile, error_21;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -2202,8 +2172,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, downloadedFile];
                     case 9:
-                        error_22 = _b.sent();
-                        console.error("OmnichannelChatSDK/downloadFileAttachment/error: ".concat(error_22));
+                        error_21 = _b.sent();
+                        console.error("OmnichannelChatSDK/downloadFileAttachment/error: ".concat(error_21));
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.DownloadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
@@ -2216,7 +2186,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_23;
+            var emailTranscriptOptionalParams, requestId, chatToken, chatId, sessionId, emailRequestBody, error_22;
             var _a;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_b) {
@@ -2267,8 +2237,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 4];
                     case 3:
-                        error_23 = _b.sent();
-                        console.error("OmnichannelChatSDK/emailLiveChatTranscript/error: ".concat(error_23));
+                        error_22 = _b.sent();
+                        console.error("OmnichannelChatSDK/emailLiveChatTranscript/error: ".concat(error_22));
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.EmailLiveChatTranscript, {
                             RequestId: requestId,
                             ChatId: chatId
@@ -2281,7 +2251,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_24, telemetryData;
+            var getChatTranscriptOptionalParams, requestId, chatToken, chatId, sessionId, transcriptResponse, error_23, telemetryData;
             var _a, _b;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_c) {
@@ -2338,12 +2308,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, transcriptResponse];
                     case 3:
-                        error_24 = _c.sent();
+                        error_23 = _c.sent();
                         telemetryData = {
                             RequestId: requestId,
                             ChatId: chatId
                         };
-                        exceptionThrowers_1.default.throwLiveChatTranscriptRetrievalFailure(error_24, this.scenarioMarker, TelemetryEvent_1.default.GetLiveChatTranscript, telemetryData);
+                        exceptionThrowers_1.default.throwLiveChatTranscriptRetrievalFailure(error_23, this.scenarioMarker, TelemetryEvent_1.default.GetLiveChatTranscript, telemetryData);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }
@@ -2795,12 +2765,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) {
@@ -2879,7 +2863,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getChatConfig = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
-            var sendCacheHeaders, bypassCache, liveChatConfig, error_25, _a;
+            var sendCacheHeaders, bypassCache, liveChatConfig, error_24, _a;
             var _b, _c;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_d) {
@@ -2900,8 +2884,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         this.debug && console.log("[OmnichannelChatSDK][getChatConfig][liveChatVersion] ".concat(this.liveChatVersion));
                         return [2 /*return*/, this.liveChatConfig];
                     case 3:
-                        error_25 = _d.sent();
-                        if (!(0, internalUtils_1.isCoreServicesOrgUrlDNSError)(error_25, this.coreServicesOrgUrl, this.dynamicsLocationCode)) return [3 /*break*/, 6];
+                        error_24 = _d.sent();
+                        if (!(0, internalUtils_1.isCoreServicesOrgUrlDNSError)(error_24, 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)];
@@ -2913,10 +2897,10 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         return [3 /*break*/, 7];
                     case 6:
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        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) {
+                        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) {
                             console.warn("No widget with the given app id is present in the system.");
                         }
-                        throw error_25; // Bubble up error by default to throw ChatConfigRetrievalFailure
+                        throw error_24; // Bubble up error by default to throw ChatConfigRetrievalFailure
                     case 7: return [3 /*break*/, 8];
                     case 8: return [2 /*return*/, this.liveChatConfig];
                 }
@@ -2951,7 +2935,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.updateChatToken = function (newToken, newRegionGTMS) {
         return __awaiter(this, void 0, void 0, function () {
-            var sessionInfo, error_26, exceptionDetails;
+            var sessionInfo, error_25, exceptionDetails;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2979,7 +2963,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 5];
                     case 4:
-                        error_26 = _a.sent();
+                        error_25 = _a.sent();
                         exceptionDetails = {
                             response: "UpdateChatTokenFailed"
                         };
@@ -2996,7 +2980,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.setAuthTokenProvider = function (provider_1) {
         return __awaiter(this, arguments, void 0, function (provider, optionalParams) {
-            var token, exceptionDetails, error_27, exceptionDetails, exceptionDetails;
+            var token, exceptionDetails, error_26, exceptionDetails, exceptionDetails;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3028,12 +3012,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        error_27 = _a.sent();
+                        error_26 = _a.sent();
                         exceptionDetails = {
                             response: ChatSDKError_1.ChatSDKErrorName.GetAuthTokenFailed
                         };
-                        if (error_27.message == ChatSDKError_1.ChatSDKErrorName.UndefinedAuthToken) {
-                            exceptionDetails.response = error_27.message;
+                        if (error_26.message == ChatSDKError_1.ChatSDKErrorName.UndefinedAuthToken) {
+                            exceptionDetails.response = error_26.message;
                         }
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetAuthToken, {
                             ExceptionDetails: JSON.stringify(exceptionDetails)
@@ -3132,7 +3116,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
      */
     OmnichannelChatSDK.prototype.getPersistentChatHistory = function () {
         return __awaiter(this, arguments, void 0, function (getPersistentChatHistoryOptionalParams) {
-            var params, result, error_28, telemetryData;
+            var params, result, error_27, telemetryData;
             var _a, _b, _c, _d, _e;
             if (getPersistentChatHistoryOptionalParams === void 0) { getPersistentChatHistoryOptionalParams = {}; }
             return __generator(this, function (_f) {
@@ -3174,13 +3158,13 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, result];
                     case 3:
-                        error_28 = _f.sent();
+                        error_27 = _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
+                            ErrorMessage: (error_27 === null || error_27 === void 0 ? void 0 : error_27.message) || 'Unknown error' // Added error message for better debugging
                         };
-                        exceptionThrowers_1.default.throwPersistentChatConversationRetrievalFailure(error_28, this.scenarioMarker, TelemetryEvent_1.default.GetPersistentChatHistory, telemetryData);
+                        exceptionThrowers_1.default.throwPersistentChatConversationRetrievalFailure(error_27, this.scenarioMarker, TelemetryEvent_1.default.GetPersistentChatHistory, telemetryData);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }