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

Ajustes para abertura do sistema sem a necessidade da pasta de gbapp.

Browse source
This commit is contained in:
Rafael Arenario Pereira da Silva 2018-06-18 09:41:55 -03:00
parent e4e331730d
commit a2ffa65425
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
deploy/core.gbapp/services/GBMinService.ts
View file

@ -88,7 +88,7 @@ export class GBMinService {
/** Constructs a new minimal instance for each bot. */ /** Constructs a new minimal instance for each bot. */
buildMin(cb: GBServiceCallback<GBMinInstance>, server: any, appPackages: Array<IGBPackage>) { buildMin(cb: GBServiceCallback<GBMinInstance>, server: any, appPackages: Array<IGBPackage>, botPackages: Array<string>) {
var _this_ = this; var _this_ = this;
@ -189,21 +189,25 @@ export class GBMinService {
GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(sysPackage => { GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(sysPackage => {
logger.trace(`Loading sys package: ${sysPackage.name}...`); logger.trace(`Loading sys package: ${sysPackage.name}...`);
let p = Object.create(sysPackage.prototype) as IGBPackage; let p = Object.create(sysPackage.prototype) as IGBPackage;
p.loadBot(min); p.loadBot(min);
e.sysPackages.push(p); e.sysPackages.push(p);
if (sysPackage.name === "GBWhatsappPackage") { if (sysPackage.name === "GBWhatsappPackage") {
let url = "/instances/:botId/whatsapp"; let url = "/instances/:botId/whatsapp";
server.post(url, (req, res) => { server.post(url, (req, res) => {
p["channel"].received(req, res); p["channel"].received(req, res);
}); });
} }
}); });
e.loadBot(min);
}); });
botPackages.forEach(e => {
[GBAdminPackage, GBAnalyticsPackage, GBCorePackage, GBSecurityPackage,
GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(sysPackage => {
logger.trace(`Loading sys package: ${sysPackage.name}...`);
let p = Object.create(sysPackage.prototype) as IGBPackage;
p.loadBot(min);
});
});
}); });
let connector = new gBuilder.ChatConnector({ let connector = new gBuilder.ChatConnector({
@ -333,7 +337,7 @@ export class GBMinService {
} }
/** Performs package deployment in all .gbai or default. */ /** Performs package deployment in all .gbai or default. */
public deployPackages(core: IGBCoreService, server: any, appPackages: Array<IGBPackage>) { public deployPackages(core: IGBCoreService, server: any, appPackages: Array<IGBPackage>, botPackages: Array<string>) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
@ -344,7 +348,6 @@ export class GBMinService {
if (additionalPath) { if (additionalPath) {
paths = paths.concat(additionalPath.toLowerCase().split(";")); paths = paths.concat(additionalPath.toLowerCase().split(";"));
} }
let botPackages = new Array<string>();
let gbappPackages = new Array<string>(); let gbappPackages = new Array<string>();
let generalPackages = new Array<string>(); let generalPackages = new Array<string>();

5
src/app.ts
View file

@ -56,6 +56,7 @@ import { GBCustomerSatisfactionPackage } from "../deploy/customer-satisfaction.g
import { IGBPackage } from 'botlib'; import { IGBPackage } from 'botlib';
let appPackages = new Array<IGBPackage>(); let appPackages = new Array<IGBPackage>();
let botPackages = new Array<string>();
/** /**
* General Bots open-core entry point. * General Bots open-core entry point.
@ -107,12 +108,12 @@ export class GBServer {
(async () => { (async () => {
try { try {
await minService.deployPackages(core, server, appPackages); await minService.deployPackages(core, server, appPackages, botPackages);
logger.info(`The Bot Server is in RUNNING mode...`); logger.info(`The Bot Server is in RUNNING mode...`);
minService.buildMin(instance => { minService.buildMin(instance => {
logger.info(`Instance loaded: ${instance.botId}...`); logger.info(`Instance loaded: ${instance.botId}...`);
}, server, appPackages); }, server, appPackages, botPackages);
} catch (err) { } catch (err) {
logger.info(err); logger.info(err);