diff --git a/deploy/core.gbapp/services/GBMinService.ts b/deploy/core.gbapp/services/GBMinService.ts index 0bb25327..ea8f01e7 100644 --- a/deploy/core.gbapp/services/GBMinService.ts +++ b/deploy/core.gbapp/services/GBMinService.ts @@ -131,8 +131,7 @@ export class GBMinService { // instance information stored on server. server.get("/instances/:botId", (req, res) => { - - logger.info('test'); + (async () => { // Returns the instance object to clients requesting bot info. @@ -155,7 +154,6 @@ export class GBMinService { let response: any; try { response = await request(options); - responseObject = JSON.parse(response); } catch (error) { logger.error(`Error calling Speech to Text client. Error is: ${error}.`); return; @@ -176,7 +174,7 @@ export class GBMinService { res.send(error); logger.error(error); } - }); + })() }); // Build bot adapter. diff --git a/package.json b/package.json index 6325cf19..e106c5c3 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "csv-parse": "^3.0.0", "dotenv-extended": "^2.2.0", "express": "^4.16.3", + "express-promise-router": "^3.0.3", "fs-extra": "^7.0.0", "fs-walk": "^0.0.2", "marked": "^0.5.0", diff --git a/src/app.ts b/src/app.ts index 54749078..0c70306f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -77,45 +77,47 @@ export class GBServer { extended: true })); - server.listen(port, async () => { + server.listen(port, () => { - try { + (async () => { + try { - logger.info(`Accepting connections on ${port}...`); - logger.info(`Starting instances...`); + logger.info(`Accepting connections on ${port}...`); + logger.info(`Starting instances...`); - // Reads basic configuration, initialize minimal services. + // Reads basic configuration, initialize minimal services. - GBConfigService.init(); - let core = new GBCoreService(); - await core.initDatabase(); + GBConfigService.init(); + let core = new GBCoreService(); + await core.initDatabase(); - // Boot a bot package if any. + // Boot a bot package if any. - let deployer = new GBDeployer(core, new GBImporter(core)); + let deployer = new GBDeployer(core, new GBImporter(core)); - // Build a minimal bot instance for each .gbot deployment. + // Build a minimal bot instance for each .gbot deployment. - let conversationalService = new GBConversationalService(core); - let minService = new GBMinService(core, conversationalService, deployer); + let conversationalService = new GBConversationalService(core); + let minService = new GBMinService(core, conversationalService, deployer); - [GBAdminPackage, GBAnalyticsPackage, GBCorePackage, GBSecurityPackage, - GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(e => { - logger.info(`Loading sys package: ${e.name}...`); - let p = Object.create(e.prototype) as IGBPackage; - p.loadPackage(core, core.sequelize); - }); + [GBAdminPackage, GBAnalyticsPackage, GBCorePackage, GBSecurityPackage, + GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(e => { + logger.info(`Loading sys package: ${e.name}...`); + let p = Object.create(e.prototype) as IGBPackage; + p.loadPackage(core, core.sequelize); + }); - await minService.deployPackages(core, server, appPackages); - logger.info(`The Bot Server is in RUNNING mode...`); + await minService.deployPackages(core, server, appPackages); + logger.info(`The Bot Server is in RUNNING mode...`); - let instance = await minService.buildMin(server, appPackages); - logger.info(`Instance loaded: ${instance.botId}...`); - return core; - } catch (err) { - logger.info(err); - } + let instance = await minService.buildMin(server, appPackages); + logger.info(`Instance loaded: ${instance.botId}...`); + return core; + } catch (err) { + logger.info(err); + } + })() }); } }