Migrate ACS to new lib location

CHANGELOG.md

@@ -4,9 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- migrate [acs_webchat-chat-adapter@0.0.35-beta.30.1](https://www.npmjs.com/package/acs_webchat-chat-adapter/v/0.0.35-beta.30.1) to [@microsoft/botframework-webchat-adapter-azure-communication-chat@0.0.1-beta.1](https://www.npmjs.com/package/@microsoft/botframework-webchat-adapter-azure-communication-chat/v/0.0.1-beta.1)
+
 ## [1.10.8] - 2025-02-05
 
 ### Fixed
+
 - Fix `ChatSDK.onNewMessages()` calling `createOmnichannelMessages()` twice during polling
 
 ### Changed

__tests__/utils/chatAdapterCreators.web.spec.ts

@@ -74,7 +74,7 @@ describe("Chat Adapter Creators", () => {
     });
 
     it("createACSAdapter should return an Adapter", async () => {
-        jest.mock("acs_webchat-chat-adapter");
+        jest.mock("@microsoft/botframework-webchat-adapter-azure-communication-chat");
 
         const optionalParams = {
             ACSAdapter: {

jest.config.jsdom.js

@@ -1,7 +1,7 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
-  testPathIgnorePatterns : [
+  testPathIgnorePatterns: [
     "<rootDir>/samples/",
     "<rootDir>/playwright/"
   ],
@@ -20,7 +20,7 @@ module.exports = {
     "external/aria/"
   ],
   moduleNameMapper: {
-    '^axios$': require.resolve('axios'),
+    '^axios$': require.resolve('axios')
   },
   setupFiles: ["./jest.setup.jsdom.js"]
 };

jest.config.node.js

@@ -15,7 +15,7 @@ module.exports = {
     "external/aria/"
   ],
   moduleNameMapper: {
-    '^axios$': require.resolve('axios'),
+    '^axios$': require.resolve('axios')
   },
   setupFiles: ["./jest.setup.node.js"]
 };

package.json

@@ -44,11 +44,11 @@
     "typescript": "^5.4.2"
   },
   "dependencies": {
-    "@azure/communication-chat": "1.5.2",
+    "@azure/communication-chat": "1.5.4",
     "@azure/communication-common": "2.3.1",
+    "@microsoft/botframework-webchat-adapter-azure-communication-chat": "^0.0.1-beta.1",
     "@microsoft/ocsdk": "^0.5.11",
     "@microsoft/omnichannel-amsclient": "^0.1.7",
-    "@microsoft/omnichannel-ic3core": "^0.1.4",
-    "acs_webchat-chat-adapter": "^0.0.35-beta.30.1"
+    "@microsoft/omnichannel-ic3core": "^0.1.4"
   }
 }

src/telemetry/AriaTelemetry.ts

@@ -1,10 +1,11 @@
-import { ariaTelemetryKey } from '../config/settings';
+import { AWTEventData, AWTLogConfiguration, AWTLogManager, AWTLogger } from '../external/aria/webjs/AriaSDK';
+import { ic3ClientVersion, webChatACSAdapterVersion } from '../config/settings';
+import { isBrowser, isReactNative } from '../utils/platform';
+
 import { AWTEventPriority } from '../external/aria/common/Enums';
-import { AWTLogManager, AWTLogger, AWTEventData, AWTLogConfiguration } from '../external/aria/webjs/AriaSDK';
 import LogLevel from '../telemetry/LogLevel';
 import ScenarioType from '../telemetry/ScenarioType';
-import { ic3ClientVersion, webChatACSAdapterVersion } from '../config/settings';
-import { isBrowser, isReactNative } from '../utils/platform';
+import { ariaTelemetryKey } from '../config/settings';
 
 interface BaseContract {
     ChatSDKRuntimeId: string;

src/types/@microsoft-botframework-webchat-adapter-azure-communication-chat.d.ts

@@ -0,0 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// typings/@microsoft/botframework-webchat-adapter-azure-communication-chat.d.ts
+declare module '@microsoft/botframework-webchat-adapter-azure-communication-chat' {
+    export function createACSAdapter(...args: any[]): any;
+}

src/utils/__mocks__/@microsoft/botframework-webchat-adapter-azure-communication-chat.js

@@ -0,0 +1,21 @@
+module.exports = {
+    createACSAdapter: () => {
+        return {
+            end: () => {
+                console.log("end");
+            },
+            fileManager: {
+                fileScanner: {
+                    end: () => {
+                        console.log("file scanner end");
+                    },
+                },
+            },
+            chatClient: {
+                sendMessage: jest.fn(),
+                receiveMessage: jest.fn(),
+                endChat: jest.fn(),
+            },
+        };
+    },
+};

src/utils/chatAdapterCreators.ts

@@ -2,26 +2,26 @@ import { ACSAdapterLogger, IC3ClientLogger } from "./loggers";
 
 import ACSParticipantDisplayName from "../core/messaging/ACSParticipantDisplayName";
 import AMSFileManager from "../external/ACSAdapter/AMSFileManager";
+import { AdapterErrorEvent } from "../external/ACSAdapter/AdapterErrorEvent";
 import AriaTelemetry from "../telemetry/AriaTelemetry";
 import ChatAdapterOptionalParams from "../core/messaging/ChatAdapterOptionalParams";
 import { ChatClient } from "@azure/communication-chat";
 import ChatSDKConfig from "../core/ChatSDKConfig";
 import IChatToken from "../external/IC3Adapter/IChatToken";
 import IIC3AdapterOptions from "../external/IC3Adapter/IIC3AdapterOptions";
 import LiveChatVersion from "../core/LiveChatVersion";
+import LogLevel from "../telemetry/LogLevel";
 import OmnichannelConfig from "../core/OmnichannelConfig";
 import ScenarioMarker from "../telemetry/ScenarioMarker";
 import TelemetryEvent from "../telemetry/TelemetryEvent";
 import WebUtils from "./WebUtils";
 import createChannelDataEgressMiddleware from "../external/ACSAdapter/createChannelDataEgressMiddleware";
-import { createACSAdapter as createChatACSAdapter } from "acs_webchat-chat-adapter";
+import { createACSAdapter as createChatACSAdapter } from "@microsoft/botframework-webchat-adapter-azure-communication-chat";
 import createFileScanIngressMiddleware from "../external/ACSAdapter/createFileScanIngressMiddleware";
 import createFormatEgressTagsMiddleware from "../external/ACSAdapter/createFormatEgressTagsMiddleware";
 import createFormatIngressTagsMiddleware from "../external/ACSAdapter/createFormatIngressTagsMiddleware";
 import exceptionThrowers from "./exceptionThrowers";
 import urlResolvers from "./urlResolvers";
-import { AdapterErrorEvent } from "../external/ACSAdapter/AdapterErrorEvent";
-import LogLevel from "../telemetry/LogLevel";
 
 const createDirectLine = async (optionalParams: ChatAdapterOptionalParams, chatSDKConfig: ChatSDKConfig, liveChatVersion: LiveChatVersion, protocol: string, telemetry: typeof AriaTelemetry, scenarioMarker: ScenarioMarker): Promise<unknown> => {
     const options = optionalParams.DirectLine ? optionalParams.DirectLine.options : {};