@microsoft/omnichannel-chat-widget 1.4.0 → 1.4.1-main.9bf5e75

package/lib/cjs/components/livechatwidget/common/endChat.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.prepareEndChat = exports.endVoiceVideoCallIfOngoing = exports.endChat = void 0;
+exports.prepareEndChat = exports.endVoiceVideoCallIfOngoing = exports.endChatStateCleanUp = exports.endChat = exports.closeChatStateCleanUp = exports.callingStateCleanUp = void 0;
 var _Constants = require("../../../common/Constants");
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 var _authHelper = require("./authHelper");
@@ -15,8 +15,9 @@ var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidget
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 var _WebChatStoreLoader = require("../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader");
 var _defaultWebChatContainerStatefulProps = require("../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps");
+var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid) => {
+const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter) => {
   try {
     var _conversationDetails$, _state$domainStates, _state$domainStates2;
     // Use Case: If call is ongoing, end the call by simulating end call button click
@@ -28,7 +29,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
       var _state$appStates;
       // If ended by customer, just close chat
       if ((state === null || state === void 0 ? void 0 : (_state$appStates = state.appStates) === null || _state$appStates === void 0 ? void 0 : _state$appStates.conversationEndedBy) === _Constants.ConversationEndEntity.Customer) {
-        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
+        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
       }
       // Use Case: If ended by Agent, stay chat in InActive state
       return;
@@ -51,7 +52,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
       var _state$appStates2;
       // For Customer intiated conversations, just close chat widget
       if ((state === null || state === void 0 ? void 0 : (_state$appStates2 = state.appStates) === null || _state$appStates2 === void 0 ? void 0 : _state$appStates2.conversationEndedBy) === _Constants.ConversationEndEntity.Customer) {
-        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
+        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
         return;
       }
 
@@ -62,7 +63,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
       });
       return;
     }
-    endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, true, true, uwid);
+    endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, true, true);
 
     // Initiate post chat render
     if (state !== null && state !== void 0 && (_state$domainStates2 = state.domainStates) !== null && _state$domainStates2 !== void 0 && _state$domainStates2.postChatContext) {
@@ -80,7 +81,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
 
     //Close chat widget for any failure in embedded to allow to show start chat button
     if (((_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.hideStartChatButton) === false) {
-      await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
+      await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
     }
   } finally {
     //Chat token clean up
@@ -90,8 +91,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.prepareEndChat = prepareEndChat;
-const endChat = async function (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) {
-  let uwid = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : "";
+const endChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => {
   if (!skipEndChatSDK && chatSDK.conversation) {
     try {
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
@@ -143,11 +143,13 @@ const endChat = async function (props, chatSDK, state, dispatch, setAdapter, set
       closeChatWidget(dispatch, props, state);
     }
   }
-  if (postMessageToOtherTab && !(0, _utils.isNullOrEmptyString)(uwid)) {
+  if (postMessageToOtherTab) {
     const endChatEventName = await getEndChatEventName(chatSDK, props);
     _omnichannelChatComponents.BroadcastService.postMessage({
       eventName: endChatEventName,
-      payload: uwid
+      payload: {
+        runtimeId: _TelemetryManager.TelemetryManager.InternalTelemetryData.lcwRuntimeId
+      }
     });
   }
 };
@@ -174,6 +176,7 @@ const callingStateCleanUp = async dispatch => {
     payload: true
   });
 };
+exports.callingStateCleanUp = callingStateCleanUp;
 const endChatStateCleanUp = async dispatch => {
   // Need to clear these states immediately when chat ended from OC.
   dispatch({
@@ -189,6 +192,7 @@ const endChatStateCleanUp = async dispatch => {
     payload: false
   });
 };
+exports.endChatStateCleanUp = endChatStateCleanUp;
 const closeChatStateCleanUp = async dispatch => {
   dispatch({
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
@@ -226,6 +230,7 @@ const closeChatStateCleanUp = async dispatch => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.closeChatStateCleanUp = closeChatStateCleanUp;
 const endVoiceVideoCallIfOngoing = async (chatSDK, dispatch) => {
   let callId = "";
   try {

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

@@ -55,6 +55,7 @@ var _useChatAdapterStore = _interopRequireDefault(require("../../../hooks/useCha
 var _useChatContextStore = _interopRequireDefault(require("../../../hooks/useChatContextStore"));
 var _useChatSDKStore = _interopRequireDefault(require("../../../hooks/useChatSDKStore"));
 var _defaultAdaptiveCardStyles = require("../../webchatcontainerstateful/common/defaultStyles/defaultAdaptiveCardStyles");
+var _omnichannelChatSdk = require("@microsoft/omnichannel-chat-sdk");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -93,8 +94,6 @@ const LiveChatWidgetStateful = props => {
   const lastLWICheckTimeRef = (0, _react2.useRef)(0);
   let optionalParams;
   let activeCachedChatExist = false;
-  const uwid = (0, _react2.useRef)(""); // its an uniqueid per chatr instance
-
   const setOptionalParams = () => {
     var _state$appStates, _state$domainStates, _state$appStates3;
     if (!(0, _utils.isUndefinedOrEmpty)((_state$appStates = state.appStates) === null || _state$appStates === void 0 ? void 0 : _state$appStates.reconnectId)) {
@@ -195,7 +194,6 @@ const LiveChatWidgetStateful = props => {
     setupClientDataStore();
     (0, _registerTelemetryLoggers.registerTelemetryLoggers)(props, dispatch);
     (0, _createInternetConnectionChangeHandler.createInternetConnectionChangeHandler)();
-    uwid.current = (0, _utils.newGuid)();
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_ELEMENT_ID,
       payload: widgetElementId
@@ -328,23 +326,27 @@ const LiveChatWidgetStateful = props => {
 
     // Start chat from SDK Event
     _omnichannelChatComponents.BroadcastService.getMessageByEventName(_TelemetryConstants.BroadcastEvent.StartChat).subscribe(msg => {
-      var _msg$payload4;
+      var _msg$payload4, _msg$payload5, _msg$payload6;
+      // If the startChat event is not initiated by the same tab. Ignore the call
+      if (!(0, _utils.isNullOrUndefined)(msg === null || msg === void 0 ? void 0 : (_msg$payload4 = msg.payload) === null || _msg$payload4 === void 0 ? void 0 : _msg$payload4.runtimeId) && (msg === null || msg === void 0 ? void 0 : (_msg$payload5 = msg.payload) === null || _msg$payload5 === void 0 ? void 0 : _msg$payload5.runtimeId) !== _TelemetryManager.TelemetryManager.InternalTelemetryData.lcwRuntimeId) {
+        return;
+      }
       let stateWithUpdatedContext = state;
-      if (msg !== null && msg !== void 0 && (_msg$payload4 = msg.payload) !== null && _msg$payload4 !== void 0 && _msg$payload4.customContext) {
-        var _msg$payload5, _msg$payload6;
+      if (msg !== null && msg !== void 0 && (_msg$payload6 = msg.payload) !== null && _msg$payload6 !== void 0 && _msg$payload6.customContext) {
+        var _msg$payload7, _msg$payload8;
         _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
           Event: _TelemetryConstants.TelemetryEvent.CustomContextReceived,
           Description: "CustomContext received through startChat event."
         });
         dispatch({
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
-          payload: msg === null || msg === void 0 ? void 0 : (_msg$payload5 = msg.payload) === null || _msg$payload5 === void 0 ? void 0 : _msg$payload5.customContext
+          payload: msg === null || msg === void 0 ? void 0 : (_msg$payload7 = msg.payload) === null || _msg$payload7 === void 0 ? void 0 : _msg$payload7.customContext
         });
         stateWithUpdatedContext = {
           ...state,
           domainStates: {
             ...state.domainStates,
-            customContext: msg === null || msg === void 0 ? void 0 : (_msg$payload6 = msg.payload) === null || _msg$payload6 === void 0 ? void 0 : _msg$payload6.customContext
+            customContext: msg === null || msg === void 0 ? void 0 : (_msg$payload8 = msg.payload) === null || _msg$payload8 === void 0 ? void 0 : _msg$payload8.customContext
           }
         };
       }
@@ -422,9 +424,16 @@ const LiveChatWidgetStateful = props => {
     // Listen to end chat event from other tabs
     const endChatEventName = (0, _utils.getWidgetEndChatEventName)(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC3 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC3 === void 0 ? void 0 : _chatSDK$omnichannelC3.widgetId, ((_props$controlProps10 = props.controlProps) === null || _props$controlProps10 === void 0 ? void 0 : _props$controlProps10.widgetInstanceId) ?? "");
     _omnichannelChatComponents.BroadcastService.getMessageByEventName(endChatEventName).subscribe(msg => {
-      console.log("Receiving end chat event", JSON.stringify(msg.payload));
-      if (msg.payload !== uwid.current) {
+      var _msg$payload9;
+      if ((msg === null || msg === void 0 ? void 0 : (_msg$payload9 = msg.payload) === null || _msg$payload9 === void 0 ? void 0 : _msg$payload9.runtimeId) !== _TelemetryManager.TelemetryManager.InternalTelemetryData.lcwRuntimeId) {
         (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, false);
+        (0, _endChat.endChatStateCleanUp)(dispatch);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        chatSDK.requestId = (0, _omnichannelChatSdk.uuidv4)();
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        chatSDK.chatToken = {};
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        chatSDK.reconnectId = null;
         return;
       }
     });
@@ -552,13 +561,13 @@ const LiveChatWidgetStateful = props => {
 
     // If start chat failed, and C2 is trying to close chat widget
     if (state !== null && state !== void 0 && (_state$appStates9 = state.appStates) !== null && _state$appStates9 !== void 0 && _state$appStates9.startChatFailed || (state === null || state === void 0 ? void 0 : (_state$appStates10 = state.appStates) === null || _state$appStates10 === void 0 ? void 0 : _state$appStates10.conversationState) === _ConversationState.ConversationState.Postchat) {
-      (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, true, uwid.current);
+      (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, true);
       return;
     }
 
     // Scenario -> Chat was InActive and closing the chat (Refresh scenario on post chat)
     if ((state === null || state === void 0 ? void 0 : (_state$appStates11 = state.appStates) === null || _state$appStates11 === void 0 ? void 0 : _state$appStates11.conversationState) === _ConversationState.ConversationState.InActive) {
-      (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid.current);
+      (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
       return;
     }
     if ((state === null || state === void 0 ? void 0 : (_state$appStates12 = state.appStates) === null || _state$appStates12 === void 0 ? void 0 : _state$appStates12.conversationEndedBy) === _Constants.ConversationEndEntity.Agent || (state === null || state === void 0 ? void 0 : (_state$appStates13 = state.appStates) === null || _state$appStates13 === void 0 ? void 0 : _state$appStates13.conversationEndedBy) === _Constants.ConversationEndEntity.Bot) {
@@ -569,7 +578,7 @@ const LiveChatWidgetStateful = props => {
     }
 
     // All other cases
-    (0, _endChat.prepareEndChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid.current);
+    (0, _endChat.prepareEndChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter);
   }, [state === null || state === void 0 ? void 0 : (_state$appStates14 = state.appStates) === null || _state$appStates14 === void 0 ? void 0 : _state$appStates14.conversationEndedBy]);
 
   // Publish chat widget state
@@ -627,13 +636,13 @@ const LiveChatWidgetStateful = props => {
   };
   const setPostChatContextRelay = () => (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab, uwid.current);
+  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab);
   const prepareStartChatRelay = () => (0, _startChat.prepareStartChat)(props, chatSDK, state, dispatch, setAdapter);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const initStartChatRelay = (optionalParams, persistedState) => (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, state, props, optionalParams, persistedState);
   const confirmationPaneProps = (0, _initConfirmationPropsComposer.initConfirmationPropsComposer)(props);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const prepareEndChatRelay = () => (0, _endChat.prepareEndChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid.current);
+  const prepareEndChatRelay = () => (0, _endChat.prepareEndChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter);
   const webChatProps = (0, _initWebChatComposer.initWebChatComposer)(props, state, dispatch, chatSDK, endChatRelay);
   const downloadTranscriptProps = (0, _createDownloadTranscriptProps.default)(props.downloadTranscriptProps, {
     ...(_defaultWebChatContainerStatefulProps.defaultWebChatContainerStatefulProps === null || _defaultWebChatContainerStatefulProps.defaultWebChatContainerStatefulProps === void 0 ? void 0 : _defaultWebChatContainerStatefulProps.defaultWebChatContainerStatefulProps.webChatStyles),

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

@@ -1,7 +1,7 @@
 import { ConfirmationState, Constants, ConversationEndEntity, ParticipantType } from "../../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { getAuthClientFunction, handleAuthentication } from "./authHelper";
-import { getConversationDetailsCall, getWidgetEndChatEventName, isNullOrEmptyString } from "../../../common/utils";
+import { getConversationDetailsCall, getWidgetEndChatEventName } from "../../../common/utils";
 import { getPostChatContext, initiatePostChat } from "./renderSurveyHelpers";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
@@ -9,9 +9,10 @@ import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidge
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
+import { TelemetryManager } from "../../../common/telemetry/TelemetryManager";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid) => {
+const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter) => {
   try {
     var _conversationDetails$, _state$domainStates, _state$domainStates2;
     // Use Case: If call is ongoing, end the call by simulating end call button click
@@ -23,7 +24,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
       var _state$appStates;
       // If ended by customer, just close chat
       if ((state === null || state === void 0 ? void 0 : (_state$appStates = state.appStates) === null || _state$appStates === void 0 ? void 0 : _state$appStates.conversationEndedBy) === ConversationEndEntity.Customer) {
-        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
+        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
       }
       // Use Case: If ended by Agent, stay chat in InActive state
       return;
@@ -46,7 +47,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
       var _state$appStates2;
       // For Customer intiated conversations, just close chat widget
       if ((state === null || state === void 0 ? void 0 : (_state$appStates2 = state.appStates) === null || _state$appStates2 === void 0 ? void 0 : _state$appStates2.conversationEndedBy) === ConversationEndEntity.Customer) {
-        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
+        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
         return;
       }
 
@@ -57,7 +58,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
       });
       return;
     }
-    endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, true, true, uwid);
+    endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, true, true);
 
     // Initiate post chat render
     if (state !== null && state !== void 0 && (_state$domainStates2 = state.domainStates) !== null && _state$domainStates2 !== void 0 && _state$domainStates2.postChatContext) {
@@ -75,7 +76,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
 
     //Close chat widget for any failure in embedded to allow to show start chat button
     if (((_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.hideStartChatButton) === false) {
-      await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
+      await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
     }
   } finally {
     //Chat token clean up
@@ -84,8 +85,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const endChat = async function (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) {
-  let uwid = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : "";
+const endChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => {
   if (!skipEndChatSDK && chatSDK.conversation) {
     try {
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
@@ -137,15 +137,17 @@ const endChat = async function (props, chatSDK, state, dispatch, setAdapter, set
       closeChatWidget(dispatch, props, state);
     }
   }
-  if (postMessageToOtherTab && !isNullOrEmptyString(uwid)) {
+  if (postMessageToOtherTab) {
     const endChatEventName = await getEndChatEventName(chatSDK, props);
     BroadcastService.postMessage({
       eventName: endChatEventName,
-      payload: uwid
+      payload: {
+        runtimeId: TelemetryManager.InternalTelemetryData.lcwRuntimeId
+      }
     });
   }
 };
-const callingStateCleanUp = async dispatch => {
+export const callingStateCleanUp = async dispatch => {
   dispatch({
     type: LiveChatWidgetActionType.SHOW_CALLING_CONTAINER,
     payload: false
@@ -167,7 +169,7 @@ const callingStateCleanUp = async dispatch => {
     payload: true
   });
 };
-const endChatStateCleanUp = async dispatch => {
+export const endChatStateCleanUp = async dispatch => {
   // Need to clear these states immediately when chat ended from OC.
   dispatch({
     type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
@@ -182,7 +184,7 @@ const endChatStateCleanUp = async dispatch => {
     payload: false
   });
 };
-const closeChatStateCleanUp = async dispatch => {
+export const closeChatStateCleanUp = async dispatch => {
   dispatch({
     type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
     payload: undefined

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

@@ -6,9 +6,9 @@ import { ConfirmationState, Constants, ConversationEndEntity, E2VVOptions, LiveW
 import { Stack } from "@fluentui/react";
 import React, { useEffect, useRef, useState } from "react";
 import { checkIfConversationStillValid, initStartChat, prepareStartChat, setPreChatAndInitiateChat } from "../common/startChat";
-import { createTimer, getBroadcastChannelName, getConversationDetailsCall, getLocaleDirection, getStateFromCache, getWidgetCacheIdfromProps, getWidgetEndChatEventName, isNullOrEmptyString, isUndefinedOrEmpty, newGuid } from "../../../common/utils";
+import { createTimer, getBroadcastChannelName, getConversationDetailsCall, getLocaleDirection, getStateFromCache, getWidgetCacheIdfromProps, getWidgetEndChatEventName, isNullOrEmptyString, isNullOrUndefined, isUndefinedOrEmpty } from "../../../common/utils";
 import { defaultClientDataStoreProvider, isCookieAllowed } from "../../../common/storage/default/defaultClientDataStoreProvider";
-import { endChat, prepareEndChat } from "../common/endChat";
+import { endChat, endChatStateCleanUp, prepareEndChat } from "../common/endChat";
 import { handleChatReconnect, isPersistentEnabled, isReconnectEnabled } from "../common/reconnectChatHelper";
 import { shouldShowCallingContainer, shouldShowChatButton, shouldShowConfirmationPane, shouldShowEmailTranscriptPane, shouldShowHeader, shouldShowLoadingPane, shouldShowOutOfOfficeHoursPane, shouldShowPostChatLoadingPane, shouldShowPostChatSurveyPane, shouldShowPreChatSurveyPane, shouldShowProactiveChatPane, shouldShowReconnectChatPane, shouldShowWebChatContainer } from "../../../controller/componentController";
 import { ActivityStreamHandler } from "../common/ActivityStreamHandler";
@@ -30,7 +30,7 @@ import PreChatSurveyPaneStateful from "../../prechatsurveypanestateful/PreChatSu
 import ProactiveChatPaneStateful from "../../proactivechatpanestateful/ProactiveChatPaneStateful";
 import ReconnectChatPaneStateful from "../../reconnectchatpanestateful/ReconnectChatPaneStateful";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
+import { TelemetryManager, TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import WebChatContainerStateful from "../../webchatcontainerstateful/WebChatContainerStateful";
 import createDownloadTranscriptProps from "../common/createDownloadTranscriptProps";
 import { createFooter } from "../common/createFooter";
@@ -51,6 +51,7 @@ import useChatAdapterStore from "../../../hooks/useChatAdapterStore";
 import useChatContextStore from "../../../hooks/useChatContextStore";
 import useChatSDKStore from "../../../hooks/useChatSDKStore";
 import { defaultAdaptiveCardStyles } from "../../webchatcontainerstateful/common/defaultStyles/defaultAdaptiveCardStyles";
+import { uuidv4 } from "@microsoft/omnichannel-chat-sdk";
 export const LiveChatWidgetStateful = props => {
   var _props$webChatContain, _props$styleProps, _chatSDK$omnichannelC, _props$controlProps, _props$controlProps2, _state$appStates7, _props$webChatContain5, _state$appStates14, _props$webChatContain6, _props$controlProps11, _props$draggableChatW, _props$draggableChatW2, _props$draggableChatW3, _props$draggableChatW4, _props$draggableChatW5, _props$webChatContain7, _props$webChatContain8, _props$webChatContain9, _props$webChatContain10, _livechatProps$webCha, _livechatProps$styleP, _livechatProps$contro, _livechatProps$contro2, _livechatProps$compon, _livechatProps$contro3, _livechatProps$compon2, _livechatProps$contro4, _livechatProps$compon3, _livechatProps$contro5, _livechatProps$compon4, _livechatProps$contro6, _livechatProps$compon5, _livechatProps$contro7, _livechatProps$compon6, _livechatProps$contro8, _livechatProps$compon7, _livechatProps$contro9, _livechatProps$contro10, _livechatProps$compon8, _livechatProps$contro11, _livechatProps$compon9, _livechatProps$contro12, _livechatProps$compon10, _livechatProps$compon11, _livechatProps$compon12;
   const [state, dispatch] = useChatContextStore();
@@ -85,8 +86,6 @@ export const LiveChatWidgetStateful = props => {
   const lastLWICheckTimeRef = useRef(0);
   let optionalParams;
   let activeCachedChatExist = false;
-  const uwid = useRef(""); // its an uniqueid per chatr instance
-
   const setOptionalParams = () => {
     var _state$appStates, _state$domainStates, _state$appStates3;
     if (!isUndefinedOrEmpty((_state$appStates = state.appStates) === null || _state$appStates === void 0 ? void 0 : _state$appStates.reconnectId)) {
@@ -187,7 +186,6 @@ export const LiveChatWidgetStateful = props => {
     setupClientDataStore();
     registerTelemetryLoggers(props, dispatch);
     createInternetConnectionChangeHandler();
-    uwid.current = newGuid();
     dispatch({
       type: LiveChatWidgetActionType.SET_WIDGET_ELEMENT_ID,
       payload: widgetElementId
@@ -320,23 +318,27 @@ export const LiveChatWidgetStateful = props => {
 
     // Start chat from SDK Event
     BroadcastService.getMessageByEventName(BroadcastEvent.StartChat).subscribe(msg => {
-      var _msg$payload4;
+      var _msg$payload4, _msg$payload5, _msg$payload6;
+      // If the startChat event is not initiated by the same tab. Ignore the call
+      if (!isNullOrUndefined(msg === null || msg === void 0 ? void 0 : (_msg$payload4 = msg.payload) === null || _msg$payload4 === void 0 ? void 0 : _msg$payload4.runtimeId) && (msg === null || msg === void 0 ? void 0 : (_msg$payload5 = msg.payload) === null || _msg$payload5 === void 0 ? void 0 : _msg$payload5.runtimeId) !== TelemetryManager.InternalTelemetryData.lcwRuntimeId) {
+        return;
+      }
       let stateWithUpdatedContext = state;
-      if (msg !== null && msg !== void 0 && (_msg$payload4 = msg.payload) !== null && _msg$payload4 !== void 0 && _msg$payload4.customContext) {
-        var _msg$payload5, _msg$payload6;
+      if (msg !== null && msg !== void 0 && (_msg$payload6 = msg.payload) !== null && _msg$payload6 !== void 0 && _msg$payload6.customContext) {
+        var _msg$payload7, _msg$payload8;
         TelemetryHelper.logActionEvent(LogLevel.INFO, {
           Event: TelemetryEvent.CustomContextReceived,
           Description: "CustomContext received through startChat event."
         });
         dispatch({
           type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
-          payload: msg === null || msg === void 0 ? void 0 : (_msg$payload5 = msg.payload) === null || _msg$payload5 === void 0 ? void 0 : _msg$payload5.customContext
+          payload: msg === null || msg === void 0 ? void 0 : (_msg$payload7 = msg.payload) === null || _msg$payload7 === void 0 ? void 0 : _msg$payload7.customContext
         });
         stateWithUpdatedContext = {
           ...state,
           domainStates: {
             ...state.domainStates,
-            customContext: msg === null || msg === void 0 ? void 0 : (_msg$payload6 = msg.payload) === null || _msg$payload6 === void 0 ? void 0 : _msg$payload6.customContext
+            customContext: msg === null || msg === void 0 ? void 0 : (_msg$payload8 = msg.payload) === null || _msg$payload8 === void 0 ? void 0 : _msg$payload8.customContext
           }
         };
       }
@@ -414,9 +416,16 @@ export const LiveChatWidgetStateful = props => {
     // Listen to end chat event from other tabs
     const endChatEventName = getWidgetEndChatEventName(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC3 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC3 === void 0 ? void 0 : _chatSDK$omnichannelC3.widgetId, ((_props$controlProps10 = props.controlProps) === null || _props$controlProps10 === void 0 ? void 0 : _props$controlProps10.widgetInstanceId) ?? "");
     BroadcastService.getMessageByEventName(endChatEventName).subscribe(msg => {
-      console.log("Receiving end chat event", JSON.stringify(msg.payload));
-      if (msg.payload !== uwid.current) {
+      var _msg$payload9;
+      if ((msg === null || msg === void 0 ? void 0 : (_msg$payload9 = msg.payload) === null || _msg$payload9 === void 0 ? void 0 : _msg$payload9.runtimeId) !== TelemetryManager.InternalTelemetryData.lcwRuntimeId) {
         endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, false);
+        endChatStateCleanUp(dispatch);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        chatSDK.requestId = uuidv4();
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        chatSDK.chatToken = {};
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        chatSDK.reconnectId = null;
         return;
       }
     });
@@ -544,13 +553,13 @@ export const LiveChatWidgetStateful = props => {
 
     // If start chat failed, and C2 is trying to close chat widget
     if (state !== null && state !== void 0 && (_state$appStates9 = state.appStates) !== null && _state$appStates9 !== void 0 && _state$appStates9.startChatFailed || (state === null || state === void 0 ? void 0 : (_state$appStates10 = state.appStates) === null || _state$appStates10 === void 0 ? void 0 : _state$appStates10.conversationState) === ConversationState.Postchat) {
-      endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, true, uwid.current);
+      endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, true);
       return;
     }
 
     // Scenario -> Chat was InActive and closing the chat (Refresh scenario on post chat)
     if ((state === null || state === void 0 ? void 0 : (_state$appStates11 = state.appStates) === null || _state$appStates11 === void 0 ? void 0 : _state$appStates11.conversationState) === ConversationState.InActive) {
-      endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid.current);
+      endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
       return;
     }
     if ((state === null || state === void 0 ? void 0 : (_state$appStates12 = state.appStates) === null || _state$appStates12 === void 0 ? void 0 : _state$appStates12.conversationEndedBy) === ConversationEndEntity.Agent || (state === null || state === void 0 ? void 0 : (_state$appStates13 = state.appStates) === null || _state$appStates13 === void 0 ? void 0 : _state$appStates13.conversationEndedBy) === ConversationEndEntity.Bot) {
@@ -561,7 +570,7 @@ export const LiveChatWidgetStateful = props => {
     }
 
     // All other cases
-    prepareEndChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid.current);
+    prepareEndChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter);
   }, [state === null || state === void 0 ? void 0 : (_state$appStates14 = state.appStates) === null || _state$appStates14 === void 0 ? void 0 : _state$appStates14.conversationEndedBy]);
 
   // Publish chat widget state
@@ -619,13 +628,13 @@ export const LiveChatWidgetStateful = props => {
   };
   const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab, uwid.current);
+  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab);
   const prepareStartChatRelay = () => prepareStartChat(props, chatSDK, state, dispatch, setAdapter);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const initStartChatRelay = (optionalParams, persistedState) => initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams, persistedState);
   const confirmationPaneProps = initConfirmationPropsComposer(props);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const prepareEndChatRelay = () => prepareEndChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid.current);
+  const prepareEndChatRelay = () => prepareEndChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter);
   const webChatProps = initWebChatComposer(props, state, dispatch, chatSDK, endChatRelay);
   const downloadTranscriptProps = createDownloadTranscriptProps(props.downloadTranscriptProps, {
     ...(defaultWebChatContainerStatefulProps === null || defaultWebChatContainerStatefulProps === void 0 ? void 0 : defaultWebChatContainerStatefulProps.webChatStyles),

package/lib/types/components/livechatwidget/common/endChat.d.ts

@@ -2,7 +2,10 @@ import { Dispatch } from "react";
 import { ILiveChatWidgetAction } from "../../../contexts/common/ILiveChatWidgetAction";
 import { ILiveChatWidgetContext } from "../../../contexts/common/ILiveChatWidgetContext";
 import { ILiveChatWidgetProps } from "../interfaces/ILiveChatWidgetProps";
-declare const prepareEndChat: (props: ILiveChatWidgetProps, chatSDK: any, state: ILiveChatWidgetContext, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, setWebChatStyles: any, adapter: any, uwid: string) => Promise<void>;
-declare const endChat: (props: ILiveChatWidgetProps, chatSDK: any, state: ILiveChatWidgetContext, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, setWebChatStyles: any, adapter: any, skipEndChatSDK?: boolean | undefined, skipCloseChat?: boolean | undefined, postMessageToOtherTab?: boolean | undefined, uwid?: string) => Promise<void>;
+declare const prepareEndChat: (props: ILiveChatWidgetProps, chatSDK: any, state: ILiveChatWidgetContext, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, setWebChatStyles: any, adapter: any) => Promise<void>;
+declare const endChat: (props: ILiveChatWidgetProps, chatSDK: any, state: ILiveChatWidgetContext, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, setWebChatStyles: any, adapter: any, skipEndChatSDK?: boolean | undefined, skipCloseChat?: boolean | undefined, postMessageToOtherTab?: boolean | undefined) => Promise<void>;
+export declare const callingStateCleanUp: (dispatch: Dispatch<ILiveChatWidgetAction>) => Promise<void>;
+export declare const endChatStateCleanUp: (dispatch: Dispatch<ILiveChatWidgetAction>) => Promise<void>;
+export declare const closeChatStateCleanUp: (dispatch: Dispatch<ILiveChatWidgetAction>) => Promise<void>;
 export declare const endVoiceVideoCallIfOngoing: (chatSDK: any, dispatch: Dispatch<ILiveChatWidgetAction>) => Promise<void>;
 export { prepareEndChat, endChat };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.4.0",
+  "version": "1.4.1-main.9bf5e75",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",
@@ -74,7 +74,7 @@
     "webpack-cli": "^4.9.2"
   },
   "dependencies": {
-    "@microsoft/omnichannel-chat-components": "^1.0.7",
+    "@microsoft/omnichannel-chat-components": "^1.0.8",
     "@microsoft/omnichannel-chat-sdk": "1.5.4",
     "abort-controller-es5": "^2.0.1",
     "dompurify": "^2.3.4",