feat: Updated js runtime to use the latest SDK

runtime/node/package.json

@@ -16,10 +16,11 @@
   "license": "ISC",
   "dependencies": {
     "@azure/functions": "^1.2.2",
-    "botbuilder": "4.10.0-rc0",
-    "botbuilder-dialogs": "4.10.0-rc0",
-    "botbuilder-dialogs-adaptive": "4.10.0-rc0-preview",
-    "botbuilder-dialogs-declarative": "4.10.0-rc0-preview",
+    "botbuilder": "next",
+    "botbuilder-ai": "next",
+    "botbuilder-dialogs": "next",
+    "botbuilder-dialogs-adaptive": "next",
+    "botbuilder-dialogs-declarative": "next",
     "debug": "^4.1.1",
     "lodash": "^4.17.19",
     "minimist": "1.2.5",

runtime/node/src/shared/composerBot.ts

@@ -1,11 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { ActivityHandler, ActivityTypes, ConversationState, SkillHttpClient, TurnContext, UserState } from 'botbuilder';
+import {
+  ActivityHandler,
+  ActivityTypes,
+  ComponentRegistration,
+  ConversationState,
+  SkillHttpClient,
+  TurnContext,
+  UserState,
+} from 'botbuilder';
+import { QnAMakerComponentRegistration, LuisComponentRegistration } from 'botbuilder-ai';
 import { DialogManager } from 'botbuilder-dialogs';
 import {
+  AdaptiveComponentRegistration,
   AdaptiveDialog,
-  AdaptiveDialogComponentRegistration,
   LanguageGeneratorExtensions,
   LanguagePolicy,
   ResourceExtensions,
@@ -41,10 +50,13 @@ export class ComposerBot extends ActivityHandler {
     this.projectRoot = getProjectRoot();
     this.settings = getSettings(this.projectRoot);
 
+    ComponentRegistration.add(new AdaptiveComponentRegistration());
+    ComponentRegistration.add(new QnAMakerComponentRegistration());
+    ComponentRegistration.add(new LuisComponentRegistration());
+
     // Create and configure resource explorer.
     this.resourceExplorer = new ResourceExplorer();
     this.resourceExplorer.addFolders(this.projectRoot, ['runtime'], false);
-    this.resourceExplorer.addComponent(new AdaptiveDialogComponentRegistration(this.resourceExplorer));
 
     this.loadRootDialog();
     this.configureLanguageGeneration();
@@ -55,9 +67,7 @@ export class ComposerBot extends ActivityHandler {
     const rootDialog = this.dialogManager.rootDialog as AdaptiveDialog;
     const claimIdentity = turnContext.turnState.get(turnContext.adapter.BotIdentityKey);
     if (claimIdentity && SkillValidation.isSkillClaim(claimIdentity.claims)) {
-      rootDialog.autoEndDialog = true;
-    } else {
-      rootDialog.autoEndDialog = false;
+      rootDialog.configure({ autoEndDialog: true });
     }
 
     const removeRecipientMention = (this.settings.feature && this.settings.feature.removeRecipientMention) || false;
@@ -76,8 +86,6 @@ export class ComposerBot extends ActivityHandler {
     this.dialogManager = new DialogManager(rootDialog);
     ResourceExtensions.useResourceExplorer(this.dialogManager, this.resourceExplorer);
     this.dialogManager.initialTurnState.set('settings', this.settings);
-    this.dialogManager.conversationState = this.conversationState;
-    this.dialogManager.userState = this.userState;
   }
 
   private configureLanguageGeneration() {

runtime/node/src/shared/helpers.ts

@@ -15,11 +15,9 @@ import {
   SkillHandler,
   TurnContext,
   UserState,
+  useBotState,
   WebRequest,
   WebResponse,
-  Activity,
-  StatusCodeError,
-  StatusCodes,
 } from 'botbuilder';
 import { AuthenticationConfiguration, SimpleCredentialProvider } from 'botframework-connector';
 import { ComposerBot } from './composerBot';
@@ -122,6 +120,7 @@ export const getBotAdapter = (userState: UserState, conversationState: Conversat
     appPassword: settings.MicrosoftAppPassword,
   };
   const adapter = new BotFrameworkAdapter(adapterSettings);
+  useBotState(adapter, userState, conversationState);
   adapter.onTurnError = async (turnContext: TurnContext, error: Error) => {
     try {
       // Send a message to the user.