@microsoft/omnichannel-chat-sdk 2.0.2-main.c0f210d → 2.1.0-main.8f375cf

package/lib/OmnichannelChatSDK.js

@@ -67,6 +67,7 @@ var locale_1 = require("./utils/locale");
 var exceptionThrowers_1 = require("./utils/exceptionThrowers");
 var errorClassifier_1 = require("./utils/errorClassifier");
 var utilities_1 = require("./utils/utilities");
+var messageUpdates_1 = require("./utils/messageUpdates");
 var WebUtils_1 = require("./utils/WebUtils");
 var AMSClientUtils_1 = require("./utils/AMSClientUtils");
 var SDKConfigValidators_1 = require("./validators/SDKConfigValidators");
@@ -86,6 +87,7 @@ var MessageContentType_1 = require("@microsoft/omnichannel-ic3core/lib/model/Mes
 var MessageSource_1 = require("./telemetry/MessageSource");
 var MessageType_1 = require("@microsoft/omnichannel-ic3core/lib/model/MessageType");
 var OmnichannelErrorCodes_1 = require("./core/OmnichannelErrorCodes");
+var OmnichannelMessage_1 = require("./core/messaging/OmnichannelMessage");
 var PersonType_1 = require("@microsoft/omnichannel-ic3core/lib/model/PersonType");
 var ProtocoleType_1 = require("@microsoft/omnichannel-ic3core/lib/interfaces/ProtocoleType");
 var ScenarioMarker_1 = require("./telemetry/ScenarioMarker");
@@ -103,6 +105,7 @@ var location_1 = require("./utils/location");
 var internalUtils_1 = require("./utils/internalUtils");
 var loggerUtils_1 = require("./utils/loggerUtils");
 var parsers_1 = require("./utils/parsers");
+var chatTokenUnauthorizedRecovery_1 = require("./utils/chatTokenUnauthorizedRecovery");
 var chatTokenRenewal_1 = require("./utils/chatTokenRenewal");
 var platform_1 = require("./utils/platform");
 var retrieveCollectorUri_1 = require("./telemetry/retrieveCollectorUri");
@@ -126,6 +129,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
         this.unqServicesOrgUrl = null;
         this.coreServicesOrgUrl = null;
         this.dynamicsLocationCode = null;
+        this.chatTokenUnauthorizedRecovery = null;
+        this.chatTokenRenewedListeners = new Set();
         this.widgetSnippetBaseUrl = '';
         this.dataMaskingRules = { rules: [] };
         this.authSettings = null;
@@ -142,6 +147,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
         this.isPersistentChat = false;
         this.isChatReconnect = false;
         this.reconnectId = null;
+        // Session key of the most recently ended chat. MRT validates it on transcript calls made after endChat.
+        this.endedChatSessionKey = null;
         this.refreshTokenTimer = null;
         this.AMSClientLoadCurrentState = AMSClientLoadStates_1.AMSClientLoadStates.NOT_LOADED;
         this.isMaskingDisabled = false;
@@ -877,6 +884,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                 switch (_u.label) {
                     case 0:
                         this.isEndingChat = false;
+                        this.endedChatSessionKey = null;
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.StartChat, {
                             RequestId: this.requestId
                         });
@@ -958,7 +966,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                 hasAuthToken: String(!!this.authenticatedUserToken)
                             })
                         });
-                        if (!this.authSettings) return [3 /*break*/, 15];
+                        if (!this.authSettings) return [3 /*break*/, 16];
                         if (!(isMidAuthEnabled && (deferInitialAuth || !this.authenticatedUserToken))) return [3 /*break*/, 9];
                         this.scenarioMarker.singleRecord(TelemetryEvent_1.default.StartChat, {
                             RequestId: this.requestId || "",
@@ -969,7 +977,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                 hasAuthToken: String(!!this.authenticatedUserToken)
                             })
                         });
-                        return [3 /*break*/, 15];
+                        return [3 /*break*/, 16];
                     case 9:
                         if (!!this.authenticatedUserToken) return [3 /*break*/, 11];
                         return [4 /*yield*/, this.setAuthTokenProvider(this.chatSDKConfig.getAuthToken, { throwError: true })];
@@ -977,7 +985,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         _u.sent();
                         _u.label = 11;
                     case 11:
-                        if (!(optionalParams.liveChatContext && Object.keys(optionalParams.liveChatContext).length > 0)) return [3 /*break*/, 15];
+                        if (!(optionalParams.liveChatContext && Object.keys(optionalParams.liveChatContext).length > 0)) return [3 /*break*/, 16];
                         this.chatToken = optionalParams.liveChatContext.chatToken || {};
                         this.requestId = optionalParams.liveChatContext.requestId || (0, ocsdk_1.uuidv4)();
                         _u.label = 12;
@@ -999,12 +1007,21 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         exceptionThrowers_1.default.throwAuthenticatedChatConversationRetrievalFailure(e_7, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                         return [3 /*break*/, 15];
                     case 15:
-                        if (!(((_k = this.chatSDKConfig.useCreateConversation) === null || _k === void 0 ? void 0 : _k.disable) && this.chatToken && Object.keys(this.chatToken).length === 0)) return [3 /*break*/, 17];
-                        return [4 /*yield*/, this.getChatToken(false)];
+                        // A persistent chat restore has a reconnectId, so the restore above skipped the key. Without it,
+                        // calls the service validates against the chat's session key (transcripts) return 401. Apply it
+                        // only after the chat is confirmed to belong to the signed-in user.
+                        this.sessionId = optionalParams.liveChatContext.sessionId || null;
+                        if (this.sessionId) {
+                            this.OCClient.sessionId = this.sessionId;
+                        }
+                        _u.label = 16;
                     case 16:
-                        _u.sent();
-                        _u.label = 17;
+                        if (!(((_k = this.chatSDKConfig.useCreateConversation) === null || _k === void 0 ? void 0 : _k.disable) && this.chatToken && Object.keys(this.chatToken).length === 0)) return [3 /*break*/, 18];
+                        return [4 /*yield*/, this.getChatToken(false)];
                     case 17:
+                        _u.sent();
+                        _u.label = 18;
+                    case 18:
                         if ((_l = this.chatToken) === null || _l === void 0 ? void 0 : _l.chatId) {
                             loggerUtils_1.default.setChatId(this.chatToken.chatId || '', this.ocSdkLogger, this.acsClientLogger, this.acsAdapterLogger, this.callingSdkLogger, this.amsClientLogger, this.ic3ClientLogger);
                         }
@@ -1025,14 +1042,14 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         else if (this.isChatReconnect && !((_o = this.chatSDKConfig.chatReconnect) === null || _o === void 0 ? void 0 : _o.disable) && !this.isPersistentChat) {
                             sessionInitOptionalParams.reconnectId = this.reconnectId;
                         }
-                        if (!((0, parsers_1.parseLowerCaseString)((_q = (_p = this.liveChatConfig) === null || _p === void 0 ? void 0 : _p.LiveWSAndLiveChatEngJoin) === null || _q === void 0 ? void 0 : _q.msdyn_requestvisitorlocation) === "true")) return [3 /*break*/, 19];
+                        if (!((0, parsers_1.parseLowerCaseString)((_q = (_p = this.liveChatConfig) === null || _p === void 0 ? void 0 : _p.LiveWSAndLiveChatEngJoin) === null || _q === void 0 ? void 0 : _q.msdyn_requestvisitorlocation) === "true")) return [3 /*break*/, 20];
                         return [4 /*yield*/, (0, location_1.getLocationInfo)(this.scenarioMarker, this.chatToken.chatId, this.requestId)];
-                    case 18:
+                    case 19:
                         location_2 = _u.sent();
                         sessionInitOptionalParams.initContext.latitude = location_2.latitude;
                         sessionInitOptionalParams.initContext.longitude = location_2.longitude;
-                        _u.label = 19;
-                    case 19:
+                        _u.label = 20;
+                    case 20:
                         sessionInitPromise = function () { return __awaiter(_this, void 0, void 0, function () {
                             var error_6, telemetryData;
                             var _a, _b, _c;
@@ -1098,10 +1115,10 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             });
                         }); };
                         messagingClientPromise = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var chatAdapterConfig, error_8, telemetryData, _a, error_9, telemetryData, error_10, telemetryData, _b, error_11, telemetryData;
-                            var _c, _d;
-                            return __generator(this, function (_e) {
-                                switch (_e.label) {
+                            var chatAdapterConfig, tokenRefresher, error_8, telemetryData, _a, error_9, telemetryData, error_10, telemetryData, _b, error_11, telemetryData;
+                            var _c, _d, _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
                                     case 0:
                                         if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 8];
                                         chatAdapterConfig = {
@@ -1111,19 +1128,22 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                             environmentUrl: this.chatToken.acsEndpoint,
                                             pollingInterval: 30000
                                         };
-                                        _e.label = 1;
+                                        _f.label = 1;
                                     case 1:
-                                        _e.trys.push([1, 3, , 4]);
+                                        _f.trys.push([1, 3, , 4]);
+                                        tokenRefresher = this.createChatTokenRefresher(chatAdapterConfig.token);
+                                        this.chatTokenUnauthorizedRecovery = this.createChatTokenUnauthorizedRecovery(chatAdapterConfig.token, tokenRefresher);
                                         return [4 /*yield*/, ((_c = this.ACSClient) === null || _c === void 0 ? void 0 : _c.initialize({
                                                 token: chatAdapterConfig.token,
                                                 environmentUrl: chatAdapterConfig.environmentUrl,
-                                                tokenRefresher: this.createChatTokenRefresher(chatAdapterConfig.token)
+                                                tokenRefresher: tokenRefresher,
+                                                unauthorizedRecovery: (_d = this.chatTokenUnauthorizedRecovery) !== null && _d !== void 0 ? _d : undefined
                                             }))];
                                     case 2:
-                                        _e.sent();
+                                        _f.sent();
                                         return [3 /*break*/, 4];
                                     case 3:
-                                        error_8 = _e.sent();
+                                        error_8 = _f.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
@@ -1131,22 +1151,22 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         exceptionThrowers_1.default.throwMessagingClientInitializationFailure(error_8, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         return [3 /*break*/, 4];
                                     case 4:
-                                        _e.trys.push([4, 6, , 7]);
+                                        _f.trys.push([4, 6, , 7]);
                                         _a = this;
-                                        return [4 /*yield*/, ((_d = this.ACSClient) === null || _d === void 0 ? void 0 : _d.joinConversation({
+                                        return [4 /*yield*/, ((_e = this.ACSClient) === null || _e === void 0 ? void 0 : _e.joinConversation({
                                                 id: chatAdapterConfig.id,
                                                 threadId: chatAdapterConfig.threadId,
                                                 pollingInterval: chatAdapterConfig.pollingInterval
                                             }))];
                                     case 5:
-                                        _a.conversation = (_e.sent());
+                                        _a.conversation = (_f.sent());
                                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.StartChat, {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId
                                         });
                                         return [3 /*break*/, 7];
                                     case 6:
-                                        error_9 = _e.sent();
+                                        error_9 = _f.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
@@ -1155,17 +1175,17 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         return [3 /*break*/, 7];
                                     case 7: return [3 /*break*/, 14];
                                     case 8:
-                                        _e.trys.push([8, 10, , 11]);
+                                        _f.trys.push([8, 10, , 11]);
                                         return [4 /*yield*/, this.IC3Client.initialize({
                                                 token: this.chatToken.token,
                                                 regionGtms: this.chatToken.regionGTMS,
                                                 visitor: true
                                             })];
                                     case 9:
-                                        _e.sent();
+                                        _f.sent();
                                         return [3 /*break*/, 11];
                                     case 10:
-                                        error_10 = _e.sent();
+                                        error_10 = _f.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
@@ -1173,18 +1193,18 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         exceptionThrowers_1.default.throwMessagingClientInitializationFailure(error_10, this.scenarioMarker, TelemetryEvent_1.default.StartChat, telemetryData);
                                         return [3 /*break*/, 11];
                                     case 11:
-                                        _e.trys.push([11, 13, , 14]);
+                                        _f.trys.push([11, 13, , 14]);
                                         _b = this;
                                         return [4 /*yield*/, this.IC3Client.joinConversation(this.chatToken.chatId)];
                                     case 12:
-                                        _b.conversation = _e.sent();
+                                        _b.conversation = _f.sent();
                                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.StartChat, {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId
                                         });
                                         return [3 /*break*/, 14];
                                     case 13:
-                                        error_11 = _e.sent();
+                                        error_11 = _f.sent();
                                         telemetryData = {
                                             RequestId: this.requestId,
                                             ChatId: this.chatToken.chatId,
@@ -1227,32 +1247,32 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                 }
                             });
                         }); };
-                        if (!!((_r = this.chatSDKConfig.useCreateConversation) === null || _r === void 0 ? void 0 : _r.disable)) return [3 /*break*/, 21];
+                        if (!!((_r = this.chatSDKConfig.useCreateConversation) === null || _r === void 0 ? void 0 : _r.disable)) return [3 /*break*/, 22];
                         return [4 /*yield*/, createConversationPromise()];
-                    case 20:
+                    case 21:
                         _u.sent();
-                        return [3 /*break*/, 23];
-                    case 21: return [4 /*yield*/, sessionInitPromise()];
-                    case 22:
-                        _u.sent(); // Await the session initialization
-                        _u.label = 23;
+                        return [3 /*break*/, 24];
+                    case 22: return [4 /*yield*/, sessionInitPromise()];
                     case 23:
-                        _u.trys.push([23, 25, , 27]);
-                        return [4 /*yield*/, Promise.all([messagingClientPromise(), attachmentClientPromise()])];
+                        _u.sent(); // Await the session initialization
+                        _u.label = 24;
                     case 24:
-                        _u.sent();
-                        return [3 /*break*/, 27];
+                        _u.trys.push([24, 26, , 28]);
+                        return [4 /*yield*/, Promise.all([messagingClientPromise(), attachmentClientPromise()])];
                     case 25:
+                        _u.sent();
+                        return [3 /*break*/, 28];
+                    case 26:
                         error_5 = _u.sent();
                         // If conversation joining fails after conversation was created, clean up the conversation
                         // Only cleanup conversations that were freshly created (not existing ones being reconnected to)
                         return [4 /*yield*/, this.handleConversationJoinFailure(error_5, optionalParams)];
-                    case 26:
+                    case 27:
                         // If conversation joining fails after conversation was created, clean up the conversation
                         // Only cleanup conversations that were freshly created (not existing ones being reconnected to)
                         _u.sent();
                         throw error_5; // Re-throw the original error
-                    case 27:
+                    case 28:
                         if (this.isPersistentChat && !((_s = this.chatSDKConfig.persistentChat) === null || _s === void 0 ? void 0 : _s.disable)) {
                             this.refreshTokenTimer = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
                                 var error_13;
@@ -1362,7 +1382,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.internalEndChat = function () {
         return __awaiter(this, arguments, void 0, function (endChatOptionalParams) {
-            var cleanupMetadata, isReactNative, isConversationalSurveyEnabled, shouldWaitForSurvey, telemetryData, surveyStarted, error_15, error_16, telemetryData;
+            var cleanupMetadata, isReactNative, isConversationalSurveyEnabled, shouldWaitForSurvey, telemetryData, surveyStarted, error_15, error_16, telemetryData, endedChatId, endedSessionId;
             var _a, _b, _c;
             if (endChatOptionalParams === void 0) { endChatOptionalParams = {}; }
             return __generator(this, function (_d) {
@@ -1421,12 +1441,17 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         exceptionThrowers_1.default.throwConversationClosureFailure(error_16, this.scenarioMarker, TelemetryEvent_1.default.EndChat, telemetryData);
                         return [3 /*break*/, 11];
                     case 10:
-                        // Cleanup always runs, regardless of success or failure
-                        // This ensures resources are released even if closeChat or survey waiting throws
+                        endedChatId = this.chatToken.chatId;
+                        endedSessionId = this.OCClient.sessionId || this.sessionId;
+                        // Keep the previous chat's key when this call had no chat to end (for example a second endChat).
+                        if (endedChatId && endedSessionId) {
+                            this.endedChatSessionKey = { chatId: endedChatId, sessionId: endedSessionId };
+                        }
                         (_c = this.conversation) === null || _c === void 0 ? void 0 : _c.disconnect();
                         this.conversation = null;
                         this.requestId = (0, ocsdk_1.uuidv4)();
                         this.chatToken = {};
+                        this.chatTokenUnauthorizedRecovery = null;
                         this.reconnectId = null;
                         if (this.IC3Client) {
                             this.IC3Client.dispose();
@@ -1545,6 +1570,20 @@ var OmnichannelChatSDK = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Subscribes to usable chat token renewals after the current SDK context has been updated.
+     * No token or other payload is passed. Read getCurrentLiveChatContext() to persist the updated context.
+     * Returns an idempotent unsubscribe function. Listener failures never affect renewal.
+     * Subscriptions belong to this SDK instance and survive endChat()/startChat().
+     * Subscribe before startChat() to observe restoration renewals; past notifications are not replayed.
+     * Unsubscribe on host teardown or before replacing a per-chat subscription.
+     */
+    OmnichannelChatSDK.prototype.onChatTokenRenewed = function (listener) {
+        var _this = this;
+        var subscription = function () { return listener(); };
+        this.chatTokenRenewedListeners.add(subscription);
+        return function () { _this.chatTokenRenewedListeners.delete(subscription); };
+    };
     OmnichannelChatSDK.prototype.getCurrentLiveChatContext = function () {
         return __awaiter(this, void 0, void 0, function () {
             var chatToken, requestId, chatSession;
@@ -1843,6 +1882,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                     var _a;
                     _this.chatToken = __assign(__assign({}, _this.chatToken), { token: renewed.Token, expiresIn: renewed.ExpiresIn !== undefined && renewed.ExpiresIn !== null ? String(renewed.ExpiresIn) : _this.chatToken.expiresIn, voiceVideoCallToken: (_a = renewed.VoiceVideoCallToken) !== null && _a !== void 0 ? _a : _this.chatToken.voiceVideoCallToken });
                     _this.refreshAttachmentClientToken(chatId_1);
+                    _this.notifyChatTokenRenewed(requestId_1, chatId_1);
                 },
                 onStart: function () { return _this.scenarioMarker.startScenario(TelemetryEvent_1.default.RenewChatToken, telemetryData_1); },
                 onSuccess: function () { return _this.scenarioMarker.completeScenario(TelemetryEvent_1.default.RenewChatToken, telemetryData_1); },
@@ -1859,6 +1899,32 @@ var OmnichannelChatSDK = /** @class */ (function () {
             return undefined;
         }
     };
+    OmnichannelChatSDK.prototype.notifyChatTokenRenewed = function (requestId, chatId) {
+        var _this = this;
+        var reportFailure = function (response) {
+            try {
+                var telemetryData = { RequestId: requestId, ChatId: chatId };
+                _this.scenarioMarker.startScenario(TelemetryEvent_1.default.ChatTokenRenewedListener, telemetryData);
+                _this.scenarioMarker.failScenario(TelemetryEvent_1.default.ChatTokenRenewedListener, __assign(__assign({}, telemetryData), { ExceptionDetails: JSON.stringify({ response: response }) }));
+            }
+            catch (_a) {
+                // Subscriber telemetry must not affect renewal or become an unhandled rejection.
+            }
+        };
+        Array.from(this.chatTokenRenewedListeners).forEach(function (listener) {
+            var _a;
+            if (_this.isEndingChat || _this.requestId !== requestId || ((_a = _this.chatToken) === null || _a === void 0 ? void 0 : _a.chatId) !== chatId
+                || !_this.chatTokenRenewedListeners.has(listener)) {
+                return;
+            }
+            try {
+                Promise.resolve(listener()).catch(function () { return reportFailure("ListenerRejected"); });
+            }
+            catch (_b) {
+                reportFailure("ListenerThrew");
+            }
+        });
+    };
     /**
      * Gives the renewed chat token to the attachment client, which keeps the token it was initialized with and uses
      * it for every upload and download. Runs in the background and never throws: on failure, attachments keep using
@@ -1897,6 +1963,42 @@ var OmnichannelChatSDK = /** @class */ (function () {
             // Attachments keep using the previous token
         }
     };
+    /**
+     * Creates the recovery for chat requests that fail with 401 while the chat token has not
+     * expired. Returns null, which keeps the existing behavior, unless chat token renewal is enabled and recovery is
+     * not disabled in the SDK config.
+     */
+    OmnichannelChatSDK.prototype.createChatTokenUnauthorizedRecovery = function (initialToken, tokenRefresher) {
+        var _this = this;
+        var _a, _b, _c;
+        try {
+            if (!tokenRefresher
+                || ((_b = (_a = this.chatSDKConfig) === null || _a === void 0 ? void 0 : _a.chatTokenRenewal) === null || _b === void 0 ? void 0 : _b.disableUnauthorizedRecovery) === true
+                || !initialToken) {
+                return null;
+            }
+            var telemetryData_3 = {
+                RequestId: this.requestId,
+                ChatId: (_c = this.chatToken) === null || _c === void 0 ? void 0 : _c.chatId
+            };
+            return (0, chatTokenUnauthorizedRecovery_1.createChatTokenUnauthorizedRecovery)({
+                initialToken: initialToken,
+                refreshToken: tokenRefresher,
+                onStart: function () { return _this.scenarioMarker.startScenario(TelemetryEvent_1.default.ChatTokenUnauthorizedRecovery, telemetryData_3); },
+                onSuccess: function (_source, usedExistingToken) {
+                    if (!usedExistingToken) {
+                        _this.scenarioMarker.completeScenario(TelemetryEvent_1.default.ChatTokenUnauthorizedRecovery, telemetryData_3);
+                    }
+                },
+                onFailure: function (source, reason) {
+                    _this.scenarioMarker.failScenario(TelemetryEvent_1.default.ChatTokenUnauthorizedRecovery, __assign(__assign({}, telemetryData_3), { ExceptionDetails: JSON.stringify({ response: reason, source: source }) }));
+                }
+            });
+        }
+        catch (_d) {
+            return null;
+        }
+    };
     /**
      * Returns the token of the authenticated user to renew the chat token with, refreshed from the auth token
      * provider when possible because the token used to start the chat may have expired. Returns undefined for
@@ -2112,7 +2214,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.onNewMessage = function (onNewMessageCallback_1) {
         return __awaiter(this, arguments, void 0, function (onNewMessageCallback, optionalParams) {
-            var postedMessages_1, messages, _i, _a, message, id, registerOnNewMessageOptionalParams;
+            var postedMessages_1, customerMessageUpdates_1, getNewCustomerVersion_1, messages, _i, _a, message, id, customerMessage, customerVersion, registerOnNewMessageOptionalParams;
             var _this = this;
             var _b;
             if (optionalParams === void 0) { optionalParams = {}; }
@@ -2128,6 +2230,20 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         }
                         if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 3];
                         postedMessages_1 = new Set();
+                        customerMessageUpdates_1 = new messageUpdates_1.MessageUpdateTracker();
+                        getNewCustomerVersion_1 = function (message) {
+                            var version = (0, messageUpdates_1.getMessageVersion)(message);
+                            if (version === undefined) {
+                                _this.scenarioMarker.singleRecord(TelemetryEvent_1.default.OnNewMessage, {
+                                    RequestId: _this.requestId,
+                                    ChatId: _this.chatToken.chatId,
+                                    ExceptionDetails: "InvalidCustomerMessageVersion"
+                                });
+                                console.warn("[OmnichannelChatSDK][onNewMessage] Invalid customer message version");
+                                return undefined;
+                            }
+                            return customerMessageUpdates_1.shouldDeliver(message.id, version) ? version : undefined;
+                        };
                         if (!(optionalParams === null || optionalParams === void 0 ? void 0 : optionalParams.rehydrate)) return [3 /*break*/, 2];
                         this.debug && console.log('[OmnichannelChatSDK][onNewMessage] rehydrate');
                         return [4 /*yield*/, this.getMessages()];
@@ -2139,8 +2255,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             if (postedMessages_1.has(id)) {
                                 continue;
                             }
+                            customerMessage = (0, utilities_1.isCustomerMessage)(message);
+                            customerVersion = customerMessage ? (0, messageUpdates_1.getMessageVersion)(message) : undefined;
+                            if (customerMessage) {
+                                message.role = OmnichannelMessage_1.Role.User;
+                            }
                             postedMessages_1.add(id);
                             onNewMessageCallback(message);
+                            if (customerVersion !== undefined) {
+                                customerMessageUpdates_1.markDelivered(id, customerVersion);
+                            }
                         }
                         _c.label = 2;
                     case 2:
@@ -2157,7 +2281,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             (_b = this.conversation) === null || _b === void 0 ? void 0 : _b.registerOnNewMessage(function (event) {
                                 var id = event.id;
                                 var isChatMessageEditedEvent = Object.keys(event).includes("editedOn");
-                                console.log("[OmnichannelChatSDK][onNewMessage] New message received", event);
+                                console.log("[OmnichannelChatSDK][onNewMessage] New message received");
                                 console.log("[OmnichannelChatSDK][onNewMessage] isChatMessageEditedEvent=>", isChatMessageEditedEvent);
                                 // Guard message transformation: createOmnichannelMessage() can throw
                                 // (e.g. unexpected event shape). Without this, the throw became an
@@ -2185,9 +2309,23 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                     });
                                     return;
                                 }
+                                var customerMessage = (0, utilities_1.isCustomerMessage)(omnichannelMessage);
+                                if (customerMessage && !(0, messageUpdates_1.isMessageEdited)(event)) {
+                                    return;
+                                }
+                                var customerVersion = customerMessage ? getNewCustomerVersion_1(event) : undefined;
+                                if (customerMessage && customerVersion === undefined) {
+                                    return;
+                                }
+                                if (customerMessage) {
+                                    omnichannelMessage.role = OmnichannelMessage_1.Role.User;
+                                }
                                 // send callback for new messages or edited existent messages
-                                if (!postedMessages_1.has(id) || isChatMessageEditedEvent) {
+                                if (customerMessage || !postedMessages_1.has(id) || isChatMessageEditedEvent) {
                                     onNewMessageCallback(omnichannelMessage);
+                                    if (customerVersion !== undefined) {
+                                        customerMessageUpdates_1.markDelivered(id, customerVersion);
+                                    }
                                     console.log("[OmnichannelChatSDK][onNewMessage] Message posted");
                                     postedMessages_1.add(id);
                                 }
@@ -2769,7 +2907,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.emailLiveChatTranscript = function (body_1) {
         return __awaiter(this, arguments, void 0, function (body, optionalParams) {
-            var emailTranscriptOptionalParams, requestId, chatToken, chatId, sessionId, emailRequestBody, error_27;
+            var emailTranscriptOptionalParams, requestId, chatToken, chatId, requestSessionKey, emailRequestBody_1, error_27;
+            var _this = this;
             var _a;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_b) {
@@ -2779,16 +2918,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         requestId = this.requestId;
                         chatToken = this.chatToken;
                         chatId = chatToken.chatId;
-                        sessionId = this.sessionId;
                         if (optionalParams.liveChatContext) {
                             requestId = optionalParams.liveChatContext.requestId;
                             chatToken = optionalParams.liveChatContext.chatToken;
                             chatId = chatToken.chatId;
                         }
-                        if ((_a = optionalParams.liveChatContext) === null || _a === void 0 ? void 0 : _a.sessionId) {
-                            sessionId = optionalParams.liveChatContext.sessionId;
-                            this.OCClient.sessionId = sessionId;
-                        }
+                        requestSessionKey = ((_a = optionalParams.liveChatContext) === null || _a === void 0 ? void 0 : _a.sessionId) || this.getEndedChatSessionKey(chatId);
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.EmailLiveChatTranscript, {
                             RequestId: requestId,
                             ChatId: chatId
@@ -2802,18 +2937,15 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         if (this.authenticatedUserToken) {
                             emailTranscriptOptionalParams.authenticatedUserToken = this.authenticatedUserToken;
                         }
-                        emailRequestBody = {
+                        emailRequestBody_1 = {
                             ChatId: chatId,
                             EmailAddress: body.emailAddress,
                             DefaultAttachmentMessage: body.attachmentMessage,
                             CustomerLocale: body.locale || (0, locale_1.getLocaleStringFromId)(this.localeId)
                         };
-                        return [4 /*yield*/, this.OCClient.emailTranscript(requestId, chatToken.token, emailRequestBody, emailTranscriptOptionalParams)];
+                        return [4 /*yield*/, this.withRequestSessionKey(requestSessionKey, function () { return _this.OCClient.emailTranscript(requestId, chatToken.token, emailRequestBody_1, emailTranscriptOptionalParams); })];
                     case 2:
                         _b.sent();
-                        if (this.sessionId) {
-                            this.OCClient.sessionId = this.sessionId;
-                        }
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.EmailLiveChatTranscript, {
                             RequestId: requestId,
                             ChatId: chatId
@@ -2834,7 +2966,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getLiveChatTranscript = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
-            var getChatTranscriptOptionalParams, requestId, chatToken, chatId, sessionId, transcriptResponse, error_28, telemetryData;
+            var getChatTranscriptOptionalParams, requestId, chatToken, chatId, requestSessionKey, transcriptResponse, error_28, telemetryData;
+            var _this = this;
             var _a, _b;
             if (optionalParams === void 0) { optionalParams = {}; }
             return __generator(this, function (_c) {
@@ -2844,7 +2977,6 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         requestId = this.requestId;
                         chatToken = this.chatToken;
                         chatId = chatToken.chatId;
-                        sessionId = this.sessionId;
                         if (optionalParams.liveChatContext) {
                             if (this.isPersistentChat && !((_a = this.chatSDKConfig.persistentChat) === null || _a === void 0 ? void 0 : _a.disable)) {
                                 requestId = this.requestId || optionalParams.liveChatContext.requestId;
@@ -2856,10 +2988,6 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             }
                             chatId = chatToken.chatId;
                         }
-                        if ((_b = optionalParams.liveChatContext) === null || _b === void 0 ? void 0 : _b.sessionId) {
-                            sessionId = optionalParams.liveChatContext.sessionId;
-                            this.OCClient.sessionId = sessionId;
-                        }
                         if (!chatId) {
                             throw new ChatSDKError_1.ChatSDKError(ChatSDKError_1.ChatSDKErrorName.LiveChatTranscriptRetrievalFailure, undefined, {
                                 response: ChatSDKError_1.ChatSDKErrorName.LiveChatTranscriptRetrievalFailure,
@@ -2873,18 +3001,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         if (!this.isInitialized) {
                             exceptionThrowers_1.default.throwUninitializedChatSDK(this.scenarioMarker, TelemetryEvent_1.default.GetLiveChatTranscript);
                         }
+                        requestSessionKey = ((_b = optionalParams.liveChatContext) === null || _b === void 0 ? void 0 : _b.sessionId) || this.getEndedChatSessionKey(chatId);
                         _c.label = 1;
                     case 1:
                         _c.trys.push([1, 3, , 4]);
                         if (this.authenticatedUserToken) {
                             getChatTranscriptOptionalParams.authenticatedUserToken = this.authenticatedUserToken;
                         }
-                        return [4 /*yield*/, this.OCClient.getChatTranscripts(requestId, chatToken.chatId, chatToken.token, getChatTranscriptOptionalParams)];
+                        return [4 /*yield*/, this.withRequestSessionKey(requestSessionKey, function () { return _this.OCClient.getChatTranscripts(requestId, chatToken.chatId, chatToken.token, getChatTranscriptOptionalParams); })];
                     case 2:
                         transcriptResponse = _c.sent();
-                        if (this.sessionId) {
-                            this.OCClient.sessionId = this.sessionId;
-                        }
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetLiveChatTranscript, {
                             RequestId: requestId,
                             ChatId: chatId
@@ -2903,6 +3029,30 @@ var OmnichannelChatSDK = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Returns the ended chat's session key when the call targets that chat, or null.
+     */
+    OmnichannelChatSDK.prototype.getEndedChatSessionKey = function (chatId) {
+        var _a;
+        return chatId && ((_a = this.endedChatSessionKey) === null || _a === void 0 ? void 0 : _a.chatId) === chatId ? this.endedChatSessionKey.sessionId : null;
+    };
+    /**
+     * Sends the session key on one OCSDK request without leaving it on the shared client. OCSDK copies the
+     * key into the request headers before its first await, so the previous key is restored before the HTTP wait.
+     */
+    OmnichannelChatSDK.prototype.withRequestSessionKey = function (sessionKey, request) {
+        if (!sessionKey) {
+            return request();
+        }
+        var previousSessionKey = this.OCClient.sessionId;
+        this.OCClient.sessionId = sessionKey;
+        try {
+            return request();
+        }
+        finally {
+            this.OCClient.sessionId = previousSessionKey;
+        }
+    };
     OmnichannelChatSDK.prototype.createChatAdapter = function () {
         return __awaiter(this, arguments, void 0, function (optionalParams) {
             var protocol, supportedChatAdapterProtocols, options, fileManager;