@microsoft/omnichannel-chat-sdk 0.3.1-main.c96fb51 → 1.0.1-main.1e6bcff

package/lib/OmnichannelChatSDK.js

@@ -55,35 +55,46 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
     return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var loggers_1 = require("./utils/loggers");
+var ACSClient_1 = require("./core/messaging/ACSClient");
+var ocsdk_1 = require("@microsoft/ocsdk");
+var platform_1 = require("./utils/platform");
+var SDKConfigValidators_1 = require("./validators/SDKConfigValidators");
+var ACSParticipantDisplayName_1 = require("./core/messaging/ACSParticipantDisplayName");
+var AMSFileManager_1 = require("./external/ACSAdapter/AMSFileManager");
 var CallingOptionsOptionSetNumber_1 = require("./core/CallingOptionsOptionSetNumber");
-var ChatAdapterProtocols_1 = require("./core/ChatAdapterProtocols");
+var ChatAdapterProtocols_1 = require("./core/messaging/ChatAdapterProtocols");
 var ConversationMode_1 = require("./core/ConversationMode");
-var loggers_1 = require("./utils/loggers");
-var createTelemetry_1 = require("./utils/createTelemetry");
-var createVoiceVideoCalling_1 = require("./api/createVoiceVideoCalling");
-var MessageTags_1 = require("./core/MessageTags");
+var createFormatEgressTagsMiddleware_1 = require("./external/ACSAdapter/createFormatEgressTagsMiddleware");
+var createFormatIngressTagsMiddleware_1 = require("./external/ACSAdapter/createFormatIngressTagsMiddleware");
 var DeliveryMode_1 = require("@microsoft/omnichannel-ic3core/lib/model/DeliveryMode");
 var FileSharingProtocolType_1 = require("@microsoft/omnichannel-ic3core/lib/model/FileSharingProtocolType");
 var HostType_1 = require("@microsoft/omnichannel-ic3core/lib/interfaces/HostType");
-var utilities_1 = require("./utils/utilities");
-var libraries_1 = require("./utils/libraries");
+var omnichannel_ic3core_1 = require("@microsoft/omnichannel-ic3core");
+var LiveChatVersion_1 = require("./core/LiveChatVersion");
 var LiveWorkItemState_1 = require("./core/LiveWorkItemState");
-var WebUtils_1 = require("./utils/WebUtils");
 var MessageContentType_1 = require("@microsoft/omnichannel-ic3core/lib/model/MessageContentType");
 var MessageType_1 = require("@microsoft/omnichannel-ic3core/lib/model/MessageType");
 var PersonType_1 = require("@microsoft/omnichannel-ic3core/lib/model/PersonType");
-var platform_1 = require("./utils/platform");
 var ProtocoleType_1 = require("@microsoft/omnichannel-ic3core/lib/interfaces/ProtocoleType");
 var ScenarioMarker_1 = require("./telemetry/ScenarioMarker");
-var ocsdk_1 = require("@microsoft/ocsdk");
-var omnichannel_ic3core_1 = require("@microsoft/omnichannel-ic3core");
 var TelemetryEvent_1 = require("./telemetry/TelemetryEvent");
+var omnichannel_amsclient_1 = require("@microsoft/omnichannel-amsclient");
+var createOmnichannelMessage_1 = require("./utils/createOmnichannelMessage");
+var createTelemetry_1 = require("./utils/createTelemetry");
+var createVoiceVideoCalling_1 = require("./api/createVoiceVideoCalling");
+var MessageTags_1 = require("./core/messaging/MessageTags");
+var locale_1 = require("./utils/locale");
+var utilities_1 = require("./utils/utilities");
+var libraries_1 = require("./utils/libraries");
+var WebUtils_1 = require("./utils/WebUtils");
 var OmnichannelConfigValidator_1 = require("./validators/OmnichannelConfigValidator");
-var SDKConfigValidators_1 = require("./validators/SDKConfigValidators");
 var OmnichannelChatSDK = /** @class */ (function () {
     function OmnichannelChatSDK(omnichannelConfig, chatSDKConfig) {
         if (chatSDKConfig === void 0) { chatSDKConfig = SDKConfigValidators_1.defaultChatSDKConfig; }
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
+        this.ACSClient = null;
+        this.AMSClient = null;
         this.authSettings = null;
         this.authenticatedUserToken = null;
         this.conversation = null;
@@ -91,15 +102,20 @@ var OmnichannelChatSDK = /** @class */ (function () {
         this.telemetry = null;
         this.ic3ClientLogger = null;
         this.ocSdkLogger = null;
+        this.acsClientLogger = null;
+        this.acsAdapterLogger = null;
         this.isPersistentChat = false;
         this.isChatReconnect = false;
         this.reconnectId = null;
         this.refreshTokenTimer = null;
         this.debug = false;
+        this.runtimeId = ocsdk_1.uuidv4();
         this.omnichannelConfig = omnichannelConfig;
         this.chatSDKConfig = __assign(__assign({}, SDKConfigValidators_1.defaultChatSDKConfig), chatSDKConfig // overrides
         );
         this.isInitialized = false;
+        this.liveChatVersion = LiveChatVersion_1.default.V1;
+        this.localeId = locale_1.defaultLocaleId;
         this.requestId = ocsdk_1.uuidv4();
         this.chatToken = {};
         this.liveChatConfig = {};
@@ -110,9 +126,18 @@ var OmnichannelChatSDK = /** @class */ (function () {
         this.scenarioMarker = new ScenarioMarker_1.default(this.omnichannelConfig);
         this.ic3ClientLogger = loggers_1.createIC3ClientLogger(this.omnichannelConfig);
         this.ocSdkLogger = loggers_1.createOCSDKLogger(this.omnichannelConfig);
+        this.acsClientLogger = loggers_1.createACSClientLogger(this.omnichannelConfig);
+        this.acsAdapterLogger = loggers_1.createACSAdapterLogger(this.omnichannelConfig);
         this.scenarioMarker.useTelemetry(this.telemetry);
         this.ic3ClientLogger.useTelemetry(this.telemetry);
         this.ocSdkLogger.useTelemetry(this.telemetry);
+        this.acsClientLogger.useTelemetry(this.telemetry);
+        this.acsAdapterLogger.useTelemetry(this.telemetry);
+        this.scenarioMarker.setRuntimeId(this.runtimeId);
+        this.ic3ClientLogger.setRuntimeId(this.runtimeId);
+        this.ocSdkLogger.setRuntimeId(this.runtimeId);
+        this.acsClientLogger.setRuntimeId(this.runtimeId);
+        this.acsAdapterLogger.setRuntimeId(this.runtimeId);
         OmnichannelConfigValidator_1.default(omnichannelConfig);
         SDKConfigValidators_1.default(chatSDKConfig);
         ((_a = this.chatSDKConfig.telemetry) === null || _a === void 0 ? void 0 : _a.disable) && ((_b = this.telemetry) === null || _b === void 0 ? void 0 : _b.disable());
@@ -121,51 +146,69 @@ var OmnichannelChatSDK = /** @class */ (function () {
         }
         (_d = this.ic3ClientLogger) === null || _d === void 0 ? void 0 : _d.setRequestId(this.requestId);
         (_e = this.ocSdkLogger) === null || _e === void 0 ? void 0 : _e.setRequestId(this.requestId);
+        (_f = this.acsClientLogger) === null || _f === void 0 ? void 0 : _f.setRequestId(this.requestId);
+        (_g = this.acsAdapterLogger) === null || _g === void 0 ? void 0 : _g.setRequestId(this.requestId);
     }
     /* istanbul ignore next */
     OmnichannelChatSDK.prototype.setDebug = function (flag) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         this.debug = flag;
-        (_a = this.telemetry) === null || _a === void 0 ? void 0 : _a.setDebug(flag);
+        (_a = this.AMSClient) === null || _a === void 0 ? void 0 : _a.setDebug(flag);
+        (_b = this.telemetry) === null || _b === void 0 ? void 0 : _b.setDebug(flag);
         this.scenarioMarker.setDebug(flag);
-        (_b = this.ic3ClientLogger) === null || _b === void 0 ? void 0 : _b.setDebug(flag);
-        (_c = this.ocSdkLogger) === null || _c === void 0 ? void 0 : _c.setDebug(flag);
+        (_c = this.ic3ClientLogger) === null || _c === void 0 ? void 0 : _c.setDebug(flag);
+        (_d = this.ocSdkLogger) === null || _d === void 0 ? void 0 : _d.setDebug(flag);
+        (_e = this.acsClientLogger) === null || _e === void 0 ? void 0 : _e.setDebug(flag);
+        (_f = this.acsAdapterLogger) === null || _f === void 0 ? void 0 : _f.setDebug(flag);
     };
     OmnichannelChatSDK.prototype.initialize = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var OCClient, IC3Client, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, _b, _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.InitializeChatSDK);
                         if (this.isInitialized) {
                             this.scenarioMarker.completeScenario(TelemetryEvent_1.default.InitializeChatSDK);
                             return [2 /*return*/, this.liveChatConfig];
                         }
-                        _b.label = 1;
+                        _e.label = 1;
                     case 1:
-                        _b.trys.push([1, 5, , 6]);
+                        _e.trys.push([1, 8, , 9]);
                         this.OCSDKProvider = ocsdk_1.SDKProvider;
+                        _a = this;
                         return [4 /*yield*/, ocsdk_1.SDKProvider.getSDK(this.omnichannelConfig, {}, this.ocSdkLogger)];
                     case 2:
-                        OCClient = _b.sent();
-                        return [4 /*yield*/, this.getIC3Client()];
-                    case 3:
-                        IC3Client = _b.sent();
-                        // Assign & Update flag only if all dependencies have been initialized succesfully
-                        this.OCClient = OCClient;
-                        this.IC3Client = IC3Client;
+                        _a.OCClient = _e.sent();
                         return [4 /*yield*/, this.getChatConfig()];
+                    case 3:
+                        _e.sent();
+                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 5];
+                        this.ACSClient = new ACSClient_1.default(this.acsClientLogger);
+                        _b = this;
+                        return [4 /*yield*/, omnichannel_amsclient_1.default({
+                                framedMode: platform_1.isBrowser(),
+                                debug: false,
+                                logger: undefined
+                            })];
                     case 4:
-                        _b.sent();
+                        _b.AMSClient = _e.sent();
+                        return [3 /*break*/, 7];
+                    case 5:
+                        _c = this;
+                        return [4 /*yield*/, this.getIC3Client()];
+                    case 6:
+                        _c.IC3Client = _e.sent();
+                        _e.label = 7;
+                    case 7:
                         this.isInitialized = true;
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.InitializeChatSDK);
-                        return [3 /*break*/, 6];
-                    case 5:
-                        _a = _b.sent();
+                        return [3 /*break*/, 9];
+                    case 8:
+                        _d = _e.sent();
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.InitializeChatSDK);
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/, this.liveChatConfig];
+                        return [3 /*break*/, 9];
+                    case 9: return [2 /*return*/, this.liveChatConfig];
                 }
             });
         });
@@ -255,13 +298,13 @@ var OmnichannelChatSDK = /** @class */ (function () {
         });
     };
     OmnichannelChatSDK.prototype.startChat = function (optionalParams) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         if (optionalParams === void 0) { optionalParams = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var reconnectableChatsParams, reconnectableChatsResponse, _j, exceptionDetails, conversationDetails, exceptionDetails, exceptionDetails, sessionInitOptionalParams, error_3, exceptionDetails, error_4, exceptionDetails, _k, error_5, exceptionDetails;
+            var reconnectableChatsParams, reconnectableChatsResponse, _p, exceptionDetails, conversationDetails, exceptionDetails, exceptionDetails, sessionInitOptionalParams, error_3, exceptionDetails, chatAdapterConfig, error_4, exceptionDetails, _q, error_5, exceptionDetails, error_6, exceptionDetails, error_7, exceptionDetails, _r, error_8, exceptionDetails;
             var _this = this;
-            return __generator(this, function (_l) {
-                switch (_l.label) {
+            return __generator(this, function (_s) {
+                switch (_s.label) {
                     case 0:
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.StartChat, {
                             RequestId: this.requestId
@@ -270,32 +313,32 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             this.reconnectId = optionalParams.reconnectId;
                         }
                         if (!(this.isPersistentChat && !((_b = this.chatSDKConfig.persistentChat) === null || _b === void 0 ? void 0 : _b.disable))) return [3 /*break*/, 4];
-                        _l.label = 1;
+                        _s.label = 1;
                     case 1:
-                        _l.trys.push([1, 3, , 4]);
+                        _s.trys.push([1, 3, , 4]);
                         reconnectableChatsParams = {
                             authenticatedUserToken: this.authenticatedUserToken
                         };
                         return [4 /*yield*/, this.OCClient.getReconnectableChats(reconnectableChatsParams)];
                     case 2:
-                        reconnectableChatsResponse = _l.sent();
+                        reconnectableChatsResponse = _s.sent();
                         if (reconnectableChatsResponse && reconnectableChatsResponse.reconnectid) {
                             this.reconnectId = reconnectableChatsResponse.reconnectid;
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        _j = _l.sent();
+                        _p = _s.sent();
                         exceptionDetails = {
                             response: "OCClientGetReconnectableChatsFailed"
                         };
                         throw Error(exceptionDetails.response);
                     case 4:
-                        if (!(optionalParams.liveChatContext && !this.isPersistentChat && !this.isChatReconnect)) return [3 /*break*/, 6];
+                        if (!(optionalParams.liveChatContext && !this.reconnectId)) return [3 /*break*/, 6];
                         this.chatToken = optionalParams.liveChatContext.chatToken || {};
                         this.requestId = optionalParams.liveChatContext.requestId || ocsdk_1.uuidv4();
                         return [4 /*yield*/, this.getConversationDetails()];
                     case 5:
-                        conversationDetails = _l.sent();
+                        conversationDetails = _s.sent();
                         if (Object.keys(conversationDetails).length === 0) {
                             exceptionDetails = {
                                 response: "InvalidConversation"
@@ -320,23 +363,26 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             console.error("Unable to join conversation that's in '" + conversationDetails.state + "' state");
                             throw Error(exceptionDetails.response);
                         }
-                        _l.label = 6;
+                        _s.label = 6;
                     case 6:
                         if (!(this.chatToken && Object.keys(this.chatToken).length === 0)) return [3 /*break*/, 8];
                         return [4 /*yield*/, this.getChatToken(false)];
                     case 7:
-                        _l.sent();
-                        _l.label = 8;
+                        _s.sent();
+                        _s.label = 8;
                     case 8:
                         (_c = this.ic3ClientLogger) === null || _c === void 0 ? void 0 : _c.setChatId(this.chatToken.chatId || '');
                         (_d = this.ocSdkLogger) === null || _d === void 0 ? void 0 : _d.setChatId(this.chatToken.chatId || '');
+                        (_e = this.acsClientLogger) === null || _e === void 0 ? void 0 : _e.setChatId(this.chatToken.chatId || '');
+                        (_f = this.acsAdapterLogger) === null || _f === void 0 ? void 0 : _f.setChatId(this.chatToken.chatId || '');
                         sessionInitOptionalParams = {
                             initContext: {}
                         };
-                        if (this.isPersistentChat && !((_e = this.chatSDKConfig.persistentChat) === null || _e === void 0 ? void 0 : _e.disable)) {
+                        sessionInitOptionalParams.initContext.locale = locale_1.getLocaleStringFromId(this.localeId);
+                        if (this.isPersistentChat && !((_g = this.chatSDKConfig.persistentChat) === null || _g === void 0 ? void 0 : _g.disable)) {
                             sessionInitOptionalParams.reconnectId = this.reconnectId;
                         }
-                        if (this.isChatReconnect && !((_f = this.chatSDKConfig.chatReconnect) === null || _f === void 0 ? void 0 : _f.disable) && !this.isPersistentChat) {
+                        if (this.isChatReconnect && !((_h = this.chatSDKConfig.chatReconnect) === null || _h === void 0 ? void 0 : _h.disable) && !this.isPersistentChat) {
                             sessionInitOptionalParams.reconnectId = this.reconnectId;
                         }
                         if (optionalParams.customContext) {
@@ -364,15 +410,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         if (this.authenticatedUserToken) {
                             sessionInitOptionalParams.authenticatedUserToken = this.authenticatedUserToken;
                         }
-                        _l.label = 9;
+                        if (!!optionalParams.liveChatContext) return [3 /*break*/, 12];
+                        _s.label = 9;
                     case 9:
-                        _l.trys.push([9, 11, , 12]);
+                        _s.trys.push([9, 11, , 12]);
                         return [4 /*yield*/, this.OCClient.sessionInit(this.requestId, sessionInitOptionalParams)];
                     case 10:
-                        _l.sent();
+                        _s.sent();
                         return [3 /*break*/, 12];
                     case 11:
-                        error_3 = _l.sent();
+                        error_3 = _s.sent();
                         exceptionDetails = {
                             response: "OCClientSessionInitFailed"
                         };
@@ -384,17 +431,95 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         console.error("OmnichannelChatSDK/startChat/sessionInit/error " + error_3);
                         return [2 /*return*/, error_3];
                     case 12:
-                        _l.trys.push([12, 14, , 15]);
+                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 23];
+                        chatAdapterConfig = {
+                            token: this.chatToken.token,
+                            id: this.chatToken.visitorId || 'teamsvisitor',
+                            threadId: this.chatToken.chatId,
+                            environmentUrl: this.chatToken.acsEndpoint,
+                            pollingInterval: 1000
+                        };
+                        _s.label = 13;
+                    case 13:
+                        _s.trys.push([13, 15, , 16]);
+                        return [4 /*yield*/, ((_j = this.ACSClient) === null || _j === void 0 ? void 0 : _j.initialize({
+                                token: chatAdapterConfig.token,
+                                environmentUrl: chatAdapterConfig.environmentUrl
+                            }))];
+                    case 14:
+                        _s.sent();
+                        return [3 /*break*/, 16];
+                    case 15:
+                        error_4 = _s.sent();
+                        exceptionDetails = {
+                            response: "ACSClientInitializeFailed"
+                        };
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.StartChat, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId,
+                            ExceptionDetails: JSON.stringify(exceptionDetails)
+                        });
+                        console.error("OmnichannelChatSDK/startChat/initialize/error " + error_4);
+                        return [2 /*return*/, error_4];
+                    case 16:
+                        _s.trys.push([16, 18, , 19]);
+                        _q = this;
+                        return [4 /*yield*/, ((_k = this.ACSClient) === null || _k === void 0 ? void 0 : _k.joinConversation({
+                                id: chatAdapterConfig.id,
+                                threadId: chatAdapterConfig.threadId,
+                                pollingInterval: chatAdapterConfig.pollingInterval
+                            }))];
+                    case 17:
+                        _q.conversation = (_s.sent());
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.StartChat, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [3 /*break*/, 19];
+                    case 18:
+                        error_5 = _s.sent();
+                        exceptionDetails = {
+                            response: "ACSClientJoinConversationFailed"
+                        };
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.StartChat, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId,
+                            ExceptionDetails: JSON.stringify(exceptionDetails)
+                        });
+                        console.error("OmnichannelChatSDK/startChat/joinConversation/error " + error_5);
+                        throw Error(exceptionDetails.response);
+                    case 19:
+                        _s.trys.push([19, 21, , 22]);
+                        return [4 /*yield*/, ((_l = this.AMSClient) === null || _l === void 0 ? void 0 : _l.initialize({
+                                chatToken: this.chatToken
+                            }))];
+                    case 20:
+                        _s.sent();
+                        return [3 /*break*/, 22];
+                    case 21:
+                        error_6 = _s.sent();
+                        exceptionDetails = {
+                            response: "AMSClientInitializeFailed"
+                        };
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.StartChat, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId,
+                            ExceptionDetails: JSON.stringify(exceptionDetails)
+                        });
+                        throw Error(exceptionDetails.response);
+                    case 22: return [3 /*break*/, 29];
+                    case 23:
+                        _s.trys.push([23, 25, , 26]);
                         return [4 /*yield*/, this.IC3Client.initialize({
                                 token: this.chatToken.token,
                                 regionGtms: this.chatToken.regionGTMS,
                                 visitor: true
                             })];
-                    case 13:
-                        _l.sent();
-                        return [3 /*break*/, 15];
-                    case 14:
-                        error_4 = _l.sent();
+                    case 24:
+                        _s.sent();
+                        return [3 /*break*/, 26];
+                    case 25:
+                        error_7 = _s.sent();
                         exceptionDetails = {
                             response: "IC3ClientInitializeFailed"
                         };
@@ -403,21 +528,21 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ChatId: this.chatToken.chatId,
                             ExceptionDetails: JSON.stringify(exceptionDetails)
                         });
-                        console.error("OmnichannelChatSDK/startChat/initialize/error " + error_4);
-                        return [2 /*return*/, error_4];
-                    case 15:
-                        _l.trys.push([15, 17, , 18]);
-                        _k = this;
+                        console.error("OmnichannelChatSDK/startChat/initialize/error " + error_7);
+                        return [2 /*return*/, error_7];
+                    case 26:
+                        _s.trys.push([26, 28, , 29]);
+                        _r = this;
                         return [4 /*yield*/, this.IC3Client.joinConversation(this.chatToken.chatId)];
-                    case 16:
-                        _k.conversation = _l.sent();
+                    case 27:
+                        _r.conversation = _s.sent();
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.StartChat, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
-                        return [3 /*break*/, 18];
-                    case 17:
-                        error_5 = _l.sent();
+                        return [3 /*break*/, 29];
+                    case 28:
+                        error_8 = _s.sent();
                         exceptionDetails = {
                             response: "IC3ClientJoinConversationFailed"
                         };
@@ -426,10 +551,10 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ChatId: this.chatToken.chatId,
                             ExceptionDetails: JSON.stringify(exceptionDetails)
                         });
-                        console.error("OmnichannelChatSDK/startChat/joinConversation/error " + error_5);
-                        return [2 /*return*/, error_5];
-                    case 18:
-                        if (this.isPersistentChat && !((_g = this.chatSDKConfig.persistentChat) === null || _g === void 0 ? void 0 : _g.disable)) {
+                        console.error("OmnichannelChatSDK/startChat/joinConversation/error " + error_8);
+                        return [2 /*return*/, error_8];
+                    case 29:
+                        if (this.isPersistentChat && !((_m = this.chatSDKConfig.persistentChat) === null || _m === void 0 ? void 0 : _m.disable)) {
                             this.refreshTokenTimer = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
@@ -440,7 +565,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                             return [2 /*return*/];
                                     }
                                 });
-                            }); }, (_h = this.chatSDKConfig.persistentChat) === null || _h === void 0 ? void 0 : _h.tokenUpdateTime);
+                            }); }, (_o = this.chatSDKConfig.persistentChat) === null || _o === void 0 ? void 0 : _o.tokenUpdateTime);
                         }
                         return [2 /*return*/];
                 }
@@ -448,11 +573,11 @@ var OmnichannelChatSDK = /** @class */ (function () {
         });
     };
     OmnichannelChatSDK.prototype.endChat = function () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return __awaiter(this, void 0, void 0, function () {
-            var sessionCloseOptionalParams, isReconnectChat, isChatReconnect, error_6, exceptionDetails;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            var sessionCloseOptionalParams, isReconnectChat, isChatReconnect, error_9, exceptionDetails;
+            return __generator(this, function (_m) {
+                switch (_m.label) {
                     case 0:
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.EndChat, {
                             RequestId: this.requestId,
@@ -466,17 +591,18 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         }
                         if (this.isChatReconnect && !((_b = this.chatSDKConfig.chatReconnect) === null || _b === void 0 ? void 0 : _b.disable) && !this.isPersistentChat) {
                             isChatReconnect = this.reconnectId !== null ? true : false;
+                            this.requestId = isChatReconnect ? this.reconnectId : this.requestId; // Chat Reconnect session to close
                             sessionCloseOptionalParams.isReconnectChat = isChatReconnect;
                         }
                         if (this.authenticatedUserToken) {
                             sessionCloseOptionalParams.authenticatedUserToken = this.authenticatedUserToken;
                         }
-                        _h.label = 1;
+                        _m.label = 1;
                     case 1:
-                        _h.trys.push([1, 3, , 4]);
+                        _m.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, this.OCClient.sessionClose(this.requestId, sessionCloseOptionalParams)];
                     case 2:
-                        _h.sent();
+                        _m.sent();
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.EndChat, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
@@ -490,9 +616,13 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         (_e = this.ic3ClientLogger) === null || _e === void 0 ? void 0 : _e.setChatId('');
                         (_f = this.ocSdkLogger) === null || _f === void 0 ? void 0 : _f.setRequestId(this.requestId);
                         (_g = this.ocSdkLogger) === null || _g === void 0 ? void 0 : _g.setChatId('');
+                        (_h = this.acsClientLogger) === null || _h === void 0 ? void 0 : _h.setRequestId(this.requestId);
+                        (_j = this.acsClientLogger) === null || _j === void 0 ? void 0 : _j.setChatId('');
+                        (_k = this.acsAdapterLogger) === null || _k === void 0 ? void 0 : _k.setRequestId(this.requestId);
+                        (_l = this.acsAdapterLogger) === null || _l === void 0 ? void 0 : _l.setChatId('');
                         return [3 /*break*/, 4];
                     case 3:
-                        error_6 = _h.sent();
+                        error_9 = _m.sent();
                         exceptionDetails = {
                             response: "OCClientSessionCloseFailed"
                         };
@@ -501,8 +631,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ChatId: this.chatToken.chatId,
                             ExceptionDetails: JSON.stringify(exceptionDetails),
                         });
-                        console.error("OmnichannelChatSDK/endChat/error " + error_6);
-                        return [2 /*return*/, error_6];
+                        console.error("OmnichannelChatSDK/endChat/error " + error_9);
+                        return [2 /*return*/, error_9];
                     case 4:
                         if (this.refreshTokenTimer !== null) {
                             clearInterval(this.refreshTokenTimer);
@@ -522,6 +652,10 @@ var OmnichannelChatSDK = /** @class */ (function () {
                     case 1:
                         chatToken = _a.sent();
                         requestId = this.requestId;
+                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetCurrentLiveChatContext, {
+                            RequestId: requestId,
+                            ChatId: chatToken.chatId
+                        });
                         chatSession = {
                             chatToken: chatToken,
                             requestId: requestId
@@ -529,6 +663,10 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         if (Object.keys(chatSession.chatToken).length === 0) {
                             return [2 /*return*/, {}];
                         }
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetCurrentLiveChatContext, {
+                            RequestId: requestId,
+                            ChatId: chatToken.chatId
+                        });
                         return [2 /*return*/, chatSession];
                 }
             });
@@ -537,7 +675,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     OmnichannelChatSDK.prototype.getConversationDetails = function () {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var lwiDetails, state, conversationId, agentAcceptedOn, liveWorkItemDetails, error_7;
+            var lwiDetails, state, conversationId, agentAcceptedOn, liveWorkItemDetails, error_10;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -565,12 +703,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [2 /*return*/, liveWorkItemDetails];
                     case 3:
-                        error_7 = _c.sent();
+                        error_10 = _c.sent();
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetConversationDetails, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId || '',
                         });
-                        console.error("OmnichannelChatSDK/getConversationDetails/error " + error_7);
+                        console.error("OmnichannelChatSDK/getConversationDetails/error " + error_10);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/, {}];
                 }
@@ -614,7 +752,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
         var _a, _b;
         if (cached === void 0) { cached = true; }
         return __awaiter(this, void 0, void 0, function () {
-            var getChatTokenOptionalParams, chatToken, chatId, token, regionGtms, expiresIn, visitorId, voiceVideoCallToken, error_8, exceptionDetails;
+            var getChatTokenOptionalParams, chatToken, chatId, token, regionGtms, expiresIn, visitorId, voiceVideoCallToken, acsEndpoint, attachmentConfiguration, error_11, exceptionDetails;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -638,7 +776,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         return [4 /*yield*/, this.OCClient.getChatToken(this.requestId, getChatTokenOptionalParams)];
                     case 2:
                         chatToken = _c.sent();
-                        chatId = chatToken.ChatId, token = chatToken.Token, regionGtms = chatToken.RegionGtms, expiresIn = chatToken.ExpiresIn, visitorId = chatToken.VisitorId, voiceVideoCallToken = chatToken.VoiceVideoCallToken;
+                        chatId = chatToken.ChatId, token = chatToken.Token, regionGtms = chatToken.RegionGtms, expiresIn = chatToken.ExpiresIn, visitorId = chatToken.VisitorId, voiceVideoCallToken = chatToken.VoiceVideoCallToken, acsEndpoint = chatToken.ACSEndpoint, attachmentConfiguration = chatToken.AttachmentConfiguration;
                         this.chatToken = {
                             chatId: chatId,
                             regionGTMS: JSON.parse(regionGtms),
@@ -646,15 +784,19 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             token: token,
                             expiresIn: expiresIn,
                             visitorId: visitorId,
-                            voiceVideoCallToken: voiceVideoCallToken
+                            voiceVideoCallToken: voiceVideoCallToken,
+                            acsEndpoint: acsEndpoint,
                         };
+                        if (attachmentConfiguration && attachmentConfiguration.AttachmentServiceEndpoint) {
+                            this.chatToken.amsEndpoint = attachmentConfiguration.AttachmentServiceEndpoint;
+                        }
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetChatToken, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
                         return [3 /*break*/, 4];
                     case 3:
-                        error_8 = _c.sent();
+                        error_11 = _c.sent();
                         exceptionDetails = {
                             response: "OCClientGetChatTokenFailed"
                         };
@@ -663,7 +805,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ChatId: this.chatToken.chatId,
                             ExceptionDetails: JSON.stringify(exceptionDetails),
                         });
-                        console.error("OmnichannelChatSDK/getChatToken/error " + error_8);
+                        console.error("OmnichannelChatSDK/getChatToken/error " + error_11);
                         return [3 /*break*/, 4];
                     case 4: return [3 /*break*/, 6];
                     case 5:
@@ -684,11 +826,13 @@ var OmnichannelChatSDK = /** @class */ (function () {
                     return [2 /*return*/, ''];
                 }
                 if (this.chatToken.voiceVideoCallToken) {
-                    console.log("calling:acs");
+                    /* istanbul ignore next */
+                    this.debug && console.log("calling:acs");
                     return [2 /*return*/, this.chatToken.voiceVideoCallToken.Token];
                 }
                 else {
-                    console.log("calling:skype");
+                    /* istanbul ignore next */
+                    this.debug && console.log("calling:skype");
                     return [2 /*return*/, this.chatToken.token];
                 }
                 return [2 /*return*/];
@@ -698,8 +842,34 @@ var OmnichannelChatSDK = /** @class */ (function () {
     OmnichannelChatSDK.prototype.getMessages = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                return [2 /*return*/, (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.getMessages()];
+            var messages, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetMessages, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, ((_a = this.conversation) === null || _a === void 0 ? void 0 : _a.getMessages())];
+                    case 2:
+                        messages = _c.sent();
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetMessages, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [2 /*return*/, messages];
+                    case 3:
+                        _b = _c.sent();
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetMessages, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -711,131 +881,283 @@ var OmnichannelChatSDK = /** @class */ (function () {
         });
     };
     OmnichannelChatSDK.prototype.sendMessage = function (message) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _a, disable, maskingCharacter, content, _i, _b, maskingRule, regex, match, replaceStr, messageToSend;
-            return __generator(this, function (_c) {
-                _a = this.chatSDKConfig.dataMasking, disable = _a.disable, maskingCharacter = _a.maskingCharacter;
-                content = message.content;
-                if (Object.keys(this.dataMaskingRules).length > 0 && !disable) {
-                    for (_i = 0, _b = Object.values(this.dataMaskingRules); _i < _b.length; _i++) {
-                        maskingRule = _b[_i];
-                        regex = new RegExp(maskingRule, 'g');
-                        match = void 0;
-                        while (match = regex.exec(content)) { // eslint-disable-line no-cond-assign
-                            replaceStr = match[0].replace(/./g, maskingCharacter);
-                            content = content.replace(match[0], replaceStr);
+            var _b, disable, maskingCharacter, content, _i, _c, maskingRule, regex, match, replaceStr, sendMessageRequest, error_12, messageToSend, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.SendMessages, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        _b = this.chatSDKConfig.dataMasking, disable = _b.disable, maskingCharacter = _b.maskingCharacter;
+                        content = message.content;
+                        if (Object.keys(this.dataMaskingRules).length > 0 && !disable) {
+                            for (_i = 0, _c = Object.values(this.dataMaskingRules); _i < _c.length; _i++) {
+                                maskingRule = _c[_i];
+                                regex = new RegExp(maskingRule, 'g');
+                                match = void 0;
+                                while (match = regex.exec(content)) { // eslint-disable-line no-cond-assign
+                                    replaceStr = match[0].replace(/./g, maskingCharacter);
+                                    content = content.replace(match[0], replaceStr);
+                                }
+                            }
                         }
-                    }
-                }
-                message.content = content;
-                messageToSend = {
-                    content: message.content,
-                    timestamp: new Date(),
-                    contentType: MessageContentType_1.default.Text,
-                    deliveryMode: DeliveryMode_1.default.Bridged,
-                    messageType: MessageType_1.default.UserMessage,
-                    properties: undefined,
-                    tags: __spreadArrays(MessageTags_1.defaultMessageTags),
-                    sender: {
-                        displayName: "Customer",
-                        id: "customer",
-                        type: PersonType_1.default.User
-                    }
-                };
-                if (message.tags) {
-                    messageToSend.tags = message.tags;
-                }
-                if (message.timestamp) {
-                    messageToSend.timestamp = message.timestamp;
+                        message.content = content;
+                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 5];
+                        sendMessageRequest = {
+                            content: message.content,
+                        };
+                        sendMessageRequest.metadata = {
+                            widgetId: this.omnichannelConfig.widgetId,
+                            clientMessageId: Date.now().toString()
+                        };
+                        if (message.metadata) {
+                            sendMessageRequest.metadata = __assign(__assign({}, sendMessageRequest.metadata), message.metadata);
+                        }
+                        _e.label = 1;
+                    case 1:
+                        _e.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, ((_a = this.conversation) === null || _a === void 0 ? void 0 : _a.sendMessage(sendMessageRequest))];
+                    case 2:
+                        _e.sent();
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.SendMessages, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_12 = _e.sent();
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendMessages, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        throw new Error('ChatSDKSendMessageFailed');
+                    case 4: return [3 /*break*/, 9];
+                    case 5:
+                        messageToSend = {
+                            content: message.content,
+                            timestamp: new Date(),
+                            contentType: MessageContentType_1.default.Text,
+                            deliveryMode: DeliveryMode_1.default.Bridged,
+                            messageType: MessageType_1.default.UserMessage,
+                            properties: undefined,
+                            tags: __spreadArrays(MessageTags_1.defaultMessageTags),
+                            sender: {
+                                displayName: "Customer",
+                                id: "customer",
+                                type: PersonType_1.default.User
+                            }
+                        };
+                        if (message.tags) {
+                            messageToSend.tags = message.tags;
+                        }
+                        if (message.timestamp) {
+                            messageToSend.timestamp = message.timestamp;
+                        }
+                        _e.label = 6;
+                    case 6:
+                        _e.trys.push([6, 8, , 9]);
+                        return [4 /*yield*/, this.conversation.sendMessage(messageToSend)];
+                    case 7:
+                        _e.sent();
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.SendMessages, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [3 /*break*/, 9];
+                    case 8:
+                        _d = _e.sent();
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendMessages, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        throw new Error('ChatSDKSendMessageFailed');
+                    case 9: return [2 /*return*/];
                 }
-                return [2 /*return*/, this.conversation.sendMessage(messageToSend)];
             });
         });
     };
     OmnichannelChatSDK.prototype.onNewMessage = function (onNewMessageCallback, optionalParams) {
-        var _a;
+        var _a, _b;
         if (optionalParams === void 0) { optionalParams = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var postedMessages, messages, _i, _b, message, clientmessageid;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var postedMessages_1, messages, _i, _c, message, id, postedMessages_2, messages, _d, _e, message, clientmessageid, omnichannelMessage;
+            var _this = this;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
-                        postedMessages = new Set();
+                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.OnNewMessage, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 3];
+                        postedMessages_1 = new Set();
                         if (!optionalParams.rehydrate) return [3 /*break*/, 2];
                         this.debug && console.log('[OmnichannelChatSDK][onNewMessage] rehydrate');
                         return [4 /*yield*/, this.getMessages()];
                     case 1:
-                        messages = _c.sent();
+                        messages = _f.sent();
+                        for (_i = 0, _c = messages.reverse(); _i < _c.length; _i++) {
+                            message = _c[_i];
+                            id = message.id;
+                            if (postedMessages_1.has(id)) {
+                                continue;
+                            }
+                            postedMessages_1.add(id);
+                            onNewMessageCallback(message);
+                        }
+                        _f.label = 2;
+                    case 2:
+                        try {
+                            (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.registerOnNewMessage(function (event) {
+                                var id = event.id;
+                                var omnichannelMessage = createOmnichannelMessage_1.default(event, {
+                                    liveChatVersion: _this.liveChatVersion,
+                                    debug: _this.debug
+                                });
+                                if (!postedMessages_1.has(id)) {
+                                    onNewMessageCallback(omnichannelMessage);
+                                    postedMessages_1.add(id);
+                                }
+                            });
+                            this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnNewMessage, {
+                                RequestId: this.requestId,
+                                ChatId: this.chatToken.chatId
+                            });
+                        }
+                        catch (_g) {
+                            this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnNewMessage, {
+                                RequestId: this.requestId,
+                                ChatId: this.chatToken.chatId
+                            });
+                        }
+                        return [3 /*break*/, 6];
+                    case 3:
+                        postedMessages_2 = new Set();
+                        if (!optionalParams.rehydrate) return [3 /*break*/, 5];
+                        this.debug && console.log('[OmnichannelChatSDK][onNewMessage] rehydrate');
+                        return [4 /*yield*/, this.getMessages()];
+                    case 4:
+                        messages = _f.sent();
                         if (messages) {
-                            for (_i = 0, _b = messages.reverse(); _i < _b.length; _i++) {
-                                message = _b[_i];
+                            for (_d = 0, _e = messages.reverse(); _d < _e.length; _d++) {
+                                message = _e[_d];
                                 clientmessageid = message.clientmessageid;
-                                if (postedMessages.has(clientmessageid)) {
+                                if (postedMessages_2.has(clientmessageid)) {
                                     continue;
                                 }
-                                postedMessages.add(clientmessageid);
-                                onNewMessageCallback(message);
+                                postedMessages_2.add(clientmessageid);
+                                omnichannelMessage = createOmnichannelMessage_1.default(message, {
+                                    liveChatVersion: this.liveChatVersion,
+                                    debug: this.debug
+                                });
+                                onNewMessageCallback(omnichannelMessage);
                             }
                         }
-                        _c.label = 2;
-                    case 2:
-                        (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.registerOnNewMessage(function (message) {
-                            var clientmessageid = message.clientmessageid, messageType = message.messageType;
-                            // Filter out customer messages
-                            if (utilities_1.isCustomerMessage(message)) {
-                                return;
-                            }
-                            // Skip duplicates
-                            if (postedMessages.has(clientmessageid)) {
-                                return;
-                            }
-                            if (messageType !== MessageType_1.default.Typing) {
-                                onNewMessageCallback(message);
-                            }
-                        });
-                        return [2 /*return*/];
+                        _f.label = 5;
+                    case 5:
+                        try {
+                            (_b = this.conversation) === null || _b === void 0 ? void 0 : _b.registerOnNewMessage(function (message) {
+                                var clientmessageid = message.clientmessageid, messageType = message.messageType;
+                                // Filter out customer messages
+                                if (utilities_1.isCustomerMessage(message)) {
+                                    return;
+                                }
+                                // Skip duplicates
+                                if (postedMessages_2.has(clientmessageid)) {
+                                    return;
+                                }
+                                if (messageType !== MessageType_1.default.Typing) {
+                                    var omnichannelMessage = createOmnichannelMessage_1.default(message, {
+                                        liveChatVersion: _this.liveChatVersion,
+                                        debug: _this.debug
+                                    });
+                                    onNewMessageCallback(omnichannelMessage);
+                                }
+                            });
+                            this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnNewMessage, {
+                                RequestId: this.requestId,
+                                ChatId: this.chatToken.chatId
+                            });
+                        }
+                        catch (_h) {
+                            this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnNewMessage, {
+                                RequestId: this.requestId,
+                                ChatId: this.chatToken.chatId
+                            });
+                        }
+                        _f.label = 6;
+                    case 6: return [2 /*return*/];
                 }
             });
         });
     };
     OmnichannelChatSDK.prototype.sendTypingEvent = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var typingPayload, members, botMembers, error_9;
+            var error_13, typingPayload, members, botMembers, error_14;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        typingPayload = "{isTyping: 0}";
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.SendTypingEvent, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
+                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 6];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 5, , 6]);
-                        return [4 /*yield*/, this.conversation.indicateTypingStatus(0)];
+                        _a.trys.push([1, 4, , 5]);
+                        return [4 /*yield*/, this.OCClient.sendTypingIndicator(this.requestId, LiveChatVersion_1.default.V2, {
+                                customerDisplayName: ACSParticipantDisplayName_1.default.Customer
+                            })];
                     case 2:
                         _a.sent();
-                        return [4 /*yield*/, this.conversation.getMembers()];
+                        return [4 /*yield*/, this.conversation.sendTyping()];
                     case 3:
+                        _a.sent();
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.SendTypingEvent, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [3 /*break*/, 5];
+                    case 4:
+                        error_13 = _a.sent();
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendTypingEvent, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        throw new Error('OCClientSendTypingFailed');
+                    case 5: return [3 /*break*/, 12];
+                    case 6:
+                        typingPayload = "{isTyping: 0}";
+                        _a.label = 7;
+                    case 7:
+                        _a.trys.push([7, 11, , 12]);
+                        return [4 /*yield*/, this.conversation.indicateTypingStatus(0)];
+                    case 8:
+                        _a.sent();
+                        return [4 /*yield*/, this.conversation.getMembers()];
+                    case 9:
                         members = _a.sent();
                         botMembers = members.filter(function (member) { return member.type === PersonType_1.default.Bot; });
                         return [4 /*yield*/, this.conversation.sendMessageToBot(botMembers[0].id, { payload: typingPayload })];
-                    case 4:
+                    case 10:
                         _a.sent();
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.SendTypingEvent, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
-                        return [3 /*break*/, 6];
-                    case 5:
-                        error_9 = _a.sent();
+                        return [3 /*break*/, 12];
+                    case 11:
+                        error_14 = _a.sent();
                         console.error("OmnichannelChatSDK/sendTypingEvent/error");
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.SendTypingEvent, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
-                        return [2 /*return*/, error_9];
-                    case 6: return [2 /*return*/];
+                        return [2 /*return*/, error_14];
+                    case 12: return [2 /*return*/];
                 }
             });
         });
@@ -844,16 +1166,49 @@ var OmnichannelChatSDK = /** @class */ (function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_b) {
-                (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.registerOnNewMessage(function (message) {
-                    var messageType = message.messageType;
-                    // Filter out customer messages
-                    if (utilities_1.isCustomerMessage(message)) {
-                        return;
+                this.scenarioMarker.startScenario(TelemetryEvent_1.default.OnTypingEvent, {
+                    RequestId: this.requestId,
+                    ChatId: this.chatToken.chatId
+                });
+                if (this.liveChatVersion === LiveChatVersion_1.default.V2) {
+                    try {
+                        this.conversation.onTypingEvent(onTypingEventCallback);
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnTypingEvent, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
                     }
-                    if (messageType === MessageType_1.default.Typing) {
-                        onTypingEventCallback(message);
+                    catch (_c) {
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnTypingEvent, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
                     }
-                });
+                }
+                else {
+                    try {
+                        (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.registerOnNewMessage(function (message) {
+                            var messageType = message.messageType;
+                            // Filter out customer messages
+                            if (utilities_1.isCustomerMessage(message)) {
+                                return;
+                            }
+                            if (messageType === MessageType_1.default.Typing) {
+                                onTypingEventCallback(message);
+                            }
+                        });
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnTypingEvent, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                    }
+                    catch (_d) {
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnTypingEvent, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                    }
+                }
                 return [2 /*return*/];
             });
         });
@@ -867,53 +1222,130 @@ var OmnichannelChatSDK = /** @class */ (function () {
                     RequestId: this.requestId,
                     ChatId: this.chatToken.chatId
                 });
-                try {
-                    (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.registerOnThreadUpdate(function (message) {
-                        var members = message.members;
-                        // Agent ending conversation would have 1 member left in the chat thread
-                        if (members.length === 1) {
-                            onAgentEndSessionCallback(message);
-                            if (_this.refreshTokenTimer !== null) {
-                                clearInterval(_this.refreshTokenTimer);
-                                _this.refreshTokenTimer = null;
-                            }
-                        }
-                    });
-                    this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnAgentEndSession, {
-                        RequestId: this.requestId,
-                        ChatId: this.chatToken.chatId
-                    });
+                if (this.liveChatVersion === LiveChatVersion_1.default.V2) {
+                    try {
+                        this.conversation.registerOnThreadUpdate(function (event) {
+                            onAgentEndSessionCallback(event);
+                        });
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnAgentEndSession, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                    }
+                    catch (error) {
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnAgentEndSession, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                    }
                 }
-                catch (error) {
-                    this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnAgentEndSession, {
-                        RequestId: this.requestId,
-                        ChatId: this.chatToken.chatId
-                    });
+                else {
+                    try {
+                        (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.registerOnThreadUpdate(function (message) {
+                            var members = message.members;
+                            // Agent ending conversation would have 1 member left in the chat thread
+                            if (members.length === 1) {
+                                onAgentEndSessionCallback(message);
+                                if (_this.refreshTokenTimer !== null) {
+                                    clearInterval(_this.refreshTokenTimer);
+                                    _this.refreshTokenTimer = null;
+                                }
+                            }
+                        });
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.OnAgentEndSession, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                    }
+                    catch (error) {
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.OnAgentEndSession, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                    }
                 }
                 return [2 /*return*/];
             });
         });
     };
     OmnichannelChatSDK.prototype.uploadFileAttachment = function (fileInfo) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var fileMetadata, messageToSend, error_10;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var createObjectResponse, documentId, uploadDocumentResponse, fileIdsProperty, fileMetaProperty, sendMessageRequest, messageToSend, error_15, fileMetadata, messageToSend, error_16;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.UploadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
-                        if (!(platform_1.default.isReactNative() || platform_1.default.isNode())) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.conversation.sendFileData(fileInfo, FileSharingProtocolType_1.default.AmsBasedFileSharing)];
+                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 7];
+                        return [4 /*yield*/, ((_a = this.AMSClient) === null || _a === void 0 ? void 0 : _a.createObject((_b = this.chatToken) === null || _b === void 0 ? void 0 : _b.chatId, fileInfo))];
                     case 1:
-                        fileMetadata = _a.sent();
-                        return [3 /*break*/, 4];
-                    case 2: return [4 /*yield*/, this.conversation.uploadFile(fileInfo, FileSharingProtocolType_1.default.AmsBasedFileSharing)];
+                        createObjectResponse = _e.sent();
+                        documentId = createObjectResponse.id;
+                        return [4 /*yield*/, ((_c = this.AMSClient) === null || _c === void 0 ? void 0 : _c.uploadDocument(documentId, fileInfo))];
+                    case 2:
+                        uploadDocumentResponse = _e.sent();
+                        fileIdsProperty = {
+                            amsReferences: JSON.stringify([documentId])
+                        };
+                        fileMetaProperty = {
+                            amsMetadata: JSON.stringify([{
+                                    contentType: fileInfo.type,
+                                    fileName: fileInfo.name
+                                }])
+                        };
+                        sendMessageRequest = {
+                            content: '',
+                            metadata: __assign(__assign({ widgetId: this.omnichannelConfig.widgetId, clientMessageId: Date.now().toString() }, fileIdsProperty), fileMetaProperty)
+                        };
+                        messageToSend = {
+                            content: "",
+                            timestamp: new Date(),
+                            contentType: MessageContentType_1.default.Text,
+                            deliveryMode: DeliveryMode_1.default.Bridged,
+                            messageType: MessageType_1.default.UserMessage,
+                            tags: __spreadArrays(MessageTags_1.defaultMessageTags),
+                            sender: {
+                                displayName: "Customer",
+                                id: "customer",
+                                type: PersonType_1.default.User,
+                            },
+                            fileMetadata: uploadDocumentResponse
+                        };
+                        _e.label = 3;
                     case 3:
-                        fileMetadata = _a.sent();
-                        _a.label = 4;
+                        _e.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, ((_d = this.conversation) === null || _d === void 0 ? void 0 : _d.sendMessage(sendMessageRequest))];
                     case 4:
+                        _e.sent();
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.UploadFileAttachment, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [2 /*return*/, messageToSend];
+                    case 5:
+                        error_15 = _e.sent();
+                        console.error("OmnichannelChatSDK/uploadFileAttachment/sendMessage/error");
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.UploadFileAttachment, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/, {}];
+                    case 7:
+                        fileMetadata = void 0;
+                        if (!(platform_1.default.isReactNative() || platform_1.default.isNode())) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this.conversation.sendFileData(fileInfo, FileSharingProtocolType_1.default.AmsBasedFileSharing)];
+                    case 8:
+                        fileMetadata = _e.sent();
+                        return [3 /*break*/, 11];
+                    case 9: return [4 /*yield*/, this.conversation.uploadFile(fileInfo, FileSharingProtocolType_1.default.AmsBasedFileSharing)];
+                    case 10:
+                        fileMetadata = _e.sent();
+                        _e.label = 11;
+                    case 11:
                         messageToSend = {
                             content: "",
                             timestamp: new Date(),
@@ -928,60 +1360,84 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             },
                             fileMetadata: fileMetadata
                         };
-                        _a.label = 5;
-                    case 5:
-                        _a.trys.push([5, 7, , 8]);
+                        _e.label = 12;
+                    case 12:
+                        _e.trys.push([12, 14, , 15]);
                         return [4 /*yield*/, this.conversation.sendFileMessage(fileMetadata, messageToSend)];
-                    case 6:
-                        _a.sent();
+                    case 13:
+                        _e.sent();
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.UploadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
                         return [2 /*return*/, messageToSend];
-                    case 7:
-                        error_10 = _a.sent();
-                        console.error("OmnichannelChatSDK/uploadFileAttachment/error: " + error_10);
+                    case 14:
+                        error_16 = _e.sent();
+                        console.error("OmnichannelChatSDK/uploadFileAttachment/error: " + error_16);
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.UploadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
-                        return [2 /*return*/, error_10];
-                    case 8: return [2 /*return*/];
+                        return [2 /*return*/, error_16];
+                    case 15: return [2 /*return*/];
                 }
             });
         });
     };
     OmnichannelChatSDK.prototype.downloadFileAttachment = function (fileMetadata) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var downloadedFile, error_11;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var response, view_location, viewResponse, _c, downloadedFile, error_17;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.DownloadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
-                        _a.label = 1;
+                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 6];
+                        _d.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.conversation.downloadFile(fileMetadata)];
+                        _d.trys.push([1, 4, , 5]);
+                        return [4 /*yield*/, ((_a = this.AMSClient) === null || _a === void 0 ? void 0 : _a.getViewStatus(fileMetadata))];
                     case 2:
-                        downloadedFile = _a.sent();
+                        response = _d.sent();
+                        view_location = response.view_location;
+                        return [4 /*yield*/, ((_b = this.AMSClient) === null || _b === void 0 ? void 0 : _b.getView(fileMetadata, view_location))];
+                    case 3:
+                        viewResponse = _d.sent();
+                        this.scenarioMarker.completeScenario(TelemetryEvent_1.default.DownloadFileAttachment, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        return [2 /*return*/, viewResponse];
+                    case 4:
+                        _c = _d.sent();
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.DownloadFileAttachment, {
+                            RequestId: this.requestId,
+                            ChatId: this.chatToken.chatId
+                        });
+                        throw new Error('DownloadFileAttachmentFailed');
+                    case 5: return [3 /*break*/, 9];
+                    case 6:
+                        _d.trys.push([6, 8, , 9]);
+                        return [4 /*yield*/, this.conversation.downloadFile(fileMetadata)];
+                    case 7:
+                        downloadedFile = _d.sent();
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.DownloadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
                         return [2 /*return*/, downloadedFile];
-                    case 3:
-                        error_11 = _a.sent();
-                        console.error("OmnichannelChatSDK/downloadFileAttachment/error: " + error_11);
+                    case 8:
+                        error_17 = _d.sent();
+                        console.error("OmnichannelChatSDK/downloadFileAttachment/error: " + error_17);
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.DownloadFileAttachment, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
                         throw new Error('DownloadFileAttachmentFailed');
-                    case 4: return [2 /*return*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         });
@@ -1054,54 +1510,103 @@ var OmnichannelChatSDK = /** @class */ (function () {
         });
     };
     OmnichannelChatSDK.prototype.createChatAdapter = function (protocol) {
-        if (protocol === void 0) { protocol = ChatAdapterProtocols_1.default.IC3; }
+        if (protocol === void 0) { protocol = null; }
         return __awaiter(this, void 0, void 0, function () {
+            var supportedChatAdapterProtocols;
             var _this = this;
             return __generator(this, function (_a) {
                 if (platform_1.default.isNode() || platform_1.default.isReactNative()) {
                     return [2 /*return*/, Promise.reject('ChatAdapter is only supported on browser')];
                 }
-                if (protocol !== ChatAdapterProtocols_1.default.IC3) {
+                supportedChatAdapterProtocols = [ChatAdapterProtocols_1.default.ACS, ChatAdapterProtocols_1.default.IC3];
+                if (protocol && !supportedChatAdapterProtocols.includes(protocol)) {
                     return [2 /*return*/, Promise.reject("ChatAdapter for protocol " + protocol + " currently not supported")];
                 }
-                return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var ic3AdapterCDNUrl;
-                        var _this = this;
-                        var _a;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    ic3AdapterCDNUrl = this.resolveChatAdapterUrl(protocol);
-                                    (_a = this.telemetry) === null || _a === void 0 ? void 0 : _a.setCDNPackages({
-                                        IC3Adapter: ic3AdapterCDNUrl
-                                    });
-                                    this.scenarioMarker.startScenario(TelemetryEvent_1.default.CreateIC3Adapter);
-                                    return [4 /*yield*/, WebUtils_1.loadScript(ic3AdapterCDNUrl, function () {
-                                            /* istanbul ignore next */
-                                            _this.debug && console.debug('IC3Adapter loaded!');
-                                            var adapterConfig = {
-                                                chatToken: _this.chatToken,
-                                                userDisplayName: 'Customer',
-                                                userId: 'teamsvisitor',
-                                                sdkURL: _this.resolveIC3ClientUrl(),
-                                                sdk: _this.IC3Client
-                                            };
-                                            var adapter = new window.Microsoft.BotFramework.WebChat.IC3Adapter(adapterConfig);
-                                            adapter.logger = _this.ic3ClientLogger;
-                                            // Keep iframe communication alive to reuse the same IC3Client instance
-                                            window.Microsoft.BotFramework.WebChat.IC3SDKProvider.disposeSdk = function () { }; // eslint-disable-line @typescript-eslint/no-empty-function
-                                            _this.scenarioMarker.completeScenario(TelemetryEvent_1.default.CreateIC3Adapter);
-                                            resolve(adapter);
-                                        }, function () {
-                                            _this.scenarioMarker.failScenario(TelemetryEvent_1.default.CreateIC3Adapter);
-                                            reject('Failed to load IC3Adapter');
-                                        })];
-                                case 1:
-                                    _b.sent();
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
+                if (protocol === ChatAdapterProtocols_1.default.ACS || this.liveChatVersion === LiveChatVersion_1.default.V2) {
+                    return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
+                            var egressMiddlewares, ingressMiddlewares, featuresOption, acsAdapterCDNUrl;
+                            var _this = this;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        egressMiddlewares = [createFormatEgressTagsMiddleware_1.default()];
+                                        ingressMiddlewares = [createFormatIngressTagsMiddleware_1.default()];
+                                        featuresOption = {
+                                            enableAdaptiveCards: true,
+                                            enableThreadMemberUpdateNotification: true,
+                                            enableLeaveThreadOnWindowClosed: false,
+                                            egressMiddleware: egressMiddlewares,
+                                            ingressMiddleware: ingressMiddlewares
+                                        };
+                                        acsAdapterCDNUrl = this.resolveChatAdapterUrl(protocol || ChatAdapterProtocols_1.default.ACS);
+                                        (_a = this.telemetry) === null || _a === void 0 ? void 0 : _a.setCDNPackages({
+                                            ACSAdapter: acsAdapterCDNUrl
+                                        });
+                                        return [4 /*yield*/, WebUtils_1.loadScript(acsAdapterCDNUrl, function () {
+                                                /* istanbul ignore next */
+                                                _this.debug && console.debug('ACSAdapter loaded!');
+                                                try {
+                                                    var ChatAdapter = window.ChatAdapter; // eslint-disable-line @typescript-eslint/no-explicit-any
+                                                    var fileManager = new AMSFileManager_1.default(_this.AMSClient, _this.acsAdapterLogger);
+                                                    var adapter = ChatAdapter.createACSAdapter(_this.chatToken.token, _this.chatToken.visitorId || 'teamsvisitor', _this.chatToken.chatId, _this.chatToken.acsEndpoint, fileManager, 1000, ACSParticipantDisplayName_1.default.Customer, undefined, undefined, // logger
+                                                    featuresOption);
+                                                    resolve(adapter);
+                                                }
+                                                catch (_a) {
+                                                    throw new Error('Failed to load ACSAdapter');
+                                                }
+                                            }, function () {
+                                                reject('Failed to load ACSADapter');
+                                            })];
+                                    case 1:
+                                        _b.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                }
+                else if (protocol === ChatAdapterProtocols_1.default.IC3 || this.liveChatVersion === LiveChatVersion_1.default.V1) {
+                    return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
+                            var ic3AdapterCDNUrl;
+                            var _this = this;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        ic3AdapterCDNUrl = this.resolveChatAdapterUrl(protocol || ChatAdapterProtocols_1.default.IC3);
+                                        (_a = this.telemetry) === null || _a === void 0 ? void 0 : _a.setCDNPackages({
+                                            IC3Adapter: ic3AdapterCDNUrl
+                                        });
+                                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.CreateIC3Adapter);
+                                        return [4 /*yield*/, WebUtils_1.loadScript(ic3AdapterCDNUrl, function () {
+                                                /* istanbul ignore next */
+                                                _this.debug && console.debug('IC3Adapter loaded!');
+                                                var adapterConfig = {
+                                                    chatToken: _this.chatToken,
+                                                    userDisplayName: 'Customer',
+                                                    userId: 'teamsvisitor',
+                                                    sdkURL: _this.resolveIC3ClientUrl(),
+                                                    sdk: _this.IC3Client
+                                                };
+                                                var adapter = new window.Microsoft.BotFramework.WebChat.IC3Adapter(adapterConfig);
+                                                adapter.logger = _this.ic3ClientLogger;
+                                                // Keep iframe communication alive to reuse the same IC3Client instance
+                                                window.Microsoft.BotFramework.WebChat.IC3SDKProvider.disposeSdk = function () { }; // eslint-disable-line @typescript-eslint/no-empty-function
+                                                _this.scenarioMarker.completeScenario(TelemetryEvent_1.default.CreateIC3Adapter);
+                                                resolve(adapter);
+                                            }, function () {
+                                                _this.scenarioMarker.failScenario(TelemetryEvent_1.default.CreateIC3Adapter);
+                                                reject('Failed to load IC3Adapter');
+                                            })];
+                                    case 1:
+                                        _b.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                }
+                return [2 /*return*/, Promise.reject("ChatAdapter for protocol " + protocol + " currently not supported")];
             });
         });
     };
@@ -1179,6 +1684,92 @@ var OmnichannelChatSDK = /** @class */ (function () {
             });
         });
     };
+    OmnichannelChatSDK.prototype.getPostChatSurveyContext = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var conversationId, liveWSAndLiveChatEngJoin, msdyn_postconversationsurveyenable, msfp_sourcesurveyidentifier, postConversationSurveyOwnerId, liveWorkItemDetails, participantJoined, surveyInviteLinkRequest, optionalParams, surveyInviteLinkResponse, surveyInviteLink, formsProLocale, postChatContext, ex_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetPostChatSurveyContext, {
+                            RequestId: this.requestId
+                        });
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 6, , 7]);
+                        liveWSAndLiveChatEngJoin = this.liveChatConfig.LiveWSAndLiveChatEngJoin;
+                        msdyn_postconversationsurveyenable = liveWSAndLiveChatEngJoin.msdyn_postconversationsurveyenable, msfp_sourcesurveyidentifier = liveWSAndLiveChatEngJoin.msfp_sourcesurveyidentifier, postConversationSurveyOwnerId = liveWSAndLiveChatEngJoin.postConversationSurveyOwnerId;
+                        if (!msdyn_postconversationsurveyenable) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.OCClient.getLWIDetails(this.requestId)];
+                    case 2:
+                        liveWorkItemDetails = _a.sent();
+                        participantJoined = (liveWorkItemDetails === null || liveWorkItemDetails === void 0 ? void 0 : liveWorkItemDetails.CanRenderPostChat) && (liveWorkItemDetails === null || liveWorkItemDetails === void 0 ? void 0 : liveWorkItemDetails.CanRenderPostChat) === "True";
+                        conversationId = liveWorkItemDetails === null || liveWorkItemDetails === void 0 ? void 0 : liveWorkItemDetails.ConversationId;
+                        surveyInviteLinkRequest = {
+                            "FormId": msfp_sourcesurveyidentifier,
+                            "ConversationId": conversationId,
+                            "OCLocaleCode": locale_1.getLocaleStringFromId(this.localeId) || locale_1.getLocaleStringFromId(locale_1.defaultLocaleId)
+                        };
+                        optionalParams = {
+                            "requestId": this.requestId
+                        };
+                        if (this.authenticatedUserToken) {
+                            optionalParams.authenticatedUserToken = this.authenticatedUserToken;
+                        }
+                        return [4 /*yield*/, this.OCClient.getSurveyInviteLink(postConversationSurveyOwnerId, surveyInviteLinkRequest)];
+                    case 3:
+                        surveyInviteLinkResponse = _a.sent();
+                        surveyInviteLink = void 0, formsProLocale = void 0;
+                        if (surveyInviteLinkResponse != null) {
+                            if (surveyInviteLinkResponse.inviteList != null && surveyInviteLinkResponse.inviteList.length == 1) {
+                                surveyInviteLink = surveyInviteLinkResponse.inviteList[0].invitationLink;
+                            }
+                            else {
+                                this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetPostChatSurveyContext, {
+                                    ConversationId: conversationId,
+                                    RequestId: this.requestId,
+                                    ExceptionDetails: "Survey Invite link failed to send response."
+                                });
+                                return [2 /*return*/, Promise.reject("Survey Invite link failed to send response.")];
+                            }
+                            if (surveyInviteLinkResponse.formsProLocaleCode != null) {
+                                formsProLocale = surveyInviteLinkResponse.formsProLocaleCode;
+                            }
+                            postChatContext = {
+                                participantJoined: participantJoined,
+                                surveyInviteLink: surveyInviteLink,
+                                formsProLocale: formsProLocale
+                            };
+                            return [2 /*return*/, Promise.resolve(postChatContext)];
+                        }
+                        else {
+                            this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetPostChatSurveyContext, {
+                                ConversationId: conversationId,
+                                RequestId: this.requestId,
+                                ExceptionDetails: "surveyInviteLinkResponse is null."
+                            });
+                            return [2 /*return*/, Promise.reject("surveyInviteLinkResponse is null.")];
+                        }
+                        return [3 /*break*/, 5];
+                    case 4:
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetPostChatSurveyContext, {
+                            RequestId: this.requestId,
+                            ExceptionDetails: "Post Chat Survey is disabled. Please check the Omnichannel Administration Portal."
+                        });
+                        return [2 /*return*/, Promise.reject("Post Chat is disabled from admin side.")];
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
+                        ex_1 = _a.sent();
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetPostChatSurveyContext, {
+                            ConversationId: conversationId,
+                            RequestId: this.requestId,
+                            ExceptionDetails: JSON.stringify(ex_1)
+                        });
+                        return [2 /*return*/, Promise.reject("Retrieving post chat context failed " + JSON.stringify(ex_1))];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    };
     OmnichannelChatSDK.prototype.getIC3Client = function () {
         return __awaiter(this, void 0, void 0, function () {
             var IC3Client;
@@ -1264,7 +1855,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getChatConfig = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var liveChatConfig, dataMaskingConfig, authSettings, liveWSAndLiveChatEngJoin, setting, preChatSurvey, msdyn_prechatenabled, msdyn_callingoptions, msdyn_conversationmode, msdyn_enablechatreconnect, isPreChatEnabled, isChatReconnectEnabled, token, exceptionDetails, _a, exceptionDetails, exceptionDetails, error_12;
+            var liveChatConfig, dataMaskingConfig, authSettings, liveWSAndLiveChatEngJoin, liveChatVersion, chatWidgetLanguage, msdyn_localeid, setting, preChatSurvey, msdyn_prechatenabled, msdyn_callingoptions, msdyn_conversationmode, msdyn_enablechatreconnect, isPreChatEnabled, isChatReconnectEnabled, token, exceptionDetails, _a, exceptionDetails, exceptionDetails, error_18;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1272,7 +1863,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         return [4 /*yield*/, this.OCClient.getChatConfig()];
                     case 1:
                         liveChatConfig = _b.sent();
-                        dataMaskingConfig = liveChatConfig.DataMaskingInfo, authSettings = liveChatConfig.LiveChatConfigAuthSettings, liveWSAndLiveChatEngJoin = liveChatConfig.LiveWSAndLiveChatEngJoin;
+                        dataMaskingConfig = liveChatConfig.DataMaskingInfo, authSettings = liveChatConfig.LiveChatConfigAuthSettings, liveWSAndLiveChatEngJoin = liveChatConfig.LiveWSAndLiveChatEngJoin, liveChatVersion = liveChatConfig.LiveChatVersion, chatWidgetLanguage = liveChatConfig.ChatWidgetLanguage;
+                        msdyn_localeid = chatWidgetLanguage.msdyn_localeid;
+                        this.localeId = msdyn_localeid || locale_1.defaultLocaleId;
+                        this.liveChatVersion = liveChatVersion || LiveChatVersion_1.default.V1;
+                        /* istanbul ignore next */
+                        this.debug && console.log("[OmnichannelChatSDK][getChatConfig][liveChatVersion] " + this.liveChatVersion);
                         setting = dataMaskingConfig.setting;
                         if (setting.msdyn_maskforcustomer) {
                             this.dataMaskingRules = dataMaskingConfig.dataMaskingRules;
@@ -1341,9 +1937,9 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         this.liveChatConfig = liveChatConfig;
                         return [2 /*return*/, this.liveChatConfig];
                     case 8:
-                        error_12 = _b.sent();
-                        console.error("OmnichannelChatSDK/getChatConfig/error " + error_12);
-                        return [2 /*return*/, error_12];
+                        error_18 = _b.sent();
+                        console.error("OmnichannelChatSDK/getChatConfig/error " + error_18);
+                        return [2 /*return*/, error_18];
                     case 9: return [2 /*return*/];
                 }
             });
@@ -1359,20 +1955,33 @@ var OmnichannelChatSDK = /** @class */ (function () {
         return libraries_1.default.getIC3ClientCDNUrl();
     };
     OmnichannelChatSDK.prototype.resolveChatAdapterUrl = function (protocol) {
-        if (protocol !== ChatAdapterProtocols_1.default.IC3) {
+        var supportedChatAdapterProtocols = [ChatAdapterProtocols_1.default.ACS, ChatAdapterProtocols_1.default.IC3];
+        if (protocol && !supportedChatAdapterProtocols.includes(protocol)) {
             throw new Error("ChatAdapter for protocol " + protocol + " currently not supported");
         }
-        if (this.chatSDKConfig.chatAdapterConfig && 'webChatIC3AdapterCDNUrl' in this.chatSDKConfig.chatAdapterConfig) {
-            return this.chatSDKConfig.chatAdapterConfig.webChatIC3AdapterCDNUrl;
+        if (protocol === ChatAdapterProtocols_1.default.ACS || this.liveChatVersion === LiveChatVersion_1.default.V2) {
+            if (this.chatSDKConfig.chatAdapterConfig && 'webChatACSAdapterCDNUrl' in this.chatSDKConfig.chatAdapterConfig) {
+                return this.chatSDKConfig.chatAdapterConfig.webChatACSAdapterCDNUrl;
+            }
+            if (this.chatSDKConfig.chatAdapterConfig && 'webChatACSAdapterVersion' in this.chatSDKConfig.chatAdapterConfig) {
+                return libraries_1.default.getACSAdapterCDNUrl(this.chatSDKConfig.chatAdapterConfig.webChatACSAdapterVersion);
+            }
+            return libraries_1.default.getACSAdapterCDNUrl();
         }
-        if (this.chatSDKConfig.chatAdapterConfig && 'webChatIC3AdapterVersion' in this.chatSDKConfig.chatAdapterConfig) {
-            return libraries_1.default.getIC3AdapterCDNUrl(this.chatSDKConfig.chatAdapterConfig.webChatIC3AdapterVersion);
+        else if (protocol === ChatAdapterProtocols_1.default.IC3 || this.liveChatVersion === LiveChatVersion_1.default.V1) {
+            if (this.chatSDKConfig.chatAdapterConfig && 'webChatIC3AdapterCDNUrl' in this.chatSDKConfig.chatAdapterConfig) {
+                return this.chatSDKConfig.chatAdapterConfig.webChatIC3AdapterCDNUrl;
+            }
+            if (this.chatSDKConfig.chatAdapterConfig && 'webChatIC3AdapterVersion' in this.chatSDKConfig.chatAdapterConfig) {
+                return libraries_1.default.getIC3AdapterCDNUrl(this.chatSDKConfig.chatAdapterConfig.webChatIC3AdapterVersion);
+            }
+            return libraries_1.default.getIC3AdapterCDNUrl();
         }
-        return libraries_1.default.getIC3AdapterCDNUrl();
+        return '';
     };
     OmnichannelChatSDK.prototype.updateChatToken = function (newToken, newRegionGTMS) {
         return __awaiter(this, void 0, void 0, function () {
-            var sessionInfo, error_13, exceptionDetails;
+            var sessionInfo, error_19, exceptionDetails;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1397,7 +2006,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         return [3 /*break*/, 4];
                     case 3:
-                        error_13 = _a.sent();
+                        error_19 = _a.sent();
                         exceptionDetails = {
                             response: "UpdateChatTokenFailed"
                         };
@@ -1406,7 +2015,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ChatId: this.chatToken.chatId,
                             ExceptionDetails: JSON.stringify(exceptionDetails)
                         });
-                        console.error("OmnichannelChatSDK/updateChatToken/error " + error_13);
+                        console.error("OmnichannelChatSDK/updateChatToken/error " + error_19);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }