From 2f9be692693d4d338dbdd7c342633ba4b5eeee3b Mon Sep 17 00:00:00 2001 From: Dong Lei Date: Fri, 18 Oct 2019 15:34:10 +0800 Subject: [PATCH 1/3] distinguish botAdminEndpoint and botEndpoint --- .../server/src/models/connector/csharpBotConnector.ts | 6 ++++-- .../src/models/environment/defaultEnvironment.ts | 2 +- .../server/src/models/environment/interface.ts | 6 +++++- Composer/packages/server/src/settings/settings.json | 7 ++++--- Composer/yarn.lock | 10 +--------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Composer/packages/server/src/models/connector/csharpBotConnector.ts b/Composer/packages/server/src/models/connector/csharpBotConnector.ts index 0f75131b92..b4476d7b79 100644 --- a/Composer/packages/server/src/models/connector/csharpBotConnector.ts +++ b/Composer/packages/server/src/models/connector/csharpBotConnector.ts @@ -11,8 +11,10 @@ import { DialogSetting } from '../bot/interface'; import { BotConfig, BotEnvironments, BotStatus, IBotConnector, IPublishHistory } from './interface'; export class CSharpBotConnector implements IBotConnector { + private adminEndpoint: string; private endpoint: string; - constructor(endpoint: string) { + constructor(adminEndpoint: string, endpoint: string) { + this.adminEndpoint = adminEndpoint; this.endpoint = endpoint; } @@ -21,7 +23,7 @@ export class CSharpBotConnector implements IBotConnector { connect = async (_: BotEnvironments, __: string) => { // confirm bot runtime is listening here try { - await axios.get(this.endpoint + '/api/admin'); + await axios.get(this.adminEndpoint + '/api/admin'); } catch (err) { throw new Error(err); } diff --git a/Composer/packages/server/src/models/environment/defaultEnvironment.ts b/Composer/packages/server/src/models/environment/defaultEnvironment.ts index a70a98e31a..5871738d0b 100644 --- a/Composer/packages/server/src/models/environment/defaultEnvironment.ts +++ b/Composer/packages/server/src/models/environment/defaultEnvironment.ts @@ -15,7 +15,7 @@ export class DefaultEnvironment implements IEnvironment { public constructor(config: IEnvironmentConfig) { this.config = config; this.settingManager = new DefaultSettingManager(this.config.basePath); - this.botConnector = new CSharpBotConnector(this.config.endpoint); + this.botConnector = new CSharpBotConnector(this.config.adminEndpoint, this.config.endpoint); } public getEnvironmentName(_: string): string | undefined { diff --git a/Composer/packages/server/src/models/environment/interface.ts b/Composer/packages/server/src/models/environment/interface.ts index 95fb4b3499..882333a4d5 100644 --- a/Composer/packages/server/src/models/environment/interface.ts +++ b/Composer/packages/server/src/models/environment/interface.ts @@ -6,6 +6,7 @@ import settings from '../../settings/settings'; export interface IEnvironmentConfig { name: string; basePath: string; + adminEndpoint: string; endpoint: string; } @@ -20,19 +21,22 @@ export interface IEnvironment { export const absHostedConfig: IEnvironmentConfig = { name: 'absh', basePath: '', + adminEndpoint: '', endpoint: '', }; export const mockHostedConfig: IEnvironmentConfig = { name: 'mockhosted', basePath: '', + adminEndpoint: '', endpoint: '', }; export const defaultConfig: IEnvironmentConfig = { name: 'default', basePath: '', - endpoint: settings.botRuntime, + adminEndpoint: settings.botAdminEndpoint, + endpoint: settings.botEndpoint, }; export const currentConfig: IEnvironmentConfig = absHosted diff --git a/Composer/packages/server/src/settings/settings.json b/Composer/packages/server/src/settings/settings.json index ef6181050c..d8f62b4a7e 100644 --- a/Composer/packages/server/src/settings/settings.json +++ b/Composer/packages/server/src/settings/settings.json @@ -1,11 +1,12 @@ { "development": { - "botRuntime": "http://localhost:3979", + "botAdminEndpoint": "http://localhost:3979", + "botEndpoint": "http://localhost:3979", "assetsLibray": "./assets", "runtimeFolder": "../../../BotProject/Templates", "defaultFolder": "../../../SampleBots" }, "container": { - "botRuntime": "http://botruntime:80" + "botAdminEndpoint": "http://botruntime:80" } -} +} \ No newline at end of file diff --git a/Composer/yarn.lock b/Composer/yarn.lock index 5d66c5ad36..2d14a5588a 100644 --- a/Composer/yarn.lock +++ b/Composer/yarn.lock @@ -2418,7 +2418,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@16.9.0": +"@types/react@*", "@types/react@16.9.0", "@types/react@^16.9.2": version "16.9.0" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.0.tgz#27434f16d889a335eb4626d1f1e67eda54039e5b" integrity sha512-eOct1hyZI9YZf/eqNlYu7jxA9qyTw1EGXruAJhHhBDBpc00W0C1vwlnh+hkOf7UFZkNK+UxnFBpwAZe3d7XJhQ== @@ -2426,14 +2426,6 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/react@^16.9.2": - version "16.9.9" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/react/-/@types/react-16.9.9.tgz#a62c6f40f04bc7681be5e20975503a64fe783c3a" - integrity sha1-pixvQPBLx2gb5eIJdVA6ZP54PDo= - dependencies: - "@types/prop-types" "*" - csstype "^2.2.0" - "@types/rimraf@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e" From 035582442511818426178a2eb2b498b79df4f863 Mon Sep 17 00:00:00 2001 From: Dong Lei Date: Fri, 18 Oct 2019 18:14:44 +0800 Subject: [PATCH 2/3] update docker --- Composer/packages/client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/package.json b/Composer/packages/client/package.json index 1712b40dad..c88e5da578 100644 --- a/Composer/packages/client/package.json +++ b/Composer/packages/client/package.json @@ -72,7 +72,7 @@ }, "scripts": { "start": "node scripts/start.js", - "build": "node --max-old-space-size=8192 scripts/build.js", + "build": "node --max-old-space-size=2048 scripts/build.js", "test": "jest", "lint": "eslint --quiet --ext .js,.jsx,.ts,.tsx ./src", "lint:fix": "yarn lint --fix" From cba0ec948acc40c400dd4cbcd742407648ab0c34 Mon Sep 17 00:00:00 2001 From: Dong Lei Date: Fri, 18 Oct 2019 20:14:33 +0800 Subject: [PATCH 3/3] fix sync --- .../packages/server/src/models/connector/csharpBotConnector.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/server/src/models/connector/csharpBotConnector.ts b/Composer/packages/server/src/models/connector/csharpBotConnector.ts index b4476d7b79..a0ec4bb2e8 100644 --- a/Composer/packages/server/src/models/connector/csharpBotConnector.ts +++ b/Composer/packages/server/src/models/connector/csharpBotConnector.ts @@ -67,7 +67,7 @@ export class CSharpBotConnector implements IBotConnector { form.append('microsoftAppPassword', config.MicrosoftAppPassword); } try { - await axios.post(this.endpoint + '/api/admin', form, { headers: form.getHeaders() }); + await axios.post(this.adminEndpoint + '/api/admin', form, { headers: form.getHeaders() }); } catch (err) { throw new Error('Unable to sync content to bot runtime'); }