@microsoft/omnichannel-chat-widget 0.1.0-main.7a3ed6a → 0.1.0-main.7b290a7

package/lib/esm/components/livechatwidget/common/startChat.js

@@ -1,65 +1,80 @@
+import { ChatSDKError, Constants } from "../../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { ChatSDKError } from "../../../common/Constants";
 import { ConversationState } from "../../../contexts/common/ConversationState";
+import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { NotificationHandler } from "../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
 import { NotificationScenarios } from "../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import { createAdapter } from "./createAdapter";
+import { createOnNewAdapterActivityHandler } from "../../../plugins/newMessageEventHandler";
 import { createTimer } from "../../../common/utils";
-import { getReconnectIdForAuthenticatedChat } from "./reconnectChatHelper";
-import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry";
-import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { getReconnectIdForAuthenticatedChat, handleRedirectUnauthenticatedReconnectChat } from "./reconnectChatHelper";
+import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey";
+import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  // Getting PreChat Survey Context
-  const parseToJson = false;
-  const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
-  const showPrechat = state.appStates.conversationState === ConversationState.ProactiveChat ? preChatSurveyResponse && state.appStates.proactiveChatStates.proactiveChatEnablePrechat : preChatSurveyResponse; // Getting reconnectId for authenticated chat
+  var _props$reconnectChatP;
 
-  const reconnectId = await getReconnectIdForAuthenticatedChat(props, chatSDK);
+  if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
+    return;
+  } // Redirecting if unauthenticated reconnect chat expired
 
-  if (reconnectId) {
-    dispatch({
-      type: LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: reconnectId
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.ReconnectChat
-    });
-  } else if (showPrechat) {
-    dispatch({
-      type: LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
-      payload: preChatSurveyResponse
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Prechat
-    });
+
+  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.reconnectId) {
+    var _props$reconnectChatP2, _props$reconnectChatP3;
+
+    await handleRedirectUnauthenticatedReconnectChat(chatSDK, dispatch, setAdapter, initStartChat, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, (_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.redirectInSameWindow);
   } else {
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Loading
-    });
-    await initStartChat(chatSDK, dispatch, setAdapter);
+    // Getting PreChat Survey Context
+    const parseToJson = false;
+    const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
+    const showPrechat = state.appStates.conversationState === ConversationState.ProactiveChat ? preChatSurveyResponse && state.appStates.proactiveChatStates.proactiveChatEnablePrechat : preChatSurveyResponse; // Getting reconnectId for authenticated chat
+
+    const reconnectId = await getReconnectIdForAuthenticatedChat(props, chatSDK);
+
+    if (reconnectId) {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+        payload: reconnectId
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.ReconnectChat
+      });
+    } else if (showPrechat) {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
+        payload: preChatSurveyResponse
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.Prechat
+      });
+    } else {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.Loading
+      });
+      await initStartChat(chatSDK, dispatch, setAdapter);
+    }
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
+const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedState) => {
   try {
-    var _TelemetryTimers$Widg;
+    var _newAdapter$activity$, _TelemetryTimers$Widg;
 
     try {
-      TelemetryHelper.logConfigDataEvent(LogLevel.INFO, {
+      TelemetryTimers.WidgetLoadTimer = createTimer();
+      TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartChatSDKCall
       });
       await chatSDK.startChat(params);
-      TelemetryTimers.WidgetLoadTimer = createTimer();
     } catch (error) {
-      TelemetryHelper.logLoadingEvent(LogLevel.ERROR, {
+      TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.StartChatMethodException,
         ExceptionDetails: {
           exception: `Failed to setup startChat: ${error}`
@@ -68,24 +83,42 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
     }
 
     const newAdapter = await createAdapter(chatSDK);
-    setAdapter(newAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    setAdapter(newAdapter);
+    const chatToken = await chatSDK.getChatToken();
+    newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe(createOnNewAdapterActivityHandler(chatToken === null || chatToken === void 0 ? void 0 : chatToken.chatId, chatToken === null || chatToken === void 0 ? void 0 : chatToken.visitorId));
 
-    if (chatSDK !== null && chatSDK !== void 0 && chatSDK.getVoiceVideoCalling) {
+    if (!persistedState) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const chatToken = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatToken());
+      if (chatSDK !== null && chatSDK !== void 0 && chatSDK.getVoiceVideoCalling) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const chatToken = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatToken());
+        dispatch({
+          type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+          payload: chatToken
+        });
+      } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+      const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
       dispatch({
-        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: chatToken
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: liveChatContext
       });
-    }
+      await setPostChatContextAndLoadSurvey(chatSDK, dispatch);
+      await updateSessionDataForTelemetry(chatSDK, dispatch); // Set app state to Active
 
-    await setPostChatContextAndLoadSurvey(chatSDK, dispatch, false);
-    await updateSessionDataForTelemetry(chatSDK, dispatch); // Set app state to Active
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.Active
+      });
+    } else {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_WIDGET_STATE,
+        payload: persistedState
+      });
+      await setPostChatContextAndLoadSurvey(chatSDK, dispatch, true);
+    }
 
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Active
-    });
     TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
       Event: TelemetryEvent.WidgetLoadComplete,
       Description: "Widget load complete",
@@ -93,9 +126,9 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
     });
   } catch (ex) {
     TelemetryHelper.logLoadingEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.StartChatFailed,
+      Event: TelemetryEvent.WidgetLoadFailed,
       ExceptionDetails: {
-        Exception: `Start Chat Failed: ${ex}`
+        Exception: `Widget load Failed: ${ex}`
       }
     });
     NotificationHandler.notifyError(NotificationScenarios.Connection, "Start Chat Failed: " + ex); // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -111,6 +144,30 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
       });
     }
   }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
+  var _DataStoreManager$cli, _persistedState$domai;
+
+  const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(Constants.widgetStateDataKey, "localStorage");
+  const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
+
+  if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai = persistedState.domainStates) !== null && _persistedState$domai !== void 0 && _persistedState$domai.liveChatContext) {
+    var _persistedState$domai2;
+
+    dispatch({
+      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: ConversationState.Loading
+    });
+    const optionalParams = {
+      liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai2 = persistedState.domainStates) === null || _persistedState$domai2 === void 0 ? void 0 : _persistedState$domai2.liveChatContext
+    };
+    await initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
+    return true;
+  } else {
+    return false;
+  }
 };
 
 export { prepareStartChat, initStartChat };

package/lib/esm/components/livechatwidget/common/startProactiveChat.js

@@ -2,14 +2,14 @@ import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryCon
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager"; // Defines startProactiveChat callback
-
-export const startProactiveChat = (dispatch, bodyTitle, showPrechat, inNewWindow) => {
+import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
+// Defines startProactiveChat callback
+export const startProactiveChat = (dispatch, notificationConfig, enablePreChat, inNewWindow) => {
   dispatch({
     type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
     payload: {
-      proactiveChatBodyTitle: bodyTitle ?? "",
-      proactiveChatEnablePrechat: showPrechat ?? false,
+      proactiveChatBodyTitle: notificationConfig && notificationConfig.message ? notificationConfig.message : "",
+      proactiveChatEnablePrechat: enablePreChat ?? false,
       proactiveChatInNewWindow: inNewWindow ?? false
     }
   });

package/lib/esm/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js

@@ -1,10 +1,11 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { BroadcastService, decodeComponentString } from "@microsoft/omnichannel-chat-components";
 import { Stack } from "@fluentui/react";
 import React, { useEffect, useRef, useState } from "react";
 import { createTimer, getLocaleDirection } from "../../../common/utils";
-import { getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat } from "../common/reconnectChatHelper";
+import { getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat, startUnauthenticatedReconnectChat } from "../common/reconnectChatHelper";
 import { initStartChat, prepareStartChat } from "../common/startChat";
 import { shouldShowCallingContainer, shouldShowChatButton, shouldShowConfirmationPane, shouldShowEmailTranscriptPane, shouldShowHeader, shouldShowLoadingPane, shouldShowOutOfOfficeHoursPane, shouldShowPostChatLoadingPane, shouldShowPostChatSurveyPane, shouldShowPreChatSurveyPane, shouldShowProactiveChatPane, shouldShowReconnectChatPane, shouldShowWebChatContainer } from "../../../controller/componentController";
 import CallingContainerStateful from "../../callingcontainerstateful/CallingContainerStateful";
@@ -12,6 +13,7 @@ import ChatButtonStateful from "../../chatbuttonstateful/ChatButtonStateful";
 import { Components } from "botframework-webchat";
 import ConfirmationPaneStateful from "../../confirmationpanestateful/ConfirmationPaneStateful";
 import { ConversationState } from "../../../contexts/common/ConversationState";
+import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
 import { ElementType } from "@microsoft/omnichannel-chat-components";
 import EmailTranscriptPaneStateful from "../../emailtranscriptpanestateful/EmailTranscriptPaneStateful";
 import HeaderStateful from "../../headerstateful/HeaderStateful";
@@ -23,12 +25,14 @@ import PostChatSurveyPaneStateful from "../../postchatsurveypanestateful/PostCha
 import PreChatSurveyPaneStateful from "../../prechatsurveypanestateful/PreChatSurveyPaneStateful";
 import ProactiveChatPaneStateful from "../../proactivechatpanestateful/ProactiveChatPaneStateful";
 import ReconnectChatPaneStateful from "../../reconnectchatpanestateful/ReconnectChatPaneStateful";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import WebChatContainerStateful from "../../webchatcontainerstateful/WebChatContainerStateful";
 import { createFooter } from "../common/createFooter";
 import { createInternetConnectionChangeHandler } from "../common/createInternetConnectionChangeHandler";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
-import { endChat } from "../common/endChat";
+import { disposeTelemetryLoggers } from "../common/disposeTelemetryLoggers";
+import { endChat, prepareEndChat } from "../common/endChat";
 import { getGeneralStylesForButton } from "../common/getGeneralStylesForButton";
 import { initCallingSdk } from "../common/initCallingSdk";
 import { initConfirmationPropsComposer } from "../common/initConfirmationPropsComposer";
@@ -40,7 +44,7 @@ import useChatAdapterStore from "../../../hooks/useChatAdapterStore";
 import useChatContextStore from "../../../hooks/useChatContextStore";
 import useChatSDKStore from "../../../hooks/useChatSDKStore";
 export const LiveChatWidgetStateful = props => {
-  var _props$webChatContain, _props$styleProps, _props$controlProps, _props$webChatContain3, _props$webChatContain4, _props$styleProps2, _props$controlProps5, _props$componentOverr, _props$controlProps6, _props$componentOverr2, _props$controlProps7, _props$componentOverr3, _props$controlProps8, _props$componentOverr4, _props$controlProps9, _props$componentOverr5, _props$controlProps10, _props$componentOverr6, _props$controlProps11, _props$controlProps12, _props$controlProps13, _props$componentOverr7, _props$controlProps14, _props$componentOverr8, _props$controlProps15, _props$componentOverr9, _props$componentOverr10, _props$componentOverr11;
+  var _props$webChatContain, _props$styleProps, _props$controlProps, _props$webChatContain3, _props$webChatContain4, _props$styleProps2, _props$controlProps5, _props$componentOverr, _props$controlProps6, _props$componentOverr2, _props$controlProps7, _props$componentOverr3, _props$controlProps8, _props$componentOverr4, _props$controlProps9, _props$componentOverr5, _props$controlProps10, _props$componentOverr6, _props$controlProps11, _props$componentOverr7, _props$controlProps12, _props$controlProps13, _props$componentOverr8, _props$controlProps14, _props$componentOverr9, _props$controlProps15, _props$componentOverr10, _props$componentOverr11, _props$componentOverr12;
 
   const [state, dispatch] = useChatContextStore(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
@@ -49,12 +53,14 @@ export const LiveChatWidgetStateful = props => {
     ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
   }); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-  const chatSDK = useChatSDKStore();
+  const chatSDK = useChatSDKStore(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   const [voiceVideoCallingSDK, setVoiceVideoCallingSDK] = useState(undefined);
   const {
     Composer
   } = Components;
-  const canStartProactiveChat = useRef(true); // Process general styles
+  const canStartProactiveChat = useRef(true);
+  const canEndChat = useRef(true); // Process general styles
 
   const generalStyles = {
     root: Object.assign({}, getGeneralStylesForButton(state), (_props$styleProps = props.styleProps) === null || _props$styleProps === void 0 ? void 0 : _props$styleProps.generalStyles)
@@ -67,6 +73,7 @@ export const LiveChatWidgetStateful = props => {
 
     registerTelemetryLoggers(props, dispatch);
     createInternetConnectionChangeHandler();
+    DataStoreManager.clientDataStore = props.contextDataStore ?? undefined;
     dispatch({
       type: LiveChatWidgetActionType.SET_WIDGET_ELEMENT_ID,
       payload: widgetElementId
@@ -75,6 +82,10 @@ export const LiveChatWidgetStateful = props => {
       type: LiveChatWidgetActionType.SET_SKIP_CHAT_BUTTON_RENDERING,
       payload: ((_props$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.skipChatButtonRendering) || false
     });
+    dispatch({
+      type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
+      payload: false
+    });
     initCallingSdk(chatSDK, setVoiceVideoCallingSDK).then(sdkCreated => {
       sdkCreated && dispatch({
         type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
@@ -85,7 +96,7 @@ export const LiveChatWidgetStateful = props => {
     if (!((_props$controlProps3 = props.controlProps) !== null && _props$controlProps3 !== void 0 && _props$controlProps3.skipChatButtonRendering) && (_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.reconnectId) {
       var _props$reconnectChatP2;
 
-      handleUnauthenticatedReconnectChat(dispatch, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, initStartChat);
+      startUnauthenticatedReconnectChat(chatSDK, dispatch, setAdapter, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, initStartChat);
     } // Initialize global dir
 
 
@@ -95,13 +106,11 @@ export const LiveChatWidgetStateful = props => {
       payload: globalDir
     });
 
-    if ((_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.chatToken) {
+    if ((_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.liveChatContext) {
       var _state$domainStates2;
 
       const optionalParams = {
-        liveChatContext: {
-          chatToken: (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : _state$domainStates2.chatToken
-        }
+        liveChatContext: (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : _state$domainStates2.liveChatContext
       };
       initStartChat(chatSDK, dispatch, setAdapter, optionalParams);
     }
@@ -111,9 +120,9 @@ export const LiveChatWidgetStateful = props => {
       var _props$reconnectChatP3;
 
       if ((_props$reconnectChatP3 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP3 !== void 0 && _props$reconnectChatP3.reconnectId && !state.appStates.reconnectId) {
-        var _props$reconnectChatP4;
+        var _props$reconnectChatP4, _props$reconnectChatP5;
 
-        handleUnauthenticatedReconnectChat(dispatch, (_props$reconnectChatP4 = props.reconnectChatPaneProps) === null || _props$reconnectChatP4 === void 0 ? void 0 : _props$reconnectChatP4.reconnectId, initStartChat);
+        handleUnauthenticatedReconnectChat(chatSDK, dispatch, setAdapter, (_props$reconnectChatP4 = props.reconnectChatPaneProps) === null || _props$reconnectChatP4 === void 0 ? void 0 : _props$reconnectChatP4.reconnectId, initStartChat, (_props$reconnectChatP5 = props.reconnectChatPaneProps) === null || _props$reconnectChatP5 === void 0 ? void 0 : _props$reconnectChatP5.redirectInSameWindow);
       } else {
         getReconnectIdForAuthenticatedChat(props, chatSDK).then(authReconnectId => {
           if (authReconnectId && !state.appStates.reconnectId) {
@@ -126,6 +135,10 @@ export const LiveChatWidgetStateful = props => {
               payload: ConversationState.ReconnectChat
             });
           } else {
+            const chatStartedSkippingChatButtonRendering = {
+              eventName: BroadcastEvent.StartChatSkippingChatButtonRendering
+            };
+            BroadcastService.postMessage(chatStartedSkippingChatButtonRendering);
             dispatch({
               type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
               payload: ConversationState.Loading
@@ -137,29 +150,87 @@ export const LiveChatWidgetStateful = props => {
     }
   }, [state.appStates.skipChatButtonRendering]);
   useEffect(() => {
+    // Add the custom context on receiving the SetCustomContext event
+    BroadcastService.getMessageByEventName(BroadcastEvent.SetCustomContext).subscribe(msg => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.CustomContextReceived,
+        Description: "CustomContext received."
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
+        payload: msg === null || msg === void 0 ? void 0 : msg.payload
+      });
+    });
     BroadcastService.getMessageByEventName("StartProactiveChat").subscribe(msg => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.StartProactiveChatEventReceived,
+        Description: "Start proactive chat event received."
+      });
+
       if (canStartProactiveChat.current) {
         var _msg$payload, _msg$payload2, _msg$payload3;
 
-        startProactiveChat(dispatch, msg === null || msg === void 0 ? void 0 : (_msg$payload = msg.payload) === null || _msg$payload === void 0 ? void 0 : _msg$payload.bodyTitle, msg === null || msg === void 0 ? void 0 : (_msg$payload2 = msg.payload) === null || _msg$payload2 === void 0 ? void 0 : _msg$payload2.showPrechat, msg === null || msg === void 0 ? void 0 : (_msg$payload3 = msg.payload) === null || _msg$payload3 === void 0 ? void 0 : _msg$payload3.inNewWindow);
+        startProactiveChat(dispatch, msg === null || msg === void 0 ? void 0 : (_msg$payload = msg.payload) === null || _msg$payload === void 0 ? void 0 : _msg$payload.notificationConfig, msg === null || msg === void 0 ? void 0 : (_msg$payload2 = msg.payload) === null || _msg$payload2 === void 0 ? void 0 : _msg$payload2.enablePreChat, msg === null || msg === void 0 ? void 0 : (_msg$payload3 = msg.payload) === null || _msg$payload3 === void 0 ? void 0 : _msg$payload3.inNewWindow);
+      } else {
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.ChatAlreadyTriggered,
+          Description: "Start proactive chat method called, when chat was already triggered."
+        });
+      }
+    }); // start chat from SDK Event
+
+    BroadcastService.getMessageByEventName("StartChat").subscribe(() => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.StartChatEventRecevied,
+        Description: "Start chat event received."
+      });
+
+      if (state.appStates.isMinimized) {
+        dispatch({
+          type: LiveChatWidgetActionType.SET_MINIMIZED,
+          payload: false
+        });
+      } else {
+        prepareStartChat(props, chatSDK, state, dispatch, setAdapter);
+      }
+    }); // end chat from SDK Event
+
+    BroadcastService.getMessageByEventName("EndChat").subscribe(async () => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.EndChatEventReceived,
+        Description: "End chat event received."
+      });
+
+      if (canEndChat.current) {
+        prepareEndChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
+      } else {
+        const skipEndChatSDK = true;
+        const skipCloseChat = false;
+        endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
       }
     });
+    window.addEventListener("beforeunload", () => {
+      disposeTelemetryLoggers();
+    });
+
+    if (state.appStates.conversationEndedByAgent) {
+      endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
+    }
   }, []);
   useEffect(() => {
-    if (state.appStates.conversationState !== ConversationState.Closed) {
-      canStartProactiveChat.current = false;
-    }
+    canStartProactiveChat.current = state.appStates.conversationState === ConversationState.Closed;
+    canEndChat.current = state.appStates.conversationState === ConversationState.Active;
 
     if (state.appStates.conversationState === ConversationState.Active) {
       chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.onNewMessage(() => {
         BroadcastService.postMessage({
-          eventName: "NewMessageNotification"
+          eventName: BroadcastEvent.NewMessageNotification
         });
       });
     } // Track the message count
 
 
-    if (state.appStates.conversationState == ConversationState.Active) {
+    if (state.appStates.conversationState === ConversationState.Active) {
       chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.onNewMessage(() => {
         currentMessageCountRef.current++;
         dispatch({
@@ -178,7 +249,7 @@ export const LiveChatWidgetStateful = props => {
     });
     const customEvent = {
       elementType: ElementType.Custom,
-      eventName: "UnreadMessageCount",
+      eventName: BroadcastEvent.UnreadMessageCount,
       payload: 0
     };
     BroadcastService.postMessage(customEvent);
@@ -188,7 +259,7 @@ export const LiveChatWidgetStateful = props => {
     if (state.appStates.isMinimized && state.appStates.unreadMessageCount > 0) {
       const customEvent = {
         elementType: ElementType.Custom,
-        eventName: "UnreadMessageCount",
+        eventName: BroadcastEvent.UnreadMessageCount,
         payload: `${state.appStates.unreadMessageCount}`
       };
       BroadcastService.postMessage(customEvent);
@@ -203,23 +274,29 @@ export const LiveChatWidgetStateful = props => {
   }, [(_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles]);
   const webChatProps = initWebChatComposer(props, chatSDK, state, dispatch, setWebChatStyles);
 
-  const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch, true);
+  const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-  const endChatRelay = () => endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
+
+  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat) => endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+  const prepareEndChatRelay = (adapter, state) => prepareEndChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
 
   const prepareStartChatRelay = () => prepareStartChat(props, chatSDK, state, dispatch, setAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-  const initStartChatRelay = optionalParams => initStartChat(chatSDK, dispatch, setAdapter, optionalParams);
+  const initStartChatRelay = (optionalParams, persistedState) => initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
 
   const confirmationPaneProps = initConfirmationPropsComposer(props); // publish chat widget state
 
-  const chatWidgetStateChangeEvent = {
-    eventName: "ChatWidgetStateChanged",
-    payload: { ...state
-    }
-  };
-  BroadcastService.postMessage(chatWidgetStateChangeEvent);
+  useEffect(() => {
+    const chatWidgetStateChangeEvent = {
+      eventName: BroadcastEvent.ChatWidgetStateChanged,
+      payload: { ...state
+      }
+    };
+    BroadcastService.postMessage(chatWidgetStateChangeEvent);
+  }, [state]);
   return /*#__PURE__*/React.createElement(Composer, _extends({}, webChatProps, {
     styleOptions: webChatStyles,
     directLine: ((_props$webChatContain4 = props.webChatContainerProps) === null || _props$webChatContain4 === void 0 ? void 0 : _props$webChatContain4.directLine) ?? adapter ?? defaultWebChatContainerStatefulProps.directLine
@@ -241,14 +318,14 @@ export const LiveChatWidgetStateful = props => {
   })), !((_props$controlProps8 = props.controlProps) !== null && _props$controlProps8 !== void 0 && _props$controlProps8.hideLoadingPane) && shouldShowLoadingPane(state) && (decodeComponentString((_props$componentOverr4 = props.componentOverrides) === null || _props$componentOverr4 === void 0 ? void 0 : _props$componentOverr4.loadingPane) || /*#__PURE__*/React.createElement(LoadingPaneStateful, props.loadingPaneProps)), !((_props$controlProps9 = props.controlProps) !== null && _props$controlProps9 !== void 0 && _props$controlProps9.hideOutOfOfficeHoursPane) && shouldShowOutOfOfficeHoursPane(state) && (decodeComponentString((_props$componentOverr5 = props.componentOverrides) === null || _props$componentOverr5 === void 0 ? void 0 : _props$componentOverr5.outOfOfficeHoursPane) || /*#__PURE__*/React.createElement(OutOfOfficeHoursPaneStateful, props.outOfOfficeHoursPaneProps)), !((_props$controlProps10 = props.controlProps) !== null && _props$controlProps10 !== void 0 && _props$controlProps10.hideReconnectChatPane) && shouldShowReconnectChatPane(state) && (decodeComponentString((_props$componentOverr6 = props.componentOverrides) === null || _props$componentOverr6 === void 0 ? void 0 : _props$componentOverr6.reconnectChatPane) || /*#__PURE__*/React.createElement(ReconnectChatPaneStateful, {
     reconnectChatProps: props.reconnectChatPaneProps,
     initStartChat: initStartChatRelay
-  })), !((_props$controlProps11 = props.controlProps) !== null && _props$controlProps11 !== void 0 && _props$controlProps11.hidePreChatSurveyPane) && shouldShowPreChatSurveyPane(state) && /*#__PURE__*/React.createElement(PreChatSurveyPaneStateful, {
+  })), !((_props$controlProps11 = props.controlProps) !== null && _props$controlProps11 !== void 0 && _props$controlProps11.hidePreChatSurveyPane) && shouldShowPreChatSurveyPane(state) && (decodeComponentString((_props$componentOverr7 = props.componentOverrides) === null || _props$componentOverr7 === void 0 ? void 0 : _props$componentOverr7.preChatSurveyPane) || /*#__PURE__*/React.createElement(PreChatSurveyPaneStateful, {
     surveyProps: props.preChatSurveyPaneProps,
     initStartChat: initStartChatRelay
-  }), !((_props$controlProps12 = props.controlProps) !== null && _props$controlProps12 !== void 0 && _props$controlProps12.hideCallingContainer) && shouldShowCallingContainer(state) && /*#__PURE__*/React.createElement(CallingContainerStateful, _extends({
+  })), !((_props$controlProps12 = props.controlProps) !== null && _props$controlProps12 !== void 0 && _props$controlProps12.hideCallingContainer) && shouldShowCallingContainer(state) && /*#__PURE__*/React.createElement(CallingContainerStateful, _extends({
     voiceVideoCallingSdk: voiceVideoCallingSDK
-  }, props.callingContainerProps)), !((_props$controlProps13 = props.controlProps) !== null && _props$controlProps13 !== void 0 && _props$controlProps13.hideWebChatContainer) && shouldShowWebChatContainer(state) && (decodeComponentString((_props$componentOverr7 = props.componentOverrides) === null || _props$componentOverr7 === void 0 ? void 0 : _props$componentOverr7.webChatContainer) || /*#__PURE__*/React.createElement(WebChatContainerStateful, props.webChatContainerProps)), !((_props$controlProps14 = props.controlProps) !== null && _props$controlProps14 !== void 0 && _props$controlProps14.hideConfirmationPane) && shouldShowConfirmationPane(state) && (decodeComponentString((_props$componentOverr8 = props.componentOverrides) === null || _props$componentOverr8 === void 0 ? void 0 : _props$componentOverr8.confirmationPane) || /*#__PURE__*/React.createElement(ConfirmationPaneStateful, _extends({}, confirmationPaneProps, {
+  }, props.callingContainerProps)), !((_props$controlProps13 = props.controlProps) !== null && _props$controlProps13 !== void 0 && _props$controlProps13.hideWebChatContainer) && shouldShowWebChatContainer(state) && (decodeComponentString((_props$componentOverr8 = props.componentOverrides) === null || _props$componentOverr8 === void 0 ? void 0 : _props$componentOverr8.webChatContainer) || /*#__PURE__*/React.createElement(WebChatContainerStateful, props.webChatContainerProps)), !((_props$controlProps14 = props.controlProps) !== null && _props$controlProps14 !== void 0 && _props$controlProps14.hideConfirmationPane) && shouldShowConfirmationPane(state) && (decodeComponentString((_props$componentOverr9 = props.componentOverrides) === null || _props$componentOverr9 === void 0 ? void 0 : _props$componentOverr9.confirmationPane) || /*#__PURE__*/React.createElement(ConfirmationPaneStateful, _extends({}, confirmationPaneProps, {
     setPostChatContext: setPostChatContextRelay,
-    endChat: endChatRelay
-  }))), !((_props$controlProps15 = props.controlProps) !== null && _props$controlProps15 !== void 0 && _props$controlProps15.hidePostChatLoadingPane) && shouldShowPostChatLoadingPane(state) && (decodeComponentString((_props$componentOverr9 = props.componentOverrides) === null || _props$componentOverr9 === void 0 ? void 0 : _props$componentOverr9.postChatLoadingPane) || /*#__PURE__*/React.createElement(PostChatLoadingPaneStateful, props.postChatLoadingPaneProps)), shouldShowPostChatSurveyPane(state) && (decodeComponentString((_props$componentOverr10 = props.componentOverrides) === null || _props$componentOverr10 === void 0 ? void 0 : _props$componentOverr10.postChatSurveyPane) || /*#__PURE__*/React.createElement(PostChatSurveyPaneStateful, _extends({}, props.postChatSurveyPaneProps, props.chatSDK))), createFooter(props, state), shouldShowEmailTranscriptPane(state) && (decodeComponentString((_props$componentOverr11 = props.componentOverrides) === null || _props$componentOverr11 === void 0 ? void 0 : _props$componentOverr11.emailTranscriptPane) || /*#__PURE__*/React.createElement(EmailTranscriptPaneStateful, props.emailTranscriptPane))));
+    prepareEndChat: prepareEndChatRelay
+  }))), !((_props$controlProps15 = props.controlProps) !== null && _props$controlProps15 !== void 0 && _props$controlProps15.hidePostChatLoadingPane) && shouldShowPostChatLoadingPane(state) && (decodeComponentString((_props$componentOverr10 = props.componentOverrides) === null || _props$componentOverr10 === void 0 ? void 0 : _props$componentOverr10.postChatLoadingPane) || /*#__PURE__*/React.createElement(PostChatLoadingPaneStateful, props.postChatLoadingPaneProps)), shouldShowPostChatSurveyPane(state) && (decodeComponentString((_props$componentOverr11 = props.componentOverrides) === null || _props$componentOverr11 === void 0 ? void 0 : _props$componentOverr11.postChatSurveyPane) || /*#__PURE__*/React.createElement(PostChatSurveyPaneStateful, _extends({}, props.postChatSurveyPaneProps, props.chatSDK))), createFooter(props, state), shouldShowEmailTranscriptPane(state) && (decodeComponentString((_props$componentOverr12 = props.componentOverrides) === null || _props$componentOverr12 === void 0 ? void 0 : _props$componentOverr12.emailTranscriptPane) || /*#__PURE__*/React.createElement(EmailTranscriptPaneStateful, props.emailTranscriptPane))));
 };
 export default LiveChatWidgetStateful;

package/lib/esm/components/loadingpanestateful/LoadingPaneStateful.js

@@ -26,7 +26,7 @@ export const LoadingPaneStateful = props => {
       firstElement[0].focus();
     }
 
-    TelemetryHelper.logActionEvent(LogLevel.INFO, {
+    TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
       Event: TelemetryEvent.LoadingPaneLoaded,
       Description: "Loading pane loaded."
     });

package/lib/esm/components/ooohpanestateful/OOOHPaneStateful.js

@@ -1,5 +1,7 @@
+import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect } from "react";
 import { OutOfOfficeHoursPane } from "@microsoft/omnichannel-chat-components";
+import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
 import { defaultGeneralStyleProps } from "./common/defaultStyleProps/defaultgeneralOOOHPaneStyleProps";
 import { findAllFocusableElement } from "../../common/utils";
 import useChatContextStore from "../../hooks/useChatContextStore";
@@ -23,6 +25,10 @@ export const OutOfOfficeHoursPaneStateful = props => {
     if (firstElement && firstElement[0]) {
       firstElement[0].focus();
     }
+
+    TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.OutOfOfficePaneLoaded
+    });
   }, []);
   return /*#__PURE__*/React.createElement(OutOfOfficeHoursPane, {
     componentOverrides: props.componentOverrides,

package/lib/esm/components/postchatloadingpanestateful/PostChatLoadingPaneStateful.js

@@ -3,6 +3,8 @@ import { LoadingPane } from "@microsoft/omnichannel-chat-components";
 import { defaultGeneralPostChatLoadingPaneStyleProps } from "./common/defaultgeneralPostChatLoadingPaneStyleProps";
 import { findAllFocusableElement } from "../../common/utils";
 import useChatContextStore from "../../hooks/useChatContextStore";
+import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
+import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 export const PostChatLoadingPaneStateful = props => {
   var _props$styleProps;
 
@@ -28,6 +30,10 @@ export const PostChatLoadingPaneStateful = props => {
     if (firstElement && firstElement[0]) {
       firstElement[0].focus();
     }
+
+    TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.PostChatSurveyLoadingPaneLoaded
+    });
   }, []);
   return /*#__PURE__*/React.createElement(LoadingPane, {
     componentOverrides: props.componentOverrides,