@microsoft/omnichannel-chat-widget 2.0.1-main.84e2c02 → 2.0.1-main.c997354

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

@@ -143,6 +143,8 @@ let TelemetryEvent = exports.TelemetryEvent = /*#__PURE__*/function (TelemetryEv
   TelemetryEvent["PrechatSubmitted"] = "PrechatSubmitted";
   TelemetryEvent["StartChatSDKCall"] = "StartChatCall";
   TelemetryEvent["StartChatEventReceived"] = "StartChatEventReceived";
+  TelemetryEvent["ConcurrentStartChatRejected"] = "ConcurrentStartChatRejected";
+  TelemetryEvent["ChatSDKStateCleanUpDisconnectFailed"] = "ChatSDKStateCleanUpDisconnectFailed";
   TelemetryEvent["EndChatSDKCall"] = "EndChatSDKCall";
   TelemetryEvent["PrepareEndChat"] = "PrepareEndChat";
   TelemetryEvent["EndChatEventReceived"] = "EndChatEventReceived";
@@ -415,6 +417,8 @@ let TelemetryConstants = exports.TelemetryConstants = /*#__PURE__*/function () {
         case TelemetryEvent.SecureEventBusDispatchError:
         case TelemetryEvent.AgentJoinedConversation:
         case TelemetryEvent.BrowserTabHidden:
+        case TelemetryEvent.ConcurrentStartChatRejected:
+        case TelemetryEvent.ChatSDKStateCleanUpDisconnectFailed:
         case TelemetryEvent.RecoveryEligibilityEvaluated:
           return ScenarioType.ACTIONS;
         case TelemetryEvent.StartChatSDKCall:

package/lib/cjs/components/chatbuttonstateful/ChatButtonStateful.js

@@ -58,37 +58,54 @@ const ChatButtonStateful = props => {
   const ref = (0, _react.useRef)(() => {
     return;
   });
+  // Optimistic guard against rapid double-clicks. `conversationState` only flips to
+  // `Loading` after React re-renders, so the button stays visible and clickable for the
+  // whole duration of the first click's async work. Without this ref two concurrent
+  // startChat() calls can create two conversations on the backend.
+  const startChatInProgressRef = (0, _react.useRef)(false);
   ref.current = async () => {
-    _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonClicked,
-      Description: "Chat button click action started",
-      CustomProperties: {
-        ConversationStage: _TelemetryConstants.ConversationStage.Initialization
-      }
-    });
-    if (state.appStates.isMinimized) {
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
-        payload: false
+    if (startChatInProgressRef.current) {
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.WARN, {
+        Event: _TelemetryConstants.TelemetryEvent.ConcurrentStartChatRejected,
+        Description: "Chat button click ignored, a start chat operation is already in progress."
       });
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
-        payload: 0
+      return;
+    }
+    startChatInProgressRef.current = true;
+    try {
+      _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonClicked,
+        Description: "Chat button click action started",
+        CustomProperties: {
+          ConversationStage: _TelemetryConstants.ConversationStage.Initialization
+        }
       });
-      // If chat is minimized and then unminimized, start a chat if convesation state is closed.
-      if (state.appStates.conversationState === _ConversationState.ConversationState.Closed) {
+      if (state.appStates.isMinimized) {
+        dispatch({
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
+          payload: false
+        });
+        dispatch({
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
+          payload: 0
+        });
+        // If chat is minimized and then unminimized, start a chat if convesation state is closed.
+        if (state.appStates.conversationState === _ConversationState.ConversationState.Closed) {
+          await startChat();
+        }
+      } else {
         await startChat();
       }
-    } else {
-      await startChat();
+      _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonActionCompleted,
+        Description: "Chat button action completed",
+        CustomProperties: {
+          ConversationStage: _TelemetryConstants.ConversationStage.Initialization
+        }
+      });
+    } finally {
+      startChatInProgressRef.current = false;
     }
-    _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonActionCompleted,
-      Description: "Chat button action completed",
-      CustomProperties: {
-        ConversationStage: _TelemetryConstants.ConversationStage.Initialization
-      }
-    });
   };
   const outOfOfficeStyleProps = Object.assign({}, _defaultOutOfOfficeChatButtonStyleProps.defaultOutOfOfficeChatButtonStyleProps, outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.styleProps);
   const controlProps = {

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

@@ -360,13 +360,52 @@ const closeChatStateCleanUp = dispatch => {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.closeChatStateCleanUp = closeChatStateCleanUp;
+const logCleanUpDisconnectFailure = error => {
+  _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.WARN, {
+    Event: _TelemetryConstants.TelemetryEvent.ChatSDKStateCleanUpDisconnectFailed,
+    Description: "Failed to disconnect the previous conversation during chat SDK state clean up.",
+    ExceptionDetails: {
+      exception: (error === null || error === void 0 ? void 0 : error.message) ?? error
+    }
+  });
+};
+
+// Releases the previous session's conversation. Mirrors the cleanup OmnichannelChatSDK.endChat()
+// runs in its finally block (disconnect, then drop the reference). Without it, a conversation
+// left over from a failed or orphaned start chat, or from a chat ended in another tab (which
+// skips the SDK endChat), keeps its messaging session open and leaks into the next chat.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const disconnectConversation = chatSDK => {
+  const conversation = chatSDK.conversation;
+  if (!conversation || typeof conversation.disconnect !== "function") {
+    return;
+  }
+  try {
+    // ACS conversations disconnect asynchronously; legacy IC3 conversations may not return a promise.
+    const result = conversation.disconnect();
+    if (result && typeof result.catch === "function") {
+      result.catch(logCleanUpDisconnectFailure);
+    }
+  } catch (error) {
+    logCleanUpDisconnectFailure(error);
+  }
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const chatSDKStateCleanUp = chatSDK => {
+  if (!chatSDK) {
+    return;
+  }
+
   // 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;
+  disconnectConversation(chatSDK);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  chatSDK.conversation = null;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -24,18 +24,87 @@ var _authHelper = require("./authHelper");
 var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
 var _persistentChatHelper = require("./persistentChatHelper");
 var _updateSessionDataForTelemetry = require("./updateSessionDataForTelemetry");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let optionalParams = {};
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let widgetInstanceId;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let popoutWidgetInstanceId;
+/**
+ * Per widget instance mutexes for the two chat creation entry points.
+ *
+ * Every guard in the prepareStartChat -> setPreChatAndInitiateChat -> initStartChat chain
+ * checks `conversationState === Closed`, but React state is updated asynchronously. A second
+ * invocation fired within the same render cycle (for example a rapid double click on the chat
+ * button, or a chat button click racing a BroadcastEvent.StartChat) therefore still observes
+ * the stale `Closed` state, reaches `facadeChatSDK.startChat()` and creates a second
+ * conversation on the backend which is then orphaned and never ended.
+ *
+ * The locks are keyed by FacadeChatSDK instance rather than being module wide, because a host
+ * page can mount several independent widgets, each with its own widgetInstanceId and its own
+ * FacadeChatSDK (created once per widget in LiveChatWidget.tsx). A module wide lock would make
+ * widget A's start chat silently drop widget B's legitimate simultaneous start chat.
+ *
+ * The two maps are separate because prepareStartChat calls initStartChat; sharing a single lock
+ * would make the nested call see its own parent as in flight and drop it. prepareStartChat is
+ * additionally blocked by an in flight initStartChat (pre-chat submit, reconnect, or the
+ * hideStartChatButton bootstrap call initStartChat directly). Otherwise a later prepareStartChat
+ * would dispatch Loading and maximize the widget, and only then have its nested initStartChat
+ * dropped.
+ */
+const prepareStartChatGuards = new WeakMap();
+const initStartChatGuards = new WeakMap();
+
+// Fallback owner used only when no FacadeChatSDK instance is available to key on, so the guard
+// degrades to the module wide behaviour instead of disappearing altogether.
+const unkeyedGuardOwner = {};
+const getGuard = (guards, facadeChatSDK) => {
+  const owner = facadeChatSDK ?? unkeyedGuardOwner;
+  let guard = guards.get(owner);
+  if (!guard) {
+    guard = {
+      inFlight: false
+    };
+    guards.set(owner, guard);
+  }
+  return guard;
+};
+
+/**
+ * Runs `operation` only if no other invocation for the same widget instance is already in
+ * flight. Concurrent invocations are dropped (and reported through telemetry) rather than
+ * awaiting the in-flight promise, so a future re-entrant call can never deadlock on itself.
+ * No caller acts on the resolved value, so dropping is safe.
+ *
+ * `blockedBy` lets an operation also yield to a different, already running operation for the
+ * same widget instance without claiming that operation's lock.
+ */
+const runExclusively = async (guards, facadeChatSDK, description, operation, props, blockedBy) => {
+  const guard = getGuard(guards, facadeChatSDK);
+  const blockingGuard = blockedBy ? getGuard(blockedBy, facadeChatSDK) : undefined;
+  if (guard.inFlight || blockingGuard !== null && blockingGuard !== void 0 && blockingGuard.inFlight) {
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.WARN, {
+      Event: _TelemetryConstants.TelemetryEvent.ConcurrentStartChatRejected,
+      Description: description,
+      CustomProperties: {
+        WidgetCacheId: props ? (0, _utils.getWidgetCacheIdfromProps)(props) : undefined
+      }
+    });
+    return;
+  }
+
+  // Claim the lock before invoking the operation, so a re-entrant call made from the
+  // operation's synchronous preamble (before its first await) cannot slip past the check above.
+  guard.inFlight = true;
+  try {
+    await operation();
+  } finally {
+    guard.inFlight = false;
+  }
+};
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareStartChat = async (props, facadeChatSDK, state, dispatch, setAdapter) => {
-  optionalParams = {}; //Resetting to ensure no stale values
-  widgetInstanceId = (0, _utils.getWidgetCacheIdfromProps)(props);
+  return runExclusively(prepareStartChatGuards, facadeChatSDK, "Concurrent prepareStartChat call ignored, a start chat operation is already in progress for this widget instance.", () => prepareStartChatInternal(props, facadeChatSDK, state, dispatch, setAdapter), props, initStartChatGuards);
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.prepareStartChat = prepareStartChat;
+const prepareStartChatInternal = async (props, facadeChatSDK, state, dispatch, setAdapter) => {
   // reconnect > chat from cache
   if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true && !(0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
     const shouldStartChatNormally = await (0, _reconnectChatHelper.handleChatReconnect)(facadeChatSDK, props, dispatch, setAdapter, initStartChat, state);
@@ -63,7 +132,6 @@ const prepareStartChat = async (props, facadeChatSDK, state, dispatch, setAdapte
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-exports.prepareStartChat = prepareStartChat;
 const setPreChatAndInitiateChat = async (facadeChatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState, state, props) => {
   var _props$preChatSurveyP, _props$controlProps, _state$domainStates, _state$appStates2;
   // Reset before loading prechat to avoid starting chat with previous requestId
@@ -163,6 +231,12 @@ const setPreChatAndInitiateChat = async (facadeChatSDK, dispatch, setAdapter, is
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.setPreChatAndInitiateChat = setPreChatAndInitiateChat;
 const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
+  return runExclusively(initStartChatGuards, facadeChatSDK, "Concurrent initStartChat call ignored, a start chat operation is already in progress for this widget instance.", () => initStartChatInternal(facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState), props);
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.initStartChat = initStartChat;
+const initStartChatInternal = async (facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
   var _state$domainStates7;
   let isStartChatSuccessful = false;
   const persistentChatEnabled = (0, _liveChatConfigUtils.isPersistentChatEnabled)(state === null || state === void 0 || (_state$domainStates7 = state.domainStates) === null || _state$domainStates7 === void 0 || (_state$domainStates7 = _state$domainStates7.liveChatConfig) === null || _state$domainStates7 === void 0 || (_state$domainStates7 = _state$domainStates7.LiveWSAndLiveChatEngJoin) === null || _state$domainStates7 === void 0 ? void 0 : _state$domainStates7.msdyn_conversationmode);
@@ -201,14 +275,15 @@ const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props,
     }
     try {
       var _window$Microsoft, _state$domainStates8;
-      // Set custom context params
-      await setCustomContextParams(state, props);
+      // Set custom context params. Returned (not stored module-side) so that concurrent
+      // widget instances cannot overwrite each other's custom context.
+      const customContextParams = await setCustomContextParams(state, props);
       const defaultOptionalParams = {
         sendDefaultInitContext: true,
         isProactiveChat: !!(params !== null && params !== void 0 && params.isProactiveChat),
         portalContactId: (_window$Microsoft = window.Microsoft) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.Dynamic365) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.Portal) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.User) === null || _window$Microsoft === void 0 ? void 0 : _window$Microsoft.contactId
       };
-      const startChatOptionalParams = Object.assign({}, params, optionalParams, defaultOptionalParams);
+      const startChatOptionalParams = Object.assign({}, params, customContextParams, defaultOptionalParams);
 
       // MID-AUTH: Add wasAuthenticated flag for reconnect scenarios
       // Tells FacadeChatSDK whether the previous session was authenticated
@@ -291,14 +366,10 @@ const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props,
     await (0, _updateSessionDataForTelemetry.updateTelemetryData)(facadeChatSDK, dispatch);
   } catch (ex) {
     (0, _startChatErrorHandler.handleStartChatError)(dispatch, facadeChatSDK, props, ex, isStartChatSuccessful);
-  } finally {
-    optionalParams = {};
-    widgetInstanceId = "";
   }
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-exports.initStartChat = initStartChat;
 const createAdapterAndSubscribe = async (facadeChatSDK, dispatch, setAdapter, startTime, props) => {
   // New adapter creation
   const newAdapter = await (0, _createAdapter.createAdapter)(facadeChatSDK, props);
@@ -338,19 +409,22 @@ const canConnectToExistingChat = async (props, facadeChatSDK, state, dispatch, s
   return false;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+/**
+ * Resolves the custom context to start the chat with.
+ *
+ * Returns the resolved params instead of mutating module-level state: a page can host several
+ * independent widgets, and once per-instance start-chat guards allow them to run concurrently,
+ * shared mutable state would let one widget overwrite another widget's custom context.
+ */
 const setCustomContextParams = async (state, props) => {
   var _state$domainStates9, _persistedState$domai5;
   if (state !== null && state !== void 0 && (_state$domainStates9 = state.domainStates) !== null && _state$domainStates9 !== void 0 && _state$domainStates9.customContext) {
     var _state$domainStates0;
-    optionalParams = Object.assign({}, optionalParams, {
+    return {
       customContext: JSON.parse(JSON.stringify(state === null || state === void 0 || (_state$domainStates0 = state.domainStates) === null || _state$domainStates0 === void 0 ? void 0 : _state$domainStates0.customContext))
-    });
-    return;
-  }
-  if ((0, _utils.isNullOrEmptyString)(widgetInstanceId)) {
-    widgetInstanceId = (0, _utils.getWidgetCacheIdfromProps)(props);
+    };
   }
+  const widgetInstanceId = props ? (0, _utils.getWidgetCacheIdfromProps)(props) : "";
   // Add custom context only for unauthenticated chat
   const persistedState = (0, _utils.getStateFromCache)(widgetInstanceId);
   const customContextLocal = (persistedState === null || persistedState === void 0 || (_persistedState$domai5 = persistedState.domainStates) === null || _persistedState$domai5 === void 0 ? void 0 : _persistedState$domai5.customContext) ?? (props === null || props === void 0 ? void 0 : props.initialCustomContext);
@@ -359,23 +433,23 @@ const setCustomContextParams = async (state, props) => {
       Event: _TelemetryConstants.TelemetryEvent.SettingCustomContext,
       Description: "Setting custom context for unauthenticated chat"
     });
-    optionalParams = Object.assign({}, optionalParams, {
+    return {
       customContext: JSON.parse(JSON.stringify(customContextLocal))
-    });
-  } else {
-    const customContextFromParent = await getInitContextParamsForPopout();
-    if (!(0, _utils.isUndefinedOrEmpty)(customContextFromParent === null || customContextFromParent === void 0 ? void 0 : customContextFromParent.contextVariables)) {
-      optionalParams = Object.assign({}, optionalParams, {
-        customContext: JSON.parse(JSON.stringify(customContextFromParent.contextVariables))
-      });
-    }
+    };
+  }
+  const customContextFromParent = await getInitContextParamsForPopout();
+  if (!(0, _utils.isUndefinedOrEmpty)(customContextFromParent === null || customContextFromParent === void 0 ? void 0 : customContextFromParent.contextVariables)) {
+    return {
+      customContext: JSON.parse(JSON.stringify(customContextFromParent.contextVariables))
+    };
   }
+  return {};
 };
 const canStartPopoutChat = async props => {
   if (props.allowSdkChatSupport === false) {
     return false;
   }
-  popoutWidgetInstanceId = (0, _utils.getWidgetCacheIdfromProps)(props, true);
+  const popoutWidgetInstanceId = (0, _utils.getWidgetCacheIdfromProps)(props, true);
   if (!(0, _utils.isNullOrEmptyString)(popoutWidgetInstanceId)) {
     var _persistedState$domai6, _persistedState$appSt3;
     const persistedState = (0, _utils.getStateFromCache)(popoutWidgetInstanceId);

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

@@ -141,6 +141,8 @@ export let TelemetryEvent = /*#__PURE__*/function (TelemetryEvent) {
   TelemetryEvent["PrechatSubmitted"] = "PrechatSubmitted";
   TelemetryEvent["StartChatSDKCall"] = "StartChatCall";
   TelemetryEvent["StartChatEventReceived"] = "StartChatEventReceived";
+  TelemetryEvent["ConcurrentStartChatRejected"] = "ConcurrentStartChatRejected";
+  TelemetryEvent["ChatSDKStateCleanUpDisconnectFailed"] = "ChatSDKStateCleanUpDisconnectFailed";
   TelemetryEvent["EndChatSDKCall"] = "EndChatSDKCall";
   TelemetryEvent["PrepareEndChat"] = "PrepareEndChat";
   TelemetryEvent["EndChatEventReceived"] = "EndChatEventReceived";
@@ -413,6 +415,8 @@ export let TelemetryConstants = /*#__PURE__*/function () {
         case TelemetryEvent.SecureEventBusDispatchError:
         case TelemetryEvent.AgentJoinedConversation:
         case TelemetryEvent.BrowserTabHidden:
+        case TelemetryEvent.ConcurrentStartChatRejected:
+        case TelemetryEvent.ChatSDKStateCleanUpDisconnectFailed:
         case TelemetryEvent.RecoveryEligibilityEvaluated:
           return ScenarioType.ACTIONS;
         case TelemetryEvent.StartChatSDKCall:

package/lib/esm/components/chatbuttonstateful/ChatButtonStateful.js

@@ -50,37 +50,54 @@ export const ChatButtonStateful = props => {
   const ref = useRef(() => {
     return;
   });
+  // Optimistic guard against rapid double-clicks. `conversationState` only flips to
+  // `Loading` after React re-renders, so the button stays visible and clickable for the
+  // whole duration of the first click's async work. Without this ref two concurrent
+  // startChat() calls can create two conversations on the backend.
+  const startChatInProgressRef = useRef(false);
   ref.current = async () => {
-    TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
-      Event: TelemetryEvent.LCWChatButtonClicked,
-      Description: "Chat button click action started",
-      CustomProperties: {
-        ConversationStage: ConversationStage.Initialization
-      }
-    });
-    if (state.appStates.isMinimized) {
-      dispatch({
-        type: LiveChatWidgetActionType.SET_MINIMIZED,
-        payload: false
+    if (startChatInProgressRef.current) {
+      TelemetryHelper.logActionEvent(LogLevel.WARN, {
+        Event: TelemetryEvent.ConcurrentStartChatRejected,
+        Description: "Chat button click ignored, a start chat operation is already in progress."
       });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
-        payload: 0
+      return;
+    }
+    startChatInProgressRef.current = true;
+    try {
+      TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
+        Event: TelemetryEvent.LCWChatButtonClicked,
+        Description: "Chat button click action started",
+        CustomProperties: {
+          ConversationStage: ConversationStage.Initialization
+        }
       });
-      // If chat is minimized and then unminimized, start a chat if convesation state is closed.
-      if (state.appStates.conversationState === ConversationState.Closed) {
+      if (state.appStates.isMinimized) {
+        dispatch({
+          type: LiveChatWidgetActionType.SET_MINIMIZED,
+          payload: false
+        });
+        dispatch({
+          type: LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
+          payload: 0
+        });
+        // If chat is minimized and then unminimized, start a chat if convesation state is closed.
+        if (state.appStates.conversationState === ConversationState.Closed) {
+          await startChat();
+        }
+      } else {
         await startChat();
       }
-    } else {
-      await startChat();
+      TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
+        Event: TelemetryEvent.LCWChatButtonActionCompleted,
+        Description: "Chat button action completed",
+        CustomProperties: {
+          ConversationStage: ConversationStage.Initialization
+        }
+      });
+    } finally {
+      startChatInProgressRef.current = false;
     }
-    TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
-      Event: TelemetryEvent.LCWChatButtonActionCompleted,
-      Description: "Chat button action completed",
-      CustomProperties: {
-        ConversationStage: ConversationStage.Initialization
-      }
-    });
   };
   const outOfOfficeStyleProps = Object.assign({}, defaultOutOfOfficeChatButtonStyleProps, outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.styleProps);
   const controlProps = {

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

@@ -349,14 +349,53 @@ export const closeChatStateCleanUp = dispatch => {
   });
 };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const logCleanUpDisconnectFailure = error => {
+  TelemetryHelper.logActionEvent(LogLevel.WARN, {
+    Event: TelemetryEvent.ChatSDKStateCleanUpDisconnectFailed,
+    Description: "Failed to disconnect the previous conversation during chat SDK state clean up.",
+    ExceptionDetails: {
+      exception: (error === null || error === void 0 ? void 0 : error.message) ?? error
+    }
+  });
+};
+
+// Releases the previous session's conversation. Mirrors the cleanup OmnichannelChatSDK.endChat()
+// runs in its finally block (disconnect, then drop the reference). Without it, a conversation
+// left over from a failed or orphaned start chat, or from a chat ended in another tab (which
+// skips the SDK endChat), keeps its messaging session open and leaks into the next chat.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const disconnectConversation = chatSDK => {
+  const conversation = chatSDK.conversation;
+  if (!conversation || typeof conversation.disconnect !== "function") {
+    return;
+  }
+  try {
+    // ACS conversations disconnect asynchronously; legacy IC3 conversations may not return a promise.
+    const result = conversation.disconnect();
+    if (result && typeof result.catch === "function") {
+      result.catch(logCleanUpDisconnectFailure);
+    }
+  } catch (error) {
+    logCleanUpDisconnectFailure(error);
+  }
+};
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const chatSDKStateCleanUp = chatSDK => {
+  if (!chatSDK) {
+    return;
+  }
+
   // 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;
+  disconnectConversation(chatSDK);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  chatSDK.conversation = null;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -18,19 +18,86 @@ import { isMidAuthEnabled } from "./authHelper";
 import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey";
 import { shouldSetPreChatIfPersistentChat } from "./persistentChatHelper";
 import { updateTelemetryData } from "./updateSessionDataForTelemetry";
+/**
+ * Per widget instance mutexes for the two chat creation entry points.
+ *
+ * Every guard in the prepareStartChat -> setPreChatAndInitiateChat -> initStartChat chain
+ * checks `conversationState === Closed`, but React state is updated asynchronously. A second
+ * invocation fired within the same render cycle (for example a rapid double click on the chat
+ * button, or a chat button click racing a BroadcastEvent.StartChat) therefore still observes
+ * the stale `Closed` state, reaches `facadeChatSDK.startChat()` and creates a second
+ * conversation on the backend which is then orphaned and never ended.
+ *
+ * The locks are keyed by FacadeChatSDK instance rather than being module wide, because a host
+ * page can mount several independent widgets, each with its own widgetInstanceId and its own
+ * FacadeChatSDK (created once per widget in LiveChatWidget.tsx). A module wide lock would make
+ * widget A's start chat silently drop widget B's legitimate simultaneous start chat.
+ *
+ * The two maps are separate because prepareStartChat calls initStartChat; sharing a single lock
+ * would make the nested call see its own parent as in flight and drop it. prepareStartChat is
+ * additionally blocked by an in flight initStartChat (pre-chat submit, reconnect, or the
+ * hideStartChatButton bootstrap call initStartChat directly). Otherwise a later prepareStartChat
+ * would dispatch Loading and maximize the widget, and only then have its nested initStartChat
+ * dropped.
+ */
+const prepareStartChatGuards = new WeakMap();
+const initStartChatGuards = new WeakMap();
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let optionalParams = {};
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let widgetInstanceId;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let popoutWidgetInstanceId;
+// Fallback owner used only when no FacadeChatSDK instance is available to key on, so the guard
+// degrades to the module wide behaviour instead of disappearing altogether.
+const unkeyedGuardOwner = {};
+const getGuard = (guards, facadeChatSDK) => {
+  const owner = facadeChatSDK ?? unkeyedGuardOwner;
+  let guard = guards.get(owner);
+  if (!guard) {
+    guard = {
+      inFlight: false
+    };
+    guards.set(owner, guard);
+  }
+  return guard;
+};
+
+/**
+ * Runs `operation` only if no other invocation for the same widget instance is already in
+ * flight. Concurrent invocations are dropped (and reported through telemetry) rather than
+ * awaiting the in-flight promise, so a future re-entrant call can never deadlock on itself.
+ * No caller acts on the resolved value, so dropping is safe.
+ *
+ * `blockedBy` lets an operation also yield to a different, already running operation for the
+ * same widget instance without claiming that operation's lock.
+ */
+const runExclusively = async (guards, facadeChatSDK, description, operation, props, blockedBy) => {
+  const guard = getGuard(guards, facadeChatSDK);
+  const blockingGuard = blockedBy ? getGuard(blockedBy, facadeChatSDK) : undefined;
+  if (guard.inFlight || blockingGuard !== null && blockingGuard !== void 0 && blockingGuard.inFlight) {
+    TelemetryHelper.logActionEvent(LogLevel.WARN, {
+      Event: TelemetryEvent.ConcurrentStartChatRejected,
+      Description: description,
+      CustomProperties: {
+        WidgetCacheId: props ? getWidgetCacheIdfromProps(props) : undefined
+      }
+    });
+    return;
+  }
+
+  // Claim the lock before invoking the operation, so a re-entrant call made from the
+  // operation's synchronous preamble (before its first await) cannot slip past the check above.
+  guard.inFlight = true;
+  try {
+    await operation();
+  } finally {
+    guard.inFlight = false;
+  }
+};
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareStartChat = async (props, facadeChatSDK, state, dispatch, setAdapter) => {
-  optionalParams = {}; //Resetting to ensure no stale values
-  widgetInstanceId = getWidgetCacheIdfromProps(props);
+  return runExclusively(prepareStartChatGuards, facadeChatSDK, "Concurrent prepareStartChat call ignored, a start chat operation is already in progress for this widget instance.", () => prepareStartChatInternal(props, facadeChatSDK, state, dispatch, setAdapter), props, initStartChatGuards);
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const prepareStartChatInternal = async (props, facadeChatSDK, state, dispatch, setAdapter) => {
   // reconnect > chat from cache
   if (isReconnectEnabled(props.chatConfig) === true && !isPersistentEnabled(props.chatConfig)) {
     const shouldStartChatNormally = await handleChatReconnect(facadeChatSDK, props, dispatch, setAdapter, initStartChat, state);
@@ -156,6 +223,11 @@ const setPreChatAndInitiateChat = async (facadeChatSDK, dispatch, setAdapter, is
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
+  return runExclusively(initStartChatGuards, facadeChatSDK, "Concurrent initStartChat call ignored, a start chat operation is already in progress for this widget instance.", () => initStartChatInternal(facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState), props);
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const initStartChatInternal = async (facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
   var _state$domainStates7;
   let isStartChatSuccessful = false;
   const persistentChatEnabled = isPersistentChatEnabled(state === null || state === void 0 || (_state$domainStates7 = state.domainStates) === null || _state$domainStates7 === void 0 || (_state$domainStates7 = _state$domainStates7.liveChatConfig) === null || _state$domainStates7 === void 0 || (_state$domainStates7 = _state$domainStates7.LiveWSAndLiveChatEngJoin) === null || _state$domainStates7 === void 0 ? void 0 : _state$domainStates7.msdyn_conversationmode);
@@ -194,14 +266,15 @@ const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props,
     }
     try {
       var _window$Microsoft, _state$domainStates8;
-      // Set custom context params
-      await setCustomContextParams(state, props);
+      // Set custom context params. Returned (not stored module-side) so that concurrent
+      // widget instances cannot overwrite each other's custom context.
+      const customContextParams = await setCustomContextParams(state, props);
       const defaultOptionalParams = {
         sendDefaultInitContext: true,
         isProactiveChat: !!(params !== null && params !== void 0 && params.isProactiveChat),
         portalContactId: (_window$Microsoft = window.Microsoft) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.Dynamic365) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.Portal) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.User) === null || _window$Microsoft === void 0 ? void 0 : _window$Microsoft.contactId
       };
-      const startChatOptionalParams = Object.assign({}, params, optionalParams, defaultOptionalParams);
+      const startChatOptionalParams = Object.assign({}, params, customContextParams, defaultOptionalParams);
 
       // MID-AUTH: Add wasAuthenticated flag for reconnect scenarios
       // Tells FacadeChatSDK whether the previous session was authenticated
@@ -284,9 +357,6 @@ const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props,
     await updateTelemetryData(facadeChatSDK, dispatch);
   } catch (ex) {
     handleStartChatError(dispatch, facadeChatSDK, props, ex, isStartChatSuccessful);
-  } finally {
-    optionalParams = {};
-    widgetInstanceId = "";
   }
 };
 
@@ -330,19 +400,22 @@ const canConnectToExistingChat = async (props, facadeChatSDK, state, dispatch, s
   return false;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+/**
+ * Resolves the custom context to start the chat with.
+ *
+ * Returns the resolved params instead of mutating module-level state: a page can host several
+ * independent widgets, and once per-instance start-chat guards allow them to run concurrently,
+ * shared mutable state would let one widget overwrite another widget's custom context.
+ */
 const setCustomContextParams = async (state, props) => {
   var _state$domainStates9, _persistedState$domai5;
   if (state !== null && state !== void 0 && (_state$domainStates9 = state.domainStates) !== null && _state$domainStates9 !== void 0 && _state$domainStates9.customContext) {
     var _state$domainStates0;
-    optionalParams = Object.assign({}, optionalParams, {
+    return {
       customContext: JSON.parse(JSON.stringify(state === null || state === void 0 || (_state$domainStates0 = state.domainStates) === null || _state$domainStates0 === void 0 ? void 0 : _state$domainStates0.customContext))
-    });
-    return;
-  }
-  if (isNullOrEmptyString(widgetInstanceId)) {
-    widgetInstanceId = getWidgetCacheIdfromProps(props);
+    };
   }
+  const widgetInstanceId = props ? getWidgetCacheIdfromProps(props) : "";
   // Add custom context only for unauthenticated chat
   const persistedState = getStateFromCache(widgetInstanceId);
   const customContextLocal = (persistedState === null || persistedState === void 0 || (_persistedState$domai5 = persistedState.domainStates) === null || _persistedState$domai5 === void 0 ? void 0 : _persistedState$domai5.customContext) ?? (props === null || props === void 0 ? void 0 : props.initialCustomContext);
@@ -351,23 +424,23 @@ const setCustomContextParams = async (state, props) => {
       Event: TelemetryEvent.SettingCustomContext,
       Description: "Setting custom context for unauthenticated chat"
     });
-    optionalParams = Object.assign({}, optionalParams, {
+    return {
       customContext: JSON.parse(JSON.stringify(customContextLocal))
-    });
-  } else {
-    const customContextFromParent = await getInitContextParamsForPopout();
-    if (!isUndefinedOrEmpty(customContextFromParent === null || customContextFromParent === void 0 ? void 0 : customContextFromParent.contextVariables)) {
-      optionalParams = Object.assign({}, optionalParams, {
-        customContext: JSON.parse(JSON.stringify(customContextFromParent.contextVariables))
-      });
-    }
+    };
+  }
+  const customContextFromParent = await getInitContextParamsForPopout();
+  if (!isUndefinedOrEmpty(customContextFromParent === null || customContextFromParent === void 0 ? void 0 : customContextFromParent.contextVariables)) {
+    return {
+      customContext: JSON.parse(JSON.stringify(customContextFromParent.contextVariables))
+    };
   }
+  return {};
 };
 const canStartPopoutChat = async props => {
   if (props.allowSdkChatSupport === false) {
     return false;
   }
-  popoutWidgetInstanceId = getWidgetCacheIdfromProps(props, true);
+  const popoutWidgetInstanceId = getWidgetCacheIdfromProps(props, true);
   if (!isNullOrEmptyString(popoutWidgetInstanceId)) {
     var _persistedState$domai6, _persistedState$appSt3;
     const persistedState = getStateFromCache(popoutWidgetInstanceId);

package/lib/types/common/telemetry/TelemetryConstants.d.ts

@@ -127,6 +127,8 @@ export declare enum TelemetryEvent {
     PrechatSubmitted = "PrechatSubmitted",
     StartChatSDKCall = "StartChatCall",
     StartChatEventReceived = "StartChatEventReceived",
+    ConcurrentStartChatRejected = "ConcurrentStartChatRejected",
+    ChatSDKStateCleanUpDisconnectFailed = "ChatSDKStateCleanUpDisconnectFailed",
     EndChatSDKCall = "EndChatSDKCall",
     PrepareEndChat = "PrepareEndChat",
     EndChatEventReceived = "EndChatEventReceived",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "2.0.1-main.84e2c02",
+  "version": "2.0.1-main.c997354",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",