@microsoft/omnichannel-chat-widget 0.1.0-main.488d6f1 → 0.1.0-main.592da7b

package/lib/cjs/contexts/common/LiveChatWidgetContextInitialState.js

@@ -12,6 +12,10 @@ var _defaultMiddlewareLocalizedTexts = require("../../components/webchatcontaine
 const getLiveChatWidgetContextInitialState = props => {
   var _props$webChatContain;
 
+  if (props !== null && props !== void 0 && props.liveChatContextFromCache) {
+    return props === null || props === void 0 ? void 0 : props.liveChatContextFromCache;
+  }
+
   const LiveChatWidgetContextInitialState = {
     domainStates: {
       liveChatConfig: props.chatConfig,
@@ -23,7 +27,9 @@ const getLiveChatWidgetContextInitialState = props => {
       postChatContext: undefined,
       telemetryInternalData: {},
       globalDir: "ltr",
-      liveChatContext: undefined
+      liveChatContext: undefined,
+      customContext: undefined,
+      widgetSize: undefined
     },
     appStates: {
       conversationState: _ConversationState.ConversationState.Closed,
@@ -56,7 +62,7 @@ const getLiveChatWidgetContextInitialState = props => {
       focusChatButton: false
     }
   };
-  return props.liveChatContextFromCache ?? LiveChatWidgetContextInitialState;
+  return LiveChatWidgetContextInitialState;
 };
 
 exports.getLiveChatWidgetContextInitialState = getLiveChatWidgetContextInitialState;

package/lib/cjs/contexts/createReducer.js

@@ -7,8 +7,6 @@ exports.createReducer = void 0;
 
 var _LiveChatWidgetActionType = require("./common/LiveChatWidgetActionType");
 
-var _TelemetryManager = require("../common/telemetry/TelemetryManager");
-
 /* eslint-disable indent */
 const createReducer = () => {
   const reducer = (state, action) => {
@@ -71,6 +69,14 @@ const createReducer = () => {
           }
         };
 
+      case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CUSTOM_CONTEXT:
+        return { ...state,
+          domainStates: { ...state.domainStates,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            customContext: action.payload
+          }
+        };
+
       case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PREVIOUS_FOCUSED_ELEMENT:
         return { ...state,
           appStates: { ...state.appStates,
@@ -93,13 +99,6 @@ const createReducer = () => {
           }
         };
 
-      case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT:
-        return { ...state,
-          appStates: { ...state.appStates,
-            shouldShowPostChat: action.payload
-          }
-        };
-
       case _LiveChatWidgetActionType.LiveChatWidgetActionType.SHOW_CALLING_CONTAINER:
         return { ...state,
           uiStates: { ...state.uiStates,
@@ -197,7 +196,6 @@ const createReducer = () => {
         };
 
       case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA:
-        _TelemetryManager.TelemetryManager.InternalTelemetryData = action.payload;
         return { ...state,
           domainStates: { ...state.domainStates,
             telemetryInternalData: action.payload
@@ -237,6 +235,14 @@ const createReducer = () => {
           }
         };
 
+      case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_SIZE:
+        return { ...state,
+          domainStates: { ...state.domainStates,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            widgetSize: action.payload
+          }
+        };
+
       default:
         return state;
     }

package/lib/cjs/controller/componentController.js

@@ -8,7 +8,7 @@ exports.shouldShowWebChatContainer = exports.shouldShowReconnectChatPane = expor
 var _ConversationState = require("../contexts/common/ConversationState");
 
 const shouldShowChatButton = state => {
-  return state.appStates.isMinimized || state.appStates.conversationState === _ConversationState.ConversationState.Closed;
+  return (state.appStates.isMinimized || state.appStates.conversationState === _ConversationState.ConversationState.Closed) && state.appStates.skipChatButtonRendering == false; // Do not show chat button in case of popout
 };
 
 exports.shouldShowChatButton = shouldShowChatButton;

package/lib/cjs/plugins/newMessageEventHandler.js

@@ -0,0 +1,99 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createOnNewAdapterActivityHandler = void 0;
+
+var _TelemetryConstants = require("../common/telemetry/TelemetryConstants");
+
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+
+var _Constants = require("../common/Constants");
+
+var _TelemetryHelper = require("../common/telemetry/TelemetryHelper");
+
+const createOnNewAdapterActivityHandler = (chatId, userId) => {
+  const onNewAdapterActivityHandler = activity => {
+    var _activity$channelData, _activity$channelData2, _activity$channelData3;
+
+    const isActivityMessage = (activity === null || activity === void 0 ? void 0 : activity.type) === _Constants.Constants.message;
+    const isNotHistoryMessage = isActivityMessage && !(activity !== null && activity !== void 0 && (_activity$channelData = activity.channelData) !== null && _activity$channelData !== void 0 && (_activity$channelData2 = _activity$channelData.tags) !== null && _activity$channelData2 !== void 0 && _activity$channelData2.includes(_Constants.Constants.historyMessageTag)) && !(activity !== null && activity !== void 0 && (_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && _activity$channelData3.fromList);
+
+    if (isNotHistoryMessage) {
+      raiseMessageEvent(activity);
+    }
+  };
+
+  const raiseMessageEvent = activity => {
+    if ((activity === null || activity === void 0 ? void 0 : activity.type) === _Constants.Constants.message) {
+      var _text, _text2, _activity$channelData4, _activity$from;
+
+      const payload = {
+        // To identify hidden contents vs empty content
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        text: (activity === null || activity === void 0 ? void 0 : (_text = activity.text) === null || _text === void 0 ? void 0 : _text.length) >= 1 ? `*contents hidden (${activity === null || activity === void 0 ? void 0 : (_text2 = activity.text) === null || _text2 === void 0 ? void 0 : _text2.length} chars)*` : "",
+        type: activity === null || activity === void 0 ? void 0 : activity.type,
+        timestamp: activity === null || activity === void 0 ? void 0 : activity.timestamp,
+        userId: userId,
+        tags: activity === null || activity === void 0 ? void 0 : (_activity$channelData4 = activity.channelData) === null || _activity$channelData4 === void 0 ? void 0 : _activity$channelData4.tags,
+        messageType: ""
+      };
+
+      if ((activity === null || activity === void 0 ? void 0 : (_activity$from = activity.from) === null || _activity$from === void 0 ? void 0 : _activity$from.role) === _Constants.Constants.userMessageTag) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        payload.messageType = _Constants.Constants.userMessageTag;
+        const newMessageSentEvent = {
+          eventName: _TelemetryConstants.BroadcastEvent.NewMessageSent,
+          payload: payload
+        };
+
+        _omnichannelChatComponents.BroadcastService.postMessage(newMessageSentEvent);
+
+        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+          Event: _TelemetryConstants.TelemetryEvent.MessageSent,
+          Description: "New message sent"
+        });
+      } else {
+        var _activity$channelData5, _activity$channelData6;
+
+        if (activity !== null && activity !== void 0 && (_activity$channelData5 = activity.channelData) !== null && _activity$channelData5 !== void 0 && (_activity$channelData6 = _activity$channelData5.tags) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.includes(_Constants.Constants.systemMessageTag)) {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          payload.messageType = _Constants.Constants.systemMessageTag;
+        } else {
+          var _activity$channelData7, _activity$channelData8, _activity$channelData9;
+
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const messageHasNoText = !(activity !== null && activity !== void 0 && activity.text); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData7 = activity.channelData) !== null && _activity$channelData7 !== void 0 && _activity$channelData7.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData8 = activity.channelData) === null || _activity$channelData8 === void 0 ? void 0 : (_activity$channelData9 = _activity$channelData8.tags) === null || _activity$channelData9 === void 0 ? void 0 : _activity$channelData9.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+          const messageHasNoAttachments = !(activity !== null && activity !== void 0 && activity.attachments) || (activity === null || activity === void 0 ? void 0 : activity.attachments.length) === 0;
+
+          if (messageHasNoTags && messageHasNoText && messageHasNoAttachments) {
+            return;
+          }
+
+          payload.messageType = _Constants.Constants.userMessageTag;
+        }
+
+        const newMessageReceivedEvent = {
+          eventName: _TelemetryConstants.BroadcastEvent.NewMessageReceived,
+          payload: payload
+        };
+
+        _omnichannelChatComponents.BroadcastService.postMessage(newMessageReceivedEvent);
+
+        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+          Event: _TelemetryConstants.TelemetryEvent.MessageReceived,
+          Description: "New message received",
+          Data: payload
+        });
+      }
+    }
+  };
+
+  return onNewAdapterActivityHandler;
+};
+
+exports.createOnNewAdapterActivityHandler = createOnNewAdapterActivityHandler;

package/lib/esm/common/Constants.js

@@ -4,12 +4,20 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 export class Constants {}
 
+_defineProperty(Constants, "magicCodeBroadcastChannel", "MagicCodeChannel");
+
+_defineProperty(Constants, "magicCodeResponseBroadcastChannel", "MagicCodeResponseChannel");
+
 _defineProperty(Constants, "systemMessageTag", "system");
 
 _defineProperty(Constants, "userMessageTag", "user");
 
+_defineProperty(Constants, "historyMessageTag", "history");
+
 _defineProperty(Constants, "agentEndConversationMessageTag", "agentendconversation");
 
+_defineProperty(Constants, "supervisorForceCloseMessageTag", "supervisorforceclosedconversation");
+
 _defineProperty(Constants, "receivedMessageClassName", "ms_lcw_webchat_received_message");
 
 _defineProperty(Constants, "sentMessageClassName", "ms_lcw_webchat_sent_message");
@@ -32,8 +40,6 @@ _defineProperty(Constants, "false", "false");
 
 _defineProperty(Constants, "maximumUnreadMessageCount", 99);
 
-_defineProperty(Constants, "widgetStateDataKey", "LcwChatWidgetState");
-
 _defineProperty(Constants, "channelIdKey", "ChannelId-");
 
 _defineProperty(Constants, "ChannelId", "lcw");
@@ -68,6 +74,14 @@ _defineProperty(Constants, "averageWaitTimeMessageTag", "averagewaittime");
 
 _defineProperty(Constants, "message", "message");
 
+_defineProperty(Constants, "hiddenTag", "Hidden");
+
+_defineProperty(Constants, "prefixTimestampTag", "ServerMessageTimestamp_");
+
+_defineProperty(Constants, "acsChannel", "ACS_CHANNEL");
+
+_defineProperty(Constants, "publicMessageTag", "public");
+
 _defineProperty(Constants, "supportedAdaptiveCardContentTypes", ["application/vnd.microsoft.card.adaptive", "application/vnd.microsoft.card.audio", "application/vnd.microsoft.card.hero", "application/vnd.microsoft.card.receipt", "application/vnd.microsoft.card.thumbnail", "application/vnd.microsoft.card.signin", "application/vnd.microsoft.card.oauth"]);
 
 _defineProperty(Constants, "maxUploadFileSize", "500000");
@@ -118,8 +132,6 @@ _defineProperty(Constants, "InputSubmit", "InputSubmit");
 
 _defineProperty(Constants, "ReconnectIdAttributeName", "oc.reconnectid");
 
-_defineProperty(Constants, "redirectPageRequest", "redirectPageRequest");
-
 _defineProperty(Constants, "LiveChatWidget", "LiveChatWidgetNew");
 
 _defineProperty(Constants, "GuidPattern", "xx-x-4m-ym-xxx");
@@ -144,6 +156,8 @@ _defineProperty(Constants, "internetConnectionTestUrl", "https://ocsdk-prod.azur
 
 _defineProperty(Constants, "internetConnectionTestUrlText", "Omnichannel Connect Test");
 
+_defineProperty(Constants, "ChatWidgetStateChangedPrefix", "ChatWidgetStateChanged");
+
 export const Regex = (_class = class Regex {}, _defineProperty(_class, "EmailRegex", "(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])"), _class);
 export class HtmlIdNames {}
 
@@ -253,6 +267,15 @@ export let ChatSDKError;
   ChatSDKError["WidgetUseOutsideOperatingHour"] = "WidgetUseOutsideOperatingHour";
 })(ChatSDKError || (ChatSDKError = {}));
 
+export let EnvironmentVersion;
+
+(function (EnvironmentVersion) {
+  EnvironmentVersion["prod"] = "prod";
+  EnvironmentVersion["dogfood"] = "df";
+  EnvironmentVersion["int"] = "int";
+  EnvironmentVersion["test"] = "test";
+})(EnvironmentVersion || (EnvironmentVersion = {}));
+
 export class TranscriptConstants {}
 
 _defineProperty(TranscriptConstants, "ChatTranscriptsBodyColor", "#F5F5F5");
@@ -273,4 +296,22 @@ _defineProperty(TranscriptConstants, "InternalMode", "internal");
 
 _defineProperty(TranscriptConstants, "AgentDialogColor", "#2266E3");
 
-_defineProperty(TranscriptConstants, "AgentFontColor", "white");
+_defineProperty(TranscriptConstants, "AgentFontColor", "white");
+
+export class AriaTelemetryConstants {}
+
+_defineProperty(AriaTelemetryConstants, "GERMANY_ENDPOINT", "https://de.pipe.aria.microsoft.com/Collector/3.0/");
+
+_defineProperty(AriaTelemetryConstants, "GCCH_ENDPOINT", "https://tb.pipe.aria.microsoft.com/Collector/3.0/");
+
+_defineProperty(AriaTelemetryConstants, "DOD_ENDPOINT", "https://pf.pipe.aria.microsoft.com/Collector/3.0");
+
+_defineProperty(AriaTelemetryConstants, "EUROPE_ENDPOINT", "https://eu-mobile.events.data.microsoft.com/Collector/3.0/");
+
+_defineProperty(AriaTelemetryConstants, "MOONCAKE_ENDPOINT", "");
+
+_defineProperty(AriaTelemetryConstants, "Public", "Public");
+
+_defineProperty(AriaTelemetryConstants, "EU", "Europe");
+
+_defineProperty(AriaTelemetryConstants, "lcwEUDomainNames", ["crm4.omnichannelengagementhub.com", "crm12.omnichannelengagementhub.com", "crm16.omnichannelengagementhub.com", "crm17.omnichannelengagementhub.com", "crm19.omnichannelengagementhub.com"]);

package/lib/esm/common/telemetry/TelemetryConstants.js

@@ -13,7 +13,7 @@ export let ScenarioType;
   ScenarioType["ACS_ADAPTER"] = "LCW_ACSAdapterEvents";
 })(ScenarioType || (ScenarioType = {}));
 
-export let LogLevel;
+export let LogLevel; // Events used in certain functionalities that are not being logged
 
 (function (LogLevel) {
   LogLevel["INFO"] = "INFO";
@@ -22,6 +22,34 @@ export let LogLevel;
   LogLevel["ERROR"] = "ERROR";
 })(LogLevel || (LogLevel = {}));
 
+export let BroadcastEvent; // Events being logged
+
+(function (BroadcastEvent) {
+  BroadcastEvent["LoadPostChatSurvey"] = "LoadPostChatSurvey";
+  BroadcastEvent["ChatEnded"] = "ChatEnded";
+  BroadcastEvent["NewMessageNotification"] = "NewMessageNotification";
+  BroadcastEvent["UnreadMessageCount"] = "UnreadMessageCount";
+  BroadcastEvent["StartProactiveChat"] = "StartProactiveChat";
+  BroadcastEvent["ProactiveChatStartChat"] = "ProactiveChatStartChat";
+  BroadcastEvent["ProactiveChatStartPopoutChat"] = "ProactiveChatStartPopoutChat";
+  BroadcastEvent["ProactiveChatIsInPopoutMode"] = "ProactiveChatIsInPopoutMode";
+  BroadcastEvent["ResetProactiveChatParams"] = "ResetProactiveChatParams";
+  BroadcastEvent["InvalidAdaptiveCardFormat"] = "InvalidAdaptiveCardFormat";
+  BroadcastEvent["NewMessageSent"] = "NewMessageSent";
+  BroadcastEvent["NewMessageReceived"] = "NewMessageReceived";
+  BroadcastEvent["RedirectPageRequest"] = "RedirectPageRequest";
+  BroadcastEvent["StartChat"] = "StartChat";
+  BroadcastEvent["StartChatSkippingChatButtonRendering"] = "StartChatSkippingChatButtonRendering";
+  BroadcastEvent["StartUnauthenticatedReconnectChat"] = "StartUnauthenticatedReconnectChat";
+  BroadcastEvent["InitiateEndChat"] = "InitiateEndChat";
+  BroadcastEvent["SetCustomContext"] = "SetCustomContext";
+  BroadcastEvent["ChatRetrievedFromCache"] = "ChatRetrievedFromCache";
+  BroadcastEvent["MaximizeChat"] = "MaximizeChat";
+  BroadcastEvent["ChatInitiated"] = "ChatInitiated";
+  BroadcastEvent["CloseChat"] = "CloseChat";
+  BroadcastEvent["InitiateEndChatOnBrowserUnload"] = "InitiateEndChatOnBrowserUnload";
+})(BroadcastEvent || (BroadcastEvent = {}));
+
 export let TelemetryEvent;
 
 (function (TelemetryEvent) {
@@ -70,7 +98,10 @@ export let TelemetryEvent;
   TelemetryEvent["PrechatSurveyLoaded"] = "PrechatSurveyLoaded";
   TelemetryEvent["PrechatSubmitted"] = "PrechatSubmitted";
   TelemetryEvent["StartChatSDKCall"] = "StartChatCall";
-  TelemetryEvent["EndChatSDKCall"] = "EndChatCall";
+  TelemetryEvent["StartChatEventRecevied"] = "StartChatEventReceived";
+  TelemetryEvent["EndChatSDKCall"] = "EndChatSDKCall";
+  TelemetryEvent["EndChatEventReceived"] = "EndChatEventReceived";
+  TelemetryEvent["WindowClosed"] = "WindowClosed";
   TelemetryEvent["OnNewMessageFailed"] = "OnNewMessageFailed";
   TelemetryEvent["OnNewMessageAudioNotificationFailed"] = "OnNewMessageAudioNotificationFailed";
   TelemetryEvent["DownloadTranscriptResponseNullOrUndefined"] = "DownloadTranscriptResponseNullOrUndefined";
@@ -84,6 +115,7 @@ export let TelemetryEvent;
   TelemetryEvent["LoadingPaneLoaded"] = "LoadingPaneLoaded";
   TelemetryEvent["EmailTranscriptLoaded"] = "EmailTranscriptLoaded";
   TelemetryEvent["OutOfOfficePaneLoaded"] = "OutOfOfficePaneLoaded";
+  TelemetryEvent["PostChatSurveyLoadingPaneLoaded"] = "PostChatSurveyLoadingPaneLoaded";
   TelemetryEvent["PostChatSurveyLoaded"] = "PostChatSurveyLoaded";
   TelemetryEvent["ConfirmationPaneLoaded"] = "ConfirmationPaneLoaded";
   TelemetryEvent["ProactiveChatPaneLoaded"] = "ProactiveChatPaneLoaded";
@@ -94,6 +126,8 @@ export let TelemetryEvent;
   TelemetryEvent["EmailTranscriptButtonClicked"] = "EmailTranscriptButtonClicked";
   TelemetryEvent["EmailTranscriptCancelButtonClicked"] = "EmailTranscriptCancelButtonClicked";
   TelemetryEvent["AudioToggleButtonClicked"] = "AudioToggleButtonClicked";
+  TelemetryEvent["SuppressBotMagicCodeSucceeded"] = "SuppressBotMagicCodeSucceeded";
+  TelemetryEvent["SuppressBotMagicCodeFailed"] = "SuppressBotMagicCodeFailed";
   TelemetryEvent["ProcessingHTMLTextMiddlewareFailed"] = "ProcessingHTMLTextMiddlewareFailed";
   TelemetryEvent["ProcessingSanitizationMiddlewareFailed"] = "ProcessingSanitizationMiddlewareFailed";
   TelemetryEvent["FormatTagsMiddlewareJSONStringifyFailed"] = "FormatTagsMiddlewareJSONStringifyFailed";
@@ -105,6 +139,7 @@ export let TelemetryEvent;
   TelemetryEvent["InvalidConfiguration"] = "InvalidConfiguration";
   TelemetryEvent["SendTypingIndicatorSucceeded"] = "SendTypingIndicatorSucceeded";
   TelemetryEvent["SendTypingIndicatorFailed"] = "SendTypingIndicatorFailed";
+  TelemetryEvent["WebChatEvent"] = "WebChatEvent";
   TelemetryEvent["PreChatSurveyStartChatMethodFailed"] = "PreChatSurveyStartChatMethodFailed";
   TelemetryEvent["ChatAlreadyTriggered"] = "ChatAlreadyTriggered";
   TelemetryEvent["StartProactiveChatEventReceived"] = "StartProactiveChatEventReceived";
@@ -113,12 +148,12 @@ export let TelemetryEvent;
   TelemetryEvent["ProactiveChatRejected"] = "ProactiveChatRejected";
   TelemetryEvent["IncomingProactiveChatScreenLoaded"] = "IncomingProactiveChatScreenLoaded";
   TelemetryEvent["ProactiveChatClosed"] = "ProactiveChatClosed";
-  TelemetryEvent["ProactiveChatStartChat"] = "ProactiveChatStartChat";
-  TelemetryEvent["ProactiveChatStartPopoutChat"] = "ProactiveChatStartPopoutChat";
   TelemetryEvent["ReconnectChatContinueConversation"] = "ReconnectChatContinueConversation";
   TelemetryEvent["ReconnectChatStartNewConversation"] = "ReconnectChatStartNewConversation";
   TelemetryEvent["ReconnectChatMinimize"] = "ReconnectChatMinimize";
-  TelemetryEvent["ChatWidgetStateChanged"] = "ChatWidgetStateChanged";
+  TelemetryEvent["MessageSent"] = "MessageSent";
+  TelemetryEvent["MessageReceived"] = "MessageReceived";
+  TelemetryEvent["CustomContextReceived"] = "CustomContextReceived";
 })(TelemetryEvent || (TelemetryEvent = {}));
 
 export class TelemetryConstants {
@@ -134,6 +169,7 @@ export class TelemetryConstants {
       case TelemetryEvent.LCWChatButtonShow:
       case TelemetryEvent.PrechatSurveyLoaded:
       case TelemetryEvent.LoadingPaneLoaded:
+      case TelemetryEvent.PostChatSurveyLoadingPaneLoaded:
       case TelemetryEvent.PostChatSurveyLoaded:
       case TelemetryEvent.EmailTranscriptLoaded:
       case TelemetryEvent.OutOfOfficePaneLoaded:
@@ -160,15 +196,22 @@ export class TelemetryConstants {
       case TelemetryEvent.PreChatSurveyStartChatMethodFailed:
       case TelemetryEvent.HeaderCloseButtonClicked:
       case TelemetryEvent.HeaderMinimizeButtonClicked:
+      case TelemetryEvent.MessageSent:
+      case TelemetryEvent.MessageReceived:
+      case TelemetryEvent.CustomContextReceived:
         return ScenarioType.ACTIONS;
 
       case TelemetryEvent.StartChatSDKCall:
+      case TelemetryEvent.StartChatEventRecevied:
       case TelemetryEvent.StartChatMethodException:
       case TelemetryEvent.CloseChatMethodException:
+      case TelemetryEvent.StartProactiveChatEventReceived:
       case TelemetryEvent.StartProactiveChatMethodFailed:
       case TelemetryEvent.OnNewMessageFailed:
       case TelemetryEvent.OnNewMessageAudioNotificationFailed:
       case TelemetryEvent.GetConversationDetailsCallFailed:
+      case TelemetryEvent.EndChatSDKCall:
+      case TelemetryEvent.EndChatEventReceived:
       case TelemetryEvent.EndChatSDKCallFailed:
       case TelemetryEvent.PostChatContextCallFailed:
       case TelemetryEvent.PostChatContextCallSucceed:

package/lib/esm/common/telemetry/TelemetryHelper.js

@@ -1,6 +1,6 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { ScenarioType } from "./TelemetryConstants";
+import { ScenarioType, TelemetryEvent } from "./TelemetryConstants";
 import { newGuid } from "../utils";
 import { TelemetryManager } from "./TelemetryManager";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
@@ -259,4 +259,16 @@ _defineProperty(TelemetryHelper, "logConfigDataEvent", (logLevel, payload) => {
     }
   };
   BroadcastService.postMessage(telemetryEvent);
+});
+
+_defineProperty(TelemetryHelper, "logWebChatEvent", (logLevel, payload) => {
+  const telemetryEvent = {
+    eventName: TelemetryEvent.WebChatEvent,
+    logLevel: logLevel,
+    payload: { ...payload,
+      type: TelemetryEvent.WebChatEvent,
+      scenarioType: ScenarioType.WEBCHAT
+    }
+  };
+  BroadcastService.postMessage(telemetryEvent);
 });

package/lib/esm/common/telemetry/TelemetryManager.js

@@ -4,6 +4,8 @@ import { LogLevel, ScenarioType, TelemetryConstants, TelemetryEvent } from "./Te
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ariaTelemetryLogger } from "./loggers/ariaTelemetryLogger";
 import { consoleLogger } from "./loggers/consoleLogger";
+import { defaultAriaConfig } from "./defaultConfigs/defaultAriaConfig";
+import { TelemetryHelper } from "./TelemetryHelper";
 export class TelemetryTimers {}
 
 _defineProperty(TelemetryTimers, "LcwLoadToChatButtonTimer", void 0);
@@ -26,25 +28,25 @@ export const RegisterLoggers = () => {
   const registerLoggers = () => {
     var _TelemetryManager$Int, _TelemetryManager$Int2, _TelemetryManager$Int3, _TelemetryManager$Int4, _TelemetryManager$Int5, _TelemetryManager$Int6, _TelemetryManager$Int7, _TelemetryManager$Int8;
 
-    if (!((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int !== void 0 && (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) !== null && _TelemetryManager$Int2 !== void 0 && _TelemetryManager$Int2.disableConsoleLog) || !((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int3 !== void 0 && (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) !== null && _TelemetryManager$Int4 !== void 0 && _TelemetryManager$Int4.telemetryDisabled)) {
+    if (((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) === null || _TelemetryManager$Int2 === void 0 ? void 0 : _TelemetryManager$Int2.disableConsoleLog) === false || ((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int3 === void 0 ? void 0 : (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) === null || _TelemetryManager$Int4 === void 0 ? void 0 : _TelemetryManager$Int4.telemetryDisabled) === false) {
       BroadcastService.getAnyMessage().subscribe(event => {
-        if (event.payload && event.eventName !== TelemetryEvent.ChatWidgetStateChanged) {
+        if (event.payload && event.eventName in TelemetryEvent) {
           logTelemetry(event);
         }
       });
     }
 
-    if (!((_TelemetryManager$Int5 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int5 !== void 0 && (_TelemetryManager$Int6 = _TelemetryManager$Int5.telemetryConfig) !== null && _TelemetryManager$Int6 !== void 0 && _TelemetryManager$Int6.disableConsoleLog)) {
+    if (((_TelemetryManager$Int5 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int5 === void 0 ? void 0 : (_TelemetryManager$Int6 = _TelemetryManager$Int5.telemetryConfig) === null || _TelemetryManager$Int6 === void 0 ? void 0 : _TelemetryManager$Int6.disableConsoleLog) === false) {
       loggers.push(consoleLogger());
     }
 
-    if (!((_TelemetryManager$Int7 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int7 !== void 0 && (_TelemetryManager$Int8 = _TelemetryManager$Int7.telemetryConfig) !== null && _TelemetryManager$Int8 !== void 0 && _TelemetryManager$Int8.telemetryDisabled)) {
+    if (((_TelemetryManager$Int7 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int7 === void 0 ? void 0 : (_TelemetryManager$Int8 = _TelemetryManager$Int7.telemetryConfig) === null || _TelemetryManager$Int8 === void 0 ? void 0 : _TelemetryManager$Int8.telemetryDisabled) === false) {
       var _TelemetryManager$Int9, _TelemetryManager$Int18, _TelemetryManager$Int19;
 
       if ((_TelemetryManager$Int9 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int9 !== void 0 && _TelemetryManager$Int9.ariaConfig) {
         var _TelemetryManager$Int10, _TelemetryManager$Int11, _TelemetryManager$Int12, _TelemetryManager$Int13, _TelemetryManager$Int14, _TelemetryManager$Int15, _TelemetryManager$Int16, _TelemetryManager$Int17;
 
-        loggers.push(ariaTelemetryLogger(((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : (_TelemetryManager$Int11 = _TelemetryManager$Int10.ariaConfig) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.ariaTelemetryKey) ?? "", ((_TelemetryManager$Int12 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : (_TelemetryManager$Int13 = _TelemetryManager$Int12.ariaConfig) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.disableCookieUsage) ?? false, ((_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : (_TelemetryManager$Int15 = _TelemetryManager$Int14.ariaConfig) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.collectorUriForTelemetry) ?? "", ((_TelemetryManager$Int16 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int16 === void 0 ? void 0 : (_TelemetryManager$Int17 = _TelemetryManager$Int16.ariaConfig) === null || _TelemetryManager$Int17 === void 0 ? void 0 : _TelemetryManager$Int17.ariaTelemetryApplicationName) ?? "OmniChannelProd_Web"));
+        loggers.push(ariaTelemetryLogger(((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : (_TelemetryManager$Int11 = _TelemetryManager$Int10.ariaConfig) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.ariaTelemetryKey) ?? defaultAriaConfig.ariaTelemetryKey, ((_TelemetryManager$Int12 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : (_TelemetryManager$Int13 = _TelemetryManager$Int12.ariaConfig) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.disableCookieUsage) ?? defaultAriaConfig.disableCookieUsage, ((_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : (_TelemetryManager$Int15 = _TelemetryManager$Int14.ariaConfig) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.collectorUriForTelemetry) ?? defaultAriaConfig.collectorUriForTelemetry, ((_TelemetryManager$Int16 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int16 === void 0 ? void 0 : (_TelemetryManager$Int17 = _TelemetryManager$Int16.ariaConfig) === null || _TelemetryManager$Int17 === void 0 ? void 0 : _TelemetryManager$Int17.ariaTelemetryApplicationName) ?? defaultAriaConfig.ariaTelemetryApplicationName));
       }
 
       const customLoggers = (_TelemetryManager$Int18 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int18 === void 0 ? void 0 : (_TelemetryManager$Int19 = _TelemetryManager$Int18.telemetryConfig) === null || _TelemetryManager$Int19 === void 0 ? void 0 : _TelemetryManager$Int19.telemetryLoggers;
@@ -67,8 +69,15 @@ export const RegisterLoggers = () => {
 
   const logTelemetry = telemetryEvent => {
     loggers.map(logger => {
+      var _payload;
+
       const logLevel = telemetryEvent.logLevel ?? LogLevel.INFO;
-      logger.log(logLevel, parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload));
+      const scenarioType = ((_payload = telemetryEvent.payload) === null || _payload === void 0 ? void 0 : _payload.scenarioType) ?? ScenarioType.UNDEFINED;
+      const telemetryInput = parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType);
+      telemetryInput.telemetryInfo = {
+        telemetryInfo: TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput)
+      };
+      logger.log(logLevel, telemetryInput);
     });
   };
 

package/lib/esm/common/telemetry/defaultConfigs/defaultAriaConfig.js

@@ -1,6 +1,6 @@
 export const defaultAriaConfig = {
   collectorUriForTelemetry: "",
   ariaTelemetryKey: "c7655518acf1403f93ff6b9f77942f0a-d01a02fd-6b50-4de3-a566-62eda11f93bc-7083",
-  ariaTelemetryApplicationName: "",
+  ariaTelemetryApplicationName: "D365_Omnichannel_Client_Public_Prod",
   disableCookieUsage: true
 };

package/lib/esm/common/telemetry/defaultConfigs/defaultTelemetryConfiguration.js

@@ -3,5 +3,8 @@ export const defaultTelemetryConfiguration = {
   telemetryDisabled: false,
   disableConsoleLog: false,
   telemetryLoggers: [],
-  ariaConfigurations: defaultAriaConfig
+  ariaConfigurations: defaultAriaConfig,
+  chatWidgetVersion: "0.0.0-0",
+  chatComponentVersion: "0.0.0-0",
+  OCChatSDKVersion: "0.0.0-0"
 };

package/lib/esm/common/telemetry/loggers/ariaTelemetryLogger.js

@@ -1,9 +1,9 @@
-import { isNullOrEmptyString, isNullOrUndefined } from "../../utils";
+import { getDomain, isNullOrEmptyString, isNullOrUndefined } from "../../utils";
 import AWTEventProperties from "@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AWTEventProperties";
 import AWTLogManager from "@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AWTLogManager";
 import { AWTPiiKind } from "@microsoft/omnichannel-chat-sdk/lib/external/aria/common/Enums";
-import { Constants } from "../../Constants";
-import { TelemetryHelper } from "../TelemetryHelper";
+import { Constants, AriaTelemetryConstants, EnvironmentVersion } from "../../Constants";
+import { TelemetryManager } from "../TelemetryManager";
 export const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUriForTelemetry, ariaTelemetryApplicationName) => {
   let _logger;
 
@@ -15,6 +15,21 @@ export const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, colle
 
       if (!isNullOrEmptyString(collectiorUriForTelemetry)) {
         configuration.collectorUri = collectiorUriForTelemetry;
+      } else {
+        if (TelemetryManager.InternalTelemetryData.environmentVersion == EnvironmentVersion.prod) {
+          var _TelemetryManager$Int;
+
+          const orgUrl = (_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.orgUrl;
+
+          if (!isNullOrUndefined(orgUrl)) {
+            // If the given org is a Production EU org, modify the Aria collector uri
+            const region = getDomain(orgUrl);
+
+            if (region === AriaTelemetryConstants.EU) {
+              configuration.collectorUri = AriaTelemetryConstants.EUROPE_ENDPOINT;
+            }
+          }
+        }
       }
 
       try {
@@ -33,18 +48,25 @@ export const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, colle
 
   const ariaLogger = {
     log: (logLevel, telemetryInput) => {
-      let property;
-      const eventProperties = new AWTEventProperties();
-      const event = TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput);
-      eventProperties.setName(telemetryInput.scenarioType);
-
-      for (const key of Object.keys(event)) {
-        property = typeof event[key] === "object" ? JSON.stringify(event[key]) : event[key];
-        eventProperties.setProperty(key, property);
-      }
+      try {
+        let property;
+        const telemetryInfo = telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo;
+        const eventProperties = new AWTEventProperties();
+        eventProperties.setName(telemetryInput.scenarioType);
 
-      eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, Constants.LiveChatWidget, AWTPiiKind.GenericData);
-      logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
+        if (telemetryInfo) {
+          for (const key of Object.keys(telemetryInfo)) {
+            property = typeof telemetryInfo[key] === "object" ? JSON.stringify(telemetryInfo[key]) : telemetryInfo[key];
+            eventProperties.setProperty(key, property);
+          }
+
+          eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, Constants.LiveChatWidget, AWTPiiKind.GenericData);
+        }
+
+        logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
+      } catch (error) {
+        console.error("Error in logging telemetry to Aria logger:" + error);
+      }
     },
     dispose: () => {
       AWTLogManager.flush(function () {

package/lib/esm/common/telemetry/loggers/consoleLogger.js

@@ -4,27 +4,28 @@ export const consoleLogger = () => {
   const consoleLogger = {
     log: (logLevel, telemetryInput) => {
       const payload = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.payload && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload : "";
+      const telemetryInfo = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.telemetryInfo && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo : "";
 
       try {
         switch (logLevel) {
           case LogLevel.INFO:
-            console.info(Constants.LiveChatWidget, payload);
+            console.info(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case LogLevel.DEBUG:
-            console.debug(Constants.LiveChatWidget, payload);
+            console.debug(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case LogLevel.WARN:
-            console.warn(Constants.LiveChatWidget, payload);
+            console.warn(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case LogLevel.ERROR:
-            console.error(Constants.LiveChatWidget, payload);
+            console.error(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           default:
-            console.debug(Constants.LiveChatWidget, payload);
+            console.debug(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
         }
       } catch (ex) {