diff --git a/CHANGELOG.md b/CHANGELOG.md index ad5d9150..ac7ea92f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,39 +1,3 @@ -## [1.3.3](https://github.com/pragmatismo-io/BotServer/compare/1.3.2...1.3.3) (2019-05-27) - - -### Bug Fixes - -* **core.gbapp:** Self-replication on Azure ([bf602c6](https://github.com/pragmatismo-io/BotServer/commit/bf602c6)) -* **core.gbapp:** Self-replication on Azure ([3cca504](https://github.com/pragmatismo-io/BotServer/commit/3cca504)) -* **core.gbapp:** Self-replication on Azure ([05edafd](https://github.com/pragmatismo-io/BotServer/commit/05edafd)) - -## [1.3.2](https://github.com/pragmatismo-io/BotServer/compare/1.3.1...1.3.2) (2019-05-26) - - -### Bug Fixes - -* **core.gbapp:** Self-replication on Azure. ([2ccae38](https://github.com/pragmatismo-io/BotServer/commit/2ccae38)) -* **core.gbapp:** Self-replication on Azure. ([4b7d29d](https://github.com/pragmatismo-io/BotServer/commit/4b7d29d)) - -## [1.3.1](https://github.com/pragmatismo-io/BotServer/compare/1.3.0...1.3.1) (2019-05-25) - - -### Bug Fixes - -* **core.gbapp:** Azure deployment. ([f1b8eb2](https://github.com/pragmatismo-io/BotServer/commit/f1b8eb2)) -* **core.gbapp:** Azure deployment. ([49e1743](https://github.com/pragmatismo-io/BotServer/commit/49e1743)) -* **core.gbapp:** Azure Deployment. ([f8fab38](https://github.com/pragmatismo-io/BotServer/commit/f8fab38)) -* **core.gbapp:** ESNext in tsconfig.json to match MSFT. ([01b8dd5](https://github.com/pragmatismo-io/BotServer/commit/01b8dd5)) -* **core.gbapp:** Fixing loading of instances. ([bc9c588](https://github.com/pragmatismo-io/BotServer/commit/bc9c588)) -* **core.gbapp:** Investigating BASIC broken. ([f0ec25e](https://github.com/pragmatismo-io/BotServer/commit/f0ec25e)) -* **core.gbapp:** package.json artifacts sync. ([01d34a6](https://github.com/pragmatismo-io/BotServer/commit/01d34a6)) -* **core.gbapp:** Publishing in Azure. ([4d6779e](https://github.com/pragmatismo-io/BotServer/commit/4d6779e)) -* **core.gbapp:** Removing POC code. ([56f46f4](https://github.com/pragmatismo-io/BotServer/commit/56f46f4)) -* **kb.gbapp:** Typo fix. ([ba26578](https://github.com/pragmatismo-io/BotServer/commit/ba26578)) -* **whatsapp.gblib:** Enabling Whatsapp. ([4351b87](https://github.com/pragmatismo-io/BotServer/commit/4351b87)) -* **whatsapp.gblib:** Enabling Whatsapp. ([74f5936](https://github.com/pragmatismo-io/BotServer/commit/74f5936)) -* **whatsapp.lib:** Enabling Whatsapp. ([85249e5](https://github.com/pragmatismo-io/BotServer/commit/85249e5)) - # [1.3.0](https://github.com/pragmatismo-io/BotServer/compare/1.2.2...1.3.0) (2019-05-12) diff --git a/package.json b/package.json index 9ae831a3..a0e9e707 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.3.3", + "version": "1.3.0", "description": "General Bot Community Edition open-core server.", "main": "./boot.js", "bugs": "https://github.com/pragmatismo-io/BotServer/issues", @@ -245,4 +245,4 @@ "post-merge": [] } } -} +} \ No newline at end of file diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index 1d0d7d96..0d113234 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -349,7 +349,7 @@ export class GBDeployer { botPackages.forEach(async (e) => { if (e !== 'packages\\boot.gbot') { GBLog.info(`Deploying bot: ${e}...`); - await _this.deployBot(e, GBServer.globals.proxyAddress); + await _this.deployBot(e, GBServer.globals.publicAddress); GBLog.info(`Bot: ${e} deployed...`); } }); diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts index bcf88d6f..fee48f3b 100644 --- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts +++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts @@ -58,7 +58,7 @@ export class WhatsappDirectLine extends GBService { url: urlJoin(this.whatsappServiceUrl, 'webhook'), qs: { token: this.whatsappServiceKey, - webhookUrl: `${GBServer.globals.proxyAddress}/instances/${this.botId}/whatsapp`, + webhookUrl: `${GBServer.globals.publicAddress}/instances/${this.botId}/whatsapp`, set: true }, headers: { diff --git a/src/app.ts b/src/app.ts index 7367e727..2f826991 100644 --- a/src/app.ts +++ b/src/app.ts @@ -55,7 +55,7 @@ const appPackages: IGBPackage[] = []; * Global shared server data; */ export class RootData { - public proxyAddress: string; + public publicAddress: string; } /** @@ -93,10 +93,16 @@ export class GBServer { const adminService: GBAdminService = new GBAdminService(core); const conversationalService: GBConversationalService = new GBConversationalService(core); - // Ensure that local development proxy is setup. + if (process.env.NODE_ENV === 'development') { + // Ensure that local development proxy is setup. - GBLog.info(`Establishing a development local proxy (ngrok)...`); - GBServer.globals.proxyAddress = await core.ensureProxy(port); + GBLog.info(`Establishing a development local proxy (ngrok)...`); + GBServer.globals.publicAddress = await core.ensureProxy(port); + } else { + const serverAddress = `http://${process.env.WEBSITE_SITE_NAME}.azurewebsites.net`; + GBLog.info(`Defining server address at ${serverAddress}...`); + GBServer.globals.publicAddress = serverAddress; + } // Creates a boot instance or load it from storage. @@ -105,7 +111,7 @@ export class GBServer { await core.initStorage(); } catch (error) { GBLog.verbose(`Error initializing storage: ${error}`); - bootInstance = await core.createBootInstance(core, azureDeployer, GBServer.globals.proxyAddress); + bootInstance = await core.createBootInstance(core, azureDeployer, GBServer.globals.publicAddress); await core.initStorage(); } @@ -133,7 +139,7 @@ export class GBServer { const fullInstance = Object.assign(packageInstance, bootInstance); await core.saveInstance(fullInstance); let instances: IGBInstance[] = await core.loadAllInstances(core, azureDeployer, - GBServer.globals.proxyAddress); + GBServer.globals.publicAddress); instances = await core.ensureInstances(instances, bootInstance, core); if (bootInstance !== undefined) { bootInstance = instances[0]; @@ -143,7 +149,7 @@ export class GBServer { const minService: GBMinService = new GBMinService(core, conversationalService, adminService, deployer); await minService.buildMin(bootInstance, server, appPackages, instances, - deployer, GBServer.globals.proxyAddress); + deployer, GBServer.globals.publicAddress); // Deployment of local applications for the first time.