GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(core.gbapp): Self-replication on Azure

Browse source
This commit is contained in:
Rodrigo Rodriguez 2019-05-27 09:14:49 -03:00
parent bf602c6b7d
commit e82a813433
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/core.gbapp/services/GBDeployer.ts
View file

@ -349,7 +349,7 @@ export class GBDeployer {
botPackages.forEach(async (e) => { botPackages.forEach(async (e) => {
if (e !== 'packages\\boot.gbot') { if (e !== 'packages\\boot.gbot') {
GBLog.info(`Deploying bot: ${e}...`); GBLog.info(`Deploying bot: ${e}...`);
await _this.deployBot(e, GBServer.globals.proxyAddress); await _this.deployBot(e, GBServer.globals.publicAddress);
GBLog.info(`Bot: ${e} deployed...`); GBLog.info(`Bot: ${e} deployed...`);
} }
}); });

2
packages/whatsapp.gblib/services/WhatsappDirectLine.ts
View file

@ -58,7 +58,7 @@ export class WhatsappDirectLine extends GBService {
url: urlJoin(this.whatsappServiceUrl, 'webhook'), url: urlJoin(this.whatsappServiceUrl, 'webhook'),
qs: { qs: {
token: this.whatsappServiceKey, token: this.whatsappServiceKey,
webhookUrl: `${GBServer.globals.proxyAddress}/instances/${this.botId}/whatsapp`, webhookUrl: `${GBServer.globals.publicAddress}/instances/${this.botId}/whatsapp`,
set: true set: true
}, },
headers: { headers: {

16
src/app.ts
View file

@ -55,7 +55,7 @@ const appPackages: IGBPackage[] = [];
* Global shared server data; * Global shared server data;
*/ */
export class RootData { export class RootData {
public proxyAddress: string; public publicAddress: string;
} }
/** /**
@ -93,10 +93,16 @@ export class GBServer {
const adminService: GBAdminService = new GBAdminService(core); const adminService: GBAdminService = new GBAdminService(core);
const conversationalService: GBConversationalService = new GBConversationalService(core); const conversationalService: GBConversationalService = new GBConversationalService(core);
if (process.env.NODE_ENV === 'development') {
// Ensure that local development proxy is setup. // Ensure that local development proxy is setup.
GBLog.info(`Establishing a development local proxy (ngrok)...`); GBLog.info(`Establishing a development local proxy (ngrok)...`);
GBServer.globals.proxyAddress = await core.ensureProxy(port); 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. // Creates a boot instance or load it from storage.
@ -105,7 +111,7 @@ export class GBServer {
await core.initStorage(); await core.initStorage();
} catch (error) { } catch (error) {
GBLog.verbose(`Error initializing storage: ${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(); await core.initStorage();
} }
@ -133,7 +139,7 @@ export class GBServer {
const fullInstance = Object.assign(packageInstance, bootInstance); const fullInstance = Object.assign(packageInstance, bootInstance);
await core.saveInstance(fullInstance); await core.saveInstance(fullInstance);
let instances: IGBInstance[] = await core.loadAllInstances(core, azureDeployer, let instances: IGBInstance[] = await core.loadAllInstances(core, azureDeployer,
GBServer.globals.proxyAddress); GBServer.globals.publicAddress);
instances = await core.ensureInstances(instances, bootInstance, core); instances = await core.ensureInstances(instances, bootInstance, core);
if (bootInstance !== undefined) { if (bootInstance !== undefined) {
bootInstance = instances[0]; bootInstance = instances[0];
@ -143,7 +149,7 @@ export class GBServer {
const minService: GBMinService = new GBMinService(core, conversationalService, adminService, deployer); const minService: GBMinService = new GBMinService(core, conversationalService, adminService, deployer);
await minService.buildMin(bootInstance, server, appPackages, instances, await minService.buildMin(bootInstance, server, appPackages, instances,
deployer, GBServer.globals.proxyAddress); deployer, GBServer.globals.publicAddress);
// Deployment of local applications for the first time. // Deployment of local applications for the first time.