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

fix(core.gbapp): Lint of all.

Browse source
This commit is contained in:
rodrigorodriguez 2022-11-19 23:34:58 -03:00
parent f8d2cd895a
commit 4a2f8b7b43
81 changed files with 11121 additions and 6793 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10743
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

11
package.json
View file

@ -86,7 +86,6 @@
"core-js": "3.26.1",
"data-forge": "1.9.6",
"date-diff": "1.0.2",
"debugger-api": "0.1.2",
"docxtemplater": "3.32.4",
"dotenv-extended": "2.9.0",
"exceljs": "4.3.0",
@ -106,7 +105,7 @@
"luxon": "3.1.0",
"mammoth": "1.5.1",
"marked": "4.2.2",
"moment": "^1.3.0",
"moment": "1.3.0",
"ms-rest-azure": "3.0.2",
"nexmo": "2.9.1",
"node-cron": "3.0.2",
@ -143,7 +142,7 @@
"swagger-client": "^3.18.5",
"tabulator-tables": "5.4.2",
"tedious": "15.1.2",
"textract": "^0.20.0",
"@nosferatu500/textract": "3.1.2",
"twitter-api-v2": "1.12.9",
"typescript": "4.9.3",
"typescript-rest-rpc": "^1.0.7",
@ -156,13 +155,11 @@
"washyourmouthoutwithsoap": "1.0.2",
"whatsapp-web.js": "1.18.3",
"winston": "3.8.2",
"winston-logs-display": "1.0.0",
"yarn": "1.22.19"
"yarn": "^1.22.19"
},
"devDependencies": {
"@types/puppeteer": "7.0.4",
"@types/url-join": "4.0.1",
"ban-sensitive-files": "^1.3.0",
"ban-sensitive-files": "1.9.18",
"commitizen": "4.2.5",
"cz-conventional-changelog": "3.3.0",
"dependency-check": "4.1.0",

61
packages/admin.gbapp/dialogs/AdminDialog.ts
View file

@ -50,11 +50,11 @@ import { CollectionUtil } from 'pragmatismo-io-framework';
* Dialogs for administration tasks.
*/
export class AdminDialog extends IGBDialog {
public static isIntentYes(locale, utterance) {
public static isIntentYes (locale, utterance) {
return utterance.toLowerCase().match(Messages[locale].affirmative_sentences);
}
public static isIntentNo(locale, utterance) {
public static isIntentNo (locale, utterance) {
return utterance.toLowerCase().match(Messages[locale].negative_sentences);
}
@ -64,7 +64,7 @@ export class AdminDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(min: GBMinInstance) {
public static setup (min: GBMinInstance) {
// Setup services.
const importer = new GBImporter(min.core);
@ -77,8 +77,7 @@ export class AdminDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -109,8 +108,7 @@ export class AdminDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -200,8 +198,7 @@ export class AdminDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -237,17 +234,15 @@ export class AdminDialog extends IGBDialog {
min.dialogs.add(
new WaterfallDialog('/publish', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
async step => {
if (step.activeDialog.state.options.confirm || process.env.ADMIN_OPEN_PUBLISH === "true") {
if (step.activeDialog.state.options.confirm || process.env.ADMIN_OPEN_PUBLISH === 'true') {
return await step.next('sim');
} else {
const locale = step.context.activity.locale;
@ -266,7 +261,7 @@ export class AdminDialog extends IGBDialog {
if (step.activeDialog.state.options.firstTime) {
canPublish = true;
} else {
canPublish = AdminDialog.canPublish(min, from) || process.env.ADMIN_OPEN_PUBLISH === "true";
canPublish = AdminDialog.canPublish(min, from) || process.env.ADMIN_OPEN_PUBLISH === 'true';
}
if (!canPublish) {
@ -313,11 +308,14 @@ export class AdminDialog extends IGBDialog {
try {
let cmd1;
if (packageName.indexOf('.') !== -1) {
cmd1 = `deployPackage ${process.env.STORAGE_SITE} /${process.env.STORAGE_LIBRARY}/${botId}.gbai/${packageName}`;
cmd1 = `deployPackage ${process.env.STORAGE_SITE} /${
process.env.STORAGE_LIBRARY
}/${botId}.gbai/${packageName}`;
} else {
cmd1 = `deployPackage ${packageName}`;
}
if ((await (deployer as any).getStoragePackageByName(min.instance.instanceId, packageName)) !== null &&
if (
(await (deployer as any).getStoragePackageByName(min.instance.instanceId, packageName)) !== null &&
!process.env.DONT_DOWNLOAD
) {
const cmd2 = `undeployPackage ${packageName}`;
@ -350,12 +348,11 @@ export class AdminDialog extends IGBDialog {
* the /broadcast command with specific phone numbers.
* @param phone Phone number to check (eg.: +5521900002233)
*/
public static canPublish(min: GBMinInstance, phone: string): Boolean {
public static canPublish (min: GBMinInstance, phone: string): Boolean {
if (process.env.SECURITY_CAN_PUBLISH !== undefined) {
let list = process.env.SECURITY_CAN_PUBLISH.split(';');
const canPublish =
min.core.getParam(min.instance, 'Can Publish', null);
const canPublish = min.core.getParam(min.instance, 'Can Publish', null);
if (canPublish) {
list = list.concat(canPublish.split(';'));
}
@ -370,14 +367,13 @@ export class AdminDialog extends IGBDialog {
}
}
private static setupSecurityDialogs(min: GBMinInstance) {
private static setupSecurityDialogs (min: GBMinInstance) {
min.dialogs.add(
new WaterfallDialog('/setupSecurity', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -398,10 +394,8 @@ export class AdminDialog extends IGBDialog {
async step => {
step.activeDialog.state.authenticatorAuthorityHostUrl = step.result;
min.instance.authenticatorTenant =
step.activeDialog.state.authenticatorTenant;
min.instance.authenticatorAuthorityHostUrl =
step.activeDialog.state.authenticatorAuthorityHostUrl;
min.instance.authenticatorTenant = step.activeDialog.state.authenticatorTenant;
min.instance.authenticatorAuthorityHostUrl = step.activeDialog.state.authenticatorAuthorityHostUrl;
await min.adminService.updateSecurityInfo(
min.instance.instanceId,
@ -415,15 +409,12 @@ export class AdminDialog extends IGBDialog {
min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state);
const redirectUri = urlJoin(
min.instance.botEndpoint,
min.instance.botId,
'/token'
);
const url = `https://login.microsoftonline.com/${step.activeDialog.state.authenticatorTenant
}/oauth2/authorize?client_id=${min.instance.marketplaceId
}&response_type=code&redirect_uri=${redirectUri
}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
const redirectUri = urlJoin(min.instance.botEndpoint, min.instance.botId, '/token');
const url = `https://login.microsoftonline.com/${
step.activeDialog.state.authenticatorTenant
}/oauth2/authorize?client_id=${
min.instance.marketplaceId
}&response_type=code&redirect_uri=${redirectUri}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
await min.conversationalService.sendText(min, step, Messages[locale].consent(url));

15
packages/admin.gbapp/index.ts
View file

@ -47,28 +47,27 @@ import { GuaribasAdmin } from './models/AdminModel.js';
export class GBAdminPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasAdmin]);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
AdminDialog.setup(min);
}
}

21
packages/admin.gbapp/models/AdminModel.ts
View file

@ -36,36 +36,27 @@
'use strict';
import {
Column,
CreatedAt,
DataType,
Model,
Table,
UpdatedAt
} from 'sequelize-typescript';
import { Column, CreatedAt, DataType, Model, Table, UpdatedAt } from 'sequelize-typescript';
/**
* General settings store.
*/
@Table
export class GuaribasAdmin extends Model<GuaribasAdmin> {
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@Column(DataType.STRING(255))
declare key: string;
key: string;
@Column(DataType.STRING(4000))
declare value: string;
value: string;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
}

55
packages/admin.gbapp/services/GBAdminService.ts
View file

@ -39,7 +39,7 @@
import { AuthenticationContext, TokenResponse } from 'adal-node';
import { GBLog, GBMinInstance, IGBAdminService, IGBCoreService, IGBDeployer, IGBInstance } from 'botlib';
import { FindOptions } from 'sequelize/types';
import urlJoin from 'url-join';
import urlJoin from 'url-join';
import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService.js';
import { GuaribasInstance } from '../../core.gbapp/models/GBModel.js';
import { GBConfigService } from '../../core.gbapp/services/GBConfigService.js';
@ -50,7 +50,7 @@ import { GuaribasAdmin } from '../models/AdminModel.js';
import msRestAzure from 'ms-rest-azure';
import Path from 'path';
import PasswordGenerator from 'strict-password-generator';
import crypto from 'crypto';
import crypto from 'crypto';
/**
* Services for server administration.
@ -63,16 +63,16 @@ export class GBAdminService implements IGBAdminService {
public core: IGBCoreService;
constructor(core: IGBCoreService) {
constructor (core: IGBCoreService) {
this.core = core;
}
public static generateUuid(): string {
public static generateUuid (): string {
return crypto.randomUUID();
}
public static getNodeVersion() {
return "19.1.0";
public static getNodeVersion () {
return '19.1.0';
const packageJson = urlJoin(process.cwd(), 'package.json');
// tslint:disable-next-line: non-literal-require
// TODO
@ -81,17 +81,17 @@ export class GBAdminService implements IGBAdminService {
// return pjson.engines.node.replace('=', '');
}
public static async getADALTokenFromUsername(username: string, password: string) {
public static async getADALTokenFromUsername (username: string, password: string) {
const credentials = await GBAdminService.getADALCredentialsFromUsername(username, password);
return (credentials as any).tokenCache._entries[0].accessToken;
}
public static async getADALCredentialsFromUsername(username: string, password: string) {
return await msRestAzure.loginWithUsernamePassword(username, password)
public static async getADALCredentialsFromUsername (username: string, password: string) {
return await msRestAzure.loginWithUsernamePassword(username, password);
}
public static getMobileCode() {
public static getMobileCode () {
const passwordGenerator = new PasswordGenerator();
const options = {
upperCaseAlpha: false,
@ -105,7 +105,7 @@ export class GBAdminService implements IGBAdminService {
return passwordGenerator.generatePassword(options);
}
public static getRndPassword(): string {
public static getRndPassword (): string {
const passwordGenerator = new PasswordGenerator();
const options = {
upperCaseAlpha: true,
@ -121,7 +121,7 @@ export class GBAdminService implements IGBAdminService {
return password;
}
public static getRndReadableIdentifier() {
public static getRndReadableIdentifier () {
const passwordGenerator = new PasswordGenerator();
const options = {
upperCaseAlpha: false,
@ -135,7 +135,7 @@ export class GBAdminService implements IGBAdminService {
return passwordGenerator.generatePassword(options);
}
public static getNumberIdentifier() {
public static getNumberIdentifier () {
const passwordGenerator = new PasswordGenerator();
const options = {
upperCaseAlpha: false,
@ -152,8 +152,9 @@ export class GBAdminService implements IGBAdminService {
/**
* @see https://stackoverflow.com/a/52171480
*/
public static getHash(str, seed = 0) {
let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
public static getHash (str, seed = 0) {
let h1 = 0xdeadbeef ^ seed,
h2 = 0x41c6ce57 ^ seed;
for (let i = 0, ch; i < str.length; i++) {
ch = str.charCodeAt(i);
h1 = Math.imul(h1 ^ ch, 2654435761);
@ -164,7 +165,7 @@ export class GBAdminService implements IGBAdminService {
return 4294967296 * (2097151 & h2) + (h1 >>> 0);
}
public static async undeployPackageCommand(text: any, min: GBMinInstance) {
public static async undeployPackageCommand (text: any, min: GBMinInstance) {
const packageName = text.split(' ')[1];
const importer = new GBImporter(min.core);
const deployer = new GBDeployer(min.core, importer);
@ -172,10 +173,10 @@ export class GBAdminService implements IGBAdminService {
await deployer.undeployPackageFromLocalPath(min.instance, localFolder);
}
public static isSharePointPath(path: string) {
public static isSharePointPath (path: string) {
return path.indexOf('sharepoint.com') !== -1;
}
public static async deployPackageCommand(min: GBMinInstance, text: string, deployer: IGBDeployer) {
public static async deployPackageCommand (min: GBMinInstance, text: string, deployer: IGBDeployer) {
const packageName = text.split(' ')[1];
if (!this.isSharePointPath(packageName)) {
@ -195,26 +196,24 @@ export class GBAdminService implements IGBAdminService {
// .gbot packages are handled using storage API, so no download
// of local resources is required.
await deployer['downloadFolder'](min,
Path.join('work', `${min.instance.botId}.gbai`),
Path.basename(folderName));
await deployer['downloadFolder'](min, Path.join('work', `${min.instance.botId}.gbai`), Path.basename(folderName));
await deployer.deployPackage(min, localFolder);
}
}
public static async rebuildIndexPackageCommand(min: GBMinInstance, deployer: IGBDeployer) {
public static async rebuildIndexPackageCommand (min: GBMinInstance, deployer: IGBDeployer) {
await deployer.rebuildIndex(
min.instance,
new AzureDeployerService(deployer).getKBSearchSchema(min.instance.searchIndex)
);
}
public static async syncBotServerCommand(min: GBMinInstance, deployer: GBDeployer) {
public static async syncBotServerCommand (min: GBMinInstance, deployer: GBDeployer) {
const serverName = `${min.instance.botId}-server`;
const service = await AzureDeployerService.createInstance(deployer);
service.syncBotServerRepository(min.instance.botId, serverName);
}
public async setValue(instanceId: number, key: string, value: string) {
public async setValue (instanceId: number, key: string, value: string) {
const options = <FindOptions>{ where: {} };
options.where = { key: key };
let admin = await GuaribasAdmin.findOne(options);
@ -227,7 +226,7 @@ export class GBAdminService implements IGBAdminService {
await admin.save();
}
public async updateSecurityInfo(
public async updateSecurityInfo (
instanceId: number,
authenticatorTenant: string,
authenticatorAuthorityHostUrl: string
@ -241,7 +240,7 @@ export class GBAdminService implements IGBAdminService {
return item.save();
}
public async getValue(instanceId: number, key: string): Promise<string> {
public async getValue (instanceId: number, key: string): Promise<string> {
const options = <FindOptions>{ where: {} };
options.where = { key: key, instanceId: instanceId };
const obj = await GuaribasAdmin.findOne(options);
@ -249,7 +248,7 @@ export class GBAdminService implements IGBAdminService {
return obj.value;
}
public async acquireElevatedToken(instanceId: number): Promise<string> {
public async acquireElevatedToken (instanceId: number): Promise<string> {
// TODO: Use boot bot as base for authentication.
const botId = GBConfigService.get('BOT_ID');
@ -298,5 +297,5 @@ export class GBAdminService implements IGBAdminService {
});
}
public async publish(min: GBMinInstance, packageName: string, republish: boolean): Promise<void> { }
public async publish (min: GBMinInstance, packageName: string, republish: boolean): Promise<void> {}
}

8
packages/admin.gbapp/strings.ts
View file

@ -3,7 +3,7 @@ export const Messages = {
authenticate: 'Please, authenticate:',
welcome: 'Welcome to Pragmatismo.io GeneralBots Administration.',
which_task: 'Which task do you wanna run now?',
working: (command) => `I'm working on ${command}...`,
working: command => `I'm working on ${command}...`,
finished_working: 'Done.',
unknown_command: text =>
`Well, but ${text} is not a administrative General Bots command, I will try to search for it.`,
@ -12,7 +12,7 @@ export const Messages = {
deployPackage: text => `Deploying package ${text}...`,
redeployPackage: text => `Redeploying package ${text}...`,
packageUndeployed: text => `√ Package ${text} undeployed...`,
consent: (url) => `Please, consent access to this app at: [Microsoft Online](${url}).`,
consent: url => `Please, consent access to this app at: [Microsoft Online](${url}).`,
wrong_password: 'Sorry, wrong password. Please, try again.',
enter_authenticator_tenant: 'Enter the Authenticator Tenant (eg.: domain.onmicrosoft.com):',
enter_authenticator_authority_host_url: 'Enter the Authority Host URL (eg.: https://login.microsoftonline.com): ',
@ -28,7 +28,7 @@ export const Messages = {
authenticate: 'Please, authenticate:',
welcome: 'Welcome to Pragmatismo.io GeneralBots Administration.',
which_task: 'Which task do you wanna run now?',
working: (command) => `I'm working on ${command}...`,
working: command => `I'm working on ${command}...`,
finished_working: 'Done.',
unknown_command: text =>
`Well, but ${text} is not a administrative General Bots command, I will try to search for it.`,
@ -37,7 +37,7 @@ export const Messages = {
deployPackage: text => `Deploying package ${text}...`,
redeployPackage: text => `Redeploying package ${text}...`,
packageUndeployed: text => `Package ${text} undeployed...`,
consent: (url) => `Please, consent access to this app at: [Microsoft Online](${url}).`,
consent: url => `Please, consent access to this app at: [Microsoft Online](${url}).`,
wrong_password: 'Sorry, wrong password. Please, try again.',
enter_authenticator_tenant: 'Enter the Authenticator Tenant (eg.: domain.onmicrosoft.com):',
enter_authenticator_authority_host_url: 'Enter the Authority Host URL (eg.: https://login.microsoftonline.com): ',

16
packages/analytics.gblib/index.ts
View file

@ -45,28 +45,26 @@ import { GuaribasConversation, GuaribasConversationMessage } from './models/inde
*/
export class GBAnalyticsPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
core.sequelize.addModels([GuaribasConversation, GuaribasConversationMessage]);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`loadBot called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
}

47
packages/analytics.gblib/models/index.ts
View file

@ -63,49 +63,48 @@ import { GuaribasUser } from '../../security.gbapp/models/index.js';
*/
@Table
export class GuaribasConversation extends Model<GuaribasConversation> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare conversationId: number;
conversationId: number;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@ForeignKey(() => GuaribasSubject)
@Column(DataType.INTEGER)
declare startSubjectId: number;
startSubjectId: number;
@BelongsTo(() => GuaribasSubject)
declare startSubject: GuaribasSubject;
startSubject: GuaribasSubject;
@ForeignKey(() => GuaribasChannel)
@Column(DataType.INTEGER)
declare channelId: string;
channelId: string;
@Column(DataType.DATE)
declare rateDate: Date;
rateDate: Date;
@Column(DataType.FLOAT)
declare rate: number;
rate: number;
@Column(DataType.STRING(512))
declare feedback: string;
feedback: string;
@CreatedAt
@Column(DataType.DATE)
declare createdAt: Date;
createdAt: Date;
@Column(DataType.STRING(255))
declare text: string;
text: string;
@ForeignKey(() => GuaribasUser)
@Column(DataType.INTEGER)
declare startedByUserId: number;
startedByUserId: number;
@BelongsTo(() => GuaribasUser)
declare startedBy: GuaribasUser;
startedBy: GuaribasUser;
}
/**
@ -113,45 +112,43 @@ export class GuaribasConversation extends Model<GuaribasConversation> {
*/
@Table
export class GuaribasConversationMessage extends Model<GuaribasConversationMessage> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare conversationMessageId: number;
conversationMessageId: number;
@ForeignKey(() => GuaribasSubject)
@Column(DataType.INTEGER)
declare subjectId: number;
subjectId: number;
@Column(DataType.TEXT)
declare content: string;
content: string;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
//tslint:disable-next-line:no-use-before-declare
@ForeignKey(() => GuaribasConversation)
@Column(DataType.INTEGER)
declare conversationId: number;
conversationId: number;
//tslint:disable-next-line:no-use-before-declare
@BelongsTo(() => GuaribasConversation)
declare conversation: GuaribasConversation;
conversation: GuaribasConversation;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@ForeignKey(() => GuaribasUser)
@Column(DataType.INTEGER)
declare userId: number;
userId: number;
@BelongsTo(() => GuaribasUser)
declare user: GuaribasUser;
user: GuaribasUser;
}

28
packages/analytics.gblib/services/AnalyticsService.ts
View file

@ -44,10 +44,7 @@ import { GuaribasConversation, GuaribasConversationMessage } from '../models/ind
* Base services for Bot Analytics.
*/
export class AnalyticsService {
public async createConversation(
user: GuaribasUser
): Promise<GuaribasConversation> {
public async createConversation (user: GuaribasUser): Promise<GuaribasConversation> {
const conversation = new GuaribasConversation();
conversation.startedBy = user;
conversation.startedByUserId = user.userId;
@ -56,15 +53,18 @@ export class AnalyticsService {
return await conversation.save();
}
public async updateConversationSuggestion(instanceId: number,
conversationId: string, feedback: string, locale: string): Promise<number> {
public async updateConversationSuggestion (
instanceId: number,
conversationId: string,
feedback: string,
locale: string
): Promise<number> {
const minBoot = GBServer.globals.minBoot as any;
const rate = await AzureText.getSentiment(
minBoot.instance.textAnalyticsKey ? minBoot.instance.textAnalyticsKey :
minBoot.instance.textAnalyticsKey,
minBoot.instance.textAnalyticsEndpoint ? minBoot.instance.textAnalyticsEndpoint :
minBoot.instance.textAnalyticsEndpoint,
minBoot.instance.textAnalyticsKey ? minBoot.instance.textAnalyticsKey : minBoot.instance.textAnalyticsKey,
minBoot.instance.textAnalyticsEndpoint
? minBoot.instance.textAnalyticsEndpoint
: minBoot.instance.textAnalyticsEndpoint,
locale,
feedback
);
@ -79,18 +79,16 @@ export class AnalyticsService {
await item.save();
return rate;
}
public async createMessage(
public async createMessage (
instanceId: number,
conversation: GuaribasConversation,
userId: number,
content: string
): Promise<GuaribasConversationMessage> {
const message = GuaribasConversationMessage.build();
message.content = typeof (content) === 'object' ? JSON.stringify(content) : content;
message.content = typeof content === 'object' ? JSON.stringify(content) : content;
message.instanceId = instanceId;
message.userId = userId;
message.conversationId = conversation.conversationId;

19
packages/azuredeployer.gbapp/dialogs/StartDialog.ts
View file

@ -46,7 +46,7 @@ import scanf from 'scanf';
* Handles command-line dialog for getting info for Boot Bot.
*/
export class StartDialog {
public static async createBaseInstance(installationDeployer: IGBInstallationDeployer) {
public static async createBaseInstance (installationDeployer: IGBInstallationDeployer) {
// No .env so asks for cloud credentials to start a new farm.
if (!Fs.existsSync(`.env`)) {
@ -111,7 +111,7 @@ export class StartDialog {
return { instance, credentials, subscriptionId };
}
private static retrieveUsername() {
private static retrieveUsername () {
let value = GBConfigService.get('CLOUD_USERNAME');
if (value === undefined) {
process.stdout.write(`${GBAdminService.GB_PROMPT}CLOUD_USERNAME:`);
@ -121,7 +121,7 @@ export class StartDialog {
return value;
}
private static retrievePassword() {
private static retrievePassword () {
let password = GBConfigService.get('CLOUD_PASSWORD');
if (password === undefined) {
process.stdout.write(`${GBAdminService.GB_PROMPT}CLOUD_PASSWORD:`);
@ -131,7 +131,7 @@ export class StartDialog {
return password;
}
private static retrieveBotId() {
private static retrieveBotId () {
let botId = GBConfigService.get('BOT_ID');
if (botId === undefined) {
process.stdout.write(
@ -146,12 +146,11 @@ cannot start or end with or contain consecutive dashes and having 4 to 42 charac
return botId;
}
/**
*
*
* Update Manifest in Azure: "signInAudience": "AzureADandPersonalMicrosoftAccount" and "accessTokenAcceptedVersion": 2.
*/
private static retrieveAppId() {
private static retrieveAppId () {
let appId = GBConfigService.get('MARKETPLACE_ID');
if (appId === undefined) {
process.stdout.write(
@ -167,7 +166,7 @@ generate manually an App ID and App Secret.\n`
return appId;
}
private static retrieveAppPassword() {
private static retrieveAppPassword () {
let appPassword = GBConfigService.get('MARKETPLACE_SECRET');
if (appPassword === undefined) {
process.stdout.write('Generated Password (MARKETPLACE_SECRET):');
@ -177,7 +176,7 @@ generate manually an App ID and App Secret.\n`
return appPassword;
}
private static retrieveSubscriptionId(list) {
private static retrieveSubscriptionId (list) {
let subscriptionId = GBConfigService.get('CLOUD_SUBSCRIPTIONID');
const map = {};
let index = 1;
@ -195,7 +194,7 @@ generate manually an App ID and App Secret.\n`
return subscriptionId;
}
private static retrieveLocation() {
private static retrieveLocation () {
let location = GBConfigService.get('CLOUD_LOCATION');
if (location === undefined) {
process.stdout.write('CLOUD_LOCATION (eg. westus):');

17
packages/azuredeployer.gbapp/index.ts
View file

@ -43,27 +43,26 @@ import { Sequelize } from 'sequelize-typescript';
* Package for Azure Deployer.
*/
export class GBAzureDeployerPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs(min: GBMinInstance) {
public sysPackages: IGBPackage[];
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`loadBot called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
}

207
packages/azuredeployer.gbapp/services/AzureDeployerService.ts
View file

@ -40,7 +40,7 @@ import urlJoin from 'url-join';
import { HttpMethods, ServiceClient, WebResource } from '@azure/ms-rest-js';
import { CognitiveServicesManagementClient } from '@azure/arm-cognitiveservices';
import { ResourceManagementClient } from '@azure/arm-resources';
import { SubscriptionClient } from '@azure/arm-subscriptions';
import { SubscriptionClient } from '@azure/arm-subscriptions';
import { SearchManagementClient } from '@azure/arm-search';
import { SqlManagementClient } from '@azure/arm-sql';
import { WebSiteManagementClient } from '@azure/arm-appservice';
@ -51,11 +51,10 @@ import { GBCorePackage } from '../../../packages/core.gbapp/index.js';
import { GBConfigService } from '../../../packages/core.gbapp/services/GBConfigService.js';
import { GBDeployer } from '../../../packages/core.gbapp/services/GBDeployer.js';
import { Account } from '@azure/arm-cognitiveservices';
import MicrosoftGraph from "@microsoft/microsoft-graph-client";
import MicrosoftGraph from '@microsoft/microsoft-graph-client';
import Spinner from 'cli-spinner';
import * as publicIp from 'public-ip';
const WebSiteResponseTimeout = 900;
const iconUrl = 'https://github.com/pragmatismo-io/BotServer/blob/master/docs/images/generalbots-logo-squared.png';
/**
@ -80,17 +79,16 @@ export class AzureDeployerService implements IGBInstallationDeployer {
public core: IGBCoreService;
private freeTier: boolean;
constructor(deployer: IGBDeployer, freeTier: boolean = true) {
constructor (deployer: IGBDeployer, freeTier: boolean = true) {
this.deployer = deployer;
this.freeTier = freeTier;
}
public async runSearch(instance: IGBInstance) {
public async runSearch (instance: IGBInstance) {
await this.deployer.rebuildIndex(instance, this.getKBSearchSchema(instance.searchIndex));
}
public static async createInstance(deployer: GBDeployer): Promise<AzureDeployerService> {
public static async createInstance (deployer: GBDeployer): Promise<AzureDeployerService> {
const username = GBConfigService.get('CLOUD_USERNAME');
const password = GBConfigService.get('CLOUD_PASSWORD');
const credentials = await GBAdminService.getADALCredentialsFromUsername(username, password);
@ -103,7 +101,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return service;
}
private static createRequestObject(url: string, accessToken: string, verb: HttpMethods, body: string) {
private static createRequestObject (url: string, accessToken: string, verb: HttpMethods, body: string) {
const req = new WebResource();
req.method = verb;
req.url = url;
@ -115,13 +113,13 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return req;
}
public async getSubscriptions(credentials) {
public async getSubscriptions (credentials) {
const subscriptionClient = new SubscriptionClient(credentials);
return subscriptionClient.subscriptions.list();
}
public getKBSearchSchema(indexName) {
public getKBSearchSchema (indexName) {
return {
name: indexName,
fields: [
@ -232,23 +230,20 @@ export class AzureDeployerService implements IGBInstallationDeployer {
};
}
public async botExists(botId) {
public async botExists (botId) {
const baseUrl = `https://management.azure.com/`;
const username = GBConfigService.get('CLOUD_USERNAME');
const password = GBConfigService.get('CLOUD_PASSWORD');
const accessToken = await GBAdminService.getADALTokenFromUsername(username, password);
const httpClient = new ServiceClient();
const query = `providers/${this.provider
}/checkNameAvailability/Action?api-version=${this.apiVersion}`;
const query = `providers/${this.provider}/checkNameAvailability/Action?api-version=${this.apiVersion}`;
const url = urlJoin(baseUrl, query);
const body = {
name: botId,
type: "botServices"
type: 'botServices'
};
const req = AzureDeployerService.createRequestObject(url, accessToken, 'POST', JSON.stringify(body));
@ -257,7 +252,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return !res.parsedBody.valid;
}
public async updateBotProxy(botId, group, endpoint) {
public async updateBotProxy (botId, group, endpoint) {
const baseUrl = `https://management.azure.com/`;
const username = GBConfigService.get('CLOUD_USERNAME');
const password = GBConfigService.get('CLOUD_PASSWORD');
@ -272,8 +267,9 @@ export class AzureDeployerService implements IGBInstallationDeployer {
}
};
const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${this.provider
}/botServices/${botId}?api-version=${this.apiVersion}`;
const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${
this.provider
}/botServices/${botId}?api-version=${this.apiVersion}`;
const url = urlJoin(baseUrl, query);
const req = AzureDeployerService.createRequestObject(url, accessToken, 'PATCH', JSON.stringify(parameters));
const res = await httpClient.sendRequest(req);
@ -284,8 +280,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
GBLog.info(`Bot proxy updated at: ${endpoint}.`);
}
public async updateBot(botId: string, group: string, name: string,
description: string, endpoint: string) {
public async updateBot (botId: string, group: string, name: string, description: string, endpoint: string) {
const baseUrl = `https://management.azure.com/`;
const username = GBConfigService.get('CLOUD_USERNAME');
const password = GBConfigService.get('CLOUD_PASSWORD');
@ -303,8 +298,9 @@ export class AzureDeployerService implements IGBInstallationDeployer {
}
};
const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${this.provider
}/botServices/${botId}?api-version=${this.apiVersion}`;
const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${
this.provider
}/botServices/${botId}?api-version=${this.apiVersion}`;
const url = urlJoin(baseUrl, query);
const req = AzureDeployerService.createRequestObject(url, accessToken, 'PATCH', JSON.stringify(parameters));
const res = await httpClient.sendRequest(req);
@ -315,7 +311,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
GBLog.info(`Bot updated at: ${endpoint}.`);
}
public async deleteBot(botId: string, group) {
public async deleteBot (botId: string, group) {
const baseUrl = `https://management.azure.com/`;
const username = GBConfigService.get('CLOUD_USERNAME');
const password = GBConfigService.get('CLOUD_PASSWORD');
@ -324,19 +320,20 @@ export class AzureDeployerService implements IGBInstallationDeployer {
const accessToken = await GBAdminService.getADALTokenFromUsername(username, password);
const httpClient = new ServiceClient();
const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${this.provider
}/botServices/${botId}?api-version=${this.apiVersion}`;
const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${
this.provider
}/botServices/${botId}?api-version=${this.apiVersion}`;
const url = urlJoin(baseUrl, query);
const req = AzureDeployerService.createRequestObject(url, accessToken, 'DELETE', undefined);
const res = await httpClient.sendRequest(req);
if (res.bodyAsText !== "") {
if (res.bodyAsText !== '') {
throw res.bodyAsText;
}
GBLog.info(`Bot ${botId} was deleted from the provider.`);
}
public async openStorageFirewall(groupName, serverName) {
public async openStorageFirewall (groupName, serverName) {
const username = GBConfigService.get('CLOUD_USERNAME');
const password = GBConfigService.get('CLOUD_PASSWORD');
const subscriptionId = GBConfigService.get('CLOUD_SUBSCRIPTIONID');
@ -350,10 +347,9 @@ export class AzureDeployerService implements IGBInstallationDeployer {
endIpAddress: ip
};
await storageClient.firewallRules.createOrUpdate(groupName, serverName, 'gb', params);
}
public async deployFarm(
public async deployFarm (
proxyAddress: string,
instance: IGBInstance,
credentials,
@ -368,11 +364,9 @@ export class AzureDeployerService implements IGBInstallationDeployer {
let keys: any;
const name = instance.botId;
GBLog.info(`Enabling resource providers...`);
await this.enableResourceProviders('Microsoft.BotService');
GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`);
await this.createDeployGroup(name, instance.cloudLocation);
@ -386,8 +380,13 @@ export class AzureDeployerService implements IGBInstallationDeployer {
const administratorPassword = GBAdminService.getRndPassword();
const storageServer = `${name.toLowerCase()}-storage-server`;
const storageName = `${name}-storage`;
await this.createStorageServer(name, storageServer, administratorLogin,
administratorPassword, storageServer, instance.cloudLocation
await this.createStorageServer(
name,
storageServer,
administratorLogin,
administratorPassword,
storageServer,
instance.cloudLocation
);
await this.createStorage(name, storageServer, storageName, instance.cloudLocation);
instance.storageUsername = administratorLogin;
@ -429,18 +428,25 @@ export class AzureDeployerService implements IGBInstallationDeployer {
setTimeout(resolve, ms);
});
};
GBLog.info(`Deploying Bot...`);
instance.botEndpoint = this.defaultEndPoint;
instance = await this.internalDeployBot(
instance, this.accessToken, name, name, name, 'General BootBot',
`${proxyAddress}/api/messages/${name}`, 'global',
instance.nlpAppId, instance.nlpKey, instance.marketplaceId, instance.marketplacePassword,
instance,
this.accessToken,
name,
name,
name,
'General BootBot',
`${proxyAddress}/api/messages/${name}`,
'global',
instance.nlpAppId,
instance.nlpKey,
instance.marketplaceId,
instance.marketplacePassword,
instance.cloudSubscriptionId
);
GBLog.info(`Waiting one minute to finishing NLP service and keys creation...`);
await sleep(60000);
@ -456,7 +462,6 @@ export class AzureDeployerService implements IGBInstallationDeployer {
const nlpAppId = await this.createNLPService(name, name, instance.cloudLocation, culture, instance.nlpAuthoringKey);
instance.nlpAppId = nlpAppId;
GBLog.info('Updating server environment variables...');
await this.updateWebisteConfig(name, serverName, serverFarm.id, instance);
@ -465,7 +470,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return instance;
}
public async deployToCloud(
public async deployToCloud (
title: string,
username: string,
password: string,
@ -496,7 +501,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
/**
* @see https://github.com/Azure/azure-rest-api-specs/blob/master/specification/botservice/resource-manager/Microsoft.BotService/preview/2017-12-01/botservice.json
*/
public async internalDeployBot(
public async internalDeployBot (
instance,
accessToken,
botId,
@ -535,14 +540,15 @@ export class AzureDeployerService implements IGBInstallationDeployer {
luisKey: nlpKey,
msaAppId: appId,
msaAppPassword: appPassword,
enabledChannels: ['webchat', "skype"],//, "facebook"],
configuredChannels: ['webchat', "skype"]//, "facebook"]
enabledChannels: ['webchat', 'skype'], //, "facebook"],
configuredChannels: ['webchat', 'skype'] //, "facebook"]
}
};
const httpClient = new ServiceClient();
let query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${this.provider
}/botServices/${botId}?api-version=${this.apiVersion}`;
let query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${
this.provider
}/botServices/${botId}?api-version=${this.apiVersion}`;
let url = urlJoin(baseUrl, query);
let req = AzureDeployerService.createRequestObject(url, accessToken, 'PUT', JSON.stringify(parameters));
const res = await httpClient.sendRequest(req);
@ -552,11 +558,11 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return;
}
try {
//tslint:disable-next-line:max-line-length
query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/Microsoft.BotService/botServices/${botId}/channels/WebChatChannel/listChannelWithKeys?api-version=${this.apiVersion
}`;
query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/Microsoft.BotService/botServices/${botId}/channels/WebChatChannel/listChannelWithKeys?api-version=${
this.apiVersion
}`;
url = urlJoin(baseUrl, query);
req = AzureDeployerService.createRequestObject(url, accessToken, 'POST', JSON.stringify(parameters));
const resChannel = await httpClient.sendRequest(req);
@ -567,15 +573,14 @@ export class AzureDeployerService implements IGBInstallationDeployer {
} catch (error) {
reject(error);
}
});
}
public async syncBotServerRepository(group, name) {
public async syncBotServerRepository (group, name) {
await this.webSiteClient.webApps.syncRepository(group, name);
}
public initServices(credentials: any, subscriptionId: string) {
public initServices (credentials: any, subscriptionId: string) {
this.cloud = new ResourceManagementClient(credentials, subscriptionId);
this.webSiteClient = new WebSiteManagementClient(credentials, subscriptionId);
this.storageClient = new SqlManagementClient(credentials, subscriptionId);
@ -584,7 +589,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
this.accessToken = credentials.tokenCache._entries[0].accessToken;
}
private async createStorageServer(group, name, administratorLogin, administratorPassword, serverName, location) {
private async createStorageServer (group, name, administratorLogin, administratorPassword, serverName, location) {
const params = {
location: location,
administratorLogin: administratorLogin,
@ -594,7 +599,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
const database = await this.storageClient.servers.beginCreateOrUpdateAndWait(group, name, params);
// AllowAllWindowsAzureIps must be created that way, so the Azure Search can
// AllowAllWindowsAzureIps must be created that way, so the Azure Search can
// access SQL Database to index its contents.
const paramsFirewall = {
@ -606,7 +611,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return database;
}
public async createApplication(token: string, name: string) {
public async createApplication (token: string, name: string) {
return new Promise<string>((resolve, reject) => {
let client = MicrosoftGraph.Client.init({
authProvider: done => {
@ -619,16 +624,15 @@ export class AzureDeployerService implements IGBInstallationDeployer {
client.api(`/applications`).post(app, (err, res) => {
if (err) {
reject(err)
}
else {
reject(err);
} else {
resolve(res);
}
});
});
}
public async createApplicationSecret(token: string, appId: string) {
public async createApplicationSecret (token: string, appId: string) {
return new Promise<string>((resolve, reject) => {
let client = MicrosoftGraph.Client.init({
authProvider: done => {
@ -637,22 +641,21 @@ export class AzureDeployerService implements IGBInstallationDeployer {
});
const body = {
passwordCredential: {
displayName: "General Bots Generated"
displayName: 'General Bots Generated'
}
};
client.api(`/applications/${appId}/addPassword`).post(body, (err, res) => {
if (err) {
reject(err)
}
else {
reject(err);
} else {
resolve(res.secretText);
}
});
});
}
private async registerProviders(subscriptionId, baseUrl, accessToken) {
private async registerProviders (subscriptionId, baseUrl, accessToken) {
const query = `subscriptions/${subscriptionId}/providers/${this.provider}/register?api-version=2018-02-01`;
const requestUrl = urlJoin(baseUrl, query);
@ -665,7 +668,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
(req.headers as any).Authorization = `Bearer ${accessToken}`;
}
private async createNLPService(
private async createNLPService (
name: string,
description: string,
location: string,
@ -683,13 +686,12 @@ export class AzureDeployerService implements IGBInstallationDeployer {
let app = null;
if (apps.bodyAsText && apps.bodyAsText !== '[]') {
const result = JSON.parse(apps.bodyAsText)
const result = JSON.parse(apps.bodyAsText);
if (result.error) {
if (result.error.code !== "401") {
if (result.error.code !== '401') {
throw new Error(result.error);
}
}
else {
} else {
app = result.filter(x => x.name === name)[0];
}
}
@ -704,7 +706,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return id.replace(/\'/gi, '');
}
private async makeNlpRequest(
private async makeNlpRequest (
location: string,
authoringKey: string,
body: string,
@ -723,14 +725,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return await httpClient.sendRequest(req);
}
public async refreshEntityList(
location: string,
nlpAppId: string,
clEntityId: string,
nlpKey: string,
data: any,
) {
public async refreshEntityList (location: string, nlpAppId: string, clEntityId: string, nlpKey: string, data: any) {
const req = new WebResource();
req.method = 'PUT';
req.url = `https://${location}.api.cognitive.microsoft.com/luis/api/v2.0/apps/${nlpAppId}/versions/0.1/closedlists/${clEntityId}`;
@ -743,12 +738,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return await httpClient.sendRequest(req);
}
public async trainNLP(
location: string,
nlpAppId: string,
nlpAuthoringKey: string,
) {
public async trainNLP (location: string, nlpAppId: string, nlpAuthoringKey: string) {
const req = new WebResource();
req.method = 'POST';
req.url = `https://${location}.api.cognitive.microsoft.com/luis/api/v2.0/apps/${nlpAppId}/versions/0.1/train`;
@ -760,16 +750,12 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return await httpClient.sendRequest(req);
}
public async publishNLP(
location: string,
nlpAppId: string,
nlpAuthoringKey: string,
) {
public async publishNLP (location: string, nlpAppId: string, nlpAuthoringKey: string) {
const body = {
versionId: "0.1",
versionId: '0.1',
isStaging: false,
directVersionPublish: false
}
};
const req = new WebResource();
req.method = 'POST';
req.url = `https://${location}.api.cognitive.microsoft.com/luis/api/v2.0/apps/${nlpAppId}/publish`;
@ -782,11 +768,10 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return await httpClient.sendRequest(req);
}
private async createSearch(group, name, location) {
private async createSearch (group, name, location) {
const params = {
sku: {
name:
this.freeTier ? 'free' : 'standard'
name: this.freeTier ? 'free' : 'standard'
},
location: location
};
@ -794,7 +779,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return await this.searchClient.services.beginCreateOrUpdateAndWait(group, name, params as any);
}
private async createStorage(group, serverName, name, location) {
private async createStorage (group, serverName, name, location) {
const params = {
sku: { name: this.freeTier ? 'Free' : 'Basic' },
createMode: 'Default',
@ -804,7 +789,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return await this.storageClient.databases.beginCreateOrUpdateAndWait(group, serverName, name, params);
}
private async createCognitiveServices(group, name, location, kind): Promise<Account> {
private async createCognitiveServices (group, name, location, kind): Promise<Account> {
const params = {
sku: {
name: name
@ -830,40 +815,40 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return await this.cognitiveClient.accounts.beginCreateAndWait(group, name, params);
}
private async createSpeech(group, name, location): Promise<Account> {
private async createSpeech (group, name, location): Promise<Account> {
return await this.createCognitiveServices(group, name, location, 'SpeechServices');
}
private async createNLP(group, name, location): Promise<Account> {
private async createNLP (group, name, location): Promise<Account> {
return await this.createCognitiveServices(group, name, location, 'LUIS');
}
private async createNLPAuthoring(group, name, location): Promise<Account> {
private async createNLPAuthoring (group, name, location): Promise<Account> {
return await this.createCognitiveServices(group, name, location, 'LUIS.Authoring');
}
private async createSpellChecker(group, name): Promise<Account> {
private async createSpellChecker (group, name): Promise<Account> {
return await this.createCognitiveServices(group, name, 'westus', 'CognitiveServices');
}
private async createTextAnalytics(group, name, location): Promise<Account> {
private async createTextAnalytics (group, name, location): Promise<Account> {
return await this.createCognitiveServices(group, name, location, 'TextAnalytics');
}
private async createDeployGroup(name, location) {
private async createDeployGroup (name, location) {
const params = { location: location };
return await this.cloud.resourceGroups.createOrUpdate(name, params);
}
private async enableResourceProviders(name) {
private async enableResourceProviders (name) {
const ret = await this.cloud.providers.get(name);
if (ret.registrationState === "NotRegistered") {
if (ret.registrationState === 'NotRegistered') {
await this.cloud.providers.register(name);
}
}
private async createHostingPlan(group, name, location): Promise<AppServicePlan> {
private async createHostingPlan (group, name, location): Promise<AppServicePlan> {
const params = {
serverFarmWithRichSkuName: name,
location: location,
@ -877,11 +862,9 @@ export class AzureDeployerService implements IGBInstallationDeployer {
return await this.webSiteClient.appServicePlans.beginCreateOrUpdateAndWait(group, name, params);
}
private async createServer(farmId, group, name, location) {
private async createServer (farmId, group, name, location) {
let tryed = false;
const create = async () => {
const parameters: Site = {
location: location,
serverFarmId: farmId,
@ -929,8 +912,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
}
}
private async updateWebisteConfig(group, name, serverFarmId, instance: IGBInstance) {
private async updateWebisteConfig (group, name, serverFarmId, instance: IGBInstance) {
const parameters: Site = {
location: instance.cloudLocation,
serverFarmId: serverFarmId,
@ -953,12 +935,11 @@ export class AzureDeployerService implements IGBInstallationDeployer {
{ name: 'STORAGE_NAME', value: `${instance.storageName}` },
{ name: 'STORAGE_USERNAME', value: `${instance.storageUsername}` },
{ name: 'STORAGE_PASSWORD', value: `${instance.storagePassword}` },
{ name: 'STORAGE_SYNC', value: `true` }]
{ name: 'STORAGE_SYNC', value: `true` }
]
}
};
return await this.webSiteClient.webApps.beginCreateOrUpdateAndWait(group, name, parameters);
}
}

2
packages/azuredeployer.gbapp/strings.ts
View file

@ -1,6 +1,6 @@
export const Messages = {
'en-US': {
about_suggestions: 'Suggestions are welcomed and improve my quality...'
about_suggestions: 'Suggestions are welcomed and improve my quality...'
},
'pt-BR': {
about_suggestions: 'Sugestões melhoram muito minha qualidade...'

31
packages/basic.gblib/index.ts
View file

@ -39,47 +39,46 @@
import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib';
import { GuaribasSchedule } from '../core.gbapp/models/GBModel.js';
import { Sequelize } from 'sequelize-typescript';
import { createServerRouter } from "typescript-rest-rpc/lib/server.js"
import { createServerRouter } from 'typescript-rest-rpc/lib/server.js';
import { DialogKeywords } from './services/DialogKeywords.js';
import * as koaBody from "koa-body"
import * as koaBody from 'koa-body';
import { SystemKeywords } from './services/SystemKeywords.js';
import { WebAutomationKeywords } from './services/WebAutomationKeywords.js';
import { DebuggerService } from './services/DebuggerService.js';
import Koa from 'koa';
const app = new Koa()
const app = new Koa();
/**
* Package for core.gbapp.
*/
export class GBBasicPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public CurrentEngineName = "guaribas-1.0.0";
public CurrentEngineName = 'guaribas-1.0.0';
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasSchedule]);
app.use(koaBody.koaBody({ multipart: true }));
app.listen(1111);
}
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
const dk = new DialogKeywords(min, null, null);
const wa = new WebAutomationKeywords(min, null, dk);
const sys = new SystemKeywords(min, null, dk, wa);
@ -87,12 +86,12 @@ export class GBBasicPackage implements IGBPackage {
dk.wa = wa;
wa.sys = sys;
const dialogRouter = createServerRouter(`/api/v2/${min.botId}/dialog`, dk);
const waRouter = createServerRouter(`/api/v2/${min.botId}/webautomation`, wa );
const waRouter = createServerRouter(`/api/v2/${min.botId}/webautomation`, wa);
const sysRouter = createServerRouter(`/api/v2/${min.botId}/system`, sys);
const dbgRouter = createServerRouter(`/api/v2/${min.botId}/debugger`, dbg);
app.use(dialogRouter.routes());
app.use(sysRouter.routes());
app.use(waRouter.routes());
app.use(dbgRouter.routes());
app.use(waRouter.routes());
app.use(dbgRouter.routes());
}
}

20
packages/basic.gblib/models/Model.ts
View file

@ -54,26 +54,24 @@ import { GuaribasInstance } from '../../core.gbapp/models/GBModel.js';
@Table
//tslint:disable-next-line:max-classes-per-file
export class GuaribasSchedule extends Model<GuaribasSchedule> {
@Column(DataType.STRING(255))
name: string;
@Column (DataType.STRING(255))
declare name: string;
@Column (DataType.STRING(255))
declare schedule: string;
@Column(DataType.STRING(255))
schedule: string;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@Column(DataType.DATE)
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
}

44
packages/basic.gblib/services/ChartServices.ts
View file

@ -32,34 +32,32 @@
'use strict';
import { createBrowser } from '../../core.gbapp/services/GBSSR.js';
export class ChartServices {
/**
* Generate chart image screenshot
* @param {object} options billboard.js generation option object
* @param {string} path screenshot image full path with file name
*/
public static async screenshot (args, path) {
const browser = await createBrowser(null);
const page = await browser.newPage();
/**
* Generate chart image screenshot
* @param {object} options billboard.js generation option object
* @param {string} path screenshot image full path with file name
*/
public static async screenshot(args, path) {
const browser = await createBrowser(null);
const page = await browser.newPage();
// load billboard.js assets from CDN.
await page.addStyleTag({ url: 'https://cdn.jsdelivr.net/npm/billboard.js/dist/theme/datalab.min.css' });
await page.addScriptTag({ url: 'https://cdn.jsdelivr.net/npm/billboard.js/dist/billboard.pkgd.min.js' });
// load billboard.js assets from CDN.
await page.addStyleTag({ url: "https://cdn.jsdelivr.net/npm/billboard.js/dist/theme/datalab.min.css" });
await page.addScriptTag({ url: "https://cdn.jsdelivr.net/npm/billboard.js/dist/billboard.pkgd.min.js" });
await page.evaluate(`bb.generate(${JSON.stringify(args)});`);
await page.evaluate(`bb.generate(${JSON.stringify(args)});`);
const content = await page.$('.bb');
const content = await page.$(".bb");
await content.screenshot({
path,
omitBackground: true
});
await content.screenshot({
path,
omitBackground: true
});
await page.close();
await browser.close();
}
}
await page.close();
await browser.close();
}
}

54
packages/basic.gblib/services/DebuggerService.ts
View file

@ -75,7 +75,6 @@ export class DebuggerService {
debugWeb: boolean;
lastDebugWeb: Date;
/**
* SYSTEM account maxLines,when used with impersonated contexts (eg. running in SET SCHEDULE).
*/
@ -178,7 +177,7 @@ export class DebuggerService {
* When creating this keyword facade,a bot instance is
* specified among the deployer service.
*/
constructor(min: GBMinInstance, user, dk) {
constructor (min: GBMinInstance, user, dk) {
this.min = min;
this.user = user;
this.dk = dk;
@ -190,33 +189,33 @@ export class DebuggerService {
GBServer.globals.debuggers[botId] = {};
GBServer.globals.debuggers[botId].state = 0;
GBServer.globals.debuggers[botId].breaks = [];
GBServer.globals.debuggers[botId].stateInfo = "Stopped";
GBServer.globals.debuggers[botId].stateInfo = 'Stopped';
GBServer.globals.debuggers[botId].childProcess = null;
}
private client;
public async breakpoint({ botId, line }) {
public async breakpoint ({ botId, line }) {
GBLog.info(`BASIC: Enabled breakpoint for ${botId} on ${line}.`);
GBServer.globals.debuggers[botId].breaks.push(Number.parseInt(line));
}
public async resume({ botId }) {
public async resume ({ botId }) {
if (GBServer.globals.debuggers[botId].state === 2) {
const client = GBServer.globals.debuggers[botId].client;
await client.Debugger.resume();
GBServer.globals.debuggers[botId].state = 1;
GBServer.globals.debuggers[botId].stateInfo = "Running (Debug)";
return {status: 'OK'};
GBServer.globals.debuggers[botId].stateInfo = 'Running (Debug)';
return { status: 'OK' };
} else {
const error = 'Invalid call to resume and state not being debug(2).';
return {error: error};
return { error: error };
}
}
public async stop({ botId }) {
public async stop ({ botId }) {
GBServer.globals.debuggers[botId].state = 0;
GBServer.globals.debuggers[botId].stateInfo = "Stopped";
GBServer.globals.debuggers[botId].stateInfo = 'Stopped';
const kill = ref => {
spawn('sh', ['-c', `pkill -9 -f ${ref}`]);
@ -224,22 +223,22 @@ export class DebuggerService {
kill(GBServer.globals.debuggers[botId].childProcess);
return {status: 'OK'};
return { status: 'OK' };
}
public async step({ botId }) {
public async step ({ botId }) {
if (GBServer.globals.debuggers[botId].state === 2) {
GBServer.globals.debuggers[botId].stateInfo = "Break";
GBServer.globals.debuggers[botId].stateInfo = 'Break';
const client = GBServer.globals.debuggers[botId].client;
await client.Debugger.stepOver();
return {status: 'OK'};
return { status: 'OK' };
} else {
const error = 'Invalid call to stepOver and state not being debug(2).';
return {error: error};
return { error: error };
}
}
public async context({ botId }) {
public async context ({ botId }) {
const conversationId = this.conversationsMap[botId];
let messages = [];
if (this.client) {
@ -266,35 +265,34 @@ export class DebuggerService {
return {
status: 'OK',
state: GBServer.globals.debuggers[botId].state,
messages:messagesText,
messages: messagesText,
scope: GBServer.globals.debuggers[botId].scope,
scopeInfo: GBServer.globals.debuggers[botId].stateInfo
};
}
public async getRunning({ botId, botApiKey, scriptName }) {
public async getRunning ({ botId, botApiKey, scriptName }) {
let error;
botId = botId[0]; // TODO: Handle call in POST.
if (!GBServer.globals.debuggers[botId])
{
GBServer.globals.debuggers[botId]= {};
if (!GBServer.globals.debuggers[botId]) {
GBServer.globals.debuggers[botId] = {};
}
if (!scriptName){
if (!scriptName) {
scriptName = 'start';
}
if (GBServer.globals.debuggers[botId].state === 1) {
error = `Cannot DEBUG an already running process. ${botId}`;
return {error: error};
error = `Cannot DEBUG an already running process. ${botId}`;
return { error: error };
} else if (GBServer.globals.debuggers[botId].state === 2) {
GBLog.info(`BASIC: Releasing execution ${botId} in DEBUG mode.`);
await this.resume({ botId});
return {status: 'OK'};
await this.resume({ botId });
return { status: 'OK' };
} else {
GBLog.info(`BASIC: Running ${botId} in DEBUG mode.`);
GBServer.globals.debuggers[botId].state = 1;
GBServer.globals.debuggers[botId].stateInfo = "Running (Debug)";
GBServer.globals.debuggers[botId].stateInfo = 'Running (Debug)';
let min: GBMinInstance = GBServer.globals.minInstances.filter(p => p.instance.botId === botId)[0];
@ -324,7 +322,7 @@ export class DebuggerService {
}
});
return {status: 'OK'};
return { status: 'OK' };
}
}
}

515
packages/basic.gblib/services/DialogKeywords.ts
View file

File diff suppressed because it is too large Load diff

963
packages/basic.gblib/services/GBVMService.ts
View file

File diff suppressed because it is too large Load diff

37
packages/basic.gblib/services/ScheduleServices.ts
View file

@ -48,14 +48,12 @@ import cron from 'node-cron';
* Basic services for BASIC manipulation.
*/
export class ScheduleServices extends GBService {
public async deleteScheduleIfAny(min: GBMinInstance, name: string) {
const task = min["scheduleMap"] ? min["scheduleMap"][name] : null;
public async deleteScheduleIfAny (min: GBMinInstance, name: string) {
const task = min['scheduleMap'] ? min['scheduleMap'][name] : null;
if (task) {
task.destroy();
delete min["scheduleMap"][name];
delete min['scheduleMap'][name];
}
const count = await GuaribasSchedule.destroy({
@ -73,11 +71,7 @@ export class ScheduleServices extends GBService {
/**
* Finds and update user agent information to a next available person.
*/
public async createOrUpdateSchedule(
min: GBMinInstance,
schedule: string,
name: string
): Promise<GuaribasSchedule> {
public async createOrUpdateSchedule (min: GBMinInstance, schedule: string, name: string): Promise<GuaribasSchedule> {
let record = await GuaribasSchedule.findOne({
where: {
instanceId: min.instance.instanceId,
@ -101,12 +95,10 @@ export class ScheduleServices extends GBService {
return record;
}
/**
* Load all cached schedule from BASIC SET SCHEDULE keyword.
*/
public async scheduleAll() {
* Load all cached schedule from BASIC SET SCHEDULE keyword.
*/
public async scheduleAll () {
let schedules;
try {
schedules = await GuaribasSchedule.findAll();
@ -115,7 +107,7 @@ export class ScheduleServices extends GBService {
p => p.instance.instanceId === item.instanceId
)[0];
if (min){
if (min) {
this.ScheduleItem(item, min);
}
});
@ -125,7 +117,7 @@ export class ScheduleServices extends GBService {
return schedules;
}
private ScheduleItem(item: GuaribasSchedule, min: GBMinInstance) {
private ScheduleItem (item: GuaribasSchedule, min: GBMinInstance) {
GBLog.info(`Scheduling ${item.name} on ${min.botId}...`);
try {
const options = {
@ -133,13 +125,13 @@ export class ScheduleServices extends GBService {
timezone: 'America/Sao_Paulo'
};
const task = min["scheduleMap"][item.name];
const task = min['scheduleMap'][item.name];
if (task) {
task.stop();
min["scheduleMap"][item.name] = null;
min['scheduleMap'][item.name] = null;
}
min["scheduleMap"][item.name] = cron.schedule(
min['scheduleMap'][item.name] = cron.schedule(
item.schedule,
function () {
const finalData = async () => {
@ -152,9 +144,10 @@ export class ScheduleServices extends GBService {
(async () => {
await finalData();
})();
}, options
},
options
);
GBLog.info(`Running .gbdialog word ${item.name} on:${item.schedule}...`);
} catch (error) { }
} catch (error) {}
}
}

730
packages/basic.gblib/services/SystemKeywords.ts
View file

File diff suppressed because it is too large Load diff

17
packages/basic.gblib/services/TSCompiler.ts
View file

@ -43,15 +43,15 @@ import * as ts from 'typescript';
* Wrapper for a TypeScript compiler.
*/
export class TSCompiler {
private static shouldIgnoreError(diagnostic) {
private static shouldIgnoreError (diagnostic) {
const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
if (message.indexOf('Cannot find name') >= 0
|| message.indexOf('Cannot find module') >= 0
|| message.indexOf('implicitly has an') >= 0
|| message.indexOf('Cannot invoke an') >= 0
|| message.indexOf('Cannot use imports, exports, or module') >= 0
if (
message.indexOf('Cannot find name') >= 0 ||
message.indexOf('Cannot find module') >= 0 ||
message.indexOf('implicitly has an') >= 0 ||
message.indexOf('Cannot invoke an') >= 0 ||
message.indexOf('Cannot use imports, exports, or module') >= 0
) {
return true;
}
@ -59,7 +59,7 @@ export class TSCompiler {
return false;
}
public compile(
public compile (
fileNames: string[],
options: ts.CompilerOptions = {
noStrictGenericChecks: true,
@ -99,5 +99,4 @@ export class TSCompiler {
return emitResult;
}
}

114
packages/basic.gblib/services/WebAutomationKeywords.ts
View file

@ -49,10 +49,9 @@ import url from 'url';
* Web Automation services of conversation to be called by BASIC.
*/
export class WebAutomationKeywords {
/**
* Reference to minimal bot instance.
*/
* Reference to minimal bot instance.
*/
public min: GBMinInstance;
/**
@ -107,16 +106,12 @@ export class WebAutomationKeywords {
* When creating this keyword facade,a bot instance is
* specified among the deployer service.
*/
constructor(min: GBMinInstance, user, dk) {
constructor (min: GBMinInstance, user, dk) {
this.min = min;
this.user = user;
this.dk = dk;
this.debugWeb = this.min.core.getParam<boolean>(
this.min.instance,
'Debug Web Automation',
false
);
this.debugWeb = this.min.core.getParam<boolean>(this.min.instance, 'Debug Web Automation', false);
}
/**
@ -124,14 +119,14 @@ export class WebAutomationKeywords {
*
* @example x = GET PAGE
*/
public async getPage({ url, username, password }) {
public async getPage ({ url, username, password }) {
GBLog.info(`BASIC: Web Automation GET PAGE ${url}.`);
if (!this.browser) {
this.browser = await createBrowser(null);
}
const page = (await this.browser.pages())[0];
if (username || password) {
await page.authenticate({ 'username': username, 'password': password });
await page.authenticate({ username: username, password: password });
}
await page.goto(url);
@ -142,7 +137,7 @@ export class WebAutomationKeywords {
return handle;
}
public getPageByHandle(hash) {
public getPageByHandle (hash) {
return this.pageMap[hash];
}
@ -151,15 +146,14 @@ export class WebAutomationKeywords {
*
* @example GET page,"selector"
*/
public async getBySelector({ handle, selector }) {
public async getBySelector ({ handle, selector }) {
const page = this.getPageByHandle(handle);
GBLog.info(`BASIC: Web Automation GET element: ${selector}.`);
await page.waitForSelector(selector)
await page.waitForSelector(selector);
let elements = await page.$$(selector);
if (elements && elements.length > 1) {
return elements;
}
else {
} else {
const el = elements[0];
el['originalSelector'] = selector;
el['href'] = await page.evaluate(e => e.getAttribute('href'), el);
@ -175,10 +169,10 @@ export class WebAutomationKeywords {
*
* @example GET page,"frameSelector,"elementSelector"
*/
public async getByFrame({ handle, frame, selector }) {
public async getByFrame ({ handle, frame, selector }) {
const page = this.getPageByHandle(handle);
GBLog.info(`BASIC: Web Automation GET element by frame: ${selector}.`);
await page.waitForSelector(frame)
await page.waitForSelector(frame);
let frameHandle = await page.$(frame);
const f = await frameHandle.contentFrame();
await f.waitForSelector(selector);
@ -193,9 +187,9 @@ export class WebAutomationKeywords {
}
/**
* Simulates a mouse hover an web page element.
* Simulates a mouse hover an web page element.
*/
public async hover({ handle, selector }) {
public async hover ({ handle, selector }) {
const page = this.getPageByHandle(handle);
GBLog.info(`BASIC: Web Automation HOVER element: ${selector}.`);
await this.getBySelector({ handle, selector: selector });
@ -208,35 +202,33 @@ export class WebAutomationKeywords {
*
* @example CLICK page,"#idElement"
*/
public async click({ handle, frameOrSelector, selector }) {
public async click ({ handle, frameOrSelector, selector }) {
const page = this.getPageByHandle(handle);
GBLog.info(`BASIC: Web Automation CLICK element: ${frameOrSelector}.`);
if (selector) {
await page.waitForSelector(frameOrSelector)
await page.waitForSelector(frameOrSelector);
let frameHandle = await page.$(frameOrSelector);
const f = await frameHandle.contentFrame();
await f.waitForSelector(selector);
await f.click(selector);
}
else {
} else {
await page.waitForSelector(frameOrSelector);
await page.click(frameOrSelector);
}
await this.debugStepWeb(page);
}
private async debugStepWeb(page) {
private async debugStepWeb (page) {
let refresh = true;
if (this.lastDebugWeb) {
refresh = (new Date().getTime() - this.lastDebugWeb.getTime()) > 5000;
refresh = new Date().getTime() - this.lastDebugWeb.getTime() > 5000;
}
if (this.debugWeb && refresh) {
const mobile = this.min.core.getParam(this.min.instance, 'Bot Admin Number', null);
const filename = page;
if (mobile) {
await this.dk.sendFileTo({ mobile, filename, caption: "General Bots Debugger" });
await this.dk.sendFileTo({ mobile, filename, caption: 'General Bots Debugger' });
}
this.lastDebugWeb = new Date();
}
@ -247,42 +239,39 @@ export class WebAutomationKeywords {
*
* @example PRESS ENTER ON page
*/
public async pressKey({ handle, char, frame }) {
public async pressKey ({ handle, char, frame }) {
const page = this.getPageByHandle(handle);
GBLog.info(`BASIC: Web Automation PRESS ${char} ON element: ${frame}.`);
if (char.toLowerCase() === "enter") {
if (char.toLowerCase() === 'enter') {
char = '\n';
}
if (frame) {
await page.waitForSelector(frame)
await page.waitForSelector(frame);
let frameHandle = await page.$(frame);
const f = await frameHandle.contentFrame();
await f.keyboard.press(char);
}
else {
} else {
await page.keyboard.press(char);
}
}
public async linkByText({ handle, text, index }) {
public async linkByText ({ handle, text, index }) {
const page = this.getPageByHandle(handle);
GBLog.info(`BASIC: Web Automation CLICK LINK TEXT: ${text} ${index}.`);
if (!index) {
index = 1
index = 1;
}
const els = await page.$x(`//a[contains(.,'${text}')]`);
await els[index - 1].click();
await this.debugStepWeb(page);
}
/**
* Returns the screenshot of page or element
*
* @example file = SCREENSHOT page
*/
public async screenshot({ handle, selector }) {
public async screenshot ({ handle, selector }) {
const page = this.getPageByHandle(handle);
GBLog.info(`BASIC: Web Automation SCREENSHOT ${selector}.`);
@ -291,24 +280,18 @@ export class WebAutomationKeywords {
await page.screenshot({ path: localName });
const url = urlJoin(
GBServer.globals.publicAddress,
this.min.botId,
'cache',
Path.basename(localName)
);
const url = urlJoin(GBServer.globals.publicAddress, this.min.botId, 'cache', Path.basename(localName));
GBLog.info(`BASIC: WebAutomation: Screenshot captured at ${url}.`);
return url;
}
/**
* Types the text into the text field.
*
* @example SET page,"selector","text"
*/
public async setElementText({ handle, selector, text }) {
public async setElementText ({ handle, selector, text }) {
const page = this.getPageByHandle(handle);
GBLog.info(`BASIC: Web Automation TYPE on ${selector}: ${text}.`);
const e = await this.getBySelector({ handle, selector });
@ -318,13 +301,12 @@ export class WebAutomationKeywords {
await this.debugStepWeb(page);
}
/**
* Performs the download to the .gbdrive Download folder.
*
* @example file = DOWNLOAD element, folder
*/
public async download({ handle, selector, folder }) {
* Performs the download to the .gbdrive Download folder.
*
* @example file = DOWNLOAD element, folder
*/
public async download ({ handle, selector, folder }) {
const page = this.getPageByHandle(handle);
const container = page; // TODO: element['_frame'] ? element['_frame'] : element['_page'];
const element = await this.getBySelector({ handle, selector });
@ -333,7 +315,7 @@ export class WebAutomationKeywords {
const xRequest = await new Promise(resolve => {
page.on('request', interceptedRequest => {
interceptedRequest.abort(); //stop intercepting requests
interceptedRequest.abort(); //stop intercepting requests
resolve(interceptedRequest);
});
});
@ -344,7 +326,7 @@ export class WebAutomationKeywords {
uri: xRequest['_url'],
body: xRequest['_postData'],
headers: xRequest['_headers']
}
};
const cookies = await page.cookies();
options.headers.Cookie = cookies.map(ck => ck.name + '=' + ck.value).join(';');
@ -355,11 +337,10 @@ export class WebAutomationKeywords {
if (options.uri.indexOf('file://') != -1) {
local = url.fileURLToPath(options.uri);
filename = Path.basename(local);
}
else {
const getBasenameFormUrl = (urlStr) => {
const url = new URL(urlStr)
return Path.basename(url.pathname)
} else {
const getBasenameFormUrl = urlStr => {
const url = new URL(urlStr);
return Path.basename(url.pathname);
};
filename = getBasenameFormUrl(options.uri);
}
@ -370,7 +351,7 @@ export class WebAutomationKeywords {
} else {
result = await request.get(options);
}
let {baseUrl, client} = await GBDeployer.internalGetDriveClient(this.min);
let { baseUrl, client } = await GBDeployer.internalGetDriveClient(this.min);
const botId = this.min.instance.botId;
// Normalizes all slashes.
@ -391,14 +372,9 @@ export class WebAutomationKeywords {
// to the source and calling /content on drive API.
let file;
try {
file = await client
.api(`${baseUrl}/drive/root:/${dstPath}:/content`)
.put(result);
file = await client.api(`${baseUrl}/drive/root:/${dstPath}:/content`).put(result);
} catch (error) {
if (error.code === "nameAlreadyExists") {
if (error.code === 'nameAlreadyExists') {
GBLog.info(`BASIC: DOWNLOAD destination file already exists: ${dstPath}.`);
}
throw error;
@ -406,6 +382,4 @@ export class WebAutomationKeywords {
return file;
}
}
}

258
packages/basic.gblib/services/vbscript-to-typescript.ts
View file

@ -1,158 +1,156 @@
// Source: https://github.com/uweg/vbscript-to-typescript
"use strict";
'use strict';
import fs_1 from 'fs';
import path from 'path';
export function convertFile(file) {
var extension = path.extname(file);
var withoutExtension = file.substr(0, file.length - extension.length);
var targetFile = withoutExtension + ".ts";
var baseName = path.basename(file, extension);
var content = fs_1.readFileSync(file, 'utf8');
var result = convert(content, baseName);
console.log("Writing to \"" + targetFile + "\"...");
fs_1.writeFileSync(targetFile, result);
export function convertFile (file) {
var extension = path.extname(file);
var withoutExtension = file.substr(0, file.length - extension.length);
var targetFile = withoutExtension + '.ts';
var baseName = path.basename(file, extension);
var content = fs_1.readFileSync(file, 'utf8');
var result = convert(content, baseName);
console.log('Writing to "' + targetFile + '"...');
fs_1.writeFileSync(targetFile, result);
}
export function convert(input, name) {
var result = convertImports(input, name);
return result;
export function convert (input, name) {
var result = convertImports(input, name);
return result;
}
function convertImports(input, name) {
var items = [];
var result = input.replace(/<!-- #include file="(.*?\/)?(.*?).asp" -->/gi, function (input, group1, group2) {
var path = group1 || './';
var file = "" + path + group2;
items.push({ name: group2, path: file });
return "<%\n" + group2 + "();\n%>";
});
result = convertCode(result);
result = convertExpressions(result);
result = convertStrings(result);
function convertImports (input, name) {
var items = [];
var result = input.replace(/<!-- #include file="(.*?\/)?(.*?).asp" -->/gi, function (input, group1, group2) {
var path = group1 || './';
var file = '' + path + group2;
items.push({ name: group2, path: file });
return '<%\n' + group2 + '();\n%>';
});
result = convertCode(result);
result = convertExpressions(result);
result = convertStrings(result);
for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
var item = items_1[_i];
result = "import {" + item.name + "} from \"" + item.path + "\"\n" + result;
for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
var item = items_1[_i];
result = 'import {' + item.name + '} from "' + item.path + '"\n' + result;
}
return result;
}
function convertCode (input) {
var result = input.replace(/<%([^=][\s\S]*?)%>/gi, function (input, group1) {
var code = group1;
code = convertComments(code);
code = convertIfStatements(code);
code = convertSwitchStatements(code);
code = convertFunctions(code);
code = convertForStatements(code);
code = convertLoops(code);
code = convertPRec(code);
code = convertPLan(code);
return '<%' + code + '%>';
});
return result;
}
function convertExpressions (input) {
var result = input.replace(/<%=([\s\S]*?)%>/gi, function (input, group1) {
var content = convertPRec(group1);
content = convertPLan(content);
return '${' + content + '}';
});
return result;
}
function convertStrings (input) {
var result = input.replace(/%>([\s\S]+?)<%/gi, '\nResponse.Write(`$1`);\n');
// Entire document is a string
if (result.indexOf('<%') === -1) {
result = 'Response.Write(`' + result + '`);';
}
// Start of the document is a string
var firstIndex = result.indexOf('<%');
if (firstIndex > 0) {
result = 'Response.Write(`' + result.substr(0, firstIndex) + '`);\n' + result.substring(firstIndex + 2);
}
result = result.replace(/%>$/, '');
// End of the document is a string
var lastIndex = result.lastIndexOf('%>');
if (lastIndex > -1 && lastIndex < result.length - 2) {
result = result.substr(0, lastIndex) + '\nResponse.Write(`' + result.substr(lastIndex + 3) + '`);';
}
result = result.replace(/^<%/, '');
return result;
}
function convertComments (input) {
var result = '';
var splitted = input.split(/(".*")/gim);
for (var _i = 0, splitted_1 = splitted; _i < splitted_1.length; _i++) {
var part = splitted_1[_i];
if (part.indexOf('"') === 0) {
result += part;
} else {
result += part.replace(/'/gi, '//');
}
return result;
}
return result;
}
function convertCode(input) {
var result = input.replace(/<%([^=][\s\S]*?)%>/gi, function (input, group1) {
var code = group1;
code = convertComments(code);
code = convertIfStatements(code);
code = convertSwitchStatements(code);
code = convertFunctions(code);
code = convertForStatements(code);
code = convertLoops(code);
code = convertPRec(code);
code = convertPLan(code);
return "<%" + code + "%>";
});
return result;
function convertIfStatements (input) {
var result = input.replace(/if +(.*?) +then/gi, function (input, group1) {
var condition = convertConditions(group1);
return '\nif (' + condition + ') {\n';
});
result = result.replace(/end if/gi, '\n}\n');
result = result.replace(/else(?!{)/gi, '\n}\nelse {\n');
return result;
}
function convertExpressions(input) {
var result = input.replace(/<%=([\s\S]*?)%>/gi, function (input, group1) {
var content = convertPRec(group1);
content = convertPLan(content);
return "${" + content + "}";
});
return result;
function convertSwitchStatements (input) {
var result = input.replace(/select case +(.*)/gi, '\nswitch ($1) {\n');
result = result.replace(/end select/gi, '\n}\n');
return result;
}
function convertStrings(input) {
var result = input.replace(/%>([\s\S]+?)<%/gi, "\nResponse.Write(`$1`);\n");
// Entire document is a string
if (result.indexOf("<%") === -1) {
result = "Response.Write(`" + result + "`);";
}
// Start of the document is a string
var firstIndex = result.indexOf("<%");
if (firstIndex > 0) {
result = "Response.Write(`" + result.substr(0, firstIndex) + "`);\n" + result.substring(firstIndex + 2);
}
result = result.replace(/%>$/, "");
// End of the document is a string
var lastIndex = result.lastIndexOf("%>");
if (lastIndex > -1 && lastIndex < result.length - 2) {
result = result.substr(0, lastIndex) + "\nResponse.Write(`" + result.substr(lastIndex + 3) + "`);";
}
result = result.replace(/^<%/, "");
return result;
function convertFunctions (input) {
var result = input.replace(/function +(.*)\((.*)\)/gi, '\n$1 = ($2) => {\n');
result = result.replace(/end function/gi, '\n}\n');
return result;
}
function convertComments(input) {
var result = '';
var splitted = input.split(/(".*")/gim);
for (var _i = 0, splitted_1 = splitted; _i < splitted_1.length; _i++) {
var part = splitted_1[_i];
if (part.indexOf("\"") === 0) {
result += part;
}
else {
result += part.replace(/'/gi, "//");
}
}
return result;
function convertForStatements (input) {
var result = input.replace(/for +(.*to.*)/gi, '\nfor ($1) {\n');
result = result.replace(/^ *next *$/gim, '}\n');
return result;
}
function convertIfStatements(input) {
var result = input.replace(/if +(.*?) +then/gi, function (input, group1) {
var condition = convertConditions(group1);
return "\nif (" + condition + ") {\n";
});
result = result.replace(/end if/gi, "\n}\n");
result = result.replace(/else(?!{)/gi, "\n}\nelse {\n");
return result;
function convertConditions (input) {
var result = input.replace(/ +and +/gi, ' && ');
result = result.replace(/ +or +/gi, ' || ');
result = result.replace(/ +<> +/gi, ' !== ');
result = result.replace(/ += +/gi, ' === ');
return result;
}
function convertSwitchStatements(input) {
var result = input.replace(/select case +(.*)/gi, "\nswitch ($1) {\n");
result = result.replace(/end select/gi, "\n}\n");
return result;
function convertLoops (input) {
var result = input.replace(/do while +(.*)/gi, function (input, group1) {
var condition = convertConditions(group1);
return '\nwhile (' + condition + ') {\n';
});
result = result.replace(/^ *loop *$/gim, '}\n');
return result;
}
function convertFunctions(input) {
var result = input.replace(/function +(.*)\((.*)\)/gi, "\n$1 = ($2) => {\n");
result = result.replace(/end function/gi, "\n}\n");
return result;
function convertPRec (input) {
var result = input.replace(/(p_rec\("\S+?"\))/gi, '$1.Value');
return result;
}
function convertForStatements(input) {
var result = input.replace(/for +(.*to.*)/gi, "\nfor ($1) {\n");
result = result.replace(/^ *next *$/gim, "}\n");
return result;
function convertPLan (input) {
var result = input.replace(/(l_\S+?)\(p_lan\)/gi, '$1[p_lan]');
return result;
}
function convertConditions(input) {
var result = input.replace(/ +and +/gi, " && ");
result = result.replace(/ +or +/gi, " || ");
result = result.replace(/ +<> +/gi, " !== ");
result = result.replace(/ += +/gi, " === ");
return result;
}
function convertLoops(input) {
var result = input.replace(/do while +(.*)/gi, function (input, group1) {
var condition = convertConditions(group1);
return "\nwhile (" + condition + ") {\n";
});
result = result.replace(/^ *loop *$/gim, "}\n");
return result;
}
function convertPRec(input) {
var result = input.replace(/(p_rec\("\S+?"\))/gi, "$1.Value");
return result;
}
function convertPLan(input) {
var result = input.replace(/(l_\S+?)\(p_lan\)/gi, "$1[p_lan]");
return result;
}

14
packages/basic.gblib/services/vm2-process/index.ts
View file

@ -63,7 +63,6 @@ export const createVm2Pool = ({ min, max, ...limits }) => {
{ cwd: limits.cwd, shell: false }
);
childProcess.stdout.on('data', data => {
childProcess['socket'] = childProcess['socket'] || data.toString().trim();
});
@ -75,16 +74,16 @@ export const createVm2Pool = ({ min, max, ...limits }) => {
kill(process);
GBServer.globals.debuggers[limits.botId].state = 0;
GBServer.globals.debuggers[limits.botId].stateInfo = stderrCache;
}
else if (stderrCache.includes('FATAL ERROR: Reached heap limit Allocation failed - JavaScript heap out of memory')) {
} else if (
stderrCache.includes('FATAL ERROR: Reached heap limit Allocation failed - JavaScript heap out of memory')
) {
limitError = 'code execution exceeed allowed memory';
kill(process);
GBServer.globals.debuggers[limits.botId].state = 0;
GBServer.globals.debuggers[limits.botId].stateInfo = 'Fail';
}
else if (stderrCache.includes('Debugger attached.')) {
} else if (stderrCache.includes('Debugger attached.')) {
GBLog.info(`BASIC: General Bots Debugger attached to Node .gbdialog process for ${limits.botId}.`);
}
}
});
let socket = null;
@ -92,7 +91,6 @@ export const createVm2Pool = ({ min, max, ...limits }) => {
GBServer.globals.debuggers[limits.botId].childProcess = ref;
// Only attach if called by debugger/run.
if (GBServer.globals.debuggers[limits.botId]) {
@ -154,7 +152,6 @@ export const createVm2Pool = ({ min, max, ...limits }) => {
await client.Runtime.runIfWaitingForDebugger();
await client.Debugger.enable();
await client.Runtime.enable();
resolve(1);
} catch (err) {
@ -214,4 +211,3 @@ export const createVm2Pool = ({ min, max, ...limits }) => {
run
};
};

10
packages/basic.gblib/services/vm2-process/vm2ProcessRunner.ts
View file

@ -9,20 +9,20 @@ const evaluate = async (script, scope) => {
console: 'inherit',
wrapper: 'none',
require: {
builtin:['stream', 'http' , 'https', 'url', 'buffer', 'zlib', 'isomorphic-fetch', 'punycode', 'encoding'],
builtin: ['stream', 'http', 'https', 'url', 'buffer', 'zlib', 'isomorphic-fetch', 'punycode', 'encoding'],
root: ['./'],
external: true,
context: 'sandbox'
},
}
});
const s = new VMScript(script, scope);
return await vm.run(script, scope);
};
const socketName = crypto1.randomBytes(20).toString('hex');
const server = net1.createServer((socket) => {
const server = net1.createServer(socket => {
const buffer = [];
const sync = async () => {
@ -39,7 +39,7 @@ const server = net1.createServer((socket) => {
socket.write(JSON.stringify({ result }) + '\n');
socket.end();
} catch (error) {
console.log(`BASIC: RUNTIME: ${error.message}, ${error.stack}`)
console.log(`BASIC: RUNTIME: ${error.message}, ${error.stack}`);
socket.write(JSON.stringify({ error: error.message }) + '\n');
socket.end();
}

1
packages/basic.gblib/strings.ts
View file

@ -1,4 +1,3 @@
export const Messages = {
'en-US': {
affirmative_sentences: /^(\bsim\b|\bs\b|\bpositivo\b|\bafirmativo\b|\bclaro\b|\bevidente\b|\bsem dúvida\b|\bconfirmo\b|\bconfirmar\b|\bconfirmado\b|\buhum\b|\bsi\b|\by\b|\byes\b|\bsure\b)/i,

14
packages/console.gblib/index.ts
View file

@ -46,25 +46,25 @@ import { ConsoleDirectLine } from './services/ConsoleDirectLine.js';
export class GBConsolePackage implements IGBPackage {
public sysPackages: IGBPackage[];
public channel: ConsoleDirectLine;
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
this.channel = new ConsoleDirectLine(min.instance.webchatKey);
}
}

12
packages/console.gblib/services/ConsoleDirectLine.ts
View file

@ -11,7 +11,7 @@ export class ConsoleDirectLine extends GBService {
public directLineClientName: string = 'DirectLineClient';
public directLineSpecUrl: string = 'https://docs.botframework.com/en-us/restapi/directline3/swagger.json';
constructor(directLineSecret: string) {
constructor (directLineSecret: string) {
super();
this.directLineSecret = directLineSecret;
@ -57,7 +57,7 @@ export class ConsoleDirectLine extends GBService {
});
}
public sendMessagesFromConsole(client, conversationId) {
public sendMessagesFromConsole (client, conversationId) {
const _this_ = this;
process.stdin.resume();
const stdin = process.stdin;
@ -92,7 +92,7 @@ export class ConsoleDirectLine extends GBService {
});
}
public pollMessages(client, conversationId) {
public pollMessages (client, conversationId) {
const _this_ = this;
GBLog.info(`Starting polling message for conversationId: ${conversationId}`);
let watermark;
@ -112,7 +112,7 @@ export class ConsoleDirectLine extends GBService {
}
// tslint:disable:no-unsafe-any
public printMessages(activities, directLineClientName) {
public printMessages (activities, directLineClientName) {
if (activities && activities.length) {
// ignore own messages
activities = activities.filter(m => {
@ -133,7 +133,7 @@ export class ConsoleDirectLine extends GBService {
// tslint:enable:no-unsafe-any
// tslint:disable:no-unsafe-any
public printMessage(activity) {
public printMessage (activity) {
if (activity.text) {
GBLog.info(activity.text);
}
@ -160,7 +160,7 @@ export class ConsoleDirectLine extends GBService {
// tslint:enable:no-unsafe-any
// tslint:disable:no-unsafe-any
public renderHeroCard(attachment) {
public renderHeroCard (attachment) {
const width = 70;
const contentLine = content => {
return `${' '.repeat((width - content.length) / 2)}content${' '.repeat((width - content.length) / 2)}`;

5
packages/core.gbapp/dialogs/BroadcastDialog.ts
View file

@ -53,14 +53,13 @@ export class BroadcastDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
public static setup (bot: BotAdapter, min: GBMinInstance) {
min.dialogs.add(
new WaterfallDialog('/gb-broadcast', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
} else {
return await step.next(step.options);
}
},

108
packages/core.gbapp/dialogs/LanguageDialog.ts
View file

@ -54,63 +54,63 @@ export class LanguageDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
min.dialogs.add(new WaterfallDialog('/language', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
return await step.next(step.options);
}
},
async step => {
const locale = step.context.activity.locale;
return await min.conversationalService.prompt(min, step,
Messages[locale].which_language);
},
async step => {
const locale = step.context.activity.locale;
const user = await min.userProfile.get(step.context, {});
const list = [
{ name: 'english', code: 'en' },
{ name: 'inglês', code: 'en' },
{ name: 'portuguese', code: 'pt' },
{ name: 'português', code: 'pt' },
{ name: 'français', code: 'fr' },
{ name: 'francês', code: 'fr' },
{ name: 'french', code: 'fr' },
{ name: 'português', code: 'pt' },
{ name: 'spanish', code: 'es' },
{ name: 'espanõl', code: 'es' },
{ name: 'espanhol', code: 'es' },
{ name: 'german', code: 'de' },
{ name: 'deutsch', code: 'de' },
{ name: 'alemão', code: 'de' }
];
let translatorLocale = null;
const text = step.context.activity['originalText'];
await CollectionUtil.asyncForEach(list, async item => {
if (GBConversationalService.kmpSearch(text.toLowerCase(), item.name.toLowerCase()) != -1 ||
GBConversationalService.kmpSearch(text.toLowerCase(), item.code.toLowerCase()) != -1) {
translatorLocale = item.code;
public static setup (bot: BotAdapter, min: GBMinInstance) {
min.dialogs.add(
new WaterfallDialog('/language', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
} else {
return await step.next(step.options);
}
});
},
let sec = new SecService();
user.systemUser = await sec.updateUserLocale(user.systemUser.userId, translatorLocale);
async step => {
const locale = step.context.activity.locale;
await min.userProfile.set(step.context, user);
await min.conversationalService.sendText(min, step,
Messages[locale].language_chosen);
return await min.conversationalService.prompt(min, step, Messages[locale].which_language);
},
async step => {
const locale = step.context.activity.locale;
const user = await min.userProfile.get(step.context, {});
await step.replaceDialog('/ask', { firstTime: true });
}
]));
const list = [
{ name: 'english', code: 'en' },
{ name: 'inglês', code: 'en' },
{ name: 'portuguese', code: 'pt' },
{ name: 'português', code: 'pt' },
{ name: 'français', code: 'fr' },
{ name: 'francês', code: 'fr' },
{ name: 'french', code: 'fr' },
{ name: 'português', code: 'pt' },
{ name: 'spanish', code: 'es' },
{ name: 'espanõl', code: 'es' },
{ name: 'espanhol', code: 'es' },
{ name: 'german', code: 'de' },
{ name: 'deutsch', code: 'de' },
{ name: 'alemão', code: 'de' }
];
let translatorLocale = null;
const text = step.context.activity['originalText'];
await CollectionUtil.asyncForEach(list, async item => {
if (
GBConversationalService.kmpSearch(text.toLowerCase(), item.name.toLowerCase()) != -1 ||
GBConversationalService.kmpSearch(text.toLowerCase(), item.code.toLowerCase()) != -1
) {
translatorLocale = item.code;
}
});
let sec = new SecService();
user.systemUser = await sec.updateUserLocale(user.systemUser.userId, translatorLocale);
await min.userProfile.set(step.context, user);
await min.conversationalService.sendText(min, step, Messages[locale].language_chosen);
await step.replaceDialog('/ask', { firstTime: true });
}
])
);
}
}

53
packages/core.gbapp/dialogs/SwitchBot.ts
View file

@ -53,32 +53,33 @@ export class SwitchBotDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
min.dialogs.add(new WaterfallDialog('/bot', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
public static setup (bot: BotAdapter, min: GBMinInstance) {
min.dialogs.add(
new WaterfallDialog('/bot', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
} else {
return await step.next(step.options);
}
},
async step => {
const locale = step.context.activity.locale;
return await min.conversationalService.prompt(min, step, 'Qual seria o código de ativação?');
},
async step => {
const sec = new SecService();
const from = step.context.activity.from.id;
const botId = step.result;
const instance = await min.core.loadInstanceByBotId(botId);
await sec.updateUserInstance(from, instance.instanceId);
await min.conversationalService.sendText(min, step, `Opa, vamos lá!`);
return await step.next();
}
else{
return await step.next(step.options);
}
},
async step => {
const locale = step.context.activity.locale;
return await min.conversationalService.prompt (min, step, 'Qual seria o código de ativação?');
},
async step => {
const sec = new SecService();
const from = step.context.activity.from.id;
const botId = step.result;
const instance = await min.core.loadInstanceByBotId(botId);
await sec.updateUserInstance(from, instance.instanceId);
await min.conversationalService.sendText(min, step, `Opa, vamos lá!`);
return await step.next();
}
]));
])
);
}
}

90
packages/core.gbapp/dialogs/WelcomeDialog.ts
View file

@ -53,57 +53,61 @@ export class WelcomeDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
public static setup (bot: BotAdapter, min: GBMinInstance) {
min.dialogs.add(
new WaterfallDialog('/', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
} else {
return await step.next(step.options);
}
},
async step => {
if (
GBServer.globals.entryPointDialog !== null &&
min.instance.botId === process.env.BOT_ID &&
step.context.activity.channelId === 'webchat'
) {
return step.replaceDialog(GBServer.globals.entryPointDialog);
}
min.dialogs.add(new WaterfallDialog('/', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
return await step.next(step.options);
}
},
async step => {
const user = await min.userProfile.get(step.context, {});
const locale = step.context.activity.locale;
if (GBServer.globals.entryPointDialog !== null &&
min.instance.botId === process.env.BOT_ID &&
step.context.activity.channelId === 'webchat') {
return step.replaceDialog(GBServer.globals.entryPointDialog);
}
const user = await min.userProfile.get(step.context, {});
const locale = step.context.activity.locale;
if (!user.once && step.context.activity.channelId === 'webchat'
&& min.core.getParam<boolean>(min.instance, 'HelloGoodX', true) === "true") {
user.once = true;
await min.userProfile.set(step.context, user);
const a = new Date();
const date = a.getHours();
const msg =
date < 12
? Messages[locale].good_morning
: date < 18
if (
!user.once &&
step.context.activity.channelId === 'webchat' &&
min.core.getParam<boolean>(min.instance, 'HelloGoodX', true) === 'true'
) {
user.once = true;
await min.userProfile.set(step.context, user);
const a = new Date();
const date = a.getHours();
const msg =
date < 12
? Messages[locale].good_morning
: date < 18
? Messages[locale].good_evening
: Messages[locale].good_night;
await min.conversationalService.sendText(min, step, Messages[locale].hi(msg));
await min.conversationalService.sendText(min, step, Messages[locale].hi(msg));
await step.replaceDialog('/ask', { firstTime: true });
await step.replaceDialog('/ask', { firstTime: true });
if (
step.context.activity !== undefined &&
step.context.activity.type === 'message' &&
step.context.activity.text !== ''
) {
GBLog.info(`/answer being called from WelcomeDialog.`);
await step.replaceDialog('/answer', { query: step.context.activity.text });
if (
step.context.activity !== undefined &&
step.context.activity.type === 'message' &&
step.context.activity.text !== ''
) {
GBLog.info(`/answer being called from WelcomeDialog.`);
await step.replaceDialog('/answer', { query: step.context.activity.text });
}
}
}
return await step.next();
}
]));
return await step.next();
}
])
);
}
}

55
packages/core.gbapp/dialogs/WhoAmIDialog.ts
View file

@ -51,33 +51,34 @@ export class WhoAmIDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
min.dialogs.add(new WaterfallDialog('/whoAmI', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
public static setup (bot: BotAdapter, min: GBMinInstance) {
min.dialogs.add(
new WaterfallDialog('/whoAmI', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
} else {
return await step.next(step.options);
}
},
async step => {
const locale = step.context.activity.locale;
await min.conversationalService.sendText(min, step, `${min.instance.description}`);
if (min.instance.whoAmIVideo !== undefined) {
await min.conversationalService.sendText(min, step, Messages[locale].show_video);
await min.conversationalService.sendEvent(min, step, 'play', {
playerType: 'video',
data: min.instance.whoAmIVideo.trim()
});
}
await step.replaceDialog('/ask', { isReturning: true });
return await step.next();
}
else{
return await step.next(step.options);
}
},
async step => {
const locale = step.context.activity.locale;
await min.conversationalService.sendText(min, step, `${min.instance.description}`);
if (min.instance.whoAmIVideo !== undefined) {
await min.conversationalService.sendText(min, step, Messages[locale].show_video);
await min.conversationalService.sendEvent(min, step, 'play', {
playerType: 'video',
data: min.instance.whoAmIVideo.trim()
});
}
await step.replaceDialog('/ask', { isReturning: true });
return await step.next();
}
]));
])
);
}
}

14
packages/core.gbapp/index.ts
View file

@ -52,27 +52,27 @@ export class GBCorePackage implements IGBPackage {
public sysPackages: IGBPackage[];
public CurrentEngineName = 'guaribas-1.0.0';
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasInstance, GuaribasPackage, GuaribasChannel, GuaribasException]);
}
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
WelcomeDialog.setup(min.bot, min);
WhoAmIDialog.setup(min.bot, min);
SwitchBotDialog.setup(min.bot, min);

214
packages/core.gbapp/models/GBModel.ts
View file

@ -55,221 +55,219 @@ import { IGBInstance } from 'botlib';
* Base instance data for a bot.
*/
@Table
export class GuaribasInstance extends Model<GuaribasInstance>
implements IGBInstance {
export class GuaribasInstance extends Model<GuaribasInstance> implements IGBInstance {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@Column(DataType.STRING(255))
declare botEndpoint: string;
botEndpoint: string;
@Column(DataType.STRING(255))
declare whoAmIVideo: string;
whoAmIVideo: string;
@Column(DataType.STRING(255))
declare botId: string;
botId: string;
@Column(DataType.STRING(255))
declare title: string;
title: string;
@Column({ type: DataType.STRING(16) })
declare activationCode: string;
activationCode: string;
@Column(DataType.STRING(255))
declare description: string;
description: string;
@Column({ type: DataType.STRING(16) })
declare state: string;
state: string;
declare version: string;
version: string;
@Column(DataType.STRING(64))
declare botKey: string;
botKey: string;
@Column(DataType.STRING(255))
declare enabledAdmin: boolean;
enabledAdmin: boolean;
@Column(DataType.STRING(255))
declare engineName: string;
engineName: string;
@Column(DataType.STRING(255))
declare marketplaceId: string;
marketplaceId: string;
@Column(DataType.STRING(255))
declare textAnalyticsKey: string;
textAnalyticsKey: string;
@Column(DataType.STRING(255))
declare textAnalyticsEndpoint: string;
textAnalyticsEndpoint: string;
@Column({ type: DataType.STRING(64) })
declare translatorKey: string;
translatorKey: string;
@Column({ type: DataType.STRING(128) })
declare translatorEndpoint: string;
translatorEndpoint: string;
@Column(DataType.STRING(255))
declare marketplacePassword: string;
marketplacePassword: string;
@Column(DataType.STRING(255))
declare webchatKey: string;
webchatKey: string;
@Column(DataType.STRING(255))
declare authenticatorTenant: string;
authenticatorTenant: string;
@Column(DataType.STRING(255))
declare authenticatorAuthorityHostUrl: string;
authenticatorAuthorityHostUrl: string;
@Column(DataType.STRING(255))
declare cloudSubscriptionId: string;
cloudSubscriptionId: string;
@Column(DataType.STRING(255))
declare cloudUsername: string;
cloudUsername: string;
@Column(DataType.STRING(255))
declare cloudPassword: string;
cloudPassword: string;
@Column(DataType.STRING(255))
declare cloudLocation: string;
cloudLocation: string;
@Column(DataType.STRING(255))
declare googleBotKey: string;
googleBotKey: string;
@Column(DataType.STRING(255))
declare googleChatApiKey: string;
googleChatApiKey: string;
@Column(DataType.STRING(255))
declare googleChatSubscriptionName: string;
googleChatSubscriptionName: string;
@Column(DataType.STRING(255))
declare googleClientEmail: string;
googleClientEmail: string;
@Column({ type: DataType.STRING(4000) })
declare googlePrivateKey: string;
googlePrivateKey: string;
@Column(DataType.STRING(255))
declare googleProjectId: string;
@Column({ type: DataType.STRING(255) })
declare facebookWorkplaceVerifyToken: string;
googleProjectId: string;
@Column({ type: DataType.STRING(255) })
declare facebookWorkplaceAppSecret: string;
facebookWorkplaceVerifyToken: string;
@Column({ type: DataType.STRING(255) })
facebookWorkplaceAppSecret: string;
@Column({ type: DataType.STRING(512) })
declare facebookWorkplaceAccessToken: string;
@Column(DataType.STRING(255))
declare whatsappBotKey: string;
facebookWorkplaceAccessToken: string;
@Column(DataType.STRING(255))
declare whatsappServiceKey: string;
whatsappBotKey: string;
@Column(DataType.STRING(255))
declare whatsappServiceNumber: string;
whatsappServiceKey: string;
@Column(DataType.STRING(255))
declare whatsappServiceUrl: string;
whatsappServiceNumber: string;
@Column(DataType.STRING(255))
declare smsKey: string;
whatsappServiceUrl: string;
@Column(DataType.STRING(255))
declare smsSecret: string;
smsKey: string;
@Column(DataType.STRING(255))
declare smsServiceNumber: string;
smsSecret: string;
@Column(DataType.STRING(255))
declare speechKey: string;
smsServiceNumber: string;
@Column(DataType.STRING(255))
declare speechEndpoint: string;
speechKey: string;
@Column(DataType.STRING(255))
declare spellcheckerKey: string;
speechEndpoint: string;
@Column(DataType.STRING(255))
declare spellcheckerEndpoint: string;
spellcheckerKey: string;
@Column(DataType.STRING(255))
declare theme: string;
spellcheckerEndpoint: string;
@Column(DataType.STRING(255))
declare ui: string;
theme: string;
@Column(DataType.STRING(255))
declare kb: string;
ui: string;
@Column(DataType.STRING(255))
declare nlpAppId: string;
kb: string;
@Column(DataType.STRING(255))
declare nlpKey: string;
nlpAppId: string;
@Column(DataType.STRING(255))
nlpKey: string;
@Column({ type: DataType.STRING(512) })
declare nlpEndpoint: string;
nlpEndpoint: string;
@Column(DataType.STRING(255))
declare nlpAuthoringKey: string;
nlpAuthoringKey: string;
@Column(DataType.STRING(255))
declare deploymentPaths: string;
deploymentPaths: string;
@Column(DataType.STRING(255))
declare searchHost: string;
searchHost: string;
@Column(DataType.STRING(255))
declare searchKey: string;
searchKey: string;
@Column(DataType.STRING(255))
declare searchIndex: string;
searchIndex: string;
@Column(DataType.STRING(255))
declare searchIndexer: string;
searchIndexer: string;
@Column(DataType.STRING(255))
declare storageUsername: string;
storageUsername: string;
@Column(DataType.STRING(255))
declare storagePassword: string;
storagePassword: string;
@Column(DataType.STRING(255))
declare storageName: string;
storageName: string;
@Column(DataType.STRING(255))
declare storageServer: string;
storageServer: string;
@Column(DataType.STRING(255))
declare storageDialect: string;
storageDialect: string;
@Column(DataType.STRING(255))
declare storagePath: string;
storagePath: string;
@Column(DataType.STRING(255))
declare adminPass: string;
adminPass: string;
@Column(DataType.FLOAT)
declare nlpVsSearch: number; // TODO: Remove field.
nlpVsSearch: number; // TODO: Remove field.
@Column(DataType.FLOAT)
declare searchScore: number;
searchScore: number;
@Column(DataType.FLOAT)
declare nlpScore: number;
nlpScore: number;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
@Column(DataType.STRING(4000))
declare params: string;
params: string;
}
/**
@ -280,28 +278,28 @@ export class GuaribasPackage extends Model<GuaribasPackage> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare packageId: number;
packageId: number;
@Column(DataType.STRING(255))
declare packageName: string;
packageName: string;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
@Column({ type: DataType.STRING(512) })
declare custom: string;
custom: string;
}
/**
@ -312,18 +310,18 @@ export class GuaribasChannel extends Model<GuaribasChannel> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare channelId: number;
channelId: number;
@Column(DataType.STRING(255))
declare title: string;
title: string;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
}
/**
@ -335,72 +333,70 @@ export class GuaribasException extends Model<GuaribasException> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare exceptionId: number;
exceptionId: number;
@Column(DataType.STRING(255))
declare message: string;
message: string;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
}
@Table
//tslint:disable-next-line:max-classes-per-file
export class GuaribasApplications extends Model<GuaribasApplications> {
@Column(DataType.STRING(255))
declare name: string;
name: string;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
}
@Table
//tslint:disable-next-line:max-classes-per-file
export class GuaribasSchedule extends Model<GuaribasSchedule> {
@Column(DataType.STRING(255))
name: string;
@Column(DataType.STRING(255))
declare name: string;
@Column(DataType.STRING(255))
declare schedule: string;
schedule: string;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
}

13
packages/core.gbapp/services/GBConfigService.ts
View file

@ -43,10 +43,10 @@ import * as en from 'dotenv-extended';
* Base configuration for the server like storage.
*/
export class GBConfigService {
public static getBoolean(value: string): boolean {
return this.get(value) as unknown as boolean;
public static getBoolean (value: string): boolean {
return (this.get(value) as unknown) as boolean;
}
public static getServerPort(): string {
public static getServerPort (): string {
if (process.env.PORT) {
return process.env.PORT;
}
@ -57,7 +57,7 @@ export class GBConfigService {
return '4242';
}
public static init(): any {
public static init (): any {
try {
en.load({
encoding: 'utf8',
@ -78,7 +78,7 @@ export class GBConfigService {
}
}
public static get(key: string): string | undefined {
public static get (key: string): string | undefined {
let value = GBConfigService.tryGet(key);
if (value === undefined) {
@ -164,13 +164,12 @@ export class GBConfigService {
return value;
}
public static tryGet(key: string): any {
public static tryGet (key: string): any {
let value = process.env[`container:${key}`];
if (value === undefined) {
value = process.env[key];
}
return value;
}
}

529
packages/core.gbapp/services/GBConversationalService.ts
View file

@ -62,126 +62,212 @@ import SpeechToTextV1 from 'ibm-watson/speech-to-text/v1.js';
import TextToSpeechV1 from 'ibm-watson/text-to-speech/v1.js';
import { IamAuthenticator } from 'ibm-watson/auth/index.js';
import * as marked from 'marked';
import Translate from '@google-cloud/translate';
import Translate from '@google-cloud/translate';
/**
* Provides basic services for handling messages and dispatching to back-end
* services like NLP or Search.
*/
export class GBConversationalService {
/**
* Reference to the core service.
*/
public coreService: IGBCoreService;
/**
*
* @param coreService
*
* @param coreService
*/
constructor(coreService: IGBCoreService) {
constructor (coreService: IGBCoreService) {
this.coreService = coreService;
}
static defaultDiacriticsRemovalMap = [
{ 'base': 'A', 'letters': '\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F' },
{ 'base': 'AA', 'letters': '\uA732' },
{ 'base': 'AE', 'letters': '\u00C6\u01FC\u01E2' },
{ 'base': 'AO', 'letters': '\uA734' },
{ 'base': 'AU', 'letters': '\uA736' },
{ 'base': 'AV', 'letters': '\uA738\uA73A' },
{ 'base': 'AY', 'letters': '\uA73C' },
{ 'base': 'B', 'letters': '\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181' },
{ 'base': 'C', 'letters': '\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E' },
{ 'base': 'D', 'letters': '\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779\u00D0' },
{ 'base': 'DZ', 'letters': '\u01F1\u01C4' },
{ 'base': 'Dz', 'letters': '\u01F2\u01C5' },
{ 'base': 'E', 'letters': '\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E' },
{ 'base': 'F', 'letters': '\u0046\u24BB\uFF26\u1E1E\u0191\uA77B' },
{ 'base': 'G', 'letters': '\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E' },
{ 'base': 'H', 'letters': '\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D' },
{ 'base': 'I', 'letters': '\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197' },
{ 'base': 'J', 'letters': '\u004A\u24BF\uFF2A\u0134\u0248' },
{ 'base': 'K', 'letters': '\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2' },
{ 'base': 'L', 'letters': '\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780' },
{ 'base': 'LJ', 'letters': '\u01C7' },
{ 'base': 'Lj', 'letters': '\u01C8' },
{ 'base': 'M', 'letters': '\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C' },
{ 'base': 'N', 'letters': '\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4' },
{ 'base': 'NJ', 'letters': '\u01CA' },
{ 'base': 'Nj', 'letters': '\u01CB' },
{ 'base': 'O', 'letters': '\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C' },
{ 'base': 'OI', 'letters': '\u01A2' },
{ 'base': 'OO', 'letters': '\uA74E' },
{ 'base': 'OU', 'letters': '\u0222' },
{ 'base': 'OE', 'letters': '\u008C\u0152' },
{ 'base': 'oe', 'letters': '\u009C\u0153' },
{ 'base': 'P', 'letters': '\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754' },
{ 'base': 'Q', 'letters': '\u0051\u24C6\uFF31\uA756\uA758\u024A' },
{ 'base': 'R', 'letters': '\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782' },
{ 'base': 'S', 'letters': '\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784' },
{ 'base': 'T', 'letters': '\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786' },
{ 'base': 'TZ', 'letters': '\uA728' },
{ 'base': 'U', 'letters': '\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244' },
{ 'base': 'V', 'letters': '\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245' },
{ 'base': 'VY', 'letters': '\uA760' },
{ 'base': 'W', 'letters': '\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72' },
{ 'base': 'X', 'letters': '\u0058\u24CD\uFF38\u1E8A\u1E8C' },
{ 'base': 'Y', 'letters': '\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE' },
{ 'base': 'Z', 'letters': '\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762' },
{ 'base': 'a', 'letters': '\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250' },
{ 'base': 'aa', 'letters': '\uA733' },
{ 'base': 'ae', 'letters': '\u00E6\u01FD\u01E3' },
{ 'base': 'ao', 'letters': '\uA735' },
{ 'base': 'au', 'letters': '\uA737' },
{ 'base': 'av', 'letters': '\uA739\uA73B' },
{ 'base': 'ay', 'letters': '\uA73D' },
{ 'base': 'b', 'letters': '\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253' },
{ 'base': 'c', 'letters': '\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184' },
{ 'base': 'd', 'letters': '\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A' },
{ 'base': 'dz', 'letters': '\u01F3\u01C6' },
{ 'base': 'e', 'letters': '\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD' },
{ 'base': 'f', 'letters': '\u0066\u24D5\uFF46\u1E1F\u0192\uA77C' },
{ 'base': 'g', 'letters': '\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F' },
{ 'base': 'h', 'letters': '\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265' },
{ 'base': 'hv', 'letters': '\u0195' },
{ 'base': 'i', 'letters': '\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131' },
{ 'base': 'j', 'letters': '\u006A\u24D9\uFF4A\u0135\u01F0\u0249' },
{ 'base': 'k', 'letters': '\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3' },
{ 'base': 'l', 'letters': '\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747' },
{ 'base': 'lj', 'letters': '\u01C9' },
{ 'base': 'm', 'letters': '\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F' },
{ 'base': 'n', 'letters': '\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5' },
{ 'base': 'nj', 'letters': '\u01CC' },
{ 'base': 'o', 'letters': '\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275' },
{ 'base': 'oi', 'letters': '\u01A3' },
{ 'base': 'ou', 'letters': '\u0223' },
{ 'base': 'oo', 'letters': '\uA74F' },
{ 'base': 'p', 'letters': '\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755' },
{ 'base': 'q', 'letters': '\u0071\u24E0\uFF51\u024B\uA757\uA759' },
{ 'base': 'r', 'letters': '\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783' },
{ 'base': 's', 'letters': '\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B' },
{ 'base': 't', 'letters': '\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787' },
{ 'base': 'tz', 'letters': '\uA729' },
{ 'base': 'u', 'letters': '\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289' },
{ 'base': 'v', 'letters': '\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C' },
{ 'base': 'vy', 'letters': '\uA761' },
{ 'base': 'w', 'letters': '\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73' },
{ 'base': 'x', 'letters': '\u0078\u24E7\uFF58\u1E8B\u1E8D' },
{ 'base': 'y', 'letters': '\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF' },
{ 'base': 'z', 'letters': '\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763' }
{
base: 'A',
letters:
'\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F'
},
{ base: 'AA', letters: '\uA732' },
{ base: 'AE', letters: '\u00C6\u01FC\u01E2' },
{ base: 'AO', letters: '\uA734' },
{ base: 'AU', letters: '\uA736' },
{ base: 'AV', letters: '\uA738\uA73A' },
{ base: 'AY', letters: '\uA73C' },
{ base: 'B', letters: '\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181' },
{ base: 'C', letters: '\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E' },
{
base: 'D',
letters: '\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779\u00D0'
},
{ base: 'DZ', letters: '\u01F1\u01C4' },
{ base: 'Dz', letters: '\u01F2\u01C5' },
{
base: 'E',
letters:
'\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E'
},
{ base: 'F', letters: '\u0046\u24BB\uFF26\u1E1E\u0191\uA77B' },
{
base: 'G',
letters: '\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E'
},
{ base: 'H', letters: '\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D' },
{
base: 'I',
letters:
'\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197'
},
{ base: 'J', letters: '\u004A\u24BF\uFF2A\u0134\u0248' },
{ base: 'K', letters: '\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2' },
{
base: 'L',
letters:
'\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780'
},
{ base: 'LJ', letters: '\u01C7' },
{ base: 'Lj', letters: '\u01C8' },
{ base: 'M', letters: '\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C' },
{
base: 'N',
letters: '\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4'
},
{ base: 'NJ', letters: '\u01CA' },
{ base: 'Nj', letters: '\u01CB' },
{
base: 'O',
letters:
'\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C'
},
{ base: 'OI', letters: '\u01A2' },
{ base: 'OO', letters: '\uA74E' },
{ base: 'OU', letters: '\u0222' },
{ base: 'OE', letters: '\u008C\u0152' },
{ base: 'oe', letters: '\u009C\u0153' },
{ base: 'P', letters: '\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754' },
{ base: 'Q', letters: '\u0051\u24C6\uFF31\uA756\uA758\u024A' },
{
base: 'R',
letters: '\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782'
},
{
base: 'S',
letters: '\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784'
},
{
base: 'T',
letters: '\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786'
},
{ base: 'TZ', letters: '\uA728' },
{
base: 'U',
letters:
'\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244'
},
{ base: 'V', letters: '\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245' },
{ base: 'VY', letters: '\uA760' },
{ base: 'W', letters: '\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72' },
{ base: 'X', letters: '\u0058\u24CD\uFF38\u1E8A\u1E8C' },
{
base: 'Y',
letters: '\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE'
},
{ base: 'Z', letters: '\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762' },
{
base: 'a',
letters:
'\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250'
},
{ base: 'aa', letters: '\uA733' },
{ base: 'ae', letters: '\u00E6\u01FD\u01E3' },
{ base: 'ao', letters: '\uA735' },
{ base: 'au', letters: '\uA737' },
{ base: 'av', letters: '\uA739\uA73B' },
{ base: 'ay', letters: '\uA73D' },
{ base: 'b', letters: '\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253' },
{ base: 'c', letters: '\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184' },
{ base: 'd', letters: '\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A' },
{ base: 'dz', letters: '\u01F3\u01C6' },
{
base: 'e',
letters:
'\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD'
},
{ base: 'f', letters: '\u0066\u24D5\uFF46\u1E1F\u0192\uA77C' },
{
base: 'g',
letters: '\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F'
},
{
base: 'h',
letters: '\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265'
},
{ base: 'hv', letters: '\u0195' },
{
base: 'i',
letters:
'\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131'
},
{ base: 'j', letters: '\u006A\u24D9\uFF4A\u0135\u01F0\u0249' },
{ base: 'k', letters: '\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3' },
{
base: 'l',
letters:
'\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747'
},
{ base: 'lj', letters: '\u01C9' },
{ base: 'm', letters: '\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F' },
{
base: 'n',
letters: '\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5'
},
{ base: 'nj', letters: '\u01CC' },
{
base: 'o',
letters:
'\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275'
},
{ base: 'oi', letters: '\u01A3' },
{ base: 'ou', letters: '\u0223' },
{ base: 'oo', letters: '\uA74F' },
{ base: 'p', letters: '\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755' },
{ base: 'q', letters: '\u0071\u24E0\uFF51\u024B\uA757\uA759' },
{
base: 'r',
letters: '\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783'
},
{
base: 's',
letters:
'\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B'
},
{
base: 't',
letters: '\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787'
},
{ base: 'tz', letters: '\uA729' },
{
base: 'u',
letters:
'\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289'
},
{ base: 'v', letters: '\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C' },
{ base: 'vy', letters: '\uA761' },
{ base: 'w', letters: '\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73' },
{ base: 'x', letters: '\u0078\u24E7\uFF58\u1E8B\u1E8D' },
{
base: 'y',
letters: '\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF'
},
{ base: 'z', letters: '\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763' }
];
// "what?" version ... http://jsperf.com/diacritics/12
public static removeDiacriticsAndPunctuation(str) {
public static removeDiacriticsAndPunctuation (str) {
str = GBConversationalService.removeDiacritics(str);
return str.replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g, "");
return str.replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g, '');
}
public static removeDiacritics(str) {
public static removeDiacritics (str) {
var diacriticsMap = {};
for (var i = 0; i < GBConversationalService.defaultDiacriticsRemovalMap.length; i++) {
var letters = GBConversationalService.defaultDiacriticsRemovalMap[i].letters;
@ -195,9 +281,7 @@ export class GBConversationalService {
return str;
}
public getNewMobileCode() {
public getNewMobileCode () {
const passwordGenerator = new PasswordGenerator();
const options = {
upperCaseAlpha: false,
@ -211,15 +295,15 @@ export class GBConversationalService {
return code;
}
public getCurrentLanguage(step: GBDialogStep) {
public getCurrentLanguage (step: GBDialogStep) {
return step.context.activity.locale;
}
public userMobile(step) {
public userMobile (step) {
return GBMinService.userMobile(step);
}
public async sendFile(
public async sendFile (
min: GBMinInstance,
step: GBDialogStep,
mobile: string,
@ -227,7 +311,6 @@ export class GBConversationalService {
caption: string
): Promise<any> {
if (step !== null) {
mobile = this.userMobile(step);
if (mobile) {
@ -247,17 +330,17 @@ export class GBConversationalService {
}
}
public async sendAudio(min: GBMinInstance, step: GBDialogStep, url: string): Promise<any> {
public async sendAudio (min: GBMinInstance, step: GBDialogStep, url: string): Promise<any> {
const mobile = step.context.activity['mobile'];
GBLog.info(`Sending audio to ${mobile} in URL: ${url}.`);
await min.whatsAppDirectLine.sendAudioToDevice(mobile, url);
}
public async sendEvent(min: GBMinInstance, step: GBDialogStep, name: string, value: Object): Promise<any> {
if (!this.userMobile(step) &&
step.context.activity.channelId !== 'msteams') {
GBLog.info(`Sending event ${name}:${typeof value === 'object' ? JSON.stringify(value) :
value ? value : ''} to client...`);
public async sendEvent (min: GBMinInstance, step: GBDialogStep, name: string, value: Object): Promise<any> {
if (!this.userMobile(step) && step.context.activity.channelId !== 'msteams') {
GBLog.info(
`Sending event ${name}:${typeof value === 'object' ? JSON.stringify(value) : value ? value : ''} to client...`
);
const msg = MessageFactory.text('');
msg.value = value;
msg.type = 'event';
@ -268,7 +351,7 @@ export class GBConversationalService {
}
// tslint:disable:no-unsafe-any due to Nexmo.
public async sendSms(min: GBMinInstance, mobile: string, text: string): Promise<any> {
public async sendSms (min: GBMinInstance, mobile: string, text: string): Promise<any> {
GBLog.info(`Sending SMS to ${mobile} with text: '${text}'.`);
if (!min.instance.smsKey && min.instance.smsSecret) {
@ -276,16 +359,16 @@ export class GBConversationalService {
method: 'POST',
url: 'http://sms-api.megaconecta.com.br/mt',
headers: {
"content-type": "application/json",
"authorization": `Bearer ${min.instance.smsSecret}`
'content-type': 'application/json',
authorization: `Bearer ${min.instance.smsSecret}`
},
body: [
{
"numero": `${mobile}`,
"servico": "short",
"mensagem": text,
"parceiro_id": "",
"codificacao": "0"
numero: `${mobile}`,
servico: 'short',
mensagem: text,
parceiro_id: '',
codificacao: '0'
}
],
json: true
@ -300,39 +383,38 @@ export class GBConversationalService {
return Promise.reject(new Error(msg));
}
}
else {
return new Promise((resolve: any, reject: any): any => {
const nexmo = new Nexmo({
apiKey: min.instance.smsKey,
apiSecret: min.instance.smsSecret
});
// tslint:disable-next-line:no-unsafe-any
nexmo.message.sendSms(min.instance.smsServiceNumber, mobile, text,{}, (err, data) => {
const message = data.messages ? data.messages[0] : {};
if (err || message['error-text']) {
GBLog.error(`BASIC: error sending SMS to ${mobile}: ${message['error-text']}`);
reject(message['error-text']);
} else {
resolve(data);
}
}, );
});
} else {
return new Promise(
(resolve: any, reject: any): any => {
const nexmo = new Nexmo({
apiKey: min.instance.smsKey,
apiSecret: min.instance.smsSecret
});
// tslint:disable-next-line:no-unsafe-any
nexmo.message.sendSms(min.instance.smsServiceNumber, mobile, text, {}, (err, data) => {
const message = data.messages ? data.messages[0] : {};
if (err || message['error-text']) {
GBLog.error(`BASIC: error sending SMS to ${mobile}: ${message['error-text']}`);
reject(message['error-text']);
} else {
resolve(data);
}
});
}
);
}
}
public async sendToMobile(min: GBMinInstance, mobile: string, message: string, conversationId) {
public async sendToMobile (min: GBMinInstance, mobile: string, message: string, conversationId) {
GBLog.info(`Sending message ${message} to ${mobile}...`);
await min.whatsAppDirectLine.sendToDevice(mobile, message, conversationId);
}
public static async getAudioBufferFromText(text): Promise<string> {
public static async getAudioBufferFromText (text): Promise<string> {
return new Promise<string>(async (resolve, reject) => {
const name = GBAdminService.getRndReadableIdentifier();
try {
const textToSpeech = new TextToSpeechV1({
authenticator: new IamAuthenticator({ apikey: process.env.WATSON_TTS_KEY }),
url: process.env.WATSON_TTS_URL
@ -358,22 +440,23 @@ export class GBConversationalService {
const transcoder = new prism.FFmpeg({
args: ['-analyzeduration', '0', '-loglevel', '0', '-f', 'opus', '-ar', '16000', '-ac', '1']
});
Fs.createReadStream(waveFilename).pipe(transcoder).pipe(output);
Fs.createReadStream(waveFilename)
.pipe(transcoder)
.pipe(output);
let url = urlJoin(GBServer.globals.publicAddress, 'audios', oggFilenameOnly);
resolve(url);
} catch (error) {
reject(error);
}
});
}
public static async getTextFromAudioBuffer(speechKey, cloudRegion, buffer, locale): Promise<string> {
public static async getTextFromAudioBuffer (speechKey, cloudRegion, buffer, locale): Promise<string> {
return new Promise<string>(async (resolve, reject) => {
try {
const oggFile = new Readable();
oggFile._read = () => { }; // _read is required but you can noop it
oggFile._read = () => {}; // _read is required but you can noop it
oggFile.push(buffer);
oggFile.push(null);
@ -437,13 +520,7 @@ export class GBConversationalService {
});
}
public async playMarkdown(
min: GBMinInstance,
answer: string,
channel: string,
step: GBDialogStep,
mobile: string
) {
public async playMarkdown (min: GBMinInstance, answer: string, channel: string, step: GBDialogStep, mobile: string) {
const user = step ? await min.userProfile.get(step.context, {}) : null;
let text = answer;
@ -465,9 +542,16 @@ export class GBConversationalService {
var videos = ['webm', 'mp4', 'mov'];
var filetype = href.split('.').pop();
if (videos.indexOf(filetype) > -1) {
var out = '<video autoplay loop alt="' + text + '">'
+ ' <source src="' + href + '" type="video/' + filetype + '">'
+ '</video>'
var out =
'<video autoplay loop alt="' +
text +
'">' +
' <source src="' +
href +
'" type="video/' +
filetype +
'">' +
'</video>';
return out;
} else {
return renderer.oldImage(href, title, text);
@ -492,8 +576,7 @@ export class GBConversationalService {
text = text.replace('! [', '![').replace('] (', '](');
text = text.replace(`[[embed url=`, process.env.BOT_URL + '/').replace(']]', ''); // TODO: Improve it.
text = text.replace(`](kb`, "](" + process.env.BOT_URL + '/kb'); // TODO: Improve it.
text = text.replace(`](kb`, '](' + process.env.BOT_URL + '/kb'); // TODO: Improve it.
if (mobile) {
await this.sendMarkdownToMobile(min, step, mobile, text);
@ -506,12 +589,7 @@ export class GBConversationalService {
}
}
private async sendMarkdownToWeb(
min,
step: GBDialogStep,
html: string,
answer: string
) {
private async sendMarkdownToWeb (min, step: GBDialogStep, html: string, answer: string) {
const locale = step.context.activity.locale;
html = html.replace(/src\=\"kb\//gi, `src=\"../kb/`);
@ -521,15 +599,14 @@ export class GBConversationalService {
content: html,
answer: answer,
prevId: 0, // TODO: answer.prevId,
nextId: 0, // TODO: answer.nextId
nextId: 0 // TODO: answer.nextId
}
});
}
// tslint:enable:no-unsafe-any
public async sendMarkdownToMobile(min: GBMinInstance, step: GBDialogStep, mobile: string, text: string) {
public async sendMarkdownToMobile (min: GBMinInstance, step: GBDialogStep, mobile: string, text: string) {
let sleep = ms => {
return new Promise(resolve => {
setTimeout(resolve, ms);
@ -699,21 +776,20 @@ export class GBConversationalService {
}
}
// TODO: Update botlib.
public async routeNLP(step: GBDialogStep, min: GBMinInstance, text: string): Promise<boolean> {
public async routeNLP (step: GBDialogStep, min: GBMinInstance, text: string): Promise<boolean> {
return false;
}
public async routeNLP2(step: GBDialogStep, min: GBMinInstance, text: string) {
public async routeNLP2 (step: GBDialogStep, min: GBMinInstance, text: string) {
if (min.instance.nlpAppId === null || min.instance.nlpAppId === undefined) {
return false;
}
text = text.toLowerCase();
text = text.replace('who´s', 'who is');
text = text.replace('who\'s', 'who is');
text = text.replace("who's", 'who is');
text = text.replace('what´s', 'what is');
text = text.replace('what\'s', 'what is');
text = text.replace("what's", 'what is');
text = text.replace('?', ' ');
text = text.replace('¿', ' ');
text = text.replace('!', ' ');
@ -732,10 +808,14 @@ export class GBConversationalService {
try {
const saved = step.context.activity.text;
step.context.activity.text = text;
nlp = await model.recognize(step.context, {}, {}, { IncludeAllIntents: false, IncludeInstanceData: false, includeAPIResults: true });
nlp = await model.recognize(
step.context,
{},
{},
{ IncludeAllIntents: false, IncludeInstanceData: false, includeAPIResults: true }
);
step.context.activity.text = saved;
} catch (error) {
// tslint:disable:no-unsafe-any
if (error.statusCode === 404 || error.statusCode === 400) {
GBLog.warn('NLP application still not publish and there are no other options for answering.');
@ -753,8 +833,11 @@ export class GBConversationalService {
const minBoot = GBServer.globals.minBoot as any;
let nlpActive = false;
let score = 0;
const instanceScore = min.core.getParam(min.instance, 'NLP Score',
min.instance.nlpScore ? min.instance.nlpScore : minBoot.instance.nlpScore);
const instanceScore = min.core.getParam(
min.instance,
'NLP Score',
min.instance.nlpScore ? min.instance.nlpScore : minBoot.instance.nlpScore
);
Object.keys(nlp.intents).forEach(name => {
score = nlp.intents[name].score;
@ -773,7 +856,9 @@ export class GBConversationalService {
}
GBLog.info(
`NLP called: ${intent}, entities: ${nlp.entities.length}, score: ${score} > required (nlpScore): ${instanceScore}`
`NLP called: ${intent}, entities: ${
nlp.entities.length
}, score: ${score} > required (nlpScore): ${instanceScore}`
);
step.activeDialog.state.options.entities = nlp.entities;
@ -782,7 +867,7 @@ export class GBConversationalService {
if (nlp.entities) {
await CollectionUtil.asyncForEach(Object.keys(nlp.entities), async key => {
if (key !== "$instance") {
if (key !== '$instance') {
let entity = nlp.entities[key];
if (Array.isArray(entity[0])) {
nlp.entities[key] = entity.slice(1);
@ -794,14 +879,12 @@ export class GBConversationalService {
return await step.replaceDialog(`/${intent}`, step.activeDialog.state.options);
}
GBLog.info(
`NLP NOT called: score: ${score} > required (nlpScore): ${instanceScore}`
);
GBLog.info(`NLP NOT called: score: ${score} > required (nlpScore): ${instanceScore}`);
return null;
}
public async getLanguage(min: GBMinInstance, text: string): Promise<string> {
public async getLanguage (min: GBMinInstance, text: string): Promise<string> {
const key = min.core.getParam<string>(min.instance, 'textAnalyticsKey', null);
if (!key) {
return process.env.DEFAULT_USER_LANGUAGE;
@ -815,9 +898,8 @@ export class GBConversationalService {
return language === '(Unknown)' ? 'en' : language;
}
public async spellCheck(min: GBMinInstance, text: string): Promise<string> {
const key =
min.core.getParam<string>(min.instance, 'spellcheckerKey', null);
public async spellCheck (min: GBMinInstance, text: string): Promise<string> {
const key = min.core.getParam<string>(min.instance, 'spellcheckerKey', null);
if (key) {
text = text.charAt(0).toUpperCase() + text.slice(1);
@ -831,7 +913,7 @@ export class GBConversationalService {
return text;
}
public async translate(min: GBMinInstance, text: string, language: string): Promise<string> {
public async translate (min: GBMinInstance, text: string, language: string): Promise<string> {
const translatorEnabled = () => {
if (min.instance.params) {
const params = JSON.parse(min.instance.params);
@ -842,7 +924,11 @@ export class GBConversationalService {
const endPoint = min.core.getParam<string>(min.instance, 'translatorEndpoint', null);
const key = min.core.getParam<string>(min.instance, 'translatorKey', null);
if ((endPoint === null && !min.instance.googleProjectId) || !translatorEnabled() || process.env.TRANSLATOR_DISABLED === 'true') {
if (
(endPoint === null && !min.instance.googleProjectId) ||
!translatorEnabled() ||
process.env.TRANSLATOR_DISABLED === 'true'
) {
return text;
}
@ -859,11 +945,13 @@ export class GBConversationalService {
const translate = new Translate.v2.Translate({
projectId: min.instance.googleProjectId,
credentials: { client_email: min.instance.googleClientEmail, private_key: min.instance.googlePrivateKey.replace(/\\n/gm, '\n') }
credentials: {
client_email: min.instance.googleClientEmail,
private_key: min.instance.googlePrivateKey.replace(/\\n/gm, '\n')
}
});
try {
const [translation] = await translate.translate(text, language);
return translation;
@ -872,10 +960,7 @@ export class GBConversationalService {
return Promise.reject(new Error(msg));
}
}
else {
} else {
let options = {
method: 'POST',
baseUrl: endPoint,
@ -899,7 +984,6 @@ export class GBConversationalService {
};
try {
const results = await request(options);
return results[0].translations[0].text;
@ -911,11 +995,11 @@ export class GBConversationalService {
}
}
public async prompt(min: GBMinInstance, step: GBDialogStep, text: string) {
public async prompt (min: GBMinInstance, step: GBDialogStep, text: string) {
const user = await min.userProfile.get(step.context, {});
const systemUser = user.systemUser;
if (text && text !== "") {
if (text && text !== '') {
text = await min.conversationalService.translate(
min,
text,
@ -925,21 +1009,18 @@ export class GBConversationalService {
);
GBLog.verbose(`Translated text(prompt): ${text}.`);
}
if (step.activeDialog.state.options['kind'] === "file") {
if (step.activeDialog.state.options['kind'] === 'file') {
return await step.prompt('attachmentPrompt', {});
}
else {
} else {
return await step.prompt('textPrompt', text ? text : {});
}
}
public async sendText(min: GBMinInstance, step, text) {
public async sendText (min: GBMinInstance, step, text) {
await this['sendTextWithOptions'](min, step, text, true, null);
}
public async sendTextWithOptions(min: GBMinInstance, step, text, translate, keepTextList) {
public async sendTextWithOptions (min: GBMinInstance, step, text, translate, keepTextList) {
const member = step.context.activity.from;
const user = await min.userProfile.get(step.context, {});
const systemUser = user.systemUser;
@ -966,9 +1047,7 @@ export class GBConversationalService {
text = await min.conversationalService.translate(
min,
text,
locale
? locale
: min.core.getParam<string>(min.instance, 'Locale', GBConfigService.get('LOCALE'))
locale ? locale : min.core.getParam<string>(min.instance, 'Locale', GBConfigService.get('LOCALE'))
);
if (keepTextList) {
@ -989,18 +1068,15 @@ export class GBConversationalService {
analytics.createMessage(min.instance.instanceId, user.conversation, null, text);
if (!isNaN(member.id) && !member.id.startsWith('1000')) {
const to = step.context.activity.group? step.context.activity.group : member.id;
const to = step.context.activity.group ? step.context.activity.group : member.id;
await min.whatsAppDirectLine.sendToDevice(to, text, step.context.activity.conversation.id);
} else {
await step.context.sendActivity(text);
}
}
public async broadcast(min: GBMinInstance, message: string) {
public async broadcast (min: GBMinInstance, message: string) {
GBLog.info(`Sending broadcast notifications...`);
let sleep = ms => {
@ -1021,60 +1097,51 @@ export class GBConversationalService {
}
/**
*
*
* Sends a message in a user with an already started conversation (got ConversationReference set)
*/
public async sendOnConversation(min: GBMinInstance, user: GuaribasUser, message: string) {
public async sendOnConversation (min: GBMinInstance, user: GuaribasUser, message: string) {
if (user.conversationReference.startsWith('spaces')) {
await min['googleDirectLine'].sendToDevice(user.userSystemId, null, user.conversationReference, message);
}
else {
} else {
const ref = JSON.parse(user.conversationReference);
MicrosoftAppCredentials.trustServiceUrl(ref.serviceUrl);
try {
await min.bot['continueConversation'](ref, async (t1) => {
await min.bot['continueConversation'](ref, async t1 => {
const ref2 = TurnContext.getConversationReference(t1.activity);
await min.bot.continueConversation(ref2, async (t2) => {
await min.bot.continueConversation(ref2, async t2 => {
await t2.sendActivity(message);
});
});
} catch (error) {
console.log(error) ;
console.log(error);
}
}
}
public static kmpSearch(pattern, text) {
public static kmpSearch (pattern, text) {
pattern = pattern.toLowerCase();
text = text.toLowerCase();
if (pattern.length == 0)
return 0; // Immediate match
if (pattern.length == 0) return 0; // Immediate match
// Compute longest suffix-prefix table
var lsp = [0]; // Base case
for (var i = 1; i < pattern.length; i++) {
var j = lsp[i - 1]; // Start by assuming we're extending the previous LSP
while (j > 0 && pattern.charAt(i) != pattern.charAt(j))
j = lsp[j - 1];
if (pattern.charAt(i) == pattern.charAt(j))
j++;
while (j > 0 && pattern.charAt(i) != pattern.charAt(j)) j = lsp[j - 1];
if (pattern.charAt(i) == pattern.charAt(j)) j++;
lsp.push(j);
}
// Walk through text string
var j = 0; // Number of chars matched in pattern
for (var i = 0; i < text.length; i++) {
while (j > 0 && text.charAt(i) != pattern.charAt(j))
j = lsp[j - 1]; // Fall back in the pattern
while (j > 0 && text.charAt(i) != pattern.charAt(j)) j = lsp[j - 1]; // Fall back in the pattern
if (text.charAt(i) == pattern.charAt(j)) {
j++; // Next char matched, increment position
if (j == pattern.length)
return i - (j - 1);
if (j == pattern.length) return i - (j - 1);
}
}
return -1; // Not found
}
}

141
packages/core.gbapp/services/GBCoreService.ts
View file

@ -100,18 +100,18 @@ export class GBCoreService implements IGBCoreService {
private dialect: string;
/**
*
*
*/
constructor() {
constructor () {
this.adminService = new GBAdminService(this);
}
public async ensureInstances(instances: IGBInstance[], bootInstance: any, core: IGBCoreService) { }
public async ensureInstances (instances: IGBInstance[], bootInstance: any, core: IGBCoreService) {}
/**
* Gets database config and connect to storage. Currently two databases
* are available: SQL Server and SQLite.
*/
public async initStorage(): Promise<any> {
public async initStorage (): Promise<any> {
this.dialect = GBConfigService.get('STORAGE_DIALECT');
let host: string | undefined;
@ -134,8 +134,8 @@ export class GBCoreService implements IGBCoreService {
const logging: boolean | Function =
GBConfigService.get('STORAGE_LOGGING') === 'true'
? (str: string): void => {
GBLog.info(str);
}
GBLog.info(str);
}
: false;
const encrypt: boolean = GBConfigService.get('STORAGE_ENCRYPT') === 'true';
@ -177,7 +177,7 @@ export class GBCoreService implements IGBCoreService {
* Checks wheather storage is acessible or not and opens firewall
* in case of any connection block.
*/
public async checkStorage(installationDeployer: IGBInstallationDeployer) {
public async checkStorage (installationDeployer: IGBInstallationDeployer) {
try {
await this.sequelize.authenticate();
} catch (error) {
@ -192,11 +192,10 @@ export class GBCoreService implements IGBCoreService {
}
}
/**
* Syncronizes structure between model and tables in storage.
*/
public async syncDatabaseStructure() {
/**
* Syncronizes structure between model and tables in storage.
*/
public async syncDatabaseStructure () {
if (GBConfigService.get('STORAGE_SYNC') === 'true') {
const alter = GBConfigService.get('STORAGE_SYNC_ALTER') === 'true';
GBLog.info('Syncing database...');
@ -214,7 +213,7 @@ export class GBCoreService implements IGBCoreService {
/**
* Loads all items to start several listeners.
*/
public async loadInstances(): Promise<IGBInstance[]> {
public async loadInstances (): Promise<IGBInstance[]> {
if (process.env.LOAD_ONLY !== undefined) {
const bots = process.env.LOAD_ONLY.split(`;`);
const and = [];
@ -237,7 +236,7 @@ export class GBCoreService implements IGBCoreService {
/**
* Loads just one Bot instance by its internal Id.
*/
public async loadInstanceById(instanceId: number): Promise<IGBInstance> {
public async loadInstanceById (instanceId: number): Promise<IGBInstance> {
const options = { where: { instanceId: instanceId, state: 'active' } };
return await GuaribasInstance.findOne(options);
@ -245,7 +244,7 @@ export class GBCoreService implements IGBCoreService {
/**
* Loads just one Bot instance.
*/
public async loadInstanceByActivationCode(code: string): Promise<IGBInstance> {
public async loadInstanceByActivationCode (code: string): Promise<IGBInstance> {
let options = { where: { activationCode: code, state: 'active' } };
return await GuaribasInstance.findOne(options);
@ -253,7 +252,7 @@ export class GBCoreService implements IGBCoreService {
/**
* Loads just one Bot instance.
*/
public async loadInstanceByBotId(botId: string): Promise<IGBInstance> {
public async loadInstanceByBotId (botId: string): Promise<IGBInstance> {
const options = { where: {} };
options.where = { botId: botId, state: 'active' };
@ -261,11 +260,11 @@ export class GBCoreService implements IGBCoreService {
}
/**
* Writes .env required to start the full server. Used during
* first startup, when user is asked some questions to create the
* Writes .env required to start the full server. Used during
* first startup, when user is asked some questions to create the
* full base environment.
*/
public async writeEnv(instance: IGBInstance) {
public async writeEnv (instance: IGBInstance) {
const env = `
ADDITIONAL_DEPLOY_PATH=
ADMIN_PASS=${instance.adminPass}
@ -290,17 +289,15 @@ ENDPOINT_UPDATE=true
Fs.writeFileSync('.env', env);
}
/**
/**
* Certifies that network servers will reach back the development machine
* when calling back from web services. This ensures that reverse proxy is
* established.
*/
public async ensureProxy(port): Promise<string> {
public async ensureProxy (port): Promise<string> {
try {
if (Fs.existsSync('node_modules/ngrok/bin/ngrok.exe') || Fs.existsSync('node_modules/ngrok/bin/ngrok')) {
return await ngrok.connect({ port: port});
return await ngrok.connect({ port: port });
} else {
GBLog.warn('ngrok executable not found (only tested on Windows). Check installation or node_modules folder.');
@ -318,7 +315,7 @@ ENDPOINT_UPDATE=true
* Setup generic web hooks so .gbapps can expose application logic
* and get called on demand.
*/
public installWebHook(isGet: boolean, url: string, callback: any) {
public installWebHook (isGet: boolean, url: string, callback: any) {
if (isGet) {
GBServer.globals.server.get(url, (req, res) => {
callback(req, res);
@ -331,10 +328,10 @@ ENDPOINT_UPDATE=true
}
/**
* Defines the entry point dialog to be called whenever a user
* Defines the entry point dialog to be called whenever a user
* starts talking to the bot.
*/
public setEntryPointDialog(dialogName: string) {
public setEntryPointDialog (dialogName: string) {
GBServer.globals.entryPointDialog = dialogName;
}
@ -342,14 +339,14 @@ ENDPOINT_UPDATE=true
* Replaces the default web application root path used to start the GB
* with a custom home page.
*/
public setWWWRoot(localPath: string) {
public setWWWRoot (localPath: string) {
GBServer.globals.wwwroot = localPath;
}
/**
* Removes a bot instance from storage.
*/
public async deleteInstance(botId: string) {
public async deleteInstance (botId: string) {
const options = { where: {} };
options.where = { botId: botId };
await GuaribasInstance.destroy(options);
@ -359,7 +356,7 @@ ENDPOINT_UPDATE=true
* Saves a bot instance object to the storage handling
* multi-column JSON based store 'params' field.
*/
public async saveInstance(fullInstance: any) {
public async saveInstance (fullInstance: any) {
const options = { where: {} };
options.where = { botId: fullInstance.botId };
let instance = await GuaribasInstance.findOne(options);
@ -380,7 +377,7 @@ ENDPOINT_UPDATE=true
/**
* Loads all bot instances from object storage, if it's formatted.
*/
public async loadAllInstances(
public async loadAllInstances (
core: IGBCoreService,
installationDeployer: IGBInstallationDeployer,
proxyAddress: string
@ -432,9 +429,9 @@ ENDPOINT_UPDATE=true
}
/**
* Loads all system packages from 'packages' folder.
* Loads all system packages from 'packages' folder.
*/
public async loadSysPackages(core: GBCoreService): Promise<IGBPackage[]> {
public async loadSysPackages (core: GBCoreService): Promise<IGBPackage[]> {
// NOTE: if there is any code before this line a semicolon
// will be necessary before this line.
// Loads all system packages.
@ -469,10 +466,10 @@ ENDPOINT_UPDATE=true
}
/**
* Verifies that an complex global password has been specified
* Verifies that an complex global password has been specified
* before starting the server.
*/
public ensureAdminIsSecured() {
public ensureAdminIsSecured () {
const password = GBConfigService.get('ADMIN_PASS');
if (!GBAdminService.StrongRegex.test(password)) {
throw new Error(
@ -484,10 +481,10 @@ ENDPOINT_UPDATE=true
/**
* Creates the first bot instance (boot instance) used to "boot" the server.
* At least one bot is required to perform conversational administrative tasks.
* So a base main bot is always deployed and will act as root bot for
* configuration tree with three levels: .env > root bot > all other bots.
* So a base main bot is always deployed and will act as root bot for
* configuration tree with three levels: .env > root bot > all other bots.
*/
public async createBootInstance(
public async createBootInstance (
core: GBCoreService,
installationDeployer: IGBInstallationDeployer,
proxyAddress: string
@ -504,7 +501,7 @@ ENDPOINT_UPDATE=true
);
await this.writeEnv(changedInstance);
GBConfigService.init();
GBLog.info(`File .env written. Preparing storage and search for the first time...`);
await this.openStorageFrontier(installationDeployer);
await this.initStorage();
@ -522,7 +519,7 @@ ENDPOINT_UPDATE=true
/**
* Helper to get the web browser onpened in UI interfaces.
*/
public openBrowserInDevelopment() {
public openBrowserInDevelopment () {
if (process.env.NODE_ENV === 'development') {
open('http://localhost:4242');
}
@ -543,29 +540,35 @@ ENDPOINT_UPDATE=true
* // ' FOREIGN KEY ([groupId1], [groupId2]) REFERENCES [Group] ([groupId1], [groupId1]) ON DELETE NO ACTION,' +
* // ' FOREIGN KEY ([instanceId]) REFERENCES [Instance] ([instanceId]) ON DELETE NO ACTION)'
*/
private createTableQueryOverride(tableName, attributes, options): string {
private createTableQueryOverride (tableName, attributes, options): string {
let sql: string = this.createTableQuery.apply(this.queryGenerator, [tableName, attributes, options]);
const re1 = /CREATE\s+TABLE\s+\[([^\]]*)\]/;
const matches = re1.exec(sql);
if (matches !== null) {
const table = matches[1];
const re2 = /PRIMARY\s+KEY\s+\(\[[^\]]*\](?:,\s*\[[^\]]*\])*\)/;
sql = sql.replace(re2, (match: string, ...args: any[]): string => {
return `CONSTRAINT [${table}_pk] ${match}`;
});
sql = sql.replace(
re2,
(match: string, ...args: any[]): string => {
return `CONSTRAINT [${table}_pk] ${match}`;
}
);
const re3 = /FOREIGN\s+KEY\s+\((\[[^\]]*\](?:,\s*\[[^\]]*\])*)\)/g;
const re4 = /\[([^\]]*)\]/g;
sql = sql.replace(re3, (match: string, ...args: any[]): string => {
const fkcols = args[0];
let fkname = table;
let matches2 = re4.exec(fkcols);
while (matches2 !== null) {
fkname += `_${matches2[1]}`;
matches2 = re4.exec(fkcols);
}
sql = sql.replace(
re3,
(match: string, ...args: any[]): string => {
const fkcols = args[0];
let fkname = table;
let matches2 = re4.exec(fkcols);
while (matches2 !== null) {
fkname += `_${matches2[1]}`;
matches2 = re4.exec(fkcols);
}
return `CONSTRAINT [${fkname}_fk] FOREIGN KEY (${fkcols})`;
});
return `CONSTRAINT [${fkname}_fk] FOREIGN KEY (${fkcols})`;
}
);
}
return sql;
@ -579,7 +582,7 @@ ENDPOINT_UPDATE=true
* ' CONSTRAINT [invalid2] FOREIGN KEY ([groupId1], [groupId2]) REFERENCES [Group] ([groupId1], [groupId2]) ON DELETE NO ACTION, ' +
* ' CONSTRAINT [invalid3] FOREIGN KEY ([instanceId1]) REFERENCES [Instance] ([instanceId1]) ON DELETE NO ACTION'
*/
private changeColumnQueryOverride(tableName, attributes): string {
private changeColumnQueryOverride (tableName, attributes): string {
let sql: string = this.changeColumnQuery.apply(this.queryGenerator, [tableName, attributes]);
const re1 = /ALTER\s+TABLE\s+\[([^\]]*)\]/;
const matches = re1.exec(sql);
@ -587,17 +590,20 @@ ENDPOINT_UPDATE=true
const table = matches[1];
const re2 = /(ADD\s+)?CONSTRAINT\s+\[([^\]]*)\]\s+FOREIGN\s+KEY\s+\((\[[^\]]*\](?:,\s*\[[^\]]*\])*)\)/g;
const re3 = /\[([^\]]*)\]/g;
sql = sql.replace(re2, (match: string, ...args: any[]): string => {
const fkcols = args[2];
let fkname = table;
let matches2 = re3.exec(fkcols);
while (matches2 !== null) {
fkname += `_${matches2[1]}`;
matches2 = re3.exec(fkcols);
}
sql = sql.replace(
re2,
(match: string, ...args: any[]): string => {
const fkcols = args[2];
let fkname = table;
let matches2 = re3.exec(fkcols);
while (matches2 !== null) {
fkname += `_${matches2[1]}`;
matches2 = re3.exec(fkcols);
}
return `${args[0] ? args[0] : ''}CONSTRAINT [${fkname}_fk] FOREIGN KEY (${fkcols})`;
});
return `${args[0] ? args[0] : ''}CONSTRAINT [${fkname}_fk] FOREIGN KEY (${fkcols})`;
}
);
}
return sql;
@ -606,7 +612,7 @@ ENDPOINT_UPDATE=true
/**
* Opens storage firewall used by the server when starting to get root bot instance.
*/
private async openStorageFrontier(installationDeployer: IGBInstallationDeployer) {
private async openStorageFrontier (installationDeployer: IGBInstallationDeployer) {
const group = GBConfigService.get('CLOUD_GROUP');
const serverName = GBConfigService.get('STORAGE_SERVER').split('.database.windows.net')[0];
await installationDeployer.openStorageFirewall(group, serverName);
@ -619,7 +625,7 @@ ENDPOINT_UPDATE=true
* @param name Name of param to get from instance.
* @param defaultValue Value returned when no param is defined in Config.xlsx.
*/
public getParam<T>(instance: IGBInstance, name: string, defaultValue?: T): any {
public getParam<T> (instance: IGBInstance, name: string, defaultValue?: T): any {
let value = null;
if (instance.params) {
const params = JSON.parse(instance.params);
@ -647,5 +653,4 @@ ENDPOINT_UPDATE=true
return value;
}
}

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

@ -41,7 +41,7 @@ import express from 'express';
import child_process from 'child_process';
import rimraf from 'rimraf';
import request from 'request-promise-native';
import vhost from 'vhost'
import vhost from 'vhost';
import urlJoin from 'url-join';
import Fs from 'fs';
import { GBError, GBLog, GBMinInstance, IGBCoreService, IGBDeployer, IGBInstance, IGBPackage } from 'botlib';
@ -58,12 +58,10 @@ import { GBImporter } from './GBImporterService.js';
import { TeamsService } from '../../teams.gblib/services/TeamsService.js';
import MicrosoftGraph from '@microsoft/microsoft-graph-client';
/**
* Deployer service for bots, themes, ai and more.
*/
export class GBDeployer implements IGBDeployer {
/**
* Where should deployer look into for general packages.
*/
@ -87,7 +85,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Deployer needs core and importer to be created.
*/
constructor(core: IGBCoreService, importer: GBImporter) {
constructor (core: IGBCoreService, importer: GBImporter) {
this.core = core;
this.importer = importer;
}
@ -96,14 +94,16 @@ export class GBDeployer implements IGBDeployer {
* Builds a connection string text to be used in direct
* use to database like the Indexer (Azure Search).
*/
public static getConnectionStringFromInstance(instance: IGBInstance) {
return `Server=tcp:${instance.storageServer},1433;Database=${instance.storageName};User ID=${instance.storageUsername};Password=${instance.storagePassword};Trusted_Connection=False;Encrypt=True;Connection Timeout=30;`;
public static getConnectionStringFromInstance (instance: IGBInstance) {
return `Server=tcp:${instance.storageServer},1433;Database=${instance.storageName};User ID=${
instance.storageUsername
};Password=${instance.storagePassword};Trusted_Connection=False;Encrypt=True;Connection Timeout=30;`;
}
/**
* Retrives token and initialize drive client API.
*/
public static async internalGetDriveClient(min: GBMinInstance) {
public static async internalGetDriveClient (min: GBMinInstance) {
let token = await min.adminService.acquireElevatedToken(min.instance.instanceId);
let siteId = process.env.STORAGE_SITE_ID;
let libraryId = process.env.STORAGE_LIBRARY;
@ -114,14 +114,13 @@ export class GBDeployer implements IGBDeployer {
}
});
const baseUrl = `https://graph.microsoft.com/v1.0/sites/${siteId}/lists/${libraryId}`;
return {baseUrl, client};
return { baseUrl, client };
}
/**
* Performs package deployment in all .gbai or default.
*/
public async deployPackages(core: IGBCoreService, server: any, appPackages: IGBPackage[]) {
public async deployPackages (core: IGBCoreService, server: any, appPackages: IGBPackage[]) {
// Builds lists of paths to search for packages.
let paths = [urlJoin(process.env.PWD, GBDeployer.deployFolder), urlJoin(process.env.PWD, GBDeployer.workFolder)];
@ -133,8 +132,7 @@ export class GBDeployer implements IGBDeployer {
const gbappPackages: string[] = [];
const generalPackages: string[] = [];
async function scanPackageDirectory(path) {
async function scanPackageDirectory (path) {
// Gets all directories.
const isDirectory = source => Fs.lstatSync(source).isDirectory();
@ -144,7 +142,6 @@ export class GBDeployer implements IGBDeployer {
.filter(isDirectory);
const dirs = getDirectories(path);
await CollectionUtil.asyncForEach(dirs, async element => {
// For each folder, checks its extensions looking for valid packages.
if (element === '.') {
@ -154,8 +151,9 @@ export class GBDeployer implements IGBDeployer {
// Skips what does not need to be loaded.
if (process.env.GBAPP_SKIP && (process.env.GBAPP_SKIP.toLowerCase().indexOf(name) !== -1
|| process.env.GBAPP_SKIP === 'true')
if (
process.env.GBAPP_SKIP &&
(process.env.GBAPP_SKIP.toLowerCase().indexOf(name) !== -1 || process.env.GBAPP_SKIP === 'true')
) {
return;
}
@ -203,8 +201,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Deploys a new blank bot to the database, cognitive services and other services.
*/
public async deployBlankBot(botId: string, mobile: string, email: string) {
public async deployBlankBot (botId: string, mobile: string, email: string) {
// Creates a new row on the GuaribasInstance table.
const instance = await this.importer.createBotInstance(botId);
@ -246,7 +243,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Verifies if bot exists on bot catalog.
*/
public async botExists(botId: string): Promise<boolean> {
public async botExists (botId: string): Promise<boolean> {
const service = new AzureDeployerService(this);
return await service.botExists(botId);
@ -255,8 +252,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Performs all tasks of deploying a new bot on the cloud.
*/
public async deployBotFull(instance: IGBInstance, publicAddress: string): Promise<IGBInstance> {
public async deployBotFull (instance: IGBInstance, publicAddress: string): Promise<IGBInstance> {
// Reads base configuration from environent file.
const service = new AzureDeployerService(this);
@ -326,20 +322,23 @@ export class GBDeployer implements IGBDeployer {
/**
* Performs the NLP publishing process on remote service.
*/
public async publishNLP(instance: IGBInstance): Promise<void> {
public async publishNLP (instance: IGBInstance): Promise<void> {
const service = new AzureDeployerService(this);
const res = await service.publishNLP(instance.cloudLocation, instance.nlpAppId,
instance.nlpAuthoringKey);
if (res.status !== 200 && res.status !== 201) { throw res.bodyAsText; }
const res = await service.publishNLP(instance.cloudLocation, instance.nlpAppId, instance.nlpAuthoringKey);
if (res.status !== 200 && res.status !== 201) {
throw res.bodyAsText;
}
}
/**
* Trains NLP on the remote service.
*/
public async trainNLP(instance: IGBInstance): Promise<void> {
public async trainNLP (instance: IGBInstance): Promise<void> {
const service = new AzureDeployerService(this);
const res = await service.trainNLP(instance.cloudLocation, instance.nlpAppId, instance.nlpAuthoringKey);
if (res.status !== 200 && res.status !== 202) { throw res.bodyAsText; }
if (res.status !== 200 && res.status !== 202) {
throw res.bodyAsText;
}
const sleep = ms => {
return new Promise(resolve => {
setTimeout(resolve, ms);
@ -351,10 +350,16 @@ export class GBDeployer implements IGBDeployer {
/**
* Return a zip file for importing bot in apps, currently MS Teams.
*/
public async getBotManifest(instance: IGBInstance): Promise<Buffer> {
public async getBotManifest (instance: IGBInstance): Promise<Buffer> {
const s = new TeamsService();
const manifest = await s.getManifest(instance.marketplaceId, instance.title, instance.description,
GBAdminService.generateUuid(), instance.botId, "General Bots");
const manifest = await s.getManifest(
instance.marketplaceId,
instance.title,
instance.description,
GBAdminService.generateUuid(),
instance.botId,
'General Bots'
);
return await s.getAppFile(manifest);
}
@ -362,7 +367,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Refreshes NLP entities on the remote service.
*/
public async refreshNLPEntity(instance: IGBInstance, listName, listData): Promise<void> {
public async refreshNLPEntity (instance: IGBInstance, listName, listData): Promise<void> {
const service = new AzureDeployerService(this);
const res = await service.refreshEntityList(
instance.cloudLocation,
@ -371,13 +376,15 @@ export class GBDeployer implements IGBDeployer {
instance.nlpAuthoringKey,
listData
);
if (res.status !== 200) { throw res.bodyAsText; }
if (res.status !== 200) {
throw res.bodyAsText;
}
}
/**
* Deploys a bot to the storage from a .gbot folder.
*/
public async deployBotFromLocalPath(localPath: string, publicAddress: string): Promise<void> {
public async deployBotFromLocalPath (localPath: string, publicAddress: string): Promise<void> {
const packageName = Path.basename(localPath);
const instance = await this.importer.importIfNotExistsBotPackage(undefined, packageName, localPath);
await this.deployBotFull(instance, publicAddress);
@ -386,7 +393,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Loads all para from tabular file Config.xlsx.
*/
public async loadParamsFromTabular(min: GBMinInstance): Promise<any> {
public async loadParamsFromTabular (min: GBMinInstance): Promise<any> {
const siteId = process.env.STORAGE_SITE_ID;
const libraryId = process.env.STORAGE_LIBRARY;
@ -408,9 +415,7 @@ export class GBDeployer implements IGBDeployer {
let url = `https://graph.microsoft.com/v1.0/sites/${siteId}/lists/${libraryId}/drive/root:${path}:/children`;
GBLog.info(`Loading .gbot from Excel: ${url}`);
const res = await client
.api(url)
.get();
const res = await client.api(url).get();
// Finds Config.xlsx.
@ -428,10 +433,13 @@ export class GBDeployer implements IGBDeployer {
const results = await client
.api(
`https://graph.microsoft.com/v1.0/sites/${siteId}/lists/${libraryId}/drive/items/${document[0].id}/workbook/worksheets('General')/range(address='A7:B100')`
`https://graph.microsoft.com/v1.0/sites/${siteId}/lists/${libraryId}/drive/items/${
document[0].id
}/workbook/worksheets('General')/range(address='A7:B100')`
)
.get();
let index = 0, obj = {};
let index = 0,
obj = {};
for (; index < results.text.length; index++) {
if (results.text[index][0] === '') {
return obj;
@ -445,10 +453,13 @@ export class GBDeployer implements IGBDeployer {
/**
* Loads all para from tabular file Config.xlsx.
*/
public async downloadFolder(min: GBMinInstance, localPath: string, remotePath: string,
baseUrl: string = null, client = null): Promise<any> {
public async downloadFolder (
min: GBMinInstance,
localPath: string,
remotePath: string,
baseUrl: string = null,
client = null
): Promise<any> {
GBLog.info(`downloadFolder: localPath=${localPath}, remotePath=${remotePath}, baseUrl=${baseUrl}`);
if (!baseUrl) {
@ -479,9 +490,7 @@ export class GBDeployer implements IGBDeployer {
GBLog.info(`Download URL: ${url}`);
const res = await client.client
.api(url)
.get();
const res = await client.client.api(url).get();
const documents = res.value;
if (documents === undefined || documents.length === 0) {
GBLog.info(`${remotePath} is an empty folder.`);
@ -491,7 +500,6 @@ export class GBDeployer implements IGBDeployer {
// Download files or navigate to directory to recurse.
await CollectionUtil.asyncForEach(documents, async item => {
const itemPath = Path.join(localPath, remotePath, item.name);
if (item.folder) {
@ -516,10 +524,8 @@ export class GBDeployer implements IGBDeployer {
const response = await request({ uri: url, encoding: null });
Fs.writeFileSync(itemPath, response, { encoding: null });
Fs.utimesSync(itemPath,
new Date(), new Date(item.lastModifiedDateTime));
}
else {
Fs.utimesSync(itemPath, new Date(), new Date(item.lastModifiedDateTime));
} else {
GBLog.info(`Local is up to date: ${itemPath}...`);
}
}
@ -529,8 +535,7 @@ export class GBDeployer implements IGBDeployer {
/**
* UndDeploys a bot to the storage.
*/
public async undeployBot(botId: string, packageName: string): Promise<void> {
public async undeployBot (botId: string, packageName: string): Promise<void> {
// Deletes Bot registration on cloud.
const service = new AzureDeployerService(this);
@ -551,7 +556,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Deploys a new package to the database storage (just a group).
*/
public async deployPackageToStorage(instanceId: number, packageName: string): Promise<GuaribasPackage> {
public async deployPackageToStorage (instanceId: number, packageName: string): Promise<GuaribasPackage> {
return await GuaribasPackage.create(<GuaribasPackage>{
packageName: packageName,
instanceId: instanceId
@ -561,8 +566,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Deploys a folder into the bot storage.
*/
public async deployPackage(min: GBMinInstance, localPath: string) {
public async deployPackage (min: GBMinInstance, localPath: string) {
const packageType = Path.extname(localPath);
let handled = false;
let pck = null;
@ -572,7 +576,6 @@ export class GBDeployer implements IGBDeployer {
const _this = this;
await CollectionUtil.asyncForEach(min.appPackages, async (e: IGBPackage) => {
try {
// If it will be handled, create a temporary service layer to be
// called by .gbapp and manage the associated package row.
@ -605,7 +608,6 @@ export class GBDeployer implements IGBDeployer {
switch (packageType) {
case '.gbot':
// Extracts configuration information from .gbot files.
if (process.env.ENABLE_PARAMS_ONLINE === 'false') {
@ -624,7 +626,6 @@ export class GBDeployer implements IGBDeployer {
break;
case '.gbkb':
// Deploys .gbkb into the storage.
const service = new KBService(this.core.sequelize);
@ -632,7 +633,6 @@ export class GBDeployer implements IGBDeployer {
break;
case '.gbdialog':
// Compiles files from .gbdialog into work folder and deploys
// it to the VM.
@ -642,7 +642,6 @@ export class GBDeployer implements IGBDeployer {
break;
case '.gbtheme':
// Updates server listeners to serve theme files in .gbtheme.
const packageName = Path.basename(localPath);
@ -652,21 +651,18 @@ export class GBDeployer implements IGBDeployer {
break;
case '.gbapp':
// Dynamically compiles and loads .gbapp packages (Node.js packages).
await this.callGBAppCompiler(localPath, this.core);
break;
case '.gblib':
// Dynamically compiles and loads .gblib packages (Node.js packages).
await this.callGBAppCompiler(localPath, this.core);
break;
default:
const err = GBError.create(`Unhandled package type: ${packageType}.`);
Promise.reject(err);
break;
@ -676,8 +672,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Removes the package from the storage and local work folders.
*/
public async undeployPackageFromLocalPath(instance: IGBInstance, localPath: string) {
public async undeployPackageFromLocalPath (instance: IGBInstance, localPath: string) {
// Gets information about the package.
const packageType = Path.extname(localPath);
@ -687,7 +682,6 @@ export class GBDeployer implements IGBDeployer {
// Removes objects from storage, cloud resources and local files if any.
switch (packageType) {
case '.gbot':
const packageObject = JSON.parse(Fs.readFileSync(urlJoin(localPath, 'package.json'), 'utf8'));
await this.undeployBot(packageObject.botId, packageName);
@ -726,8 +720,7 @@ export class GBDeployer implements IGBDeployer {
* Performs automation of the Indexer (Azure Search) and rebuild
* its index based on .gbkb structure.
*/
public async rebuildIndex(instance: IGBInstance, searchSchema: any) {
public async rebuildIndex (instance: IGBInstance, searchSchema: any) {
// Prepares search.
const search = new AzureSearch(
@ -744,11 +737,9 @@ export class GBDeployer implements IGBDeployer {
try {
await search.deleteDataSource(dsName);
} catch (err) {
// If it is a 404 there is nothing to delete as it is the first creation.
if (err.code !== 404) {
throw err;
}
}
@ -758,10 +749,9 @@ export class GBDeployer implements IGBDeployer {
try {
await search.deleteIndex();
} catch (err) {
// If it is a 404 there is nothing to delete as it is the first creation.
if (err.code !== 404 && err.code !== "OperationNotAllowed") {
if (err.code !== 404 && err.code !== 'OperationNotAllowed') {
throw err;
}
}
@ -780,7 +770,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Finds a storage package by using package name.
*/
public async getStoragePackageByName(instanceId: number, packageName: string): Promise<GuaribasPackage> {
public async getStoragePackageByName (instanceId: number, packageName: string): Promise<GuaribasPackage> {
const where = { packageName: packageName, instanceId: instanceId };
return await GuaribasPackage.findOne({
@ -792,8 +782,7 @@ export class GBDeployer implements IGBDeployer {
* Prepares the React application inside default.gbui folder and
* makes this web application available as default web front-end.
*/
public setupDefaultGBUI() {
public setupDefaultGBUI () {
// Setups paths.
const root = 'packages/default.gbui';
@ -802,7 +791,6 @@ export class GBDeployer implements IGBDeployer {
// Checks if .gbapp compiliation is enabled.
if (!Fs.existsSync(`${root}/build`) && process.env.DISABLE_WEB !== 'true') {
// Write a .env required to fix some bungs in create-react-app tool.
Fs.writeFileSync(`${root}/.env`, 'SKIP_PREFLIGHT_CHECK=true');
@ -821,8 +809,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Servers bot storage assets to be used by web, WhatsApp and other channels.
*/
public static mountGBKBAssets(packageName: any, botId: string, filename: string) {
public static mountGBKBAssets (packageName: any, botId: string, filename: string) {
// Servers menu assets.
GBServer.globals.server.use(
@ -833,20 +820,27 @@ export class GBDeployer implements IGBDeployer {
// Servers all other assets in .gbkb folders.
const gbaiName = `${botId}.gbai`;
GBServer.globals.server.use(`/kb/${gbaiName}/${packageName}/assets`,
express.static(urlJoin('work', gbaiName, filename, 'assets')));
GBServer.globals.server.use(`/kb/${gbaiName}/${packageName}/images`,
express.static(urlJoin('work', gbaiName, filename, 'images')));
GBServer.globals.server.use(`/kb/${gbaiName}/${packageName}/audios`,
express.static(urlJoin('work', gbaiName, filename, 'audios')));
GBServer.globals.server.use(`/kb/${gbaiName}/${packageName}/videos`,
express.static(urlJoin('work', gbaiName, filename, 'videos')));
GBServer.globals.server.use(`/${botId}/cache`,
express.static(urlJoin('work', gbaiName, 'cache')));
GBServer.globals.server.use(`/${gbaiName}/${botId}.gbdata/public`,
express.static(urlJoin('work', gbaiName, `${botId}.gbdata`, 'public')));
GBServer.globals.server.use(
`/kb/${gbaiName}/${packageName}/assets`,
express.static(urlJoin('work', gbaiName, filename, 'assets'))
);
GBServer.globals.server.use(
`/kb/${gbaiName}/${packageName}/images`,
express.static(urlJoin('work', gbaiName, filename, 'images'))
);
GBServer.globals.server.use(
`/kb/${gbaiName}/${packageName}/audios`,
express.static(urlJoin('work', gbaiName, filename, 'audios'))
);
GBServer.globals.server.use(
`/kb/${gbaiName}/${packageName}/videos`,
express.static(urlJoin('work', gbaiName, filename, 'videos'))
);
GBServer.globals.server.use(`/${botId}/cache`, express.static(urlJoin('work', gbaiName, 'cache')));
GBServer.globals.server.use(
`/${gbaiName}/${botId}.gbdata/public`,
express.static(urlJoin('work', gbaiName, `${botId}.gbdata`, 'public'))
);
GBLog.verbose(`KB (.gbkb) assets accessible at: /kb/${botId}.gbai/${packageName}.`);
}
@ -854,13 +848,12 @@ export class GBDeployer implements IGBDeployer {
/**
* Invokes Type Script compiler for a given .gbapp package (Node.js based).
*/
public async callGBAppCompiler(
public async callGBAppCompiler (
gbappPath: string,
core: IGBCoreService,
appPackages: any[] = undefined,
appPackagesProcessed: number = 0
) {
// Runs `npm install` for the package.
GBLog.info(`Deploying General Bots Application (.gbapp) or Library (.gblib): ${Path.basename(gbappPath)}...`);
@ -874,7 +867,6 @@ export class GBDeployer implements IGBDeployer {
folder = Path.join(gbappPath, 'dist');
try {
// Runs TSC in .gbapp folder.
if (process.env.GBAPP_DISABLE_COMPILE !== 'true') {
@ -896,7 +888,6 @@ export class GBDeployer implements IGBDeployer {
}
GBLog.info(`.gbapp or .gblib deployed: ${gbappPath}.`);
appPackagesProcessed++;
} catch (error) {
GBLog.error(`Error compiling package, message: ${error.message}\n${error.stack}`);
if (error.stdout) {
@ -911,7 +902,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Determines if a given package is of system kind.
*/
private isSystemPackage(name: string): Boolean {
private isSystemPackage (name: string): Boolean {
const names = [
'analytics.gblib',
'console.gblib',
@ -935,8 +926,7 @@ export class GBDeployer implements IGBDeployer {
/**
* Performs the process of compiling all .gbapp folders.
*/
private async deployAppPackages(gbappPackages: string[], core: any, appPackages: any[]) {
private async deployAppPackages (gbappPackages: string[], core: any, appPackages: any[]) {
// Loops through all ready to load .gbapp packages.
let appPackagesProcessed = 0;

16
packages/core.gbapp/services/GBImporterService.ts
View file

@ -50,12 +50,16 @@ import { GBConfigService } from './GBConfigService.js';
export class GBImporter {
public core: IGBCoreService;
constructor(core: IGBCoreService) {
constructor (core: IGBCoreService) {
this.core = core;
}
public async importIfNotExistsBotPackage(botId: string,
packageName: string, localPath: string, additionalInstance: IGBInstance = null) {
public async importIfNotExistsBotPackage (
botId: string,
packageName: string,
localPath: string,
additionalInstance: IGBInstance = null
) {
const settingsJson = JSON.parse(Fs.readFileSync(urlJoin(localPath, 'settings.json'), 'utf8'));
if (botId === undefined) {
botId = settingsJson.botId;
@ -94,14 +98,14 @@ export class GBImporter {
return await this.createOrUpdateInstanceInternal(instance, botId, localPath, settingsJson);
}
public async createBotInstance(botId: string) {
const fullSettingsJson=<GuaribasInstance> { ...GBServer.globals.bootInstance };
public async createBotInstance (botId: string) {
const fullSettingsJson = <GuaribasInstance>{ ...GBServer.globals.bootInstance };
fullSettingsJson['botId'] = botId;
return await GuaribasInstance.create(fullSettingsJson);
}
private async createOrUpdateInstanceInternal(
private async createOrUpdateInstanceInternal (
instance: IGBInstance,
botId: string,
localPath: string,

304
packages/core.gbapp/services/GBMinService.ts
View file

@ -93,7 +93,6 @@ import * as nlp from 'node-nlp';
* Minimal service layer for a bot and encapsulation of BOT Framework calls.
*/
export class GBMinService {
/**
* Default General Bots User Interface package.
*/
@ -119,13 +118,12 @@ export class GBMinService {
*/
public deployer: GBDeployer;
bar1;
/**
* Static initialization of minimal instance.
*/
constructor(
constructor (
core: IGBCoreService,
conversationalService: IGBConversationalService,
adminService: IGBAdminService,
@ -140,17 +138,15 @@ export class GBMinService {
/**
* Constructs a new minimal instance for each bot.
*/
public async buildMin(instances: IGBInstance[]) {
public async buildMin (instances: IGBInstance[]) {
// Servers default UI on root address '/' if web enabled.
if (process.env.DISABLE_WEB !== 'true') {
// SSR processing.
const defaultOptions = {
prerender: [],
exclude: ["/api/", "/instances/", "/webhooks/"],
exclude: ['/api/', '/instances/', '/webhooks/'],
useCache: true,
cacheRefreshRate: 86400
};
@ -164,29 +160,31 @@ export class GBMinService {
GBServer.globals.server.use('/', express.static(url));
// Servers the bot information object via HTTP so clients can get
// instance information stored on server.
GBServer.globals.server.get('/instances/:botId', this.handleGetInstanceForClient.bind(this));
}
// Calls mountBot event to all bots.
let i = 1;
if (instances.length > 1) {
this.bar1 = new cliProgress.SingleBar({
format: '[{bar}] ({value}/{total}) Loading {botId} ...', barsize: 40,
forceRedraw: true
}, cliProgress.Presets.rect);
this.bar1.start(instances.length, i, { botId: "Boot" });
this.bar1 = new cliProgress.SingleBar(
{
format: '[{bar}] ({value}/{total}) Loading {botId} ...',
barsize: 40,
forceRedraw: true
},
cliProgress.Presets.rect
);
this.bar1.start(instances.length, i, { botId: 'Boot' });
}
const throttledPromiseAll = async (promises) => {
const throttledPromiseAll = async promises => {
const MAX_IN_PROCESS = 20;
const results = new Array(promises.length);
async function doBlock(startIndex) {
async function doBlock (startIndex) {
// Shallow-copy a block of promises to work on
const currBlock = promises.slice(startIndex, startIndex + MAX_IN_PROCESS);
// Await the completion. If any fail, it will throw and that's good.
@ -203,19 +201,21 @@ export class GBMinService {
return results;
};
await throttledPromiseAll(instances.map((async instance => {
try {
await this['mountBot'](instance);
await throttledPromiseAll(
instances.map(
(async instance => {
try {
await this['mountBot'](instance);
if (this.bar1) {
this.bar1.update(i++, { botId: instance.botId });
}
} catch (error) {
GBLog.error(`Error mounting bot ${instance.botId}: ${error.message}\n${error.stack}`);
}
}).bind(this)));
if (this.bar1) {
this.bar1.update(i++, { botId: instance.botId });
}
} catch (error) {
GBLog.error(`Error mounting bot ${instance.botId}: ${error.message}\n${error.stack}`);
}
}).bind(this)
)
);
if (this.bar1) {
this.bar1.stop();
}
@ -229,13 +229,11 @@ export class GBMinService {
GBLog.info(`All Bot instances loaded.`);
}
/**
* Removes bot endpoint from web listeners and remove bot instance
* from list of global server bot instances.
*/
public async unmountBot(botId: string) {
public async unmountBot (botId: string) {
const url = `/api/messages/${botId}`;
removeRoute(GBServer.globals.server, url);
@ -243,7 +241,6 @@ export class GBMinService {
removeRoute(GBServer.globals.server, uiUrl);
GBServer.globals.minInstances = GBServer.globals.minInstances.filter(p => p.instance.botId !== botId);
}
/**
@ -251,8 +248,7 @@ export class GBMinService {
* serving bot endpoint in several URL like WhatsApp endpoint, .gbkb assets,
* installing all BASIC artifacts from .gbdialog and OAuth2.
*/
public async mountBot(instance: IGBInstance) {
public async mountBot (instance: IGBInstance) {
// Build bot adapter.
const { min, adapter, conversationState } = await this.buildBotAdapter(
@ -329,11 +325,11 @@ export class GBMinService {
// Test code.
if (process.env.TEST_MESSAGE) {
GBLog.info(`Starting auto test with '${process.env.TEST_MESSAGE}'.`);
const client = await new Swagger({
spec: JSON.parse(Fs.readFileSync('directline-3.0.json', 'utf8')), usePromise: true
spec: JSON.parse(Fs.readFileSync('directline-3.0.json', 'utf8')),
usePromise: true
});
client.clientAuthorizations.add(
'AuthorizationBotConnector',
@ -351,7 +347,6 @@ export class GBMinService {
};
await CollectionUtil.asyncForEach(steps, async step => {
client.Conversations.Conversations_PostActivity({
conversationId: conversationId,
activity: {
@ -366,8 +361,6 @@ export class GBMinService {
});
await sleep(5000);
});
}
@ -411,25 +404,23 @@ export class GBMinService {
this.createCheckHealthAddress(GBServer.globals.server, min, min.instance);
GBDeployer.mountGBKBAssets(`${instance.botId}.gbkb`,
instance.botId, `${instance.botId}.gbkb`);
GBDeployer.mountGBKBAssets(`${instance.botId}.gbkb`, instance.botId, `${instance.botId}.gbkb`);
}
public static isChatAPI(req, res) {
public static isChatAPI (req, res) {
if (!res) {
return "GeneralBots";
return 'GeneralBots';
}
return req.body.phone_id ? "maytapi" : "chatapi";
return req.body.phone_id ? 'maytapi' : 'chatapi';
}
/**
* Creates a listener that can be used by external monitors to check
* bot instance health.
*/
private createCheckHealthAddress(server: any, min: GBMinInstance, instance: IGBInstance) {
private createCheckHealthAddress (server: any, min: GBMinInstance, instance: IGBInstance) {
server.get(`/${min.instance.botId}/check`, async (req, res) => {
try {
// Performs the checking of WhatsApp API if enabled for this instance.
if (min.whatsAppDirectLine != undefined && instance.whatsappServiceKey !== null) {
@ -445,9 +436,7 @@ export class GBMinService {
// GB is OK, so 200.
res.status(200).send(`General Bot ${min.botId} is healthly.`);
} catch (error) {
// GB is not OK, 500 and detail the information on response content.
GBLog.error(error);
@ -460,10 +449,8 @@ export class GBMinService {
* Handle OAuth2 web service calls for token requests
* on https://<gbhost>/<BotId>/token URL.
*/
private handleOAuthTokenRequests(server: any, min: GBMinInstance, instance: IGBInstance) {
private handleOAuthTokenRequests (server: any, min: GBMinInstance, instance: IGBInstance) {
server.get(`/${min.instance.botId}/token`, async (req, res) => {
// Checks request state by reading AntiCSRFAttackState from GB Admin infrastructure.
const state = await min.adminService.getValue(instance.instanceId, 'AntiCSRFAttackState');
@ -491,12 +478,11 @@ export class GBMinService {
GBLog.error(msg);
res.send(msg);
} else {
// Saves token to the database.
await this.adminService.setValue(instance.instanceId, 'accessToken', token['accessToken']);
await this.adminService.setValue(instance.instanceId, 'accessToken', token['accessToken']);
await this.adminService.setValue(instance.instanceId, 'refreshToken', token['refreshToken']);
await this.adminService.setValue(instance.instanceId, 'expiresOn', token['expiresOn'].toString());
await this.adminService.setValue(instance.instanceId, 'expiresOn', token['expiresOn'].toString());
await this.adminService.setValue(instance.instanceId, 'AntiCSRFAttackState', undefined);
// Inform the home for default .gbui after finishing token retrival.
@ -512,15 +498,16 @@ export class GBMinService {
* Handle OAuth2 web service calls for authorization requests
* on https://<gbhost>/<BotId>/auth URL.
*/
private handleOAuthRequests(server: any, min: GBMinInstance) {
private handleOAuthRequests (server: any, min: GBMinInstance) {
server.get(`/${min.instance.botId}/auth`, (req, res) => {
let authorizationUrl = urlJoin(
min.instance.authenticatorAuthorityHostUrl,
min.instance.authenticatorTenant,
'/oauth2/authorize'
);
authorizationUrl = `${authorizationUrl}?response_type=code&client_id=${min.instance.marketplaceId
}&redirect_uri=${urlJoin(min.instance.botEndpoint, min.instance.botId, 'token')}`;
authorizationUrl = `${authorizationUrl}?response_type=code&client_id=${
min.instance.marketplaceId
}&redirect_uri=${urlJoin(min.instance.botEndpoint, min.instance.botId, 'token')}`;
GBLog.info(`HandleOAuthRequests: ${authorizationUrl}.`);
res.redirect(authorizationUrl);
});
@ -529,8 +516,7 @@ export class GBMinService {
/**
* Returns the instance object to clients requesting bot info.
*/
private async handleGetInstanceForClient(req: any, res: any) {
private async handleGetInstanceForClient (req: any, res: any) {
// Translates the requested botId.
let botId = req.params.botId;
@ -548,7 +534,6 @@ export class GBMinService {
}
if (instance !== null) {
// Gets the webchat token, speech token and theme.
const webchatTokenContainer = await this.getWebchatToken(instance);
@ -561,7 +546,6 @@ export class GBMinService {
theme = `default.gbtheme`;
}
res.send(
JSON.stringify({
instanceId: instance.instanceId,
@ -589,7 +573,7 @@ export class GBMinService {
/**
* Gets Webchat token from Bot Service.
*/
private async getWebchatToken(instance: any) {
private async getWebchatToken (instance: any) {
const options = {
url: 'https://directline.botframework.com/v3/directline/tokens/generate',
method: 'POST',
@ -612,7 +596,7 @@ export class GBMinService {
/**
* Gets a Speech to Text / Text to Speech token from the provider.
*/
private async getSTSToken(instance: any) {
private async getSTSToken (instance: any) {
const options = {
url: instance.speechEndpoint,
method: 'POST',
@ -633,17 +617,19 @@ export class GBMinService {
/**
* Builds the BOT Framework & GB infrastructures.
*/
private async buildBotAdapter(instance: any, sysPackages: IGBPackage[], appPackages: IGBPackage[]) {
private async buildBotAdapter (instance: any, sysPackages: IGBPackage[], appPackages: IGBPackage[]) {
// MSFT stuff.
const adapter = new BotFrameworkAdapter(
{ appId: instance.marketplaceId, appPassword: instance.marketplacePassword });
const adapter = new BotFrameworkAdapter({
appId: instance.marketplaceId,
appPassword: instance.marketplacePassword
});
const storage = new MemoryStorage();
const conversationState = new ConversationState(storage);
const userState = new UserState(storage);
adapter.use(new AutoSaveStateMiddleware(conversationState, userState));
MicrosoftAppCredentials.trustServiceUrl('https://directline.botframework.com',
MicrosoftAppCredentials.trustServiceUrl(
'https://directline.botframework.com',
new Date(new Date().setFullYear(new Date().getFullYear() + 10))
);
@ -662,9 +648,9 @@ export class GBMinService {
min.cbMap = {};
min.scriptMap = {};
min.sandBoxMap = {};
min["scheduleMap"] = {};
min["conversationWelcomed"] = {};
min["nerEngine"] = new nlp.default.NerManager();
min['scheduleMap'] = {};
min['conversationWelcomed'] = {};
min['nerEngine'] = new nlp.default.NerManager();
min.packages = sysPackages;
min.appPackages = appPackages;
@ -690,8 +676,6 @@ export class GBMinService {
}
});
if (min.instance.googlePrivateKey) {
min['googleDirectLine'] = new GoogleChatDirectLine(
min,
@ -706,11 +690,7 @@ export class GBMinService {
await min['googleDirectLine'].setup(true);
}
const group = min.core.getParam<string>(
min.instance,
'WhatsApp Group ID',
null,
);
const group = min.core.getParam<string>(min.instance, 'WhatsApp Group ID', null);
WhatsappDirectLine.botGroups[min.botId] = group;
@ -769,8 +749,7 @@ export class GBMinService {
/**
* Performs calling of loadBot event in all .gbapps.
*/
private async invokeLoadBot(appPackages: IGBPackage[], sysPackages: IGBPackage[], min: GBMinInstance) {
private async invokeLoadBot (appPackages: IGBPackage[], sysPackages: IGBPackage[], min: GBMinInstance) {
// Calls loadBot event in all .gbapp packages.
await CollectionUtil.asyncForEach(sysPackages, async p => {
@ -804,22 +783,20 @@ export class GBMinService {
}
// TODO: Unify in util.
public static userMobile(step) {
let mobile = WhatsappDirectLine.mobiles[step.context.activity.conversation.id]
public static userMobile (step) {
let mobile = WhatsappDirectLine.mobiles[step.context.activity.conversation.id];
if (!mobile && step) {
return step.context.activity.from.id;
}
return mobile;
}
/**
* BOT Framework web service hook method.
*/
private async receiver(
private async receiver (
req: any,
res: any,
conversationState: ConversationState,
@ -827,7 +804,6 @@ export class GBMinService {
instance: any,
appPackages: any[]
) {
let adapter = min.bot;
if (req.body.object) {
@ -849,13 +825,10 @@ export class GBMinService {
step.context.activity.locale = 'pt-BR';
let firstTime = false;
try {
const sec = new SecService();
const user = await min.userProfile.get(context, {});
const conversationReference = JSON.stringify(
TurnContext.getConversationReference(context.activity)
);
const conversationReference = JSON.stringify(TurnContext.getConversationReference(context.activity));
// First time processing.
@ -868,7 +841,7 @@ export class GBMinService {
user.subjects = [];
user.cb = undefined;
user.welcomed = false;
user.basicOptions = { maxLines: 100, translatorOn: true, wholeWord: true, theme: "white", maxColumns: 40 };
user.basicOptions = { maxLines: 100, translatorOn: true, wholeWord: true, theme: 'white', maxColumns: 40 };
firstTime = true;
@ -876,7 +849,6 @@ export class GBMinService {
// including the bot, that is filtered bellow.
if (context.activity.from.id !== min.botId) {
// Creates a new row in user table if it does not exists.
const member = context.activity.from;
@ -894,7 +866,6 @@ export class GBMinService {
const analytics = new AnalyticsService();
user.systemUser = persistedUser;
user.conversation = await analytics.createConversation(persistedUser);
}
await sec.updateConversationReferenceById(user.systemUser.userId, conversationReference);
@ -919,27 +890,35 @@ export class GBMinService {
// Required for MSTEAMS handling of persisted conversations.
if (step.context.activity.channelId === 'msteams') {
if (step.context.activity.attachments && step.context.activity.attachments.length > 1) {
const file = context.activity.attachments[0];
const credentials = new MicrosoftAppCredentials(min.instance.marketplaceId, min.instance.marketplacePassword);
const credentials = new MicrosoftAppCredentials(
min.instance.marketplaceId,
min.instance.marketplacePassword
);
const botToken = await credentials.getToken();
const headers = { Authorization: `Bearer ${botToken}` };
const t = new SystemKeywords(null, null, null, null);
const data = await t.getByHttp({
url: file.contentUrl, headers, username: null,
ps: null, qs: null, streaming: true
url: file.contentUrl,
headers,
username: null,
ps: null,
qs: null,
streaming: true
});
const folder = `work/${min.instance.botId}.gbai/cache`;
const filename = `${GBAdminService.generateUuid()}.png`;
Fs.writeFileSync(path.join(folder, filename), data);
step.context.activity.text = urlJoin(GBServer.globals.publicAddress, `${min.instance.botId}`, 'cache', filename);
step.context.activity.text = urlJoin(
GBServer.globals.publicAddress,
`${min.instance.botId}`,
'cache',
filename
);
}
if (!user.welcomed) {
const startDialog = min.core.getParam(min.instance, 'Start Dialog', null);
if (startDialog && !user.welcomed) {
@ -952,7 +931,11 @@ export class GBMinService {
// Required for F0 handling of persisted conversations.
GBLog.info(`Input> ${context.activity.text} (type: ${context.activity.type}, name: ${context.activity.name}, channelId: ${context.activity.channelId})`);
GBLog.info(
`Input> ${context.activity.text} (type: ${context.activity.type}, name: ${
context.activity.name
}, channelId: ${context.activity.channelId})`
);
// Answer to specific BOT Framework event conversationUpdate to auto start dialogs.
// Skips if the bot is talking.
@ -960,9 +943,7 @@ export class GBMinService {
if (context.activity.type === 'installationUpdate') {
GBLog.info(`Bot installed on Teams.`);
} else if (context.activity.type === 'conversationUpdate' &&
context.activity.membersAdded.length > 0) {
} else if (context.activity.type === 'conversationUpdate' && context.activity.membersAdded.length > 0) {
// Check if a bot or a human participant is being added to the conversation.
const member = context.activity.membersAdded[0];
@ -978,45 +959,46 @@ export class GBMinService {
// Auto starts dialogs if any is specified.
if (!startDialog && !user.welcomed) {
// Otherwise, calls / (root) to default welcome users.
await step.beginDialog('/');
}
else {
if (!GBMinService.userMobile(step) &&
!min["conversationWelcomed"][step.context.activity.conversation.id]) {
} else {
if (
!GBMinService.userMobile(step) &&
!min['conversationWelcomed'][step.context.activity.conversation.id]
) {
min['conversationWelcomed'][step.context.activity.conversation.id] = true;
min["conversationWelcomed"][step.context.activity.conversation.id] = true;
GBLog.info(`Auto start (web 1) dialog is now being called: ${startDialog} for ${min.instance.instanceId}...`);
GBLog.info(
`Auto start (web 1) dialog is now being called: ${startDialog} for ${min.instance.instanceId}...`
);
await GBVMService.callVM(startDialog.toLowerCase(), min, step, this.deployer, false);
}
}
} else {
GBLog.info(`Person added to conversation: ${member.name}`);
if (GBMinService.userMobile(step)) {
if (startDialog && !min["conversationWelcomed"][step.context.activity.conversation.id] &&
!step.context.activity['group']) {
if (
startDialog &&
!min['conversationWelcomed'][step.context.activity.conversation.id] &&
!step.context.activity['group']
) {
user.welcomed = true;
min["conversationWelcomed"][step.context.activity.conversation.id] = true;
min['conversationWelcomed'][step.context.activity.conversation.id] = true;
await min.userProfile.set(step.context, user);
GBLog.info(`Auto start (whatsapp) dialog is now being called: ${startDialog} for ${min.instance.instanceId}...`);
GBLog.info(
`Auto start (whatsapp) dialog is now being called: ${startDialog} for ${min.instance.instanceId}...`
);
await GBVMService.callVM(startDialog.toLowerCase(), min, step, this.deployer, false);
}
}
}
} else if (context.activity.type === 'message') {
// Processes messages activities.
await this.processMessageActivity(context, min, step);
} else if (context.activity.type === 'event') {
// Processes events activities.
await this.processEventActivity(min, user, context, step);
@ -1025,9 +1007,7 @@ export class GBMinService {
// Saves conversation state for later use.
await conversationState.saveChanges(context, true);
} catch (error) {
const msg = `ERROR: ${error.message} ${error.stack ? error.stack : ''}`;
GBLog.error(msg);
@ -1045,8 +1025,7 @@ export class GBMinService {
/**
* Called to handle all event sent by .gbui clients.
*/
private async processEventActivity(min, user, context, step: GBDialogStep) {
private async processEventActivity (min, user, context, step: GBDialogStep) {
if (context.activity.name === 'whoAmI') {
await step.beginDialog('/whoAmI');
} else if (context.activity.name === 'showSubjects') {
@ -1068,7 +1047,7 @@ export class GBMinService {
});
} else if (context.activity.name === 'startGB') {
const startDialog = min.core.getParam(min.instance, 'Start Dialog', null);
if (startDialog && !min["conversationWelcomed"][step.context.activity.conversation.id]) {
if (startDialog && !min['conversationWelcomed'][step.context.activity.conversation.id]) {
user.welcomed = true;
GBLog.info(`Auto start (web 2) dialog is now being called: ${startDialog} for ${min.instance.instanceId}...`);
await GBVMService.callVM(startDialog.toLowerCase(), min, step, this.deployer, false);
@ -1084,8 +1063,7 @@ export class GBMinService {
/**
* Called to handle all text messages sent and received by the bot.
*/
private async processMessageActivity(context, min: GBMinInstance, step: GBDialogStep) {
private async processMessageActivity (context, min: GBMinInstance, step: GBDialogStep) {
const sec = new SecService();
if (!context.activity.text) {
@ -1110,12 +1088,10 @@ export class GBMinService {
const user = await min.userProfile.get(context, {});
let message: GuaribasConversationMessage;
if (process.env.PRIVACY_STORE_MESSAGES === 'true') {
// Adds message to the analytics layer.
const analytics = new AnalyticsService();
if (user) {
if (!user.conversation) {
user.conversation = await analytics.createConversation(user.systemUser);
}
@ -1141,22 +1117,18 @@ export class GBMinService {
if (isVMCall) {
await GBVMService.callVM(context.activity.text, min, step, this.deployer, false);
} else if (context.activity.text.charAt(0) === '/') {
const text = context.activity.text;
const parts = text.split(' ');
const cmdOrDialogName = parts[0];
parts.splice(0, 1);
const args = parts.join(' ');
if (cmdOrDialogName === '/start') {
// Reset user.
const user = await min.userProfile.get(context, {});
await min.conversationalService.sendEvent(min, step, 'loadInstance', {});
user.loaded = false;
await min.userProfile.set(step.context, user);
} else if (cmdOrDialogName === '/call') {
await GBVMService.callVM(args, min, step, this.deployer, false);
} else if (cmdOrDialogName === '/callsch') {
@ -1169,23 +1141,21 @@ export class GBMinService {
} else if (globalQuit(step.context.activity.locale, context.activity.text)) {
await step.cancelAllDialogs();
await min.conversationalService.sendText(min, step, Messages[step.context.activity.locale].canceled);
} else if (context.activity.text === 'admin') {
await step.beginDialog('/admin');
} else if (context.activity.text.startsWith('{"title"')) {
await step.beginDialog('/menu', JSON.parse(context.activity.text));
} else if (
!(await this.deployer.getStoragePackageByName(min.instance.instanceId, `${min.instance.botId}.gbkb`)) &&
process.env.GBKB_ENABLE_AUTO_PUBLISH === 'true'
) {
await min.conversationalService.sendText(min, step,
await min.conversationalService.sendText(
min,
step,
`Oi, ainda não possuo pacotes de conhecimento publicados. Por favor, aguarde alguns segundos enquanto eu auto-publico alguns pacotes.`
);
await step.beginDialog('/publish', { confirm: true, firstTime: true });
} else {
// Removes unwanted chars in input text.
let text = context.activity.text;
@ -1208,7 +1178,7 @@ export class GBMinService {
}
});
const getNormalizedRegExp = (value) => {
const getNormalizedRegExp = value => {
var chars = [
{ letter: 'a', reg: '[aáàãäâ]' },
{ letter: 'e', reg: '[eéèëê]' },
@ -1220,7 +1190,7 @@ export class GBMinService {
for (var i in chars) {
value = value.replace(new RegExp(chars[i].letter, 'gi'), chars[i].reg);
};
}
return value;
};
@ -1236,7 +1206,10 @@ export class GBMinService {
const replacementToken = 'X' + GBAdminService.getNumberIdentifier().substr(0, 4);
replacements[i] = { text: item, replacementToken: replacementToken };
i++;
textProcessed = textProcessed.replace(new RegExp(`\\b${getNormalizedRegExp(it.trim())}\\b`, 'gi'), `${replacementToken}`);
textProcessed = textProcessed.replace(
new RegExp(`\\b${getNormalizedRegExp(it.trim())}\\b`, 'gi'),
`${replacementToken}`
);
}
});
}
@ -1248,18 +1221,22 @@ export class GBMinService {
// Detects user typed language and updates their locale profile if applies.
let locale = min.core.getParam<string>(min.instance, 'Default User Language',
let locale = min.core.getParam<string>(
min.instance,
'Default User Language',
GBConfigService.get('DEFAULT_USER_LANGUAGE')
);
const detectLanguage = min.core.getParam<boolean>(min.instance, 'Language Detector',
GBConfigService.getBoolean('LANGUAGE_DETECTOR')
) === 'true';
const detectLanguage =
min.core.getParam<boolean>(
min.instance,
'Language Detector',
GBConfigService.getBoolean('LANGUAGE_DETECTOR')
) === 'true';
const systemUser = user.systemUser;
locale = systemUser.locale;
if (text != '' && detectLanguage && !locale) {
locale = await min.conversationalService.getLanguage(min, text);
if (systemUser.locale != locale) {
user.systemUser = await sec.updateUserLocale(systemUser.userId, locale);
await min.userProfile.set(step.context, user);
}
@ -1308,32 +1285,32 @@ export class GBMinService {
const message = await min.kbService.getAnswerTextByMediaName(min.instance.instanceId, filename);
if (message === null) {
GBLog.error(`File ${filename} not found in any .gbkb published. Check the name or publish again the associated .gbkb.`);
GBLog.error(
`File ${filename} not found in any .gbkb published. Check the name or publish again the associated .gbkb.`
);
} else {
await min.conversationalService.sendMarkdownToMobile(min, null, manualUser.userSystemId, message);
}
} else {
await min.whatsAppDirectLine.sendToDeviceEx(
manualUser.userSystemId,
`${manualUser.agentSystemId}: ${text}`,
locale,
step.context.activity.conversation.id
);
}
else {
await min.whatsAppDirectLine.sendToDeviceEx(manualUser.userSystemId, `${manualUser.agentSystemId}: ${text}`, locale,
step.context.activity.conversation.id);
}
}
else {
if (min.cbMap[user.systemUser.userId] &&
min.cbMap[user.systemUser.userId].promise == '!GBHEAR') {
} else {
if (min.cbMap[user.systemUser.userId] && min.cbMap[user.systemUser.userId].promise == '!GBHEAR') {
min.cbMap[user.systemUser.userId].promise = text;
}
// If there is a dialog in course, continue to the next step.
else if (step.activeDialog !== undefined) {
await step.continueDialog();
} else {
const startDialog = user.hearOnDialog ?
user.hearOnDialog :
min.core.getParam(min.instance, 'Start Dialog', null);
const startDialog = user.hearOnDialog
? user.hearOnDialog
: min.core.getParam(min.instance, 'Start Dialog', null);
if (text !== startDialog) {
let nextDialog = null;
@ -1357,7 +1334,6 @@ export class GBMinService {
user: user ? user.dataValues : null,
message: message
});
}
}
}

492
packages/core.gbapp/services/GBSSR.ts
View file

@ -31,7 +31,7 @@
\*****************************************************************************/
/**
* @fileoverview General Bots SSR support based on https://www.npmjs.com/package/ssr-for-bots.
* @fileoverview General Bots SSR support based on https://www.npmjs.com/package/ssr-for-bots.
*/
'use strict';
@ -42,302 +42,284 @@ import Fs from 'fs';
// const StealthPlugin from 'puppeteer-extra-plugin-stealth')
// puppeteer.use(StealthPlugin());
import { NextFunction, Request, Response } from "express";
import urljoin from "url-join";
import { NextFunction, Request, Response } from 'express';
import urljoin from 'url-join';
// https://hackernoon.com/tips-and-tricks-for-web-scraping-with-puppeteer-ed391a63d952
// Dont download all resources, we just need the HTML
// Also, this is huge performance/response time boost
const blockedResourceTypes = [
"image",
"media",
"font",
"texttrack",
"object",
"beacon",
"csp_report",
"imageset",
];
const blockedResourceTypes = ['image', 'media', 'font', 'texttrack', 'object', 'beacon', 'csp_report', 'imageset'];
// const whitelist = ["document", "script", "xhr", "fetch"];
const skippedResources = [
"quantserve",
"adzerk",
"doubleclick",
"adition",
"exelator",
"sharethrough",
"cdn.api.twitter",
"google-analytics",
"googletagmanager",
"google",
"fontawesome",
"facebook",
"analytics",
"optimizely",
"clicktale",
"mixpanel",
"zedo",
"clicksor",
"tiqcdn",
'quantserve',
'adzerk',
'doubleclick',
'adition',
'exelator',
'sharethrough',
'cdn.api.twitter',
'google-analytics',
'googletagmanager',
'google',
'fontawesome',
'facebook',
'analytics',
'optimizely',
'clicktale',
'mixpanel',
'zedo',
'clicksor',
'tiqcdn'
];
const RENDER_CACHE = new Map();
async function createBrowser (profilePath): Promise<any> {
let args = [
'--check-for-update-interval=2592000',
'--disable-accelerated-2d-canvas',
'--disable-dev-shm-usage',
'--disable-features=site-per-process',
'--disable-gpu',
'--no-first-run',
'--no-default-browser-check'
];
if (profilePath) {
args.push(`--user-data-dir=${profilePath}`);
async function createBrowser(profilePath): Promise<any> {
let args = [
'--check-for-update-interval=2592000',
'--disable-accelerated-2d-canvas',
'--disable-dev-shm-usage',
'--disable-features=site-per-process',
'--disable-gpu',
'--no-first-run',
'--no-default-browser-check'
];
if (profilePath) {
args.push(`--user-data-dir=${profilePath}`);
const preferences = urljoin(profilePath, "Default", "Preferences");
if (Fs.existsSync(preferences)) {
const file = Fs.readFileSync(preferences, "utf8")
const data = JSON.parse(file)
data["profile"]['exit_type'] = "none";
Fs.writeFileSync(preferences, JSON.stringify(data))
}
const preferences = urljoin(profilePath, 'Default', 'Preferences');
if (Fs.existsSync(preferences)) {
const file = Fs.readFileSync(preferences, 'utf8');
const data = JSON.parse(file);
data['profile']['exit_type'] = 'none';
Fs.writeFileSync(preferences, JSON.stringify(data));
}
const browser = await puppeteer.launch({
args: args,
ignoreHTTPSErrors: true,
headless: false,
defaultViewport: null,
ignoreDefaultArgs: ["--enable-automation", "--enable-blink-features=IdleDetection"]
});
return browser;
}
const browser = await puppeteer.launch({
args: args,
ignoreHTTPSErrors: true,
headless: false,
defaultViewport: null,
ignoreDefaultArgs: ['--enable-automation', '--enable-blink-features=IdleDetection']
});
return browser;
}
async function recursiveFindInFrames(inputFrame, selector) {
const frames = inputFrame.childFrames();
const results = await Promise.all(
frames.map(async frame => {
const el = await frame.$(selector);
if (el) return el;
if (frame.childFrames().length > 0) {
return await recursiveFindInFrames(frame, selector);
}
return null;
})
);
return results.find(Boolean);
async function recursiveFindInFrames (inputFrame, selector) {
const frames = inputFrame.childFrames();
const results = await Promise.all(
frames.map(async frame => {
const el = await frame.$(selector);
if (el) return el;
if (frame.childFrames().length > 0) {
return await recursiveFindInFrames(frame, selector);
}
return null;
})
);
return results.find(Boolean);
}
/**
* https://developers.google.com/web/tools/puppeteer/articles/ssr#reuseinstance
* @param {string} url URL to prerender.
*/
async function ssr(url: string, useCache: boolean, cacheRefreshRate: number) {
if (RENDER_CACHE.has(url) && useCache) {
const cached = RENDER_CACHE.get(url);
if (
Date.now() - cached.renderedAt > cacheRefreshRate &&
!(cacheRefreshRate <= 0)
) {
RENDER_CACHE.delete(url);
} else {
return {
html: cached.html,
status: 200,
};
}
async function ssr (url: string, useCache: boolean, cacheRefreshRate: number) {
if (RENDER_CACHE.has(url) && useCache) {
const cached = RENDER_CACHE.get(url);
if (Date.now() - cached.renderedAt > cacheRefreshRate && !(cacheRefreshRate <= 0)) {
RENDER_CACHE.delete(url);
} else {
return {
html: cached.html,
status: 200
};
}
const browser = await createBrowser(null);
const stylesheetContents = {};
}
const browser = await createBrowser(null);
const stylesheetContents = {};
try {
const page = await browser.newPage();
await page.setUserAgent(
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36"
);
await page.setRequestInterception(true);
page.on("request", (request) => {
const requestUrl = request.url().split("?")[0].split("#")[0];
if (
blockedResourceTypes.indexOf(request.resourceType()) !== -1 ||
skippedResources.some((resource) => requestUrl.indexOf(resource) !== -1)
) {
request.abort();
} else {
request.continue();
}
try {
const page = await browser.newPage();
await page.setUserAgent(
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36'
);
await page.setRequestInterception(true);
page.on('request', request => {
const requestUrl = request
.url()
.split('?')[0]
.split('#')[0];
if (
blockedResourceTypes.indexOf(request.resourceType()) !== -1 ||
skippedResources.some(resource => requestUrl.indexOf(resource) !== -1)
) {
request.abort();
} else {
request.continue();
}
});
page.on('response', async resp => {
const responseUrl = resp.url();
const sameOrigin = new URL(responseUrl).origin === new URL(url).origin;
const isStylesheet = resp.request().resourceType() === 'stylesheet';
if (sameOrigin && isStylesheet) {
stylesheetContents[responseUrl] = await resp.text();
}
});
const response = await page.goto(url, {
timeout: 120000,
waitUntil: 'networkidle0'
});
const sleep = ms => {
return new Promise(resolve => {
setTimeout(resolve, ms);
});
};
await sleep(45000);
// Inject <base> on page to relative resources load properly.
await page.evaluate(url => {
const base = document.createElement('base');
base.href = url;
// Add to top of head, before all other resources.
document.head.prepend(base);
}, url);
// Remove scripts and html imports. They've already executed.
await page.evaluate(() => {
const elements = document.querySelectorAll('script, link[rel="import"]');
elements.forEach(e => {
e.remove();
});
});
// Replace stylesheets in the page with their equivalent <style>.
await page.$$eval(
'link[rel="stylesheet"]',
(links, content) => {
links.forEach((link: any) => {
const cssText = content[link.href];
if (cssText) {
const style = document.createElement('style');
style.textContent = cssText;
link.replaceWith(style);
}
});
},
stylesheetContents
);
page.on("response", async (resp) => {
const responseUrl = resp.url();
const sameOrigin = new URL(responseUrl).origin === new URL(url).origin;
const isStylesheet = resp.request().resourceType() === "stylesheet";
if (sameOrigin && isStylesheet) {
stylesheetContents[responseUrl] = await resp.text();
}
});
const html = await page.content();
const response = await page.goto(url, {
timeout: 120000,
waitUntil: "networkidle0",
});
const sleep = ms => {
return new Promise(resolve => {
setTimeout(resolve, ms);
});
};
await sleep(45000);
// Inject <base> on page to relative resources load properly.
await page.evaluate((url) => {
const base = document.createElement("base");
base.href = url;
// Add to top of head, before all other resources.
document.head.prepend(base);
}, url);
// Remove scripts and html imports. They've already executed.
await page.evaluate(() => {
const elements = document.querySelectorAll('script, link[rel="import"]');
elements.forEach((e) => {
e.remove();
});
});
// Replace stylesheets in the page with their equivalent <style>.
await page.$$eval(
'link[rel="stylesheet"]',
(links, content) => {
links.forEach((link: any) => {
const cssText = content[link.href];
if (cssText) {
const style = document.createElement("style");
style.textContent = cssText;
link.replaceWith(style);
}
});
},
stylesheetContents
);
const html = await page.content();
// Close the page we opened here (not the browser).
await page.close();
if (useCache) {
RENDER_CACHE.set(url, { html, renderedAt: Date.now() });
}
return { html, status: response!.status() };
} catch (e) {
const html = e.toString();
console.warn({ message: `URL: ${url} Failed with message: ${html}` });
return { html, status: 500 };
} finally {
await browser.close();
// Close the page we opened here (not the browser).
await page.close();
if (useCache) {
RENDER_CACHE.set(url, { html, renderedAt: Date.now() });
}
return { html, status: response!.status() };
} catch (e) {
const html = e.toString();
console.warn({ message: `URL: ${url} Failed with message: ${html}` });
return { html, status: 500 };
} finally {
await browser.close();
}
}
function clearCache() {
RENDER_CACHE.clear();
function clearCache () {
RENDER_CACHE.clear();
}
interface Options {
prerender?: Array<string>;
exclude?: Array<string>;
useCache?: boolean;
cacheRefreshRate?: number;
prerender?: Array<string>;
exclude?: Array<string>;
useCache?: boolean;
cacheRefreshRate?: number;
}
function ssrForBots(
options: Options = {
prerender: [], // Array containing the user-agents that will trigger the ssr service
exclude: [], // Array containing paths and/or extentions that will be excluded from being prerendered by the ssr service
useCache: true, // Variable that determins if we will use page caching or not
cacheRefreshRate: 86400 // Seconds of which the cache will be kept alive, pass 0 or negative value for infinite lifespan
}
function ssrForBots (
options: Options = {
prerender: [], // Array containing the user-agents that will trigger the ssr service
exclude: [], // Array containing paths and/or extentions that will be excluded from being prerendered by the ssr service
useCache: true, // Variable that determins if we will use page caching or not
cacheRefreshRate: 86400 // Seconds of which the cache will be kept alive, pass 0 or negative value for infinite lifespan
}
) {
let applyOptions = Object.assign(
{
prerender: [], // Array containing the user-agents that will trigger the ssr service
exclude: [], // Array containing paths and/or extentions that will be excluded from being prerendered by the ssr service
useCache: true, // Variable that determins if we will use page caching or not
cacheRefreshRate: 86400 // Seconds of which the cache will be kept alive, pass 0 or negative value for infinite lifespan
},
options
);
let applyOptions = Object.assign(
{
prerender: [], // Array containing the user-agents that will trigger the ssr service
exclude: [], // Array containing paths and/or extentions that will be excluded from being prerendered by the ssr service
useCache: true, // Variable that determins if we will use page caching or not
cacheRefreshRate: 86400 // Seconds of which the cache will be kept alive, pass 0 or negative value for infinite lifespan
},
options
);
// Default user agents
const prerenderArray = [
"bot",
"googlebot",
"Chrome-Lighthouse",
"DuckDuckBot",
"ia_archiver",
"bingbot",
"yandex",
"baiduspider",
"Facebot",
"facebookexternalhit",
"facebookexternalhit/1.1",
"twitterbot",
"rogerbot",
"linkedinbot",
"embedly",
"quora link preview",
"showyoubot",
"outbrain",
"pinterest",
"slackbot",
"vkShare",
"W3C_Validator",
];
// Default user agents
const prerenderArray = [
'bot',
'googlebot',
'Chrome-Lighthouse',
'DuckDuckBot',
'ia_archiver',
'bingbot',
'yandex',
'baiduspider',
'Facebot',
'facebookexternalhit',
'facebookexternalhit/1.1',
'twitterbot',
'rogerbot',
'linkedinbot',
'embedly',
'quora link preview',
'showyoubot',
'outbrain',
'pinterest',
'slackbot',
'vkShare',
'W3C_Validator'
];
// default exclude array
const excludeArray = [".xml", ".ico", ".txt", ".json"];
// default exclude array
const excludeArray = ['.xml', '.ico', '.txt', '.json'];
function ssrOnDemand(req: Request, res: Response, next: NextFunction) {
Promise.resolve(() => {
return true;
})
.then(async () => {
const userAgent: string = req.headers["user-agent"] || "";
function ssrOnDemand (req: Request, res: Response, next: NextFunction) {
Promise.resolve(() => {
return true;
})
.then(async () => {
const userAgent: string = req.headers['user-agent'] || '';
const prerender = new RegExp(
[...prerenderArray, ...applyOptions.prerender].join("|").slice(0, -1),
"i"
).test(userAgent);
const prerender = new RegExp([...prerenderArray, ...applyOptions.prerender].join('|').slice(0, -1), 'i').test(
userAgent
);
const exclude = !new RegExp(
[...excludeArray, ...applyOptions.exclude].join("|").slice(0, -1)
).test(req.originalUrl);
const exclude = !new RegExp([...excludeArray, ...applyOptions.exclude].join('|').slice(0, -1)).test(
req.originalUrl
);
if (req.originalUrl && prerender && exclude) {
const { html, status } = await ssr(
req.protocol + "://" + req.get("host") + req.originalUrl,
applyOptions.useCache,
applyOptions.cacheRefreshRate
);
return res.status(status).send(html);
} else {
return next();
}
})
.catch(next);
}
if (req.originalUrl && prerender && exclude) {
const { html, status } = await ssr(
req.protocol + '://' + req.get('host') + req.originalUrl,
applyOptions.useCache,
applyOptions.cacheRefreshRate
);
return res.status(status).send(html);
} else {
return next();
}
})
.catch(next);
}
return ssrOnDemand;
return ssrOnDemand;
}
export { createBrowser, ssr, clearCache, ssrForBots };

16
packages/core.gbapp/strings.ts
View file

@ -1,4 +1,3 @@
export const Messages = {
global_quit: /^(\bsair\b|\bsai\b|\bchega\b|\bexit\b|\bquit\b|\bfinish\b|\bend\b|\bausfahrt\b|\bverlassen\b)/i,
'en-US': {
@ -6,23 +5,22 @@ export const Messages = {
good_morning: 'good morning',
good_evening: 'good evening',
good_night: 'good night',
hi: (msg) => `Hello, ${msg}.`,
hi: msg => `Hello, ${msg}.`,
very_sorry_about_error: `I'm sorry to inform that there was an error which was recorded to be solved.`,
canceled: 'Canceled. If I can be useful, let me know how',
whats_email: 'What\'s your E-mail address?',
whats_email: "What's your E-mail address?",
which_language: 'Please, type the language name you would like to talk through.',
validation_enter_valid_email: 'Please enter a valid e-mail.',
language_chosen: 'Very good, so let\'s go...',
language_chosen: "Very good, so let's go...",
affirmative_sentences: /^(\bsim\b|\bs\b|\bpositivo\b|\bafirmativo\b|\bclaro\b|\bevidente\b|\bsem dúvida\b|\bconfirmo\b|\bconfirmar\b|\bconfirmado\b|\buhum\b|\bsi\b|\by\b|\byes\b|\bsure\b)/i,
will_answer_projector:
'I\'ll answer on the projector to a better experience...',
will_answer_projector: "I'll answer on the projector to a better experience..."
},
'pt-BR': {
show_video: 'Vou te mostrar um vídeo. Por favor, aguarde...',
good_morning: 'bom dia',
good_evening: 'boa tarde',
good_night: 'boa noite',
hi: (msg) => `Oi, ${msg}.`,
hi: msg => `Oi, ${msg}.`,
very_sorry_about_error: `Lamento, ocorreu um erro que já foi registrado para ser tratado.`,
canceled: 'Cancelado, avise como posso ser útil novamente.',
whats_email: 'Qual seu e-mail?',
@ -30,8 +28,6 @@ export const Messages = {
validation_enter_valid_email: 'Por favor digite um email válido.',
language_chosen: 'Muito bem, então vamos lá...',
affirmative_sentences: /^(\bsim\b|\bs\b|\bpositivo\b|\bafirmativo\b|\bclaro\b|\bevidente\b|\bsem dúvida\b|\bconfirmo\b|\bconfirmar\b|\bconfirmado\b|\buhum\b|\bsi\b|\by\b|\byes\b|\bsure\b)/i,
will_answer_projector:
'Vou te responder na tela para melhor visualização...',
will_answer_projector: 'Vou te responder na tela para melhor visualização...'
}
};

152
packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts
View file

@ -55,7 +55,7 @@ export class FeedbackDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
public static setup (bot: BotAdapter, min: GBMinInstance) {
const service = new CSService();
min.dialogs.add(
@ -74,13 +74,11 @@ export class FeedbackDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
async step => {
const locale = step.context.activity.locale;
const sec = new SecService();
let from = GBMinService.userMobile(step);
@ -90,40 +88,39 @@ export class FeedbackDialog extends IGBDialog {
// Transfer to...
if (args && args.to) {
// An user from Teams willing to transfer to a WhatsApp user.
await sec.ensureUser(min.instance.instanceId, args.to,
'Name', '', 'whatsapp', 'Name', null);
await sec.ensureUser(min.instance.instanceId, args.to, 'Name', '', 'whatsapp', 'Name', null);
await sec.assignHumanAgent(min, args.to, profile.systemUser.userSystemId);
await min.conversationalService.sendText(min, step,
Messages[locale].notify_agent_transfer_done(min.instance.botId));
}
else {
await min.conversationalService.sendText(
min,
step,
Messages[locale].notify_agent_transfer_done(min.instance.botId)
);
} else {
await min.conversationalService.sendText(min, step, Messages[locale].please_wait_transfering);
const agentSystemId = await sec.assignHumanAgent(min, from);
profile.systemUser = await sec.getUserFromAgentSystemId(agentSystemId);
await min.userProfile.set(step.context, profile);
if (agentSystemId.charAt(2) === ":" || agentSystemId.indexOf("@") > -1) { // Agent is from Teams or Google Chat.
if (agentSystemId.charAt(2) === ':' || agentSystemId.indexOf('@') > -1) {
// Agent is from Teams or Google Chat.
const agent = await sec.getUserFromSystemId(agentSystemId);
await min.conversationalService['sendOnConversation'](min, agent,
Messages[locale].notify_agent(step.context.activity.from.name));
}
else {
await min.whatsAppDirectLine.sendToDevice(agentSystemId, Messages[locale].notify_agent(step.context.activity.from.name));
await min.conversationalService['sendOnConversation'](
min,
agent,
Messages[locale].notify_agent(step.context.activity.from.name)
);
} else {
await min.whatsAppDirectLine.sendToDevice(
agentSystemId,
Messages[locale].notify_agent(step.context.activity.from.name)
);
}
}
return await step.next();
}
])
);
@ -133,13 +130,11 @@ export class FeedbackDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
async step => {
const locale = step.context.activity.locale;
const sec = new SecService();
@ -149,16 +144,27 @@ export class FeedbackDialog extends IGBDialog {
if (user.systemUser.agentMode === 'self') {
const manualUser = await sec.getUserFromAgentSystemId(userSystemId);
await min.whatsAppDirectLine.sendToDeviceEx(manualUser.userSystemId,
Messages[locale].notify_end_transfer(min.instance.botId), locale, step.context.activity.conversation.id);
await min.whatsAppDirectLine.sendToDeviceEx(
manualUser.userSystemId,
Messages[locale].notify_end_transfer(min.instance.botId),
locale,
step.context.activity.conversation.id
);
if (userSystemId.charAt(2) === ":" || userSystemId.indexOf('@') > -1) { // Agent is from Teams or Google Chat.
await min.conversationalService.sendText(min, step, Messages[locale].notify_end_transfer(min.instance.botId));
}
else {
await min.whatsAppDirectLine.sendToDeviceEx(userSystemId,
Messages[locale].notify_end_transfer(min.instance.botId), locale
, step.context.activity.conversation.id);
if (userSystemId.charAt(2) === ':' || userSystemId.indexOf('@') > -1) {
// Agent is from Teams or Google Chat.
await min.conversationalService.sendText(
min,
step,
Messages[locale].notify_end_transfer(min.instance.botId)
);
} else {
await min.whatsAppDirectLine.sendToDeviceEx(
userSystemId,
Messages[locale].notify_end_transfer(min.instance.botId),
locale,
step.context.activity.conversation.id
);
}
await sec.updateHumanAgent(userSystemId, min.instance.instanceId, null);
@ -166,22 +172,30 @@ export class FeedbackDialog extends IGBDialog {
user.systemUser = await sec.getUserFromSystemId(userSystemId);
await min.userProfile.set(step.context, user);
}
else if (user.systemUser.agentMode === 'human') {
} else if (user.systemUser.agentMode === 'human') {
const agent = await sec.getUserFromSystemId(user.systemUser.agentSystemId);
await min.whatsAppDirectLine.sendToDeviceEx(user.systemUser.userSystemId,
Messages[locale].notify_end_transfer(min.instance.botId), locale, step.context.activity.conversation.id);
await min.whatsAppDirectLine.sendToDeviceEx(
user.systemUser.userSystemId,
Messages[locale].notify_end_transfer(min.instance.botId),
locale,
step.context.activity.conversation.id
);
if (user.systemUser.agentSystemId.charAt(2) === ":" || userSystemId.indexOf('@') > -1) { // Agent is from Teams or Google Chat.
await min.conversationalService.sendText(min, step, Messages[locale].notify_end_transfer(min.instance.botId));
}
else {
await min.whatsAppDirectLine.sendToDeviceEx(user.systemUser.agentSystemId,
Messages[locale].notify_end_transfer(min.instance.botId), locale, step.context.activity.conversation.id);
if (user.systemUser.agentSystemId.charAt(2) === ':' || userSystemId.indexOf('@') > -1) {
// Agent is from Teams or Google Chat.
await min.conversationalService.sendText(
min,
step,
Messages[locale].notify_end_transfer(min.instance.botId)
);
} else {
await min.whatsAppDirectLine.sendToDeviceEx(
user.systemUser.agentSystemId,
Messages[locale].notify_end_transfer(min.instance.botId),
locale,
step.context.activity.conversation.id
);
}
await sec.updateHumanAgent(user.systemUser.userSystemId, min.instance.instanceId, null);
@ -189,15 +203,17 @@ export class FeedbackDialog extends IGBDialog {
user.systemUser = await sec.getUserFromSystemId(userSystemId);
await min.userProfile.set(step.context, user);
}
else {
if (user.systemUser.userSystemId.charAt(2) === ":" || userSystemId.indexOf('@') > -1) { // Agent is from Teams or Google Chat.
} else {
if (user.systemUser.userSystemId.charAt(2) === ':' || userSystemId.indexOf('@') > -1) {
// Agent is from Teams or Google Chat.
await min.conversationalService.sendText(min, step, 'Nenhum atendimento em andamento.');
}
else {
await min.whatsAppDirectLine.sendToDeviceEx(user.systemUser.userSystemId,
'Nenhum atendimento em andamento.', locale, step.context.activity.conversation.id);
} else {
await min.whatsAppDirectLine.sendToDeviceEx(
user.systemUser.userSystemId,
'Nenhum atendimento em andamento.',
locale,
step.context.activity.conversation.id
);
}
}
@ -211,8 +227,7 @@ export class FeedbackDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -238,8 +253,7 @@ export class FeedbackDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -259,14 +273,20 @@ export class FeedbackDialog extends IGBDialog {
const analytics = new AnalyticsService();
const rate = await analytics.updateConversationSuggestion(
min.instance.instanceId, user.conversation.conversationId, step.result, user.systemUser.locale);
min.instance.instanceId,
user.conversation.conversationId,
step.result,
user.systemUser.locale
);
if (rate > 0.5) {
await min.conversationalService.sendText(min, step, Messages[fixedLocale].glad_you_liked);
} else {
const message = min.core.getParam<string>(min.instance, 'Feedback Improve Message',
Messages[fixedLocale].we_will_improve); // TODO: Improve to be multi-language.
const message = min.core.getParam<string>(
min.instance,
'Feedback Improve Message',
Messages[fixedLocale].we_will_improve
); // TODO: Improve to be multi-language.
await min.conversationalService.sendText(min, step, message);
}

107
packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts
View file

@ -55,60 +55,63 @@ export class QualityDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
public static setup (bot: BotAdapter, min: GBMinInstance) {
const service = new CSService();
min.dialogs.add(new WaterfallDialog('/check', [
async step => {
const locale = step.context.activity.locale;
await min.conversationalService.sendText(min, step, Messages[locale].check_whatsapp_ok);
return await step.replaceDialog('/ask', { isReturning: true });
}
]
));
min.dialogs.add(new WaterfallDialog('/quality', [
async step => {
const locale = step.context.activity.locale;
const user = await min.userProfile.get(step.context, {});
const score = step.result;
if (score === 0) {
await min.conversationalService.sendText(min, step, Messages[locale].im_sorry_lets_try);
return await step.next();
} else {
await min.conversationalService.sendText(min, step, Messages[locale].great_thanks);
await min.conversationalService.sendEvent(min, step, 'play', {
playerType: 'markdown',
data: {
content: Messages[locale].great_thanks,
}
});
let sleep = ms => {
return new Promise(resolve => {
setTimeout(resolve, ms);
});
};
await service.insertQuestionAlternate(
min.instance.instanceId,
user.lastQuestion,
user.lastQuestionId
);
// Updates values to perform Bot Analytics.
const analytics = new AnalyticsService();
analytics.updateConversationSuggestion(
min.instance.instanceId, user.conversation, step.result, user.systemUser.locale);
// Goes to the ask loop.
return await step.replaceDialog('/ask', { emptyPrompt: true });
min.dialogs.add(
new WaterfallDialog('/check', [
async step => {
const locale = step.context.activity.locale;
await min.conversationalService.sendText(min, step, Messages[locale].check_whatsapp_ok);
return await step.replaceDialog('/ask', { isReturning: true });
}
}
]));
])
);
min.dialogs.add(
new WaterfallDialog('/quality', [
async step => {
const locale = step.context.activity.locale;
const user = await min.userProfile.get(step.context, {});
const score = step.result;
if (score === 0) {
await min.conversationalService.sendText(min, step, Messages[locale].im_sorry_lets_try);
return await step.next();
} else {
await min.conversationalService.sendText(min, step, Messages[locale].great_thanks);
await min.conversationalService.sendEvent(min, step, 'play', {
playerType: 'markdown',
data: {
content: Messages[locale].great_thanks
}
});
let sleep = ms => {
return new Promise(resolve => {
setTimeout(resolve, ms);
});
};
await service.insertQuestionAlternate(min.instance.instanceId, user.lastQuestion, user.lastQuestionId);
// Updates values to perform Bot Analytics.
const analytics = new AnalyticsService();
analytics.updateConversationSuggestion(
min.instance.instanceId,
user.conversation,
step.result,
user.systemUser.locale
);
// Goes to the ask loop.
return await step.replaceDialog('/ask', { emptyPrompt: true });
}
}
])
);
}
}

14
packages/customer-satisfaction.gbapp/index.ts
View file

@ -49,26 +49,26 @@ import { Sequelize } from 'sequelize-typescript';
*/
export class GBCustomerSatisfactionPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasQuestionAlternate]);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
FeedbackDialog.setup(min.bot, min);
QualityDialog.setup(min.bot, min);
}

22
packages/customer-satisfaction.gbapp/models/index.ts
View file

@ -36,16 +36,7 @@
'use strict';
import {
AutoIncrement,
BelongsTo,
Column,
DataType,
ForeignKey,
Model,
PrimaryKey,
Table
} from 'sequelize-typescript';
import { AutoIncrement, BelongsTo, Column, DataType, ForeignKey, Model, PrimaryKey, Table } from 'sequelize-typescript';
import { GuaribasInstance } from '../../core.gbapp/models/GBModel.js';
@ -54,22 +45,21 @@ import { GuaribasInstance } from '../../core.gbapp/models/GBModel.js';
*/
@Table
export class GuaribasQuestionAlternate extends Model<GuaribasQuestionAlternate> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare quickAnswerId: number;
quickAnswerId: number;
@Column(DataType.STRING(255))
declare questionTyped: string;
questionTyped: string;
@Column(DataType.STRING(255))
declare questionText: string;
questionText: string;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
}

14
packages/customer-satisfaction.gbapp/services/CSService.ts
View file

@ -39,11 +39,7 @@ import { GuaribasQuestionAlternate } from '../models/index.js';
* Customer Satisfaction Service Layer.
*/
export class CSService {
public async getQuestionFromAlternateText(
instanceId: number,
text: string): Promise<GuaribasQuestion> {
public async getQuestionFromAlternateText (instanceId: number, text: string): Promise<GuaribasQuestion> {
const questionAlternate = await GuaribasQuestionAlternate.findOne({
where: {
instanceId: instanceId,
@ -54,7 +50,6 @@ export class CSService {
let question: GuaribasQuestion = null;
if (questionAlternate !== null) {
question = await GuaribasQuestion.findOne({
where: {
instanceId: instanceId,
@ -66,17 +61,18 @@ export class CSService {
return question;
}
public async insertQuestionAlternate(
public async insertQuestionAlternate (
instanceId: number,
questionTyped: string,
questionText: string): Promise<GuaribasQuestionAlternate> {
questionText: string
): Promise<GuaribasQuestionAlternate> {
return await GuaribasQuestionAlternate.create(<GuaribasQuestionAlternate>{
questionTyped: questionTyped,
questionText: questionText
});
}
public async updateConversationRate(
public async updateConversationRate (
conversation: GuaribasConversation,
rate: number
): Promise<GuaribasConversation> {

25
packages/customer-satisfaction.gbapp/strings.ts
View file

@ -1,20 +1,20 @@
export const Messages = {
'en-US': {
about_suggestions: 'Suggestions are welcomed and improve my quality...',
what_about_service: 'What about my service?',
glad_you_liked: 'I\'m glad you liked. I\'m here for you.',
we_will_improve: 'Let\'s take note of that, thanks for sharing.',
glad_you_liked: "I'm glad you liked. I'm here for you.",
we_will_improve: "Let's take note of that, thanks for sharing.",
what_about_me: 'What about the service, please rate between 1 and 5.',
thanks: 'Thanks!',
im_sorry_lets_try: 'I\'m sorry. Let\'s try again...',
im_sorry_lets_try: "I'm sorry. Let's try again...",
great_thanks: 'Great, thanks for sharing your thoughts.',
please_no_bad_words: 'Please, no bad words.',
please_wait_transfering: 'Please, wait while I find an agent to answer you.',
notify_agent: (name) => `New call available for *${name}*, you can answer right here when you are finished, type /qt.`,
notify_end_transfer: (botName) => `All messages will be now routed to user ${botName}.`,
notify_agent_transfer_done: (person) => `Now talking directly to ${person}.`,
check_whatsapp_ok: 'If you are seeing this message, WhatsApp API is OK.',
notify_agent: name =>
`New call available for *${name}*, you can answer right here when you are finished, type /qt.`,
notify_end_transfer: botName => `All messages will be now routed to user ${botName}.`,
notify_agent_transfer_done: person => `Now talking directly to ${person}.`,
check_whatsapp_ok: 'If you are seeing this message, WhatsApp API is OK.'
},
'pt-BR': {
about_suggestions: 'Sugestões melhoram muito minha qualidade...',
@ -27,9 +27,10 @@ export const Messages = {
great_thanks: 'Ótimo, obrigado por contribuir com sua resposta.',
please_no_bad_words: 'Por favor, sem palavrões!',
please_wait_transfering: 'Por favor, aguarde enquanto eu localizo alguém para te atender.',
notify_agent: (name) => `Existe um novo atendimento para *${name}*, por favor, responda aqui mesmo para a pessoa. Para finalizar, digite /qt.`,
notify_end_transfer: (botName) => `Falando novamente com o bot ${botName}.`,
notify_agent_transfer_done: (person) => `Todas as mensagens agora sendo transmitidas para ${person}.`,
check_whatsapp_ok: 'Se você está recebendo esta mensagem, significa que a API do WhatsApp está OK.',
notify_agent: name =>
`Existe um novo atendimento para *${name}*, por favor, responda aqui mesmo para a pessoa. Para finalizar, digite /qt.`,
notify_end_transfer: botName => `Falando novamente com o bot ${botName}.`,
notify_agent_transfer_done: person => `Todas as mensagens agora sendo transmitidas para ${person}.`,
check_whatsapp_ok: 'Se você está recebendo esta mensagem, significa que a API do WhatsApp está OK.'
}
};

32
packages/default.gbui/package.json
View file

@ -8,26 +8,26 @@
"homepage": ".",
"dependencies": {
"@midudev/react-static-content": "^1.0.4",
"ajv": "^8.6.0",
"botframework-directlinejs": "0.14.1",
"botframework-webchat": "^4.13.0",
"ajv": "^8.11.2",
"botframework-directlinejs": "0.15.1",
"botframework-webchat": "^4.15.5",
"deep-extend": "0.6.0",
"eslint": "7.11.0",
"eslint": "8.28.0",
"fetch": "1.1.0",
"msal": "^1.4.11",
"powerbi-client": "2.18.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"msal": "^1.4.17",
"powerbi-client": "2.22.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-helmet": "6.1.0",
"react-modern-audio-player": "^1.2.2",
"react-player": "^2.9.0",
"react-modern-audio-player": "^1.3.0",
"react-player": "^2.11.0",
"react-powerbi": "0.9.1",
"react-scripts": "^4.0.3",
"react-super-seo": "^1.0.6",
"react-transition-group": "^4.4.2",
"rxjs": "^7.1.0",
"url-join": "4.0.1",
"webpack": "4.44.2"
"react-scripts": "^5.0.1",
"react-super-seo": "^1.0.7",
"react-transition-group": "^4.4.5",
"rxjs": "^7.5.7",
"url-join": "5.0.0",
"webpack": "5.75.0"
},
"scripts": {
"start": "react-scripts start",

17
packages/google-chat.gblib/index.ts
View file

@ -46,27 +46,24 @@ import { GoogleChatDirectLine } from './services/GoogleChatDirectLine.js';
export class GBGoogleChatPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {}
}
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
}

68
packages/google-chat.gblib/services/GoogleChatDirectLine.ts
View file

@ -43,7 +43,6 @@ import { SecService } from '../../security.gbapp/services/SecService.js';
* Support for Google Chat.
*/
export class GoogleChatDirectLine extends GBService {
public static conversationIds = {};
public pollInterval = 5000;
public directLineClientName = 'DirectLineClient';
@ -59,7 +58,7 @@ export class GoogleChatDirectLine extends GBService {
GoogleClientPrivateKey: any;
GoogleProjectId: any;
constructor(
constructor (
min: GBMinInstance,
botId,
directLineSecret,
@ -84,22 +83,19 @@ export class GoogleChatDirectLine extends GBService {
projectId: this.GoogleProjectId,
credentials: { client_email: GoogleClientEmail, private_key: GoogleClientPrivateKey }
});
}
public static async asyncForEach(array, callback) {
public static async asyncForEach (array, callback) {
for (let index = 0; index < array.length; index++) {
await callback(array[index], index, array);
}
}
public async setup(setUrl) {
this.directLineClient =
new Swagger({
spec: JSON.parse(Fs.readFileSync('directline-3.0.json', 'utf8')),
usePromise: true
});
public async setup (setUrl) {
this.directLineClient = new Swagger({
spec: JSON.parse(Fs.readFileSync('directline-3.0.json', 'utf8')),
usePromise: true
});
const client = await this.directLineClient;
client.clientAuthorizations.add(
@ -109,29 +105,24 @@ export class GoogleChatDirectLine extends GBService {
if (setUrl) {
try {
const subscription = this.pubSubClient.subscription(this.GoogleChatSubscriptionName);
subscription.on('message', this.receiver.bind(this));
} catch (error) {
GBLog.error(`Error initializing 3rd party GoogleChat provider(1) ${error.message}`);
}
}
}
public async resetConversationId(key) {
public async resetConversationId (key) {
GoogleChatDirectLine.conversationIds[key] = undefined;
}
public async check() {
public async check () {
GBLog.info(`GBGoogleChat: Checking server...`);
}
// TODO: Check service.Users.Messages.List("me").
public async receiver(message) {
public async receiver (message) {
const event = JSON.parse(Buffer.from(message.data, 'binary').toString());
let from = '';
@ -140,7 +131,6 @@ export class GoogleChatDirectLine extends GBService {
const threadName = event.message.thread.name;
if (event['type'] === 'ADDED_TO_SPACE' && event['space']['singleUserBotDm']) {
} else if (event['type'] === 'MESSAGE') {
text = event.message.text;
fromName = event.message.sender.displayName;
@ -150,8 +140,7 @@ export class GoogleChatDirectLine extends GBService {
message.ack();
const sec = new SecService();
const user = await sec.ensureUser(this.min.instance.instanceId, from,
from, '', 'googlechat', fromName, from);
const user = await sec.ensureUser(this.min.instance.instanceId, from, from, '', 'googlechat', fromName, from);
await sec.updateConversationReferenceById(user.userId, threadName);
@ -170,12 +159,11 @@ export class GoogleChatDirectLine extends GBService {
this.pollMessages(client, generatedConversationId, threadName, from, fromName);
this.inputMessage(client, generatedConversationId, threadName, text, from, fromName);
} else {
this.inputMessage(client, conversationId, threadName, text, from, fromName);
}
}
public inputMessage(client, conversationId, threadName, text, from, fromName) {
public inputMessage (client, conversationId, threadName, text, from, fromName) {
return client.Conversations.Conversations_PostActivity({
conversationId: conversationId,
activity: {
@ -192,7 +180,7 @@ export class GoogleChatDirectLine extends GBService {
});
}
public pollMessages(client, conversationId, threadName, from, fromName) {
public pollMessages (client, conversationId, threadName, from, fromName) {
GBLog.info(`GBGoogleChat: Starting message polling(${from}, ${conversationId}).`);
let watermark: any;
@ -212,7 +200,7 @@ export class GoogleChatDirectLine extends GBService {
setInterval(worker, this.pollInterval);
}
public async printMessages(activities, conversationId, threadName, from, fromName) {
public async printMessages (activities, conversationId, threadName, from, fromName) {
if (activities && activities.length) {
// Ignore own messages.
@ -228,7 +216,7 @@ export class GoogleChatDirectLine extends GBService {
}
}
public async printMessage(activity, conversationId, threadName, from, fromName) {
public async printMessage (activity, conversationId, threadName, from, fromName) {
let output = '';
if (activity.text) {
@ -252,25 +240,16 @@ export class GoogleChatDirectLine extends GBService {
await this.sendToDevice(from, conversationId, threadName, output);
}
public async sendToDevice(from: string, conversationId: string, threadName, msg: string) {
public async sendToDevice (from: string, conversationId: string, threadName, msg: string) {
try {
let threadParts = threadName.split('/');
let spaces = threadParts[1];
let threadKey = threadParts[3];
const scopes = ['https://www.googleapis.com/auth/chat.bot'];
const jwtClient = new google.auth.JWT(
this.GoogleClientEmail,
null,
this.GoogleClientPrivateKey,
scopes,
null
);
const jwtClient = new google.auth.JWT(this.GoogleClientEmail, null, this.GoogleClientPrivateKey, scopes, null);
await jwtClient.authorize();
const chat = google.chat({version: 'v1', auth: jwtClient});
const chat = google.chat({ version: 'v1', auth: jwtClient });
const res = await chat.spaces.messages.create({
parent: `spaces/${spaces}`,
@ -286,15 +265,10 @@ export class GoogleChatDirectLine extends GBService {
}
}
public async sendToDeviceEx(to, conversationId, threadName, text, locale) {
public async sendToDeviceEx (to, conversationId, threadName, text, locale) {
const minBoot = GBServer.globals.minBoot as any;
text = await minBoot.conversationalService.translate(
minBoot,
text,
locale
);
text = await minBoot.conversationalService.translate(minBoot, text, locale);
await this.sendToDevice(to, conversationId, threadName, text);
}
}
}

4
packages/google-chat.gblib/strings.ts
View file

@ -1,8 +1,8 @@
export const Messages = {
'en-US': {
notify_end_transfer: (botName) => `Now talking to ${botName} again.`
notify_end_transfer: botName => `Now talking to ${botName} again.`
},
'pt-BR': {
notify_end_transfer: (botName) => `Falando com o bot ${botName} novamente.`
notify_end_transfer: botName => `Falando com o bot ${botName} novamente.`
}
};

17
packages/hubspot.gblib/index.ts
View file

@ -45,27 +45,24 @@ import { Sequelize } from 'sequelize-typescript';
export class GBHubSpotPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {}
}
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
}

7
packages/hubspot.gblib/services/HubSpotServices.ts
View file

@ -30,17 +30,12 @@
| |
\*****************************************************************************/
import { GBLog, GBMinInstance, GBService } from 'botlib';
import { promisify } from 'util';
import Swagger from 'swagger-client';
import * as hubspot from '@hubspot/api-client';
/**
* Support for Hub Spot XRM.
*/
export class HubSpotServices extends GBService {
}
export class HubSpotServices extends GBService {}

8
packages/hubspot.gblib/strings.ts
View file

@ -1,8 +1,4 @@
export const Messages = {
'en-US': {
},
'pt-BR': {
}
'en-US': {},
'pt-BR': {}
};

75
packages/kb.gbapp/dialogs/AskDialog.ts
View file

@ -69,7 +69,7 @@ export class AskDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
public static setup (bot: BotAdapter, min: GBMinInstance) {
const service = new KBService(min.core.sequelize);
const importer = new GBImporter(min.core);
this.deployer = new GBDeployer(min.core, importer);
@ -79,13 +79,12 @@ export class AskDialog extends IGBDialog {
min.dialogs.add(new WaterfallDialog('/ask', AskDialog.getAskDialog(min)));
}
private static getAskDialog(min: GBMinInstance) {
private static getAskDialog (min: GBMinInstance) {
return [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -101,9 +100,9 @@ export class AskDialog extends IGBDialog {
if (step.options && step.options.firstTime) {
text = Messages[locale].ask_first_time;
} else if (step.options && step.options.isReturning) {
text = ""; // REMOVED: Messages[locale].anything_else;
text = ''; // REMOVED: Messages[locale].anything_else;
} else if (step.options && step.options.emptyPrompt) {
text = "";
text = '';
} else if (user.subjects.length > 0) {
text = Messages[locale].which_question;
} else {
@ -111,7 +110,6 @@ export class AskDialog extends IGBDialog {
}
return await min.conversationalService.prompt(min, step, text);
},
async step => {
if (step.result) {
@ -120,7 +118,15 @@ export class AskDialog extends IGBDialog {
let sec = new SecService();
const member = step.context.activity.from;
const user = await sec.ensureUser(min.instance.instanceId, member.id, member.name, '', 'web', member.name, null);
const user = await sec.ensureUser(
min.instance.instanceId,
member.id,
member.name,
'',
'web',
member.name,
null
);
let handled = false;
let nextDialog = null;
@ -132,9 +138,7 @@ export class AskDialog extends IGBDialog {
user: user ? user['dataValues'] : null
};
await CollectionUtil.asyncForEach(min.appPackages, async (e: IGBPackage) => {
if (
nextDialog = await e.onExchangeData(min, 'handleAnswer', data)
) {
if ((nextDialog = await e.onExchangeData(min, 'handleAnswer', data))) {
handled = true;
}
});
@ -153,13 +157,12 @@ export class AskDialog extends IGBDialog {
];
}
private static getAnswerDialog(min: GBMinInstance, service: KBService) {
private static getAnswerDialog (min: GBMinInstance, service: KBService) {
return [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -176,8 +179,7 @@ export class AskDialog extends IGBDialog {
// when people type just the @botName in MSTEAMS for example.
if (!text) {
const startDialog =
min.core.getParam(min.instance, 'Start Dialog', null);
const startDialog = min.core.getParam(min.instance, 'Start Dialog', null);
if (startDialog) {
await GBVMService.callVM(startDialog.toLowerCase().trim(), min, step, this.deployer, false);
}
@ -189,7 +191,7 @@ export class AskDialog extends IGBDialog {
// Stops any content on projector.
if (step.context.activity.channelId !== 'msteams') {
await min.conversationalService.sendEvent(min, step, 'stop', undefined);
await min.conversationalService.sendEvent(min, step, 'stop', undefined);
}
// Handle extra text from FAQ.
@ -201,8 +203,11 @@ export class AskDialog extends IGBDialog {
// Searches KB for the first time.
const searchScore = min.core.getParam(min.instance, 'Search Score',
min.instance.searchScore ? min.instance.searchScore : minBoot.instance.searchScore);
const searchScore = min.core.getParam(
min.instance,
'Search Score',
min.instance.searchScore ? min.instance.searchScore : minBoot.instance.searchScore
);
user.lastQuestion = text;
await min.userProfile.set(step.context, user);
@ -256,7 +261,7 @@ export class AskDialog extends IGBDialog {
// Tries to answer by NLP.
let nextDialog = await min.conversationalService["routeNLP2"](step, min, text);
let nextDialog = await min.conversationalService['routeNLP2'](step, min, text);
if (nextDialog) {
return nextDialog;
}
@ -270,39 +275,36 @@ export class AskDialog extends IGBDialog {
const docs = await min.kbService['getDocs'](min.instance.instanceId);
await CollectionUtil.asyncForEach(docs, async (doc: GuaribasAnswer) => {
if (!answered) {
const answerText = await min.kbService['readComprehension'](min.instance.instanceId, doc.content, text);
answered = true;
text = await min.conversationalService.translate(min, text, user.systemUser.locale
? user.systemUser.locale
: min.core.getParam<string>(min.instance, 'Locale', GBConfigService.get('LOCALE')));
text = await min.conversationalService.translate(
min,
text,
user.systemUser.locale
? user.systemUser.locale
: min.core.getParam<string>(min.instance, 'Locale', GBConfigService.get('LOCALE'))
);
await min.conversationalService.sendText(min, step, answerText);
await min.conversationalService.sendEvent(min, step, 'stop', undefined);
}
});
return await step.replaceDialog('/ask', { isReturning: true });
}
// Not found.
const message = min.core.getParam<string>(min.instance, 'Not Found Message',
Messages[locale].did_not_find);
const message = min.core.getParam<string>(min.instance, 'Not Found Message', Messages[locale].did_not_find);
await min.conversationalService.sendText(min, step, message);
return await step.replaceDialog('/ask', { isReturning: true });
}
];
}
private static async handleAnswer(service: KBService, min: GBMinInstance, step: any, answer: GuaribasAnswer) {
private static async handleAnswer (service: KBService, min: GBMinInstance, step: any, answer: GuaribasAnswer) {
const text = answer.content;
if (text.endsWith('.docx')) {
const mainName = GBVMService.getMethodNameFromVBSFilename(text);
return await GBVMService.callVM(mainName, min, step, this.deployer, false);
} else {
@ -311,17 +313,16 @@ export class AskDialog extends IGBDialog {
}
}
private static getChannel(step): string {
private static getChannel (step): string {
return !isNaN(step.context.activity['mobile']) ? 'whatsapp' : step.context.activity.channelId;
}
private static getAnswerEventDialog(service: KBService, min: GBMinInstance) {
private static getAnswerEventDialog (service: KBService, min: GBMinInstance) {
return [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
@ -330,7 +331,7 @@ export class AskDialog extends IGBDialog {
const data = step.options as AskDialogArgs;
if (data !== undefined && data.questionId !== undefined) {
const question = await service.getQuestionById(min.instance.instanceId, data.questionId);
const answer = await service.getAnswerById(min.instance.instanceId, question.answerId );
const answer = await service.getAnswerById(min.instance.instanceId, question.answerId);
// Sends the answer to all outputs, including projector.
await service.sendAnswer(min, AskDialog.getChannel(step), step, answer);
await step.replaceDialog('/ask', { isReturning: true });

46
packages/kb.gbapp/dialogs/FaqDialog.ts
View file

@ -53,34 +53,34 @@ export class FaqDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
public static setup (bot: BotAdapter, min: GBMinInstance) {
const service = new KBService(min.core.sequelize);
min.dialogs.add(new WaterfallDialog('/faq', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
return await step.next(step.options);
}
},
min.dialogs.add(
new WaterfallDialog('/faq', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
} else {
return await step.next(step.options);
}
},
async step => {
const data = await service.getFaqBySubjectArray(min.instance.instanceId, 'faq', undefined);
const locale = step.context.activity.locale;
if (data !== undefined) {
await min.conversationalService.sendEvent(min, step, 'play', {
playerType: 'bullet',
data: data.slice(0, 10)
});
async step => {
const data = await service.getFaqBySubjectArray(min.instance.instanceId, 'faq', undefined);
const locale = step.context.activity.locale;
if (data !== undefined) {
await min.conversationalService.sendEvent(min, step, 'play', {
playerType: 'bullet',
data: data.slice(0, 10)
});
await min.conversationalService.sendText(min, step, Messages[locale].see_faq);
await min.conversationalService.sendText(min, step, Messages[locale].see_faq);
return await step.next();
return await step.next();
}
}
}
]));
])
);
}
}

17
packages/kb.gbapp/dialogs/MenuDialog.ts
View file

@ -64,19 +64,18 @@ export class MenuDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(bot: BotAdapter, min: GBMinInstance) {
public static setup (bot: BotAdapter, min: GBMinInstance) {
const service = new KBService(min.core.sequelize);
min.dialogs.add(new WaterfallDialog('/menu', MenuDialog.getMenuDialog(min, service)));
}
private static getMenuDialog(min: GBMinInstance, service: KBService) {
private static getMenuDialog (min: GBMinInstance, service: KBService) {
return [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
} else {
return await step.next(step.options);
}
},
@ -103,8 +102,7 @@ export class MenuDialog extends IGBDialog {
// Whenever a subject is selected, shows a faq about it.
if (user.subjects.length > 0) {
const list = await service.getFaqBySubjectArray(min.instance.instanceId,
'menu', user.subjects);
const list = await service.getFaqBySubjectArray(min.instance.instanceId, 'menu', user.subjects);
await min.conversationalService.sendEvent(min, step, 'play', {
playerType: 'bullet',
data: list.slice(0, 10)
@ -142,10 +140,11 @@ export class MenuDialog extends IGBDialog {
attachments.push(card);
});
if (attachments.length === 0) {
if (user.subjects && user.subjects.length > 0) {
await min.conversationalService.sendText(min, step,
Messages[locale].lets_search(KBService.getFormattedSubjectItems(user.subjects))
await min.conversationalService.sendText(
min,
step,
Messages[locale].lets_search(KBService.getFormattedSubjectItems(user.subjects))
);
}
} else {

14
packages/kb.gbapp/index.ts
View file

@ -48,26 +48,26 @@ import { GuaribasAnswer, GuaribasQuestion, GuaribasSubject } from './models/inde
*/
export class GBKBPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasAnswer, GuaribasQuestion, GuaribasSubject]);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
AskDialog.setup(min.bot, min);
FaqDialog.setup(min.bot, min);
MenuDialog.setup(min.bot, min);

99
packages/kb.gbapp/models/index.ts
View file

@ -54,10 +54,7 @@ import {
UpdatedAt
} from 'sequelize-typescript';
import {
GuaribasInstance,
GuaribasPackage
} from '../../core.gbapp/models/GBModel.js';
import { GuaribasInstance, GuaribasPackage } from '../../core.gbapp/models/GBModel.js';
import { GuaribasUser } from '../../security.gbapp/models/index.js';
/**
@ -68,53 +65,53 @@ export class GuaribasSubject extends Model<GuaribasSubject> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare subjectId: number;
subjectId: number;
@Column(DataType.INTEGER)
declare internalId: string;
internalId: string;
@Column(DataType.STRING(255))
declare title: string;
title: string;
@Column(DataType.STRING(512))
declare description: string;
description: string;
@Column(DataType.STRING(255))
declare from: string;
from: string;
@Column(DataType.STRING(255))
declare to: string;
to: string;
@ForeignKey(() => GuaribasSubject)
@Column(DataType.INTEGER)
declare parentSubjectId: number;
parentSubjectId: number;
@BelongsTo(() => GuaribasSubject, 'parentSubjectId')
declare parentSubject: GuaribasSubject;
parentSubject: GuaribasSubject;
@HasMany(() => GuaribasSubject, { foreignKey: 'parentSubjectId' })
declare childrenSubjects: GuaribasSubject[];
childrenSubjects: GuaribasSubject[];
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@ForeignKey(() => GuaribasUser)
@Column(DataType.INTEGER)
declare responsibleUserId: number;
responsibleUserId: number;
@BelongsTo(() => GuaribasUser)
declare responsibleUser: GuaribasUser;
responsibleUser: GuaribasUser;
@ForeignKey(() => GuaribasPackage)
@Column(DataType.INTEGER)
declare packageId: number;
packageId: number;
@BelongsTo(() => GuaribasPackage)
declare package: GuaribasPackage;
package: GuaribasPackage;
}
/**
@ -125,62 +122,61 @@ export class GuaribasQuestion extends Model<GuaribasQuestion> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare questionId: number;
questionId: number;
@Column(DataType.STRING(64))
declare subject1: string;
subject1: string;
@Column(DataType.STRING(64))
declare subject2: string;
subject2: string;
@Column(DataType.STRING(64))
declare subject3: string;
subject3: string;
@Column(DataType.STRING(64))
declare subject4: string;
subject4: string;
@Column(DataType.STRING(1024))
declare keywords: string;
keywords: string;
@Column(DataType.BOOLEAN)
declare skipIndex: boolean;
skipIndex: boolean;
@Column(DataType.STRING(512))
declare from: string;
from: string;
@Column(DataType.STRING(512))
declare to: string;
to: string;
@Column(DataType.TEXT)
declare content: string;
content: string;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
//tslint:disable-next-line:no-use-before-declare
@ForeignKey(() => GuaribasAnswer)
@Column(DataType.INTEGER)
declare answerId: number;
answerId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@ForeignKey(() => GuaribasPackage)
@Column(DataType.INTEGER)
declare packageId: number;
packageId: number;
@BelongsTo(() => GuaribasPackage)
declare package: GuaribasPackage;
package: GuaribasPackage;
}
/**
@ -191,53 +187,52 @@ export class GuaribasAnswer extends Model<GuaribasAnswer> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare answerId: number;
answerId: number;
@Length({ min: 0, max: 512 })
@Column(DataType.STRING(512))
declare media: string;
media: string;
@Length({ min: 0, max: 12 })
@Column(DataType.STRING(12))
declare format: string;
format: string;
@Column(DataType.TEXT)
declare content: string;
content: string;
@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;
@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;
updatedAt: Date;
@HasMany(() => GuaribasQuestion)
declare questions: GuaribasQuestion[];
questions: GuaribasQuestion[];
@HasOne(() => GuaribasQuestion)
declare prev: GuaribasQuestion;
prev: GuaribasQuestion;
@HasOne(() => GuaribasQuestion)
declare next: GuaribasQuestion;
next: GuaribasQuestion;
@ForeignKey(() => GuaribasQuestion)
@Column(DataType.INTEGER)
declare nextId: number;
nextId: number;
@ForeignKey(() => GuaribasQuestion)
@Column(DataType.INTEGER)
declare prevId: number;
prevId: number;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@ForeignKey(() => GuaribasPackage)
@Column(DataType.INTEGER)
declare packageId: number;
packageId: number;
@BelongsTo(() => GuaribasPackage)
declare package: GuaribasPackage;
package: GuaribasPackage;
}

64
packages/kb.gbapp/services/KBService.ts
View file

@ -80,11 +80,11 @@ export class KBServiceSearchResults {
export class KBService implements IGBKBService {
public sequelize: Sequelize;
constructor(sequelize: Sequelize) {
constructor (sequelize: Sequelize) {
this.sequelize = sequelize;
}
public static getFormattedSubjectItems(subjects: GuaribasSubject[]) {
public static getFormattedSubjectItems (subjects: GuaribasSubject[]) {
if (subjects === null) {
return '';
}
@ -96,7 +96,7 @@ export class KBService implements IGBKBService {
return out.join(', ');
}
public static getSubjectItemsSeparatedBySpaces(subjects: GuaribasSubject[]) {
public static getSubjectItemsSeparatedBySpaces (subjects: GuaribasSubject[]) {
const out = [];
if (subjects === undefined) {
return '';
@ -108,7 +108,7 @@ export class KBService implements IGBKBService {
return out.join(' ');
}
public async getAnswerTextByMediaName(instanceId: number, answerMediaName: string): Promise<string> {
public async getAnswerTextByMediaName (instanceId: number, answerMediaName: string): Promise<string> {
const answer = await GuaribasAnswer.findOne({
where: {
instanceId: instanceId,
@ -119,7 +119,7 @@ export class KBService implements IGBKBService {
return answer != undefined ? answer.content : null;
}
public async getQuestionById(instanceId: number, questionId: number): Promise<GuaribasQuestion> {
public async getQuestionById (instanceId: number, questionId: number): Promise<GuaribasQuestion> {
return GuaribasQuestion.findOne({
where: {
instanceId: instanceId,
@ -128,7 +128,7 @@ export class KBService implements IGBKBService {
});
}
public async getAnswerById(instanceId: number, answerId: number): Promise<GuaribasAnswer> {
public async getAnswerById (instanceId: number, answerId: number): Promise<GuaribasAnswer> {
return GuaribasAnswer.findOne({
where: {
instanceId: instanceId,
@ -140,7 +140,7 @@ export class KBService implements IGBKBService {
/**
* Returns a question object given a SEO friendly URL.
*/
public async getQuestionIdFromURL(core: IGBCoreService, url: string) {
public async getQuestionIdFromURL (core: IGBCoreService, url: string) {
// Extracts questionId from URL.
const id = url.substr(url.lastIndexOf('-') + 1);
@ -164,7 +164,7 @@ export class KBService implements IGBKBService {
return question;
}
public static async getQuestionsNER(instanceId: number) {
public static async getQuestionsNER (instanceId: number) {
const where = {
instanceId: instanceId,
content: { [Op.like]: `%(%` }
@ -177,7 +177,7 @@ export class KBService implements IGBKBService {
return questions;
}
public async getQuestionsSEO(instanceId: number) {
public async getQuestionsSEO (instanceId: number) {
const questions = await GuaribasQuestion.findAll({
where: {
instanceId: instanceId
@ -195,7 +195,7 @@ export class KBService implements IGBKBService {
return output;
}
public async getDocs(instanceId: number) {
public async getDocs (instanceId: number) {
return await GuaribasAnswer.findAll({
where: {
instanceId: instanceId,
@ -204,7 +204,7 @@ export class KBService implements IGBKBService {
});
}
public async getAnswerByText(instanceId: number, text: string, from: string = null): Promise<any> {
public async getAnswerByText (instanceId: number, text: string, from: string = null): Promise<any> {
text = text.trim();
const service = new CSService();
@ -247,11 +247,11 @@ export class KBService implements IGBKBService {
return undefined;
}
public async addAnswer(obj: GuaribasAnswer): Promise<GuaribasAnswer> {
public async addAnswer (obj: GuaribasAnswer): Promise<GuaribasAnswer> {
return await GuaribasAnswer.create(obj);
}
public async ask(
public async ask (
instance: IGBInstance,
query: string,
searchScore: number,
@ -350,7 +350,7 @@ export class KBService implements IGBKBService {
}
}
public async getSubjectItems(instanceId: number, parentId: number): Promise<GuaribasSubject[]> {
public async getSubjectItems (instanceId: number, parentId: number): Promise<GuaribasSubject[]> {
const where = { parentSubjectId: parentId, instanceId: instanceId };
return GuaribasSubject.findAll({
@ -358,7 +358,7 @@ export class KBService implements IGBKBService {
});
}
public async getFaqBySubjectArray(instanceId: number, from: string, subjects: any): Promise<GuaribasQuestion[]> {
public async getFaqBySubjectArray (instanceId: number, from: string, subjects: any): Promise<GuaribasQuestion[]> {
if (subjects) {
const where = {
from: from,
@ -400,13 +400,13 @@ export class KBService implements IGBKBService {
}
}
public static async getGroupReplies(instanceId: number): Promise<GuaribasQuestion[]> {
public static async getGroupReplies (instanceId: number): Promise<GuaribasQuestion[]> {
return await GuaribasQuestion.findAll({
where: { from: 'group', instanceId: instanceId }
});
}
public async importKbTabularFile(
public async importKbTabularFile (
filePath: string,
instanceId: number,
packageId: number
@ -572,7 +572,7 @@ export class KBService implements IGBKBService {
return await GuaribasQuestion.bulkCreate(questions);
}
public async sendAnswer(min: GBMinInstance, channel: string, step: GBDialogStep, answer: GuaribasAnswer) {
public async sendAnswer (min: GBMinInstance, channel: string, step: GBDialogStep, answer: GuaribasAnswer) {
if (answer.content.endsWith('.mp4')) {
await this.playVideo(min, min.conversationalService, step, answer, channel);
} else if (
@ -606,7 +606,7 @@ export class KBService implements IGBKBService {
}
}
public async importKbPackage(
public async importKbPackage (
min: GBMinInstance,
localPath: string,
packageStorage: GuaribasPackage,
@ -636,7 +636,7 @@ export class KBService implements IGBKBService {
/**
* Import all .md files in articles folder that has not been referenced by tabular files.
*/
public async importRemainingArticles(localPath: string, instance: IGBInstance, packageId: number): Promise<any> {
public async importRemainingArticles (localPath: string, instance: IGBInstance, packageId: number): Promise<any> {
const files = await walkPromise(urlJoin(localPath, 'articles'));
await CollectionUtil.asyncForEach(files, async file => {
@ -663,7 +663,7 @@ export class KBService implements IGBKBService {
/**
* Import all .docx files in reading comprehension folder.
*/
public async importDocs(
public async importDocs (
min: GBMinInstance,
localPath: string,
instance: IGBInstance,
@ -701,7 +701,7 @@ export class KBService implements IGBKBService {
}
}
public async importKbTabularDirectory(localPath: string, instance: IGBInstance, packageId: number): Promise<any> {
public async importKbTabularDirectory (localPath: string, instance: IGBInstance, packageId: number): Promise<any> {
const files = await walkPromise(localPath);
await CollectionUtil.asyncForEach(files, async file => {
@ -711,7 +711,7 @@ export class KBService implements IGBKBService {
});
}
public async importSubjectFile(packageId: number, filename: string, instance: IGBInstance): Promise<any> {
public async importSubjectFile (packageId: number, filename: string, instance: IGBInstance): Promise<any> {
const subjectsLoaded = JSON.parse(Fs.readFileSync(filename, 'utf8'));
const doIt = async (subjects: GuaribasSubject[], parentSubjectId: number) => {
@ -738,7 +738,7 @@ export class KBService implements IGBKBService {
return doIt(subjectsLoaded.children, undefined);
}
public async undeployKbFromStorage(instance: IGBInstance, deployer: GBDeployer, packageId: number) {
public async undeployKbFromStorage (instance: IGBInstance, deployer: GBDeployer, packageId: number) {
await GuaribasQuestion.destroy({
where: { instanceId: instance.instanceId, packageId: packageId }
});
@ -751,7 +751,7 @@ export class KBService implements IGBKBService {
await this.undeployPackageFromStorage(instance, packageId);
}
public static async RefreshNER(min: GBMinInstance) {
public static async RefreshNER (min: GBMinInstance) {
const questions = await KBService.getQuestionsNER(min.instance.instanceId);
const contentLocale = min.core.getParam<string>(
min.instance,
@ -778,7 +778,7 @@ export class KBService implements IGBKBService {
*
* @param localPath Path to the .gbkb folder.
*/
public async deployKb(core: IGBCoreService, deployer: GBDeployer, localPath: string, min: GBMinInstance) {
public async deployKb (core: IGBCoreService, deployer: GBDeployer, localPath: string, min: GBMinInstance) {
const packageName = Path.basename(localPath);
GBLog.info(`[GBDeployer] Opening package: ${localPath}`);
@ -796,7 +796,7 @@ export class KBService implements IGBKBService {
GBLog.info(`[GBDeployer] Finished import of ${localPath}`);
}
private async playAudio(
private async playAudio (
min: GBMinInstance,
answer: GuaribasAnswer,
channel: string,
@ -806,7 +806,7 @@ export class KBService implements IGBKBService {
conversationalService.sendAudio(min, step, answer.content);
}
private async playUrl(
private async playUrl (
min,
conversationalService: IGBConversationalService,
step: GBDialogStep,
@ -823,7 +823,7 @@ export class KBService implements IGBKBService {
}
}
private async playVideo(
private async playVideo (
min,
conversationalService: IGBConversationalService,
step: GBDialogStep,
@ -840,13 +840,13 @@ export class KBService implements IGBKBService {
}
}
private async undeployPackageFromStorage(instance: any, packageId: number) {
private async undeployPackageFromStorage (instance: any, packageId: number) {
await GuaribasPackage.destroy({
where: { instanceId: instance.instanceId, packageId: packageId }
});
}
public async readComprehension(instanceId: number, doc: string, question: string) {
public async readComprehension (instanceId: number, doc: string, question: string) {
const options = {
timeout: 60000 * 5,
uri: `http://${process.env.GBMODELS_SERVER}/reading-comprehension`,
@ -858,7 +858,7 @@ export class KBService implements IGBKBService {
return await request.post(options);
}
private async getTextFromFile(filename: string) {
private async getTextFromFile (filename: string) {
return new Promise<string>(async (resolve, reject) => {
textract.fromFileWithPath(filename, { preserveLineBreaks: true }, (error, text) => {
if (error) {

21
packages/kb.gbapp/strings.ts
View file

@ -1,32 +1,27 @@
export const Messages = {
'en-US': {
did_not_find: 'I\'m sorry I didn\'t find anything.',
did_not_find: "I'm sorry I didn't find anything.",
going_answer: 'Great choice, now looking for your answer...',
wider_answer: subjectText =>
`Answering to you in a broader way... Not just about ${subjectText}.`,
which_question: 'What\'s your question?',
wider_answer: subjectText => `Answering to you in a broader way... Not just about ${subjectText}.`,
which_question: "What's your question?",
anything_else: 'Can I help you with anything else?',
here_is_subjects: 'Here are some subjects to choose from...',
menu_select: 'Select',
lets_search: query =>
`Lets search for ${query}... What do you want to know?`,
see_faq: 'Please take a look at the FAQ I\'ve prepared for you. You can click on them to get the answer.',
lets_search: query => `Lets search for ${query}... What do you want to know?`,
see_faq: "Please take a look at the FAQ I've prepared for you. You can click on them to get the answer.",
ask_first_time: 'What are you looking for?'
},
'pt-BR': {
did_not_find: 'Desculpe-me, não encontrei nada a respeito.',
going_answer: 'Ótima escolha, procurando resposta para sua questão...',
wider_answer: subjectText =>
`Vou te responder de modo mais abrangente... Não apenas sobre ${subjectText}`,
wider_answer: subjectText => `Vou te responder de modo mais abrangente... Não apenas sobre ${subjectText}`,
which_question: 'Qual a pergunta?',
anything_else: 'Posso ajudar em algo mais?',
here_is_subjects: 'Aqui estão algumas categorias de assuntos...',
menu_select: 'Selecionar',
lets_search: query =>
`Let's search about ${query}... What do you want to know?`,
see_faq:
'Veja algumas perguntas mais frequentes logo na tela. Clique numa delas para eu responder.',
lets_search: query => `Let's search about ${query}... What do you want to know?`,
see_faq: 'Veja algumas perguntas mais frequentes logo na tela. Clique numa delas para eu responder.',
ask_first_time: 'Como eu posso ajudar?'
}

2
packages/security.gbapp/dialogs/OAuthDialog.ts
View file

@ -44,7 +44,7 @@ import { Messages } from '../strings.js';
* Dialogs for handling Menu control.
*/
export class OAuthDialog extends IGBDialog {
public static getOAuthDialog(min: GBMinInstance) {
public static getOAuthDialog (min: GBMinInstance) {
return {
id: '/auth',
waterfall: [

60
packages/security.gbapp/dialogs/ProfileDialog.ts
View file

@ -36,7 +36,6 @@
'use strict';
import { GBLog, GBMinInstance, IGBDialog } from 'botlib';
import { GBAdminService } from '../../admin.gbapp/services/GBAdminService.js';
import { Messages } from '../strings.js';
@ -46,16 +45,14 @@ import * as phone from 'google-libphonenumber';
* Dialogs for handling Menu control.
*/
export class ProfileDialog extends IGBDialog {
public static getNameDialog(min: GBMinInstance) {
public static getNameDialog (min: GBMinInstance) {
return {
id: '/profile_name', waterfall: [
id: '/profile_name',
waterfall: [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
} else {
return await step.next(step.options);
}
},
@ -67,7 +64,7 @@ export class ProfileDialog extends IGBDialog {
async step => {
const locale = step.context.activity.locale;
const fullName = (text) => {
const fullName = text => {
return text.match(/^[a-zA-Z]+(([',. -][a-zA-Z ])?[a-zA-Z]*)*$/gi);
};
@ -80,21 +77,20 @@ export class ProfileDialog extends IGBDialog {
step.activeDialog.state.options.name = value[0];
return await step.replaceDialog('/profile_mobile', step.activeDialog.state.options);
}
}]
}
]
};
}
public static getMobileDialog(min: GBMinInstance) {
public static getMobileDialog (min: GBMinInstance) {
return {
id: '/profile_mobile', waterfall: [
id: '/profile_mobile',
waterfall: [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
} else {
return await step.next(step.options);
}
},
@ -125,19 +121,19 @@ export class ProfileDialog extends IGBDialog {
return await step.replaceDialog('/profile_mobile_confirm', step.activeDialog.state.options);
}
}]
}
]
};
}
public static getMobileConfirmDialog(min: GBMinInstance) {
public static getMobileConfirmDialog (min: GBMinInstance) {
return {
id: '/profile_mobile_confirm', waterfall: [
id: '/profile_mobile_confirm',
waterfall: [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
} else {
return await step.next(step.options);
}
},
@ -146,8 +142,10 @@ export class ProfileDialog extends IGBDialog {
const locale = step.context.activity.locale;
const from = step.activeDialog.state.options.mobile;
if (min.whatsAppDirectLine) {
await min.whatsAppDirectLine.sendToDevice(from, `${step.activeDialog.state.options.mobileCode} is your General Bots creation code.`);
await min.whatsAppDirectLine.sendToDevice(
from,
`${step.activeDialog.state.options.mobileCode} is your General Bots creation code.`
);
} else {
GBLog.info(`WhatsApp not configured. Here is the code: ${step.activeDialog.state.options.mobileCode}.`);
}
@ -164,18 +162,19 @@ export class ProfileDialog extends IGBDialog {
} else {
await step.replaceDialog('/profile_email', step.activeDialog.state.options);
}
}]
}
]
};
}
public static getEmailDialog(min: GBMinInstance) {
public static getEmailDialog (min: GBMinInstance) {
return {
id: '/profile_email', waterfall: [
id: '/profile_email',
waterfall: [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else{
} else {
return await step.next(step.options);
}
},
@ -186,7 +185,7 @@ export class ProfileDialog extends IGBDialog {
async step => {
const locale = step.context.activity.locale;
const extractEntity = (text) => {
const extractEntity = text => {
return text.match(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+)/gi);
};
@ -199,7 +198,8 @@ export class ProfileDialog extends IGBDialog {
step.activeDialog.state.options.email = value[0];
await step.replaceDialog(`/${step.activeDialog.state.options.nextDialog}`, step.activeDialog.state.options);
}
}]
}
]
};
}
}

16
packages/security.gbapp/index.ts
View file

@ -47,8 +47,7 @@ import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from './models/index.j
*/
export class GBSecurityPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
const out = [
ProfileDialog.getNameDialog(min),
ProfileDialog.getEmailDialog(min),
@ -60,25 +59,24 @@ export class GBSecurityPackage implements IGBPackage {
out.push(OAuthDialog.getOAuthDialog(min));
}
return out;
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`loadBot called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasGroup, GuaribasUser, GuaribasUserGroup]);
}
}

50
packages/security.gbapp/models/index.ts
View file

@ -58,46 +58,46 @@ export class GuaribasUser extends Model<GuaribasUser> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare userId: number;
userId: number;
@Column(DataType.STRING(255))
declare displayName: string;
displayName: string;
@Column(DataType.INTEGER)
declare userSystemId: string;
userSystemId: string;
@Column(DataType.STRING(255))
declare userName: string;
userName: string;
@Column(DataType.STRING(255))
declare defaultChannel: string;
defaultChannel: string;
@Column(DataType.STRING(255))
declare email: string;
email: string;
@Column(DataType.STRING(5))
declare locale: string;
locale: string;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@Column(DataType.INTEGER)
declare agentSystemId: string;
agentSystemId: string;
@Column(DataType.DATE)
declare agentContacted: Date;
agentContacted: Date;
@Column(DataType.STRING(16))
declare agentMode: string;
agentMode: string;
@Column(DataType.TEXT)
declare conversationReference: string;
conversationReference: string;
@Column(DataType.STRING(64))
declare hearOnDialog: string;
hearOnDialog: string;
}
/**
@ -108,18 +108,18 @@ export class GuaribasGroup extends Model<GuaribasGroup> {
@PrimaryKey
@AutoIncrement
@Column(DataType.INTEGER)
declare groupId: number;
groupId: number;
@Length({ min: 0, max: 512 })
@Column(DataType.STRING(512))
declare displayName: string;
displayName: string;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
}
/**
@ -129,22 +129,22 @@ export class GuaribasGroup extends Model<GuaribasGroup> {
export class GuaribasUserGroup extends Model<GuaribasUserGroup> {
@ForeignKey(() => GuaribasUser)
@Column(DataType.INTEGER)
declare userId: number;
userId: number;
@ForeignKey(() => GuaribasGroup)
@Column(DataType.INTEGER)
declare groupId: number;
groupId: number;
@ForeignKey(() => GuaribasInstance)
@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;
@BelongsTo(() => GuaribasInstance)
declare instance: GuaribasInstance;
instance: GuaribasInstance;
@BelongsTo(() => GuaribasGroup)
declare group: GuaribasGroup;
group: GuaribasGroup;
@BelongsTo(() => GuaribasUser)
declare user: GuaribasUser;
user: GuaribasUser;
}

45
packages/security.gbapp/services/SecService.ts
View file

@ -11,8 +11,7 @@ import { FindOptions } from 'sequelize';
* Security service layer.
*/
export class SecService extends GBService {
public async ensureUser(
public async ensureUser (
instanceId: number,
userSystemId: string,
userName: string,
@ -44,7 +43,7 @@ export class SecService extends GBService {
/**
* Retrives a conversation reference from contact phone.
*/
public async getConversationReference(phone: string): Promise<ConversationReference> {
public async getConversationReference (phone: string): Promise<ConversationReference> {
const options = <FindOptions>{ rejectOnEmpty: true, where: { phone: phone } };
const user = await GuaribasUser.findOne(options);
@ -54,7 +53,7 @@ export class SecService extends GBService {
/**
* Updates a conversation reference from contact phone.
*/
public async updateConversationReference(phone: string, conversationReference: string) {
public async updateConversationReference (phone: string, conversationReference: string) {
const options = <FindOptions>{ where: { phone: phone } };
const user = await GuaribasUser.findOne(options);
@ -62,7 +61,7 @@ export class SecService extends GBService {
await user.save();
}
public async updateConversationReferenceById(userId: number, conversationReference: string) {
public async updateConversationReferenceById (userId: number, conversationReference: string) {
const options = <FindOptions>{ where: { userId: userId } };
const user = await GuaribasUser.findOne(options);
@ -70,7 +69,7 @@ export class SecService extends GBService {
await user.save();
}
public async updateUserLocale(userId: number, locale: any): Promise<GuaribasUser> {
public async updateUserLocale (userId: number, locale: any): Promise<GuaribasUser> {
const user = await GuaribasUser.findOne({
where: {
userId: userId
@ -81,7 +80,7 @@ export class SecService extends GBService {
return await user.save();
}
public async updateUserHearOnDialog(userId: number, dialogName: string): Promise<GuaribasUser> {
public async updateUserHearOnDialog (userId: number, dialogName: string): Promise<GuaribasUser> {
const user = await GuaribasUser.findOne({
where: {
userId: userId
@ -92,7 +91,7 @@ export class SecService extends GBService {
return await user.save();
}
public async updateUserInstance(userSystemId: string, instanceId: number): Promise<GuaribasUser> {
public async updateUserInstance (userSystemId: string, instanceId: number): Promise<GuaribasUser> {
const user = await GuaribasUser.findOne({
where: {
userSystemId: userSystemId
@ -106,12 +105,12 @@ export class SecService extends GBService {
/**
* Finds and update user agent information to a next available person.
*/
public async updateHumanAgent(
public async updateHumanAgent (
userSystemId: string,
instanceId: number,
agentSystemId: string
): Promise<GuaribasUser> {
const user = await GuaribasUser.findOne({
const user = await GuaribasUser.findOne({
where: {
userSystemId: userSystemId,
instanceId: instanceId
@ -153,7 +152,7 @@ export class SecService extends GBService {
return user;
}
public async isAgentSystemId(systemId: string): Promise<Boolean> {
public async isAgentSystemId (systemId: string): Promise<Boolean> {
const user = await GuaribasUser.findOne({
where: {
userSystemId: systemId
@ -167,24 +166,24 @@ export class SecService extends GBService {
return user.agentMode === 'self';
}
public async assignHumanAgent(min: GBMinInstance, userSystemId: string, agentSystemId: string = null): Promise<string> {
public async assignHumanAgent (
min: GBMinInstance,
userSystemId: string,
agentSystemId: string = null
): Promise<string> {
if (!agentSystemId) {
let list = min.core.getParam<string>(
min.instance,
'Transfer To',
process.env.TRANSFER_TO
);
let list = min.core.getParam<string>(min.instance, 'Transfer To', process.env.TRANSFER_TO);
if (list) {
list = list.split(';')
list = list.split(';');
}
await CollectionUtil.asyncForEach(list, async item => {
if (
item !== undefined &&
agentSystemId === undefined &&
item !== userSystemId && !await this.isAgentSystemId(item)
item !== userSystemId &&
!(await this.isAgentSystemId(item))
) {
// TODO: Optimize loop.
agentSystemId = item;
@ -198,7 +197,7 @@ export class SecService extends GBService {
return agentSystemId;
}
public async getUserFromSystemId(systemId: string): Promise<GuaribasUser> {
public async getUserFromSystemId (systemId: string): Promise<GuaribasUser> {
return await GuaribasUser.findOne({
where: {
userSystemId: systemId
@ -206,7 +205,7 @@ export class SecService extends GBService {
});
}
public async getUserFromAgentSystemId(systemId: string): Promise<GuaribasUser> {
public async getUserFromAgentSystemId (systemId: string): Promise<GuaribasUser> {
return await GuaribasUser.findOne({
where: {
agentSystemId: systemId
@ -214,7 +213,7 @@ export class SecService extends GBService {
});
}
public async getAllUsers(instanceId: number): Promise<GuaribasUser[]> {
public async getAllUsers (instanceId: number): Promise<GuaribasUser[]> {
return await GuaribasUser.findAll({
where: {
instanceId: instanceId

9
packages/security.gbapp/strings.ts
View file

@ -1,9 +1,9 @@
export const Messages = {
'en-US': {
whats_name: 'What\'s your name?',
whats_mobile: 'What\'s your mobile number including country code (e.g. +1 222 9998888)?',
whats_name: "What's your name?",
whats_mobile: "What's your mobile number including country code (e.g. +1 222 9998888)?",
confirm_mobile: 'Please type the code just sent to your mobile.',
whats_email: 'What\'s your E-mail address?',
whats_email: "What's your E-mail address?",
validation_enter_name: 'Please enter your full name.',
validation_enter_valid_mobile: 'Please enter a valid mobile number.',
validation_enter_valid_email: 'Please enter a valid e-mail.'
@ -13,7 +13,8 @@ export const Messages = {
whats_email: 'Qual o seu e-mail?',
whats_mobile: 'Qual o seu celular?',
confirm_mobile: 'Por favor, digite o código enviado para seu celular.',
confirm_mobile_again: 'Esse não me parece ser um código numérico válido. Por favor, digite novamente o código enviado para seu celular.',
confirm_mobile_again:
'Esse não me parece ser um código numérico válido. Por favor, digite novamente o código enviado para seu celular.',
validation_enter_valid_email: 'Por favor, digite um e-mail válido no formato nome@domínio.com.br.',
validation_enter_name: 'Por favor, digite seu nome completo',
validation_enter_valid_mobile: 'Por favor, insira um número de celular válido (ex.: +55 21 98888-7766).'

15
packages/sharepoint.gblib/index.ts
View file

@ -44,26 +44,25 @@ import { Sequelize } from 'sequelize-typescript';
*/
export class GBSharePointPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`loadBot called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
}

7
packages/sharepoint.gblib/services/SharePointService.ts
View file

@ -36,12 +36,7 @@
'use strict';
/**
* Service facade for SharePoint Online.
*/
export class GBSharePointService {
}
export class GBSharePointService {}

8
packages/sharepoint.gblib/strings.ts
View file

@ -1,8 +1,4 @@
export const Messages = {
'en-US': {
},
'pt-BR': {
}
'en-US': {},
'pt-BR': {}
};

17
packages/teams.gblib/index.ts
View file

@ -45,27 +45,24 @@ import { Sequelize } from 'sequelize-typescript';
export class GBTeamsPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {}
}
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
}

12
packages/teams.gblib/services/TeamsService.ts
View file

@ -38,17 +38,15 @@ import AdmZip from 'adm-zip';
* Support for Whatsapp.
*/
export class TeamsService extends GBService {
public async getAppFile(manifest)
{
public async getAppFile (manifest) {
var zip = new AdmZip();
zip.addFile("manifest.json", Buffer.from(manifest, "utf8"), "Built with General Bots™.");
zip.addLocalFile("teams-color.png", null, "color.png");
zip.addLocalFile("teams-outline.png", null, "outline.png");
zip.addFile('manifest.json', Buffer.from(manifest, 'utf8'), 'Built with General Bots™.');
zip.addLocalFile('teams-color.png', null, 'color.png');
zip.addLocalFile('teams-outline.png', null, 'outline.png');
return zip.toBuffer();
}
public async getManifest(marketplaceId, botName, botDescription, id, packageName, yourName) {
public async getManifest (marketplaceId, botName, botDescription, id, packageName, yourName) {
let content = Fs.readFileSync('teams-manifest.json', 'utf8');
content = content.replace(/\@\@marketplaceId/gi, marketplaceId);

8
packages/teams.gblib/strings.ts
View file

@ -1,8 +1,4 @@
export const Messages = {
'en-US': {
},
'pt-BR': {
}
'en-US': {},
'pt-BR': {}
};

17
packages/whatsapp.gblib/index.ts
View file

@ -46,27 +46,24 @@ import { WhatsappDirectLine } from './services/WhatsappDirectLine.js';
export class GBWhatsappPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {}
}
public async getDialogs(min: GBMinInstance) {
public async getDialogs (min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
}
public async unloadPackage(core: IGBCoreService): Promise<void> {
public async unloadPackage (core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot(min: GBMinInstance): Promise<void> {
public async unloadBot (min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
}

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

File diff suppressed because it is too large Load diff

4
packages/whatsapp.gblib/strings.ts
View file

@ -1,8 +1,8 @@
export const Messages = {
'en-US': {
notify_end_transfer: (botName) => `Now talking to ${botName} again.`
notify_end_transfer: botName => `Now talking to ${botName} again.`
},
'pt-BR': {
notify_end_transfer: (botName) => `Falando com o bot ${botName} novamente.`
notify_end_transfer: botName => `Falando com o bot ${botName} novamente.`
}
};

48
src/app.ts
View file

@ -51,8 +51,8 @@ import { GBCoreService } from '../packages/core.gbapp/services/GBCoreService.js'
import { GBDeployer } from '../packages/core.gbapp/services/GBDeployer.js';
import { GBImporter } from '../packages/core.gbapp/services/GBImporterService.js';
import { GBMinService } from '../packages/core.gbapp/services/GBMinService.js';
import auth from 'basic-auth';
import child_process from 'child_process';
import auth from 'basic-auth';
import child_process from 'child_process';
import * as winston from 'winston-logs-display';
/**
@ -70,7 +70,7 @@ export class RootData {
public wwwroot: string; // .gbui or a static webapp.
public entryPointDialog: string; // To replace default welcome dialog.
public debugConversationId: any; // Used to self-message during debug.
public debuggers: any []; // Client of attached Debugger instances by botId.
public debuggers: any[]; // Client of attached Debugger instances by botId.
}
/**
* General Bots open-core entry point.
@ -82,21 +82,18 @@ export class GBServer {
* Program entry-point.
*/
public static run() {
public static run () {
GBLog.info(`The Bot Server is in STARTING mode...`);
GBServer.globals = new RootData();
GBConfigService.init();
const port = GBConfigService.getServerPort();
if (process.env.TEST_SHELL)
{
if (process.env.TEST_SHELL) {
GBLog.info(`Running TEST_SHELL: ${process.env.TEST_SHELL}...`);
try{
child_process.execSync(process.env.TEST_SHELL);
}catch(error){
GBLog.error(`Running TEST_SHELL ERROR: ${error}...`);
try {
child_process.execSync(process.env.TEST_SHELL);
} catch (error) {
GBLog.error(`Running TEST_SHELL ERROR: ${error}...`);
}
}
@ -113,7 +110,6 @@ export class GBServer {
server.use(bodyParser.json());
server.use(bodyParser.urlencoded({ extended: true }));
// Creates working directory.
const workDir = Path.join(process.env.PWD, 'work');
@ -123,9 +119,7 @@ export class GBServer {
const mainCallback = () => {
(async () => {
try {
GBLog.info(`Now accepting connections on ${port}...`);
process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
@ -160,9 +154,11 @@ export class GBServer {
await core.initStorage();
} catch (error) {
GBLog.verbose(`Error initializing storage: ${error}`);
GBServer.globals.bootInstance =
await core.createBootInstance(core, azureDeployer, GBServer.globals.publicAddress);
GBServer.globals.bootInstance = await core.createBootInstance(
core,
azureDeployer,
GBServer.globals.publicAddress
);
}
core.ensureAdminIsSecured();
@ -190,7 +186,6 @@ export class GBServer {
);
if (instances.length === 0) {
const instance = await importer.importIfNotExistsBotPackage(
GBConfigService.get('BOT_ID'),
'boot.gbot',
@ -215,15 +210,15 @@ export class GBServer {
await minService.buildMin(instances);
if (process.env.ENABLE_WEBLOG) {
var admins = {
'admin': { password: process.env.ADMIN_PASS },
const admins = {
admin: { password: process.env.ADMIN_PASS }
};
// ... some not authenticated middlewares
server.use(async (req, res, next) => {
if (req.originalUrl.startsWith('/logs')) {
var user = auth(req);
const user = auth(req);
if (!user || !admins[user.name] || admins[user.name].password !== user.pass) {
res.set('WWW-Authenticate', 'Basic realm="example"');
return res.status(401).send();
@ -239,7 +234,6 @@ export class GBServer {
winston.default(server, loggers[1]);
}
GBLog.info(`The Bot Server is in RUNNING mode...`);
// Opens Navigator.
@ -252,22 +246,20 @@ export class GBServer {
})();
};
if (process.env.CERTIFICATE_PFX) {
let options = {
const options = {
passphrase: process.env.CERTIFICATE_PASSPHRASE,
pfx: Fs.readFileSync(process.env.CERTIFICATE_PFX)
};
const httpsServer = https.createServer(options, server).listen(port, mainCallback);
if (process.env.CERTIFICATE2_PFX) {
let options = {
const options = {
passphrase: process.env.CERTIFICATE2_PASSPHRASE,
pfx: Fs.readFileSync(process.env.CERTIFICATE2_PFX)
};
httpsServer.addContext(process.env.CERTIFICATE2_DOMAIN, options);
}
}
else {
} else {
server.listen(port, mainCallback);
}
}