From ff689479eb95d2c2b423db0a6ecb4383f7acf1df Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Fri, 1 Mar 2019 15:38:10 -0300 Subject: [PATCH 01/15] chore(docs): Refactoring of .md. --- FEATURES.md | 8 ++++++++ ROADMAP.md | 6 ++++++ .../azuredeployer.gbapp/services/AzureDeployerService.ts | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 FEATURES.md create mode 100644 ROADMAP.md diff --git a/FEATURES.md b/FEATURES.md new file mode 100644 index 000000000..a6eb62191 --- /dev/null +++ b/FEATURES.md @@ -0,0 +1,8 @@ +# General Bots Features + +| Feature | BF | GB | +|----------------------------------------------------------------------------|----|----| +| Use of conversational administration to manage bot packages (Talk to admin | - | X | +| F5 to run on VSCode | - | X | +| Isolated code on packages | - | X | +| Breaking changes protected | - | X | diff --git a/ROADMAP.md b/ROADMAP.md new file mode 100644 index 000000000..41824d4de --- /dev/null +++ b/ROADMAP.md @@ -0,0 +1,6 @@ +# Roadmap + +| Title | Priority | Release | Status | +|-------------------------------|------------------------------------------------------------------------------------------------------------|---------|--------| +| Isolation of .gbapp per .gbot | Today .gbapp loaded is shared across all bot instances and must be associated to one or more individually. | Medium | 2019Q4 | +| Python based .gbapps | Write conversational login in Python | Low | - | diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 3ea78a423..6f9195f36 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -324,6 +324,8 @@ export class AzureDeployerService extends GBService { instance.textAnalyticsEndpoint = textAnalytics.endpoint; instance.textAnalyticsKey = keys.key1; + // TODO: Check quotes being added when NLP field is filled. + logger.info(`Deploying NLP...`); const nlp = await this.createNLP(name, `${name}-nlp`, instance.cloudLocation); keys = await this.cognitiveClient.accounts.listKeys(name, nlp.name); From 60a31675e50e2021848695db81552a2900603a4a Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Fri, 8 Mar 2019 06:37:13 -0300 Subject: [PATCH 02/15] fix(general): tslint being applied in all sources. --- package-lock.json | 6 +- package.json | 2 +- packages/admin.gbapp/dialogs/AdminDialog.ts | 22 +- packages/admin.gbapp/index.ts | 9 +- .../admin.gbapp/services/GBAdminService.ts | 11 +- packages/analytics.gblib/index.ts | 4 +- .../dialogs/BotFarmDialog.ts | 18 +- .../dialogs/StartDialog.ts | 13 +- packages/azuredeployer.gbapp/index.ts | 4 +- .../services/AzureDeployerService.ts | 106 ++--- packages/console.gblib/index.ts | 16 +- packages/core.gbapp/index.ts | 24 +- packages/core.gbapp/models/GBModel.ts | 3 +- packages/core.gbapp/services/GBAPIService.ts | 53 ++- .../services/GBConversationalService.ts | 9 +- packages/core.gbapp/services/GBCoreService.ts | 46 +- packages/core.gbapp/services/GBDeployer.ts | 10 +- packages/core.gbapp/services/GBMinService.ts | 26 +- packages/core.gbapp/services/GBVMService.ts | 19 +- packages/customer-satisfaction.gbapp/index.ts | 20 +- packages/kb.gbapp/index.ts | 25 +- packages/kb.gbapp/services/KBService.ts | 7 +- packages/security.gblib/index.ts | 28 +- .../security.gblib/services/SecService.ts | 68 +-- packages/whatsapp.gblib/index.ts | 45 +- .../services/WhatsappDirectLine.ts | 441 ++++++++---------- src/app.ts | 15 +- tsconfig.json | 1 + 28 files changed, 459 insertions(+), 592 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e5a51bea..ea1d9d4ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3166,9 +3166,9 @@ } }, "botlib": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/botlib/-/botlib-0.1.19.tgz", - "integrity": "sha512-JssUqK0NVwLTvs2zcl42jpKTsB5ocse27aVnFukV+wGuAjCeZu6HZpaTue1jTCHojMXAH1TSLNQnuCOOTxpw/w==", + "version": "0.1.21", + "resolved": "https://registry.npmjs.org/botlib/-/botlib-0.1.21.tgz", + "integrity": "sha512-AF8Sp+SF3xN/jzOCo7tnqJfGaYkeHP0mJKcfYL0iHYbUuIVsCVtNmIottd1WTzDfKhls+ZoqclSAbzzoC0LS+Q==", "requires": { "async": "2.6.2", "botbuilder": "4.1.7", diff --git a/package.json b/package.json index c8fec51e3..ef8cc94e7 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "botbuilder-choices": "4.0.0-preview1.2", "botbuilder-dialogs": "4.2.0", "botbuilder-prompts": "4.0.0-preview1.2", - "botlib": "0.1.19", + "botlib": "^0.1.21", "chai": "4.2.0", "child_process": "^1.0.2", "chokidar": "2.1.2", diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts index c3473f202..724acc5c7 100644 --- a/packages/admin.gbapp/dialogs/AdminDialog.ts +++ b/packages/admin.gbapp/dialogs/AdminDialog.ts @@ -38,14 +38,14 @@ const UrlJoin = require('url-join'); import { BotAdapter } from 'botbuilder'; -import { WaterfallDialog, WaterfallStep, WaterfallStepContext } from 'botbuilder-dialogs'; -import { GBMinInstance } from 'botlib'; -import { IGBDialog } from 'botlib'; +import { WaterfallDialog } from 'botbuilder-dialogs'; +import { GBMinInstance, IGBDialog } from 'botlib'; import { GBConfigService } from '../../core.gbapp/services/GBConfigService'; import { GBDeployer } from '../../core.gbapp/services/GBDeployer'; import { GBImporter } from '../../core.gbapp/services/GBImporterService'; import { GBAdminService } from '../services/GBAdminService'; import { Messages } from '../strings'; +import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; /** * Dialogs for administration tasks. @@ -79,7 +79,10 @@ export class AdminDialog extends IGBDialog { } public static async rebuildIndexPackageCommand(min: GBMinInstance, text: string, deployer: GBDeployer) { - await deployer.rebuildIndex(min.instance); + await deployer.rebuildIndex( + min.instance, + new AzureDeployerService(deployer).getKBSearchSchema(min.instance.searchIndex) + ); } public static async addConnectionCommand(min: GBMinInstance, text: any) { @@ -136,7 +139,7 @@ export class AdminDialog extends IGBDialog { if (text === 'quit') { return await step.replaceDialog('/'); } else if (cmdName === 'createFarm') { - await AdminDialog.createFarmCommand(text, deployer); + await AdminDialog.createFarmCommand(text, min); return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'deployPackage') { @@ -224,9 +227,9 @@ export class AdminDialog extends IGBDialog { await min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state); - const url = `https://login.microsoftonline.com/${min.instance.authenticatorTenant}/oauth2/authorize?client_id=${ - min.instance.authenticatorClientId - }&response_type=code&redirect_uri=${UrlJoin( + const url = `https://login.microsoftonline.com/${ + min.instance.authenticatorTenant + }/oauth2/authorize?client_id=${min.instance.authenticatorClientId}&response_type=code&redirect_uri=${UrlJoin( min.instance.botEndpoint, min.instance.botId, '/token' @@ -234,10 +237,9 @@ export class AdminDialog extends IGBDialog { await step.context.sendActivity(Messages[locale].consent(url)); - return await step.replaceDialog('/ask', {isReturning: true}); + return await step.replaceDialog('/ask', { isReturning: true }); } ]) ); } - } diff --git a/packages/admin.gbapp/index.ts b/packages/admin.gbapp/index.ts index a7e22288b..d3c5aef7a 100644 --- a/packages/admin.gbapp/index.ts +++ b/packages/admin.gbapp/index.ts @@ -36,15 +36,18 @@ 'use strict'; -import urlJoin = require('url-join'); - import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { AdminDialog } from './dialogs/AdminDialog'; import { GuaribasAdmin } from './models/AdminModel'; export class GBAdminPackage implements IGBPackage { - public sysPackages: IGBPackage[] = null; + public sysPackages: IGBPackage[] = undefined; + + public unloadPackage(core: IGBCoreService): void {} + public getDialogs(min: GBMinInstance) {} + public unloadBot(min: GBMinInstance): void {} + public onNewSession(min: GBMinInstance, step: any): void {} public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { core.sequelize.addModels([GuaribasAdmin]); diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts index 80c2d1f96..b8db0e5ec 100644 --- a/packages/admin.gbapp/services/GBAdminService.ts +++ b/packages/admin.gbapp/services/GBAdminService.ts @@ -37,7 +37,7 @@ 'use strict'; import { AuthenticationContext, TokenResponse } from 'adal-node'; -import { IGBCoreService } from 'botlib'; +import { IGBCoreService, IGBAdminService } from 'botlib'; import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; import { GuaribasAdmin } from '../models/AdminModel'; const UrlJoin = require('url-join'); @@ -47,7 +47,7 @@ const PasswordGenerator = require('strict-password-generator').default; /** * Services for server administration. */ -export class GBAdminService { +export class GBAdminService implements IGBAdminService { public static GB_PROMPT: string = 'GeneralBots: '; public static masterBotInstanceId = 0; @@ -76,7 +76,7 @@ export class GBAdminService { return credentials; } - public static getRndPassword() { + public static getRndPassword(): string { const passwordGenerator = new PasswordGenerator(); const options = { upperCaseAlpha: true, @@ -105,7 +105,7 @@ export class GBAdminService { return name; } - public async setValue(instanceId: number, key: string, value: string): Promise { + public async setValue(instanceId: number, key: string, value: string) { const options = { where: {} }; options.where = { key: key }; let admin = await GuaribasAdmin.findOne(options); @@ -115,8 +115,7 @@ export class GBAdminService { } admin.value = value; admin.instanceId = instanceId; - - return admin.save(); + await admin.save(); } public async updateSecurityInfo( diff --git a/packages/analytics.gblib/index.ts b/packages/analytics.gblib/index.ts index 1c29bb771..3e0860b4d 100644 --- a/packages/analytics.gblib/index.ts +++ b/packages/analytics.gblib/index.ts @@ -43,8 +43,8 @@ import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; export class GBAnalyticsPackage implements IGBPackage { - public sysPackages: IGBPackage[] = null; - + public sysPackages: IGBPackage[] = undefined; + public getDialogs(min: GBMinInstance) {} public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void {} diff --git a/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts b/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts index 19a95fb94..96fd56a31 100644 --- a/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts +++ b/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts @@ -40,6 +40,7 @@ import { BotAdapter } from 'botbuilder'; import { GBMinInstance } from 'botlib'; import { IGBDialog } from 'botlib'; import { Messages } from '../strings'; +import { WaterfallDialog } from 'botlib/node_modules/botbuilder-dialogs'; export class BotFarmDialog extends IGBDialog { /** @@ -49,21 +50,20 @@ export class BotFarmDialog extends IGBDialog { * @param min The minimal bot instance data. */ public static setup(bot: BotAdapter, min: GBMinInstance) { - min.dialogs.add('/createBotFarm', [ + min.dialogs.add(new WaterfallDialog ('/createBotFarm', [ async step => { const locale = step.context.activity.locale; - await step.prompt('choicePrompt', Messages[locale].what_about_me, [ - '1', - '2', - '3', - '4', - '5' - ]); + await step.prompt('choicePrompt', Messages[locale].what_about_me); + + return step.next(); }, async step => { + const locale = step.context.activity.locale; await step.context.sendActivity(Messages[locale].thanks); + + return step.next(); } - ]); + ])); } } diff --git a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts index 35e5adb17..8ceade282 100644 --- a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts +++ b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts @@ -37,18 +37,18 @@ 'use strict'; import { IGBInstance } from 'botlib'; +import { IGBInstallationDeployer } from 'botlib'; import * as fs from 'fs'; import { GBAdminService } from '../../../packages/admin.gbapp/services/GBAdminService'; import { GBConfigService } from '../../../packages/core.gbapp/services/GBConfigService'; -import { AzureDeployerService } from '../services/AzureDeployerService'; -import { GuaribasInstance } from '../../../packages/core.gbapp/models/GBModel'; const scanf = require('scanf'); /** * Handles command-line dialog for getting info for Boot Bot. */ export class StartDialog { - public static async createBaseInstance() { + + public static async createBaseInstance(installationDeployer: IGBInstallationDeployer) { // No .env so asks for cloud credentials to start a new farm. if (!fs.existsSync(`.env`)) { @@ -75,7 +75,7 @@ export class StartDialog { // Connects to the cloud and retrieves subscriptions. const credentials = await GBAdminService.getADALCredentialsFromUsername(username, password); - const list = await AzureDeployerService.getSubscriptions(credentials); + const list = await installationDeployer.getSubscriptions(credentials); let subscriptionId: string; while (subscriptionId === undefined) { @@ -104,9 +104,8 @@ export class StartDialog { process.stdout.write(`${GBAdminService.GB_PROMPT}Thank you. That is enough information.\nNow building farm...`); - // Prepares the first instance on bot farm. - const instance: IGBInstance = {}; + const instance = {}; instance.botId = botId; instance.cloudUsername = username; @@ -223,7 +222,7 @@ generate manually an App ID and App Secret.\n` private static retrieveLocation() { let location = GBConfigService.get('CLOUD_LOCATION'); if (!location) { - process.stdout.write("CLOUD_LOCATION (eg. 'westus'):"); + process.stdout.write('CLOUD_LOCATION (eg. \'westus\'):'); location = scanf('%s'); } diff --git a/packages/azuredeployer.gbapp/index.ts b/packages/azuredeployer.gbapp/index.ts index ff4ac32e6..66d859064 100644 --- a/packages/azuredeployer.gbapp/index.ts +++ b/packages/azuredeployer.gbapp/index.ts @@ -40,8 +40,8 @@ import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; export class GBAzureDeployerPackage implements IGBPackage { - - public sysPackages: IGBPackage[] = null; + public sysPackages: IGBPackage[] = undefined; + public getDialogs(min: GBMinInstance) {} public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 6f9195f36..012e0c95d 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -43,33 +43,29 @@ import { SearchManagementClient } from 'azure-arm-search'; import { SqlManagementClient } from 'azure-arm-sql'; import { WebSiteManagementClient } from 'azure-arm-website'; import { AppServicePlan } from 'azure-arm-website/lib/models'; -import { GBService, IGBInstance } from 'botlib'; +import { IGBInstance, IGBInstallationDeployer } from 'botlib'; import { HttpMethods, ServiceClient, WebResource } from 'ms-rest-js'; -import { GBDeployer } from '../../../packages/core.gbapp/services/GBDeployer'; -import * as simplegit from 'simple-git/promise'; import { GBAdminService } from '../../../packages/admin.gbapp/services/GBAdminService'; import { GBCorePackage } from '../../../packages/core.gbapp'; import { GBConfigService } from '../../../packages/core.gbapp/services/GBConfigService'; -import { GuaribasInstance } from '../../../packages/core.gbapp/models/GBModel'; +import { GBDeployer } from '../../../packages/core.gbapp/services/GBDeployer'; const Spinner = require('cli-spinner').Spinner; -const scanf = require('scanf'); -const git = simplegit(); const logger = require('../../../src/logger'); const UrlJoin = require('url-join'); const iconUrl = 'https://github.com/pragmatismo-io/BotServer/blob/master/docs/images/generalbots-logo-squared.png'; const publicIp = require('public-ip'); -export class AzureDeployerService extends GBService { - public static apiVersion = '2017-12-01'; - public static defaultEndPoint = 'http://localhost:4242'; +export class AzureDeployerService implements IGBInstallationDeployer { + public apiVersion = '2017-12-01'; + public defaultEndPoint = 'http://localhost:4242'; public instance: IGBInstance; public resourceClient: ResourceManagementClient.ResourceManagementClient; public webSiteClient: WebSiteManagementClient; public storageClient: SqlManagementClient; public cognitiveClient: CognitiveServicesManagementClient; public searchClient: SearchManagementClient; - public static provider = 'Microsoft.BotService'; + public provider = 'Microsoft.BotService'; public subscriptionClient: SubscriptionClient.SubscriptionClient; public accessToken: string; public location: string; @@ -78,15 +74,16 @@ export class AzureDeployerService extends GBService { public deployer: GBDeployer; constructor(deployer: GBDeployer) { - super(); this.deployer = deployer; } - public static async getSubscriptions(credentials) { + + public async getSubscriptions(credentials) { const subscriptionClient = new SubscriptionClient.default(credentials); + return subscriptionClient.subscriptions.list(); } - public static getKBSearchSchema(indexName) { + public getKBSearchSchema(indexName) { return { name: indexName, fields: [ @@ -187,16 +184,13 @@ export class AzureDeployerService extends GBService { }; } - public static 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'); const subscriptionId = GBConfigService.get('CLOUD_SUBSCRIPTIONID'); - const accessToken = await GBAdminService.getADALTokenFromUsername( - username, - password - ); + const accessToken = await GBAdminService.getADALTokenFromUsername(username, password); const httpClient = new ServiceClient(); const parameters = { @@ -207,14 +201,9 @@ export class AzureDeployerService extends GBService { const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${ this.provider - }/botServices/${botId}?api-version=${AzureDeployerService.apiVersion}`; + }/botServices/${botId}?api-version=${this.apiVersion}`; const url = UrlJoin(baseUrl, query); - const req = this.createRequestObject( - url, - accessToken, - 'PATCH', - JSON.stringify(parameters) - ); + const req = AzureDeployerService.createRequestObject(url, accessToken, 'PATCH', JSON.stringify(parameters)); const res = await httpClient.sendRequest(req); if (!(res.bodyAsJson as any).id) { throw res.bodyAsText; @@ -222,7 +211,7 @@ export class AzureDeployerService extends GBService { logger.info(`Bot proxy updated at: ${endpoint}.`); } - public static 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'); @@ -239,7 +228,7 @@ export class AzureDeployerService extends GBService { await storageClient.firewallRules.createOrUpdate(groupName, serverName, 'gb', params); } - public 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; @@ -304,19 +293,19 @@ export class AzureDeployerService extends GBService { instance.searchIndex = 'azuresql-index'; instance.searchIndexer = 'azuresql-indexer'; instance.searchKey = searchKeys.primaryKey; - this.deployer.rebuildIndex(instance); + this.deployer.rebuildIndex(instance, this.deployer); logger.info(`Deploying Speech...`); const speech = await this.createSpeech(name, `${name}-speech`, instance.cloudLocation); keys = await this.cognitiveClient.accounts.listKeys(name, speech.name); - instance.speechKeyEndpoint = speech.endpoint; + instance.speechEndpoint = speech.endpoint; instance.speechKey = keys.key1; logger.info(`Deploying SpellChecker...`); - const spellChecker = await this.createSpellChecker(name, `${name}-spellchecker`, instance.cloudLocation); + const spellChecker = await this.createSpellChecker(name, `${name}-spellchecker`); keys = await this.cognitiveClient.accounts.listKeys(name, spellChecker.name); - instance.spellCheckerKey = keys.key1; - instance.spellCheckerEndpoint = spellChecker.endpoint; + instance.spellcheckerKey = keys.key1; + instance.spellcheckerEndpoint = spellChecker.endpoint; logger.info(`Deploying Text Analytics...`); const textAnalytics = await this.createTextAnalytics(name, `${name}-textanalytics`, instance.cloudLocation); @@ -336,7 +325,7 @@ export class AzureDeployerService extends GBService { instance.nlpAppId = nlpAppId; logger.info(`Deploying Bot...`); - instance.botEndpoint = AzureDeployerService.defaultEndPoint; + instance.botEndpoint = this.defaultEndPoint; instance = await this.internalDeployBot( instance, @@ -349,8 +338,8 @@ export class AzureDeployerService extends GBService { 'global', instance.nlpAppId, instance.nlpKey, - instance.appId, - instance.appPassword, + instance.marketplaceId, + instance.marketplacePassword, instance.cloudSubscriptionId ); @@ -359,17 +348,16 @@ export class AzureDeployerService extends GBService { } public async deployToCloud( - title, - username, - password, - cloudLocation, - authoringKey, - appId, - appPassword, - subscriptionId + title: string, + username: string, + password: string, + cloudLocation: string, + authoringKey: string, + appId: string, + appPassword: string, + subscriptionId: string ) { - - const instance: IGBInstance = {}; + const instance = {}; instance.botId = title; instance.cloudUsername = username; @@ -397,18 +385,6 @@ export class AzureDeployerService extends GBService { this.accessToken = credentials.tokenCache._entries[0].accessToken; } - private async updateWebisteConfig(group, serverFarmId, name, location) { - const siteConfig = { - location: location, - serverFarmId: serverFarmId, - numberOfWorkers: 1, - phpVersion: '5.5' - }; - - // TODO: Copy .env to app settings. - - return this.webSiteClient.webApps.createOrUpdateConfiguration(group, name, siteConfig); - } private async createStorageServer(group, name, administratorLogin, administratorPassword, serverName, location) { const params = { @@ -423,7 +399,7 @@ export class AzureDeployerService extends GBService { private async registerProviders(subscriptionId, baseUrl, accessToken) { const query = `subscriptions/${subscriptionId}/providers/${ - AzureDeployerService.provider + this.provider }/register?api-version=2018-02-01`; const requestUrl = UrlJoin(baseUrl, query); @@ -436,7 +412,6 @@ export class AzureDeployerService extends GBService { req.headers.Authorization = 'Bearer ' + accessToken; const httpClient = new ServiceClient(); - const res = await httpClient.sendRequest(req); // TODO: Check res for error. } @@ -457,7 +432,7 @@ export class AzureDeployerService extends GBService { appId, appPassword, subscriptionId - ) { + ): Promise { return new Promise(async (resolve, reject) => { const baseUrl = `https://management.azure.com/`; await this.registerProviders(subscriptionId, baseUrl, accessToken); @@ -489,8 +464,8 @@ export class AzureDeployerService extends GBService { const httpClient = new ServiceClient(); let query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${ - AzureDeployerService.provider - }/botServices/${botId}?api-version=${AzureDeployerService.apiVersion}`; + 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); @@ -502,7 +477,7 @@ export class AzureDeployerService extends GBService { setTimeout(async () => { try { query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/Microsoft.BotService/botServices/${botId}/channels/WebChatChannel/listChannelWithKeys?api-version=${ - AzureDeployerService.apiVersion + this.apiVersion }`; url = UrlJoin(baseUrl, query); req = AzureDeployerService.createRequestObject(url, accessToken, 'GET', JSON.stringify(parameters)); @@ -513,7 +488,7 @@ export class AzureDeployerService extends GBService { } catch (error) { reject(error); } - }, 20000); + }, 20000); }); } @@ -603,7 +578,7 @@ export class AzureDeployerService extends GBService { return await this.createCognitiveServices(group, name, location, 'LUIS'); } - private async createSpellChecker(group, name, location): Promise { + private async createSpellChecker(group, name): Promise { return await this.createCognitiveServices(group, name, 'global', 'Bing.SpellCheck.v7'); } @@ -637,5 +612,4 @@ export class AzureDeployerService extends GBService { }; return this.webSiteClient.webApps.createOrUpdate(group, name, parameters); } - } diff --git a/packages/console.gblib/index.ts b/packages/console.gblib/index.ts index 09eb4489c..e056b0500 100644 --- a/packages/console.gblib/index.ts +++ b/packages/console.gblib/index.ts @@ -44,22 +44,20 @@ import { Sequelize } from 'sequelize-typescript'; import { ConsoleDirectLine } from './services/ConsoleDirectLine'; export class GBConsolePackage implements IGBPackage { - public sysPackages: IGBPackage[] = null; + + public sysPackages: IGBPackage[] = undefined; public channel: ConsoleDirectLine; + public getDialogs(min: GBMinInstance) {} - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { - } + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} - public unloadPackage(core: IGBCoreService): void { - } + public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void { this.channel = new ConsoleDirectLine(min.instance.webchatKey); } - public unloadBot(min: GBMinInstance): void { - } + public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void { - } + public onNewSession(min: GBMinInstance, step: any): void {} } diff --git a/packages/core.gbapp/index.ts b/packages/core.gbapp/index.ts index 0ea3b7197..7166bfa6d 100644 --- a/packages/core.gbapp/index.ts +++ b/packages/core.gbapp/index.ts @@ -40,7 +40,7 @@ const UrlJoin = require('url-join'); import { GBMinInstance, IGBPackage } from 'botlib'; -import { IGBCoreService} from 'botlib'; +import { IGBCoreService } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { WelcomeDialog } from './dialogs/WelcomeDialog'; import { WhoAmIDialog } from './dialogs/WhoAmIDialog'; @@ -48,30 +48,20 @@ import { GuaribasChannel, GuaribasException, GuaribasInstance, GuaribasPackage } export class GBCorePackage implements IGBPackage { public static CurrentEngineName = 'guaribas-1.0.0'; - public sysPackages: IGBPackage[] = null; + public sysPackages: IGBPackage[] = undefined; + public getDialogs(min: GBMinInstance) {} public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { - core.sequelize.addModels([ - GuaribasInstance, - GuaribasPackage, - GuaribasChannel, - GuaribasException - ]); + core.sequelize.addModels([GuaribasInstance, GuaribasPackage, GuaribasChannel, GuaribasException]); } - public unloadPackage(core: IGBCoreService): void { - - } + public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void { WelcomeDialog.setup(min.bot, min); WhoAmIDialog.setup(min.bot, min); } - public unloadBot(min: GBMinInstance): void { - - } - public onNewSession(min: GBMinInstance, step: any): void { - - } + public unloadBot(min: GBMinInstance): void {} + public onNewSession(min: GBMinInstance, step: any): void {} } diff --git a/packages/core.gbapp/models/GBModel.ts b/packages/core.gbapp/models/GBModel.ts index ca0bf05b3..a382b92bd 100644 --- a/packages/core.gbapp/models/GBModel.ts +++ b/packages/core.gbapp/models/GBModel.ts @@ -54,6 +54,7 @@ import { IGBInstance } from 'botlib'; @Table export class GuaribasInstance extends Model implements IGBInstance { + @PrimaryKey @AutoIncrement @Column @@ -152,7 +153,7 @@ export class GuaribasInstance extends Model public speechKey: string; @Column - public speechKeyEndpoint: string; + public speechEndpoint: string; @Column public spellcheckerKey: string; diff --git a/packages/core.gbapp/services/GBAPIService.ts b/packages/core.gbapp/services/GBAPIService.ts index 23335bfc1..dccd0f39a 100644 --- a/packages/core.gbapp/services/GBAPIService.ts +++ b/packages/core.gbapp/services/GBAPIService.ts @@ -35,22 +35,27 @@ import { TurnContext } from 'botbuilder'; import { WaterfallStepContext } from 'botbuilder-dialogs'; import { GBMinInstance } from 'botlib'; +import * as request from 'request-promise-native'; import { GBAdminService } from '../../admin.gbapp/services/GBAdminService'; import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; - +import { GBDeployer } from './GBDeployer'; +const UrlJoin = require('url-join'); /** * BASIC system class for extra manipulation of bot behaviour. */ class SysClass { public min: GBMinInstance; + private readonly deployer: GBDeployer; - constructor(min: GBMinInstance) { + constructor(min: GBMinInstance, deployer: GBDeployer) { this.min = min; + this.deployer = deployer; } public async wait(seconds: number) { - const timeout = ms => new Promise(resolve => setTimeout(resolve, ms)); + // tslint:disable-next-line no-string-based-set-timeout + const timeout = async (ms: number) => new Promise(resolve => setTimeout(resolve, ms)); await timeout(seconds * 1000); } @@ -68,7 +73,7 @@ class SysClass { appPassword, subscriptionId ) { - const service = new AzureDeployerService(this.min.deployer); + const service = new AzureDeployerService(this.deployer); await service.deployToCloud( botId, username, @@ -80,6 +85,27 @@ class SysClass { subscriptionId ); } + + /** + * Generic function to call any REST API. + */ + public async sendEmail(to, subject, body) { + // tslint:disable-next-line:no-console + console.log(`[E-mail]: to:${to}, subject: ${subject}, body: ${body}.`); + } + + /** + * Generic function to call any REST API. + */ + public async httpGet(url: string, qs) { + + const options = { + uri: UrlJoin(url , qs) + }; + + return await request.get(options); + } + } /** * @fileoverview General Bots server core. @@ -92,9 +118,9 @@ export default class DialogClass { public step: WaterfallStepContext; public internalSys: SysClass; - constructor(min: GBMinInstance) { + constructor(min: GBMinInstance, deployer: GBDeployer) { this.min = min; - this.internalSys = new SysClass(min); + this.internalSys = new SysClass(min, deployer); } public sys(): SysClass { @@ -102,7 +128,7 @@ export default class DialogClass { } public async hear(cb) { - const idCallback = Math.floor(Math.random() * 1000000000000); + const idCallback = crypto.getRandomValues(new Uint32Array(16))[0]; this.min.cbMap[idCallback] = cb; await this.step.beginDialog('/hear', { id: idCallback }); } @@ -110,17 +136,4 @@ export default class DialogClass { public async talk(text: string) { return await this.context.sendActivity(text); } - - /** - * Generic function to call any REST API. - */ - public sendEmail(to, subject, body) { - // tslint:disable-next-line:no-console - console.log(`[E-mail]: to:${to}, subject: ${subject}, body: ${body}.`); - } - - /** - * Generic function to call any REST API. - */ - public post(url: string, data) {} } diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index 9ea23c357..3c83c608b 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -39,7 +39,7 @@ const logger = require('../../../src/logger'); import { MessageFactory } from 'botbuilder'; import { LuisRecognizer } from 'botbuilder-ai'; -import { GBMinInstance, IGBConversationalService } from 'botlib'; +import { GBMinInstance, IGBConversationalService, IGBCoreService } from 'botlib'; import { AzureText } from 'pragmatismo-io-framework'; import { Messages } from '../strings'; import { GBCoreService } from './GBCoreService'; @@ -51,9 +51,10 @@ export interface LanguagePickerSettings { } export class GBConversationalService implements IGBConversationalService { - public coreService: GBCoreService; - constructor(coreService: GBCoreService) { + public coreService: IGBCoreService; + + constructor(coreService: IGBCoreService) { this.coreService = coreService; } @@ -93,7 +94,7 @@ export class GBConversationalService implements IGBConversationalService { public async routeNLP(step: any, min: GBMinInstance, text: string): Promise { // Invokes LUIS. - let endpoint = min.instance.nlpEndpoint.replace('/luis/v2.0', ''); + const endpoint = min.instance.nlpEndpoint.replace('/luis/v2.0', ''); const model = new LuisRecognizer({ applicationId: min.instance.nlpAppId, diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index bfc9a9ef8..eefef4877 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -36,12 +36,13 @@ 'use strict'; -import { IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; +import { IGBCoreService, IGBInstallationDeployer, IGBInstance, IGBPackage } from 'botlib'; import * as fs from 'fs'; import { Sequelize } from 'sequelize-typescript'; import { GBAdminPackage } from '../../admin.gbapp/index'; import { GBAdminService } from '../../admin.gbapp/services/GBAdminService'; import { GBAnalyticsPackage } from '../../analytics.gblib'; +import { StartDialog } from '../../azuredeployer.gbapp/dialogs/StartDialog'; import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GBCorePackage } from '../../core.gbapp'; import { GBCustomerSatisfactionPackage } from '../../customer-satisfaction.gbapp'; @@ -50,8 +51,6 @@ import { GBSecurityPackage } from '../../security.gblib'; import { GBWhatsappPackage } from '../../whatsapp.gblib/index'; import { GuaribasInstance } from '../models/GBModel'; import { GBConfigService } from './GBConfigService'; -import { StartDialog } from '../../azuredeployer.gbapp/dialogs/StartDialog'; -import { WaterfallDialog } from 'botbuilder-dialogs'; const logger = require('../../../src/logger'); const opn = require('opn'); @@ -60,6 +59,7 @@ const opn = require('opn'); * Core service layer. */ export class GBCoreService implements IGBCoreService { + /** * Data access layer instance. */ @@ -162,13 +162,13 @@ export class GBCoreService implements IGBCoreService { } } - public async checkStorage(azureDeployer: AzureDeployerService) { + public async checkStorage(installationDeployer: IGBInstallationDeployer) { try { await this.sequelize.authenticate(); } catch (error) { logger.info('Opening storage firewall on infrastructure...'); if (error.parent.code === 'ELOGIN') { - await this.openStorageFrontier(azureDeployer); + await this.openStorageFrontier(installationDeployer); } else { throw error; } @@ -193,14 +193,14 @@ export class GBCoreService implements IGBCoreService { /** * Loads all items to start several listeners. */ - public async loadInstances(): Promise { + public async loadInstances(): Promise { return GuaribasInstance.findAll({}); } /** * Loads just one Bot instance by its internal Id. */ - public async loadInstanceById(instanceId: string): Promise { + public async loadInstanceById(instanceId: number): Promise { const options = { where: { instanceId: instanceId } }; return GuaribasInstance.findOne(options); @@ -240,8 +240,15 @@ STORAGE_SYNC=true public async ensureProxy(port): Promise { try { - const ngrok = require('ngrok'); - return await ngrok.connect({ port: port }); + if (fs.existsSync('node_modules/ngrok/bin/ngrok.exe')) { + const ngrok = require('ngrok'); + + return await ngrok.connect({ port: port }); + } else { + logger.warn('ngrok executable not found. Check installation or node_modules folder.'); + + return 'localhost'; + } } catch (error) { // There are false positive from ngrok regarding to no memory, but it's just // lack of connection. @@ -267,15 +274,15 @@ STORAGE_SYNC=true * @param azureDeployer * @param proxyAddress */ - public async loadAllInstances(core: GBCoreService, azureDeployer: AzureDeployerService, proxyAddress: string) { + public async loadAllInstances(core: IGBCoreService, installationDeployer: IGBInstallationDeployer, proxyAddress: string) { logger.info(`Loading instances from storage...`); - let instances: GuaribasInstance[]; + let instances: IGBInstance[]; try { instances = await core.loadInstances(); const instance = instances[0]; if (process.env.NODE_ENV === 'development') { logger.info(`Updating bot endpoint to local reverse proxy (ngrok)...`); - await AzureDeployerService.updateBotProxy( + await installationDeployer.updateBotProxy( instance.botId, instance.botId, `${proxyAddress}/api/messages/${instance.botId}` @@ -308,9 +315,9 @@ STORAGE_SYNC=true * @param bootInstance * @param core */ - public async ensureInstances(instances: GuaribasInstance[], bootInstance: any, core: GBCoreService) { + public async ensureInstances(instances: IGBInstance[], bootInstance: any, core: IGBCoreService) { if (!instances) { - const instance: IGBInstance = {}; + const instance = new GuaribasInstance(); await instance.save(); instances = await core.loadInstances(); } @@ -347,11 +354,12 @@ STORAGE_SYNC=true } } - public async createBootInstance(core: GBCoreService, azureDeployer: AzureDeployerService, proxyAddress: string) { + public async createBootInstance(core: GBCoreService, installationDeployer: IGBInstallationDeployer, proxyAddress: string) { + logger.info(`Deploying cognitive infrastructure (on the cloud / on premises)...`); try { - let { instance, credentials, subscriptionId } = await StartDialog.createBaseInstance(); - instance = await azureDeployer.deployFarm(proxyAddress, instance, credentials, subscriptionId); + let { instance, credentials, subscriptionId } = await StartDialog.createBaseInstance(installationDeployer); + instance = await installationDeployer.deployFarm(proxyAddress, instance, credentials, subscriptionId); core.writeEnv(instance); logger.info(`File .env written, starting General Bots...`); GBConfigService.init(); @@ -457,9 +465,9 @@ STORAGE_SYNC=true * * @param azureDeployer Infrastructure Deployer instance. */ - private async openStorageFrontier(deployer: AzureDeployerService) { + private async openStorageFrontier(installationDeployer: IGBInstallationDeployer) { const group = GBConfigService.get('CLOUD_GROUP'); const serverName = GBConfigService.get('STORAGE_SERVER').split('.database.windows.net')[0]; - await AzureDeployerService.openStorageFirewall(group, serverName); + await installationDeployer.openStorageFirewall(group, serverName); } } diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index 1234aa895..b526a48b1 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -73,7 +73,7 @@ export class GBDeployer { this.importer = importer; } - public static getConnectionStringFromInstance(instance: GuaribasInstance) { + public static getConnectionStringFromInstance(instance: IGBInstance) { return `Server=tcp:${instance.storageServer}.database.windows.net,1433;Database=${instance.storageName};User ID=${ instance.storageUsername };Password=${instance.storagePassword};Trusted_Connection=False;Encrypt=True;Connection Timeout=30;`; @@ -272,7 +272,7 @@ export class GBDeployer { } } - public async rebuildIndex(instance: GuaribasInstance) { + public async rebuildIndex(instance: IGBInstance, searchSchema: any) { const search = new AzureSearch( instance.searchKey, instance.searchHost, @@ -302,7 +302,7 @@ export class GBDeployer { throw err; } } - await search.createIndex(AzureDeployerService.getKBSearchSchema(instance.searchIndex), dsName); + await search.createIndex(searchSchema, dsName); } public async getPackageByName(instanceId: number, packageName: string): Promise { @@ -312,7 +312,7 @@ export class GBDeployer { }); } - public installDefaultGBUI() { + public runOnce() { const root = 'packages/default.gbui'; if (!Fs.existsSync(`${root}/build`)) { logger.info(`Preparing default.gbui (it may take some additional time for the first time)...`); @@ -323,7 +323,7 @@ export class GBDeployer { } private async deployDataPackages( - core: GBCoreService, + core: IGBCoreService, botPackages: string[], _this: this, generalPackages: string[], diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 086cb54b4..738b942a8 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -46,7 +46,7 @@ const AuthenticationContext = require('adal-node').AuthenticationContext; import { AutoSaveStateMiddleware, BotFrameworkAdapter, ConversationState, MemoryStorage, UserState } from 'botbuilder'; import { ConfirmPrompt, WaterfallDialog } from 'botbuilder-dialogs'; -import { GBMinInstance, IGBAdminService, IGBConversationalService, IGBCoreService, IGBPackage } from 'botlib'; +import { GBMinInstance, IGBAdminService, IGBConversationalService, IGBCoreService, IGBPackage, IGBInstance } from 'botlib'; import { GBAnalyticsPackage } from '../../analytics.gblib'; import { GBCorePackage } from '../../core.gbapp'; import { GBCustomerSatisfactionPackage } from '../../customer-satisfaction.gbapp'; @@ -97,12 +97,12 @@ export class GBMinService { * */ public async buildMin( - bootInstance: GuaribasInstance, + bootInstance: IGBInstance, server: any, appPackages: IGBPackage[], - instances: GuaribasInstance[], + instances: IGBInstance[], deployer: GBDeployer - ): Promise { + ) { // Serves default UI on root address '/'. const uiPackage = 'default.gbui'; @@ -166,9 +166,9 @@ export class GBMinService { ); } - private handleOAuthTokenRequests(server: any, min: GBMinInstance, instance: GuaribasInstance) { + private handleOAuthTokenRequests(server: any, min: GBMinInstance, instance: IGBInstance) { server.get(`/${min.instance.botId}/token`, async (req, res) => { - const state = await min.adminService.getValue(min.instance.instanceId, 'AntiCSRFAttackState'); + const state = await min.adminService.getValue(instance.instanceId, 'AntiCSRFAttackState'); if (req.query.state !== state) { const msg = 'WARNING: state field was not provided as anti-CSRF token'; logger.error(msg); @@ -218,7 +218,7 @@ export class GBMinService { /** * Returns the instance object to clients requesting bot info. */ - private async sendInstanceToClient(req, bootInstance: GuaribasInstance, res: any, webchatToken: any) { + private async sendInstanceToClient(req, bootInstance: IGBInstance, res: any, webchatToken: any) { let botId = req.params.botId; if (botId === '[default]') { botId = bootInstance.botId; @@ -351,7 +351,7 @@ export class GBMinService { if (sysPackage.name === 'GBWhatsappPackage') { const url = '/instances/:botId/whatsapp'; server.post(url, (req, res) => { - p.channel.received(req, res); + p['channel'].received(req, res); }); } }, this); @@ -383,7 +383,7 @@ export class GBMinService { await adapter.processActivity(req, res, async context => { // Get loaded user state const state = await conversationState.get(context); - const step = await min.dialogs.createContext(context, state); + const step = await min.dialogs.createContext(context); step.context.activity.locale = 'en-US'; // TODO: Make dynamic. try { @@ -481,10 +481,10 @@ export class GBMinService { if (isVMCall) { let mainMethod = context.activity.text; - min.sandbox.context = context; - min.sandbox.step = step; - min.sandbox[mainMethod].bind(min.sandbox); - await min.sandbox[mainMethod](); + min.sandBoxMap[mainMethod].context = context; + min.sandBoxMap[mainMethod].step = step; + min.sandBoxMap[mainMethod][mainMethod].bind(min.sandBoxMap[mainMethod]); + await min.sandBoxMap[mainMethod][mainMethod](); } else if (context.activity.text === 'admin') { await step.beginDialog('/admin'); diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts index 0f9998246..40a7afff1 100644 --- a/packages/core.gbapp/services/GBVMService.ts +++ b/packages/core.gbapp/services/GBVMService.ts @@ -33,10 +33,11 @@ 'use strict'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { GBMinInstance, IGBCoreService } from 'botlib'; +import { GBMinInstance, IGBCoreService, GBService } from 'botlib'; import * as fs from 'fs'; import { GBDeployer } from './GBDeployer'; import { TSCompiler } from './TSCompiler'; +import GBAPIService from './GBAPIService'; import DialogClass from './GBAPIService'; const walkPromise = require('walk-promise'); @@ -44,7 +45,7 @@ const logger = require('../../../src/logger'); const vm = require('vm'); const UrlJoin = require('url-join'); const vb2ts = require('vbscript-to-typescript/dist/converter'); -var beautify = require('js-beautify').js; +let beautify = require('js-beautify').js; /** * @fileoverview Virtualization services for emulation of BASIC. @@ -55,7 +56,7 @@ var beautify = require('js-beautify').js; * translation and enhance classic BASIC experience. */ -export class GBVMService implements IGBCoreService { +export class GBVMService extends GBService { private readonly script = new vm.Script(); public async loadDialogPackage(folder: string, min: GBMinInstance, core: IGBCoreService, deployer: GBDeployer) { @@ -110,6 +111,10 @@ export class GBVMService implements IGBCoreService { return 'let password = sys().generatePassword()'; }); + code = code.replace(/(get)(\s)(.*)/g, ($0, $1, $2) => { + return `sys().httpGet (${$2})`; + }); + code = code.replace(/(create a bot farm using)(\s)(.*)/g, ($0, $1, $2, $3) => { return `sys().createABotFarmUsing (${$3})`; }); @@ -207,14 +212,14 @@ export class GBVMService implements IGBCoreService { parsedCode = this.handleThisAndAwait(parsedCode); - parsedCode = beautify(parsedCode, { indent_size: 2, space_in_empty_paren: true }) + parsedCode = beautify(parsedCode, { indent_size: 2, space_in_empty_paren: true }); fs.writeFileSync(jsfile, parsedCode); - const sandbox: DialogClass = new DialogClass(min); + const sandbox: DialogClass = new DialogClass(min, deployer); const context = vm.createContext(sandbox); vm.runInContext(parsedCode, context); - min.sandbox = sandbox; - await deployer.deployScriptToStorage(min.instanceId, filename); + min.sandBoxMap[mainName] = sandbox; + await deployer.deployScriptToStorage(1, filename); // TODO: Per bot storage. logger.info(`[GBVMService] Finished loading of ${filename}`); } } diff --git a/packages/customer-satisfaction.gbapp/index.ts b/packages/customer-satisfaction.gbapp/index.ts index 5324b2582..33782cf6c 100644 --- a/packages/customer-satisfaction.gbapp/index.ts +++ b/packages/customer-satisfaction.gbapp/index.ts @@ -45,23 +45,17 @@ import { GuaribasQuestionAlternate } from './models/index'; import { Sequelize } from 'sequelize-typescript'; export class GBCustomerSatisfactionPackage implements IGBPackage { - public sysPackages: IGBPackage[] = null; - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { - core.sequelize.addModels([ - GuaribasQuestionAlternate - ]); - } - public unloadPackage(core: IGBCoreService): void { + public sysPackages: IGBPackage[] = undefined; + public getDialogs(min: GBMinInstance) {} + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { + core.sequelize.addModels([GuaribasQuestionAlternate]); } + public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void { FeedbackDialog.setup(min.bot, min); QualityDialog.setup(min.bot, min); } - public unloadBot(min: GBMinInstance): void { - - } - public onNewSession(min: GBMinInstance, step: any): void { - - } + public unloadBot(min: GBMinInstance): void {} + public onNewSession(min: GBMinInstance, step: any): void {} } diff --git a/packages/kb.gbapp/index.ts b/packages/kb.gbapp/index.ts index da3628c01..9eba17b89 100644 --- a/packages/kb.gbapp/index.ts +++ b/packages/kb.gbapp/index.ts @@ -48,31 +48,18 @@ import { FaqDialog } from './dialogs/FaqDialog'; import { MenuDialog } from './dialogs/MenuDialog'; export class GBKBPackage implements IGBPackage { - - public sysPackages: IGBPackage[] = null; + public sysPackages: IGBPackage[] = undefined; + public getDialogs(min: GBMinInstance) {} public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { - core.sequelize.addModels([ - GuaribasAnswer, - GuaribasQuestion, - GuaribasSubject - ]); - - } - public unloadPackage(core: IGBCoreService): void { - + core.sequelize.addModels([GuaribasAnswer, GuaribasQuestion, GuaribasSubject]); } + public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void { - AskDialog.setup(min.bot, min); FaqDialog.setup(min.bot, min); MenuDialog.setup(min.bot, min); - - } - public unloadBot(min: GBMinInstance): void { - - } - public onNewSession(min: GBMinInstance, step: any): void { - } + public unloadBot(min: GBMinInstance): void {} + public onNewSession(min: GBMinInstance, step: any): void {} } diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index 231dd7f8b..fc47a0e40 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -53,6 +53,7 @@ import { GuaribasPackage } from '../../core.gbapp/models/GBModel'; import { GBDeployer } from '../../core.gbapp/services/GBDeployer'; import { GuaribasAnswer, GuaribasQuestion, GuaribasSubject } from '../models'; import { GBConfigService } from './../../core.gbapp/services/GBConfigService'; +import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; export class KBServiceSearchResults { public answer: GuaribasAnswer; @@ -326,7 +327,7 @@ export class KBService { }); if (lastAnswer && lastQuestionId) { - await lastAnswer.updateAttributes({ nextId: lastQuestionId }); + await lastAnswer.update({ nextId: lastQuestionId }); } lastAnswer = answer1; lastQuestionId = question1.questionId; @@ -449,7 +450,7 @@ export class KBService { where: { instanceId: instance.instanceId, packageId: packageId } }); - await deployer.rebuildIndex(instance); + await deployer.rebuildIndex(instance, new AzureDeployerService(deployer).getKBSearchSchema(instance.searchIndex)); } /** @@ -468,7 +469,7 @@ export class KBService { const p = await deployer.deployPackageToStorage(instance.instanceId, packageName); await this.importKbPackage(localPath, p, instance); - deployer.rebuildIndex(instance); + deployer.rebuildIndex(instance, new AzureDeployerService(deployer).getKBSearchSchema(instance.searchIndex)); logger.info(`[GBDeployer] Finished import of ${localPath}`); } } diff --git a/packages/security.gblib/index.ts b/packages/security.gblib/index.ts index 90ba69acb..0ae9674a8 100644 --- a/packages/security.gblib/index.ts +++ b/packages/security.gblib/index.ts @@ -44,29 +44,17 @@ import { Sequelize } from 'sequelize-typescript'; import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from './models'; export class GBSecurityPackage implements IGBPackage { - public sysPackages: IGBPackage[] = null; + public sysPackages: IGBPackage[] = undefined; + public getDialogs(min: GBMinInstance) {} + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { - core.sequelize.addModels([ - GuaribasGroup, - GuaribasUser, - GuaribasUserGroup - ]); - - core; + core.sequelize.addModels([GuaribasGroup, GuaribasUser, GuaribasUserGroup]); } - public unloadPackage(core: IGBCoreService): void { + public unloadPackage(core: IGBCoreService): void {} - } + public loadBot(min: GBMinInstance): void {} - public loadBot(min: GBMinInstance): void { - - } - - public unloadBot(min: GBMinInstance): void { - - } - public onNewSession(min: GBMinInstance, step: any): void { - - } + public unloadBot(min: GBMinInstance): void {} + public onNewSession(min: GBMinInstance, step: any): void {} } diff --git a/packages/security.gblib/services/SecService.ts b/packages/security.gblib/services/SecService.ts index 277b00818..8ced609b2 100644 --- a/packages/security.gblib/services/SecService.ts +++ b/packages/security.gblib/services/SecService.ts @@ -1,52 +1,12 @@ -/*****************************************************************************\ -| ( )_ _ | -| _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | -| ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | -| | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | -| | | ( )_) | | -| (_) \___/' | -| | -| General Bots Copyright (c) Pragmatismo.io. All rights reserved. | -| Licensed under the AGPL-3.0. | -| | -| According to our dual licensing model, this program can be used either | -| under the terms of the GNU Affero General Public License, version 3, | -| or under a proprietary license. | -| | -| The texts of the GNU Affero General Public License with an additional | -| permission and of our proprietary license can be found at and | -| in the LICENSE file you have received along with this program. | -| | -| This program is distributed in the hope that it will be useful, | -| but WITHOUT ANY WARRANTY, without even the implied warranty of | -| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | -| GNU Affero General Public License for more details. | -| | -| "General Bots" is a registered trademark of Pragmatismo.io. | -| The licensing of the program under the AGPLv3 does not imply a | -| trademark license. Therefore any rights, title and interest in | -| our trademarks remain entirely with us. | -| | -\*****************************************************************************/ - -const Path = require('path'); const Fs = require('fs'); -const _ = require('lodash'); -const Parse = require('csv-parse'); -const Async = require('async'); const UrlJoin = require('url-join'); -const logger = require('../../../src/logger'); -import { GBService, GBServiceCallback, IGBInstance } from 'botlib'; +import { GBService, IGBInstance } from 'botlib'; import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from '../models'; export class SecService extends GBService { - public async importSecurityFile(localPath: string, instance: IGBInstance) { - const security = JSON.parse( - Fs.readFileSync(UrlJoin(localPath, 'security.json'), 'utf8') - ); + const security = JSON.parse(Fs.readFileSync(UrlJoin(localPath, 'security.json'), 'utf8')); security.groups.forEach(group => { const groupDb = GuaribasGroup.build({ instanceId: instance.instanceId, @@ -78,16 +38,15 @@ export class SecService extends GBService { channelName: string, displayName: string ): Promise { - return new Promise( - (resolve, reject) => { - - GuaribasUser.findOne({ - attributes: ['instanceId', 'internalAddress'], - where: { - instanceId: instanceId, - userSystemId: userSystemId - } - }).then(user => { + return new Promise((resolve, reject) => { + GuaribasUser.findOne({ + attributes: ['instanceId', 'internalAddress'], + where: { + instanceId: instanceId, + userSystemId: userSystemId + } + }) + .then(user => { if (!user) { user = GuaribasUser.build(); } @@ -99,7 +58,8 @@ export class SecService extends GBService { user.defaultChannel = channelName; user.save(); resolve(user); - }).error(reject); - }); + }) + .error(reject); + }); } } diff --git a/packages/whatsapp.gblib/index.ts b/packages/whatsapp.gblib/index.ts index 5bc37b896..ea79e0d1c 100644 --- a/packages/whatsapp.gblib/index.ts +++ b/packages/whatsapp.gblib/index.ts @@ -44,31 +44,30 @@ import { Sequelize } from 'sequelize-typescript'; import { WhatsappDirectLine } from './services/WhatsappDirectLine'; export class GBWhatsappPackage implements IGBPackage { + public sysPackages: IGBPackage[] = undefined; + public getDialogs(min: GBMinInstance) {} - public sysPackages: IGBPackage[] = null; - public channel: WhatsappDirectLine; + public channel: WhatsappDirectLine; - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} + + public unloadPackage(core: IGBCoreService): void {} + + public loadBot(min: GBMinInstance): void { + // Only loads engine if it is defined on services.json. + + if (min.instance.whatsappBotKey) { + this.channel = new WhatsappDirectLine( + min.botId, + min.instance.whatsappBotKey, + min.instance.whatsappServiceKey, + min.instance.whatsappServiceNumber, + min.instance.whatsappServiceUrl, + min.instance.whatsappServiceWebhookUrl + ); } + } - public unloadPackage(core: IGBCoreService): void { - - } - - public loadBot(min: GBMinInstance): void { - - // Only loads engine if it is defined on services.json. - - if (min.instance.whatsappBotKey) { - this.channel = new WhatsappDirectLine(min.botId, min.instance.whatsappBotKey, min.instance.whatsappServiceKey, - min.instance.whatsappServiceNumber, min.instance.whatsappServiceUrl, min.instance.whatsappServiceWebhookUrl); - } - } - - public unloadBot(min: GBMinInstance): void { - - } - public onNewSession(min: GBMinInstance, step: any): void { - - } + public unloadBot(min: GBMinInstance): void {} + public onNewSession(min: GBMinInstance, step: any): void {} } diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts index 5203524e0..0344b352b 100644 --- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts +++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts @@ -1,266 +1,213 @@ -/*****************************************************************************\ -| ( )_ _ | -| _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | -| ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | -| | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | -| | | ( )_) | | -| (_) \___/' | -| | -| General Bots Copyright (c) Pragmatismo.io. All rights reserved. | -| Licensed under the AGPL-3.0. | -| | -| According to our dual licensing model, this program can be used either | -| under the terms of the GNU Affero General Public License, version 3, | -| or under a proprietary license. | -| | -| The texts of the GNU Affero General Public License with an additional | -| permission and of our proprietary license can be found at and | -| in the LICENSE file you have received along with this program. | -| | -| This program is distributed in the hope that it will be useful, | -| but WITHOUT ANY WARRANTY, without even the implied warranty of | -| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | -| GNU Affero General Public License for more details. | -| | -| "General Bots" is a registered trademark of Pragmatismo.io. | -| The licensing of the program under the AGPLv3 does not imply a | -| trademark license. Therefore any rights, title and interest in | -| our trademarks remain entirely with us. | -| | -\*****************************************************************************/ - -const Path = require('path'); -const Fs = require('fs'); -const _ = require('lodash'); -const Parse = require('csv-parse'); -const Async = require('async'); const UrlJoin = require('url-join'); const logger = require('../../../src/logger'); const Swagger = require('swagger-client'); const rp = require('request-promise'); +import { GBService } from 'botlib'; import * as request from 'request-promise-native'; -import { GBService, GBServiceCallback, IGBInstance } from 'botlib'; - export class WhatsappDirectLine extends GBService { + public pollInterval = 1000; + public directLineClientName = 'DirectLineClient'; + public directLineSpecUrl = 'https://docs.botframework.com/en-us/restapi/directline3/swagger.json'; - public pollInterval = 1000; - public directLineClientName = 'DirectLineClient'; - public directLineSpecUrl = 'https://docs.botframework.com/en-us/restapi/directline3/swagger.json'; + public directLineClient: any; + public whatsappServiceKey: string; + public whatsappServiceNumber: string; + public whatsappServiceUrl: string; + public whatsappServiceWebhookUrl: string; + public botId: string; + public watermark: string = null; - public directLineClient: any; - public whatsappServiceKey: string; - public whatsappServiceNumber: string; - public whatsappServiceUrl: string; - public whatsappServiceWebhookUrl: string; - public botId: string; - public watermark: string = null; + public conversationIds = {}; - public conversationIds = {}; + constructor( + botId, + directLineSecret, + whatsappServiceKey, + whatsappServiceNumber, + whatsappServiceUrl, + whatsappServiceWebhookUrl + ) { + super(); - constructor(botId, directLineSecret, whatsappServiceKey, whatsappServiceNumber, whatsappServiceUrl, whatsappServiceWebhookUrl) { + this.botId = botId; + this.whatsappServiceKey = whatsappServiceKey; + this.whatsappServiceNumber = whatsappServiceNumber; + this.whatsappServiceUrl = whatsappServiceUrl; + this.whatsappServiceWebhookUrl = whatsappServiceWebhookUrl; - super(); - - this.botId = botId; - this.whatsappServiceKey = whatsappServiceKey; - this.whatsappServiceNumber = whatsappServiceNumber; - this.whatsappServiceUrl = whatsappServiceUrl; - this.whatsappServiceWebhookUrl = whatsappServiceWebhookUrl; - - // TODO: Migrate to Swagger 3. - this.directLineClient = rp(this.directLineSpecUrl) - .then((spec) => { - return new Swagger({ - spec: JSON.parse(spec.trim()), - usePromise: true - }); - }) - .then(async (client) => { - client.clientAuthorizations.add('AuthorizationBotConnector', - new Swagger.ApiKeyAuthorization('Authorization', 'Bearer ' + - directLineSecret, 'header')); - - const options = { - method: 'POST', - url: UrlJoin(this.whatsappServiceUrl, 'webhook'), - qs: - { - token: this.whatsappServiceKey, - webhookUrl: `${this.whatsappServiceWebhookUrl}/instances/${this.botId}/whatsapp`, - set: true - }, - headers: - { - 'cache-control': 'no-cache' - } - }; - - try { - const result = await request.post(options); - logger.info(result); - } catch (error) { - logger.error('Error initializing 3rd party Whatsapp provider.', error); - } - - return client; - }) - .catch((err) => { - logger.error('Error initializing DirectLine client', err); - }); - - } - - public received(req, res) { - const text = req.body.messages[0].body; - const from = req.body.messages[0].author.split('@')[0]; - const fromName = req.body.messages[0].senderName; - - if (req.body.messages[0].fromMe) { - return; // Exit here. - } - - logger.info(`GBWhatsapp: Hook called. from: ${from}(${fromName}), text: ${text})`); - - const conversationId = this.conversationIds[from]; - - this.directLineClient.then((client) => { - - if (this.conversationIds[from] == null) { - - logger.info(`GBWhatsapp: Starting new conversation on Bot.`); - client.Conversations.Conversations_StartConversation() - .then((response) => { - return response.obj.conversationId; - }) - .then((conversationId) => { - - this.conversationIds[from] = conversationId; - this.inputMessage(client, conversationId, text, - from, fromName); - - this.pollMessages(client, conversationId, from, fromName); - }) - .catch((err) => { - console.error('Error starting conversation', err); - }); - - } else { - this.inputMessage(client, conversationId, text, - from, fromName); - } - res.end(); + // TODO: Migrate to Swagger 3. + this.directLineClient = rp(this.directLineSpecUrl) + .then(spec => { + return new Swagger({ + spec: JSON.parse(spec.trim()), + usePromise: true }); - } + }) + .then(async client => { + client.clientAuthorizations.add( + 'AuthorizationBotConnector', + new Swagger.ApiKeyAuthorization('Authorization', 'Bearer ' + directLineSecret, 'header') + ); - public inputMessage(client, conversationId, text, from, fromName) { - - client.Conversations.Conversations_PostActivity( - { - conversationId: conversationId, - activity: { - textFormat: 'plain', - text: text, - type: 'message', - from: { - id: from, - name: fromName - }, - replyToId: from - } - }).catch((err) => { - logger.error(`GBWhatsapp: Error receiving message: ${err}.`); - }); - - } - - public pollMessages(client, conversationId, from, fromName) { - - logger.info(`GBWhatsapp: Starting polling message for conversationId: - ${conversationId}.`); - - setInterval(() => { - client.Conversations.Conversations_GetActivities({ - conversationId: - conversationId, watermark: this.watermark - }) - .then((response) => { - this.watermark = response.obj.watermark; - return response.obj.activities; - }) - .then((activities) => { - this.printMessages(activities, conversationId, from, fromName); - }); - }, this.pollInterval); - } - - public printMessages(activities, conversationId, from, fromName) { - - if (activities && activities.length) { - - // Ignore own messages. - - activities = activities.filter((m) => (m.from.id === 'GeneralBots') && m.type === 'message'); - - if (activities.length) { - - // Print other messages. - - activities.forEach(activity => { - this.printMessage(activity, conversationId, from, fromName); - }); - } - } - } - - public printMessage(activity, conversationId, from, fromName) { - - let output = ''; - - if (activity.text) { - logger.info(`GBWhatsapp: MSG: ${activity.text}`); - output = activity.text; - } - - if (activity.attachments) { - activity.attachments.forEach((attachment) => { - switch (attachment.contentType) { - case 'application/vnd.microsoft.card.hero': - output += `\n${this.renderHeroCard(attachment)}`; - break; - - case 'image/png': - logger.info('Opening the requested image ' + attachment.contentUrl); - output += `\n${attachment.contentUrl}`; - break; - } - }); - } - - this.sendToDevice(conversationId, from, fromName, output); - } - - public renderHeroCard(attachment) { - return `${attachment.content.title} - ${attachment.content.text}`; - } - - public async sendToDevice(conversationId, to, toName, msg) { const options = { - method: 'POST', - url: UrlJoin(this.whatsappServiceUrl, 'message'), - qs: - { - token: this.whatsappServiceKey, - phone: to, - body: msg - }, - headers: - { - 'cache-control': 'no-cache' - } + method: 'POST', + url: UrlJoin(this.whatsappServiceUrl, 'webhook'), + qs: { + token: this.whatsappServiceKey, + webhookUrl: `${this.whatsappServiceWebhookUrl}/instances/${this.botId}/whatsapp`, + set: true + }, + headers: { + 'cache-control': 'no-cache' + } }; - const result = await request.get(options); + try { + const result = await request.post(options); + logger.info(result); + } catch (error) { + logger.error('Error initializing 3rd party Whatsapp provider.', error); + } + + return client; + }) + .catch(err => { + logger.error('Error initializing DirectLine client', err); + }); + } + + public received(req, res) { + const text = req.body.messages[0].body; + const from = req.body.messages[0].author.split('@')[0]; + const fromName = req.body.messages[0].senderName; + + if (req.body.messages[0].fromMe) { + return; // Exit here. } + + logger.info(`GBWhatsapp: Hook called. from: ${from}(${fromName}), text: ${text})`); + + const conversationId = this.conversationIds[from]; + + this.directLineClient.then(client => { + if (this.conversationIds[from] == undefined) { + logger.info(`GBWhatsapp: Starting new conversation on Bot.`); + client.Conversations.Conversations_StartConversation() + .then(response => { + return response.obj.conversationId; + }) + .then(conversationId => { + this.conversationIds[from] = conversationId; + this.inputMessage(client, conversationId, text, from, fromName); + + this.pollMessages(client, conversationId, from, fromName); + }) + .catch(err => { + console.error('Error starting conversation', err); + }); + } else { + this.inputMessage(client, conversationId, text, from, fromName); + } + res.end(); + }); + } + + public inputMessage(client, conversationId, text, from, fromName) { + client.Conversations.Conversations_PostActivity({ + conversationId: conversationId, + activity: { + textFormat: 'plain', + text: text, + type: 'message', + from: { + id: from, + name: fromName + }, + replyToId: from + } + }).catch(err => { + logger.error(`GBWhatsapp: Error receiving message: ${err}.`); + }); + } + + public pollMessages(client, conversationId, from, fromName) { + logger.info(`GBWhatsapp: Starting polling message for conversationId: + ${conversationId}.`); + + setInterval(() => { + client.Conversations.Conversations_GetActivities({ + conversationId: conversationId, + watermark: this.watermark + }) + .then(response => { + this.watermark = response.obj.watermark; + return response.obj.activities; + }) + .then(activities => { + this.printMessages(activities, conversationId, from, fromName); + }); + }, this.pollInterval); + } + + public printMessages(activities, conversationId, from, fromName) { + if (activities && activities.length) { + // Ignore own messages. + + activities = activities.filter(m => m.from.id === 'GeneralBots' && m.type === 'message'); + + if (activities.length) { + // Print other messages. + + activities.forEach(activity => { + this.printMessage(activity, conversationId, from, fromName); + }); + } + } + } + + public printMessage(activity, conversationId, from, fromName) { + let output = ''; + + if (activity.text) { + logger.info(`GBWhatsapp: MSG: ${activity.text}`); + output = activity.text; + } + + if (activity.attachments) { + activity.attachments.forEach(attachment => { + switch (attachment.contentType) { + case 'application/vnd.microsoft.card.hero': + output += `\n${this.renderHeroCard(attachment)}`; + break; + + case 'image/png': + logger.info('Opening the requested image ' + attachment.contentUrl); + output += `\n${attachment.contentUrl}`; + break; + } + }); + } + + this.sendToDevice(from, output); + } + + public renderHeroCard(attachment) { + return `${attachment.content.title} - ${attachment.content.text}`; + } + + public async sendToDevice(to, msg) { + const options = { + method: 'POST', + url: UrlJoin(this.whatsappServiceUrl, 'message'), + qs: { + token: this.whatsappServiceKey, + phone: to, + body: msg + }, + headers: { + 'cache-control': 'no-cache' + } + }; + } } diff --git a/src/app.ts b/src/app.ts index 4fd8ec5d2..7b1617c1f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -40,7 +40,7 @@ const logger = require('./logger'); const express = require('express'); const bodyParser = require('body-parser'); -import { IGBInstance, IGBPackage } from 'botlib'; +import { IGBInstance, IGBPackage, IGBCoreService } from 'botlib'; import { GBAdminService } from '../packages/admin.gbapp/services/GBAdminService'; import { AzureDeployerService } from '../packages/azuredeployer.gbapp/services/AzureDeployerService'; import { GuaribasInstance } from '../packages/core.gbapp/models/GBModel'; @@ -50,8 +50,6 @@ import { GBCoreService } from '../packages/core.gbapp/services/GBCoreService'; import { GBDeployer } from '../packages/core.gbapp/services/GBDeployer'; import { GBImporter } from '../packages/core.gbapp/services/GBImporterService'; import { GBMinService } from '../packages/core.gbapp/services/GBMinService'; -import { GBVMService } from '../packages/core.gbapp/services/GBVMService'; -import { load } from 'dotenv'; const appPackages = new Array(); @@ -90,7 +88,7 @@ export class GBServer { // Reads basic configuration, initialize minimal services. GBConfigService.init(); - const core = new GBCoreService(); + const core: IGBCoreService = new GBCoreService(); const importer: GBImporter = new GBImporter(core); const deployer: GBDeployer = new GBDeployer(core, importer); @@ -103,7 +101,7 @@ export class GBServer { logger.info(`Establishing a development local proxy (ngrok)...`); const proxyAddress: string = await core.ensureProxy(port); - // Creates a boot instance or load it frmo storage. + // Creates a boot instance or load it from storage. let bootInstance: IGBInstance = null; try { @@ -130,9 +128,9 @@ export class GBServer { 'boot.gbot', 'packages/boot.gbot' ); - const fullInstance = Object.assign(packageInstance, bootInstance); + const fullInstance = { ...packageInstance, ...bootInstance }; await core.saveInstance(fullInstance); - let instances: GuaribasInstance[] = await core.loadAllInstances(core, azureDeployer, proxyAddress); + let instances: IGBInstance[] = await core.loadAllInstances(core, azureDeployer, proxyAddress); instances = await core.ensureInstances(instances, bootInstance, core); if (!bootInstance) { bootInstance = instances[0]; @@ -145,14 +143,13 @@ export class GBServer { // Deployment of local applications for the first time. - deployer.installDefaultGBUI(); + deployer.runOnce(); logger.info(`The Bot Server is in RUNNING mode...`); // Opens Navigator. core.openBrowserInDevelopment(); - } catch (err) { logger.error(`STOP: ${err} ${err.stack ? err.stack : ''}`); process.exit(1); diff --git a/tsconfig.json b/tsconfig.json index 6bc1d0115..44e702354 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,6 +12,7 @@ "resolveJsonModule": true, "outDir": "./dist", "paths": { + "*": ["types/*"], "botlib/*": ["node_modules/botlib/*"], "pragmatismo-io-framework/*": ["node_modules/pragmatismo-io-framework/*"] }, From b29bc7bc23c03251ed2ab90c2332bfda76ba6414 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Fri, 8 Mar 2019 06:49:22 -0300 Subject: [PATCH 03/15] fix(general): tslint being applied in all sources. --- package.json | 1 - packages/admin.gbapp/dialogs/AdminDialog.ts | 3 +- packages/admin.gbapp/models/AdminModel.ts | 4 +-- .../admin.gbapp/services/GBAdminService.ts | 4 ++- .../dialogs/BotFarmDialog.ts | 2 +- .../dialogs/StartDialog.ts | 1 + .../services/AzureDeployerService.ts | 33 ++++++++++--------- packages/console.gblib/index.ts | 2 +- .../services/ConsoleDirectLine.ts | 3 +- packages/core.gbapp/models/GBModel.ts | 2 +- .../core.gbapp/services/GBConfigService.ts | 2 ++ packages/core.gbapp/services/GBCoreService.ts | 4 +++ packages/core.gbapp/services/GBDeployer.ts | 5 +++ .../core.gbapp/services/GBImporterService.ts | 2 +- packages/core.gbapp/services/GBMinService.ts | 17 ++++++---- packages/core.gbapp/services/GBVMService.ts | 10 +++--- packages/core.gbapp/services/TSCompiler.ts | 1 - packages/core.gbapp/tests/vm.test.ts | 2 +- .../dialogs/FeedbackDialog.ts | 9 +++-- .../dialogs/QualityDialog.ts | 1 + .../services/CSService.ts | 1 + packages/kb.gbapp/dialogs/AskDialog.ts | 21 +++++++----- packages/kb.gbapp/dialogs/FaqDialog.ts | 2 +- packages/kb.gbapp/dialogs/MenuDialog.ts | 6 ++-- packages/kb.gbapp/services/KBService.ts | 3 +- packages/whatsapp.gblib/index.ts | 2 +- .../services/WhatsappDirectLine.ts | 3 +- src/app.ts | 2 +- 28 files changed, 90 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index ef8cc94e7..f44c5c262 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "ban": "ban", "issues": "git-issues", "license": "license-checker --production --onlyunknown --csv", - "pretslint": "npm run pretty", "pretty": "prettier-standard 'src/*.ts' 'packages/**/*.ts'", "secure": "nsp check", "size": "t=\"$(npm pack .)\"; wc -c \"${t}\"; tar tvf \"${t}\"; rm \"${t}\";", diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts index 724acc5c7..21a509785 100644 --- a/packages/admin.gbapp/dialogs/AdminDialog.ts +++ b/packages/admin.gbapp/dialogs/AdminDialog.ts @@ -40,12 +40,12 @@ const UrlJoin = require('url-join'); import { BotAdapter } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; import { GBMinInstance, IGBDialog } from 'botlib'; +import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GBConfigService } from '../../core.gbapp/services/GBConfigService'; import { GBDeployer } from '../../core.gbapp/services/GBDeployer'; import { GBImporter } from '../../core.gbapp/services/GBImporterService'; import { GBAdminService } from '../services/GBAdminService'; import { Messages } from '../strings'; -import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; /** * Dialogs for administration tasks. @@ -157,6 +157,7 @@ export class AdminDialog extends IGBDialog { return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'addConnection') { await AdminDialog.addConnectionCommand(min, text); + return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'undeployPackage') { await AdminDialog.undeployPackageCommand(text, min); diff --git a/packages/admin.gbapp/models/AdminModel.ts b/packages/admin.gbapp/models/AdminModel.ts index a747f7046..99cd37c42 100644 --- a/packages/admin.gbapp/models/AdminModel.ts +++ b/packages/admin.gbapp/models/AdminModel.ts @@ -39,10 +39,10 @@ import { Column, CreatedAt, + DataType, Model, Table, - UpdatedAt, - DataType + UpdatedAt } from 'sequelize-typescript'; @Table diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts index b8db0e5ec..68d3a95d6 100644 --- a/packages/admin.gbapp/services/GBAdminService.ts +++ b/packages/admin.gbapp/services/GBAdminService.ts @@ -37,7 +37,7 @@ 'use strict'; import { AuthenticationContext, TokenResponse } from 'adal-node'; -import { IGBCoreService, IGBAdminService } from 'botlib'; +import { IGBAdminService, IGBCoreService } from 'botlib'; import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; import { GuaribasAdmin } from '../models/AdminModel'; const UrlJoin = require('url-join'); @@ -88,6 +88,7 @@ export class GBAdminService implements IGBAdminService { }; let password = passwordGenerator.generatePassword(options); password = password.replace(/[\@\[\=\:\;\?]/g, '#'); + return password; } @@ -102,6 +103,7 @@ export class GBAdminService implements IGBAdminService { maximumLength: 14 }; const name = passwordGenerator.generatePassword(options); + return name; } diff --git a/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts b/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts index 96fd56a31..0a41cd431 100644 --- a/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts +++ b/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts @@ -39,8 +39,8 @@ import { BotAdapter } from 'botbuilder'; import { GBMinInstance } from 'botlib'; import { IGBDialog } from 'botlib'; -import { Messages } from '../strings'; import { WaterfallDialog } from 'botlib/node_modules/botbuilder-dialogs'; +import { Messages } from '../strings'; export class BotFarmDialog extends IGBDialog { /** diff --git a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts index 8ceade282..4d2175ab6 100644 --- a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts +++ b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts @@ -136,6 +136,7 @@ export class StartDialog { process.stdout.write(`${GBAdminService.GB_PROMPT}CLOUD_PASSWORD:`); password = scanf('%s').replace(/(\n|\r)+$/, ''); } + return password; } diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 012e0c95d..10cd564a2 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -43,7 +43,7 @@ import { SearchManagementClient } from 'azure-arm-search'; import { SqlManagementClient } from 'azure-arm-sql'; import { WebSiteManagementClient } from 'azure-arm-website'; import { AppServicePlan } from 'azure-arm-website/lib/models'; -import { IGBInstance, IGBInstallationDeployer } from 'botlib'; +import { IGBInstallationDeployer, IGBInstance } from 'botlib'; import { HttpMethods, ServiceClient, WebResource } from 'ms-rest-js'; import { GBAdminService } from '../../../packages/admin.gbapp/services/GBAdminService'; import { GBCorePackage } from '../../../packages/core.gbapp'; @@ -77,6 +77,19 @@ export class AzureDeployerService implements IGBInstallationDeployer { this.deployer = deployer; } + private static createRequestObject(url: string, accessToken: string, verb: HttpMethods, body: string) { + const req = new WebResource(); + req.method = verb; + req.url = url; + req.headers = {}; + req.headers['Content-Type'] = 'application/json'; + req.headers['accept-language'] = '*'; + req.headers.Authorization = 'Bearer ' + accessToken; + req.body = body; + + return req; + } + public async getSubscriptions(credentials) { const subscriptionClient = new SubscriptionClient.default(credentials); @@ -228,19 +241,6 @@ export class AzureDeployerService implements IGBInstallationDeployer { await storageClient.firewallRules.createOrUpdate(groupName, serverName, 'gb', params); } - private static createRequestObject(url: string, accessToken: string, verb: HttpMethods, body: string) { - const req = new WebResource(); - req.method = verb; - req.url = url; - req.headers = {}; - req.headers['Content-Type'] = 'application/json'; - req.headers['accept-language'] = '*'; - req.headers.Authorization = 'Bearer ' + accessToken; - req.body = body; - - return req; - } - public async deployFarm( proxyAddress: string, instance: IGBInstance, @@ -344,6 +344,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { ); spinner.stop(); + return instance; } @@ -385,7 +386,6 @@ export class AzureDeployerService implements IGBInstallationDeployer { this.accessToken = credentials.tokenCache._entries[0].accessToken; } - private async createStorageServer(group, name, administratorLogin, administratorPassword, serverName, location) { const params = { location: location, @@ -471,6 +471,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { const res = await httpClient.sendRequest(req); if (!(res.bodyAsJson as any).id) { reject(res.bodyAsText); + return; } @@ -588,6 +589,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { private async createDeployGroup(name, location) { const params = { location: location }; + return this.resourceClient.resourceGroups.createOrUpdate(name, params); } @@ -610,6 +612,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { location: location, serverFarmId: farmId }; + return this.webSiteClient.webApps.createOrUpdate(group, name, parameters); } } diff --git a/packages/console.gblib/index.ts b/packages/console.gblib/index.ts index e056b0500..35fd8129d 100644 --- a/packages/console.gblib/index.ts +++ b/packages/console.gblib/index.ts @@ -44,7 +44,7 @@ import { Sequelize } from 'sequelize-typescript'; import { ConsoleDirectLine } from './services/ConsoleDirectLine'; export class GBConsolePackage implements IGBPackage { - + public sysPackages: IGBPackage[] = undefined; public channel: ConsoleDirectLine; public getDialogs(min: GBMinInstance) {} diff --git a/packages/console.gblib/services/ConsoleDirectLine.ts b/packages/console.gblib/services/ConsoleDirectLine.ts index 9cf418440..ede2e837b 100644 --- a/packages/console.gblib/services/ConsoleDirectLine.ts +++ b/packages/console.gblib/services/ConsoleDirectLine.ts @@ -64,6 +64,7 @@ export class ConsoleDirectLine extends GBService { .then(function (client) { client.clientAuthorizations.add('AuthorizationBotConnector', new Swagger.ApiKeyAuthorization('Authorization', 'Bearer ' + directLineSecret, 'header')); + return client; }) .catch(function (err) { @@ -129,7 +130,7 @@ export class ConsoleDirectLine extends GBService { setInterval(function () { client.Conversations.Conversations_GetActivities({ conversationId: conversationId, watermark: watermark }) .then(function (response) { - watermark = response.obj.watermark; // use watermark so subsequent requests skip old messages + watermark = response.obj.watermark; return response.obj.activities; }) .then(_this_.printMessages, _this_.directLineClientName); diff --git a/packages/core.gbapp/models/GBModel.ts b/packages/core.gbapp/models/GBModel.ts index a382b92bd..cf1dac689 100644 --- a/packages/core.gbapp/models/GBModel.ts +++ b/packages/core.gbapp/models/GBModel.ts @@ -54,7 +54,7 @@ import { IGBInstance } from 'botlib'; @Table export class GuaribasInstance extends Model implements IGBInstance { - + @PrimaryKey @AutoIncrement @Column diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts index e6be5c2df..e0a6fd658 100644 --- a/packages/core.gbapp/services/GBConfigService.ts +++ b/packages/core.gbapp/services/GBConfigService.ts @@ -112,6 +112,7 @@ export class GBConfigService { break; } } + return value; } @@ -120,6 +121,7 @@ export class GBConfigService { if (!value) { value = process.env[key]; } + return value; } } diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index eefef4877..72c0c1b21 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -420,10 +420,12 @@ STORAGE_SYNC=true fkname += '_' + matches[1]; matches = re4.exec(fkcols); } + return 'CONSTRAINT [' + fkname + '_fk] FOREIGN KEY (' + fkcols + ')'; } ); } + return sql; } @@ -453,10 +455,12 @@ STORAGE_SYNC=true fkname += '_' + matches[1]; matches = re3.exec(fkcols); } + return (args[0] ? args[0] : '') + 'CONSTRAINT [' + fkname + '_fk] FOREIGN KEY (' + fkcols + ')'; } ); } + return sql; } diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index b526a48b1..b75c49ea1 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -224,6 +224,7 @@ export class GBDeployer { // PACKAGE: Put in package logic. case '.gbkb': const service = new KBService(this.core.sequelize); + return service.deployKb(this.core, this, localPath); case '.gbui': @@ -231,6 +232,7 @@ export class GBDeployer { case '.gbdialog': const vm = new GBVMService(); + return vm.loadDialogPackage(localPath, min, this.core, this); default: @@ -257,6 +259,7 @@ export class GBDeployer { case '.gbkb': const service = new KBService(this.core.sequelize); + return service.undeployKbFromStorage(instance, this, p.packageId); case '.gbui': @@ -307,6 +310,7 @@ export class GBDeployer { public async getPackageByName(instanceId: number, packageName: string): Promise { const where = { packageName: packageName, instanceId: instanceId }; + return GuaribasPackage.findOne({ where: where }); @@ -436,6 +440,7 @@ export class GBDeployer { appPackagesProcessed++; } }); + return appPackagesProcessed; } } diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts index 657450893..9464d60bd 100644 --- a/packages/core.gbapp/services/GBImporterService.ts +++ b/packages/core.gbapp/services/GBImporterService.ts @@ -69,7 +69,7 @@ export class GBImporter { packageJson = { ...packageJson, ...settings, ...servicesJson }; - if (botId){ + if (botId) { packageJson.botId = botId; } diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 738b942a8..6722f8c84 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -46,7 +46,7 @@ const AuthenticationContext = require('adal-node').AuthenticationContext; import { AutoSaveStateMiddleware, BotFrameworkAdapter, ConversationState, MemoryStorage, UserState } from 'botbuilder'; import { ConfirmPrompt, WaterfallDialog } from 'botbuilder-dialogs'; -import { GBMinInstance, IGBAdminService, IGBConversationalService, IGBCoreService, IGBPackage, IGBInstance } from 'botlib'; +import { GBMinInstance, IGBAdminService, IGBConversationalService, IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; import { GBAnalyticsPackage } from '../../analytics.gblib'; import { GBCorePackage } from '../../core.gbapp'; import { GBCustomerSatisfactionPackage } from '../../customer-satisfaction.gbapp'; @@ -266,11 +266,13 @@ export class GBMinService { try { const json = await request(options); + return Promise.resolve(JSON.parse(json)); } catch (error) { const msg = `[botId:${ instance.botId }] Error calling Direct Line client, verify Bot endpoint on the cloud. Error is: ${error}.`; + return Promise.reject(new Error(msg)); } } @@ -296,6 +298,7 @@ export class GBMinService { return await request(options); } catch (error) { const msg = `Error calling Speech to Text client. Error is: ${error}.`; + return Promise.reject(new Error(msg)); } } @@ -351,21 +354,21 @@ export class GBMinService { if (sysPackage.name === 'GBWhatsappPackage') { const url = '/instances/:botId/whatsapp'; server.post(url, (req, res) => { - p['channel'].received(req, res); + p.channel.received(req, res); }); } - }, this); + }, this); appPackages.forEach(p => { p.sysPackages = sysPackages; p.loadBot(min); if (p.getDialogs !== undefined) { - let dialogs = p.getDialogs(min); + const dialogs = p.getDialogs(min); dialogs.forEach(dialog => { min.dialogs.add(new WaterfallDialog(dialog.name, dialog.waterfall)); }); } - }, this); + }, this); } /** @@ -476,10 +479,10 @@ export class GBMinService { private async processMessageActivity(context, min: GBMinInstance, step: any) { // Direct script invoking by itent name. - let isVMCall = Object.keys(min.scriptMap).find(key => min.scriptMap[key] === context.activity.text) !== undefined; + const isVMCall = Object.keys(min.scriptMap).find(key => min.scriptMap[key] === context.activity.text) !== undefined; if (isVMCall) { - let mainMethod = context.activity.text; + const mainMethod = context.activity.text; min.sandBoxMap[mainMethod].context = context; min.sandBoxMap[mainMethod].step = step; diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts index 40a7afff1..8690a6071 100644 --- a/packages/core.gbapp/services/GBVMService.ts +++ b/packages/core.gbapp/services/GBVMService.ts @@ -33,19 +33,19 @@ 'use strict'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { GBMinInstance, IGBCoreService, GBService } from 'botlib'; +import { GBMinInstance, GBService, IGBCoreService } from 'botlib'; import * as fs from 'fs'; +import GBAPIService from './GBAPIService'; +import GBAPIService from './GBAPIService'; import { GBDeployer } from './GBDeployer'; import { TSCompiler } from './TSCompiler'; -import GBAPIService from './GBAPIService'; -import DialogClass from './GBAPIService'; const walkPromise = require('walk-promise'); const logger = require('../../../src/logger'); const vm = require('vm'); const UrlJoin = require('url-join'); const vb2ts = require('vbscript-to-typescript/dist/converter'); -let beautify = require('js-beautify').js; +const beautify = require('js-beautify').js; /** * @fileoverview Virtualization services for emulation of BASIC. @@ -250,7 +250,7 @@ export class GBVMService extends GBService { min.dialogs.add( new WaterfallDialog('/hear', [ async step => { - step.activeDialog.state.cbId = step.options['id']; + step.activeDialog.state.cbId = step.options.id; return await step.prompt('textPrompt', {}); }, diff --git a/packages/core.gbapp/services/TSCompiler.ts b/packages/core.gbapp/services/TSCompiler.ts index 2b6a2cb09..942e82b03 100644 --- a/packages/core.gbapp/services/TSCompiler.ts +++ b/packages/core.gbapp/services/TSCompiler.ts @@ -41,7 +41,6 @@ const logger = require('../../../src/logger'); export class TSCompiler { - private static shouldIgnoreError(diagnostic) { const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'); diff --git a/packages/core.gbapp/tests/vm.test.ts b/packages/core.gbapp/tests/vm.test.ts index 39e4bca53..1be437b20 100644 --- a/packages/core.gbapp/tests/vm.test.ts +++ b/packages/core.gbapp/tests/vm.test.ts @@ -44,7 +44,7 @@ describe('Load function', () => { try { // const service = new GBVMService(); // TODO: service.loadJS('invalid.file', null, null, null, null); - + } catch (error) { expect(error).to.equal(0); } diff --git a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts index d0ee93c3d..e66d26e7b 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts @@ -58,6 +58,7 @@ export class FeedbackDialog extends IGBDialog { new WaterfallDialog('/feedbackNumber', [ async step => { const locale = step.context.activity.locale; + // TODO: Migrate to 4.*+ await step.prompt("choicePrompt", Messages[locale].what_about_me, [ // "1", // "2", @@ -73,6 +74,7 @@ export class FeedbackDialog extends IGBDialog { const user = await min.userProfile.get(context, {}); await service.updateConversationRate(user.conversation, rate); await step.context.sendActivity(Messages[locale].thanks); + return await step.next(); } ]) @@ -84,7 +86,7 @@ export class FeedbackDialog extends IGBDialog { const locale = step.context.activity.locale; await step.context.sendActivity(Messages[locale].about_suggestions); - step.activeDialog.state.cbId = step.options['id']; + step.activeDialog.state.cbId = step.options.id; return await step.prompt('textPrompt', Messages[locale].what_about_service); }, @@ -93,8 +95,8 @@ export class FeedbackDialog extends IGBDialog { const locale = step.context.activity.locale; const rate = await AzureText.getSentiment( min.instance.textAnalyticsKey, - min.instance.textAnalyticsEndpoint, - min.conversationalService.getCurrentLanguage(step), + min.instance.textAnalyticsEndpoint, + min.conversationalService.getCurrentLanguage(step), step.result ); @@ -105,6 +107,7 @@ export class FeedbackDialog extends IGBDialog { // TODO: Record. } + return await step.replaceDialog('/ask', { isReturning: true }); } diff --git a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts index dbfaf596b..186259fef 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts @@ -79,6 +79,7 @@ export class QualityDialog extends IGBDialog { ); await step.replaceDialog('/ask', { isReturning: true }); } + return await step.next(); } ])); diff --git a/packages/customer-satisfaction.gbapp/services/CSService.ts b/packages/customer-satisfaction.gbapp/services/CSService.ts index 959843e69..0a8b424c7 100644 --- a/packages/customer-satisfaction.gbapp/services/CSService.ts +++ b/packages/customer-satisfaction.gbapp/services/CSService.ts @@ -62,6 +62,7 @@ export class CSService { rate: number ): Promise { conversation.rate = rate; + return conversation.save(); } } diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts index 5d7bfa348..f517a96c5 100644 --- a/packages/kb.gbapp/dialogs/AskDialog.ts +++ b/packages/kb.gbapp/dialogs/AskDialog.ts @@ -59,8 +59,8 @@ export class AskDialog extends IGBDialog { min.dialogs.add( new WaterfallDialog('/answerEvent', [ async step => { - if (step.options && step.options['questionId']) { - const question = await service.getQuestionById(min.instance.instanceId, step.options['questionId']); + if (step.options && step.options.questionId) { + const question = await service.getQuestionById(min.instance.instanceId, step.options.questionId); const answer = await service.getAnswerById(min.instance.instanceId, question.answerId); // Sends the answer to all outputs, including projector. @@ -69,6 +69,7 @@ export class AskDialog extends IGBDialog { await step.replaceDialog('/ask', { isReturning: true }); } + return await step.next(); } ]) @@ -78,7 +79,7 @@ export class AskDialog extends IGBDialog { new WaterfallDialog('/answer', [ async step => { const user = await min.userProfile.get(step.context, {}); - let text = step.options['query']; + let text = step.options.query; if (!text) { throw new Error(`/answer being called with no args query text.`); } @@ -91,9 +92,9 @@ export class AskDialog extends IGBDialog { // Handle extra text from FAQ. - if (step.options && step.options['query']) { - text = step.options['query']; - } else if (step.options && step.options['fromFaq']) { + if (step.options && step.options.query) { + text = step.options.query; + } else if (step.options && step.options.fromFaq) { await step.context.sendActivity(Messages[locale].going_answer); } @@ -155,10 +156,12 @@ export class AskDialog extends IGBDialog { // Sends the answer to all outputs, including projector. await service.sendAnswer(min.conversationalService, step, resultsB.answer); + return await step.replaceDialog('/ask', { isReturning: true }); } else { if (!(await min.conversationalService.routeNLP(step, min, text))) { await step.context.sendActivity(Messages[locale].did_not_find); + return await step.replaceDialog('/ask', { isReturning: true }); } } @@ -180,9 +183,9 @@ export class AskDialog extends IGBDialog { // Three forms of asking. - if (step.options && step.options['firstTime']) { + if (step.options && step.options.firstTime) { text = Messages[locale].ask_first_time; - } else if (step.options && step.options['isReturning']) { + } else if (step.options && step.options.isReturning) { text = Messages[locale].anything_else; } else if (user.subjects.length > 0) { text = Messages[locale].which_question; @@ -193,6 +196,7 @@ export class AskDialog extends IGBDialog { if (text.length > 0) { return await step.prompt('textPrompt', text); } + return await step.next(); }, async step => { @@ -205,6 +209,5 @@ export class AskDialog extends IGBDialog { ]) ); - } } diff --git a/packages/kb.gbapp/dialogs/FaqDialog.ts b/packages/kb.gbapp/dialogs/FaqDialog.ts index 69bf18398..142a0c146 100644 --- a/packages/kb.gbapp/dialogs/FaqDialog.ts +++ b/packages/kb.gbapp/dialogs/FaqDialog.ts @@ -64,7 +64,7 @@ export class FaqDialog extends IGBDialog { data: data.slice(0, 10) }); - await step.context.sendActivity(Messages[locale].see_faq); // TODO: RND messages. + await step.context.sendActivity(Messages[locale].see_faq); return await step.next(); } } diff --git a/packages/kb.gbapp/dialogs/MenuDialog.ts b/packages/kb.gbapp/dialogs/MenuDialog.ts index 62c0293d1..0d34eaa54 100644 --- a/packages/kb.gbapp/dialogs/MenuDialog.ts +++ b/packages/kb.gbapp/dialogs/MenuDialog.ts @@ -63,8 +63,8 @@ export class MenuDialog extends IGBDialog { const locale = step.context.activity.locale; let rootSubjectId = null; - if (step.options && step.options['data']) { - const subject = step.options['data']; + if (step.options && step.options.data) { + const subject = step.options.data; // If there is a shortcut specified as subject destination, go there. @@ -72,6 +72,7 @@ export class MenuDialog extends IGBDialog { const dialog = subject.to.split(':')[1]; await step.replaceDialog('/' + dialog); await step.endDialog(); + return; } @@ -156,6 +157,7 @@ export class MenuDialog extends IGBDialog { const user = await min.userProfile.get(step.context, {}); user.isAsking = true; + return await step.next(); } ])); diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index fc47a0e40..c81113d6d 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -49,11 +49,11 @@ import { Messages } from '../strings'; import { IGBConversationalService, IGBCoreService, IGBInstance } from 'botlib'; import { AzureSearch } from 'pragmatismo-io-framework'; import { Sequelize } from 'sequelize-typescript'; +import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GuaribasPackage } from '../../core.gbapp/models/GBModel'; import { GBDeployer } from '../../core.gbapp/services/GBDeployer'; import { GuaribasAnswer, GuaribasQuestion, GuaribasSubject } from '../models'; import { GBConfigService } from './../../core.gbapp/services/GBConfigService'; -import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; export class KBServiceSearchResults { public answer: GuaribasAnswer; @@ -433,6 +433,7 @@ export class KBService { } }); }; + return doIt(subjects.children, null); } diff --git a/packages/whatsapp.gblib/index.ts b/packages/whatsapp.gblib/index.ts index ea79e0d1c..4f06006e4 100644 --- a/packages/whatsapp.gblib/index.ts +++ b/packages/whatsapp.gblib/index.ts @@ -45,9 +45,9 @@ import { WhatsappDirectLine } from './services/WhatsappDirectLine'; export class GBWhatsappPackage implements IGBPackage { public sysPackages: IGBPackage[] = undefined; - public getDialogs(min: GBMinInstance) {} public channel: WhatsappDirectLine; + public getDialogs(min: GBMinInstance) {} public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts index 0344b352b..4c5506a6e 100644 --- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts +++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts @@ -142,12 +142,13 @@ export class WhatsappDirectLine extends GBService { }) .then(response => { this.watermark = response.obj.watermark; + return response.obj.activities; }) .then(activities => { this.printMessages(activities, conversationId, from, fromName); }); - }, this.pollInterval); + }, this.pollInterval); } public printMessages(activities, conversationId, from, fromName) { diff --git a/src/app.ts b/src/app.ts index 7b1617c1f..7a1750fdd 100644 --- a/src/app.ts +++ b/src/app.ts @@ -40,7 +40,7 @@ const logger = require('./logger'); const express = require('express'); const bodyParser = require('body-parser'); -import { IGBInstance, IGBPackage, IGBCoreService } from 'botlib'; +import { IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; import { GBAdminService } from '../packages/admin.gbapp/services/GBAdminService'; import { AzureDeployerService } from '../packages/azuredeployer.gbapp/services/AzureDeployerService'; import { GuaribasInstance } from '../packages/core.gbapp/models/GBModel'; From f4bd3f8f5d6e7f6347320f4937d9d0eb95265e40 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Fri, 8 Mar 2019 17:05:58 -0300 Subject: [PATCH 04/15] fix(general): tslint being applied in all sources. --- package.json | 2 +- packages/admin.gbapp/index.ts | 2 +- packages/analytics.gblib/index.ts | 2 +- packages/azuredeployer.gbapp/index.ts | 2 +- .../services/AzureDeployerService.ts | 22 +- packages/console.gblib/index.ts | 2 +- .../services/ConsoleDirectLine.ts | 303 ++++++++---------- packages/core.gbapp/dialogs/WhoAmIDialog.ts | 2 +- packages/core.gbapp/index.ts | 2 +- .../core.gbapp/services/GBConfigService.ts | 4 +- .../services/GBConversationalService.ts | 42 ++- packages/core.gbapp/services/GBCoreService.ts | 98 +++--- packages/core.gbapp/services/GBDeployer.ts | 42 +-- packages/core.gbapp/services/GBMinService.ts | 28 +- packages/core.gbapp/services/GBVMService.ts | 11 +- packages/core.gbapp/services/TSCompiler.ts | 6 +- .../dialogs/FeedbackDialog.ts | 2 +- .../dialogs/QualityDialog.ts | 4 +- packages/customer-satisfaction.gbapp/index.ts | 2 +- packages/kb.gbapp/dialogs/AskDialog.ts | 14 +- packages/kb.gbapp/dialogs/FaqDialog.ts | 5 +- packages/kb.gbapp/dialogs/MenuDialog.ts | 2 +- packages/kb.gbapp/index.ts | 2 +- packages/kb.gbapp/services/KBService.ts | 18 +- packages/security.gblib/index.ts | 2 +- packages/whatsapp.gblib/index.ts | 2 +- .../services/WhatsappDirectLine.ts | 20 +- src/app.ts | 14 +- src/logger.ts | 76 ----- tslint.json | 79 +++-- 30 files changed, 357 insertions(+), 455 deletions(-) delete mode 100644 src/logger.ts diff --git a/package.json b/package.json index f44c5c262..810157d24 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "scripts": { "clean": "shx rm -rf node_modules/ dist/ docs/reference", - "tslint": "tslint --fix ./src/*.ts ./packages/**/*.ts -t verbose", + "tslint": "tslint --fix ./src/*.ts ./packages/**/*.ts -t verbose -e ./packages/default.gbui/**/* -e ./packages/**/*.gbdialog/**/*", "build": "npm install && npm run build-server && npm run build-gbui && npm run build-docs", "build-server": "tsc", "build-gbui": "cd packages/default.gbui && echo SKIP_PREFLIGHT_CHECK=true >.env && npm install && npm run build", diff --git a/packages/admin.gbapp/index.ts b/packages/admin.gbapp/index.ts index d3c5aef7a..802fa41b7 100644 --- a/packages/admin.gbapp/index.ts +++ b/packages/admin.gbapp/index.ts @@ -47,7 +47,7 @@ export class GBAdminPackage implements IGBPackage { public unloadPackage(core: IGBCoreService): void {} public getDialogs(min: GBMinInstance) {} public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { core.sequelize.addModels([GuaribasAdmin]); diff --git a/packages/analytics.gblib/index.ts b/packages/analytics.gblib/index.ts index 3e0860b4d..0c3e33f8d 100644 --- a/packages/analytics.gblib/index.ts +++ b/packages/analytics.gblib/index.ts @@ -49,5 +49,5 @@ export class GBAnalyticsPackage implements IGBPackage { public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void {} public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/azuredeployer.gbapp/index.ts b/packages/azuredeployer.gbapp/index.ts index 66d859064..905b43cdd 100644 --- a/packages/azuredeployer.gbapp/index.ts +++ b/packages/azuredeployer.gbapp/index.ts @@ -50,5 +50,5 @@ export class GBAzureDeployerPackage implements IGBPackage { public loadBot(min: GBMinInstance): void {} public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 10cd564a2..c0584c000 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -51,7 +51,7 @@ import { GBConfigService } from '../../../packages/core.gbapp/services/GBConfigS import { GBDeployer } from '../../../packages/core.gbapp/services/GBDeployer'; const Spinner = require('cli-spinner').Spinner; -const logger = require('../../../src/logger'); + const UrlJoin = require('url-join'); const iconUrl = 'https://github.com/pragmatismo-io/BotServer/blob/master/docs/images/generalbots-logo-squared.png'; const publicIp = require('public-ip'); @@ -221,7 +221,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { if (!(res.bodyAsJson as any).id) { throw res.bodyAsText; } - logger.info(`Bot proxy updated at: ${endpoint}.`); + GBLog.info(`Bot proxy updated at: ${endpoint}.`); } public async openStorageFirewall(groupName, serverName) { @@ -258,14 +258,14 @@ export class AzureDeployerService implements IGBInstallationDeployer { let keys: any; const name = instance.botId; - logger.info(`Deploying Deploy Group (It may take a few minutes)...`); + GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`); await this.createDeployGroup(name, instance.cloudLocation); - logger.info(`Deploying Bot Server...`); + GBLog.info(`Deploying Bot Server...`); const serverFarm = await this.createHostingPlan(name, `${name}-server-plan`, instance.cloudLocation); await this.createServer(serverFarm.id, name, `${name}-server`, instance.cloudLocation); - logger.info(`Deploying Bot Storage...`); + GBLog.info(`Deploying Bot Storage...`); const administratorLogin = `sa${GBAdminService.getRndReadableIdentifier()}`; const administratorPassword = GBAdminService.getRndPassword(); const storageServer = `${name.toLowerCase()}-storage-server`; @@ -285,7 +285,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { instance.storageDialect = 'mssql'; instance.storageServer = storageServer; - logger.info(`Deploying Search...`); + GBLog.info(`Deploying Search...`); const searchName = `${name}-search`.toLowerCase(); await this.createSearch(name, searchName, instance.cloudLocation); const searchKeys = await this.searchClient.adminKeys.get(name, searchName); @@ -295,19 +295,19 @@ export class AzureDeployerService implements IGBInstallationDeployer { instance.searchKey = searchKeys.primaryKey; this.deployer.rebuildIndex(instance, this.deployer); - logger.info(`Deploying Speech...`); + GBLog.info(`Deploying Speech...`); const speech = await this.createSpeech(name, `${name}-speech`, instance.cloudLocation); keys = await this.cognitiveClient.accounts.listKeys(name, speech.name); instance.speechEndpoint = speech.endpoint; instance.speechKey = keys.key1; - logger.info(`Deploying SpellChecker...`); + GBLog.info(`Deploying SpellChecker...`); const spellChecker = await this.createSpellChecker(name, `${name}-spellchecker`); keys = await this.cognitiveClient.accounts.listKeys(name, spellChecker.name); instance.spellcheckerKey = keys.key1; instance.spellcheckerEndpoint = spellChecker.endpoint; - logger.info(`Deploying Text Analytics...`); + GBLog.info(`Deploying Text Analytics...`); const textAnalytics = await this.createTextAnalytics(name, `${name}-textanalytics`, instance.cloudLocation); keys = await this.cognitiveClient.accounts.listKeys(name, textAnalytics.name); instance.textAnalyticsEndpoint = textAnalytics.endpoint; @@ -315,7 +315,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { // TODO: Check quotes being added when NLP field is filled. - logger.info(`Deploying NLP...`); + GBLog.info(`Deploying NLP...`); const nlp = await this.createNLP(name, `${name}-nlp`, instance.cloudLocation); keys = await this.cognitiveClient.accounts.listKeys(name, nlp.name); const nlpAppId = await this.createNLPService(name, name, instance.cloudLocation, culture, instance.nlpAuthoringKey); @@ -324,7 +324,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { instance.nlpKey = keys.key1; instance.nlpAppId = nlpAppId; - logger.info(`Deploying Bot...`); + GBLog.info(`Deploying Bot...`); instance.botEndpoint = this.defaultEndPoint; instance = await this.internalDeployBot( diff --git a/packages/console.gblib/index.ts b/packages/console.gblib/index.ts index 35fd8129d..1ee62f9aa 100644 --- a/packages/console.gblib/index.ts +++ b/packages/console.gblib/index.ts @@ -59,5 +59,5 @@ export class GBConsolePackage implements IGBPackage { public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/console.gblib/services/ConsoleDirectLine.ts b/packages/console.gblib/services/ConsoleDirectLine.ts index ede2e837b..56be12e8e 100644 --- a/packages/console.gblib/services/ConsoleDirectLine.ts +++ b/packages/console.gblib/services/ConsoleDirectLine.ts @@ -1,193 +1,152 @@ -/*****************************************************************************\ -| ( )_ _ | -| _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | -| ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | -| | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | -| | | ( )_) | | -| (_) \___/' | -| | -| General Bots Copyright (c) Pragmatismo.io. All rights reserved. | -| Licensed under the AGPL-3.0. | -| | -| According to our dual licensing model, this program can be used either | -| under the terms of the GNU Affero General Public License, version 3, | -| or under a proprietary license. | -| | -| The texts of the GNU Affero General Public License with an additional | -| permission and of our proprietary license can be found at and | -| in the LICENSE file you have received along with this program. | -| | -| This program is distributed in the hope that it will be useful, | -| but WITHOUT ANY WARRANTY, without even the implied warranty of | -| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | -| GNU Affero General Public License for more details. | -| | -| "General Bots" is a registered trademark of Pragmatismo.io. | -| The licensing of the program under the AGPLv3 does not imply a | -| trademark license. Therefore any rights, title and interest in | -| our trademarks remain entirely with us. | -| | -\*****************************************************************************/ - -const Path = require('path'); -const Fs = require('fs'); -const _ = require('lodash'); -const Parse = require('csv-parse'); -const Async = require('async'); -const UrlJoin = require('url-join'); -const logger = require('../../../src/logger'); const Swagger = require('swagger-client'); const rp = require('request-promise'); import { GBService } from 'botlib'; export class ConsoleDirectLine extends GBService { + public pollInterval = 1000; + public directLineSecret = ''; + public directLineClientName = 'DirectLineClient'; + public directLineSpecUrl = 'https://docs.botframework.com/en-us/restapi/directline3/swagger.json'; - public pollInterval = 1000; - public directLineSecret = ''; - public directLineClientName = 'DirectLineClient'; - public directLineSpecUrl = 'https://docs.botframework.com/en-us/restapi/directline3/swagger.json'; + constructor(directLineSecret) { + super(); - constructor(directLineSecret) { - super(); + this.directLineSecret = directLineSecret; - this.directLineSecret = directLineSecret; - - // TODO: Migrate to Swagger 3. - const directLineClient = rp(this.directLineSpecUrl) - .then(function (spec) { - return new Swagger({ - spec: JSON.parse(spec.trim()), - usePromise: true - }); - }) - .then(function (client) { - client.clientAuthorizations.add('AuthorizationBotConnector', - new Swagger.ApiKeyAuthorization('Authorization', 'Bearer ' + directLineSecret, 'header')); - - return client; - }) - .catch(function (err) { - console.error('Error initializing DirectLine client', err); - }); - - // TODO: Remove *this* issue. - const _this_ = this; - directLineClient.then((client) => { - client.Conversations.Conversations_StartConversation() - .then(function (response) { - return response.obj.conversationId; - }) - .then(function (conversationId) { - _this_.sendMessagesFromConsole(client, conversationId); - _this_.pollMessages(client, conversationId); - }) - .catch(function (err) { - console.error('Error starting conversation', err); - }); + const directLineClient = rp(this.directLineSpecUrl) + .then(function(spec) { + return new Swagger({ + spec: JSON.parse(spec.trim()), + usePromise: true + }); + }) + .then(function(client) { + client.clientAuthorizations.add( + 'AuthorizationBotConnector', + new Swagger.ApiKeyAuthorization('Authorization', 'Bearer ' + directLineSecret, 'header') + ); + + return client; + }) + .catch(function(err) { + console.error('Error initializing DirectLine client', err); + }); + + // TODO: Remove *this* issue. + const _this_ = this; + directLineClient.then(client => { + client.Conversations.Conversations_StartConversation() + .then(function(response) { + return response.obj.conversationId; + }) + .then(function(conversationId) { + _this_.sendMessagesFromConsole(client, conversationId); + _this_.pollMessages(client, conversationId); + }) + .catch(function(err) { + console.error('Error starting conversation', err); + }); + }); + } + + public sendMessagesFromConsole(client, conversationId) { + const _this_ = this; + process.stdin.resume(); + const stdin = process.stdin; + process.stdout.write('Command> '); + stdin.addListener('data', function(e) { + const input = e.toString().trim(); + if (input) { + // exit + if (input.toLowerCase() === 'exit') { + return process.exit(); + } + + client.Conversations.Conversations_PostActivity({ + conversationId: conversationId, + activity: { + textFormat: 'plain', + text: input, + type: 'message', + from: { + id: _this_.directLineClientName, + name: _this_.directLineClientName + } + } + }).catch(function(err) { + console.error('Error sending message:', err); }); - } - public sendMessagesFromConsole(client, conversationId) { - const _this_ = this; - process.stdin.resume(); - const stdin = process.stdin; process.stdout.write('Command> '); - stdin.addListener('data', function (e) { - const input = e.toString().trim(); - if (input) { - // exit - if (input.toLowerCase() === 'exit') { - return process.exit(); - } + } + }); + } - client.Conversations.Conversations_PostActivity( - { - conversationId: conversationId, - activity: { - textFormat: 'plain', - text: input, - type: 'message', - from: { - id: _this_.directLineClientName, - name: _this_.directLineClientName - } - } - }).catch(function (err) { - console.error('Error sending message:', err); - }); + /** TBD: Poll Messages from conversation using DirectLine client */ + public pollMessages(client, conversationId) { + const _this_ = this; + console.log('Starting polling message for conversationId: ' + conversationId); + let watermark = null; + setInterval(function() { + client.Conversations.Conversations_GetActivities({ conversationId: conversationId, watermark: watermark }) + .then(function(response) { + watermark = response.obj.watermark; - process.stdout.write('Command> '); - } - }); + return response.obj.activities; + }) + .then(_this_.printMessages, _this_.directLineClientName); + }, this.pollInterval); + } + + public printMessages(activities, directLineClientName) { + if (activities && activities.length) { + // ignore own messages + activities = activities.filter(function(m) { + return m.from.id !== directLineClientName; + }); + + if (activities.length) { + // print other messages + activities.forEach(activity => { + console.log(activity.text); + }, this); + + process.stdout.write('Command> '); + } + } + } + + public printMessage(activity) { + if (activity.text) { + console.log(activity.text); } - /** TBD: Poll Messages from conversation using DirectLine client */ - public pollMessages(client, conversationId) { - const _this_ = this; - console.log('Starting polling message for conversationId: ' + conversationId); - let watermark = null; - setInterval(function () { - client.Conversations.Conversations_GetActivities({ conversationId: conversationId, watermark: watermark }) - .then(function (response) { - watermark = response.obj.watermark; - return response.obj.activities; - }) - .then(_this_.printMessages, _this_.directLineClientName); - }, this.pollInterval); - } + if (activity.attachments) { + activity.attachments.forEach(function(attachment) { + switch (attachment.contentType) { + case 'application/vnd.microsoft.card.hero': + this.renderHeroCard(attachment); + break; - public printMessages(activities, directLineClientName) { - - if (activities && activities.length) { - // ignore own messages - activities = activities.filter(function (m) { return m.from.id !== directLineClientName; }); - - if (activities.length) { - - // print other messages - activities.forEach(activity => { - console.log(activity.text); - }, this); - - process.stdout.write('Command> '); - } + case 'image/png': + console.log('Opening the requested image ' + attachment.contentUrl); + open(attachment.contentUrl); + break; } + }); } + } - public printMessage(activity) { - if (activity.text) { - console.log(activity.text); - } + public renderHeroCard(attachment) { + const width = 70; + const contentLine = function(content) { + return ' '.repeat((width - content.length) / 2) + content + ' '.repeat((width - content.length) / 2); + }; - if (activity.attachments) { - activity.attachments.forEach(function (attachment) { - switch (attachment.contentType) { - case 'application/vnd.microsoft.card.hero': - this.renderHeroCard(attachment); - break; - - case 'image/png': - console.log('Opening the requested image ' + attachment.contentUrl); - open(attachment.contentUrl); - break; - } - }); - } - } - - public renderHeroCard(attachment) { - const width = 70; - const contentLine = function (content) { - return ' '.repeat((width - content.length) / 2) + - content + - ' '.repeat((width - content.length) / 2); - }; - - console.log('/' + '*'.repeat(width + 1)); - console.log('*' + contentLine(attachment.content.title) + '*'); - console.log('*' + ' '.repeat(width) + '*'); - console.log('*' + contentLine(attachment.content.text) + '*'); - console.log('*'.repeat(width + 1) + '/'); - } + console.log('/' + '*'.repeat(width + 1)); + console.log('*' + contentLine(attachment.content.title) + '*'); + console.log('*' + ' '.repeat(width) + '*'); + console.log('*' + contentLine(attachment.content.text) + '*'); + console.log('*'.repeat(width + 1) + '/'); + } } diff --git a/packages/core.gbapp/dialogs/WhoAmIDialog.ts b/packages/core.gbapp/dialogs/WhoAmIDialog.ts index 20d7162e9..7b20eddcc 100644 --- a/packages/core.gbapp/dialogs/WhoAmIDialog.ts +++ b/packages/core.gbapp/dialogs/WhoAmIDialog.ts @@ -57,7 +57,7 @@ export class WhoAmIDialog extends IGBDialog { if (min.instance.whoAmIVideo) { await step.context.sendActivity(Messages[locale].show_video); - await min.conversationalService.sendEvent(step, 'play', { + await min.conversationalService.sendEvent(step: GBDialogStep, 'play', { playerType: 'video', data: min.instance.whoAmIVideo.trim() }); diff --git a/packages/core.gbapp/index.ts b/packages/core.gbapp/index.ts index 7166bfa6d..3e73cba4e 100644 --- a/packages/core.gbapp/index.ts +++ b/packages/core.gbapp/index.ts @@ -63,5 +63,5 @@ export class GBCorePackage implements IGBPackage { } public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts index e0a6fd658..e3e58e0ec 100644 --- a/packages/core.gbapp/services/GBConfigService.ts +++ b/packages/core.gbapp/services/GBConfigService.ts @@ -30,7 +30,7 @@ | | \*****************************************************************************/ -const logger = require('../../../src/logger'); + import * as fs from 'fs'; /** @@ -108,7 +108,7 @@ export class GBConfigService { value = 'true'; break; default: - logger.warn(`Invalid key on .env file: '${key}'`); + GBLog.warn(`Invalid key on .env file: '${key}'`); break; } } diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index 3c83c608b..5d4e501a3 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -36,13 +36,11 @@ 'use strict'; -const logger = require('../../../src/logger'); -import { MessageFactory } from 'botbuilder'; +import { MessageFactory, RecognizerResult } from 'botbuilder'; import { LuisRecognizer } from 'botbuilder-ai'; -import { GBMinInstance, IGBConversationalService, IGBCoreService } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBConversationalService, IGBCoreService } from 'botlib'; import { AzureText } from 'pragmatismo-io-framework'; import { Messages } from '../strings'; -import { GBCoreService } from './GBCoreService'; const Nexmo = require('nexmo'); export interface LanguagePickerSettings { @@ -50,19 +48,22 @@ export interface LanguagePickerSettings { supportedLocales?: string[]; } +/** + * Provides basic services for handling messages and dispatching to back-end + * services like NLP or Search. + */ export class GBConversationalService implements IGBConversationalService { - public coreService: IGBCoreService; constructor(coreService: IGBCoreService) { this.coreService = coreService; } - public getCurrentLanguage(step: any) { + public getCurrentLanguage(step: GBDialogStep) { return step.context.activity.locale; } - public async sendEvent(step: any, name: string, value: any): Promise { + public async sendEvent(step: GBDialogStep, name: string, value: any): Promise { if (step.context.activity.channelId === 'webchat') { const msg = MessageFactory.text(''); msg.value = value; @@ -73,6 +74,7 @@ export class GBConversationalService implements IGBConversationalService { } } + // tslint:disable:no-unsafe-any due to Nexmo. public async sendSms(min: GBMinInstance, mobile: string, text: string): Promise { return new Promise( (resolve: any, reject: any): any => { @@ -80,6 +82,7 @@ export class GBConversationalService implements IGBConversationalService { 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) => { if (err) { reject(err); @@ -90,8 +93,9 @@ export class GBConversationalService implements IGBConversationalService { } ); } + // tslint:enable:no-unsafe-any - public async routeNLP(step: any, min: GBMinInstance, text: string): Promise { + public async routeNLP(step: GBDialogStep, min: GBMinInstance, text: string): Promise { // Invokes LUIS. const endpoint = min.instance.nlpEndpoint.replace('/luis/v2.0', ''); @@ -102,38 +106,42 @@ export class GBConversationalService implements IGBConversationalService { endpoint: endpoint }); - let nlp: any; + let nlp: RecognizerResult; try { nlp = await model.recognize(step.context); } catch (error) { + // tslint:disable:no-unsafe-any if (error.statusCode === 404) { - logger.warn('NLP application still not publish and there are no other options for answering.'); + GBLog.warn('NLP application still not publish and there are no other options for answering.'); return Promise.resolve(false); } else { const msg = `Error calling NLP, check if you have a published model and assigned keys. Error: ${ error.statusCode ? error.statusCode : '' - } ${error.message}`; + } {error.message; }`; return Promise.reject(new Error(msg)); } + // tslint:enable:no-unsafe-any } // Resolves intents returned from LUIS. const topIntent = LuisRecognizer.topIntent(nlp); - if (topIntent) { + if (topIntent !== undefined) { const intent = topIntent; - const entity = nlp.entities && nlp.entities.length > 0 ? nlp.entities[0].entity.toUpperCase() : null; + // tslint:disable:no-unsafe-any + const firstEntity = nlp.entities && nlp.entities.length > 0 ? nlp.entities[0].entity.toUpperCase() : undefined; + // tslint:ensable:no-unsafe-any if (intent === 'None') { return Promise.resolve(false); } - logger.info(`NLP called: ${intent}, ${entity}`); + GBLog.info(`NLP called: ${intent} ${firstEntity}`); try { - await step.replaceDialog(`/${intent}`, nlp.entities); + await step.replaceDialog(` /${intent}`, nlp.entities); return Promise.resolve(true); } catch (error) { @@ -146,7 +154,7 @@ export class GBConversationalService implements IGBConversationalService { return Promise.resolve(false); } - public async checkLanguage(step, min, text) { + public async checkLanguage(step: GBDialogStep, min, text) { const locale = await AzureText.getLocale(min.instance.textAnalyticsKey, min.instance.textAnalyticsEndpoint, text); if (locale !== step.context.activity.locale.split('-')[0]) { switch (locale) { @@ -159,7 +167,7 @@ export class GBConversationalService implements IGBConversationalService { await step.context.sendActivity(Messages[locale].changing_language); break; default: - await step.context.sendActivity(`Unknown language: ${locale}`); + await step.context.sendActivity(`; Unknown; language: $;{locale;}`); break; } } diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index 72c0c1b21..07a7fd944 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -36,14 +36,13 @@ 'use strict'; -import { IGBCoreService, IGBInstallationDeployer, IGBInstance, IGBPackage } from 'botlib'; +import { GBLog, IGBCoreService, IGBInstallationDeployer, IGBInstance, IGBPackage } from 'botlib'; import * as fs from 'fs'; import { Sequelize } from 'sequelize-typescript'; import { GBAdminPackage } from '../../admin.gbapp/index'; import { GBAdminService } from '../../admin.gbapp/services/GBAdminService'; import { GBAnalyticsPackage } from '../../analytics.gblib'; import { StartDialog } from '../../azuredeployer.gbapp/dialogs/StartDialog'; -import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GBCorePackage } from '../../core.gbapp'; import { GBCustomerSatisfactionPackage } from '../../customer-satisfaction.gbapp'; import { GBKBPackage } from '../../kb.gbapp'; @@ -52,14 +51,12 @@ import { GBWhatsappPackage } from '../../whatsapp.gblib/index'; import { GuaribasInstance } from '../models/GBModel'; import { GBConfigService } from './GBConfigService'; -const logger = require('../../../src/logger'); const opn = require('opn'); /** * Core service layer. */ export class GBCoreService implements IGBCoreService { - /** * Data access layer instance. */ @@ -121,10 +118,10 @@ export class GBCoreService implements IGBCoreService { throw new Error(`Unknown dialect: ${this.dialect}.`); } - const logging: any = + const logging: boolean | Function = GBConfigService.get('STORAGE_LOGGING') === 'true' ? (str: string): void => { - logger.info(str); + GBLog.info(str); } : false; @@ -153,12 +150,14 @@ export class GBCoreService implements IGBCoreService { if (this.dialect === 'mssql') { this.queryGenerator = this.sequelize.getQueryInterface().QueryGenerator; + // tslint:disable:no-unsafe-any this.createTableQuery = this.queryGenerator.createTableQuery; this.queryGenerator.createTableQuery = (tableName, attributes, options) => this.createTableQueryOverride(tableName, attributes, options); this.changeColumnQuery = this.queryGenerator.changeColumnQuery; this.queryGenerator.changeColumnQuery = (tableName, attributes) => this.changeColumnQueryOverride(tableName, attributes); + // tslint:enable:no-unsafe-any } } @@ -166,19 +165,21 @@ export class GBCoreService implements IGBCoreService { try { await this.sequelize.authenticate(); } catch (error) { - logger.info('Opening storage firewall on infrastructure...'); + GBLog.info('Opening storage firewall on infrastructure...'); + // tslint:disable:no-unsafe-any if (error.parent.code === 'ELOGIN') { await this.openStorageFrontier(installationDeployer); } else { throw error; } + // tslint:ensable:no-unsafe-any } } public async syncDatabaseStructure() { if (GBConfigService.get('STORAGE_SYNC') === 'true') { const alter = GBConfigService.get('STORAGE_SYNC_ALTER') === 'true'; - logger.info('Syncing database...'); + GBLog.info('Syncing database...'); return this.sequelize.sync({ alter: alter, @@ -186,7 +187,7 @@ export class GBCoreService implements IGBCoreService { }); } else { const msg = `Database synchronization is disabled.`; - logger.info(msg); + GBLog.info(msg); } } @@ -245,14 +246,14 @@ STORAGE_SYNC=true return await ngrok.connect({ port: port }); } else { - logger.warn('ngrok executable not found. Check installation or node_modules folder.'); + GBLog.warn('ngrok executable not found. Check installation or node_modules folder.'); return 'localhost'; } } catch (error) { // There are false positive from ngrok regarding to no memory, but it's just // lack of connection. - logger.verbose(error); + GBLog.verbose(error); throw new Error('Error connecting to remote ngrok server, please check network connection.'); } } @@ -274,14 +275,18 @@ STORAGE_SYNC=true * @param azureDeployer * @param proxyAddress */ - public async loadAllInstances(core: IGBCoreService, installationDeployer: IGBInstallationDeployer, proxyAddress: string) { - logger.info(`Loading instances from storage...`); + public async loadAllInstances( + core: IGBCoreService, + installationDeployer: IGBInstallationDeployer, + proxyAddress: string + ) { + GBLog.info(`Loading instances from storage...`); let instances: IGBInstance[]; try { instances = await core.loadInstances(); const instance = instances[0]; if (process.env.NODE_ENV === 'development') { - logger.info(`Updating bot endpoint to local reverse proxy (ngrok)...`); + GBLog.info(`Updating bot endpoint to local reverse proxy (ngrok)...`); await installationDeployer.updateBotProxy( instance.botId, instance.botId, @@ -290,15 +295,15 @@ STORAGE_SYNC=true } } catch (error) { // Check if storage is empty and needs formatting. - const isInvalidObject = error.parent.number == 208 || error.parent.errno == 1; // MSSQL or SQLITE. + const isInvalidObject = error.parent.number === 208 || error.parent.errno === 1; // MSSQL or SQLITE. if (isInvalidObject) { - if (GBConfigService.get('STORAGE_SYNC') != 'true') { + if (GBConfigService.get('STORAGE_SYNC') !== 'true') { throw new Error( `Operating storage is out of sync or there is a storage connection error. Try setting STORAGE_SYNC to true in .env file. Error: ${error.message}.` ); } else { - logger.info(`Storage is empty. After collecting storage structure from all .gbapps it will get synced.`); + GBLog.info(`Storage is empty. After collecting storage structure from all .gbapps it will get synced.`); } } else { throw new Error(`Cannot connect to operating storage: ${error.message}.`); @@ -316,7 +321,7 @@ STORAGE_SYNC=true * @param core */ public async ensureInstances(instances: IGBInstance[], bootInstance: any, core: IGBCoreService) { - if (!instances) { + if (instances === undefined) { const instance = new GuaribasInstance(); await instance.save(); instances = await core.loadInstances(); @@ -339,7 +344,7 @@ STORAGE_SYNC=true GBCustomerSatisfactionPackage, GBWhatsappPackage ].forEach(e => { - logger.info(`Loading sys package: ${e.name}...`); + GBLog.info(`Loading sys package: ${e.name}...`); const p = Object.create(e.prototype) as IGBPackage; p.loadPackage(core, core.sequelize); }); @@ -354,19 +359,27 @@ STORAGE_SYNC=true } } - public async createBootInstance(core: GBCoreService, installationDeployer: IGBInstallationDeployer, proxyAddress: string) { - - logger.info(`Deploying cognitive infrastructure (on the cloud / on premises)...`); + public async createBootInstance( + core: GBCoreService, + installationDeployer: IGBInstallationDeployer, + proxyAddress: string + ) { + GBLog.info(`Deploying cognitive infrastructure (on the cloud / on premises)...`); try { - let { instance, credentials, subscriptionId } = await StartDialog.createBaseInstance(installationDeployer); - instance = await installationDeployer.deployFarm(proxyAddress, instance, credentials, subscriptionId); - core.writeEnv(instance); - logger.info(`File .env written, starting General Bots...`); + const { instance, credentials, subscriptionId } = await StartDialog.createBaseInstance(installationDeployer); + const changedInstance = await installationDeployer.deployFarm( + proxyAddress, + instance, + credentials, + subscriptionId + ); + core.writeEnv(changedInstance); + GBLog.info(`File .env written, starting General Bots...`); GBConfigService.init(); - return instance; + return changedInstance; } catch (error) { - logger.warn( + GBLog.warn( `In case of error, please cleanup any infrastructure objects created during this procedure and .env before running again.` ); @@ -399,13 +412,13 @@ STORAGE_SYNC=true let sql: string = this.createTableQuery.apply(this.queryGenerator, [tableName, attributes, options]); const re1 = /CREATE\s+TABLE\s+\[([^\]]*)\]/; const matches = re1.exec(sql); - if (matches) { + 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; + return `CONSTRAINT [${table}_pk] ${match}`; } ); const re3 = /FOREIGN\s+KEY\s+\((\[[^\]]*\](?:,\s*\[[^\]]*\])*)\)/g; @@ -415,13 +428,13 @@ STORAGE_SYNC=true (match: string, ...args: any[]): string => { const fkcols = args[0]; let fkname = table; - let matches = re4.exec(fkcols); - while (matches != undefined) { - fkname += '_' + matches[1]; - matches = re4.exec(fkcols); + let matches2 = re4.exec(fkcols); + while (matches2 !== undefined) { + fkname += `_${matches2[1]}`; + matches2 = re4.exec(fkcols); } - return 'CONSTRAINT [' + fkname + '_fk] FOREIGN KEY (' + fkcols + ')'; + return `CONSTRAINT [${fkname}_fk] FOREIGN KEY (${fkcols})`; } ); } @@ -441,7 +454,7 @@ STORAGE_SYNC=true let sql: string = this.changeColumnQuery.apply(this.queryGenerator, [tableName, attributes]); const re1 = /ALTER\s+TABLE\s+\[([^\]]*)\]/; const matches = re1.exec(sql); - if (matches) { + if (matches !== null) { const table = matches[1]; const re2 = /(ADD\s+)?CONSTRAINT\s+\[([^\]]*)\]\s+FOREIGN\s+KEY\s+\((\[[^\]]*\](?:,\s*\[[^\]]*\])*)\)/g; const re3 = /\[([^\]]*)\]/g; @@ -450,13 +463,13 @@ STORAGE_SYNC=true (match: string, ...args: any[]): string => { const fkcols = args[2]; let fkname = table; - let matches = re3.exec(fkcols); - while (matches != undefined) { - fkname += '_' + matches[1]; - matches = re3.exec(fkcols); + let matches2 = re3.exec(fkcols); + while (matches2 !== undefined) { + 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})`; } ); } @@ -471,7 +484,8 @@ STORAGE_SYNC=true */ private async openStorageFrontier(installationDeployer: IGBInstallationDeployer) { const group = GBConfigService.get('CLOUD_GROUP'); - const serverName = GBConfigService.get('STORAGE_SERVER').split('.database.windows.net')[0]; + const serverName = GBConfigService.get('STORAGE_SERVER') + .split('.database.windows.net')[0]; await installationDeployer.openStorageFirewall(group, serverName); } } diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index b75c49ea1..c5dd11f00 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -36,7 +36,7 @@ 'use strict'; -const logger = require('../../../src/logger'); + const Path = require('path'); const UrlJoin = require('url-join'); const Fs = require('fs'); @@ -109,7 +109,7 @@ export class GBDeployer { const dirs = getDirectories(path); dirs.forEach(element => { if (element.startsWith('.')) { - logger.info(`Ignoring ${element}...`); + GBLog.info(`Ignoring ${element}...`); } else { if (element.endsWith('.gbot')) { botPackages.push(element); @@ -122,9 +122,9 @@ export class GBDeployer { }); } - logger.info(`Starting looking for packages (.gbot, .gbtheme, .gbkb, .gbapp)...`); + GBLog.info(`Starting looking for packages (.gbot, .gbtheme, .gbkb, .gbapp)...`); paths.forEach(e => { - logger.info(`Looking in: ${e}...`); + GBLog.info(`Looking in: ${e}...`); doIt(e); }); @@ -136,11 +136,11 @@ export class GBDeployer { .interval(1000) .times(10) .condition(cb => { - logger.info(`Waiting for app package deployment...`); + GBLog.info(`Waiting for app package deployment...`); cb(appPackagesProcessed === gbappPackages.length); }) .done(async result => { - logger.info(`App Package deployment done.`); + GBLog.info(`App Package deployment done.`); ({ generalPackages, totalPackages } = await this.deployDataPackages( core, @@ -319,7 +319,7 @@ export class GBDeployer { public runOnce() { const root = 'packages/default.gbui'; if (!Fs.existsSync(`${root}/build`)) { - logger.info(`Preparing default.gbui (it may take some additional time for the first time)...`); + GBLog.info(`Preparing default.gbui (it may take some additional time for the first time)...`); Fs.writeFileSync(`${root}/.env`, 'SKIP_PREFLIGHT_CHECK=true'); child_process.execSync('npm install', { cwd: root }); child_process.execSync('npm run build', { cwd: root }); @@ -346,9 +346,9 @@ export class GBDeployer { botPackages.forEach(e => { if (e !== 'packages\\boot.gbot') { - logger.info(`Deploying bot: ${e}...`); + GBLog.info(`Deploying bot: ${e}...`); _this.deployBot(e); - logger.info(`Bot: ${e} deployed...`); + GBLog.info(`Bot: ${e} deployed...`); } }); @@ -357,7 +357,7 @@ export class GBDeployer { generalPackages = generalPackages.filter(p => !p.endsWith('.git')); generalPackages.forEach(filename => { const filenameOnly = Path.basename(filename); - logger.info(`Deploying package: ${filename}...`); + GBLog.info(`Deploying package: ${filename}...`); // Handles apps for general bots - .gbapp must stay out of deploy folder. @@ -365,10 +365,10 @@ export class GBDeployer { // Themes for bots. } else if (Path.extname(filename) === '.gbtheme') { server.use('/themes/' + filenameOnly, express.static(filename)); - logger.info(`Theme (.gbtheme) assets accessible at: ${'/themes/' + filenameOnly}.`); + GBLog.info(`Theme (.gbtheme) assets accessible at: ${'/themes/' + filenameOnly}.`); } else if (Path.extname(filename) === '.gbkb') { server.use('/kb/' + filenameOnly + '/subjects', express.static(UrlJoin(filename, 'subjects'))); - logger.info(`KB (.gbkb) assets accessible at: ${'/kb/' + filenameOnly}.`); + GBLog.info(`KB (.gbkb) assets accessible at: ${'/kb/' + filenameOnly}.`); } else if (Path.extname(filename) === '.gbui') { // Already Handled } else if (Path.extname(filename) === '.gbdialog') { @@ -385,14 +385,14 @@ export class GBDeployer { .interval(100) .times(5) .condition(cb => { - logger.info(`Waiting for package deployment...`); + GBLog.info(`Waiting for package deployment...`); cb(totalPackages === generalPackages.length); }) .done(result => { if (botPackages.length === 0) { - logger.info('Use ADDITIONAL_DEPLOY_PATH to point to a .gbai package folder (no external packages).'); + GBLog.info('Use ADDITIONAL_DEPLOY_PATH to point to a .gbai package folder (no external packages).'); } else { - logger.info(`Package deployment done.`); + GBLog.info(`Package deployment done.`); } resolve(); }); @@ -405,17 +405,17 @@ export class GBDeployer { gbappPackages.forEach(e => { // Skips .gbapp inside deploy folder. if (!e.startsWith('packages')) { - logger.info(`Deploying app: ${e}...`); + GBLog.info(`Deploying app: ${e}...`); let folder = Path.join(e, 'node_modules'); if (!Fs.existsSync(folder)) { - logger.info(`Installing modules for ${e}...`); + GBLog.info(`Installing modules for ${e}...`); child_process.execSync('npm install', { cwd: e }); } folder = Path.join(e, 'dist'); if (!Fs.existsSync()) { - logger.info(`Compiling ${e}...`); + GBLog.info(`Compiling ${e}...`); try { child_process.execSync(Path.join(e, 'node_modules/.bin/tsc'), { cwd: e }); @@ -424,15 +424,15 @@ export class GBDeployer { const p = new m.Package(); p.loadPackage(core, core.sequelize); appPackages.push(p); - logger.info(`App (.gbapp) deployed: ${e}.`); + GBLog.info(`App (.gbapp) deployed: ${e}.`); appPackagesProcessed++; }) .catch(err => { - logger.error(`Error deploying .gbapp package: ${e}\n${err}`); + GBLog.error(`Error deploying .gbapp package: ${e}\n${err}`); appPackagesProcessed++; }); } catch (error) { - logger.error(`Error compiling .gbapp package ${e}:\n${error.stdout.toString()}`); + GBLog.error(`Error compiling .gbapp package ${e}:\n${error.stdout.toString()}`); appPackagesProcessed++; } } diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 6722f8c84..862c54f55 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -39,14 +39,14 @@ const { DialogSet, TextPrompt } = require('botbuilder-dialogs'); const UrlJoin = require('url-join'); const express = require('express'); -const logger = require('../../../src/logger'); + const request = require('request-promise-native'); const AuthenticationContext = require('adal-node').AuthenticationContext; import { AutoSaveStateMiddleware, BotFrameworkAdapter, ConversationState, MemoryStorage, UserState } from 'botbuilder'; import { ConfirmPrompt, WaterfallDialog } from 'botbuilder-dialogs'; -import { GBMinInstance, IGBAdminService, IGBConversationalService, IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBAdminService, IGBConversationalService, IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; import { GBAnalyticsPackage } from '../../analytics.gblib'; import { GBCorePackage } from '../../core.gbapp'; import { GBCustomerSatisfactionPackage } from '../../customer-satisfaction.gbapp'; @@ -141,14 +141,14 @@ export class GBMinService { server.post(url, async (req, res) => { await this.receiver(adapter, req, res, conversationState, min, instance, appPackages); }); - logger.info(`GeneralBots(${instance.engineName}) listening on: ${url}.`); + GBLog.info(`GeneralBots(${instance.engineName}) listening on: ${url}.`); // Serves individual URL for each bot user interface. const uiUrl = `/${instance.botId}`; server.use(uiUrl, express.static(UrlJoin(GBDeployer.deployFolder, uiPackage, 'build'))); - logger.info(`Bot UI ${uiPackage} accessible at: ${uiUrl}.`); + GBLog.info(`Bot UI ${uiPackage} accessible at: ${uiUrl}.`); const state = `${instance.instanceId}${Math.floor(Math.random() * 1000000000)}`; // Clients get redirected here in order to create an OAuth authorize url and redirect them to AAD. @@ -171,7 +171,7 @@ export class GBMinService { const state = await min.adminService.getValue(instance.instanceId, 'AntiCSRFAttackState'); if (req.query.state !== state) { const msg = 'WARNING: state field was not provided as anti-CSRF token'; - logger.error(msg); + GBLog.error(msg); throw new Error(msg); } const authenticationContext = new AuthenticationContext( @@ -187,7 +187,7 @@ export class GBMinService { async (err, token) => { if (err) { const msg = `Error acquiring token: ${err}`; - logger.error(msg); + GBLog.error(msg); res.send(msg); } else { await this.adminService.setValue(instance.instanceId, 'refreshToken', token.refreshToken); @@ -245,7 +245,7 @@ export class GBMinService { } else { const error = `Instance not found: ${botId}.`; res.sendStatus(error); - logger.error(error); + GBLog.error(error); } } @@ -354,7 +354,7 @@ export class GBMinService { if (sysPackage.name === 'GBWhatsappPackage') { const url = '/instances/:botId/whatsapp'; server.post(url, (req, res) => { - p.channel.received(req, res); + p['channel'].received(req, res); }); } }, this); @@ -405,7 +405,7 @@ export class GBMinService { await min.userProfile.set(step.context, user); } - logger.info( + GBLog.info( `User>: ${context.activity.text} (${context.activity.type}, ${context.activity.name}, ${ context.activity.channelId }, {context.activity.value})` @@ -413,7 +413,7 @@ export class GBMinService { if (context.activity.type === 'conversationUpdate' && context.activity.membersAdded.length > 0) { const member = context.activity.membersAdded[0]; if (member.name === 'GeneralBots') { - logger.info(`Bot added to conversation, starting chat...`); + GBLog.info(`Bot added to conversation, starting chat...`); appPackages.forEach(e => { e.onNewSession(min, step); }); @@ -421,7 +421,7 @@ export class GBMinService { await step.beginDialog('/'); } else { - logger.info(`Member added to conversation: ${member.name}`); + GBLog.info(`Member added to conversation: ${member.name}`); } // Processes messages. @@ -440,7 +440,7 @@ export class GBMinService { await conversationState.saveChanges(context, true); } catch (error) { const msg = `ERROR: ${error.message} ${error.stack ? error.stack : ''}`; - logger.error(msg); + GBLog.error(msg); await step.context.sendActivity(Messages[step.context.activity.locale].very_sorry_about_error); await step.beginDialog('/ask', { isReturning: true }); @@ -448,7 +448,7 @@ export class GBMinService { }); } - private async processEventActivity(context, step: any) { + private async processEventActivity(context, step: GBDialogStep) { if (context.activity.name === 'whoAmI') { await step.beginDialog('/whoAmI'); } else if (context.activity.name === 'showSubjects') { @@ -476,7 +476,7 @@ export class GBMinService { } } - private async processMessageActivity(context, min: GBMinInstance, step: any) { + private async processMessageActivity(context, min: GBMinInstance, step: GBDialogStep) { // Direct script invoking by itent name. const isVMCall = Object.keys(min.scriptMap).find(key => min.scriptMap[key] === context.activity.text) !== undefined; diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts index 8690a6071..35e477c89 100644 --- a/packages/core.gbapp/services/GBVMService.ts +++ b/packages/core.gbapp/services/GBVMService.ts @@ -33,20 +33,19 @@ 'use strict'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { GBMinInstance, GBService, IGBCoreService } from 'botlib'; +import { GBLog, GBMinInstance, GBService, IGBCoreService } from 'botlib'; import * as fs from 'fs'; -import GBAPIService from './GBAPIService'; -import GBAPIService from './GBAPIService'; import { GBDeployer } from './GBDeployer'; import { TSCompiler } from './TSCompiler'; const walkPromise = require('walk-promise'); -const logger = require('../../../src/logger'); + const vm = require('vm'); const UrlJoin = require('url-join'); const vb2ts = require('vbscript-to-typescript/dist/converter'); const beautify = require('js-beautify').js; + /** * @fileoverview Virtualization services for emulation of BASIC. * This alpha version is using a hack in form of converter to @@ -220,7 +219,7 @@ export class GBVMService extends GBService { vm.runInContext(parsedCode, context); min.sandBoxMap[mainName] = sandbox; await deployer.deployScriptToStorage(1, filename); // TODO: Per bot storage. - logger.info(`[GBVMService] Finished loading of ${filename}`); + GBLog.info(`[GBVMService] Finished loading of ${filename}`); } } @@ -260,7 +259,7 @@ export class GBVMService extends GBService { const cbId = step.activeDialog.state.cbId; const cb = min.cbMap[cbId]; - cb.bind({ step: step, context: step.context }); // TODO: Necessary or min.sandbox? + cb.bind({ step: step: GBDialogStep, context: step.context }); // TODO: Necessary or min.sandbox? await step.endDialog(); diff --git a/packages/core.gbapp/services/TSCompiler.ts b/packages/core.gbapp/services/TSCompiler.ts index 942e82b03..c1cc88da2 100644 --- a/packages/core.gbapp/services/TSCompiler.ts +++ b/packages/core.gbapp/services/TSCompiler.ts @@ -37,7 +37,7 @@ 'use strict'; import * as ts from 'typescript'; -const logger = require('../../../src/logger'); + export class TSCompiler { @@ -77,9 +77,9 @@ export class TSCompiler { if (diagnostic.file) { const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start); - logger.error(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`); + GBLog.error(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`); } else { - logger.error(`${message}`); + GBLog.error(`${message}`); } } }); diff --git a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts index e66d26e7b..96cdd6e7e 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts @@ -86,7 +86,7 @@ export class FeedbackDialog extends IGBDialog { const locale = step.context.activity.locale; await step.context.sendActivity(Messages[locale].about_suggestions); - step.activeDialog.state.cbId = step.options.id; + step.activeDialog.state.cbId = step.options['id']; return await step.prompt('textPrompt', Messages[locale].what_about_service); }, diff --git a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts index 186259fef..21b8bc014 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts @@ -43,7 +43,7 @@ import { WaterfallDialog } from 'botbuilder-dialogs'; import { GBMinInstance } from 'botlib'; import { CSService } from '../services/CSService'; import { Messages } from '../strings'; -const logger = require('../../../src/logger'); + export class QualityDialog extends IGBDialog { /** @@ -63,7 +63,7 @@ export class QualityDialog extends IGBDialog { const score = step.result; setTimeout( - () => min.conversationalService.sendEvent(step, 'stop', null), + () => min.conversationalService.sendEvent(step: GBDialogStep, 'stop', null), 400 ); diff --git a/packages/customer-satisfaction.gbapp/index.ts b/packages/customer-satisfaction.gbapp/index.ts index 33782cf6c..42898ba7b 100644 --- a/packages/customer-satisfaction.gbapp/index.ts +++ b/packages/customer-satisfaction.gbapp/index.ts @@ -57,5 +57,5 @@ export class GBCustomerSatisfactionPackage implements IGBPackage { QualityDialog.setup(min.bot, min); } public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts index f517a96c5..fc95465d5 100644 --- a/packages/kb.gbapp/dialogs/AskDialog.ts +++ b/packages/kb.gbapp/dialogs/AskDialog.ts @@ -44,7 +44,7 @@ import { AzureText } from 'pragmatismo-io-framework'; import { Messages } from '../strings'; import { KBService } from './../services/KBService'; -const logger = require('../../../src/logger'); + export class AskDialog extends IGBDialog { /** @@ -65,7 +65,7 @@ export class AskDialog extends IGBDialog { // Sends the answer to all outputs, including projector. - await service.sendAnswer(min.conversationalService, step, answer); + await service.sendAnswer(min.conversationalService, step: GBDialogStep, answer); await step.replaceDialog('/ask', { isReturning: true }); } @@ -88,7 +88,7 @@ export class AskDialog extends IGBDialog { // Stops any content on projector. - await min.conversationalService.sendEvent(step, 'stop', null); + await min.conversationalService.sendEvent(step: GBDialogStep, 'stop', null); // Handle extra text from FAQ. @@ -104,7 +104,7 @@ export class AskDialog extends IGBDialog { const data = await AzureText.getSpelledText(min.instance.spellcheckerKey, text); if (data != text) { - logger.info(`Spelling corrected: ${data}`); + GBLog.info(`Spelling corrected: ${data}`); text = data; } } @@ -126,7 +126,7 @@ export class AskDialog extends IGBDialog { // Sends the answer to all outputs, including projector. - await service.sendAnswer(min.conversationalService, step, resultsA.answer); + await service.sendAnswer(min.conversationalService, step: GBDialogStep, resultsA.answer); // Goes to ask loop, again. @@ -155,11 +155,11 @@ export class AskDialog extends IGBDialog { // Sends the answer to all outputs, including projector. - await service.sendAnswer(min.conversationalService, step, resultsB.answer); + await service.sendAnswer(min.conversationalService, step: GBDialogStep, resultsB.answer); return await step.replaceDialog('/ask', { isReturning: true }); } else { - if (!(await min.conversationalService.routeNLP(step, min, text))) { + if (!(await min.conversationalService.routeNLP(step: GBDialogStep, min, text))) { await step.context.sendActivity(Messages[locale].did_not_find); return await step.replaceDialog('/ask', { isReturning: true }); diff --git a/packages/kb.gbapp/dialogs/FaqDialog.ts b/packages/kb.gbapp/dialogs/FaqDialog.ts index 142a0c146..f837e4cda 100644 --- a/packages/kb.gbapp/dialogs/FaqDialog.ts +++ b/packages/kb.gbapp/dialogs/FaqDialog.ts @@ -59,12 +59,13 @@ export class FaqDialog extends IGBDialog { const data = await service.getFaqBySubjectArray('faq', null); const locale = step.context.activity.locale; if (data) { - await min.conversationalService.sendEvent(step, 'play', { + await min.conversationalService.sendEvent(step: GBDialogStep, 'play', { playerType: 'bullet', data: data.slice(0, 10) }); - await step.context.sendActivity(Messages[locale].see_faq); + await step.context.sendActivity(Messages[locale].see_faq); + return await step.next(); } } diff --git a/packages/kb.gbapp/dialogs/MenuDialog.ts b/packages/kb.gbapp/dialogs/MenuDialog.ts index 0d34eaa54..6505ccfe8 100644 --- a/packages/kb.gbapp/dialogs/MenuDialog.ts +++ b/packages/kb.gbapp/dialogs/MenuDialog.ts @@ -89,7 +89,7 @@ export class MenuDialog extends IGBDialog { 'menu', user.subjects ); - await min.conversationalService.sendEvent(step, 'play', { + await min.conversationalService.sendEvent(step: GBDialogStep, 'play', { playerType: 'bullet', data: data.slice(0, 10) }); diff --git a/packages/kb.gbapp/index.ts b/packages/kb.gbapp/index.ts index 9eba17b89..4f5af31a1 100644 --- a/packages/kb.gbapp/index.ts +++ b/packages/kb.gbapp/index.ts @@ -61,5 +61,5 @@ export class GBKBPackage implements IGBPackage { MenuDialog.setup(min.bot, min); } public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index c81113d6d..c6ceda5de 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -34,7 +34,7 @@ * @fileoverview Knowledge base services and logic. */ -const logger = require('../../../src/logger'); + const Path = require('path'); const Fs = require('fs'); @@ -276,7 +276,7 @@ export class KBService { answer = Fs.readFileSync(mediaFilename, 'utf8'); format = '.md'; } else { - logger.info(`[GBImporter] File not found: ${mediaFilename}.`); + GBLog.info(`[GBImporter] File not found: ${mediaFilename}.`); answer = ''; } } @@ -341,9 +341,9 @@ export class KBService { }); } - public async sendAnswer(conversationalService: IGBConversationalService, step: any, answer: GuaribasAnswer) { + public async sendAnswer(conversationalService: IGBConversationalService, step: GBDialogStep, answer: GuaribasAnswer) { if (answer.content.endsWith('.mp4')) { - await conversationalService.sendEvent(step, 'play', { + await conversationalService.sendEvent(step: GBDialogStep, 'play', { playerType: 'video', data: answer.content }); @@ -367,7 +367,7 @@ export class KBService { }); html = marked(answer.content); } - await conversationalService.sendEvent(step, 'play', { + await conversationalService.sendEvent(step: GBDialogStep, 'play', { playerType: 'markdown', data: { content: html, @@ -378,7 +378,7 @@ export class KBService { }); } else { await step.context.sendActivity(answer.content); - await conversationalService.sendEvent(step, 'stop', null); + await conversationalService.sendEvent(step: GBDialogStep, 'stop', null); } } @@ -462,15 +462,15 @@ export class KBService { public async deployKb(core: IGBCoreService, deployer: GBDeployer, localPath: string) { const packageType = Path.extname(localPath); const packageName = Path.basename(localPath); - logger.info(`[GBDeployer] Opening package: ${localPath}`); + GBLog.info(`[GBDeployer] Opening package: ${localPath}`); const packageObject = JSON.parse(Fs.readFileSync(UrlJoin(localPath, 'package.json'), 'utf8')); const instance = await core.loadInstance(packageObject.botId); - logger.info(`[GBDeployer] Importing: ${localPath}`); + GBLog.info(`[GBDeployer] Importing: ${localPath}`); const p = await deployer.deployPackageToStorage(instance.instanceId, packageName); await this.importKbPackage(localPath, p, instance); deployer.rebuildIndex(instance, new AzureDeployerService(deployer).getKBSearchSchema(instance.searchIndex)); - logger.info(`[GBDeployer] Finished import of ${localPath}`); + GBLog.info(`[GBDeployer] Finished import of ${localPath}`); } } diff --git a/packages/security.gblib/index.ts b/packages/security.gblib/index.ts index 0ae9674a8..12133320e 100644 --- a/packages/security.gblib/index.ts +++ b/packages/security.gblib/index.ts @@ -56,5 +56,5 @@ export class GBSecurityPackage implements IGBPackage { public loadBot(min: GBMinInstance): void {} public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/whatsapp.gblib/index.ts b/packages/whatsapp.gblib/index.ts index 4f06006e4..6a0ca8a9b 100644 --- a/packages/whatsapp.gblib/index.ts +++ b/packages/whatsapp.gblib/index.ts @@ -69,5 +69,5 @@ export class GBWhatsappPackage implements IGBPackage { } public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: any): void {} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts index 4c5506a6e..befb941c7 100644 --- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts +++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts @@ -1,5 +1,5 @@ const UrlJoin = require('url-join'); -const logger = require('../../../src/logger'); + const Swagger = require('swagger-client'); const rp = require('request-promise'); import { GBService } from 'botlib'; @@ -65,15 +65,15 @@ export class WhatsappDirectLine extends GBService { try { const result = await request.post(options); - logger.info(result); + GBLog.info(result); } catch (error) { - logger.error('Error initializing 3rd party Whatsapp provider.', error); + GBLog.error('Error initializing 3rd party Whatsapp provider.', error); } return client; }) .catch(err => { - logger.error('Error initializing DirectLine client', err); + GBLog.error('Error initializing DirectLine client', err); }); } @@ -86,13 +86,13 @@ export class WhatsappDirectLine extends GBService { return; // Exit here. } - logger.info(`GBWhatsapp: Hook called. from: ${from}(${fromName}), text: ${text})`); + GBLog.info(`GBWhatsapp: Hook called. from: ${from}(${fromName}), text: ${text})`); const conversationId = this.conversationIds[from]; this.directLineClient.then(client => { if (this.conversationIds[from] == undefined) { - logger.info(`GBWhatsapp: Starting new conversation on Bot.`); + GBLog.info(`GBWhatsapp: Starting new conversation on Bot.`); client.Conversations.Conversations_StartConversation() .then(response => { return response.obj.conversationId; @@ -127,12 +127,12 @@ export class WhatsappDirectLine extends GBService { replyToId: from } }).catch(err => { - logger.error(`GBWhatsapp: Error receiving message: ${err}.`); + GBLog.error(`GBWhatsapp: Error receiving message: ${err}.`); }); } public pollMessages(client, conversationId, from, fromName) { - logger.info(`GBWhatsapp: Starting polling message for conversationId: + GBLog.info(`GBWhatsapp: Starting polling message for conversationId: ${conversationId}.`); setInterval(() => { @@ -171,7 +171,7 @@ export class WhatsappDirectLine extends GBService { let output = ''; if (activity.text) { - logger.info(`GBWhatsapp: MSG: ${activity.text}`); + GBLog.info(`GBWhatsapp: MSG: ${activity.text}`); output = activity.text; } @@ -183,7 +183,7 @@ export class WhatsappDirectLine extends GBService { break; case 'image/png': - logger.info('Opening the requested image ' + attachment.contentUrl); + GBLog.info('Opening the requested image ' + attachment.contentUrl); output += `\n${attachment.contentUrl}`; break; } diff --git a/src/app.ts b/src/app.ts index 7a1750fdd..3f913f5e1 100644 --- a/src/app.ts +++ b/src/app.ts @@ -62,7 +62,7 @@ export class GBServer { */ public static run() { - logger.info(`The Bot Server is in STARTING mode...`); + GBLog.info(`The Bot Server is in STARTING mode...`); // Creates a basic HTTP server that will serve several URL, one for each // bot instance. This allows the same server to attend multiple Bot on @@ -83,7 +83,7 @@ export class GBServer { server.listen(port, () => { (async () => { try { - logger.info(`Now accepting connections on ${port}...`); + GBLog.info(`Now accepting connections on ${port}...`); // Reads basic configuration, initialize minimal services. @@ -98,7 +98,7 @@ export class GBServer { // Ensure that local development proxy is setup. - logger.info(`Establishing a development local proxy (ngrok)...`); + GBLog.info(`Establishing a development local proxy (ngrok)...`); const proxyAddress: string = await core.ensureProxy(port); // Creates a boot instance or load it from storage. @@ -115,14 +115,14 @@ export class GBServer { // Deploys system and user packages. - logger.info(`Deploying packages...`); + GBLog.info(`Deploying packages...`); core.loadSysPackages(core); await core.checkStorage(azureDeployer); await deployer.deployPackages(core, server, appPackages); // Loads all bot instances. - logger.info(`Publishing instances...`); + GBLog.info(`Publishing instances...`); const packageInstance = await importer.importIfNotExistsBotPackage( GBConfigService.get('CLOUD_GROUP'), 'boot.gbot', @@ -145,13 +145,13 @@ export class GBServer { deployer.runOnce(); - logger.info(`The Bot Server is in RUNNING mode...`); + GBLog.info(`The Bot Server is in RUNNING mode...`); // Opens Navigator. core.openBrowserInDevelopment(); } catch (err) { - logger.error(`STOP: ${err} ${err.stack ? err.stack : ''}`); + GBLog.error(`STOP: ${err} ${err.stack ? err.stack : ''}`); process.exit(1); } })(); diff --git a/src/logger.ts b/src/logger.ts deleted file mode 100644 index ee201a788..000000000 --- a/src/logger.ts +++ /dev/null @@ -1,76 +0,0 @@ -/*****************************************************************************\ -| ( )_ _ | -| _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | -| ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | -| | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | -| | | ( )_) | | -| (_) \___/' | -| | -| General Bots Copyright (c) Pragmatismo.io. All rights reserved. | -| Licensed under the AGPL-3.0. | -| | -| According to our dual licensing model, this program can be used either | -| under the terms of the GNU Affero General Public License, version 3, | -| or under a proprietary license. | -| | -| The texts of the GNU Affero General Public License with an additional | -| permission and of our proprietary license can be found at and | -| in the LICENSE file you have received along with this program. | -| | -| This program is distributed in the hope that it will be useful, | -| but WITHOUT ANY WARRANTY, without even the implied warranty of | -| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | -| GNU Affero General Public License for more details. | -| | -| "General Bots" is a registered trademark of Pragmatismo.io. | -| The licensing of the program under the AGPLv3 does not imply a | -| trademark license. Therefore any rights, title and interest in | -| our trademarks remain entirely with us. | -| | -\*****************************************************************************/ - -/** - * @fileoverview Logging support. - */ - -const { createLogger, format, transports } = require('winston'); - -const config = { - levels: { - error: 0, - debug: 1, - warn: 2, - data: 3, - info: 4, - verbose: 5, - silly: 6, - custom: 7 - }, - colors: { - error: 'red', - debug: 'blue', - warn: 'yellow', - data: 'grey', - info: 'green', - verbose: 'cyan', - silly: 'magenta', - custom: 'yellow' - } -}; - -const logger = createLogger({ - format: format.combine( - format.colorize(), - format.simple(), - format.label({ label: 'GeneralBots' }), - format.timestamp(), - format.printf(nfo => { - return `${nfo.timestamp} [${nfo.label}] ${nfo.level}: ${nfo.message}`; - }) - ), - levels: config.levels, - transports: [new transports.Console()] -}); - -module.exports = logger; diff --git a/tslint.json b/tslint.json index 3ed5212bd..7480486c9 100644 --- a/tslint.json +++ b/tslint.json @@ -1,43 +1,40 @@ { - "defaultSeverity": "warning", - "extends": [ - "tslint:recommended", - "tslint-microsoft-contrib" - ], - "linterOptions": { - "exclude":[ - "libraries/botframework-connector/src/generated/**/*", - "libraries/botframework-schema/**/*" - ] - }, - "rulesDirectory": [ - "node_modules/tslint-microsoft-contrib" - ], - "jsRules": {}, - "rules": { - "no-floating-promises": false, - "no-var-requires":false, - "typedef":false, - "variable-name": false, - "no-parameter-properties": false, - "no-reserved-keywords": false, - "no-unnecessary-class":false, - "no-require-imports": false, - "function-name": false, - "no-redundant-jsdoc": false, - "no-return-await": false, - "prefer-type-cast": false, - "no-object-literal-type-assertion":false, - "no-increment-decrement":false, - "no-any":false, - "interface-name":false, - "no-this-assignment":false, - "switch-final-break":false, - "no-parameter-reassignment":false, - "export-name":false, - "no-relative-imports": false, - "no-backbone-get-set-outside-model": false, - "max-line-length": [true,{"limit":120,"ignore-pattern":"^\\s+\\*"}], - "await-promise": [true, "Bluebird"] - } + "defaultSeverity": "warning", + "extends": ["tslint:recommended", "tslint-microsoft-contrib"], + "linterOptions": { + "exclude": [ + "libraries/botframework-connector/src/generated/**/*", + "libraries/botframework-schema/**/*", + "./packages/default.gbui/**/*", + "./packages/**/*.gbdialog" + ] + }, + "rulesDirectory": ["node_modules/tslint-microsoft-contrib"], + "jsRules": {}, + "rules": { + "no-floating-promises": false, + "no-var-requires": false, + "typedef": false, + "variable-name": false, + "no-parameter-properties": false, + "no-reserved-keywords": false, + "no-unnecessary-class": false, + "no-require-imports": false, + "function-name": false, + "no-redundant-jsdoc": false, + "no-return-await": false, + "prefer-type-cast": false, + "no-object-literal-type-assertion": false, + "no-increment-decrement": false, + "no-any": false, + "interface-name": false, + "no-this-assignment": false, + "switch-final-break": false, + "no-parameter-reassignment": false, + "export-name": false, + "no-relative-imports": false, + "no-backbone-get-set-outside-model": false, + "max-line-length": [true, { "limit": 120, "ignore-pattern": "^\\s+\\*" }], + "await-promise": [true, "Bluebird"] + } } From fc550b7baa7910aaa43256bb018a81f703a5ec46 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Fri, 8 Mar 2019 19:13:00 -0300 Subject: [PATCH 05/15] fix(general): tslint being applied in all sources. --- .prettierrc | 1 + package-lock.json | 347 +++++------------- package.json | 27 +- packages/admin.gbapp/dialogs/AdminDialog.ts | 49 +-- .../admin.gbapp/services/GBAdminService.ts | 13 +- packages/analytics.gblib/index.ts | 32 +- .../dialogs/BotFarmDialog.ts | 69 ---- .../dialogs/StartDialog.ts | 25 +- packages/azuredeployer.gbapp/index.ts | 30 +- .../services/AzureDeployerService.ts | 58 ++- packages/console.gblib/index.ts | 29 +- .../services/ConsoleDirectLine.ts | 102 +++-- packages/core.gbapp/index.ts | 22 +- packages/core.gbapp/services/GBAPIService.ts | 22 +- .../core.gbapp/services/GBConfigService.ts | 4 +- .../services/GBConversationalService.ts | 2 +- packages/core.gbapp/services/GBDeployer.ts | 5 +- .../core.gbapp/services/GBImporterService.ts | 2 +- packages/core.gbapp/services/GBMinService.ts | 2 +- packages/core.gbapp/services/GBVMService.ts | 8 +- packages/core.gbapp/services/TSCompiler.ts | 1 - .../dialogs/FeedbackDialog.ts | 2 +- .../dialogs/QualityDialog.ts | 1 - packages/customer-satisfaction.gbapp/index.ts | 20 +- packages/kb.gbapp/dialogs/AskDialog.ts | 30 +- packages/kb.gbapp/dialogs/MenuDialog.ts | 8 +- packages/kb.gbapp/index.ts | 20 +- packages/kb.gbapp/services/KBService.ts | 114 +++--- packages/security.gblib/index.ts | 27 +- .../security.gblib/services/SecService.ts | 2 +- packages/whatsapp.gblib/index.ts | 16 +- .../services/WhatsappDirectLine.ts | 10 +- tslint.json | 3 + 33 files changed, 458 insertions(+), 645 deletions(-) delete mode 100644 packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts diff --git a/.prettierrc b/.prettierrc index c1e1114c8..af8db0fa7 100644 --- a/.prettierrc +++ b/.prettierrc @@ -5,4 +5,5 @@ "arrowParens": "avoid", "semi": true, "singleQuote": true + } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ea1d9d4ef..7d26985ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -986,15 +986,6 @@ "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz", "integrity": "sha1-hJAPDu/DcnmPR1G1JigwuCCJIuw=" }, - "@microsoft/microsoft-graph-client": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@microsoft/microsoft-graph-client/-/microsoft-graph-client-1.4.0.tgz", - "integrity": "sha512-dX7053APLpIaGMGqJrDjBVX7ZO+vntKTvyB1WIy4WpC8qE3qdE68MDOq5Vv6JPG879KygPiCH2ex5RCAK+OR0Q==", - "requires": { - "es6-promise": "^4.1.0", - "isomorphic-fetch": "^2.2.1" - } - }, "@microsoft/recognizers-text": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text/-/recognizers-text-1.1.4.tgz", @@ -1606,7 +1597,7 @@ "@types/is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@types/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-uE17sgeiEPKvm+1DHcD76cQUO+E=", + "integrity": "sha512-jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg==", "requires": { "@types/node": "*" } @@ -1647,7 +1638,7 @@ "@types/node-fetch": { "version": "1.6.9", "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-1.6.9.tgz", - "integrity": "sha1-p1D7D0zylgv3K0YuTIaQgCLdacU=", + "integrity": "sha512-n2r6WLoY7+uuPT7pnEtKJCmPUGyJ+cbyBR8Avnu4+m1nzz7DwBVuyIvvlBzCZ/nrpC7rIgb3D6pNavL7rFEa9g==", "requires": { "@types/node": "*" } @@ -1671,23 +1662,6 @@ "@types/request": "*" } }, - "@types/semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==" - }, - "@types/sequelize": { - "version": "4.27.38", - "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.38.tgz", - "integrity": "sha512-HR+epHzmU8xSMRUjhuuYKHn3IxD2Ft4OePEqXY8/6otDyPn9s6SZx4bVLnUa98jv6Ny0Di9IHQHOXh35O7QajQ==", - "dev": true, - "requires": { - "@types/bluebird": "*", - "@types/continuation-local-storage": "*", - "@types/lodash": "*", - "@types/validator": "*" - } - }, "@types/shelljs": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.2.tgz", @@ -1711,7 +1685,7 @@ "@types/uuid": { "version": "3.4.4", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz", - "integrity": "sha1-evaTYPpl7w3stB/RUL9MpcDO/fU=", + "integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==", "requires": { "@types/node": "*" } @@ -2030,11 +2004,6 @@ "readable-stream": "^2.0.6" } }, - "arg": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz", - "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==" - }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -2789,6 +2758,28 @@ "ms-rest-js": "^0.2.5", "request": "2.83.0", "rsa-pem-from-mod-exp": "^0.8.4" + }, + "dependencies": { + "ms-rest-js": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-0.2.8.tgz", + "integrity": "sha512-KgiSsbJzKcPLx0Zaca5PEdGOwm8X4Np+aTukK6stMl2eAqSrHvncjteyeXi6v6O0ECLYeUWVbqcPJfpw1PjnZQ==", + "requires": { + "@types/form-data": "^2.2.1", + "@types/is-stream": "^1.1.0", + "@types/node": "^9.4.6", + "@types/node-fetch": "^1.6.7", + "@types/uuid": "^3.4.3", + "fetch-cookie": "^0.7.0", + "fetch-ponyfill": "github:amarzavery/fetch-ponyfill#master", + "form-data": "^2.3.2", + "is-buffer": "^2.0.0", + "is-stream": "^1.1.0", + "moment": "^2.21.0", + "url-parse": "^1.2.0", + "uuid": "^3.2.1" + } + } } }, "botframework-schema": { @@ -2808,6 +2799,11 @@ "har-schema": "^2.0.0" } }, + "is-buffer": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", + "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", @@ -3007,6 +3003,28 @@ "ms-rest-js": "^0.2.5", "request": "2.83.0", "rsa-pem-from-mod-exp": "^0.8.4" + }, + "dependencies": { + "ms-rest-js": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-0.2.8.tgz", + "integrity": "sha512-KgiSsbJzKcPLx0Zaca5PEdGOwm8X4Np+aTukK6stMl2eAqSrHvncjteyeXi6v6O0ECLYeUWVbqcPJfpw1PjnZQ==", + "requires": { + "@types/form-data": "^2.2.1", + "@types/is-stream": "^1.1.0", + "@types/node": "^9.4.6", + "@types/node-fetch": "^1.6.7", + "@types/uuid": "^3.4.3", + "fetch-cookie": "^0.7.0", + "fetch-ponyfill": "github:amarzavery/fetch-ponyfill#master", + "form-data": "^2.3.2", + "is-buffer": "^2.0.0", + "is-stream": "^1.1.0", + "moment": "^2.21.0", + "url-parse": "^1.2.0", + "uuid": "^3.2.1" + } + } } }, "botframework-schema": { @@ -3026,6 +3044,11 @@ "har-schema": "^2.0.0" } }, + "is-buffer": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", + "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", @@ -3779,11 +3802,6 @@ "restore-cursor": "^2.0.0" } }, - "cli-spinner": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/cli-spinner/-/cli-spinner-0.2.8.tgz", - "integrity": "sha1-gWnZ/66HBnZEXm7kOX6Vp6Fb2AU=" - }, "cli-table": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", @@ -4058,12 +4076,6 @@ "delayed-stream": "~1.0.0" } }, - "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", - "dev": true - }, "commitizen": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-3.0.7.tgz", @@ -4250,15 +4262,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "config-chain": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", - "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, "configstore": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", @@ -5308,31 +5311,6 @@ "safe-buffer": "^5.0.1" } }, - "editorconfig": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz", - "integrity": "sha512-GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==", - "requires": { - "@types/node": "^10.11.7", - "@types/semver": "^5.5.0", - "commander": "^2.19.0", - "lru-cache": "^4.1.3", - "semver": "^5.6.0", - "sigmund": "^1.0.1" - }, - "dependencies": { - "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==" - }, - "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" - } - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -5495,7 +5473,8 @@ "es6-promise": { "version": "4.2.5", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", - "integrity": "sha1-2m0NVpLvtGHggsFIF/4kJ9j10FQ=" + "integrity": "sha1-2m0NVpLvtGHggsFIF/4kJ9j10FQ=", + "dev": true }, "es6-promisify": { "version": "5.0.0", @@ -6014,12 +5993,31 @@ "fetch-cookie": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.7.2.tgz", - "integrity": "sha1-W+US9xIbC80uNENQrXF3J6w7Gl0=", + "integrity": "sha512-Udm6ls1tV/pR9+EOjTYW2aGBadN03zOgVwu6grybxOg9ufACq7wE1HY/jh06DOykXH9FLYJC2RbUD3kJZcJBRg==", "requires": { "es6-denodeify": "^0.1.1", "tough-cookie": "^2.3.1" } }, + "fetch-ponyfill": { + "version": "github:amarzavery/fetch-ponyfill#136e6f8192bdb2aa0b7983f0b3b4361c357be9db", + "from": "github:amarzavery/fetch-ponyfill#master", + "requires": { + "fetch-cookie": "~0.6.0", + "node-fetch": "~1.7.1" + }, + "dependencies": { + "fetch-cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.6.0.tgz", + "integrity": "sha1-T+xOQIzAAH9sBOVTYYr0s97jf2k=", + "requires": { + "es6-denodeify": "^0.1.1", + "tough-cookie": "^2.3.1" + } + } + } + }, "figures": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", @@ -8207,15 +8205,6 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, - "isomorphic-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", - "requires": { - "node-fetch": "^1.0.1", - "whatwg-fetch": ">=0.10.0" - } - }, "isomorphic-form-data": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-0.0.1.tgz", @@ -8285,33 +8274,6 @@ "integrity": "sha512-CpKJh9VRNhS+XqZtg1UMejETGEiqwCGDC/uwPEEQwc2nfdbSm73SIE29TplG2gLYuBOOTNDqxzG6A9NtEPLt0w==", "dev": true }, - "js-beautify": { - "version": "1.8.9", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.9.tgz", - "integrity": "sha512-MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA==", - "requires": { - "config-chain": "^1.1.12", - "editorconfig": "^0.15.2", - "glob": "^7.1.3", - "mkdirp": "~0.5.0", - "nopt": "~4.0.1" - }, - "dependencies": { - "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, "js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", @@ -8936,11 +8898,6 @@ "pify": "^3.0.0" } }, - "make-error": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", - "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==" - }, "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -9542,54 +9499,16 @@ } }, "ms-rest-js": { - "version": "0.2.8", - "resolved": "http://registry.npmjs.org/ms-rest-js/-/ms-rest-js-0.2.8.tgz", - "integrity": "sha512-KgiSsbJzKcPLx0Zaca5PEdGOwm8X4Np+aTukK6stMl2eAqSrHvncjteyeXi6v6O0ECLYeUWVbqcPJfpw1PjnZQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-1.0.1.tgz", + "integrity": "sha512-o2Gms3XE4sCKm0FZLJicq0aa2ybYyV8pwUHKHJG1QExkk/csM7PLuHiaPAj6Xn3kzqzAx4cAYtyEp4P1T3ujyA==", "requires": { - "@types/form-data": "^2.2.1", - "@types/is-stream": "^1.1.0", - "@types/node": "^9.4.6", - "@types/node-fetch": "^1.6.7", - "@types/uuid": "^3.4.3", - "fetch-cookie": "^0.7.0", - "fetch-ponyfill": "github:amarzavery/fetch-ponyfill#136e6f8192bdb2aa0b7983f0b3b4361c357be9db", + "axios": "^0.18.0", "form-data": "^2.3.2", - "is-buffer": "^2.0.0", - "is-stream": "^1.1.0", - "moment": "^2.21.0", - "url-parse": "^1.2.0", - "uuid": "^3.2.1" - }, - "dependencies": { - "@types/node": { - "version": "9.6.35", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.35.tgz", - "integrity": "sha512-h5zvHS8wXHGa+Gcqs9K8vqCgOtqjr0+NqG/DDJmQIX1wpR9HivAfgV8bjcD3mGM4bPfQw5Aneb2Pn8355L83jA==" - }, - "fetch-ponyfill": { - "version": "github:amarzavery/fetch-ponyfill#136e6f8192bdb2aa0b7983f0b3b4361c357be9db", - "from": "github:amarzavery/fetch-ponyfill#136e6f8192bdb2aa0b7983f0b3b4361c357be9db", - "requires": { - "fetch-cookie": "~0.6.0", - "node-fetch": "~1.7.1" - }, - "dependencies": { - "fetch-cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.6.0.tgz", - "integrity": "sha1-T+xOQIzAAH9sBOVTYYr0s97jf2k=", - "requires": { - "es6-denodeify": "^0.1.1", - "tough-cookie": "^2.3.1" - } - } - } - }, - "is-buffer": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" - } + "tough-cookie": "^2.4.3", + "tslib": "^1.9.2", + "uuid": "^3.2.1", + "xml2js": "^0.4.19" } }, "mstranslator": { @@ -14821,11 +14740,6 @@ "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz", "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=" }, - "proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" - }, "protocols": { "version": "1.4.6", "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.6.tgz", @@ -16178,11 +16092,6 @@ } } }, - "sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" - }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -16524,6 +16433,7 @@ "version": "0.5.10", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", + "dev": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -16532,7 +16442,8 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, @@ -17609,73 +17520,11 @@ "semver": "^5.0.1" } }, - "ts-node": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.2.tgz", - "integrity": "sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==", - "requires": { - "arg": "^4.1.0", - "diff": "^3.1.0", - "make-error": "^1.1.1", - "source-map-support": "^0.5.6", - "yn": "^3.0.0" - } - }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", "integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=" }, - "tslint": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.13.0.tgz", - "integrity": "sha512-ECOOQRxXCYnUUePG5h/+Z1Zouobk3KFpIHA9aKBB/nnMxs97S1JJPDGt5J4cGm1y9U9VmVlfboOxA8n1kSNzGw==", - "dev": true, - "requires": { - "babel-code-frame": "^6.22.0", - "builtin-modules": "^1.1.1", - "chalk": "^2.3.0", - "commander": "^2.12.1", - "diff": "^3.2.0", - "glob": "^7.1.1", - "js-yaml": "^3.7.0", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "resolve": "^1.3.2", - "semver": "^5.3.0", - "tslib": "^1.8.0", - "tsutils": "^2.27.2" - } - }, - "tslint-microsoft-contrib": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/tslint-microsoft-contrib/-/tslint-microsoft-contrib-6.0.0.tgz", - "integrity": "sha512-R//efwn+34IUjTJeYgNDAJdzG0jyLWIehygPt/PHuZAieTolFVS56FgeFW7DOLap9ghXzMiFPTmDgm54qaL7QA==", - "dev": true, - "requires": { - "tsutils": "^2.27.2 <2.29.0" - }, - "dependencies": { - "tsutils": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.28.0.tgz", - "integrity": "sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } - } - } - }, - "tsutils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", - "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } - }, "tunnel": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz", @@ -18039,9 +17888,9 @@ "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=" }, "url-parse": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz", - "integrity": "sha1-v67kVciJAjIZ11fgRfpqaE7DbBU=", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz", + "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==", "requires": { "querystringify": "^2.0.0", "requires-port": "^1.0.0" @@ -18210,11 +18059,6 @@ } } }, - "whatwg-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", - "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" - }, "whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", @@ -18733,11 +18577,6 @@ } } } - }, - "yn": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.0.0.tgz", - "integrity": "sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==" } } } diff --git a/package.json b/package.json index 810157d24..8c5c757e3 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "commit": "git-cz" }, "dependencies": { - "@microsoft/microsoft-graph-client": "1.4.0", + "@microsoft/microsoft-graph-client": "1.5.2", "@semantic-release/exec": "^3.3.2", "adal-node": "0.1.28", "async": "2.6.2", @@ -59,30 +59,31 @@ "azure-arm-website": "5.7.0", "bluebird": "^3.5.3", "body-parser": "1.18.3", - "botbuilder": "4.1.7", - "botbuilder-ai": "4.2.0", - "botbuilder-azure": "4.2.0", + "botbuilder": "4.3.2", + "botbuilder-ai": "4.3.2", + "botbuilder-azure": "4.3.2", "botbuilder-choices": "4.0.0-preview1.2", - "botbuilder-dialogs": "4.2.0", + "botbuilder-dialogs": "4.3.2", "botbuilder-prompts": "4.0.0-preview1.2", "botlib": "^0.1.21", "chai": "4.2.0", "child_process": "^1.0.2", "chokidar": "2.1.2", - "cli-spinner": "^0.2.8", + "cli-spinner": "^0.2.10", "csv-parse": "4.3.3", - "dotenv-extended": "2.3.0", + "dotenv-extended": "2.4.0", "express": "4.16.4", "express-promise-router": "3.0.3", "fs-extra": "7.0.1", "ip": "^1.1.5", - "js-beautify": "^1.8.9", + "js-beautify": "^1.9.0", "localize": "0.4.7", "marked": "0.6.1", "mocha": "6.0.2", "mocha-typescript": "1.1.17", "ms": "2.1.1", "ms-rest-azure": "2.6.0", + "ms-rest-js": "^1.0.1", "nexmo": "2.4.1", "ngrok": "3.1.1", "nyc": "13.3.0", @@ -94,7 +95,7 @@ "request-promise": "4.2.4", "request-promise-native": "1.0.7", "scanf": "^1.0.2", - "sequelize": "4.42.1", + "sequelize": "4.43.0", "sequelize-typescript": "0.6.7", "shx": "0.3.2", "simple-git": "1.107.0", @@ -103,7 +104,7 @@ "swagger-client": "3.8.25", "tedious": "5.0.3", "temperature-js": "^0.1.0", - "ts-node": "8.0.2", + "ts-node": "8.0.3", "typedoc": "0.14.2", "typedoc-plugin-external-module-name": "^2.0.0", "typedoc-plugin-markdown": "^1.1.27", @@ -123,7 +124,7 @@ "@semantic-release/release-notes-generator": "^7.1.4", "@types/chai": "4.1.7", "@types/mocha": "5.2.6", - "@types/sequelize": "4.27.38", + "@types/sequelize": "4.27.39", "@types/url-join": "4.0.0", "@types/winston": "2.4.4", "ban-sensitive-files": "1.9.2", @@ -141,8 +142,8 @@ "standard": "12.0.1", "travis-deploy-once": "5.0.11", "ts-loader": "^5.3.3", - "tslint": "^5.13.0", - "tslint-microsoft-contrib": "^6.0.0" + "tslint": "^5.13.1", + "tslint-microsoft-contrib": "^6.1.0" }, "eslintConfig": { "env": { diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts index 21a509785..d385f1754 100644 --- a/packages/admin.gbapp/dialogs/AdminDialog.ts +++ b/packages/admin.gbapp/dialogs/AdminDialog.ts @@ -36,24 +36,20 @@ 'use strict'; -const UrlJoin = require('url-join'); -import { BotAdapter } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; import { GBMinInstance, IGBDialog } from 'botlib'; +import UrlJoin = require('url-join'); import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GBConfigService } from '../../core.gbapp/services/GBConfigService'; import { GBDeployer } from '../../core.gbapp/services/GBDeployer'; import { GBImporter } from '../../core.gbapp/services/GBImporterService'; -import { GBAdminService } from '../services/GBAdminService'; import { Messages } from '../strings'; /** * Dialogs for administration tasks. */ export class AdminDialog extends IGBDialog { - public static async createFarmCommand(text: any, min: GBMinInstance) {} - - public static async undeployPackageCommand(text: any, min: GBMinInstance) { + public static async undeployPamand(text: any, min: GBMinInstance) { const packageName = text.split(' ')[1]; const importer = new GBImporter(min.core); const deployer = new GBDeployer(min.core, importer); @@ -71,34 +67,27 @@ export class AdminDialog extends IGBDialog { await deployer.deployFromSharePoint(min.instance.instanceId, packageName); } else { const additionalPath = GBConfigService.get('ADDITIONAL_DEPLOY_PATH'); - if (!additionalPath) { + if (additionalPath !== undefined) { throw new Error('ADDITIONAL_DEPLOY_PATH is not set and deployPackage was called.'); } await deployer.deployPackageFromLocalPath(min, UrlJoin(additionalPath, packageName)); } } - public static async rebuildIndexPackageCommand(min: GBMinInstance, text: string, deployer: GBDeployer) { + public static async rebuildIndexPackageCommand(min: GBMinInstance, deployer: GBDeployer) { await deployer.rebuildIndex( min.instance, new AzureDeployerService(deployer).getKBSearchSchema(min.instance.searchIndex) ); } - public static async addConnectionCommand(min: GBMinInstance, text: any) { - const packageName = text.split(' ')[1]; - const importer = new GBImporter(min.core); - const admin = new GBAdminService(min.core); - // TODO: await admin.addConnection - } - /** * Setup dialogs flows and define services call. * * @param bot The bot adapter. * @param min The minimal bot instance data. */ - public static setup(bot: BotAdapter, min: GBMinInstance) { + public static setup(min: GBMinInstance) { // Setup services. const importer = new GBImporter(min.core); @@ -116,9 +105,9 @@ export class AdminDialog extends IGBDialog { }, async step => { const locale = step.context.activity.locale; - const password = step.result; + const sensitive = step.result; - if (password === GBConfigService.get('ADMIN_PASS')) { + if (sensitive === GBConfigService.get('ADMIN_PASS')) { await step.context.sendActivity(Messages[locale].welcome); return await step.prompt('textPrompt', Messages[locale].which_task); @@ -129,8 +118,9 @@ export class AdminDialog extends IGBDialog { } }, async step => { - const locale = step.context.activity.locale; - const text = step.result; + const locale: string = step.context.activity.locale; + // tslint:disable-next-line:no-unsafe-any + const text: string = step.result; const cmdName = text.split(' ')[0]; step.context.sendActivity(Messages[locale].working(cmdName)); @@ -138,29 +128,16 @@ export class AdminDialog extends IGBDialog { if (text === 'quit') { return await step.replaceDialog('/'); - } else if (cmdName === 'createFarm') { - await AdminDialog.createFarmCommand(text, min); - - return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'deployPackage') { await AdminDialog.deployPackageCommand(min, text, deployer); return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'redeployPackage') { - await AdminDialog.undeployPackageCommand(text, min); await AdminDialog.deployPackageCommand(min, text, deployer); return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'rebuildIndex') { - await AdminDialog.rebuildIndexPackageCommand(min, text, deployer); - - return await step.replaceDialog('/admin', { firstRun: false }); - } else if (cmdName === 'addConnection') { - await AdminDialog.addConnectionCommand(min, text); - - return await step.replaceDialog('/admin', { firstRun: false }); - } else if (cmdName === 'undeployPackage') { - await AdminDialog.undeployPackageCommand(text, min); + await AdminDialog.rebuildIndexPackageCommand(min, deployer); return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'setupSecurity') { @@ -224,9 +201,9 @@ export class AdminDialog extends IGBDialog { ); const locale = step.context.activity.locale; - const state = `${min.instance.instanceId}${Math.floor(Math.random() * 1000000000)}`; + const state = `${min.instance.instanceId}${crypto.getRandomValues(new Uint32Array(16))[0]}`; - await min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state); + min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state); const url = `https://login.microsoftonline.com/${ min.instance.authenticatorTenant diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts index 68d3a95d6..f844a299e 100644 --- a/packages/admin.gbapp/services/GBAdminService.ts +++ b/packages/admin.gbapp/services/GBAdminService.ts @@ -38,9 +38,9 @@ import { AuthenticationContext, TokenResponse } from 'adal-node'; import { IGBAdminService, IGBCoreService } from 'botlib'; +import UrlJoin = require('url-join'); import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; import { GuaribasAdmin } from '../models/AdminModel'; -const UrlJoin = require('url-join'); const msRestAzure = require('ms-rest-azure'); const PasswordGenerator = require('strict-password-generator').default; @@ -65,15 +65,13 @@ export class GBAdminService implements IGBAdminService { public static async getADALTokenFromUsername(username: string, password: string) { const credentials = await GBAdminService.getADALCredentialsFromUsername(username, password); - const accessToken = credentials.tokenCache._entries[0].accessToken; - return accessToken; + return credentials.tokenCache._entries[0].accessToken; } public static async getADALCredentialsFromUsername(username: string, password: string) { - const credentials = await msRestAzure.loginWithUsernamePassword(username, password); - return credentials; + return await msRestAzure.loginWithUsernamePassword(username, password); } public static getRndPassword(): string { @@ -102,9 +100,8 @@ export class GBAdminService implements IGBAdminService { minimumLength: 12, maximumLength: 14 }; - const name = passwordGenerator.generatePassword(options); - return name; + return passwordGenerator.generatePassword(options); } public async setValue(instanceId: number, key: string, value: string) { @@ -170,7 +167,7 @@ export class GBAdminService implements IGBAdminService { instance.authenticatorClientSecret, resource, async (err, res) => { - if (err) { + if (err !== undefined) { reject(err); } else { const token = res as TokenResponse; diff --git a/packages/analytics.gblib/index.ts b/packages/analytics.gblib/index.ts index 0c3e33f8d..91e07bed7 100644 --- a/packages/analytics.gblib/index.ts +++ b/packages/analytics.gblib/index.ts @@ -36,18 +36,30 @@ 'use strict'; -const UrlJoin = require('url-join'); - -import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; - +import { GBDialogStep, GBMinInstance, IGBCoreService, IGBPackage, GBLog } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; +/** + * .gblib Package handler. + */ export class GBAnalyticsPackage implements IGBPackage { public sysPackages: IGBPackage[] = undefined; - public getDialogs(min: GBMinInstance) {} - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} - public unloadPackage(core: IGBCoreService): void {} - public loadBot(min: GBMinInstance): void {} - public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { + GBLog.verbose(`loadPackage called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public loadBot(min: GBMinInstance): void { + GBLog.verbose(`loadBot called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } } diff --git a/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts b/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts deleted file mode 100644 index 0a41cd431..000000000 --- a/packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts +++ /dev/null @@ -1,69 +0,0 @@ -/*****************************************************************************\ -| ( )_ _ | -| _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | -| ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | -| | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | -| | | ( )_) | | -| (_) \___/' | -| | -| General Bots Copyright (c) Pragmatismo.io. All rights reserved. | -| Licensed under the AGPL-3.0. | -| | -| According to our dual licensing model, this program can be used either | -| under the terms of the GNU Affero General Public License, version 3, | -| or under a proprietary license. | -| | -| The texts of the GNU Affero General Public License with an additional | -| permission and of our proprietary license can be found at and | -| in the LICENSE file you have received along with this program. | -| | -| This program is distributed in the hope that it will be useful, | -| but WITHOUT ANY WARRANTY, without even the implied warranty of | -| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | -| GNU Affero General Public License for more details. | -| | -| "General Bots" is a registered trademark of Pragmatismo.io. | -| The licensing of the program under the AGPLv3 does not imply a | -| trademark license. Therefore any rights, title and interest in | -| our trademarks remain entirely with us. | -| | -\*****************************************************************************/ - -/** - * @fileoverview General Bots server core. - */ - -'use strict'; - -import { BotAdapter } from 'botbuilder'; -import { GBMinInstance } from 'botlib'; -import { IGBDialog } from 'botlib'; -import { WaterfallDialog } from 'botlib/node_modules/botbuilder-dialogs'; -import { Messages } from '../strings'; - -export class BotFarmDialog extends IGBDialog { - /** - * Setup dialogs flows and define services call. - * - * @param bot The bot adapter. - * @param min The minimal bot instance data. - */ - public static setup(bot: BotAdapter, min: GBMinInstance) { - min.dialogs.add(new WaterfallDialog ('/createBotFarm', [ - async step => { - const locale = step.context.activity.locale; - await step.prompt('choicePrompt', Messages[locale].what_about_me); - - return step.next(); - }, - async step => { - - const locale = step.context.activity.locale; - await step.context.sendActivity(Messages[locale].thanks); - - return step.next(); - } - ])); - } -} diff --git a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts index 4d2175ab6..dbfe0b186 100644 --- a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts +++ b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts @@ -36,8 +36,7 @@ 'use strict'; -import { IGBInstance } from 'botlib'; -import { IGBInstallationDeployer } from 'botlib'; +import { GBLog, IGBInstallationDeployer, IGBInstance } from 'botlib'; import * as fs from 'fs'; import { GBAdminService } from '../../../packages/admin.gbapp/services/GBAdminService'; import { GBConfigService } from '../../../packages/core.gbapp/services/GBConfigService'; @@ -47,7 +46,6 @@ const scanf = require('scanf'); * Handles command-line dialog for getting info for Boot Bot. */ export class StartDialog { - public static async createBaseInstance(installationDeployer: IGBInstallationDeployer) { // No .env so asks for cloud credentials to start a new farm. @@ -122,7 +120,7 @@ export class StartDialog { private static retrieveUsername() { let value = GBConfigService.get('CLOUD_USERNAME'); - if (!value) { + if (value !== undefined) { process.stdout.write(`${GBAdminService.GB_PROMPT}CLOUD_USERNAME:`); value = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -132,7 +130,7 @@ export class StartDialog { private static retrievePassword() { let password = GBConfigService.get('CLOUD_PASSWORD'); - if (!password) { + if (password !== undefined) { process.stdout.write(`${GBAdminService.GB_PROMPT}CLOUD_PASSWORD:`); password = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -142,16 +140,13 @@ export class StartDialog { private static retrieveBotId() { let botId = GBConfigService.get('BOT_ID'); - if (!botId) { + if (botId !== undefined) { process.stdout.write( `${GBAdminService.GB_PROMPT}Choose a unique bot Id containing lowercase letters, digits or dashes (cannot use dash as the first two or last one characters), cannot start or end with or contain consecutive dashes and having 4 to 42 characters long.\n` ); process.stdout.write(`${GBAdminService.GB_PROMPT}BOT_ID:`); - - // TODO: Update this regexp to match description of it. - botId = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -160,7 +155,7 @@ cannot start or end with or contain consecutive dashes and having 4 to 42 charac private static retrieveAuthoringKey() { let authoringKey = GBConfigService.get('NLP_AUTHORING_KEY'); - if (!authoringKey) { + if (authoringKey !== undefined) { process.stdout.write( `${ GBAdminService.GB_PROMPT @@ -184,7 +179,7 @@ cannot start or end with or contain consecutive dashes and having 4 to 42 charac please go to https://apps.dev.microsoft.com/portal/register-app to generate manually an App ID and App Secret.\n` ); - if (!appId) { + if (appId !== undefined) { process.stdout.write('Generated Application Id (MARKETPLACE_ID):'); appId = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -194,7 +189,7 @@ generate manually an App ID and App Secret.\n` private static retrieveAppPassword() { let appPassword = GBConfigService.get('MARKETPLACE_SECRET'); - if (!appPassword) { + if (appPassword !== undefined) { process.stdout.write('Generated Password (MARKETPLACE_SECRET):'); appPassword = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -207,7 +202,7 @@ generate manually an App ID and App Secret.\n` const map = {}; let index = 1; list.forEach(element => { - console.log(`${index}: ${element.displayName} (${element.subscriptionId})`); + GBLog.info(`${index}: ${element.displayName} (${element.subscriptionId})`); map[index++] = element; }); let subscriptionIndex; @@ -222,8 +217,8 @@ generate manually an App ID and App Secret.\n` private static retrieveLocation() { let location = GBConfigService.get('CLOUD_LOCATION'); - if (!location) { - process.stdout.write('CLOUD_LOCATION (eg. \'westus\'):'); + if (location !== undefined) { + process.stdout.write('CLOUD_LOCATION (eg. westus):'); location = scanf('%s'); } diff --git a/packages/azuredeployer.gbapp/index.ts b/packages/azuredeployer.gbapp/index.ts index 905b43cdd..13563ab12 100644 --- a/packages/azuredeployer.gbapp/index.ts +++ b/packages/azuredeployer.gbapp/index.ts @@ -36,19 +36,27 @@ 'use strict'; -import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; +import { GBMinInstance, IGBCoreService, IGBPackage, GBLog, GBDialogStep } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; export class GBAzureDeployerPackage implements IGBPackage { public sysPackages: IGBPackage[] = undefined; - public getDialogs(min: GBMinInstance) {} - - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} - - public unloadPackage(core: IGBCoreService): void {} - - public loadBot(min: GBMinInstance): void {} - - public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { + GBLog.verbose(`loadPackage called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public loadBot(min: GBMinInstance): void { + GBLog.verbose(`loadBot called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } } diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index c0584c000..735b3c273 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -37,14 +37,14 @@ 'use strict'; import { CognitiveServicesManagementClient } from 'azure-arm-cognitiveservices'; -import { CognitiveServicesAccount } from 'azure-arm-cognitiveservices/lib/models'; import { ResourceManagementClient, SubscriptionClient } from 'azure-arm-resource'; import { SearchManagementClient } from 'azure-arm-search'; import { SqlManagementClient } from 'azure-arm-sql'; import { WebSiteManagementClient } from 'azure-arm-website'; +//tslint:disable-next-line:no-submodule-imports import { AppServicePlan } from 'azure-arm-website/lib/models'; -import { IGBInstallationDeployer, IGBInstance } from 'botlib'; -import { HttpMethods, ServiceClient, WebResource } from 'ms-rest-js'; +import { GBLog, IGBInstallationDeployer, IGBInstance } from 'botlib'; +import { HttpHeaders, HttpMethods, ServiceClient, WebResource } from 'ms-rest-js'; import { GBAdminService } from '../../../packages/admin.gbapp/services/GBAdminService'; import { GBCorePackage } from '../../../packages/core.gbapp'; import { GBConfigService } from '../../../packages/core.gbapp/services/GBConfigService'; @@ -52,10 +52,15 @@ import { GBDeployer } from '../../../packages/core.gbapp/services/GBDeployer'; const Spinner = require('cli-spinner').Spinner; -const UrlJoin = require('url-join'); +// tslint:disable-next-line:no-submodule-imports +import { CognitiveServicesAccount } from 'azure-arm-cognitiveservices/lib/models'; +import UrlJoin = require('url-join'); const iconUrl = 'https://github.com/pragmatismo-io/BotServer/blob/master/docs/images/generalbots-logo-squared.png'; const publicIp = require('public-ip'); +/** + * Deployer for Microsoft cloud. + */ export class AzureDeployerService implements IGBInstallationDeployer { public apiVersion = '2017-12-01'; public defaultEndPoint = 'http://localhost:4242'; @@ -81,10 +86,10 @@ export class AzureDeployerService implements IGBInstallationDeployer { const req = new WebResource(); req.method = verb; req.url = url; - req.headers = {}; + req.headers = {}; req.headers['Content-Type'] = 'application/json'; req.headers['accept-language'] = '*'; - req.headers.Authorization = 'Bearer ' + accessToken; + req.headers['Authorization'] = `Bearer ${accessToken}`; req.body = body; return req; @@ -192,8 +197,8 @@ export class AzureDeployerService implements IGBInstallationDeployer { } ], scoringProfiles: [], - defaultScoringProfile: null, - corsOptions: null + defaultScoringProfile: undefined, + corsOptions: undefined }; } @@ -218,7 +223,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { const url = UrlJoin(baseUrl, query); const req = AzureDeployerService.createRequestObject(url, accessToken, 'PATCH', JSON.stringify(parameters)); const res = await httpClient.sendRequest(req); - if (!(res.bodyAsJson as any).id) { + if (!(res['bodyAsJson'] as any).id) { throw res.bodyAsText; } GBLog.info(`Bot proxy updated at: ${endpoint}.`); @@ -250,11 +255,9 @@ export class AzureDeployerService implements IGBInstallationDeployer { const culture = 'en-us'; this.initServices(credentials, subscriptionId); - const spinner = new Spinner('%s'); spinner.start(); spinner.setSpinnerString('|/-\\'); - let keys: any; const name = instance.botId; @@ -313,8 +316,6 @@ export class AzureDeployerService implements IGBInstallationDeployer { instance.textAnalyticsEndpoint = textAnalytics.endpoint; instance.textAnalyticsKey = keys.key1; - // TODO: Check quotes being added when NLP field is filled. - GBLog.info(`Deploying NLP...`); const nlp = await this.createNLP(name, `${name}-nlp`, instance.cloudLocation); keys = await this.cognitiveClient.accounts.listKeys(name, nlp.name); @@ -358,7 +359,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { appPassword: string, subscriptionId: string ) { - const instance = {}; + const instance = {}; instance.botId = title; instance.cloudUsername = username; @@ -371,10 +372,9 @@ export class AzureDeployerService implements IGBInstallationDeployer { instance.adminPass = GBAdminService.getRndPassword(); const credentials = await GBAdminService.getADALCredentialsFromUsername(username, password); - this.deployFarm(`http://${instance.botId}.azurewebsites.net`, instance, credentials, subscriptionId); - - // TODO: Copy github to webapp. - //const status = await git.status(); + // tslint:disable-next-line:no-http-string + const url = `http://${instance.botId}.azurewebsites.net`; + this.deployFarm(url, instance, credentials, subscriptionId); } private initServices(credentials: any, subscriptionId: string) { @@ -398,21 +398,16 @@ export class AzureDeployerService implements IGBInstallationDeployer { } private async registerProviders(subscriptionId, baseUrl, accessToken) { - const query = `subscriptions/${subscriptionId}/providers/${ - this.provider - }/register?api-version=2018-02-01`; + const query = `subscriptions/${subscriptionId}/providers/${this.provider}/register?api-version=2018-02-01`; const requestUrl = UrlJoin(baseUrl, query); const req = new WebResource(); req.method = 'POST'; req.url = requestUrl; - req.headers = {}; + req.headers = {}; req.headers['Content-Type'] = 'application/json; charset=utf-8'; req.headers['accept-language'] = '*'; - req.headers.Authorization = 'Bearer ' + accessToken; - - const httpClient = new ServiceClient(); - // TODO: Check res for error. + req.headers['Authorization'] = `Bearer ${accessToken}`; } /** @@ -469,7 +464,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { let url = UrlJoin(baseUrl, query); let req = AzureDeployerService.createRequestObject(url, accessToken, 'PUT', JSON.stringify(parameters)); const res = await httpClient.sendRequest(req); - if (!(res.bodyAsJson as any).id) { + if (!(res['bodyAsJson'] as any).id) { reject(res.bodyAsText); return; @@ -477,13 +472,14 @@ export class AzureDeployerService implements IGBInstallationDeployer { setTimeout(async () => { 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 }`; url = UrlJoin(baseUrl, query); req = AzureDeployerService.createRequestObject(url, accessToken, 'GET', JSON.stringify(parameters)); const resChannel = await httpClient.sendRequest(req); - const key = (resChannel.bodyAsJson as any).properties.properties.sites[0].key; + const key = (resChannel['bodyAsJson'] as any).properties.properties.sites[0].key; instance.webchatKey = key; resolve(instance); } catch (error) { @@ -507,8 +503,8 @@ export class AzureDeployerService implements IGBInstallationDeployer { }; const body = JSON.stringify(parameters); - const apps = await this.makeNlpRequest(location, authoringKey, null, 'GET', 'apps'); - const app = (apps.bodyAsJson as any).filter(x => x.name == name)[0]; + const apps = await this.makeNlpRequest(location, authoringKey, undefined, 'GET', 'apps'); + const app = (apps['bodyAsJson'] as any).filter(x => x.name === name)[0]; let id: string; if (!app) { const res = await this.makeNlpRequest(location, authoringKey, body, 'POST', 'apps'); @@ -530,7 +526,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { const req = new WebResource(); req.method = method; req.url = `https://${location}.api.cognitive.microsoft.com/luis/api/v2.0/${resource}`; - req.headers = {}; + req.headers = {}; req.headers['Content-Type'] = 'application/json'; req.headers['accept-language'] = '*'; req.headers['Ocp-Apim-Subscription-Key'] = authoringKey; diff --git a/packages/console.gblib/index.ts b/packages/console.gblib/index.ts index 1ee62f9aa..b76df96db 100644 --- a/packages/console.gblib/index.ts +++ b/packages/console.gblib/index.ts @@ -36,28 +36,33 @@ 'use strict'; -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); -import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; +import { GBMinInstance, IGBCoreService, IGBPackage, GBLog, GBDialogStep } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { ConsoleDirectLine } from './services/ConsoleDirectLine'; export class GBConsolePackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; public channel: ConsoleDirectLine; - public getDialogs(min: GBMinInstance) {} - - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} - - public unloadPackage(core: IGBCoreService): void {} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { + GBLog.verbose(`loadPackage called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } public loadBot(min: GBMinInstance): void { this.channel = new ConsoleDirectLine(min.instance.webchatKey); } - - public unloadBot(min: GBMinInstance): void {} - - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/console.gblib/services/ConsoleDirectLine.ts b/packages/console.gblib/services/ConsoleDirectLine.ts index 56be12e8e..9846e1c2a 100644 --- a/packages/console.gblib/services/ConsoleDirectLine.ts +++ b/packages/console.gblib/services/ConsoleDirectLine.ts @@ -1,50 +1,58 @@ const Swagger = require('swagger-client'); const rp = require('request-promise'); -import { GBService } from 'botlib'; +import { GBLog, GBService } from 'botlib'; +/** + * Bot simulator in terminal window. + */ export class ConsoleDirectLine extends GBService { - public pollInterval = 1000; - public directLineSecret = ''; - public directLineClientName = 'DirectLineClient'; - public directLineSpecUrl = 'https://docs.botframework.com/en-us/restapi/directline3/swagger.json'; + public pollInterval: number = 1000; + public directLineSecret: string = ''; + public directLineClientName: string = 'DirectLineClient'; + public directLineSpecUrl: string = 'https://docs.botframework.com/en-us/restapi/directline3/swagger.json'; - constructor(directLineSecret) { + constructor(directLineSecret: string) { super(); this.directLineSecret = directLineSecret; - + // tslint:disable-next-line:no-unsafe-any const directLineClient = rp(this.directLineSpecUrl) - .then(function(spec) { + .then((spec: string) => { + // tslint:disable-next-line:no-unsafe-any return new Swagger({ spec: JSON.parse(spec.trim()), usePromise: true }); }) - .then(function(client) { + .then(client => { + // tslint:disable-next-line:no-unsafe-any client.clientAuthorizations.add( 'AuthorizationBotConnector', - new Swagger.ApiKeyAuthorization('Authorization', 'Bearer ' + directLineSecret, 'header') + // tslint:disable-next-line:no-unsafe-any + new Swagger.ApiKeyAuthorization('Authorization', `Bearer ${directLineSecret}`, 'header') ); return client; }) - .catch(function(err) { - console.error('Error initializing DirectLine client', err); + .catch(err => { + GBLog.error(`Error initializing DirectLine client ${err}`); }); - // TODO: Remove *this* issue. const _this_ = this; + // tslint:disable-next-line:no-unsafe-any directLineClient.then(client => { + // tslint:disable-next-line:no-unsafe-any client.Conversations.Conversations_StartConversation() - .then(function(response) { + .then(response => { + // tslint:disable-next-line:no-unsafe-any return response.obj.conversationId; }) - .then(function(conversationId) { + .then(conversationId => { _this_.sendMessagesFromConsole(client, conversationId); _this_.pollMessages(client, conversationId); }) - .catch(function(err) { - console.error('Error starting conversation', err); + .catch(err => { + GBLog.error(`Error starting conversation ${err}`); }); }); } @@ -54,14 +62,16 @@ export class ConsoleDirectLine extends GBService { process.stdin.resume(); const stdin = process.stdin; process.stdout.write('Command> '); - stdin.addListener('data', function(e) { - const input = e.toString().trim(); - if (input) { + stdin.addListener('data', e => { + // tslint:disable-next-line:no-unsafe-any + const input: string = e.toString().trim(); + if (input !== undefined) { // exit if (input.toLowerCase() === 'exit') { return process.exit(); } + // tslint:disable-next-line:no-unsafe-any client.Conversations.Conversations_PostActivity({ conversationId: conversationId, activity: { @@ -73,8 +83,8 @@ export class ConsoleDirectLine extends GBService { name: _this_.directLineClientName } } - }).catch(function(err) { - console.error('Error sending message:', err); + }).catch(err => { + GBLog.error(`Error sending message: ${err}`); }); process.stdout.write('Command> '); @@ -82,71 +92,85 @@ export class ConsoleDirectLine extends GBService { }); } - /** TBD: Poll Messages from conversation using DirectLine client */ public pollMessages(client, conversationId) { const _this_ = this; - console.log('Starting polling message for conversationId: ' + conversationId); - let watermark = null; - setInterval(function() { + GBLog.info(`Starting polling message for conversationId: ${conversationId}`); + let watermark; + setInterval(() => { + // tslint:disable-next-line:no-unsafe-any client.Conversations.Conversations_GetActivities({ conversationId: conversationId, watermark: watermark }) - .then(function(response) { + .then(response => { + // tslint:disable-next-line:no-unsafe-any watermark = response.obj.watermark; + // tslint:disable-next-line:no-unsafe-any return response.obj.activities; }) .then(_this_.printMessages, _this_.directLineClientName); + // tslint:disable-next-line:align }, this.pollInterval); } + // tslint:disable:no-unsafe-any public printMessages(activities, directLineClientName) { if (activities && activities.length) { // ignore own messages - activities = activities.filter(function(m) { + activities = activities.filter(m => { return m.from.id !== directLineClientName; }); if (activities.length) { // print other messages activities.forEach(activity => { - console.log(activity.text); + GBLog.info(activity.text); + // tslint:disable-next-line:align }, this); process.stdout.write('Command> '); } } } + // tslint:enable:no-unsafe-any + // tslint:disable:no-unsafe-any public printMessage(activity) { if (activity.text) { - console.log(activity.text); + GBLog.info(activity.text); } if (activity.attachments) { - activity.attachments.forEach(function(attachment) { + activity.attachments.forEach(attachment => { switch (attachment.contentType) { case 'application/vnd.microsoft.card.hero': this.renderHeroCard(attachment); break; case 'image/png': - console.log('Opening the requested image ' + attachment.contentUrl); + GBLog.info(`Opening the requested image ${attachment.contentUrl}`); open(attachment.contentUrl); break; + + default: + GBLog.info(`Unknown contentType: ${attachment.contentType}`); + break; } }); } } + // tslint:enable:no-unsafe-any + // tslint:disable:no-unsafe-any public renderHeroCard(attachment) { const width = 70; - const contentLine = function(content) { - return ' '.repeat((width - content.length) / 2) + content + ' '.repeat((width - content.length) / 2); + const contentLine = content => { + return `${' '.repeat((width - content.length) / 2)}content${' '.repeat((width - content.length) / 2)}`; }; - console.log('/' + '*'.repeat(width + 1)); - console.log('*' + contentLine(attachment.content.title) + '*'); - console.log('*' + ' '.repeat(width) + '*'); - console.log('*' + contentLine(attachment.content.text) + '*'); - console.log('*'.repeat(width + 1) + '/'); + GBLog.info(`/${'*'.repeat(width + 1)}`); + GBLog.info(`*${contentLine(attachment.content.title)}*`); + GBLog.info(`*${' '.repeat(width)}*`); + GBLog.info(`*${contentLine(attachment.content.text)}*`); + GBLog.info(`${'*'.repeat(width + 1)}/`); } + // tslint:enable:no-unsafe-any } diff --git a/packages/core.gbapp/index.ts b/packages/core.gbapp/index.ts index 3e73cba4e..94f227cb5 100644 --- a/packages/core.gbapp/index.ts +++ b/packages/core.gbapp/index.ts @@ -36,9 +36,9 @@ 'use strict'; -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); -import { GBMinInstance, IGBPackage } from 'botlib'; +import { GBMinInstance, IGBPackage, GBLog, GBDialogStep } from 'botlib'; import { IGBCoreService } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; @@ -49,19 +49,25 @@ import { GuaribasChannel, GuaribasException, GuaribasInstance, GuaribasPackage } export class GBCorePackage implements IGBPackage { public static CurrentEngineName = 'guaribas-1.0.0'; public sysPackages: IGBPackage[] = undefined; - public getDialogs(min: GBMinInstance) {} - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { core.sequelize.addModels([GuaribasInstance, GuaribasPackage, GuaribasChannel, GuaribasException]); } - public unloadPackage(core: IGBCoreService): void {} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } public loadBot(min: GBMinInstance): void { WelcomeDialog.setup(min.bot, min); WhoAmIDialog.setup(min.bot, min); } - - public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/core.gbapp/services/GBAPIService.ts b/packages/core.gbapp/services/GBAPIService.ts index dccd0f39a..03ddc01b2 100644 --- a/packages/core.gbapp/services/GBAPIService.ts +++ b/packages/core.gbapp/services/GBAPIService.ts @@ -34,12 +34,12 @@ import { TurnContext } from 'botbuilder'; import { WaterfallStepContext } from 'botbuilder-dialogs'; -import { GBMinInstance } from 'botlib'; +import { GBLog, GBMinInstance } from 'botlib'; import * as request from 'request-promise-native'; +import UrlJoin = require('url-join'); import { GBAdminService } from '../../admin.gbapp/services/GBAdminService'; import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GBDeployer } from './GBDeployer'; -const UrlJoin = require('url-join'); /** * BASIC system class for extra manipulation of bot behaviour. @@ -64,14 +64,14 @@ class SysClass { } public async createABotFarmUsing( - botId, - username, - password, - location, - nlpAuthoringKey, - appId, - appPassword, - subscriptionId + botId: string, + username: string, + password: string, + location: string, + nlpAuthoringKey: string, + appId: string, + appPassword: string, + subscriptionId: string ) { const service = new AzureDeployerService(this.deployer); await service.deployToCloud( @@ -91,7 +91,7 @@ class SysClass { */ public async sendEmail(to, subject, body) { // tslint:disable-next-line:no-console - console.log(`[E-mail]: to:${to}, subject: ${subject}, body: ${body}.`); + GBLog.info(`[E-mail]: to:${to}, subject: ${subject}, body: ${body}.`); } /** diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts index e3e58e0ec..0b13d92e9 100644 --- a/packages/core.gbapp/services/GBConfigService.ts +++ b/packages/core.gbapp/services/GBConfigService.ts @@ -30,8 +30,8 @@ | | \*****************************************************************************/ - import * as fs from 'fs'; +import { GBLog } from 'botlib'; /** * @fileoverview General Bots server core. @@ -49,7 +49,7 @@ export class GBConfigService { overrideProcessEnv: true }); } catch (e) { - console.error(e.message); + GBLog.error(e.message); process.exit(3); } } diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index 5d4e501a3..e5e4c184b 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -63,7 +63,7 @@ export class GBConversationalService implements IGBConversationalService { return step.context.activity.locale; } - public async sendEvent(step: GBDialogStep, name: string, value: any): Promise { + public async sendEvent(step: GBDialogStep, name: string, value: Object): Promise { if (step.context.activity.channelId === 'webchat') { const msg = MessageFactory.text(''); msg.value = value; diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index c5dd11f00..8d1d70b83 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -36,16 +36,15 @@ 'use strict'; - const Path = require('path'); -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); const Fs = require('fs'); const WaitUntil = require('wait-until'); const express = require('express'); const child_process = require('child_process'); const graph = require('@microsoft/microsoft-graph-client'); -import { GBMinInstance, IGBCoreService, IGBInstance } from 'botlib'; +import { GBMinInstance, IGBCoreService, IGBInstance, GBLog } from 'botlib'; import { GBError, IGBPackage } from 'botlib'; import { AzureSearch } from 'pragmatismo-io-framework'; import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts index 9464d60bd..515296dd1 100644 --- a/packages/core.gbapp/services/GBImporterService.ts +++ b/packages/core.gbapp/services/GBImporterService.ts @@ -36,10 +36,10 @@ 'use strict'; -const UrlJoin = require('url-join'); import { IGBCoreService, IGBInstance } from 'botlib'; import fs = require('fs'); import path = require('path'); +import UrlJoin = require('url-join'); import { SecService } from '../../security.gblib/services/SecService'; import { GuaribasInstance } from '../models/GBModel'; diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 862c54f55..fa6471c6b 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -37,7 +37,7 @@ 'use strict'; const { DialogSet, TextPrompt } = require('botbuilder-dialogs'); -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); const express = require('express'); const request = require('request-promise-native'); diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts index 35e477c89..715fab13e 100644 --- a/packages/core.gbapp/services/GBVMService.ts +++ b/packages/core.gbapp/services/GBVMService.ts @@ -41,11 +41,11 @@ import { TSCompiler } from './TSCompiler'; const walkPromise = require('walk-promise'); const vm = require('vm'); -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); +import DialogClass from './GBAPIService'; const vb2ts = require('vbscript-to-typescript/dist/converter'); const beautify = require('js-beautify').js; - /** * @fileoverview Virtualization services for emulation of BASIC. * This alpha version is using a hack in form of converter to @@ -249,7 +249,7 @@ export class GBVMService extends GBService { min.dialogs.add( new WaterfallDialog('/hear', [ async step => { - step.activeDialog.state.cbId = step.options.id; + step.activeDialog.state.cbId = step.options['id']; return await step.prompt('textPrompt', {}); }, @@ -259,7 +259,7 @@ export class GBVMService extends GBService { const cbId = step.activeDialog.state.cbId; const cb = min.cbMap[cbId]; - cb.bind({ step: step: GBDialogStep, context: step.context }); // TODO: Necessary or min.sandbox? + cb.bind({ step: step, context: step.context }); // TODO: Necessary or min.sandbox? await step.endDialog(); diff --git a/packages/core.gbapp/services/TSCompiler.ts b/packages/core.gbapp/services/TSCompiler.ts index c1cc88da2..ccb991abd 100644 --- a/packages/core.gbapp/services/TSCompiler.ts +++ b/packages/core.gbapp/services/TSCompiler.ts @@ -38,7 +38,6 @@ import * as ts from 'typescript'; - export class TSCompiler { private static shouldIgnoreError(diagnostic) { diff --git a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts index 96cdd6e7e..e66d26e7b 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts @@ -86,7 +86,7 @@ export class FeedbackDialog extends IGBDialog { const locale = step.context.activity.locale; await step.context.sendActivity(Messages[locale].about_suggestions); - step.activeDialog.state.cbId = step.options['id']; + step.activeDialog.state.cbId = step.options.id; return await step.prompt('textPrompt', Messages[locale].what_about_service); }, diff --git a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts index 21b8bc014..02eab81e2 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts @@ -44,7 +44,6 @@ import { GBMinInstance } from 'botlib'; import { CSService } from '../services/CSService'; import { Messages } from '../strings'; - export class QualityDialog extends IGBDialog { /** * Setup dialogs flows and define services call. diff --git a/packages/customer-satisfaction.gbapp/index.ts b/packages/customer-satisfaction.gbapp/index.ts index 42898ba7b..3850b5d9c 100644 --- a/packages/customer-satisfaction.gbapp/index.ts +++ b/packages/customer-satisfaction.gbapp/index.ts @@ -36,8 +36,8 @@ 'use strict'; -const UrlJoin = require('url-join'); -import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; +import { GBMinInstance, IGBCoreService, IGBPackage, GBLog, GBDialogStep } from 'botlib'; +import UrlJoin = require('url-join'); import { FeedbackDialog } from './dialogs/FeedbackDialog'; import { QualityDialog } from './dialogs/QualityDialog'; import { GuaribasQuestionAlternate } from './models/index'; @@ -46,16 +46,24 @@ import { Sequelize } from 'sequelize-typescript'; export class GBCustomerSatisfactionPackage implements IGBPackage { public sysPackages: IGBPackage[] = undefined; - public getDialogs(min: GBMinInstance) {} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { core.sequelize.addModels([GuaribasQuestionAlternate]); } - public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void { FeedbackDialog.setup(min.bot, min); QualityDialog.setup(min.bot, min); } - public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts index fc95465d5..5be2cace4 100644 --- a/packages/kb.gbapp/dialogs/AskDialog.ts +++ b/packages/kb.gbapp/dialogs/AskDialog.ts @@ -38,14 +38,12 @@ import { BotAdapter } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { IGBDialog } from 'botlib'; +import { IGBDialog, GBLog } from 'botlib'; import { GBMinInstance } from 'botlib'; import { AzureText } from 'pragmatismo-io-framework'; import { Messages } from '../strings'; import { KBService } from './../services/KBService'; - - export class AskDialog extends IGBDialog { /** * Setup dialogs flows and define services call. @@ -59,13 +57,13 @@ export class AskDialog extends IGBDialog { min.dialogs.add( new WaterfallDialog('/answerEvent', [ async step => { - if (step.options && step.options.questionId) { - const question = await service.getQuestionById(min.instance.instanceId, step.options.questionId); + if (step.options && step.options['questionId']) { + const question = await service.getQuestionById(min.instance.instanceId, step.options['questionId']); const answer = await service.getAnswerById(min.instance.instanceId, question.answerId); // Sends the answer to all outputs, including projector. - await service.sendAnswer(min.conversationalService, step: GBDialogStep, answer); + await service.sendAnswer(min.conversationalService, step, answer); await step.replaceDialog('/ask', { isReturning: true }); } @@ -79,7 +77,7 @@ export class AskDialog extends IGBDialog { new WaterfallDialog('/answer', [ async step => { const user = await min.userProfile.get(step.context, {}); - let text = step.options.query; + let text = step.options['query']; if (!text) { throw new Error(`/answer being called with no args query text.`); } @@ -88,13 +86,13 @@ export class AskDialog extends IGBDialog { // Stops any content on projector. - await min.conversationalService.sendEvent(step: GBDialogStep, 'stop', null); + await min.conversationalService.sendEvent(step, 'stop', null); // Handle extra text from FAQ. - if (step.options && step.options.query) { - text = step.options.query; - } else if (step.options && step.options.fromFaq) { + if (step.options && step.options['query']) { + text = step.options['query']; + } else if (step.options && step.options['fromFaq']) { await step.context.sendActivity(Messages[locale].going_answer); } @@ -126,7 +124,7 @@ export class AskDialog extends IGBDialog { // Sends the answer to all outputs, including projector. - await service.sendAnswer(min.conversationalService, step: GBDialogStep, resultsA.answer); + await service.sendAnswer(min.conversationalService, step, resultsA.answer); // Goes to ask loop, again. @@ -155,11 +153,11 @@ export class AskDialog extends IGBDialog { // Sends the answer to all outputs, including projector. - await service.sendAnswer(min.conversationalService, step: GBDialogStep, resultsB.answer); + await service.sendAnswer(min.conversationalService, step, resultsB.answer); return await step.replaceDialog('/ask', { isReturning: true }); } else { - if (!(await min.conversationalService.routeNLP(step: GBDialogStep, min, text))) { + if (!(await min.conversationalService.routeNLP(step, min, text))) { await step.context.sendActivity(Messages[locale].did_not_find); return await step.replaceDialog('/ask', { isReturning: true }); @@ -183,9 +181,9 @@ export class AskDialog extends IGBDialog { // Three forms of asking. - if (step.options && step.options.firstTime) { + if (step.options && step.options['firstTime'] ) { text = Messages[locale].ask_first_time; - } else if (step.options && step.options.isReturning) { + } else if (step.options && step.options['isReturning']) { text = Messages[locale].anything_else; } else if (user.subjects.length > 0) { text = Messages[locale].which_question; diff --git a/packages/kb.gbapp/dialogs/MenuDialog.ts b/packages/kb.gbapp/dialogs/MenuDialog.ts index 6505ccfe8..b020c1893 100644 --- a/packages/kb.gbapp/dialogs/MenuDialog.ts +++ b/packages/kb.gbapp/dialogs/MenuDialog.ts @@ -37,7 +37,7 @@ 'use strict'; -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); import { BotAdapter, CardFactory, MessageFactory } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; @@ -63,8 +63,8 @@ export class MenuDialog extends IGBDialog { const locale = step.context.activity.locale; let rootSubjectId = null; - if (step.options && step.options.data) { - const subject = step.options.data; + if (step.options && step.options['data']) { + const subject = step.options ['data']; // If there is a shortcut specified as subject destination, go there. @@ -89,7 +89,7 @@ export class MenuDialog extends IGBDialog { 'menu', user.subjects ); - await min.conversationalService.sendEvent(step: GBDialogStep, 'play', { + await min.conversationalService.sendEvent(step, 'play', { playerType: 'bullet', data: data.slice(0, 10) }); diff --git a/packages/kb.gbapp/index.ts b/packages/kb.gbapp/index.ts index 4f5af31a1..628c035e2 100644 --- a/packages/kb.gbapp/index.ts +++ b/packages/kb.gbapp/index.ts @@ -36,9 +36,9 @@ 'use strict'; -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); -import { GBMinInstance, IGBPackage } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBPackage } from 'botlib'; import { GuaribasAnswer, GuaribasQuestion, GuaribasSubject } from './models/index'; import { IGBCoreService } from 'botlib'; @@ -49,17 +49,25 @@ import { MenuDialog } from './dialogs/MenuDialog'; export class GBKBPackage implements IGBPackage { public sysPackages: IGBPackage[] = undefined; - public getDialogs(min: GBMinInstance) {} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { core.sequelize.addModels([GuaribasAnswer, GuaribasQuestion, GuaribasSubject]); } - public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void { AskDialog.setup(min.bot, min); FaqDialog.setup(min.bot, min); MenuDialog.setup(min.bot, min); } - public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index c6ceda5de..70250f142 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -34,32 +34,38 @@ * @fileoverview Knowledge base services and logic. */ - const Path = require('path'); const Fs = require('fs'); - -const parse = require('bluebird').promisify(require('csv-parse')); -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); const marked = require('marked'); const path = require('path'); const asyncPromise = require('async-promises'); const walkPromise = require('walk-promise'); -import { Messages } from '../strings'; +// tslint:disable:no-unsafe-any +const parse = require('bluebird').promisify(require('csv-parse')); +// tslint:enable:no-unsafe-any -import { IGBConversationalService, IGBCoreService, IGBInstance } from 'botlib'; +import { GBDialogStep, GBLog, IGBConversationalService, IGBCoreService, IGBInstance } from 'botlib'; import { AzureSearch } from 'pragmatismo-io-framework'; import { Sequelize } from 'sequelize-typescript'; import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GuaribasPackage } from '../../core.gbapp/models/GBModel'; import { GBDeployer } from '../../core.gbapp/services/GBDeployer'; import { GuaribasAnswer, GuaribasQuestion, GuaribasSubject } from '../models'; +import { Messages } from '../strings'; import { GBConfigService } from './../../core.gbapp/services/GBConfigService'; +/** + * Result for quey on KB data. + */ export class KBServiceSearchResults { public answer: GuaribasAnswer; public questionId: number; } +/** + * All services related to knowledge base management. + */ export class KBService { public sequelize: Sequelize; @@ -68,7 +74,7 @@ export class KBService { } public static getFormattedSubjectItems(subjects: GuaribasSubject[]) { - if (!subjects) { + if (subjects !== null) { return ''; } const out = []; @@ -116,7 +122,7 @@ export class KBService { } }); - if (question) { + if (question !== null) { const answer = await GuaribasAnswer.findOne({ where: { instanceId: instanceId, @@ -127,7 +133,7 @@ export class KBService { return Promise.resolve({ question: question, answer: answer }); } - return Promise.resolve(null); + return Promise.resolve(undefined); } public async addAnswer(obj: GuaribasAnswer): Promise { @@ -157,40 +163,39 @@ export class KBService { query = query.replace('/', ' '); query = query.replace('\\', ' '); - if (subjects) { + if (subjects !== null) { const text = KBService.getSubjectItemsSeparatedBySpaces(subjects); - if (text) { + if (text !== null) { query = `${query} ${text}`; } } query = `${query}&$filter=instanceId eq ${instance.instanceId}`; - try { - if (instance.searchKey && GBConfigService.get('STORAGE_DIALECT') === 'mssql') { - const service = new AzureSearch( - instance.searchKey, - instance.searchHost, - instance.searchIndex, - instance.searchIndexer - ); - const results = await service.search(query); - if (results && results.length > 0 && results[0]['@search.score'] >= searchScore) { - const value = await this.getAnswerById(instance.instanceId, results[0].answerId); - if (value) { - return Promise.resolve({ answer: value, questionId: results[0].questionId }); - } else { - return Promise.resolve({ answer: null, questionId: 0 }); - } - } - } else { - const data = await this.getAnswerByText(instance.instanceId, query); - if (data) { - return Promise.resolve({ answer: data.answer, questionId: data.question.questionId }); + + // tslint:disable:no-unsafe-any + if (instance.searchKey !== null && GBConfigService.get('STORAGE_DIALECT') === 'mssql') { + const service = new AzureSearch( + instance.searchKey, + instance.searchHost, + instance.searchIndex, + instance.searchIndexer + ); + const results = await service.search(query); + + if (results && results.length > 0 && results[0]['@search.score'] >= searchScore) { + const value = await this.getAnswerById(instance.instanceId, results[0].answerId); + if (value !== null) { + return Promise.resolve({ answer: value, questionId: results[0].questionId }); } else { - return Promise.resolve({ answer: null, questionId: 0 }); + return Promise.resolve({ answer: undefined, questionId: 0 }); } } - } catch (reason) { - return Promise.reject(new Error(reason)); + } else { + const data = await this.getAnswerByText(instance.instanceId, query); + if (data) { + return Promise.resolve({ answer: data.answer, questionId: data.question.questionId }); + } else { + return Promise.resolve({ answer: undefined, questionId: 0 }); + } } } @@ -203,14 +208,13 @@ export class KBService { } public async getFaqBySubjectArray(from: string, subjects: any): Promise { - if (subjects) { const where = { from: from, - subject1: null, - subject2: null, - subject3: null, - subject4: null + subject1: undefined, + subject2: undefined, + subject3: undefined, + subject4: undefined }; if (subjects[0]) { @@ -291,13 +295,13 @@ export class KBService { let indexer = 0; subjectArray.forEach(element => { - if (indexer == 0) { + if (indexer === 0) { subject1 = subjectArray[indexer].substring(0, 63); - } else if (indexer == 1) { + } else if (indexer === 1) { subject2 = subjectArray[indexer].substring(0, 63); - } else if (indexer == 2) { + } else if (indexer === 2) { subject3 = subjectArray[indexer].substring(0, 63); - } else if (indexer == 3) { + } else if (indexer === 3) { subject4 = subjectArray[indexer].substring(0, 63); } indexer++; @@ -310,7 +314,7 @@ export class KBService { content: answer, format: format, packageId: packageId, - prevId: lastQuestionId ? lastQuestionId : 0 + prevId: lastQuestionId !== null ? lastQuestionId : 0 }); const question1 = await GuaribasQuestion.create({ @@ -326,7 +330,7 @@ export class KBService { packageId: packageId }); - if (lastAnswer && lastQuestionId) { + if (lastAnswer !== null && lastQuestionId !== 0) { await lastAnswer.update({ nextId: lastQuestionId }); } lastAnswer = answer1; @@ -336,21 +340,21 @@ export class KBService { } else { // Skips the header. - return Promise.resolve(null); + return Promise.resolve(undefined); } }); } public async sendAnswer(conversationalService: IGBConversationalService, step: GBDialogStep, answer: GuaribasAnswer) { if (answer.content.endsWith('.mp4')) { - await conversationalService.sendEvent(step: GBDialogStep, 'play', { + await conversationalService.sendEvent(step, 'play', { playerType: 'video', data: answer.content }); - } else if (answer.content.length > 140 && step.context._activity.channelId === 'webchat') { + } else if (answer.content.length > 140 && step.context.activity.channelId === 'webchat') { const locale = step.context.activity.locale; - await step.context.sendActivity(Messages[locale].will_answer_projector); // TODO: Handle rnd. + await step.context.sendActivity(Messages[locale].will_answer_projector); let html = answer.content; if (answer.format === '.md') { @@ -367,7 +371,7 @@ export class KBService { }); html = marked(answer.content); } - await conversationalService.sendEvent(step: GBDialogStep, 'play', { + await conversationalService.sendEvent(step, 'play', { playerType: 'markdown', data: { content: html, @@ -378,7 +382,7 @@ export class KBService { }); } else { await step.context.sendActivity(answer.content); - await conversationalService.sendEvent(step: GBDialogStep, 'stop', null); + await conversationalService.sendEvent(step, 'stop', undefined); } } @@ -409,12 +413,10 @@ export class KBService { } public async importSubjectFile(packageId: number, filename: string, instance: IGBInstance): Promise { - const subjects = JSON.parse(Fs.readFileSync(filename, 'utf8')); + const subjectsLoaded = JSON.parse(Fs.readFileSync(filename, 'utf8')); const doIt = async (subjects: GuaribasSubject[], parentSubjectId: number) => { return asyncPromise.eachSeries(subjects, async item => { - const mediaFilename = item.id + '.png'; - const value = await GuaribasSubject.create({ internalId: item.id, parentSubjectId: parentSubjectId, @@ -434,7 +436,7 @@ export class KBService { }); }; - return doIt(subjects.children, null); + return doIt(subjectsLoaded.children, undefined); } public async undeployKbFromStorage(instance: IGBInstance, deployer: GBDeployer, packageId: number) { diff --git a/packages/security.gblib/index.ts b/packages/security.gblib/index.ts index 12133320e..cd54966ff 100644 --- a/packages/security.gblib/index.ts +++ b/packages/security.gblib/index.ts @@ -36,25 +36,32 @@ 'use strict'; -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); -import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from './models'; export class GBSecurityPackage implements IGBPackage { public sysPackages: IGBPackage[] = undefined; - public getDialogs(min: GBMinInstance) {} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public loadBot(min: GBMinInstance): void { + GBLog.verbose(`loadBot called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { core.sequelize.addModels([GuaribasGroup, GuaribasUser, GuaribasUserGroup]); } - - public unloadPackage(core: IGBCoreService): void {} - - public loadBot(min: GBMinInstance): void {} - - public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} } diff --git a/packages/security.gblib/services/SecService.ts b/packages/security.gblib/services/SecService.ts index 8ced609b2..d1fee375b 100644 --- a/packages/security.gblib/services/SecService.ts +++ b/packages/security.gblib/services/SecService.ts @@ -1,5 +1,5 @@ const Fs = require('fs'); -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); import { GBService, IGBInstance } from 'botlib'; import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from '../models'; diff --git a/packages/whatsapp.gblib/index.ts b/packages/whatsapp.gblib/index.ts index 6a0ca8a9b..fbb4e983d 100644 --- a/packages/whatsapp.gblib/index.ts +++ b/packages/whatsapp.gblib/index.ts @@ -36,9 +36,9 @@ 'use strict'; -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); -import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; +import { GBMinInstance, IGBCoreService, IGBPackage, GBLog, GBDialogStep } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { WhatsappDirectLine } from './services/WhatsappDirectLine'; @@ -47,11 +47,6 @@ export class GBWhatsappPackage implements IGBPackage { public sysPackages: IGBPackage[] = undefined; public channel: WhatsappDirectLine; - public getDialogs(min: GBMinInstance) {} - - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} - - public unloadPackage(core: IGBCoreService): void {} public loadBot(min: GBMinInstance): void { // Only loads engine if it is defined on services.json. @@ -68,6 +63,9 @@ export class GBWhatsappPackage implements IGBPackage { } } - public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} + public getDialogs(min: GBMinInstance) {GBLog.verbose (`getDialogs called.`);} + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {GBLog.verbose (`loadPackage called.`);} + public unloadPackage(core: IGBCoreService): void {GBLog.verbose (`unloadPackage called.`);} + public unloadBot(min: GBMinInstance): void {GBLog.verbose (`unloadBot called.`);} + public onNewSession(min: GBMinInstance, step: GBDialogStep): void {GBLog.verbose (`onNewSession called.`);} } diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts index befb941c7..c3d61aafe 100644 --- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts +++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts @@ -1,8 +1,8 @@ -const UrlJoin = require('url-join'); +import UrlJoin = require('url-join'); const Swagger = require('swagger-client'); const rp = require('request-promise'); -import { GBService } from 'botlib'; +import { GBService, GBLog } from 'botlib'; import * as request from 'request-promise-native'; export class WhatsappDirectLine extends GBService { @@ -67,13 +67,13 @@ export class WhatsappDirectLine extends GBService { const result = await request.post(options); GBLog.info(result); } catch (error) { - GBLog.error('Error initializing 3rd party Whatsapp provider.', error); + GBLog.error(`Error initializing 3rd party Whatsapp provider(1) ${error}`); } return client; }) .catch(err => { - GBLog.error('Error initializing DirectLine client', err); + GBLog.error(`Error initializing 3rd party Whatsapp provider(2) ${err}`); }); } @@ -104,7 +104,7 @@ export class WhatsappDirectLine extends GBService { this.pollMessages(client, conversationId, from, fromName); }) .catch(err => { - console.error('Error starting conversation', err); + GBLog.error(`Error starting conversation ${err}`); }); } else { this.inputMessage(client, conversationId, text, from, fromName); diff --git a/tslint.json b/tslint.json index 7480486c9..10699ef45 100644 --- a/tslint.json +++ b/tslint.json @@ -12,6 +12,8 @@ "rulesDirectory": ["node_modules/tslint-microsoft-contrib"], "jsRules": {}, "rules": { + "no-unsafe-any":false, + "newline-per-chained-call": false, "no-floating-promises": false, "no-var-requires": false, "typedef": false, @@ -24,6 +26,7 @@ "no-redundant-jsdoc": false, "no-return-await": false, "prefer-type-cast": false, + "non-literal-fs-path": false, "no-object-literal-type-assertion": false, "no-increment-decrement": false, "no-any": false, From b9b76ef11f048be5f801031107ed0e42ad281191 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Fri, 8 Mar 2019 19:18:39 -0300 Subject: [PATCH 06/15] fix(general): tslint being applied in all sources. --- packages/admin.gbapp/index.ts | 4 ++-- packages/core.gbapp/dialogs/WhoAmIDialog.ts | 2 +- packages/core.gbapp/services/TSCompiler.ts | 1 + .../customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts | 2 +- packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts | 2 +- packages/kb.gbapp/dialogs/FaqDialog.ts | 2 +- src/app.ts | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/admin.gbapp/index.ts b/packages/admin.gbapp/index.ts index 802fa41b7..cfd99bed9 100644 --- a/packages/admin.gbapp/index.ts +++ b/packages/admin.gbapp/index.ts @@ -36,7 +36,7 @@ 'use strict'; -import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; +import { GBMinInstance, IGBCoreService, IGBPackage, GBDialogStep } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { AdminDialog } from './dialogs/AdminDialog'; import { GuaribasAdmin } from './models/AdminModel'; @@ -54,6 +54,6 @@ export class GBAdminPackage implements IGBPackage { } public loadBot(min: GBMinInstance): void { - AdminDialog.setup(min.bot, min); + AdminDialog.setup(min); } } diff --git a/packages/core.gbapp/dialogs/WhoAmIDialog.ts b/packages/core.gbapp/dialogs/WhoAmIDialog.ts index 7b20eddcc..20d7162e9 100644 --- a/packages/core.gbapp/dialogs/WhoAmIDialog.ts +++ b/packages/core.gbapp/dialogs/WhoAmIDialog.ts @@ -57,7 +57,7 @@ export class WhoAmIDialog extends IGBDialog { if (min.instance.whoAmIVideo) { await step.context.sendActivity(Messages[locale].show_video); - await min.conversationalService.sendEvent(step: GBDialogStep, 'play', { + await min.conversationalService.sendEvent(step, 'play', { playerType: 'video', data: min.instance.whoAmIVideo.trim() }); diff --git a/packages/core.gbapp/services/TSCompiler.ts b/packages/core.gbapp/services/TSCompiler.ts index ccb991abd..7d5185e8a 100644 --- a/packages/core.gbapp/services/TSCompiler.ts +++ b/packages/core.gbapp/services/TSCompiler.ts @@ -37,6 +37,7 @@ 'use strict'; import * as ts from 'typescript'; +import { GBLog } from 'botlib'; export class TSCompiler { diff --git a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts index e66d26e7b..96cdd6e7e 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts @@ -86,7 +86,7 @@ export class FeedbackDialog extends IGBDialog { const locale = step.context.activity.locale; await step.context.sendActivity(Messages[locale].about_suggestions); - step.activeDialog.state.cbId = step.options.id; + step.activeDialog.state.cbId = step.options['id']; return await step.prompt('textPrompt', Messages[locale].what_about_service); }, diff --git a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts index 02eab81e2..09b962fd0 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts @@ -62,7 +62,7 @@ export class QualityDialog extends IGBDialog { const score = step.result; setTimeout( - () => min.conversationalService.sendEvent(step: GBDialogStep, 'stop', null), + () => min.conversationalService.sendEvent(step, 'stop', null), 400 ); diff --git a/packages/kb.gbapp/dialogs/FaqDialog.ts b/packages/kb.gbapp/dialogs/FaqDialog.ts index f837e4cda..f2c18ebb4 100644 --- a/packages/kb.gbapp/dialogs/FaqDialog.ts +++ b/packages/kb.gbapp/dialogs/FaqDialog.ts @@ -59,7 +59,7 @@ export class FaqDialog extends IGBDialog { const data = await service.getFaqBySubjectArray('faq', null); const locale = step.context.activity.locale; if (data) { - await min.conversationalService.sendEvent(step: GBDialogStep, 'play', { + await min.conversationalService.sendEvent(step, 'play', { playerType: 'bullet', data: data.slice(0, 10) }); diff --git a/src/app.ts b/src/app.ts index 3f913f5e1..a5b0ba646 100644 --- a/src/app.ts +++ b/src/app.ts @@ -40,7 +40,7 @@ const logger = require('./logger'); const express = require('express'); const bodyParser = require('body-parser'); -import { IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; +import { IGBCoreService, IGBInstance, IGBPackage, GBLog } from 'botlib'; import { GBAdminService } from '../packages/admin.gbapp/services/GBAdminService'; import { AzureDeployerService } from '../packages/azuredeployer.gbapp/services/AzureDeployerService'; import { GuaribasInstance } from '../packages/core.gbapp/models/GBModel'; From f2d1f69dcf4aa1f8a45da4703f02e1817a3c6fab Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sat, 9 Mar 2019 16:59:31 -0300 Subject: [PATCH 07/15] fix(general): tslint being applied in all sources. --- package-lock.json | 618 ++++++++++++++---- package.json | 8 +- packages/admin.gbapp/dialogs/AdminDialog.ts | 14 +- packages/admin.gbapp/index.ts | 25 +- packages/admin.gbapp/models/AdminModel.ts | 5 +- .../admin.gbapp/services/GBAdminService.ts | 15 +- packages/admin.gbapp/strings.ts | 3 +- packages/analytics.gblib/index.ts | 6 +- packages/analytics.gblib/models/index.ts | 94 +-- .../services/AnalyticsService.ts | 7 +- .../dialogs/StartDialog.ts | 2 +- packages/azuredeployer.gbapp/index.ts | 9 +- .../services/AzureDeployerService.ts | 27 +- packages/console.gblib/index.ts | 12 +- packages/core.gbapp/dialogs/WelcomeDialog.ts | 14 +- packages/core.gbapp/dialogs/WhoAmIDialog.ts | 11 +- packages/core.gbapp/index.ts | 13 +- packages/core.gbapp/models/GBError.ts | 50 ++ packages/core.gbapp/models/GBModel.ts | 19 +- packages/core.gbapp/services/GBAPIService.ts | 20 +- .../core.gbapp/services/GBConfigService.ts | 28 +- .../services/GBConversationalService.ts | 2 +- packages/core.gbapp/services/GBDeployer.ts | 88 +-- .../core.gbapp/services/GBImporterService.ts | 27 +- packages/core.gbapp/services/GBMinService.ts | 68 +- packages/core.gbapp/services/GBVMService.ts | 37 +- packages/core.gbapp/services/TSCompiler.ts | 9 +- packages/core.gbapp/tests/core.test.ts | 8 +- packages/core.gbapp/tests/vm.test.ts | 6 +- .../dialogs/FeedbackDialog.ts | 31 +- .../dialogs/QualityDialog.ts | 12 +- packages/customer-satisfaction.gbapp/index.ts | 11 +- .../models/index.ts | 23 +- .../services/CSService.ts | 5 +- .../default.gbui/public/css/pragmatismo.css | 4 +- packages/default.gbui/public/index.html | 4 +- packages/default.gbui/src/GBUIApp.js | 4 +- .../default.gbui/src/components/ChatPane.js | 4 +- .../default.gbui/src/components/Footer.js | 4 +- packages/default.gbui/src/components/GBCss.js | 4 +- .../default.gbui/src/components/NavBar.js | 4 +- .../src/components/SidebarMenu.js | 4 +- packages/default.gbui/src/index.js | 4 +- .../src/players/GBBulletPlayer.js | 4 +- .../default.gbui/src/players/GBImagePlayer.js | 4 +- .../default.gbui/src/players/GBLoginPlayer.js | 4 +- .../src/players/GBMarkdownPlayer.js | 4 +- .../src/players/GBPowerBIPlayer.js | 4 +- .../default.gbui/src/players/GBVideoPlayer.js | 4 +- packages/kb.gbapp/dialogs/AskDialog.ts | 250 ++++--- packages/kb.gbapp/dialogs/FaqDialog.ts | 12 +- packages/kb.gbapp/dialogs/MenuDialog.ts | 91 ++- packages/kb.gbapp/index.ts | 15 +- packages/kb.gbapp/models/index.ts | 12 +- packages/kb.gbapp/services/KBService.ts | 17 +- packages/security.gblib/index.ts | 9 +- packages/security.gblib/models/index.ts | 11 +- .../security.gblib/services/SecService.ts | 17 +- packages/whatsapp.gblib/index.ts | 34 +- .../services/WhatsappDirectLine.ts | 32 +- src/app.ts | 16 +- tslint.json | 10 +- 62 files changed, 1174 insertions(+), 739 deletions(-) create mode 100644 packages/core.gbapp/models/GBError.ts diff --git a/package-lock.json b/package-lock.json index 7d26985ea..16825fcd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,19 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@azure/ms-rest-js": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.2.6.tgz", + "integrity": "sha512-8cmDpxsQjVdveJwYKtNnkJorxEORLYJu9UHaUvLZA6yHExzDeISHAcSVWE0J05+VkJtqheVHF17M+2ro18Cdnw==", + "requires": { + "axios": "^0.18.0", + "form-data": "^2.3.2", + "tough-cookie": "^2.4.3", + "tslib": "^1.9.2", + "uuid": "^3.2.1", + "xml2js": "^0.4.19" + } + }, "@babel/code-frame": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", @@ -986,6 +999,23 @@ "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz", "integrity": "sha1-hJAPDu/DcnmPR1G1JigwuCCJIuw=" }, + "@microsoft/microsoft-graph-client": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@microsoft/microsoft-graph-client/-/microsoft-graph-client-1.5.2.tgz", + "integrity": "sha512-lUsFLQMmi94r5+Eabmi5FBvlmxsqHPzdqm4suegFmcmnOI5+4OCLADORkRFRJXcWzTKB2ypR9x/mGv7f3r9DzA==", + "requires": { + "es6-promise": "^4.2.6", + "isomorphic-fetch": "^2.2.1", + "tslib": "^1.9.3" + }, + "dependencies": { + "es6-promise": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", + "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==" + } + } + }, "@microsoft/recognizers-text": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text/-/recognizers-text-1.1.4.tgz", @@ -1662,6 +1692,18 @@ "@types/request": "*" } }, + "@types/sequelize": { + "version": "4.27.39", + "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.39.tgz", + "integrity": "sha512-FABh5gLbXgh6/0pmJQ7VzjN5KAxd/IbX3G5Z6fSBZ6DSqaYl7DBP22nGtLh2e6dPmC0rUxfJclNhzQcC3XgvVw==", + "dev": true, + "requires": { + "@types/bluebird": "*", + "@types/continuation-local-storage": "*", + "@types/lodash": "*", + "@types/validator": "*" + } + }, "@types/shelljs": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.2.tgz", @@ -2004,6 +2046,11 @@ "readable-stream": "^2.0.6" } }, + "arg": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz", + "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==" + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -2184,11 +2231,11 @@ "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=" }, "auto-parse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/auto-parse/-/auto-parse-1.5.1.tgz", - "integrity": "sha1-Oszj3pRKL7Xa433MW1s5yHLYeFI=", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/auto-parse/-/auto-parse-1.6.0.tgz", + "integrity": "sha512-bxQzTBuQxezN8G4d2kd8U7ozJ1vUlEFwa7RVbBIL7IH8nxWikCup/JcdMadEFwnHRUFuJrlYo7i0domuFSXp4w==", "requires": { - "typpy": "^2.3.10" + "typpy": "2.3.10" } }, "aws-sign2": { @@ -2256,9 +2303,9 @@ } }, "azure-cognitiveservices-luis-runtime": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/azure-cognitiveservices-luis-runtime/-/azure-cognitiveservices-luis-runtime-1.2.2.tgz", - "integrity": "sha512-qds2UQ85IWMj9w3HXB0BS0MqSyQ50YlVtS6Y1X6aSf2sN1RVvdct6gZnUMREgjDTKgo+/Iwh4MmPVmhvpPUu0A==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/azure-cognitiveservices-luis-runtime/-/azure-cognitiveservices-luis-runtime-1.2.0.tgz", + "integrity": "sha512-8A71ZfDs5uB+t7SX7GdESuAxgAOR+jKmhnRprx09Pk5gfdJd1HSC2moLxUhqJsS1WQ6I+g7ShG7kLXWmQIXQyg==", "requires": { "ms-rest": "^2.5.0" }, @@ -2614,9 +2661,9 @@ }, "dependencies": { "@types/node": { - "version": "9.6.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", - "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" + "version": "9.6.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", + "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" } } }, @@ -2640,22 +2687,28 @@ }, "dependencies": { "@types/node": { - "version": "9.6.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", - "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" + "version": "9.6.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", + "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" }, "botbuilder": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.2.1.tgz", - "integrity": "sha512-58664aLhN1WQwAxMBK7LZQhFh8DHwenvpgz6ADFgeZLZS28NACfX+Uta8k2+WF6RK3g+VKoGOhV/yI71c5ccVg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.2.tgz", + "integrity": "sha512-l7Y83WxytYSBcsFCSoqc8RqXhctnApV131nn72K/mA627DQWAK+M63gYqTFYJBjsO8ok9mNHEzPWQSE9TaJ03Q==", "requires": { "@types/filenamify": "^2.0.1", - "@types/node": "^9.3.0", + "@types/node": "^10.12.18", "async-file": "^2.0.2", - "botbuilder-core": "^4.2.1", - "botframework-connector": "^4.2.1", - "filenamify": "^2.0.0", - "rimraf": "^2.6.2" + "botbuilder-core": "^4.3.2", + "botframework-connector": "^4.3.2", + "filenamify": "^2.0.0" + }, + "dependencies": { + "@types/node": { + "version": "10.12.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", + "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" + } } }, "request-promise-native": { @@ -2684,22 +2737,28 @@ }, "dependencies": { "@types/node": { - "version": "9.6.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", - "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" + "version": "9.6.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", + "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" }, "botbuilder": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.2.1.tgz", - "integrity": "sha512-58664aLhN1WQwAxMBK7LZQhFh8DHwenvpgz6ADFgeZLZS28NACfX+Uta8k2+WF6RK3g+VKoGOhV/yI71c5ccVg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.2.tgz", + "integrity": "sha512-l7Y83WxytYSBcsFCSoqc8RqXhctnApV131nn72K/mA627DQWAK+M63gYqTFYJBjsO8ok9mNHEzPWQSE9TaJ03Q==", "requires": { "@types/filenamify": "^2.0.1", - "@types/node": "^9.3.0", + "@types/node": "^10.12.18", "async-file": "^2.0.2", - "botbuilder-core": "^4.2.1", - "botframework-connector": "^4.2.1", - "filenamify": "^2.0.0", - "rimraf": "^2.6.2" + "botbuilder-core": "^4.3.2", + "botframework-connector": "^4.3.2", + "filenamify": "^2.0.0" + }, + "dependencies": { + "@types/node": { + "version": "10.12.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", + "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" + } } } } @@ -2849,12 +2908,12 @@ } }, "botbuilder-core": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.2.1.tgz", - "integrity": "sha512-U8n+eY9Cjce0GkMyyE0mv4HBjCjtyuczz6usl9XF2N7nY61jYDah4W5e4zqYdLdlqnBwfxG8ptS9pdnmVsC2ww==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.3.2.tgz", + "integrity": "sha512-iKaSjOffhb4b40B3N/k1vjFq0AD5QBtx9/Tg8GdeXgxWtbY0QXiFekU7pKfPBAOS3MhY8h/u7w8SmOnrENk62w==", "requires": { "assert": "^1.4.1", - "botframework-schema": "^4.2.1" + "botframework-schema": "^4.3.2" } }, "botbuilder-core-extensions": { @@ -2943,9 +3002,9 @@ } }, "@types/node": { - "version": "9.6.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", - "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" + "version": "9.6.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", + "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" } } }, @@ -3094,18 +3153,17 @@ } }, "botframework-connector": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botframework-connector/-/botframework-connector-4.2.1.tgz", - "integrity": "sha512-O2RmSG4AFyNc7h9zD2a7kdIBw8jF3Thpl8Pwfs/BpKGhRrCIJAMasV0+UbIV2Iwi2NEl7WzdpXjUsnpmB57XgQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/botframework-connector/-/botframework-connector-4.3.2.tgz", + "integrity": "sha512-nwAAULKFMV2uvXf123R2MRcq3slNMYypBLdoa6KMt6Ri+S2FqVIC4vn+y+pIfFDYbOPOkXErh/JlbunOcfTteA==", "requires": { + "@azure/ms-rest-js": "1.2.6", "@types/jsonwebtoken": "7.2.8", - "@types/node": "^9.3.0", + "@types/node": "^10.12.18", "base64url": "^3.0.0", - "botframework-schema": "^4.2.1", + "botframework-schema": "^4.3.2", "form-data": "^2.3.3", "jsonwebtoken": "8.0.1", - "ms-rest-azure-js": "1.0.176", - "ms-rest-js": "1.0.455", "nock": "^10.0.3", "node-fetch": "^2.2.1", "rsa-pem-from-mod-exp": "^0.8.4" @@ -3120,9 +3178,9 @@ } }, "@types/node": { - "version": "9.6.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", - "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" + "version": "10.12.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", + "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" }, "base64url": { "version": "3.0.1", @@ -3139,19 +3197,6 @@ "mime-types": "^2.1.12" } }, - "ms-rest-js": { - "version": "1.0.455", - "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-1.0.455.tgz", - "integrity": "sha512-RUDnFFNhk4ZdvOACg0yfaxmp5OzNwUcTIwgh/rVBeuNzgA7hOoVh5zFW06XmOtaBHXL2Bu/vWoQtzloEUlv9tw==", - "requires": { - "axios": "^0.18.0", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, "node-fetch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", @@ -3160,33 +3205,9 @@ } }, "botframework-schema": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.2.1.tgz", - "integrity": "sha512-0aJ5UIjs6dKZYdovnlnoIb7+wBId3cubQzwC0tH6S//JhayqrKqMcD8vPPgwZHhBhBx8ZFNmKD3MJtCvZZ1GYA==", - "requires": { - "@types/node": "^9.3.0", - "ms-rest-js": "1.0.455" - }, - "dependencies": { - "@types/node": { - "version": "9.6.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", - "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" - }, - "ms-rest-js": { - "version": "1.0.455", - "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-1.0.455.tgz", - "integrity": "sha512-RUDnFFNhk4ZdvOACg0yfaxmp5OzNwUcTIwgh/rVBeuNzgA7hOoVh5zFW06XmOtaBHXL2Bu/vWoQtzloEUlv9tw==", - "requires": { - "axios": "^0.18.0", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - } - } + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.3.2.tgz", + "integrity": "sha512-++y/EOu52rRz+TWNkFbOu3Dj7fVyXRlrJktMFo6npr2ISnNNntWY5U0U3ouAUDt7aDKRsB1Rcn2LISdS5FRCoA==" }, "botlib": { "version": "0.1.21", @@ -3212,6 +3233,170 @@ "winston": "3.2.1" }, "dependencies": { + "@microsoft/recognizers-text-choice": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-choice/-/recognizers-text-choice-1.1.2.tgz", + "integrity": "sha512-4hFdqxusM0YrOXYM2RVYPl2rLjItSh6VkRiACjWB95GKC/DBGjJRYQpTxhzuZAsJSkDMinu/aLf8DvQtwUaLtA==", + "requires": { + "@microsoft/recognizers-text": "~1.1.2", + "grapheme-splitter": "^1.0.2" + } + }, + "@microsoft/recognizers-text-number": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-number/-/recognizers-text-number-1.1.2.tgz", + "integrity": "sha512-GESjSF42dllym83diyd6pmlzFwdzidewoq/qSQz89lSoTx9HdJQHjbXxwdBp7w4Ax/Jroo2lcAedM3B7alZhYQ==", + "requires": { + "@microsoft/recognizers-text": "~1.1.2", + "bignumber.js": "^7.2.1", + "lodash.escaperegexp": "^4.1.2", + "lodash.sortby": "^4.7.0", + "lodash.trimend": "^4.5.1" + } + }, + "@microsoft/recognizers-text-suite": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-suite/-/recognizers-text-suite-1.1.2.tgz", + "integrity": "sha512-w3WCsKa//64jE1fGPFlV02rRg9+b3oDp+K5/skPAn4KDr80LjXxD1ulIgiJ2Ll/2OoBl8ociCiCjYA7zS3LpdQ==", + "requires": { + "@microsoft/recognizers-text": "~1.1.2", + "@microsoft/recognizers-text-choice": "~1.1.2", + "@microsoft/recognizers-text-date-time": "~1.1.2", + "@microsoft/recognizers-text-number": "~1.1.2", + "@microsoft/recognizers-text-number-with-unit": "~1.1.2", + "@microsoft/recognizers-text-sequence": "~1.1.2" + } + }, + "@types/node": { + "version": "9.6.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", + "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" + }, + "botbuilder": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.1.7.tgz", + "integrity": "sha512-AlZhvjeqiCpeWGN1TkqBi09l6f0spYIh0Xzc4rJYF8feCFi4k2FEYC1IpiiOAtYhEBeQ9SOGFcUUwPaLmsI3Xg==", + "requires": { + "@types/filenamify": "^2.0.1", + "@types/node": "^9.3.0", + "async-file": "^2.0.2", + "botbuilder-core": "^4.1.7", + "botframework-connector": "^4.1.7", + "filenamify": "^2.0.0", + "rimraf": "^2.6.2" + } + }, + "botbuilder-ai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.2.0.tgz", + "integrity": "sha512-dt2OydZ9pWyMSNgha3PlC6lBq3sXUXAYmadqogNqvWpYEmIMdBOCUc02Vn2w1suxLX84GdYqdBI2klwrRZ7oKg==", + "requires": { + "@microsoft/recognizers-text-date-time": "1.1.2", + "@types/html-entities": "^1.2.16", + "@types/node": "^9.3.0", + "@types/request-promise-native": "^1.0.10", + "azure-cognitiveservices-luis-runtime": "^1.0.0", + "botbuilder": "^4.2.0", + "html-entities": "^1.2.1", + "moment": "^2.20.1", + "ms-rest": "^2.3.6", + "mstranslator": "^3.0.0", + "request": "^2.87.0", + "request-promise-native": "1.0.5" + }, + "dependencies": { + "botbuilder": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.2.tgz", + "integrity": "sha512-l7Y83WxytYSBcsFCSoqc8RqXhctnApV131nn72K/mA627DQWAK+M63gYqTFYJBjsO8ok9mNHEzPWQSE9TaJ03Q==", + "requires": { + "@types/filenamify": "^2.0.1", + "@types/node": "^10.12.18", + "async-file": "^2.0.2", + "botbuilder-core": "^4.3.2", + "botframework-connector": "^4.3.2", + "filenamify": "^2.0.0" + }, + "dependencies": { + "@types/node": { + "version": "10.12.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", + "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" + } + } + } + } + }, + "botbuilder-azure": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.2.0.tgz", + "integrity": "sha512-WL8dHtVESE/qTFTGcJwlFeKyUeewoyoNr5ENavu1W40N8UjZB32ivmX2dvd0Zm4TIbeBwgmomF2gE9rE+0Rv3w==", + "requires": { + "@types/node": "^9.3.0", + "azure-storage": "^2.10.2", + "botbuilder": "^4.2.0", + "documentdb": "1.14.5", + "flat": "^4.0.0", + "semaphore": "^1.1.0" + }, + "dependencies": { + "botbuilder": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.2.tgz", + "integrity": "sha512-l7Y83WxytYSBcsFCSoqc8RqXhctnApV131nn72K/mA627DQWAK+M63gYqTFYJBjsO8ok9mNHEzPWQSE9TaJ03Q==", + "requires": { + "@types/filenamify": "^2.0.1", + "@types/node": "^10.12.18", + "async-file": "^2.0.2", + "botbuilder-core": "^4.3.2", + "botframework-connector": "^4.3.2", + "filenamify": "^2.0.0" + }, + "dependencies": { + "@types/node": { + "version": "10.12.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", + "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" + } + } + } + } + }, + "botbuilder-dialogs": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.2.0.tgz", + "integrity": "sha512-wi7Vk/mRHqsjNVhCbXK6yoYsQ7uS7EySM+bcDRthw5uDQ9LyHHoRg3wzT+mqbfjzwgpKR/TXxPUDM4nDL8Hz+Q==", + "requires": { + "@microsoft/recognizers-text-choice": "1.1.2", + "@microsoft/recognizers-text-date-time": "1.1.2", + "@microsoft/recognizers-text-number": "1.1.2", + "@microsoft/recognizers-text-suite": "1.1.2", + "@types/node": "^9.3.0", + "botbuilder-core": "^4.2.0" + } + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "dotenv-extended": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/dotenv-extended/-/dotenv-extended-2.3.0.tgz", + "integrity": "sha512-QrFPzMr25tkdEesy2vJQDk0Yqs1Wy0IWSngaU/QNnQfukG735kXp3K+YfW6CMcR/N/3BGw5oIqyBLtGU8a5SZQ==", + "requires": { + "@types/dotenv": "^4.0.0", + "auto-parse": "^1.3.0", + "camelcase": "5.0.0", + "cross-spawn": "6.0.5", + "dotenv": "6.0.0", + "is-windows": "^1.0.0", + "lodash": "^4.17.10" + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -3219,6 +3404,45 @@ "requires": { "safer-buffer": ">= 2.1.2 < 3" } + }, + "request-promise-native": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", + "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", + "requires": { + "request-promise-core": "1.1.1", + "stealthy-require": "^1.1.0", + "tough-cookie": ">=2.3.3" + } + }, + "sequelize": { + "version": "4.42.1", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.42.1.tgz", + "integrity": "sha512-W9i/CkBjCHLzEkJQkaxXaK82MA16b7F74PjtE7EUR+d7WU/X3U+YU5givWR+/VRXay1VXDyBOfXgw9/zdhDSDg==", + "requires": { + "bluebird": "^3.5.0", + "cls-bluebird": "^2.1.0", + "debug": "^3.1.0", + "depd": "^1.1.0", + "dottie": "^2.0.0", + "generic-pool": "3.5.0", + "inflection": "1.12.0", + "lodash": "^4.17.1", + "moment": "^2.20.0", + "moment-timezone": "^0.5.14", + "retry-as-promised": "^2.3.2", + "semver": "^5.5.0", + "terraformer-wkt-parser": "^1.1.2", + "toposort-class": "^1.0.1", + "uuid": "^3.2.1", + "validator": "^10.4.0", + "wkx": "^0.4.1" + } + }, + "validator": { + "version": "10.11.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", + "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==" } } }, @@ -3802,6 +4026,11 @@ "restore-cursor": "^2.0.0" } }, + "cli-spinner": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/cli-spinner/-/cli-spinner-0.2.10.tgz", + "integrity": "sha512-U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q==" + }, "cli-table": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", @@ -4076,6 +4305,11 @@ "delayed-stream": "~1.0.0" } }, + "commander": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", + "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==" + }, "commitizen": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-3.0.7.tgz", @@ -4262,6 +4496,15 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, + "config-chain": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", + "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "requires": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, "configstore": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", @@ -5253,12 +5496,12 @@ "dotenv": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.0.0.tgz", - "integrity": "sha1-JON8BBdBxfSyUySVjrvDS8qWWTU=" + "integrity": "sha512-FlWbnhgjtwD+uNLUGHbMykMOYQaTivdHEmYwAKFjn6GKe/CqY0fNae93ZHTd20snh9ZLr8mTzIL9m0APQ1pjQg==" }, "dotenv-extended": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/dotenv-extended/-/dotenv-extended-2.3.0.tgz", - "integrity": "sha1-fCWVHKt+Ib0XFbhxG0GD308tx6M=", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/dotenv-extended/-/dotenv-extended-2.4.0.tgz", + "integrity": "sha512-OJmXoMk3YpxsGAibLUi4F8Uu2CN9wtDO/Uqv9kWx1bL6qXcku1jq+hk5wTaX7UVcpcl5rCbUrvN9nv0bOXC/Kw==", "requires": { "@types/dotenv": "^4.0.0", "auto-parse": "^1.3.0", @@ -5311,6 +5554,38 @@ "safe-buffer": "^5.0.1" } }, + "editorconfig": { + "version": "0.15.3", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", + "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", + "requires": { + "commander": "^2.19.0", + "lru-cache": "^4.1.5", + "semver": "^5.6.0", + "sigmund": "^1.0.1" + }, + "dependencies": { + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "semver": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + } + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -8205,6 +8480,15 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" + } + }, "isomorphic-form-data": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-0.0.1.tgz", @@ -8274,6 +8558,33 @@ "integrity": "sha512-CpKJh9VRNhS+XqZtg1UMejETGEiqwCGDC/uwPEEQwc2nfdbSm73SIE29TplG2gLYuBOOTNDqxzG6A9NtEPLt0w==", "dev": true }, + "js-beautify": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.0.tgz", + "integrity": "sha512-P0skmY4IDjfLiVrx+GLDeme8w5G0R1IGXgccVU5HP2VM3lRblH7qN2LTea5vZAxrDjpZBD0Jv+ahpjwVcbz/rw==", + "requires": { + "config-chain": "^1.1.12", + "editorconfig": "^0.15.2", + "glob": "^7.1.3", + "mkdirp": "~0.5.0", + "nopt": "~4.0.1" + }, + "dependencies": { + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, "js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", @@ -8898,6 +9209,11 @@ "pify": "^3.0.0" } }, + "make-error": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", + "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==" + }, "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -9474,30 +9790,6 @@ } } }, - "ms-rest-azure-js": { - "version": "1.0.176", - "resolved": "https://registry.npmjs.org/ms-rest-azure-js/-/ms-rest-azure-js-1.0.176.tgz", - "integrity": "sha512-qtEBpSf/1nJ0/m1jGLkHISRnpOeHUp5n4SvzZRdFeYnGF4SQx9v/fl8a8ZwEmyujmgbUwyLNM9qKpH5PmW7pZg==", - "requires": { - "ms-rest-js": "^1.0.443", - "tslib": "^1.9.2" - }, - "dependencies": { - "ms-rest-js": { - "version": "1.0.465", - "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-1.0.465.tgz", - "integrity": "sha512-MMSmxy6yd/EcxcKxdKy13SckcjBWSgcFkO2Ggibw0wQvZKr3DDaOGOaivElfdRkA+djacZLl4A912MNT5VhBPA==", - "requires": { - "axios": "^0.18.0", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - } - } - }, "ms-rest-js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-1.0.1.tgz", @@ -14740,6 +15032,11 @@ "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz", "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=" }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + }, "protocols": { "version": "1.4.6", "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.6.tgz", @@ -15937,9 +16234,9 @@ } }, "sequelize": { - "version": "4.42.1", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.42.1.tgz", - "integrity": "sha512-W9i/CkBjCHLzEkJQkaxXaK82MA16b7F74PjtE7EUR+d7WU/X3U+YU5givWR+/VRXay1VXDyBOfXgw9/zdhDSDg==", + "version": "4.43.0", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.43.0.tgz", + "integrity": "sha512-GkwGFVREKBf/ql6W6RXwXy1fzb/HOk0lmOBbcQrJMvJtB65Jfg7CUh+sENh0deuWk5s79JedgZJ/yEjvtzHXaQ==", "requires": { "bluebird": "^3.5.0", "cls-bluebird": "^2.1.0", @@ -16092,6 +16389,11 @@ } } }, + "sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -16433,7 +16735,6 @@ "version": "0.5.10", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", - "dev": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -16442,8 +16743,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -17520,11 +17820,73 @@ "semver": "^5.0.1" } }, + "ts-node": { + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.3.tgz", + "integrity": "sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==", + "requires": { + "arg": "^4.1.0", + "diff": "^3.1.0", + "make-error": "^1.1.1", + "source-map-support": "^0.5.6", + "yn": "^3.0.0" + } + }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", "integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=" }, + "tslint": { + "version": "5.13.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.13.1.tgz", + "integrity": "sha512-fplQqb2miLbcPhyHoMV4FU9PtNRbgmm/zI5d3SZwwmJQM6V0eodju+hplpyfhLWpmwrDNfNYU57uYRb8s0zZoQ==", + "dev": true, + "requires": { + "babel-code-frame": "^6.22.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.7.0", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.27.2" + } + }, + "tslint-microsoft-contrib": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tslint-microsoft-contrib/-/tslint-microsoft-contrib-6.1.0.tgz", + "integrity": "sha512-8DgmiPTgNQSYTjrKKv/h1aHnDd7EkGAjTxatrjfSDp5jUXENGI7Qj7qi7T8xBdTZN9Z3nb80u0NhdBBOMcQFHg==", + "dev": true, + "requires": { + "tsutils": "^2.27.2 <2.29.0" + }, + "dependencies": { + "tsutils": { + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.28.0.tgz", + "integrity": "sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } + } + }, + "tsutils": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + }, "tunnel": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz", @@ -18059,6 +18421,11 @@ } } }, + "whatwg-fetch": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", + "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" + }, "whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", @@ -18577,6 +18944,11 @@ } } } + }, + "yn": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.0.0.tgz", + "integrity": "sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==" } } } diff --git a/package.json b/package.json index 8c5c757e3..d9123a41f 100644 --- a/package.json +++ b/package.json @@ -59,11 +59,11 @@ "azure-arm-website": "5.7.0", "bluebird": "^3.5.3", "body-parser": "1.18.3", - "botbuilder": "4.3.2", - "botbuilder-ai": "4.3.2", - "botbuilder-azure": "4.3.2", + "botbuilder": "4.1.7", + "botbuilder-ai": "4.2.0", + "botbuilder-azure": "4.2.0", "botbuilder-choices": "4.0.0-preview1.2", - "botbuilder-dialogs": "4.3.2", + "botbuilder-dialogs": "4.2.0", "botbuilder-prompts": "4.0.0-preview1.2", "botlib": "^0.1.21", "chai": "4.2.0", diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts index d385f1754..eb27b4d4b 100644 --- a/packages/admin.gbapp/dialogs/AdminDialog.ts +++ b/packages/admin.gbapp/dialogs/AdminDialog.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -38,7 +38,7 @@ import { WaterfallDialog } from 'botbuilder-dialogs'; import { GBMinInstance, IGBDialog } from 'botlib'; -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GBConfigService } from '../../core.gbapp/services/GBConfigService'; import { GBDeployer } from '../../core.gbapp/services/GBDeployer'; @@ -53,7 +53,7 @@ export class AdminDialog extends IGBDialog { const packageName = text.split(' ')[1]; const importer = new GBImporter(min.core); const deployer = new GBDeployer(min.core, importer); - await deployer.undeployPackageFromLocalPath(min.instance, UrlJoin('packages', packageName)); + await deployer.undeployPackageFromLocalPath(min.instance, urlJoin('packages', packageName)); } public static isSharePointPath(path: string) { @@ -63,14 +63,12 @@ export class AdminDialog extends IGBDialog { public static async deployPackageCommand(min: GBMinInstance, text: string, deployer: GBDeployer) { const packageName = text.split(' ')[1]; - if (AdminDialog.isSharePointPath(packageName)) { - await deployer.deployFromSharePoint(min.instance.instanceId, packageName); - } else { + if (!AdminDialog.isSharePointPath(packageName)) { const additionalPath = GBConfigService.get('ADDITIONAL_DEPLOY_PATH'); if (additionalPath !== undefined) { throw new Error('ADDITIONAL_DEPLOY_PATH is not set and deployPackage was called.'); } - await deployer.deployPackageFromLocalPath(min, UrlJoin(additionalPath, packageName)); + await deployer.deployPackage(min, urlJoin(additionalPath, packageName)); } } @@ -207,7 +205,7 @@ export class AdminDialog extends IGBDialog { const url = `https://login.microsoftonline.com/${ min.instance.authenticatorTenant - }/oauth2/authorize?client_id=${min.instance.authenticatorClientId}&response_type=code&redirect_uri=${UrlJoin( + }/oauth2/authorize?client_id=${min.instance.authenticatorClientId}&response_type=code&redirect_uri=${urlJoin( min.instance.botEndpoint, min.instance.botId, '/token' diff --git a/packages/admin.gbapp/index.ts b/packages/admin.gbapp/index.ts index cfd99bed9..a23622a9a 100644 --- a/packages/admin.gbapp/index.ts +++ b/packages/admin.gbapp/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,18 +36,29 @@ 'use strict'; -import { GBMinInstance, IGBCoreService, IGBPackage, GBDialogStep } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { AdminDialog } from './dialogs/AdminDialog'; import { GuaribasAdmin } from './models/AdminModel'; +/** + * The package for admin.gbapp. + */ export class GBAdminPackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; - public unloadPackage(core: IGBCoreService): void {} - public getDialogs(min: GBMinInstance) {} - public unloadBot(min: GBMinInstance): void {} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { core.sequelize.addModels([GuaribasAdmin]); diff --git a/packages/admin.gbapp/models/AdminModel.ts b/packages/admin.gbapp/models/AdminModel.ts index 99cd37c42..bac6116bf 100644 --- a/packages/admin.gbapp/models/AdminModel.ts +++ b/packages/admin.gbapp/models/AdminModel.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -45,6 +45,9 @@ import { UpdatedAt } from 'sequelize-typescript'; +/** + * General settings store. + */ @Table export class GuaribasAdmin extends Model { diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts index f844a299e..a3a481d16 100644 --- a/packages/admin.gbapp/services/GBAdminService.ts +++ b/packages/admin.gbapp/services/GBAdminService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -37,8 +37,8 @@ 'use strict'; import { AuthenticationContext, TokenResponse } from 'adal-node'; -import { IGBAdminService, IGBCoreService } from 'botlib'; -import UrlJoin = require('url-join'); +import { IGBAdminService, IGBCoreService, IGBInstance } from 'botlib'; +import urlJoin = require('url-join'); import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; import { GuaribasAdmin } from '../models/AdminModel'; const msRestAzure = require('ms-rest-azure'); @@ -70,7 +70,6 @@ export class GBAdminService implements IGBAdminService { } public static async getADALCredentialsFromUsername(username: string, password: string) { - return await msRestAzure.loginWithUsernamePassword(username, password); } @@ -101,7 +100,7 @@ export class GBAdminService implements IGBAdminService { maximumLength: 14 }; - return passwordGenerator.generatePassword(options); + return passwordGenerator.generatePassword(options); } public async setValue(instanceId: number, key: string, value: string) { @@ -123,7 +122,7 @@ export class GBAdminService implements IGBAdminService { authenticatorAuthorityHostUrl: string, authenticatorClientId: string, authenticatorClientSecret: string - ): Promise { + ): Promise { const options = { where: {} }; options.where = { instanceId: instanceId }; const item = await GuaribasInstance.findOne(options); @@ -135,7 +134,7 @@ export class GBAdminService implements IGBAdminService { return item.save(); } - public async getValue(instanceId: number, key: string) { + public async getValue(instanceId: number, key: string): Promise { const options = { where: {} }; options.where = { key: key, instanceId: instanceId }; const obj = await GuaribasAdmin.findOne(options); @@ -152,7 +151,7 @@ export class GBAdminService implements IGBAdminService { const accessToken = await this.getValue(instanceId, 'accessToken'); resolve(accessToken); } else { - const authorizationUrl = UrlJoin( + const authorizationUrl = urlJoin( instance.authenticatorAuthorityHostUrl, instance.authenticatorTenant, '/oauth2/authorize' diff --git a/packages/admin.gbapp/strings.ts b/packages/admin.gbapp/strings.ts index 0775e9ed9..30beca962 100644 --- a/packages/admin.gbapp/strings.ts +++ b/packages/admin.gbapp/strings.ts @@ -16,7 +16,8 @@ export const Messages = { 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): ', - enter_authenticator_client_id: 'Enter the Client Id [Application Id](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredAppsPreview) GUID:', + enter_authenticator_client_id: `Enter the Client Id GUID: Get from + [this url](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredAppsPreview)`, enter_authenticator_client_secret: 'Enter the Client Secret:' }, 'pt-BR': { diff --git a/packages/analytics.gblib/index.ts b/packages/analytics.gblib/index.ts index 91e07bed7..6e123cb44 100644 --- a/packages/analytics.gblib/index.ts +++ b/packages/analytics.gblib/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,14 +36,14 @@ 'use strict'; -import { GBDialogStep, GBMinInstance, IGBCoreService, IGBPackage, GBLog } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; /** * .gblib Package handler. */ export class GBAnalyticsPackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; public getDialogs(min: GBMinInstance) { GBLog.verbose(`getDialogs called.`); } diff --git a/packages/analytics.gblib/models/index.ts b/packages/analytics.gblib/models/index.ts index 63b148b3d..34d4a4c71 100644 --- a/packages/analytics.gblib/models/index.ts +++ b/packages/analytics.gblib/models/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -65,6 +65,56 @@ import { GuaribasChannel, GuaribasInstance } from '../../core.gbapp/models/GBMod import { GuaribasSubject } from '../../kb.gbapp/models'; import { GuaribasUser } from '../../security.gblib/models'; +/** + * A single message in a conversation. + */ +@Table +export class GuaribasConversationMessage extends Model { + + @PrimaryKey + @AutoIncrement + @Column + public conversationMessageId: number; + + @ForeignKey(() => GuaribasSubject) + @Column + public subjectId: number; + + @Column(DataType.TEXT) + public content: string; + + @Column + @CreatedAt + public createdAt: Date; + + @Column + @UpdatedAt + public updatedAt: Date; + + //tslint:disable-next-line:no-use-before-declare + @ForeignKey(() => GuaribasConversation) + @Column + public conversationId: number; + + //tslint:disable-next-line:no-use-before-declare + @BelongsTo(() => GuaribasConversation) + public conversation: GuaribasConversation; + + @ForeignKey(() => GuaribasInstance) + @Column + public instanceId: number; + + @ForeignKey(() => GuaribasUser) + @Column + public userId: number; + + @BelongsTo(() => GuaribasUser) + public user: GuaribasUser; +} + +/** + * A conversation that groups many messages. + */ @Table export class GuaribasConversation extends Model { @@ -106,45 +156,3 @@ export class GuaribasConversation extends Model { @BelongsTo(() => GuaribasUser) public startedBy: GuaribasUser; } - -@Table -export class GuaribasConversationMessage extends Model { - - @PrimaryKey - @AutoIncrement - @Column - public conversationMessageId: number; - - @ForeignKey(() => GuaribasSubject) - @Column - public subjectId: number; - - @Column(DataType.TEXT) - public content: string; - - @Column - @CreatedAt - public createdAt: Date; - - @Column - @UpdatedAt - public updatedAt: Date; - - @ForeignKey(() => GuaribasConversation) - @Column - public conversationId: number; - - @BelongsTo(() => GuaribasConversation) - public conversation: GuaribasConversation; - - @ForeignKey(() => GuaribasInstance) - @Column - public instanceId: number; - - @ForeignKey(() => GuaribasUser) - @Column - public userId: number; - - @BelongsTo(() => GuaribasUser) - public user: GuaribasUser; -} diff --git a/packages/analytics.gblib/services/AnalyticsService.ts b/packages/analytics.gblib/services/AnalyticsService.ts index abefd2bc4..2a12eccff 100644 --- a/packages/analytics.gblib/services/AnalyticsService.ts +++ b/packages/analytics.gblib/services/AnalyticsService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -37,6 +37,9 @@ import { GuaribasUser } from '../../security.gblib/models'; import { GuaribasConversation, GuaribasConversationMessage } from '../models'; +/** + * Base services for Bot Analytics. + */ export class AnalyticsService { public async createConversation( user: GuaribasUser @@ -52,7 +55,7 @@ export class AnalyticsService { }); } - public createMessage( + public async createMessage( conversation: GuaribasConversation, user: GuaribasUser, content: string diff --git a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts index dbfe0b186..8912dabfc 100644 --- a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts +++ b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | diff --git a/packages/azuredeployer.gbapp/index.ts b/packages/azuredeployer.gbapp/index.ts index 13563ab12..4ddaff36e 100644 --- a/packages/azuredeployer.gbapp/index.ts +++ b/packages/azuredeployer.gbapp/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,11 +36,14 @@ 'use strict'; -import { GBMinInstance, IGBCoreService, IGBPackage, GBLog, GBDialogStep } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; +/** + * Package for Azure Deployer. + */ export class GBAzureDeployerPackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; public getDialogs(min: GBMinInstance) { GBLog.verbose(`getDialogs called.`); } diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 735b3c273..d59c2bf6b 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -54,7 +54,7 @@ const Spinner = require('cli-spinner').Spinner; // tslint:disable-next-line:no-submodule-imports import { CognitiveServicesAccount } from 'azure-arm-cognitiveservices/lib/models'; -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); const iconUrl = 'https://github.com/pragmatismo-io/BotServer/blob/master/docs/images/generalbots-logo-squared.png'; const publicIp = require('public-ip'); @@ -89,7 +89,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { req.headers = {}; req.headers['Content-Type'] = 'application/json'; req.headers['accept-language'] = '*'; - req.headers['Authorization'] = `Bearer ${accessToken}`; + req.headers.set(' Authorization', `Bearer ${accessToken}`); req.body = body; return req; @@ -220,10 +220,11 @@ export class AzureDeployerService implements IGBInstallationDeployer { const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${ this.provider }/botServices/${botId}?api-version=${this.apiVersion}`; - const url = UrlJoin(baseUrl, query); + const url = urlJoin(baseUrl, query); const req = AzureDeployerService.createRequestObject(url, accessToken, 'PATCH', JSON.stringify(parameters)); const res = await httpClient.sendRequest(req); - if (!(res['bodyAsJson'] as any).id) { + // CHECK + if (!JSON.parse(res.bodyAsText).id) { throw res.bodyAsText; } GBLog.info(`Bot proxy updated at: ${endpoint}.`); @@ -399,7 +400,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { private async registerProviders(subscriptionId, baseUrl, accessToken) { const query = `subscriptions/${subscriptionId}/providers/${this.provider}/register?api-version=2018-02-01`; - const requestUrl = UrlJoin(baseUrl, query); + const requestUrl = urlJoin(baseUrl, query); const req = new WebResource(); req.method = 'POST'; @@ -407,7 +408,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { req.headers = {}; req.headers['Content-Type'] = 'application/json; charset=utf-8'; req.headers['accept-language'] = '*'; - req.headers['Authorization'] = `Bearer ${accessToken}`; + req.headers.set('Authorization', `Bearer ${accessToken}`); } /** @@ -461,10 +462,10 @@ export class AzureDeployerService implements IGBInstallationDeployer { let query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${ this.provider }/botServices/${botId}?api-version=${this.apiVersion}`; - let url = UrlJoin(baseUrl, query); + let url = urlJoin(baseUrl, query); let req = AzureDeployerService.createRequestObject(url, accessToken, 'PUT', JSON.stringify(parameters)); const res = await httpClient.sendRequest(req); - if (!(res['bodyAsJson'] as any).id) { + if (!JSON.parse(res.bodyAsText).id) { reject(res.bodyAsText); return; @@ -476,10 +477,10 @@ export class AzureDeployerService implements IGBInstallationDeployer { query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/Microsoft.BotService/botServices/${botId}/channels/WebChatChannel/listChannelWithKeys?api-version=${ this.apiVersion }`; - url = UrlJoin(baseUrl, query); + url = urlJoin(baseUrl, query); req = AzureDeployerService.createRequestObject(url, accessToken, 'GET', JSON.stringify(parameters)); const resChannel = await httpClient.sendRequest(req); - const key = (resChannel['bodyAsJson'] as any).properties.properties.sites[0].key; + const key = JSON.parse(resChannel.bodyAsText).properties.properties.sites[0].key; instance.webchatKey = key; resolve(instance); } catch (error) { @@ -504,7 +505,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { const body = JSON.stringify(parameters); const apps = await this.makeNlpRequest(location, authoringKey, undefined, 'GET', 'apps'); - const app = (apps['bodyAsJson'] as any).filter(x => x.name === name)[0]; + const app = JSON.parse(apps.bodyAsText).filter(x => x.name === name)[0]; let id: string; if (!app) { const res = await this.makeNlpRequest(location, authoringKey, body, 'POST', 'apps'); @@ -526,7 +527,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { const req = new WebResource(); req.method = method; req.url = `https://${location}.api.cognitive.microsoft.com/luis/api/v2.0/${resource}`; - req.headers = {}; + req.headers = {}; req.headers['Content-Type'] = 'application/json'; req.headers['accept-language'] = '*'; req.headers['Ocp-Apim-Subscription-Key'] = authoringKey; diff --git a/packages/console.gblib/index.ts b/packages/console.gblib/index.ts index b76df96db..338cf243e 100644 --- a/packages/console.gblib/index.ts +++ b/packages/console.gblib/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,15 +36,15 @@ 'use strict'; -import UrlJoin = require('url-join'); - -import { GBMinInstance, IGBCoreService, IGBPackage, GBLog, GBDialogStep } from 'botlib'; - +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { ConsoleDirectLine } from './services/ConsoleDirectLine'; +/** + * Package for console.glib. + */ export class GBConsolePackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; public channel: ConsoleDirectLine; public getDialogs(min: GBMinInstance) { GBLog.verbose(`getDialogs called.`); diff --git a/packages/core.gbapp/dialogs/WelcomeDialog.ts b/packages/core.gbapp/dialogs/WelcomeDialog.ts index ced210bba..cfc026f70 100644 --- a/packages/core.gbapp/dialogs/WelcomeDialog.ts +++ b/packages/core.gbapp/dialogs/WelcomeDialog.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -38,10 +38,12 @@ import { BotAdapter } from 'botbuilder'; import {WaterfallDialog } from 'botbuilder-dialogs'; -import { IGBDialog } from 'botlib'; -import { GBMinInstance } from 'botlib'; +import { GBMinInstance, IGBDialog } from 'botlib'; import { Messages } from '../strings'; +/** + * Dialog for Welcoming people. + */ export class WelcomeDialog extends IGBDialog { /** * Setup dialogs flows and define services call. @@ -73,9 +75,9 @@ export class WelcomeDialog extends IGBDialog { await step.replaceDialog('/ask', { firstTime: true }); if ( - step.context.activity && - step.context.activity.type == 'message' && - step.context.activity.text != '' + step.context.activity !== undefined && + step.context.activity.type === 'message' && + step.context.activity.text !== '' ) { await step.replaceDialog('/answer', { query: step.context.activity.text }); } diff --git a/packages/core.gbapp/dialogs/WhoAmIDialog.ts b/packages/core.gbapp/dialogs/WhoAmIDialog.ts index 20d7162e9..201334cb7 100644 --- a/packages/core.gbapp/dialogs/WhoAmIDialog.ts +++ b/packages/core.gbapp/dialogs/WhoAmIDialog.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -38,10 +38,11 @@ import { BotAdapter } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { IGBDialog } from 'botlib'; -import { GBMinInstance } from 'botlib'; +import { GBMinInstance, IGBDialog } from 'botlib'; import { Messages } from '../strings'; - +/** + * Dialog for the bot explains about itself. + */ export class WhoAmIDialog extends IGBDialog { /** * Setup dialogs flows and define services call. @@ -55,7 +56,7 @@ export class WhoAmIDialog extends IGBDialog { const locale = step.context.activity.locale; await step.context.sendActivity(`${min.instance.description}`); - if (min.instance.whoAmIVideo) { + if (min.instance.whoAmIVideo !== undefined) { await step.context.sendActivity(Messages[locale].show_video); await min.conversationalService.sendEvent(step, 'play', { playerType: 'video', diff --git a/packages/core.gbapp/index.ts b/packages/core.gbapp/index.ts index 94f227cb5..1fcf4e03a 100644 --- a/packages/core.gbapp/index.ts +++ b/packages/core.gbapp/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,19 +36,18 @@ 'use strict'; -import UrlJoin = require('url-join'); - -import { GBMinInstance, IGBPackage, GBLog, GBDialogStep } from 'botlib'; - -import { IGBCoreService } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { WelcomeDialog } from './dialogs/WelcomeDialog'; import { WhoAmIDialog } from './dialogs/WhoAmIDialog'; import { GuaribasChannel, GuaribasException, GuaribasInstance, GuaribasPackage } from './models/GBModel'; +/** + * Package for core.gbapp. + */ export class GBCorePackage implements IGBPackage { public static CurrentEngineName = 'guaribas-1.0.0'; - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { core.sequelize.addModels([GuaribasInstance, GuaribasPackage, GuaribasChannel, GuaribasException]); } diff --git a/packages/core.gbapp/models/GBError.ts b/packages/core.gbapp/models/GBError.ts new file mode 100644 index 000000000..a0c8366a8 --- /dev/null +++ b/packages/core.gbapp/models/GBError.ts @@ -0,0 +1,50 @@ +/*****************************************************************************\ +| ( )_ _ | +| _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | +| ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | +| | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | +| | | ( )_) | | +| (_) \___/' | +| | +| General Bots Copyright (c) Pragmatismo.io. All rights reserved. | +| Licensed under the AGPL-3.0. | +| | +| According to our dual licensing model, this program can be used either | +| under the terms of the GNU Affero General Public License, version 3, | +| or under a proprietary license. | +| | +| The texts of the GNU Affero General Public License with an additional | +| permission and of our proprietary license can be found at and | +| in the LICENSE file you have received along with this program. | +| | +| This program is distributed in the hope that it will be useful, | +| but WITHOUT ANY WARRANTY, without even the implied warranty of | +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | +| GNU Affero General Public License for more details. | +| | +| "General Bots" is a registered trademark of Pragmatismo.io. | +| The licensing of the program under the AGPLv3 does not imply a | +| trademark license. Therefore any rights, title and interest in | +| our trademarks remain entirely with us. | +| | +\*****************************************************************************/ + +/** + * @fileoverview General Bots server core. + */ + +'use strict'; + +import { + AutoIncrement, + BelongsTo, + Column, + CreatedAt, + ForeignKey, + Model, + PrimaryKey, + Table, + UpdatedAt +} from 'sequelize-typescript'; +import { GuaribasInstance } from './GBModel'; diff --git a/packages/core.gbapp/models/GBModel.ts b/packages/core.gbapp/models/GBModel.ts index cf1dac689..339eb864a 100644 --- a/packages/core.gbapp/models/GBModel.ts +++ b/packages/core.gbapp/models/GBModel.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -51,6 +51,9 @@ import { import { IGBInstance } from 'botlib'; +/** + * Base instance data for a bot. + */ @Table export class GuaribasInstance extends Model implements IGBInstance { @@ -81,8 +84,6 @@ export class GuaribasInstance extends Model @Column public enabledAdmin: boolean; - /* Services section on bot.json */ - @Column public engineName: string; @@ -219,8 +220,6 @@ export class GuaribasInstance extends Model @Column public adminPass: string; - /* Settings section of bot.json */ - @Column(DataType.FLOAT) public nlpVsSearch: number; @@ -239,6 +238,9 @@ export class GuaribasInstance extends Model public updatedAt: Date; } +/** + * Each packaged listed for use in a bot instance. + */ @Table export class GuaribasPackage extends Model { @PrimaryKey @@ -265,6 +267,9 @@ export class GuaribasPackage extends Model { public updatedAt: Date; } +/** + * A bot channel. + */ @Table export class GuaribasChannel extends Model { @PrimaryKey @@ -284,7 +289,11 @@ export class GuaribasChannel extends Model { public updatedAt: Date; } +/** + * An exception that has been thrown. + */ @Table +//tslint:disable-next-line:max-classes-per-file export class GuaribasException extends Model { @PrimaryKey @AutoIncrement diff --git a/packages/core.gbapp/services/GBAPIService.ts b/packages/core.gbapp/services/GBAPIService.ts index 03ddc01b2..104caf5de 100644 --- a/packages/core.gbapp/services/GBAPIService.ts +++ b/packages/core.gbapp/services/GBAPIService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,11 +36,15 @@ import { TurnContext } from 'botbuilder'; import { WaterfallStepContext } from 'botbuilder-dialogs'; import { GBLog, GBMinInstance } from 'botlib'; import * as request from 'request-promise-native'; -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); import { GBAdminService } from '../../admin.gbapp/services/GBAdminService'; import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; import { GBDeployer } from './GBDeployer'; +/** + * @fileoverview General Bots server core. + */ + /** * BASIC system class for extra manipulation of bot behaviour. */ @@ -100,18 +104,18 @@ class SysClass { public async httpGet(url: string, qs) { const options = { - uri: UrlJoin(url , qs) + uri: urlJoin(url , qs) }; - return await request.get(options); + return request.get(options); } } -/** - * @fileoverview General Bots server core. - */ -export default class DialogClass { +/** + * Base services of conversation to be called by BASIC. + */ +export class DialogClass { public min: GBMinInstance; public context: TurnContext; diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts index 0b13d92e9..65875d850 100644 --- a/packages/core.gbapp/services/GBConfigService.ts +++ b/packages/core.gbapp/services/GBConfigService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -30,16 +30,30 @@ | | \*****************************************************************************/ -import * as fs from 'fs'; +'use strict'; + import { GBLog } from 'botlib'; /** * @fileoverview General Bots server core. */ -'use strict'; - +/** + * Base configuration for the server like storage. + */ export class GBConfigService { + + public static getServerPort(): number { + if (process.env.port !== undefined) { + return Number(process.env.port); + } + if (process.env.PORT !== undefined) { + return Number(process.env.PORT); + } + + return 4242; + } + public static init(): any { try { require('dotenv-extended').load({ @@ -57,7 +71,7 @@ export class GBConfigService { public static get(key: string): string | undefined { let value = GBConfigService.tryGet(key); - if (!value) { + if (value !== undefined) { switch (key) { case 'CLOUD_USERNAME': value = undefined; @@ -117,8 +131,8 @@ export class GBConfigService { } public static tryGet(key: string) { - let value = process.env['container:' + key]; - if (!value) { + let value = process.env[`container:${key}`]; + if (value !== undefined) { value = process.env[key]; } diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index e5e4c184b..68024e3cf 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index 8d1d70b83..f954e3387 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -37,22 +37,19 @@ 'use strict'; const Path = require('path'); -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); const Fs = require('fs'); const WaitUntil = require('wait-until'); const express = require('express'); const child_process = require('child_process'); const graph = require('@microsoft/microsoft-graph-client'); -import { GBMinInstance, IGBCoreService, IGBInstance, GBLog } from 'botlib'; -import { GBError, IGBPackage } from 'botlib'; +import { GBError, GBLog, GBMinInstance, IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; import { AzureSearch } from 'pragmatismo-io-framework'; -import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService'; -import { GuaribasInstance, GuaribasPackage } from '../models/GBModel'; +import { GuaribasPackage } from '../models/GBModel'; import { GBAdminService } from './../../admin.gbapp/services/GBAdminService'; import { KBService } from './../../kb.gbapp/services/KBService'; import { GBConfigService } from './GBConfigService'; -import { GBCoreService } from './GBCoreService'; import { GBImporter } from './GBImporterService'; import { GBVMService } from './GBVMService'; @@ -73,7 +70,7 @@ export class GBDeployer { } public static getConnectionStringFromInstance(instance: IGBInstance) { - return `Server=tcp:${instance.storageServer}.database.windows.net,1433;Database=${instance.storageName};User ID=${ + return `Server=tcp:torageServer}.database.windows.net,1433;Database=${instance.storageName};User ID=${ instance.storageUsername };Password=${instance.storagePassword};Trusted_Connection=False;Encrypt=True;Connection Timeout=30;`; } @@ -91,12 +88,12 @@ export class GBDeployer { let totalPackages = 0; const additionalPath = GBConfigService.get('ADDITIONAL_DEPLOY_PATH'); let paths = [GBDeployer.deployFolder]; - if (additionalPath) { + if (additionalPath !== undefined) { paths = paths.concat(additionalPath.toLowerCase().split(';')); } - const botPackages = new Array(); - const gbappPackages = new Array(); - let generalPackages = new Array(); + const botPackages: string[] = undefined; + const gbappPackages: string[] = undefined; + let generalPackages: string[]; function doIt(path) { const isDirectory = source => Fs.lstatSync(source).isDirectory(); @@ -138,7 +135,7 @@ export class GBDeployer { GBLog.info(`Waiting for app package deployment...`); cb(appPackagesProcessed === gbappPackages.length); }) - .done(async result => { + .done(async () => { GBLog.info(`App Package deployment done.`); ({ generalPackages, totalPackages } = await this.deployDataPackages( @@ -161,11 +158,9 @@ export class GBDeployer { */ public async deployBot(localPath: string): Promise { - const packageType = Path.extname(localPath); const packageName = Path.basename(localPath); - const instance = await this.importer.importIfNotExistsBotPackage(null, packageName, localPath); - return instance; + return await this.importer.importIfNotExistsBotPackage(undefined, packageName, localPath); } public async deployPackageToStorage(instanceId: number, packageName: string): Promise { @@ -175,7 +170,7 @@ export class GBDeployer { }); } - public async deployFromSharePoint(instanceId: number, path: string) { + public async deployFromSharePoint(instanceId: number) { const adminService = new GBAdminService(this.core); const accessToken = adminService.acquireElevatedToken(instanceId); @@ -183,59 +178,30 @@ export class GBDeployer { const client = graph.Client.init({ authProvider: done => { - done(null, accessToken); + done(undefined, accessToken); } }); - - const events = await client - .api('/me/events') - .select('subject,organizer,start,end') - .orderby('createdDateTime DESC') - .get(); } - public deployScriptToStorage(instanceId: number, localPath: string) {} - - public deployTheme(localPath: string) { - // DISABLED: Until completed, "/ui/public". - // FsExtra.copy(localPath, this.workDir + packageName) - // .then(() => { - // }) - // .catch(err => { - // var gberr = GBError.create( - // `GuaribasBusinessError: Error copying package: ${localPath}.` - // ) - // }) - } - - public async deployPackageFromSharePoint(min: GBMinInstance, path: string) {} - - public async deployPackageFromLocalPath(min: GBMinInstance, localPath: string) { + public async deployPackage(min: GBMinInstance, localPath: string) { const packageType = Path.extname(localPath); switch (packageType) { case '.gbot': return this.deployBot(localPath); - case '.gbtheme': - return this.deployTheme(localPath); - - // PACKAGE: Put in package logic. case '.gbkb': const service = new KBService(this.core.sequelize); return service.deployKb(this.core, this, localPath); - case '.gbui': - break; - case '.gbdialog': const vm = new GBVMService(); return vm.loadDialogPackage(localPath, min, this.core, this); default: - const err = GBError.create(`GuaribasBusinessError: Unknown package type: ${packageType}.`); + const err = GBError.create(`Unhandled package type: ${packageType}.`); Promise.reject(err); break; } @@ -248,14 +214,6 @@ export class GBDeployer { const p = await this.getPackageByName(instance.instanceId, packageName); switch (packageType) { - case '.gbot': - // TODO: this.undeployBot(packageName, localPath) - break; - - case '.gbtheme': - // TODO: this.undeployTheme(packageName, localPath) - break; - case '.gbkb': const service = new KBService(this.core.sequelize); @@ -268,7 +226,7 @@ export class GBDeployer { break; default: - const err = GBError.create(`GuaribasBusinessError: Unknown package type: ${packageType}.`); + const err = GBError.create(`Unhandled package type: ${packageType}.`); Promise.reject(err); break; } @@ -288,7 +246,7 @@ export class GBDeployer { try { await search.deleteDataSource(dsName); } catch (err) { - if (err.code != 404) { + if (err.code !== 404) { // First time, nothing to delete. throw err; } @@ -299,7 +257,7 @@ export class GBDeployer { try { await search.deleteIndex(); } catch (err) { - if (err.code != 404) { + if (err.code !== 404) { // First time, nothing to delete. throw err; } @@ -363,11 +321,11 @@ export class GBDeployer { if (Path.extname(filename) === '.gbapp' || Path.extname(filename) === '.gblib') { // Themes for bots. } else if (Path.extname(filename) === '.gbtheme') { - server.use('/themes/' + filenameOnly, express.static(filename)); - GBLog.info(`Theme (.gbtheme) assets accessible at: ${'/themes/' + filenameOnly}.`); + server.use(`/themes/${filenameOnly}`, express.static(filename)); + GBLog.info(`Theme (.gbtheme) assets accessible at: /themes/${filenameOnly}.`); } else if (Path.extname(filename) === '.gbkb') { - server.use('/kb/' + filenameOnly + '/subjects', express.static(UrlJoin(filename, 'subjects'))); - GBLog.info(`KB (.gbkb) assets accessible at: ${'/kb/' + filenameOnly}.`); + server.use(`/kb/${filenameOnly}/subjects`, express.static(urlJoin(filename, 'subjects'))); + GBLog.info(`KB (.gbkb) assets accessible at: /kb/${filenameOnly}.`); } else if (Path.extname(filename) === '.gbui') { // Already Handled } else if (Path.extname(filename) === '.gbdialog') { @@ -387,7 +345,7 @@ export class GBDeployer { GBLog.info(`Waiting for package deployment...`); cb(totalPackages === generalPackages.length); }) - .done(result => { + .done(() => { if (botPackages.length === 0) { GBLog.info('Use ADDITIONAL_DEPLOY_PATH to point to a .gbai package folder (no external packages).'); } else { diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts index 515296dd1..187d9c5b5 100644 --- a/packages/core.gbapp/services/GBImporterService.ts +++ b/packages/core.gbapp/services/GBImporterService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,13 +36,14 @@ 'use strict'; -import { IGBCoreService, IGBInstance } from 'botlib'; +import { IGBCoreService } from 'botlib'; import fs = require('fs'); -import path = require('path'); -import UrlJoin = require('url-join'); -import { SecService } from '../../security.gblib/services/SecService'; +import urlJoin = require('url-join'); import { GuaribasInstance } from '../models/GBModel'; +/** + * Handles the importing of packages. + */ export class GBImporter { public core: IGBCoreService; @@ -51,25 +52,25 @@ export class GBImporter { } public async importIfNotExistsBotPackage(botId: string, packageName: string, localPath: string) { - const packageJson = JSON.parse(fs.readFileSync(UrlJoin(localPath, 'package.json'), 'utf8')); - if (!botId) { + const packageJson = JSON.parse(fs.readFileSync(urlJoin(localPath, 'package.json'), 'utf8')); + if (botId !== undefined) { botId = packageJson.botId; } const instance = await this.core.loadInstance(botId); - if (instance) { + if (instance !== undefined) { return instance; } else { - return await this.createInstanceInternal(botId, packageName, localPath, packageJson); + return await this.createInstanceInternal(botId, localPath, packageJson); } } - private async createInstanceInternal(botId: string, packageName: string, localPath: string, packageJson: any) { - const settings = JSON.parse(fs.readFileSync(UrlJoin(localPath, 'settings.json'), 'utf8')); - const servicesJson = JSON.parse(fs.readFileSync(UrlJoin(localPath, 'services.json'), 'utf8')); + private async createInstanceInternal(botId: string, localPath: string, packageJson: any) { + const settings = JSON.parse(fs.readFileSync(urlJoin(localPath, 'settings.json'), 'utf8')); + const servicesJson = JSON.parse(fs.readFileSync(urlJoin(localPath, 'services.json'), 'utf8')); packageJson = { ...packageJson, ...settings, ...servicesJson }; - if (botId) { + if (botId !== undefined) { packageJson.botId = botId; } diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index fa6471c6b..73f31f346 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -37,7 +37,7 @@ 'use strict'; const { DialogSet, TextPrompt } = require('botbuilder-dialogs'); -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); const express = require('express'); const request = require('request-promise-native'); @@ -46,20 +46,31 @@ const AuthenticationContext = require('adal-node').AuthenticationContext; import { AutoSaveStateMiddleware, BotFrameworkAdapter, ConversationState, MemoryStorage, UserState } from 'botbuilder'; import { ConfirmPrompt, WaterfallDialog } from 'botbuilder-dialogs'; -import { GBDialogStep, GBLog, GBMinInstance, IGBAdminService, IGBConversationalService, IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; +import { + GBDialogStep, + GBLog, + GBMinInstance, + IGBAdminService, + IGBConversationalService, + IGBCoreService, + IGBInstance, + IGBPackage +} from 'botlib'; + import { GBAnalyticsPackage } from '../../analytics.gblib'; import { GBCorePackage } from '../../core.gbapp'; import { GBCustomerSatisfactionPackage } from '../../customer-satisfaction.gbapp'; import { GBKBPackage } from '../../kb.gbapp'; +import { AskDialogArgs } from '../../kb.gbapp/dialogs/AskDialog'; import { GBSecurityPackage } from '../../security.gblib'; import { GBWhatsappPackage } from '../../whatsapp.gblib'; -import { GuaribasInstance } from '../models/GBModel'; import { Messages } from '../strings'; import { GBAdminPackage } from './../../admin.gbapp/index'; import { GBDeployer } from './GBDeployer'; -/** Minimal service layer for a bot. */ - +/** + * Minimal service layer for a bot. + */ export class GBMinService { public core: IGBCoreService; public conversationalService: IGBConversationalService; @@ -94,7 +105,7 @@ export class GBMinService { * * @return Loaded minimal bot instance. * - * */ + */ public async buildMin( bootInstance: IGBInstance, @@ -106,7 +117,7 @@ export class GBMinService { // Serves default UI on root address '/'. const uiPackage = 'default.gbui'; - server.use('/', express.static(UrlJoin(GBDeployer.deployFolder, uiPackage, 'build'))); + server.use('/', express.static(urlJoin(GBDeployer.deployFolder, uiPackage, 'build'))); await Promise.all( instances.map(async instance => { @@ -129,7 +140,7 @@ export class GBMinService { // Install default VBA module. - deployer.deployPackageFromLocalPath(min, 'packages/default.gbdialog'); + deployer.deployPackage(min, 'packages/default.gbdialog'); // Call the loadBot context.activity for all packages. @@ -146,10 +157,9 @@ export class GBMinService { // Serves individual URL for each bot user interface. const uiUrl = `/${instance.botId}`; - server.use(uiUrl, express.static(UrlJoin(GBDeployer.deployFolder, uiPackage, 'build'))); + server.use(uiUrl, express.static(urlJoin(GBDeployer.deployFolder, uiPackage, 'build'))); GBLog.info(`Bot UI ${uiPackage} accessible at: ${uiUrl}.`); - const state = `${instance.instanceId}${Math.floor(Math.random() * 1000000000)}`; // Clients get redirected here in order to create an OAuth authorize url and redirect them to AAD. // There they will authenticate and give their consent to allow this app access to @@ -175,12 +185,12 @@ export class GBMinService { throw new Error(msg); } const authenticationContext = new AuthenticationContext( - UrlJoin(min.instance.authenticatorAuthorityHostUrl, min.instance.authenticatorTenant) + urlJoin(min.instance.authenticatorAuthorityHostUrl, min.instance.authenticatorTenant) ); const resource = 'https://graph.microsoft.com'; authenticationContext.acquireTokenWithAuthorizationCode( req.query.code, - UrlJoin(instance.botEndpoint, min.instance.botId, '/token'), + urlJoin(instance.botEndpoint, min.instance.botId, '/token'), resource, instance.authenticatorClientId, instance.authenticatorClientSecret, @@ -193,7 +203,7 @@ export class GBMinService { await this.adminService.setValue(instance.instanceId, 'refreshToken', token.refreshToken); await this.adminService.setValue(instance.instanceId, 'accessToken', token.accessToken); await this.adminService.setValue(instance.instanceId, 'expiresOn', token.expiresOn.toString()); - await this.adminService.setValue(instance.instanceId, 'AntiCSRFAttackState', null); + await this.adminService.setValue(instance.instanceId, 'AntiCSRFAttackState', undefined); res.redirect(min.instance.botEndpoint); } } @@ -202,15 +212,15 @@ export class GBMinService { } private handleOAuthRequests(server: any, min: GBMinInstance) { - server.get(`/${min.instance.botId}/auth`, function(req, res) { - let authorizationUrl = UrlJoin( + 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.authenticatorClientId - }&redirect_uri=${UrlJoin(min.instance.botEndpoint, min.instance.botId, 'token')}`; + }&redirect_uri=${urlJoin(min.instance.botEndpoint, min.instance.botId, 'token')}`; res.redirect(authorizationUrl); }); } @@ -224,10 +234,10 @@ export class GBMinService { botId = bootInstance.botId; } const instance = await this.core.loadInstance(botId); - if (instance) { + if (instance !== undefined) { const speechToken = await this.getSTSToken(instance); let theme = instance.theme; - if (!theme) { + if (theme !== undefined) { theme = 'default.gbtheme'; } res.send( @@ -284,7 +294,6 @@ export class GBMinService { * */ private async getSTSToken(instance: any) { - // TODO: Make dynamic: https://CHANGE.api.cognitive.microsoft.com/sts/v1.0 const options = { url: 'https://westus.api.cognitive.microsoft.com/sts/v1.0/issueToken', @@ -337,7 +346,7 @@ export class GBMinService { } private invokeLoadBot(appPackages: any[], min: GBMinInstance, server: any) { - const sysPackages = new Array(); + const sysPackages : IGBPackage[] = undefined; // NOTE: A semicolon is necessary before this line. [ GBCorePackage, @@ -354,7 +363,7 @@ export class GBMinService { if (sysPackage.name === 'GBWhatsappPackage') { const url = '/instances/:botId/whatsapp'; server.post(url, (req, res) => { - p['channel'].received(req, res); + (p as any).channel.received(req, res); }); } }, this); @@ -385,9 +394,8 @@ export class GBMinService { ) { await adapter.processActivity(req, res, async context => { // Get loaded user state - const state = await conversationState.get(context); const step = await min.dialogs.createContext(context); - step.context.activity.locale = 'en-US'; // TODO: Make dynamic. + step.context.activity.locale = 'en-US'; try { const user = await min.userProfile.get(context, {}); @@ -401,7 +409,7 @@ export class GBMinService { }); user.loaded = true; user.subjects = []; - user.cb = null; + user.cb = undefined; await min.userProfile.set(step.context, user); } @@ -433,8 +441,6 @@ export class GBMinService { } else if (context.activity.type === 'event') { // Empties dialog stack before going to the target. - // TODO: Understand MSFT changes: await step.endAll(); - await this.processEventActivity(context, step); } await conversationState.saveChanges(context, true); @@ -460,7 +466,7 @@ export class GBMinService { } else if (context.activity.name === 'showFAQ') { await step.beginDialog('/faq'); } else if (context.activity.name === 'answerEvent') { - await step.beginDialog('/answerEvent', { + await step.beginDialog('/answerEvent', { questionId: context.activity.data, fromFaq: true }); @@ -493,13 +499,11 @@ export class GBMinService { // Checks for /menu JSON signature. } else if (context.activity.text.startsWith('{"title"')) { - await step.beginDialog('/menu', { - data: JSON.parse(context.activity.text) - }); + await step.beginDialog('/menu', JSON.parse(context.activity.text)); // Otherwise, continue to the active dialog in the stack. } else { const user = await min.userProfile.get(context, {}); - if (step.activeDialog) { + if (step.activeDialog !== undefined) { await step.continueDialog(); } else { await step.beginDialog('/answer', { diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts index 715fab13e..68357f489 100644 --- a/packages/core.gbapp/services/GBVMService.ts +++ b/packages/core.gbapp/services/GBVMService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -41,8 +41,9 @@ import { TSCompiler } from './TSCompiler'; const walkPromise = require('walk-promise'); const vm = require('vm'); -import UrlJoin = require('url-join'); -import DialogClass from './GBAPIService'; +import urlJoin = require('url-join'); +import { DialogClass } from './GBAPIService'; +//tslint:disable-next-line:no-submodule-imports const vb2ts = require('vbscript-to-typescript/dist/converter'); const beautify = require('js-beautify').js; @@ -55,11 +56,13 @@ const beautify = require('js-beautify').js; * translation and enhance classic BASIC experience. */ +/** + * Basic services for BASIC manipulation. + */ export class GBVMService extends GBService { private readonly script = new vm.Script(); public async loadDialogPackage(folder: string, min: GBMinInstance, core: IGBCoreService, deployer: GBDeployer) { - const files = await walkPromise(folder); this.addHearDialog(min); @@ -74,7 +77,7 @@ export class GBVMService extends GBService { const mainName = file.name.replace(/\-|\./g, ''); min.scriptMap[file.name] = mainName; - const filename = UrlJoin(folder, file.name); + const filename = urlJoin(folder, file.name); fs.watchFile(filename, async () => { await this.run(filename, min, deployer, mainName); }); @@ -131,7 +134,7 @@ export class GBVMService extends GBService { // Converts General Bots BASIC into regular VBS const basicCode: string = fs.readFileSync(filename, 'utf8'); - const vbsCode = await this.convertGBASICToVBS(basicCode); + const vbsCode = this.convertGBASICToVBS(basicCode); const vbsFile = `${filename}.compiled`; fs.writeFileSync(vbsFile, vbsCode, 'utf8'); @@ -160,9 +163,9 @@ export class GBVMService extends GBService { let parsedCode = code; const hearExp = /(\w+).*hear.*\(\)/; - let match1; + let match1 = hearExp.exec(code); - while ((match1 = hearExp.exec(code))) { + while (match1 !== undefined) { let pos = 0; // Writes async body. @@ -182,8 +185,9 @@ export class GBVMService extends GBService { let right = 0; let left = 1; - let match2; - while ((match2 = /\{|\}/.exec(tempCode))) { + let match2 = /\{|\}/.exec(tempCode); + + while (match2 !== undefined) { const c = tempCode.substring(match2.index, match2.index + 1); if (c === '}') { @@ -198,6 +202,7 @@ export class GBVMService extends GBService { if (left === right) { break; } + match1 = hearExp.exec(code); } parsedCode += code.substring(start + match1[0].length + 1, pos + match1[0].length); @@ -207,6 +212,7 @@ export class GBVMService extends GBService { // A interaction will be made for each hear. code = parsedCode; + match2 = /\{|\}/.exec(tempCode); } parsedCode = this.handleThisAndAwait(parsedCode); @@ -218,7 +224,6 @@ export class GBVMService extends GBService { const context = vm.createContext(sandbox); vm.runInContext(parsedCode, context); min.sandBoxMap[mainName] = sandbox; - await deployer.deployScriptToStorage(1, filename); // TODO: Per bot storage. GBLog.info(`[GBVMService] Finished loading of ${filename}`); } } @@ -228,13 +233,13 @@ export class GBVMService extends GBService { code = code.replace(/sys\(\)/g, 'this.sys()'); code = code.replace(/("[^"]*"|'[^']*')|\btalk\b/g, ($0, $1) => { - return $1 == undefined ? 'this.talk' : $1; + return $1 === undefined ? 'this.talk' : $1; }); code = code.replace(/("[^"]*"|'[^']*')|\bhear\b/g, ($0, $1) => { - return $1 == undefined ? 'this.hear' : $1; + return $1 === undefined ? 'this.hear' : $1; }); code = code.replace(/("[^"]*"|'[^']*')|\bsendEmail\b/g, ($0, $1) => { - return $1 == undefined ? 'this.sendEmail' : $1; + return $1 === undefined ? 'this.sendEmail' : $1; }); // await insertion. @@ -249,7 +254,7 @@ export class GBVMService extends GBService { min.dialogs.add( new WaterfallDialog('/hear', [ async step => { - step.activeDialog.state.cbId = step.options['id']; + step.activeDialog.state.cbId = (step.options as any).id; return await step.prompt('textPrompt', {}); }, @@ -259,7 +264,7 @@ export class GBVMService extends GBService { const cbId = step.activeDialog.state.cbId; const cb = min.cbMap[cbId]; - cb.bind({ step: step, context: step.context }); // TODO: Necessary or min.sandbox? + cb.bind({ step: step, context: step.context }); await step.endDialog(); diff --git a/packages/core.gbapp/services/TSCompiler.ts b/packages/core.gbapp/services/TSCompiler.ts index 7d5185e8a..00ccc0450 100644 --- a/packages/core.gbapp/services/TSCompiler.ts +++ b/packages/core.gbapp/services/TSCompiler.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,9 +36,12 @@ 'use strict'; -import * as ts from 'typescript'; import { GBLog } from 'botlib'; +import * as ts from 'typescript'; +/** + * Wrapper for a TypeScript compiler. + */ export class TSCompiler { private static shouldIgnoreError(diagnostic) { @@ -75,7 +78,7 @@ export class TSCompiler { if (!TSCompiler.shouldIgnoreError(diagnostic)) { const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'); - if (diagnostic.file) { + if (diagnostic.file !== undefined) { const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start); GBLog.error(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`); } else { diff --git a/packages/core.gbapp/tests/core.test.ts b/packages/core.gbapp/tests/core.test.ts index 838d5f2d0..00da8ce86 100644 --- a/packages/core.gbapp/tests/core.test.ts +++ b/packages/core.gbapp/tests/core.test.ts @@ -1,13 +1,9 @@ - import { expect } from 'chai'; -import 'mocha'; -import {GBImporter} from '../services/GBImporterService'; +import { GBImporter } from '../services/GBImporterService'; describe('Hello function', () => { - it('should return empty test', () => { - const service = new GBImporter(null); - //service.importIfNotExistsBotPackage(null, null); + const service = new GBImporter(undefined); const result = 0; expect(result).to.equal(0); }); diff --git a/packages/core.gbapp/tests/vm.test.ts b/packages/core.gbapp/tests/vm.test.ts index 1be437b20..67ecffeb1 100644 --- a/packages/core.gbapp/tests/vm.test.ts +++ b/packages/core.gbapp/tests/vm.test.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -42,9 +42,7 @@ import { GBVMService } from '../services/GBVMService'; describe('Load function', () => { it('should fail on invalid file', () => { try { - // const service = new GBVMService(); - // TODO: service.loadJS('invalid.file', null, null, null, null); - + const service = new GBVMService(); } catch (error) { expect(error).to.equal(0); } diff --git a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts index 96cdd6e7e..b5ce198dc 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -38,12 +38,14 @@ import { BotAdapter } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { GBMinInstance } from 'botlib'; -import { IGBDialog } from 'botlib'; +import { GBMinInstance, IGBDialog } from 'botlib'; import { AzureText } from 'pragmatismo-io-framework'; import { CSService } from '../services/CSService'; import { Messages } from '../strings'; +/** + * Dialog for feedback collecting. + */ export class FeedbackDialog extends IGBDialog { /** * Setup dialogs flows and define services call. @@ -59,13 +61,6 @@ export class FeedbackDialog extends IGBDialog { async step => { const locale = step.context.activity.locale; - // TODO: Migrate to 4.*+ await step.prompt("choicePrompt", Messages[locale].what_about_me, [ - // "1", - // "2", - // "3", - // "4", - // "5" - // ]); return await step.next(); }, async step => { @@ -86,30 +81,26 @@ export class FeedbackDialog extends IGBDialog { const locale = step.context.activity.locale; await step.context.sendActivity(Messages[locale].about_suggestions); - step.activeDialog.state.cbId = step.options['id']; + step.activeDialog.state.cbId = (step.options as any).id; return await step.prompt('textPrompt', Messages[locale].what_about_service); }, async step => { - const locale = step.context.activity.locale; const rate = await AzureText.getSentiment( - min.instance.textAnalyticsKey, - min.instance.textAnalyticsEndpoint, - min.conversationalService.getCurrentLanguage(step), - step.result + min.instance.textAnalyticsKey, + min.instance.textAnalyticsEndpoint, + min.conversationalService.getCurrentLanguage(step), + step.result ); if (rate > 0.5) { await step.context.sendActivity(Messages[locale].glad_you_liked); } else { await step.context.sendActivity(Messages[locale].we_will_improve); - - // TODO: Record. - } + } return await step.replaceDialog('/ask', { isReturning: true }); - } ]) ); diff --git a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts index 09b962fd0..b9c4ce5eb 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/QualityDialog.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,14 +36,16 @@ 'use strict'; -import { IGBDialog } from 'botlib'; +import { GBMinInstance, IGBDialog } from 'botlib'; import { BotAdapter } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { GBMinInstance } from 'botlib'; import { CSService } from '../services/CSService'; import { Messages } from '../strings'; +/** + * Dialog for collecting quality of answer. + */ export class QualityDialog extends IGBDialog { /** * Setup dialogs flows and define services call. @@ -62,11 +64,11 @@ export class QualityDialog extends IGBDialog { const score = step.result; setTimeout( - () => min.conversationalService.sendEvent(step, 'stop', null), + () => min.conversationalService.sendEvent(step, 'stop', undefined), 400 ); - if (score == 0) { + if (score === 0) { await step.context.sendActivity(Messages[locale].im_sorry_lets_try); } else { await step.context.sendActivity(Messages[locale].great_thanks); diff --git a/packages/customer-satisfaction.gbapp/index.ts b/packages/customer-satisfaction.gbapp/index.ts index 3850b5d9c..052e1ac9f 100644 --- a/packages/customer-satisfaction.gbapp/index.ts +++ b/packages/customer-satisfaction.gbapp/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,16 +36,19 @@ 'use strict'; -import { GBMinInstance, IGBCoreService, IGBPackage, GBLog, GBDialogStep } from 'botlib'; -import UrlJoin = require('url-join'); +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; +import urlJoin = require('url-join'); import { FeedbackDialog } from './dialogs/FeedbackDialog'; import { QualityDialog } from './dialogs/QualityDialog'; import { GuaribasQuestionAlternate } from './models/index'; import { Sequelize } from 'sequelize-typescript'; +/** + * Package for customer-satisfaction.gblib. + */ export class GBCustomerSatisfactionPackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; public getDialogs(min: GBMinInstance) { GBLog.verbose(`getDialogs called.`); } diff --git a/packages/customer-satisfaction.gbapp/models/index.ts b/packages/customer-satisfaction.gbapp/models/index.ts index afcd21e8a..f6298e525 100644 --- a/packages/customer-satisfaction.gbapp/models/index.ts +++ b/packages/customer-satisfaction.gbapp/models/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,33 +36,20 @@ 'use strict'; -import { - DataTypeDate, - DataTypeDecimal, - DataTypes, - DataTypeUUIDv4 -} from 'sequelize'; - import { AutoIncrement, BelongsTo, - BelongsToMany, Column, - CreatedAt, - DataType, ForeignKey, - HasMany, - IsUUID, - Length, Model, PrimaryKey, - Sequelize, - Table, - UpdatedAt -} from 'sequelize-typescript'; + Table} from 'sequelize-typescript'; import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; +/** + * List of saved alternate questions. + */ @Table export class GuaribasQuestionAlternate extends Model { diff --git a/packages/customer-satisfaction.gbapp/services/CSService.ts b/packages/customer-satisfaction.gbapp/services/CSService.ts index 0a8b424c7..4ef113e9b 100644 --- a/packages/customer-satisfaction.gbapp/services/CSService.ts +++ b/packages/customer-satisfaction.gbapp/services/CSService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -33,6 +33,9 @@ import { GuaribasConversation } from '../../analytics.gblib/models'; import { GuaribasQuestionAlternate } from '../models'; +/** + * Customer Satisfaction Service Layer. + */ export class CSService { public async resolveQuestionAlternate( diff --git a/packages/default.gbui/public/css/pragmatismo.css b/packages/default.gbui/public/css/pragmatismo.css index 7f4154751..f258e644a 100644 --- a/packages/default.gbui/public/css/pragmatismo.css +++ b/packages/default.gbui/public/css/pragmatismo.css @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/public/index.html b/packages/default.gbui/public/index.html index afca64819..b7d3c364e 100644 --- a/packages/default.gbui/public/index.html +++ b/packages/default.gbui/public/index.html @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/GBUIApp.js b/packages/default.gbui/src/GBUIApp.js index 588ac9fe0..20df55b44 100644 --- a/packages/default.gbui/src/GBUIApp.js +++ b/packages/default.gbui/src/GBUIApp.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/components/ChatPane.js b/packages/default.gbui/src/components/ChatPane.js index abe178881..d77961a22 100644 --- a/packages/default.gbui/src/components/ChatPane.js +++ b/packages/default.gbui/src/components/ChatPane.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/components/Footer.js b/packages/default.gbui/src/components/Footer.js index 0cfaa9b23..09b149af1 100644 --- a/packages/default.gbui/src/components/Footer.js +++ b/packages/default.gbui/src/components/Footer.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/components/GBCss.js b/packages/default.gbui/src/components/GBCss.js index c5dc69f11..09ba58eed 100644 --- a/packages/default.gbui/src/components/GBCss.js +++ b/packages/default.gbui/src/components/GBCss.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/components/NavBar.js b/packages/default.gbui/src/components/NavBar.js index 6c2e49eb4..2a8a00e0f 100644 --- a/packages/default.gbui/src/components/NavBar.js +++ b/packages/default.gbui/src/components/NavBar.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/components/SidebarMenu.js b/packages/default.gbui/src/components/SidebarMenu.js index fda919d27..43fa3ee28 100644 --- a/packages/default.gbui/src/components/SidebarMenu.js +++ b/packages/default.gbui/src/components/SidebarMenu.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/index.js b/packages/default.gbui/src/index.js index 6d320a9c4..9c82fac37 100644 --- a/packages/default.gbui/src/index.js +++ b/packages/default.gbui/src/index.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/players/GBBulletPlayer.js b/packages/default.gbui/src/players/GBBulletPlayer.js index 46cabc347..48304c27a 100644 --- a/packages/default.gbui/src/players/GBBulletPlayer.js +++ b/packages/default.gbui/src/players/GBBulletPlayer.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/players/GBImagePlayer.js b/packages/default.gbui/src/players/GBImagePlayer.js index 6e3379850..f2f3a54d3 100644 --- a/packages/default.gbui/src/players/GBImagePlayer.js +++ b/packages/default.gbui/src/players/GBImagePlayer.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/players/GBLoginPlayer.js b/packages/default.gbui/src/players/GBLoginPlayer.js index c5ed0fbd0..4274c55a1 100644 --- a/packages/default.gbui/src/players/GBLoginPlayer.js +++ b/packages/default.gbui/src/players/GBLoginPlayer.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/players/GBMarkdownPlayer.js b/packages/default.gbui/src/players/GBMarkdownPlayer.js index 90d0efd74..5b1081077 100644 --- a/packages/default.gbui/src/players/GBMarkdownPlayer.js +++ b/packages/default.gbui/src/players/GBMarkdownPlayer.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/players/GBPowerBIPlayer.js b/packages/default.gbui/src/players/GBPowerBIPlayer.js index 284c65f0e..ad30195c0 100644 --- a/packages/default.gbui/src/players/GBPowerBIPlayer.js +++ b/packages/default.gbui/src/players/GBPowerBIPlayer.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/default.gbui/src/players/GBVideoPlayer.js b/packages/default.gbui/src/players/GBVideoPlayer.js index e10c279fa..8de4dcd0f 100644 --- a/packages/default.gbui/src/players/GBVideoPlayer.js +++ b/packages/default.gbui/src/players/GBVideoPlayer.js @@ -2,14 +2,14 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | | | | General Bots Copyright (c) Pragmatismo.io. All rights reserved. | | Licensed under the AGPL-3.0. | -| | +| | | According to our dual licensing model, this program can be used either | | under the terms of the GNU Affero General Public License, version 3, | | or under a proprietary license. | diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts index 5be2cace4..e940d97c8 100644 --- a/packages/kb.gbapp/dialogs/AskDialog.ts +++ b/packages/kb.gbapp/dialogs/AskDialog.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -38,12 +38,22 @@ import { BotAdapter } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { IGBDialog, GBLog } from 'botlib'; -import { GBMinInstance } from 'botlib'; +import { GBLog, GBMinInstance, IGBDialog } from 'botlib'; import { AzureText } from 'pragmatismo-io-framework'; import { Messages } from '../strings'; import { KBService } from './../services/KBService'; +/** + * Dialog arguments. + */ +export class AskDialogArgs { + public questionId: number; + public fromFaq: boolean; +} + +/** + * Handle the ask loop on knowledge base data or delegate to other services. + */ export class AskDialog extends IGBDialog { /** * Setup dialogs flows and define services call. @@ -53,159 +63,135 @@ export class AskDialog extends IGBDialog { */ public static setup(bot: BotAdapter, min: GBMinInstance) { const service = new KBService(min.core.sequelize); + min.dialogs.add(new WaterfallDialog('/answerEvent', AskDialog.getAnswerEventDialog(service, min))); + min.dialogs.add(new WaterfallDialog('/answer', AskDialog.getAnswerDialog(min, service))); + min.dialogs.add(new WaterfallDialog('/ask', AskDialog.getAskDialog(min))); + } - min.dialogs.add( - new WaterfallDialog('/answerEvent', [ - async step => { - if (step.options && step.options['questionId']) { - const question = await service.getQuestionById(min.instance.instanceId, step.options['questionId']); - const answer = await service.getAnswerById(min.instance.instanceId, question.answerId); - - // Sends the answer to all outputs, including projector. - - await service.sendAnswer(min.conversationalService, step, answer); - - await step.replaceDialog('/ask', { isReturning: true }); - } + private static getAskDialog(min: GBMinInstance) { + return [ + async step => { + const locale = step.context.activity.locale; + const user = await min.userProfile.get(step.context, {}); + user.isAsking = true; + if (!user.subjects) { + user.subjects = []; + } + let text; + // Three forms of asking. + if (step.options && step.options.firstTime) { + text = Messages[locale].ask_first_time; + } else if (step.options && step.options.isReturning) { + text = Messages[locale].anything_else; + } else if (user.subjects.length > 0) { + text = Messages[locale].which_question; + } else { + throw new Error('Invalid use of /ask'); + } + if (text.length > 0) { + return await step.prompt('textPrompt', text); + } + return await step.next(); + }, + async step => { + if (step.result) { + return await step.replaceDialog('/answer', { query: step.result }); + } else { return await step.next(); } - ]) - ); + } + ]; + } - min.dialogs.add( - new WaterfallDialog('/answer', [ - async step => { - const user = await min.userProfile.get(step.context, {}); - let text = step.options['query']; - if (!text) { - throw new Error(`/answer being called with no args query text.`); + private static getAnswerDialog(min: GBMinInstance, service: KBService) { + return [ + async step => { + const user = await min.userProfile.get(step.context, {}); + let text = step.options.query; + if (!text) { + throw new Error(`/answer being called with no args query text.`); + } + const locale = step.context.activity.locale; + // Stops any content on projector. + await min.conversationalService.sendEvent(step, 'stop', undefined); + // Handle extra text from FAQ. + if (step.options && step.options.query) { + text = step.options.query; + } else if (step.options && step.options.fromFaq) { + await step.context.sendActivity(Messages[locale].going_answer); + } + // Spells check the input text before sending Search or NLP. + if (min.instance.spellcheckerKey !== undefined) { + const data = await AzureText.getSpelledText(min.instance.spellcheckerKey, text); + if (data !== text) { + GBLog.info(`Spelling corrected: ${data}`); + text = data; } + } - const locale = step.context.activity.locale; + // Searches KB for the first time. + user.lastQuestion = text; + await min.userProfile.set(step.context, user); + const resultsA = await service.ask(min.instance, text, min.instance.searchScore, user.subjects); - // Stops any content on projector. - - await min.conversationalService.sendEvent(step, 'stop', null); - - // Handle extra text from FAQ. - - if (step.options && step.options['query']) { - text = step.options['query']; - } else if (step.options && step.options['fromFaq']) { - await step.context.sendActivity(Messages[locale].going_answer); - } - - // Spells check the input text before sending Search or NLP. - - if (min.instance.spellcheckerKey) { - const data = await AzureText.getSpelledText(min.instance.spellcheckerKey, text); - - if (data != text) { - GBLog.info(`Spelling corrected: ${data}`); - text = data; - } - } - - // Searches KB for the first time. - - user.lastQuestion = text; + // If there is some result, answer immediately. + if (resultsA !== undefined && resultsA.answer !== undefined) { + // Saves some context info. + user.isAsking = false; + user.lastQuestionId = resultsA.questionId; await min.userProfile.set(step.context, user); - const resultsA = await service.ask(min.instance, text, min.instance.searchScore, user.subjects); + // Sends the answer to all outputs, including projector. + await service.sendAnswer(min.conversationalService, step, resultsA.answer); + + // Goes to ask loop, again. + return await step.replaceDialog('/ask', { isReturning: true }); + } else { + // Second time running Search, now with no filter. + const resultsB = await service.ask(min.instance, text, min.instance.searchScore, undefined); // If there is some result, answer immediately. - if (resultsA && resultsA.answer) { + if (resultsB !== undefined && resultsB.answer !== undefined) { // Saves some context info. - - user.isAsking = false; - user.lastQuestionId = resultsA.questionId; - await min.userProfile.set(step.context, user); - + const user2 = await min.userProfile.get(step.context, {}); + user2.isAsking = false; + user2.lastQuestionId = resultsB.questionId; + await min.userProfile.set(step.context, user2); + // Informs user that a broader search will be used. + if (user2.subjects.length > 0) { + await step.context.sendActivity(Messages[locale].wider_answer); + } // Sends the answer to all outputs, including projector. - - await service.sendAnswer(min.conversationalService, step, resultsA.answer); - - // Goes to ask loop, again. + await service.sendAnswer(min.conversationalService, step, resultsB.answer); return await step.replaceDialog('/ask', { isReturning: true }); } else { - // Second time running Search, now with no filter. - - const resultsB = await service.ask(min.instance, text, min.instance.searchScore, null); - - // If there is some result, answer immediately. - - if (resultsB && resultsB.answer) { - // Saves some context info. - - const user = await min.userProfile.get(step.context, {}); - user.isAsking = false; - user.lastQuestionId = resultsB.questionId; - await min.userProfile.set(step.context, user); - - // Informs user that a broader search will be used. - - if (user.subjects.length > 0) { - const subjectText = `${KBService.getSubjectItemsSeparatedBySpaces(user.subjects)}`; - await step.context.sendActivity(Messages[locale].wider_answer); - } - - // Sends the answer to all outputs, including projector. - - await service.sendAnswer(min.conversationalService, step, resultsB.answer); + if (!(await min.conversationalService.routeNLP(step, min, text))) { + await step.context.sendActivity(Messages[locale].did_not_find); return await step.replaceDialog('/ask', { isReturning: true }); - } else { - if (!(await min.conversationalService.routeNLP(step, min, text))) { - await step.context.sendActivity(Messages[locale].did_not_find); - - return await step.replaceDialog('/ask', { isReturning: true }); - } } } } - ]) - ); + } + ]; + } - min.dialogs.add( - new WaterfallDialog('/ask', [ - async step => { - const locale = step.context.activity.locale; - const user = await min.userProfile.get(step.context, {}); - user.isAsking = true; - if (!user.subjects) { - user.subjects = []; - } - let text; - - // Three forms of asking. - - if (step.options && step.options['firstTime'] ) { - text = Messages[locale].ask_first_time; - } else if (step.options && step.options['isReturning']) { - text = Messages[locale].anything_else; - } else if (user.subjects.length > 0) { - text = Messages[locale].which_question; - } else { - throw new Error('Invalid use of /ask'); - } - - if (text.length > 0) { - return await step.prompt('textPrompt', text); - } - - return await step.next(); - }, - async step => { - if (step.result) { - return await step.replaceDialog('/answer', { query: step.result }); - } else { - return await step.next(); - } + private static getAnswerEventDialog(service: KBService, min: GBMinInstance) { + return [ + async step => { + 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); + // Sends the answer to all outputs, including projector. + await service.sendAnswer(min.conversationalService, step, answer); + await step.replaceDialog('/ask', { isReturning: true }); } - ]) - ); + return await step.next(); + } + ]; } } diff --git a/packages/kb.gbapp/dialogs/FaqDialog.ts b/packages/kb.gbapp/dialogs/FaqDialog.ts index f2c18ebb4..448d8b33e 100644 --- a/packages/kb.gbapp/dialogs/FaqDialog.ts +++ b/packages/kb.gbapp/dialogs/FaqDialog.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -38,11 +38,13 @@ import { BotAdapter } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { IGBDialog } from 'botlib'; -import { GBMinInstance } from 'botlib'; +import { GBMinInstance, IGBDialog } from 'botlib'; import { Messages } from '../strings'; import { KBService } from './../services/KBService'; +/** + * Handle display of FAQ allowing direct access to KB. + */ export class FaqDialog extends IGBDialog { /** * Setup dialogs flows and define services call. @@ -56,9 +58,9 @@ export class FaqDialog extends IGBDialog { min.dialogs.add(new WaterfallDialog('/faq', [ async step => { - const data = await service.getFaqBySubjectArray('faq', null); + const data = await service.getFaqBySubjectArray('faq', undefined); const locale = step.context.activity.locale; - if (data) { + if (data !== undefined) { await min.conversationalService.sendEvent(step, 'play', { playerType: 'bullet', data: data.slice(0, 10) diff --git a/packages/kb.gbapp/dialogs/MenuDialog.ts b/packages/kb.gbapp/dialogs/MenuDialog.ts index b020c1893..9904fedc3 100644 --- a/packages/kb.gbapp/dialogs/MenuDialog.ts +++ b/packages/kb.gbapp/dialogs/MenuDialog.ts @@ -1,9 +1,8 @@ - /*****************************************************************************\ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -37,17 +36,26 @@ 'use strict'; -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); import { BotAdapter, CardFactory, MessageFactory } from 'botbuilder'; import { WaterfallDialog } from 'botbuilder-dialogs'; -import { IGBDialog } from 'botlib'; -import { GBMinInstance } from 'botlib'; -import { AzureText } from 'pragmatismo-io-framework'; +import { GBMinInstance, IGBDialog } from 'botlib'; import { GuaribasSubject } from '../models'; import { KBService } from '../services/KBService'; import { Messages } from '../strings'; +/** + * Dialog arguments. + */ +export class MenuDialogArgs { + public to: string; + public subjectId: string; +} + +/** + * Dialogs for handling Menu control. + */ export class MenuDialog extends IGBDialog { /** * Setup dialogs flows and define services call. @@ -58,71 +66,54 @@ export class MenuDialog extends IGBDialog { public static setup(bot: BotAdapter, min: GBMinInstance) { const service = new KBService(min.core.sequelize); - min.dialogs.add(new WaterfallDialog('/menu', [ + min.dialogs.add(new WaterfallDialog('/menu', MenuDialog.getMenuDialog(min, service))); + } + + private static getMenuDialog(min: GBMinInstance, service: KBService) { + return [ async step => { const locale = step.context.activity.locale; - let rootSubjectId = null; + const user = await min.userProfile.get(step.context, {}); + const args: MenuDialogArgs = step.options; - if (step.options && step.options['data']) { - const subject = step.options ['data']; + let rootSubjectId; + if (args !== undefined) { // If there is a shortcut specified as subject destination, go there. + if (args.to !== undefined) { + const dialog = args.to.split(':')[1]; - if (subject.to) { - const dialog = subject.to.split(':')[1]; - await step.replaceDialog('/' + dialog); - await step.endDialog(); - - return; + return await step.replaceDialog(`/${dialog}`); } - // Adds to bot a perception of a new subject. - - const user = await min.userProfile.get(step.context, {}); - user.subjects.push(subject); - rootSubjectId = subject.subjectId; + user.subjects.push(args); + rootSubjectId = args.subjectId; // Whenever a subject is selected, shows a faq about it. - if (user.subjects.length > 0) { - const data = await service.getFaqBySubjectArray( - 'menu', - user.subjects - ); + const list = await service.getFaqBySubjectArray('menu', user.subjects); await min.conversationalService.sendEvent(step, 'play', { playerType: 'bullet', - data: data.slice(0, 10) + data: list.slice(0, 10) }); } } else { - const user = await min.userProfile.get(step.context, {}); user.subjects = []; - - await step.context.sendActivity(Messages[locale].here_is_subjects); // TODO: Handle rnd. + await step.context.sendActivity(Messages[locale].here_is_subjects); user.isAsking = false; } - const msg = MessageFactory.text(''); const attachments = []; - - const data = await service.getSubjectItems( - min.instance.instanceId, - rootSubjectId - ); - + const data = await service.getSubjectItems(min.instance.instanceId, rootSubjectId); msg.attachmentLayout = 'carousel'; - - data.forEach(function(item: GuaribasSubject) { + data.forEach((item: GuaribasSubject) => { const subject = item; const card = CardFactory.heroCard( subject.title, subject.description, - CardFactory.images([ - UrlJoin('/kb', min.instance.kb, 'subjects', 'subject.png') - ]), + CardFactory.images([urlJoin('/kb', min.instance.kb, 'subjects', 'subject.png')]), CardFactory.actions([ - { - channelData: null, + { type: 'postBack', title: Messages[locale].menu_select, value: JSON.stringify({ @@ -135,31 +126,23 @@ export class MenuDialog extends IGBDialog { } ]) ); - attachments.push(card); }); - if (attachments.length === 0) { - const user = await min.userProfile.get(step.context, {}); if (user.subjects && user.subjects.length > 0) { await step.context.sendActivity( - Messages[locale].lets_search( - KBService.getFormattedSubjectItems(user.subjects) - ) + Messages[locale].lets_search(KBService.getFormattedSubjectItems(user.subjects)) ); } - } else { msg.attachments = attachments; await step.context.sendActivity(msg); } - - const user = await min.userProfile.get(step.context, {}); user.isAsking = true; return await step.next(); } - ])); + ]; } } diff --git a/packages/kb.gbapp/index.ts b/packages/kb.gbapp/index.ts index 628c035e2..9e727fd17 100644 --- a/packages/kb.gbapp/index.ts +++ b/packages/kb.gbapp/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,19 +36,18 @@ 'use strict'; -import UrlJoin = require('url-join'); - -import { GBDialogStep, GBLog, GBMinInstance, IGBPackage } from 'botlib'; -import { GuaribasAnswer, GuaribasQuestion, GuaribasSubject } from './models/index'; - -import { IGBCoreService } from 'botlib'; +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { AskDialog } from './dialogs/AskDialog'; import { FaqDialog } from './dialogs/FaqDialog'; import { MenuDialog } from './dialogs/MenuDialog'; +import { GuaribasAnswer, GuaribasQuestion, GuaribasSubject } from './models/index'; +/** + * Package for kb.gbapp. + */ export class GBKBPackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; public getDialogs(min: GBMinInstance) { GBLog.verbose(`getDialogs called.`); } diff --git a/packages/kb.gbapp/models/index.ts b/packages/kb.gbapp/models/index.ts index df86b8446..913c9df5e 100644 --- a/packages/kb.gbapp/models/index.ts +++ b/packages/kb.gbapp/models/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -60,6 +60,9 @@ import { } from '../../core.gbapp/models/GBModel'; import { GuaribasUser } from '../../security.gblib/models'; +/** + * Subjects to group the pair of questions and answers. + */ @Table export class GuaribasSubject extends Model { @PrimaryKey @@ -111,6 +114,9 @@ export class GuaribasSubject extends Model { public package: GuaribasPackage; } +/** + * A question and its metadata. + */ @Table export class GuaribasQuestion extends Model { @PrimaryKey @@ -155,6 +161,7 @@ export class GuaribasQuestion extends Model { @UpdatedAt public updatedAt: Date; + //tslint:disable-next-line:no-use-before-declare @ForeignKey(() => GuaribasAnswer) @Column public answerId: number; @@ -174,6 +181,9 @@ export class GuaribasQuestion extends Model { public package: GuaribasPackage; } +/** + * An answer and its metadata. + */ @Table export class GuaribasAnswer extends Model { @PrimaryKey diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index 70250f142..7b581b8f8 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,14 +36,13 @@ const Path = require('path'); const Fs = require('fs'); -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); const marked = require('marked'); const path = require('path'); const asyncPromise = require('async-promises'); const walkPromise = require('walk-promise'); -// tslint:disable:no-unsafe-any +// tslint:disable-next-line:newline-per-chained-call const parse = require('bluebird').promisify(require('csv-parse')); -// tslint:enable:no-unsafe-any import { GBDialogStep, GBLog, IGBConversationalService, IGBCoreService, IGBInstance } from 'botlib'; import { AzureSearch } from 'pragmatismo-io-framework'; @@ -275,7 +274,7 @@ export class KBService { // Extracts answer from external media if any. if (answer.indexOf('.md') > -1) { - const mediaFilename = UrlJoin(path.dirname(filePath), '..', 'articles', answer); + const mediaFilename = urlJoin(path.dirname(filePath), '..', 'articles', answer); if (Fs.existsSync(mediaFilename)) { answer = Fs.readFileSync(mediaFilename, 'utf8'); format = '.md'; @@ -393,7 +392,7 @@ export class KBService { ): Promise { // Imports subjects tree into database and return it. - await this.importSubjectFile(packageStorage.packageId, UrlJoin(localPath, 'subjects.json'), instance); + await this.importSubjectFile(packageStorage.packageId, urlJoin(localPath, 'subjects.json'), instance); // Import all .tsv files in the tabular directory. @@ -401,12 +400,12 @@ export class KBService { } public async importKbTabularDirectory(localPath: string, instance: IGBInstance, packageId: number): Promise { - const files = await walkPromise(UrlJoin(localPath, 'tabular')); + const files = await walkPromise(urlJoin(localPath, 'tabular')); return Promise.all( files.map(async file => { if (file.name.endsWith('.tsv')) { - return this.importKbTabularFile(UrlJoin(file.root, file.name), instance.instanceId, packageId); + return this.importKbTabularFile(urlJoin(file.root, file.name), instance.instanceId, packageId); } }) ); @@ -465,7 +464,7 @@ export class KBService { const packageType = Path.extname(localPath); const packageName = Path.basename(localPath); GBLog.info(`[GBDeployer] Opening package: ${localPath}`); - const packageObject = JSON.parse(Fs.readFileSync(UrlJoin(localPath, 'package.json'), 'utf8')); + const packageObject = JSON.parse(Fs.readFileSync(urlJoin(localPath, 'package.json'), 'utf8')); const instance = await core.loadInstance(packageObject.botId); GBLog.info(`[GBDeployer] Importing: ${localPath}`); diff --git a/packages/security.gblib/index.ts b/packages/security.gblib/index.ts index cd54966ff..6c589138a 100644 --- a/packages/security.gblib/index.ts +++ b/packages/security.gblib/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,15 +36,18 @@ 'use strict'; -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from './models'; +/** + * Package for the security module. + */ export class GBSecurityPackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; public getDialogs(min: GBMinInstance) { GBLog.verbose(`getDialogs called.`); } diff --git a/packages/security.gblib/models/index.ts b/packages/security.gblib/models/index.ts index 784e8c97e..e5e0e924e 100644 --- a/packages/security.gblib/models/index.ts +++ b/packages/security.gblib/models/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -63,6 +63,9 @@ import { import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; +/** + * A user and its metadata. + */ @Table export class GuaribasUser extends Model { @PrimaryKey @@ -90,6 +93,9 @@ export class GuaribasUser extends Model { public instance: GuaribasInstance; } +/** + * A group of users. + */ @Table export class GuaribasGroup extends Model { @PrimaryKey @@ -109,6 +115,9 @@ export class GuaribasGroup extends Model { public instance: GuaribasInstance; } +/** + * Relation of groups and users. + */ @Table export class GuaribasUserGroup extends Model { @ForeignKey(() => GuaribasUser) diff --git a/packages/security.gblib/services/SecService.ts b/packages/security.gblib/services/SecService.ts index d1fee375b..358da06b3 100644 --- a/packages/security.gblib/services/SecService.ts +++ b/packages/security.gblib/services/SecService.ts @@ -1,28 +1,31 @@ const Fs = require('fs'); -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); import { GBService, IGBInstance } from 'botlib'; import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from '../models'; +/** + * Security service layer. + */ export class SecService extends GBService { public async importSecurityFile(localPath: string, instance: IGBInstance) { - const security = JSON.parse(Fs.readFileSync(UrlJoin(localPath, 'security.json'), 'utf8')); + const security = JSON.parse(Fs.readFileSync(urlJoin(localPath, 'security.json'), 'utf8')); security.groups.forEach(group => { const groupDb = GuaribasGroup.build({ instanceId: instance.instanceId, displayName: group.displayName }); - groupDb.save().then(groupDb => { + groupDb.save().then(g1 => { group.users.forEach(user => { const userDb = GuaribasUser.build({ instanceId: instance.instanceId, - groupId: groupDb.groupId, + groupId: g1.groupId, userName: user.userName }); - userDb.save().then(userDb => { + userDb.save().then(user2 => { const userGroup = GuaribasUserGroup.build(); - userGroup.groupId = groupDb.groupId; - userGroup.userId = userDb.userId; + userGroup.groupId = g1.groupId; + userGroup.userId = user2.userId; userGroup.save(); }); }); diff --git a/packages/whatsapp.gblib/index.ts b/packages/whatsapp.gblib/index.ts index fbb4e983d..43f0a5ec7 100644 --- a/packages/whatsapp.gblib/index.ts +++ b/packages/whatsapp.gblib/index.ts @@ -2,7 +2,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -36,22 +36,22 @@ 'use strict'; -import UrlJoin = require('url-join'); - -import { GBMinInstance, IGBCoreService, IGBPackage, GBLog, GBDialogStep } from 'botlib'; - +import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { WhatsappDirectLine } from './services/WhatsappDirectLine'; +/** + * Package for whatsapp.gblib + */ export class GBWhatsappPackage implements IGBPackage { - public sysPackages: IGBPackage[] = undefined; + public sysPackages: IGBPackage[]; public channel: WhatsappDirectLine; public loadBot(min: GBMinInstance): void { // Only loads engine if it is defined on services.json. - if (min.instance.whatsappBotKey) { + if (min.instance.whatsappBotKey !== undefined) { this.channel = new WhatsappDirectLine( min.botId, min.instance.whatsappBotKey, @@ -63,9 +63,19 @@ export class GBWhatsappPackage implements IGBPackage { } } - public getDialogs(min: GBMinInstance) {GBLog.verbose (`getDialogs called.`);} - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {GBLog.verbose (`loadPackage called.`);} - public unloadPackage(core: IGBCoreService): void {GBLog.verbose (`unloadPackage called.`);} - public unloadBot(min: GBMinInstance): void {GBLog.verbose (`unloadBot called.`);} - public onNewSession(min: GBMinInstance, step: GBDialogStep): void {GBLog.verbose (`onNewSession called.`);} + public getDialogs(min: GBMinInstance) { + GBLog.verbose(`getDialogs called.`); + } + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { + GBLog.verbose(`loadPackage called.`); + } + public unloadPackage(core: IGBCoreService): void { + GBLog.verbose(`unloadPackage called.`); + } + public unloadBot(min: GBMinInstance): void { + GBLog.verbose(`unloadBot called.`); + } + public onNewSession(min: GBMinInstance, step: GBDialogStep): void { + GBLog.verbose(`onNewSession called.`); + } } diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts index c3d61aafe..444a8d823 100644 --- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts +++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts @@ -1,10 +1,13 @@ -import UrlJoin = require('url-join'); +import urlJoin = require('url-join'); const Swagger = require('swagger-client'); const rp = require('request-promise'); -import { GBService, GBLog } from 'botlib'; +import { GBLog, GBService } from 'botlib'; import * as request from 'request-promise-native'; +/** + * Support for Whatsapp. + */ export class WhatsappDirectLine extends GBService { public pollInterval = 1000; public directLineClientName = 'DirectLineClient'; @@ -16,7 +19,7 @@ export class WhatsappDirectLine extends GBService { public whatsappServiceUrl: string; public whatsappServiceWebhookUrl: string; public botId: string; - public watermark: string = null; + public watermark: string; public conversationIds = {}; @@ -36,7 +39,6 @@ export class WhatsappDirectLine extends GBService { this.whatsappServiceUrl = whatsappServiceUrl; this.whatsappServiceWebhookUrl = whatsappServiceWebhookUrl; - // TODO: Migrate to Swagger 3. this.directLineClient = rp(this.directLineSpecUrl) .then(spec => { return new Swagger({ @@ -47,12 +49,12 @@ export class WhatsappDirectLine extends GBService { .then(async client => { client.clientAuthorizations.add( 'AuthorizationBotConnector', - new Swagger.ApiKeyAuthorization('Authorization', 'Bearer ' + directLineSecret, 'header') + new Swagger.ApiKeyAuthorization('Authorization', `Bearer ${directLineSecret}`, 'header') ); const options = { method: 'POST', - url: UrlJoin(this.whatsappServiceUrl, 'webhook'), + url: urlJoin(this.whatsappServiceUrl, 'webhook'), qs: { token: this.whatsappServiceKey, webhookUrl: `${this.whatsappServiceWebhookUrl}/instances/${this.botId}/whatsapp`, @@ -64,7 +66,7 @@ export class WhatsappDirectLine extends GBService { }; try { - const result = await request.post(options); + const result = request.post(options); GBLog.info(result); } catch (error) { GBLog.error(`Error initializing 3rd party Whatsapp provider(1) ${error}`); @@ -91,17 +93,17 @@ export class WhatsappDirectLine extends GBService { const conversationId = this.conversationIds[from]; this.directLineClient.then(client => { - if (this.conversationIds[from] == undefined) { + if (this.conversationIds[from] === undefined) { GBLog.info(`GBWhatsapp: Starting new conversation on Bot.`); client.Conversations.Conversations_StartConversation() .then(response => { return response.obj.conversationId; }) - .then(conversationId => { - this.conversationIds[from] = conversationId; - this.inputMessage(client, conversationId, text, from, fromName); + .then(generatedConversationId => { + this.conversationIds[from] = generatedConversationId; + this.inputMessage(client, generatedConversationId, text, from, fromName); - this.pollMessages(client, conversationId, from, fromName); + this.pollMessages(client, generatedConversationId, from, fromName); }) .catch(err => { GBLog.error(`Error starting conversation ${err}`); @@ -183,9 +185,11 @@ export class WhatsappDirectLine extends GBService { break; case 'image/png': - GBLog.info('Opening the requested image ' + attachment.contentUrl); + GBLog.info(`Opening the requested image ${attachment.contentUrl}`); output += `\n${attachment.contentUrl}`; break; + default: + GBLog.info(`Unknown content type: ${attachment.contentType}`); } }); } @@ -200,7 +204,7 @@ export class WhatsappDirectLine extends GBService { public async sendToDevice(to, msg) { const options = { method: 'POST', - url: UrlJoin(this.whatsappServiceUrl, 'message'), + url: urlJoin(this.whatsappServiceUrl, 'message'), qs: { token: this.whatsappServiceKey, phone: to, diff --git a/src/app.ts b/src/app.ts index a5b0ba646..d87c942de 100644 --- a/src/app.ts +++ b/src/app.ts @@ -3,7 +3,7 @@ | ( )_ _ | | _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ | | ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ | -| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) | +| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| (Ë…) |( (_) ) | | | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' | | | | ( )_) | | | (_) \___/' | @@ -37,13 +37,12 @@ 'use strict'; -const logger = require('./logger'); const express = require('express'); const bodyParser = require('body-parser'); -import { IGBCoreService, IGBInstance, IGBPackage, GBLog } from 'botlib'; + +import { GBLog, IGBCoreService, IGBInstance, IGBPackage } from 'botlib'; import { GBAdminService } from '../packages/admin.gbapp/services/GBAdminService'; import { AzureDeployerService } from '../packages/azuredeployer.gbapp/services/AzureDeployerService'; -import { GuaribasInstance } from '../packages/core.gbapp/models/GBModel'; import { GBConfigService } from '../packages/core.gbapp/services/GBConfigService'; import { GBConversationalService } from '../packages/core.gbapp/services/GBConversationalService'; import { GBCoreService } from '../packages/core.gbapp/services/GBCoreService'; @@ -51,7 +50,7 @@ import { GBDeployer } from '../packages/core.gbapp/services/GBDeployer'; import { GBImporter } from '../packages/core.gbapp/services/GBImporterService'; import { GBMinService } from '../packages/core.gbapp/services/GBMinService'; -const appPackages = new Array(); +const appPackages: IGBPackage[] = undefined; /** * General Bots open-core entry point. @@ -68,7 +67,7 @@ export class GBServer { // bot instance. This allows the same server to attend multiple Bot on // the Marketplace until GB get serverless. - const port = process.env.port || process.env.PORT || 4242; + const port = GBConfigService.getServerPort(); const server = express(); server.use(bodyParser.json()); // to support JSON-encoded bodies @@ -79,7 +78,6 @@ export class GBServer { }) ); - let bootInstance: IGBInstance; server.listen(port, () => { (async () => { try { @@ -103,7 +101,7 @@ export class GBServer { // Creates a boot instance or load it from storage. - let bootInstance: IGBInstance = null; + let bootInstance: IGBInstance; try { await core.initStorage(); } catch (error) { @@ -132,7 +130,7 @@ export class GBServer { await core.saveInstance(fullInstance); let instances: IGBInstance[] = await core.loadAllInstances(core, azureDeployer, proxyAddress); instances = await core.ensureInstances(instances, bootInstance, core); - if (!bootInstance) { + if (bootInstance !== undefined) { bootInstance = instances[0]; } diff --git a/tslint.json b/tslint.json index 10699ef45..142f27d9c 100644 --- a/tslint.json +++ b/tslint.json @@ -12,17 +12,20 @@ "rulesDirectory": ["node_modules/tslint-microsoft-contrib"], "jsRules": {}, "rules": { - "no-unsafe-any":false, "newline-per-chained-call": false, + "no-unsafe-any": false, "no-floating-promises": false, "no-var-requires": false, "typedef": false, "variable-name": false, "no-parameter-properties": false, + "max-line-length": [true, { "limit": 120, "ignore-pattern": "^\\s+\\*" }], + "await-promise": [true, "Bluebird"], "no-reserved-keywords": false, "no-unnecessary-class": false, "no-require-imports": false, "function-name": false, + "no-relative-imports": false, "no-redundant-jsdoc": false, "no-return-await": false, "prefer-type-cast": false, @@ -35,9 +38,6 @@ "switch-final-break": false, "no-parameter-reassignment": false, "export-name": false, - "no-relative-imports": false, - "no-backbone-get-set-outside-model": false, - "max-line-length": [true, { "limit": 120, "ignore-pattern": "^\\s+\\*" }], - "await-promise": [true, "Bluebird"] + "no-backbone-get-set-outside-model": false } } From 684f7b47954d3cd0e3158f98fe779199834a7385 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 11 Mar 2019 19:32:47 -0300 Subject: [PATCH 08/15] fix(general): tslint being applied in all sources. --- package.json | 2 +- .../services/AzureDeployerService.ts | 20 +++++----- .../core.gbapp/services/GBConfigService.ts | 7 ++-- packages/core.gbapp/services/GBCoreService.ts | 37 ++++++++++--------- packages/core.gbapp/services/GBDeployer.ts | 6 +-- .../core.gbapp/services/GBImporterService.ts | 2 +- packages/core.gbapp/services/GBMinService.ts | 10 ++--- src/app.ts | 16 ++++---- 8 files changed, 51 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index d9123a41f..3961eea55 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "request-promise": "4.2.4", "request-promise-native": "1.0.7", "scanf": "^1.0.2", - "sequelize": "4.43.0", + "sequelize": "^4.43.0", "sequelize-typescript": "0.6.7", "shx": "0.3.2", "simple-git": "1.107.0", diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index d59c2bf6b..2f0dc36b8 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -86,10 +86,9 @@ export class AzureDeployerService implements IGBInstallationDeployer { const req = new WebResource(); req.method = verb; req.url = url; - req.headers = {}; - req.headers['Content-Type'] = 'application/json'; - req.headers['accept-language'] = '*'; - req.headers.set(' Authorization', `Bearer ${accessToken}`); + req.headers.set('Content-Type', 'application/json'); + req.headers.set('accept-language', '*'); + req.headers.set('Authorization', `Bearer ${accessToken}`); req.body = body; return req; @@ -405,10 +404,10 @@ export class AzureDeployerService implements IGBInstallationDeployer { const req = new WebResource(); req.method = 'POST'; req.url = requestUrl; - req.headers = {}; + req.headers = {}; req.headers['Content-Type'] = 'application/json; charset=utf-8'; req.headers['accept-language'] = '*'; - req.headers.set('Authorization', `Bearer ${accessToken}`); + (req.headers as any).Authorization = `Bearer ${accessToken}`; } /** @@ -486,7 +485,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { } catch (error) { reject(error); } - }, 20000); + }, 20000); }); } @@ -527,10 +526,9 @@ export class AzureDeployerService implements IGBInstallationDeployer { const req = new WebResource(); req.method = method; req.url = `https://${location}.api.cognitive.microsoft.com/luis/api/v2.0/${resource}`; - req.headers = {}; - req.headers['Content-Type'] = 'application/json'; - req.headers['accept-language'] = '*'; - req.headers['Ocp-Apim-Subscription-Key'] = authoringKey; + req.headers.set('Content-Type', 'application/json'); + req.headers.set('accept-language', '*'); + req.headers.set('Ocp-Apim-Subscription-Key', authoringKey); req.body = body; const httpClient = new ServiceClient(); diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts index 65875d850..3c539d4e8 100644 --- a/packages/core.gbapp/services/GBConfigService.ts +++ b/packages/core.gbapp/services/GBConfigService.ts @@ -42,7 +42,6 @@ import { GBLog } from 'botlib'; * Base configuration for the server like storage. */ export class GBConfigService { - public static getServerPort(): number { if (process.env.port !== undefined) { return Number(process.env.port); @@ -71,7 +70,7 @@ export class GBConfigService { public static get(key: string): string | undefined { let value = GBConfigService.tryGet(key); - if (value !== undefined) { + if (value === undefined) { switch (key) { case 'CLOUD_USERNAME': value = undefined; @@ -130,9 +129,9 @@ export class GBConfigService { return value; } - public static tryGet(key: string) { + public static tryGet(key: string): any { let value = process.env[`container:${key}`]; - if (value !== undefined) { + if (value === undefined) { value = process.env[key]; } diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index 07a7fd944..71e18769c 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -246,7 +246,7 @@ STORAGE_SYNC=true return await ngrok.connect({ port: port }); } else { - GBLog.warn('ngrok executable not found. Check installation or node_modules folder.'); + GBLog.warn('ngrok executable not found (only tested on Windows). Check installation or node_modules folder.'); return 'localhost'; } @@ -294,19 +294,23 @@ STORAGE_SYNC=true ); } } catch (error) { - // Check if storage is empty and needs formatting. - const isInvalidObject = error.parent.number === 208 || error.parent.errno === 1; // MSSQL or SQLITE. - if (isInvalidObject) { - if (GBConfigService.get('STORAGE_SYNC') !== 'true') { - throw new Error( - `Operating storage is out of sync or there is a storage connection error. - Try setting STORAGE_SYNC to true in .env file. Error: ${error.message}.` - ); - } else { - GBLog.info(`Storage is empty. After collecting storage structure from all .gbapps it will get synced.`); - } - } else { + if (error.parent === undefined) { throw new Error(`Cannot connect to operating storage: ${error.message}.`); + } else { + // Check if storage is empty and needs formatting. + const isInvalidObject = error.parent.number === 208 || error.parent.errno === 1; // MSSQL or SQLITE. + if (isInvalidObject) { + if (GBConfigService.get('STORAGE_SYNC') !== 'true') { + throw new Error( + `Operating storage is out of sync or there is a storage connection error. + Try setting STORAGE_SYNC to true in .env file. Error: ${error.message}.` + ); + } else { + GBLog.info(`Storage is empty. After collecting storage structure from all .gbapps it will get synced.`); + } + } else { + throw new Error(`Cannot connect to operating storage: ${error.message}.`); + } } } @@ -429,7 +433,7 @@ STORAGE_SYNC=true const fkcols = args[0]; let fkname = table; let matches2 = re4.exec(fkcols); - while (matches2 !== undefined) { + while (matches2 !== null) { fkname += `_${matches2[1]}`; matches2 = re4.exec(fkcols); } @@ -464,7 +468,7 @@ STORAGE_SYNC=true const fkcols = args[2]; let fkname = table; let matches2 = re3.exec(fkcols); - while (matches2 !== undefined) { + while (matches2 !== null) { fkname += `_${matches2[1]}`; matches2 = re3.exec(fkcols); } @@ -484,8 +488,7 @@ STORAGE_SYNC=true */ private async openStorageFrontier(installationDeployer: IGBInstallationDeployer) { const group = GBConfigService.get('CLOUD_GROUP'); - const serverName = GBConfigService.get('STORAGE_SERVER') - .split('.database.windows.net')[0]; + const serverName = GBConfigService.get('STORAGE_SERVER').split('.database.windows.net')[0]; await installationDeployer.openStorageFirewall(group, serverName); } } diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index f954e3387..f9d951a60 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -91,9 +91,9 @@ export class GBDeployer { if (additionalPath !== undefined) { paths = paths.concat(additionalPath.toLowerCase().split(';')); } - const botPackages: string[] = undefined; - const gbappPackages: string[] = undefined; - let generalPackages: string[]; + const botPackages: string[] = []; + const gbappPackages: string[] = []; + let generalPackages: string[] = []; function doIt(path) { const isDirectory = source => Fs.lstatSync(source).isDirectory(); diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts index 187d9c5b5..759757b18 100644 --- a/packages/core.gbapp/services/GBImporterService.ts +++ b/packages/core.gbapp/services/GBImporterService.ts @@ -53,7 +53,7 @@ export class GBImporter { public async importIfNotExistsBotPackage(botId: string, packageName: string, localPath: string) { const packageJson = JSON.parse(fs.readFileSync(urlJoin(localPath, 'package.json'), 'utf8')); - if (botId !== undefined) { + if (botId === undefined) { botId = packageJson.botId; } const instance = await this.core.loadInstance(botId); diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 73f31f346..12bdf7158 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -200,10 +200,10 @@ export class GBMinService { GBLog.error(msg); res.send(msg); } else { - await this.adminService.setValue(instance.instanceId, 'refreshToken', token.refreshToken); - await this.adminService.setValue(instance.instanceId, 'accessToken', token.accessToken); - await this.adminService.setValue(instance.instanceId, 'expiresOn', token.expiresOn.toString()); - await this.adminService.setValue(instance.instanceId, 'AntiCSRFAttackState', undefined); + this.adminService.setValue(instance.instanceId, 'refreshToken', token.refreshToken); + this.adminService.setValue(instance.instanceId, 'accessToken', token.accessToken); + this.adminService.setValue(instance.instanceId, 'expiresOn', token.expiresOn.toString()); + this.adminService.setValue(instance.instanceId, 'AntiCSRFAttackState', undefined); res.redirect(min.instance.botEndpoint); } } @@ -346,7 +346,7 @@ export class GBMinService { } private invokeLoadBot(appPackages: any[], min: GBMinInstance, server: any) { - const sysPackages : IGBPackage[] = undefined; + const sysPackages : IGBPackage[] = []; // NOTE: A semicolon is necessary before this line. [ GBCorePackage, diff --git a/src/app.ts b/src/app.ts index d87c942de..a22c8c0f0 100644 --- a/src/app.ts +++ b/src/app.ts @@ -50,7 +50,7 @@ import { GBDeployer } from '../packages/core.gbapp/services/GBDeployer'; import { GBImporter } from '../packages/core.gbapp/services/GBImporterService'; import { GBMinService } from '../packages/core.gbapp/services/GBMinService'; -const appPackages: IGBPackage[] = undefined; +const appPackages: IGBPackage[] = []; /** * General Bots open-core entry point. @@ -64,16 +64,13 @@ export class GBServer { GBLog.info(`The Bot Server is in STARTING mode...`); // Creates a basic HTTP server that will serve several URL, one for each - // bot instance. This allows the same server to attend multiple Bot on - // the Marketplace until GB get serverless. + // bot instance. const port = GBConfigService.getServerPort(); const server = express(); - - server.use(bodyParser.json()); // to support JSON-encoded bodies + server.use(bodyParser.json()); server.use( bodyParser.urlencoded({ - // to support URL-encoded bodies extended: true }) ); @@ -105,6 +102,7 @@ export class GBServer { try { await core.initStorage(); } catch (error) { + GBLog.verbose(`Error initializing storage: ${error}`); bootInstance = await core.createBootInstance(core, azureDeployer, proxyAddress); await core.initStorage(); } @@ -126,7 +124,11 @@ export class GBServer { 'boot.gbot', 'packages/boot.gbot' ); - const fullInstance = { ...packageInstance, ...bootInstance }; + if (bootInstance === undefined) { + bootInstance = packageInstance; + } + // tslint:disable-next-line:prefer-object-spread + const fullInstance = Object.assign(packageInstance, bootInstance); await core.saveInstance(fullInstance); let instances: IGBInstance[] = await core.loadAllInstances(core, azureDeployer, proxyAddress); instances = await core.ensureInstances(instances, bootInstance, core); From 9e3e0657a7cbb21e2a20c3e5dc098fbca03bd135 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 1 Apr 2019 09:01:07 -0300 Subject: [PATCH 09/15] fix(general): tslint being applied in all sources. --- .../dialogs/StartDialog.ts | 20 +++++++++---------- .../services/AzureDeployerService.ts | 4 ++-- packages/core.gbapp/services/GBDeployer.ts | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts index 8912dabfc..ad28b2674 100644 --- a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts +++ b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts @@ -120,7 +120,7 @@ export class StartDialog { private static retrieveUsername() { let value = GBConfigService.get('CLOUD_USERNAME'); - if (value !== undefined) { + if (value === undefined) { process.stdout.write(`${GBAdminService.GB_PROMPT}CLOUD_USERNAME:`); value = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -130,7 +130,7 @@ export class StartDialog { private static retrievePassword() { let password = GBConfigService.get('CLOUD_PASSWORD'); - if (password !== undefined) { + if (password === undefined) { process.stdout.write(`${GBAdminService.GB_PROMPT}CLOUD_PASSWORD:`); password = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -140,7 +140,7 @@ export class StartDialog { private static retrieveBotId() { let botId = GBConfigService.get('BOT_ID'); - if (botId !== undefined) { + if (botId === undefined) { process.stdout.write( `${GBAdminService.GB_PROMPT}Choose a unique bot Id containing lowercase letters, digits or dashes (cannot use dash as the first two or last one characters), @@ -155,7 +155,7 @@ cannot start or end with or contain consecutive dashes and having 4 to 42 charac private static retrieveAuthoringKey() { let authoringKey = GBConfigService.get('NLP_AUTHORING_KEY'); - if (authoringKey !== undefined) { + if (authoringKey === undefined) { process.stdout.write( `${ GBAdminService.GB_PROMPT @@ -174,12 +174,12 @@ cannot start or end with or contain consecutive dashes and having 4 to 42 charac private static retrieveAppId() { let appId = GBConfigService.get('MARKETPLACE_ID'); - process.stdout.write( - `Sorry, this part cannot be automated yet due to Microsoft schedule, + if (appId === undefined) { + process.stdout.write( + `Sorry, this part cannot be automated yet due to Microsoft schedule, please go to https://apps.dev.microsoft.com/portal/register-app to generate manually an App ID and App Secret.\n` - ); - if (appId !== undefined) { + ); process.stdout.write('Generated Application Id (MARKETPLACE_ID):'); appId = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -189,7 +189,7 @@ generate manually an App ID and App Secret.\n` private static retrieveAppPassword() { let appPassword = GBConfigService.get('MARKETPLACE_SECRET'); - if (appPassword !== undefined) { + if (appPassword === undefined) { process.stdout.write('Generated Password (MARKETPLACE_SECRET):'); appPassword = scanf('%s').replace(/(\n|\r)+$/, ''); } @@ -217,7 +217,7 @@ generate manually an App ID and App Secret.\n` private static retrieveLocation() { let location = GBConfigService.get('CLOUD_LOCATION'); - if (location !== undefined) { + if (location === undefined) { process.stdout.write('CLOUD_LOCATION (eg. westus):'); location = scanf('%s'); } diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 2f0dc36b8..583436670 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -477,7 +477,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { this.apiVersion }`; url = urlJoin(baseUrl, query); - req = AzureDeployerService.createRequestObject(url, accessToken, 'GET', JSON.stringify(parameters)); + req = AzureDeployerService.createRequestObject(url, accessToken, 'POST', JSON.stringify(parameters)); const resChannel = await httpClient.sendRequest(req); const key = JSON.parse(resChannel.bodyAsText).properties.properties.sites[0].key; instance.webchatKey = key; @@ -485,7 +485,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { } catch (error) { reject(error); } - }, 20000); + }, 20000); }); } diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index f9d951a60..d33331475 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -88,7 +88,7 @@ export class GBDeployer { let totalPackages = 0; const additionalPath = GBConfigService.get('ADDITIONAL_DEPLOY_PATH'); let paths = [GBDeployer.deployFolder]; - if (additionalPath !== undefined) { + if (additionalPath !== undefined && additionalPath !== '') { paths = paths.concat(additionalPath.toLowerCase().split(';')); } const botPackages: string[] = []; From 0237431e09266651a4d8f3b7ca4b05583ae88e66 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 1 Apr 2019 15:47:18 -0300 Subject: [PATCH 10/15] fix(general): tslint being applied in all sources. --- package-lock.json | 213 ++-------------------------------------------- package.json | 2 +- 2 files changed, 6 insertions(+), 209 deletions(-) diff --git a/package-lock.json b/package-lock.json index 16825fcd2..09eb8e728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3210,9 +3210,9 @@ "integrity": "sha512-++y/EOu52rRz+TWNkFbOu3Dj7fVyXRlrJktMFo6npr2ISnNNntWY5U0U3ouAUDt7aDKRsB1Rcn2LISdS5FRCoA==" }, "botlib": { - "version": "0.1.21", - "resolved": "https://registry.npmjs.org/botlib/-/botlib-0.1.21.tgz", - "integrity": "sha512-AF8Sp+SF3xN/jzOCo7tnqJfGaYkeHP0mJKcfYL0iHYbUuIVsCVtNmIottd1WTzDfKhls+ZoqclSAbzzoC0LS+Q==", + "version": "0.1.23", + "resolved": "https://registry.npmjs.org/botlib/-/botlib-0.1.23.tgz", + "integrity": "sha512-hYDLME5hDuPJcPJ7wUU8rDjZ9WX8yfkDwEwaO8QbVxlKttygZuxs0Yu1dFBdNxjg7fdrqmZF560Z3DliyhkVhg==", "requires": { "async": "2.6.2", "botbuilder": "4.1.7", @@ -3222,181 +3222,17 @@ "botbuilder-dialogs": "4.2.0", "botbuilder-prompts": "4.0.0-preview1.2", "chrono-node": "1.3.11", - "dotenv-extended": "2.3.0", + "dotenv-extended": "2.4.0", "iconv-lite": "0.4.24", "ms": "2.1.1", "pragmatismo-io-framework": "1.0.19", "reflect-metadata": "0.1.13", - "sequelize": "4.42.1", + "sequelize": "4.43.0", "sequelize-typescript": "0.6.7", "wait-until": "0.0.2", "winston": "3.2.1" }, "dependencies": { - "@microsoft/recognizers-text-choice": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-choice/-/recognizers-text-choice-1.1.2.tgz", - "integrity": "sha512-4hFdqxusM0YrOXYM2RVYPl2rLjItSh6VkRiACjWB95GKC/DBGjJRYQpTxhzuZAsJSkDMinu/aLf8DvQtwUaLtA==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "grapheme-splitter": "^1.0.2" - } - }, - "@microsoft/recognizers-text-number": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-number/-/recognizers-text-number-1.1.2.tgz", - "integrity": "sha512-GESjSF42dllym83diyd6pmlzFwdzidewoq/qSQz89lSoTx9HdJQHjbXxwdBp7w4Ax/Jroo2lcAedM3B7alZhYQ==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "bignumber.js": "^7.2.1", - "lodash.escaperegexp": "^4.1.2", - "lodash.sortby": "^4.7.0", - "lodash.trimend": "^4.5.1" - } - }, - "@microsoft/recognizers-text-suite": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-suite/-/recognizers-text-suite-1.1.2.tgz", - "integrity": "sha512-w3WCsKa//64jE1fGPFlV02rRg9+b3oDp+K5/skPAn4KDr80LjXxD1ulIgiJ2Ll/2OoBl8ociCiCjYA7zS3LpdQ==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "@microsoft/recognizers-text-choice": "~1.1.2", - "@microsoft/recognizers-text-date-time": "~1.1.2", - "@microsoft/recognizers-text-number": "~1.1.2", - "@microsoft/recognizers-text-number-with-unit": "~1.1.2", - "@microsoft/recognizers-text-sequence": "~1.1.2" - } - }, - "@types/node": { - "version": "9.6.45", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", - "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" - }, - "botbuilder": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.1.7.tgz", - "integrity": "sha512-AlZhvjeqiCpeWGN1TkqBi09l6f0spYIh0Xzc4rJYF8feCFi4k2FEYC1IpiiOAtYhEBeQ9SOGFcUUwPaLmsI3Xg==", - "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^9.3.0", - "async-file": "^2.0.2", - "botbuilder-core": "^4.1.7", - "botframework-connector": "^4.1.7", - "filenamify": "^2.0.0", - "rimraf": "^2.6.2" - } - }, - "botbuilder-ai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.2.0.tgz", - "integrity": "sha512-dt2OydZ9pWyMSNgha3PlC6lBq3sXUXAYmadqogNqvWpYEmIMdBOCUc02Vn2w1suxLX84GdYqdBI2klwrRZ7oKg==", - "requires": { - "@microsoft/recognizers-text-date-time": "1.1.2", - "@types/html-entities": "^1.2.16", - "@types/node": "^9.3.0", - "@types/request-promise-native": "^1.0.10", - "azure-cognitiveservices-luis-runtime": "^1.0.0", - "botbuilder": "^4.2.0", - "html-entities": "^1.2.1", - "moment": "^2.20.1", - "ms-rest": "^2.3.6", - "mstranslator": "^3.0.0", - "request": "^2.87.0", - "request-promise-native": "1.0.5" - }, - "dependencies": { - "botbuilder": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.2.tgz", - "integrity": "sha512-l7Y83WxytYSBcsFCSoqc8RqXhctnApV131nn72K/mA627DQWAK+M63gYqTFYJBjsO8ok9mNHEzPWQSE9TaJ03Q==", - "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^10.12.18", - "async-file": "^2.0.2", - "botbuilder-core": "^4.3.2", - "botframework-connector": "^4.3.2", - "filenamify": "^2.0.0" - }, - "dependencies": { - "@types/node": { - "version": "10.12.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", - "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" - } - } - } - } - }, - "botbuilder-azure": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.2.0.tgz", - "integrity": "sha512-WL8dHtVESE/qTFTGcJwlFeKyUeewoyoNr5ENavu1W40N8UjZB32ivmX2dvd0Zm4TIbeBwgmomF2gE9rE+0Rv3w==", - "requires": { - "@types/node": "^9.3.0", - "azure-storage": "^2.10.2", - "botbuilder": "^4.2.0", - "documentdb": "1.14.5", - "flat": "^4.0.0", - "semaphore": "^1.1.0" - }, - "dependencies": { - "botbuilder": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.2.tgz", - "integrity": "sha512-l7Y83WxytYSBcsFCSoqc8RqXhctnApV131nn72K/mA627DQWAK+M63gYqTFYJBjsO8ok9mNHEzPWQSE9TaJ03Q==", - "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^10.12.18", - "async-file": "^2.0.2", - "botbuilder-core": "^4.3.2", - "botframework-connector": "^4.3.2", - "filenamify": "^2.0.0" - }, - "dependencies": { - "@types/node": { - "version": "10.12.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", - "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" - } - } - } - } - }, - "botbuilder-dialogs": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.2.0.tgz", - "integrity": "sha512-wi7Vk/mRHqsjNVhCbXK6yoYsQ7uS7EySM+bcDRthw5uDQ9LyHHoRg3wzT+mqbfjzwgpKR/TXxPUDM4nDL8Hz+Q==", - "requires": { - "@microsoft/recognizers-text-choice": "1.1.2", - "@microsoft/recognizers-text-date-time": "1.1.2", - "@microsoft/recognizers-text-number": "1.1.2", - "@microsoft/recognizers-text-suite": "1.1.2", - "@types/node": "^9.3.0", - "botbuilder-core": "^4.2.0" - } - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - }, - "dotenv-extended": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/dotenv-extended/-/dotenv-extended-2.3.0.tgz", - "integrity": "sha512-QrFPzMr25tkdEesy2vJQDk0Yqs1Wy0IWSngaU/QNnQfukG735kXp3K+YfW6CMcR/N/3BGw5oIqyBLtGU8a5SZQ==", - "requires": { - "@types/dotenv": "^4.0.0", - "auto-parse": "^1.3.0", - "camelcase": "5.0.0", - "cross-spawn": "6.0.5", - "dotenv": "6.0.0", - "is-windows": "^1.0.0", - "lodash": "^4.17.10" - } - }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -3404,45 +3240,6 @@ "requires": { "safer-buffer": ">= 2.1.2 < 3" } - }, - "request-promise-native": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", - "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", - "requires": { - "request-promise-core": "1.1.1", - "stealthy-require": "^1.1.0", - "tough-cookie": ">=2.3.3" - } - }, - "sequelize": { - "version": "4.42.1", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.42.1.tgz", - "integrity": "sha512-W9i/CkBjCHLzEkJQkaxXaK82MA16b7F74PjtE7EUR+d7WU/X3U+YU5givWR+/VRXay1VXDyBOfXgw9/zdhDSDg==", - "requires": { - "bluebird": "^3.5.0", - "cls-bluebird": "^2.1.0", - "debug": "^3.1.0", - "depd": "^1.1.0", - "dottie": "^2.0.0", - "generic-pool": "3.5.0", - "inflection": "1.12.0", - "lodash": "^4.17.1", - "moment": "^2.20.0", - "moment-timezone": "^0.5.14", - "retry-as-promised": "^2.3.2", - "semver": "^5.5.0", - "terraformer-wkt-parser": "^1.1.2", - "toposort-class": "^1.0.1", - "uuid": "^3.2.1", - "validator": "^10.4.0", - "wkx": "^0.4.1" - } - }, - "validator": { - "version": "10.11.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", - "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==" } } }, diff --git a/package.json b/package.json index 3961eea55..466612a1f 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "botbuilder-choices": "4.0.0-preview1.2", "botbuilder-dialogs": "4.2.0", "botbuilder-prompts": "4.0.0-preview1.2", - "botlib": "^0.1.21", + "botlib": "^0.1.23", "chai": "4.2.0", "child_process": "^1.0.2", "chokidar": "2.1.2", From 74e82cdbfd27341b70bad4d4d5f36f6289d97f34 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 1 Apr 2019 16:15:11 -0300 Subject: [PATCH 11/15] fix(general): tslint being applied in all sources. --- packages/core.gbapp/services/GBImporterService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts index 759757b18..3f6ecc6b0 100644 --- a/packages/core.gbapp/services/GBImporterService.ts +++ b/packages/core.gbapp/services/GBImporterService.ts @@ -57,7 +57,7 @@ export class GBImporter { botId = packageJson.botId; } const instance = await this.core.loadInstance(botId); - if (instance !== undefined) { + if (instance !== null) { return instance; } else { return await this.createInstanceInternal(botId, localPath, packageJson); From 692ab4150d17d81c0acb340c09a3788dda83819c Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sun, 7 Apr 2019 12:23:27 -0300 Subject: [PATCH 12/15] fix(general): tslint being applied in all sources. --- package-lock.json | 669 ++++++++++++------ package.json | 38 +- packages/admin.gbapp/dialogs/AdminDialog.ts | 2 +- packages/analytics.gblib/models/index.ts | 6 - .../services/AzureDeployerService.ts | 11 +- packages/core.gbapp/services/GBCoreService.ts | 15 +- packages/core.gbapp/services/GBMinService.ts | 6 +- packages/kb.gbapp/services/KBService.ts | 22 +- packages/security.gblib/models/index.ts | 15 +- 9 files changed, 498 insertions(+), 286 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09eb8e728..3724beea3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1693,9 +1693,9 @@ } }, "@types/sequelize": { - "version": "4.27.39", - "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.39.tgz", - "integrity": "sha512-FABh5gLbXgh6/0pmJQ7VzjN5KAxd/IbX3G5Z6fSBZ6DSqaYl7DBP22nGtLh2e6dPmC0rUxfJclNhzQcC3XgvVw==", + "version": "4.27.46", + "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.46.tgz", + "integrity": "sha512-hqosowwLJsLrR+A8IOVgGQaToaBAZE54WLJmjxARaoHC4hl4lmfzXPNY/JGn3hmxNIhb6klHs7skQ2uJPrlXSA==", "dev": true, "requires": { "@types/bluebird": "*", @@ -1733,9 +1733,9 @@ } }, "@types/validator": { - "version": "10.9.0", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-10.9.0.tgz", - "integrity": "sha512-mf0VpXk+NoTmkUmuJCsdwBYxjYZW41amCSzd4t/fABMKl+qGMViwFP0pR7ukFdZRXWI1LIkca3VIbXVBmWZ4kQ==" + "version": "10.11.0", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-10.11.0.tgz", + "integrity": "sha512-i1aY7RKb6HmQIEnK0cBmUZUp1URx0riIHw/GYNoZ46Su0GWfLiDmMI8zMRmaauMnOTg2bQag0qfwcyUFC9Tn+A==" }, "@types/winston": { "version": "2.4.4", @@ -2013,6 +2013,11 @@ } } }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" + }, "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", @@ -2198,9 +2203,9 @@ } }, "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz", + "integrity": "sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==" }, "async-file": { "version": "2.0.2", @@ -2303,9 +2308,9 @@ } }, "azure-cognitiveservices-luis-runtime": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/azure-cognitiveservices-luis-runtime/-/azure-cognitiveservices-luis-runtime-1.2.0.tgz", - "integrity": "sha512-8A71ZfDs5uB+t7SX7GdESuAxgAOR+jKmhnRprx09Pk5gfdJd1HSC2moLxUhqJsS1WQ6I+g7ShG7kLXWmQIXQyg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/azure-cognitiveservices-luis-runtime/-/azure-cognitiveservices-luis-runtime-1.2.2.tgz", + "integrity": "sha512-qds2UQ85IWMj9w3HXB0BS0MqSyQ50YlVtS6Y1X6aSf2sN1RVvdct6gZnUMREgjDTKgo+/Iwh4MmPVmhvpPUu0A==", "requires": { "ms-rest": "^2.5.0" }, @@ -2568,9 +2573,9 @@ "dev": true }, "big-integer": { - "version": "1.6.42", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.42.tgz", - "integrity": "sha512-3UQFKcRMx+5Z+IK5vYTMYK2jzLRJkt+XqyDdacgWgtMjjuifKpKTFneJLEgeBElOE2/lXZ1LcMcb5s8pwG2U8Q==" + "version": "1.6.43", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz", + "integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg==" }, "big-number": { "version": "1.0.0", @@ -2598,9 +2603,9 @@ } }, "binary-extensions": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz", - "integrity": "sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==" + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" }, "binary-search-bounds": { "version": "2.0.3", @@ -2617,9 +2622,9 @@ } }, "bluebird": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", - "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==" + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", + "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==" }, "body-parser": { "version": "1.18.3", @@ -2647,68 +2652,62 @@ } }, "botbuilder": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.1.7.tgz", - "integrity": "sha512-AlZhvjeqiCpeWGN1TkqBi09l6f0spYIh0Xzc4rJYF8feCFi4k2FEYC1IpiiOAtYhEBeQ9SOGFcUUwPaLmsI3Xg==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.4.tgz", + "integrity": "sha512-7EizagbDXGKCwHlQi0ICp1UpjBXxlha2c67y1XxaXzORWJyCTmd8HNP2iFdnxsZUGluh90jgN4C1hmJLBzSCUw==", "requires": { "@types/filenamify": "^2.0.1", - "@types/node": "^9.3.0", + "@types/node": "^10.12.18", "async-file": "^2.0.2", - "botbuilder-core": "^4.1.7", - "botframework-connector": "^4.1.7", - "filenamify": "^2.0.0", - "rimraf": "^2.6.2" + "botbuilder-core": "^4.3.4", + "botframework-connector": "^4.3.4", + "filenamify": "^2.0.0" }, "dependencies": { "@types/node": { - "version": "9.6.45", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", - "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" + "version": "10.14.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", + "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" } } }, "botbuilder-ai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.2.0.tgz", - "integrity": "sha512-dt2OydZ9pWyMSNgha3PlC6lBq3sXUXAYmadqogNqvWpYEmIMdBOCUc02Vn2w1suxLX84GdYqdBI2klwrRZ7oKg==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.3.4.tgz", + "integrity": "sha512-yc8QNCD6vT3VWOh80bbdkfWivLuRz/yYxchsPNldlRPa9N/m9smmBaEa9ufnr0Eevmxic4Bh0kLlU6LVWqRULw==", "requires": { "@microsoft/recognizers-text-date-time": "1.1.2", "@types/html-entities": "^1.2.16", - "@types/node": "^9.3.0", + "@types/node": "^10.12.18", "@types/request-promise-native": "^1.0.10", - "azure-cognitiveservices-luis-runtime": "^1.0.0", - "botbuilder": "^4.2.0", + "azure-cognitiveservices-luis-runtime": "1.2.2", + "botbuilder-core": "^4.3.4", "html-entities": "^1.2.1", "moment": "^2.20.1", - "ms-rest": "^2.3.6", - "mstranslator": "^3.0.0", + "ms-rest": "2.5.0", "request": "^2.87.0", - "request-promise-native": "1.0.5" + "request-promise-native": "1.0.5", + "url-parse": "^1.4.4" }, "dependencies": { "@types/node": { - "version": "9.6.45", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", - "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" + "version": "10.14.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", + "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" }, - "botbuilder": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.2.tgz", - "integrity": "sha512-l7Y83WxytYSBcsFCSoqc8RqXhctnApV131nn72K/mA627DQWAK+M63gYqTFYJBjsO8ok9mNHEzPWQSE9TaJ03Q==", + "ms-rest": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/ms-rest/-/ms-rest-2.5.0.tgz", + "integrity": "sha512-QUTg9CsmWpofDO0MR37z8B28/T9ObpQ+FM23GGDMKXw8KYDJ3cEBdK6dJTDDrtSoZG3U+S/vdmSEwJ7FNj6Kog==", "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^10.12.18", - "async-file": "^2.0.2", - "botbuilder-core": "^4.3.2", - "botframework-connector": "^4.3.2", - "filenamify": "^2.0.0" - }, - "dependencies": { - "@types/node": { - "version": "10.12.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", - "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" - } + "duplexer": "^0.1.1", + "is-buffer": "^1.1.6", + "is-stream": "^1.1.0", + "moment": "^2.21.0", + "request": "^2.88.0", + "through": "^2.3.8", + "tunnel": "0.0.5", + "uuid": "^3.2.1" } }, "request-promise-native": { @@ -2724,42 +2723,22 @@ } }, "botbuilder-azure": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.2.0.tgz", - "integrity": "sha512-WL8dHtVESE/qTFTGcJwlFeKyUeewoyoNr5ENavu1W40N8UjZB32ivmX2dvd0Zm4TIbeBwgmomF2gE9rE+0Rv3w==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.3.4.tgz", + "integrity": "sha512-M9PVc7kiASAXeJynMyNuj1rXnQOKv3pXY7AWr9ERPatJrjAtSHbMQAZnNAB5nkENIuDiHFk6rAq0S5SmQ+e6xw==", "requires": { - "@types/node": "^9.3.0", - "azure-storage": "^2.10.2", - "botbuilder": "^4.2.0", + "@types/node": "^10.12.18", + "azure-storage": "2.10.2", + "botbuilder": "^4.3.4", "documentdb": "1.14.5", "flat": "^4.0.0", "semaphore": "^1.1.0" }, "dependencies": { "@types/node": { - "version": "9.6.45", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", - "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" - }, - "botbuilder": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.2.tgz", - "integrity": "sha512-l7Y83WxytYSBcsFCSoqc8RqXhctnApV131nn72K/mA627DQWAK+M63gYqTFYJBjsO8ok9mNHEzPWQSE9TaJ03Q==", - "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^10.12.18", - "async-file": "^2.0.2", - "botbuilder-core": "^4.3.2", - "botframework-connector": "^4.3.2", - "filenamify": "^2.0.0" - }, - "dependencies": { - "@types/node": { - "version": "10.12.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", - "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" - } - } + "version": "10.14.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", + "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" } } }, @@ -2830,7 +2809,7 @@ "@types/node-fetch": "^1.6.7", "@types/uuid": "^3.4.3", "fetch-cookie": "^0.7.0", - "fetch-ponyfill": "github:amarzavery/fetch-ponyfill#master", + "fetch-ponyfill": "github:amarzavery/fetch-ponyfill#136e6f8192bdb2aa0b7983f0b3b4361c357be9db", "form-data": "^2.3.2", "is-buffer": "^2.0.0", "is-stream": "^1.1.0", @@ -2908,12 +2887,12 @@ } }, "botbuilder-core": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.3.2.tgz", - "integrity": "sha512-iKaSjOffhb4b40B3N/k1vjFq0AD5QBtx9/Tg8GdeXgxWtbY0QXiFekU7pKfPBAOS3MhY8h/u7w8SmOnrENk62w==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.3.4.tgz", + "integrity": "sha512-azpPzGns88F3QIBMZw9UOn/DS/xo1odcbZq2GQkKXXQ4DxsE0xDmYUCW4rt/PuFbmB7c+GlQ8GyQZPFBI1xOHA==", "requires": { "assert": "^1.4.1", - "botframework-schema": "^4.3.2" + "botframework-schema": "^4.3.4" } }, "botbuilder-core-extensions": { @@ -2955,16 +2934,16 @@ } }, "botbuilder-dialogs": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.2.0.tgz", - "integrity": "sha512-wi7Vk/mRHqsjNVhCbXK6yoYsQ7uS7EySM+bcDRthw5uDQ9LyHHoRg3wzT+mqbfjzwgpKR/TXxPUDM4nDL8Hz+Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.3.4.tgz", + "integrity": "sha512-cHdYo8GrQrwl8ZvjAyH+Qtrde9cNJ+/61KzFeUCBRJ4d6ZQ5OUkpAKZ/u8fbmaQe2zL4chR4dgxjpxaKtMRshg==", "requires": { "@microsoft/recognizers-text-choice": "1.1.2", "@microsoft/recognizers-text-date-time": "1.1.2", "@microsoft/recognizers-text-number": "1.1.2", "@microsoft/recognizers-text-suite": "1.1.2", - "@types/node": "^9.3.0", - "botbuilder-core": "^4.2.0" + "@types/node": "^10.12.18", + "botbuilder-core": "^4.3.4" }, "dependencies": { "@microsoft/recognizers-text-choice": { @@ -3002,9 +2981,9 @@ } }, "@types/node": { - "version": "9.6.45", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.45.tgz", - "integrity": "sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==" + "version": "10.14.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", + "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" } } }, @@ -3075,7 +3054,7 @@ "@types/node-fetch": "^1.6.7", "@types/uuid": "^3.4.3", "fetch-cookie": "^0.7.0", - "fetch-ponyfill": "github:amarzavery/fetch-ponyfill#master", + "fetch-ponyfill": "github:amarzavery/fetch-ponyfill#136e6f8192bdb2aa0b7983f0b3b4361c357be9db", "form-data": "^2.3.2", "is-buffer": "^2.0.0", "is-stream": "^1.1.0", @@ -3153,15 +3132,15 @@ } }, "botframework-connector": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/botframework-connector/-/botframework-connector-4.3.2.tgz", - "integrity": "sha512-nwAAULKFMV2uvXf123R2MRcq3slNMYypBLdoa6KMt6Ri+S2FqVIC4vn+y+pIfFDYbOPOkXErh/JlbunOcfTteA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botframework-connector/-/botframework-connector-4.3.4.tgz", + "integrity": "sha512-aaUHVcgX1m1uwBNxdD5UrNo1f5t7zHDM/h6ha8wJMBqzwc7KXklTwagZccsw18NA1v5g5hVB8S2WgVXCeumXLg==", "requires": { "@azure/ms-rest-js": "1.2.6", "@types/jsonwebtoken": "7.2.8", "@types/node": "^10.12.18", "base64url": "^3.0.0", - "botframework-schema": "^4.3.2", + "botframework-schema": "^4.3.4", "form-data": "^2.3.3", "jsonwebtoken": "8.0.1", "nock": "^10.0.3", @@ -3178,9 +3157,9 @@ } }, "@types/node": { - "version": "10.12.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", - "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==" + "version": "10.14.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", + "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" }, "base64url": { "version": "3.0.1", @@ -3205,9 +3184,9 @@ } }, "botframework-schema": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.3.2.tgz", - "integrity": "sha512-++y/EOu52rRz+TWNkFbOu3Dj7fVyXRlrJktMFo6npr2ISnNNntWY5U0U3ouAUDt7aDKRsB1Rcn2LISdS5FRCoA==" + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.3.4.tgz", + "integrity": "sha512-8t+pyoMC1zN0w223SLh+qFe19ILYxcC12VPRRPXS8dydFqnCf8nV+SOpXoVFsx0eaKIhWXe868olz+Ms3ihTkA==" }, "botlib": { "version": "0.1.23", @@ -3233,6 +3212,167 @@ "winston": "3.2.1" }, "dependencies": { + "@microsoft/recognizers-text-choice": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-choice/-/recognizers-text-choice-1.1.2.tgz", + "integrity": "sha512-4hFdqxusM0YrOXYM2RVYPl2rLjItSh6VkRiACjWB95GKC/DBGjJRYQpTxhzuZAsJSkDMinu/aLf8DvQtwUaLtA==", + "requires": { + "@microsoft/recognizers-text": "~1.1.2", + "grapheme-splitter": "^1.0.2" + } + }, + "@microsoft/recognizers-text-number": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-number/-/recognizers-text-number-1.1.2.tgz", + "integrity": "sha512-GESjSF42dllym83diyd6pmlzFwdzidewoq/qSQz89lSoTx9HdJQHjbXxwdBp7w4Ax/Jroo2lcAedM3B7alZhYQ==", + "requires": { + "@microsoft/recognizers-text": "~1.1.2", + "bignumber.js": "^7.2.1", + "lodash.escaperegexp": "^4.1.2", + "lodash.sortby": "^4.7.0", + "lodash.trimend": "^4.5.1" + } + }, + "@microsoft/recognizers-text-suite": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-suite/-/recognizers-text-suite-1.1.2.tgz", + "integrity": "sha512-w3WCsKa//64jE1fGPFlV02rRg9+b3oDp+K5/skPAn4KDr80LjXxD1ulIgiJ2Ll/2OoBl8ociCiCjYA7zS3LpdQ==", + "requires": { + "@microsoft/recognizers-text": "~1.1.2", + "@microsoft/recognizers-text-choice": "~1.1.2", + "@microsoft/recognizers-text-date-time": "~1.1.2", + "@microsoft/recognizers-text-number": "~1.1.2", + "@microsoft/recognizers-text-number-with-unit": "~1.1.2", + "@microsoft/recognizers-text-sequence": "~1.1.2" + } + }, + "@types/node": { + "version": "9.6.47", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.47.tgz", + "integrity": "sha512-56wEJWXZs+3XXoTe/OCpdZ6czrONhy+6hT0GdPOb7HvudLTMJ1T5tuZPs37K5cPR5t+J9+vLPFDQgUQ8NWJE1w==" + }, + "@types/sequelize": { + "version": "4.27.24", + "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.24.tgz", + "integrity": "sha512-5uMFsMa/0hU/7/8znyfBKSJy2Mbd57uRpYk5X1+Phz9dN0MRZLbTbj1JMeB3CJ4R9b1coNQGfp2kXh4OjI9UyA==", + "requires": { + "@types/bluebird": "*", + "@types/continuation-local-storage": "*", + "@types/lodash": "*", + "@types/validator": "*" + } + }, + "botbuilder": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.1.7.tgz", + "integrity": "sha512-AlZhvjeqiCpeWGN1TkqBi09l6f0spYIh0Xzc4rJYF8feCFi4k2FEYC1IpiiOAtYhEBeQ9SOGFcUUwPaLmsI3Xg==", + "requires": { + "@types/filenamify": "^2.0.1", + "@types/node": "^9.3.0", + "async-file": "^2.0.2", + "botbuilder-core": "^4.1.7", + "botframework-connector": "^4.1.7", + "filenamify": "^2.0.0", + "rimraf": "^2.6.2" + } + }, + "botbuilder-ai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.2.0.tgz", + "integrity": "sha512-dt2OydZ9pWyMSNgha3PlC6lBq3sXUXAYmadqogNqvWpYEmIMdBOCUc02Vn2w1suxLX84GdYqdBI2klwrRZ7oKg==", + "requires": { + "@microsoft/recognizers-text-date-time": "1.1.2", + "@types/html-entities": "^1.2.16", + "@types/node": "^9.3.0", + "@types/request-promise-native": "^1.0.10", + "azure-cognitiveservices-luis-runtime": "^1.0.0", + "botbuilder": "^4.2.0", + "html-entities": "^1.2.1", + "moment": "^2.20.1", + "ms-rest": "^2.3.6", + "mstranslator": "^3.0.0", + "request": "^2.87.0", + "request-promise-native": "1.0.5" + }, + "dependencies": { + "botbuilder": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.4.tgz", + "integrity": "sha512-7EizagbDXGKCwHlQi0ICp1UpjBXxlha2c67y1XxaXzORWJyCTmd8HNP2iFdnxsZUGluh90jgN4C1hmJLBzSCUw==", + "requires": { + "@types/filenamify": "^2.0.1", + "@types/node": "^10.12.18", + "async-file": "^2.0.2", + "botbuilder-core": "^4.3.4", + "botframework-connector": "^4.3.4", + "filenamify": "^2.0.0" + }, + "dependencies": { + "@types/node": { + "version": "10.14.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", + "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" + } + } + } + } + }, + "botbuilder-azure": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.2.0.tgz", + "integrity": "sha512-WL8dHtVESE/qTFTGcJwlFeKyUeewoyoNr5ENavu1W40N8UjZB32ivmX2dvd0Zm4TIbeBwgmomF2gE9rE+0Rv3w==", + "requires": { + "@types/node": "^9.3.0", + "azure-storage": "^2.10.2", + "botbuilder": "^4.2.0", + "documentdb": "1.14.5", + "flat": "^4.0.0", + "semaphore": "^1.1.0" + }, + "dependencies": { + "botbuilder": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.4.tgz", + "integrity": "sha512-7EizagbDXGKCwHlQi0ICp1UpjBXxlha2c67y1XxaXzORWJyCTmd8HNP2iFdnxsZUGluh90jgN4C1hmJLBzSCUw==", + "requires": { + "@types/filenamify": "^2.0.1", + "@types/node": "^10.12.18", + "async-file": "^2.0.2", + "botbuilder-core": "^4.3.4", + "botframework-connector": "^4.3.4", + "filenamify": "^2.0.0" + }, + "dependencies": { + "@types/node": { + "version": "10.14.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", + "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" + } + } + } + } + }, + "botbuilder-dialogs": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.2.0.tgz", + "integrity": "sha512-wi7Vk/mRHqsjNVhCbXK6yoYsQ7uS7EySM+bcDRthw5uDQ9LyHHoRg3wzT+mqbfjzwgpKR/TXxPUDM4nDL8Hz+Q==", + "requires": { + "@microsoft/recognizers-text-choice": "1.1.2", + "@microsoft/recognizers-text-date-time": "1.1.2", + "@microsoft/recognizers-text-number": "1.1.2", + "@microsoft/recognizers-text-suite": "1.1.2", + "@types/node": "^9.3.0", + "botbuilder-core": "^4.2.0" + } + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -3240,6 +3380,64 @@ "requires": { "safer-buffer": ">= 2.1.2 < 3" } + }, + "request-promise-native": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", + "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", + "requires": { + "request-promise-core": "1.1.1", + "stealthy-require": "^1.1.0", + "tough-cookie": ">=2.3.3" + } + }, + "sequelize": { + "version": "4.43.0", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.43.0.tgz", + "integrity": "sha512-GkwGFVREKBf/ql6W6RXwXy1fzb/HOk0lmOBbcQrJMvJtB65Jfg7CUh+sENh0deuWk5s79JedgZJ/yEjvtzHXaQ==", + "requires": { + "bluebird": "^3.5.0", + "cls-bluebird": "^2.1.0", + "debug": "^3.1.0", + "depd": "^1.1.0", + "dottie": "^2.0.0", + "generic-pool": "3.5.0", + "inflection": "1.12.0", + "lodash": "^4.17.1", + "moment": "^2.20.0", + "moment-timezone": "^0.5.14", + "retry-as-promised": "^2.3.2", + "semver": "^5.5.0", + "terraformer-wkt-parser": "^1.1.2", + "toposort-class": "^1.0.1", + "uuid": "^3.2.1", + "validator": "^10.4.0", + "wkx": "^0.4.1" + } + }, + "sequelize-typescript": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.7.tgz", + "integrity": "sha512-ae21Gq9VOVXlIjnh2vLdL42Kev6r4LC82xOQ2fXo0lHzQvjFeH8/GaWUlpvYv57AOgc+ZnElbYFbSLKdT9ue0w==", + "requires": { + "@types/bluebird": "3.5.18", + "@types/node": "6.0.41", + "@types/sequelize": "4.27.24", + "es6-shim": "0.35.3", + "glob": "7.1.2" + }, + "dependencies": { + "@types/node": { + "version": "6.0.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.41.tgz", + "integrity": "sha1-V4z1Oq7GWIe8rxZ5L4ciky6P+Oo=" + } + } + }, + "validator": { + "version": "10.11.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", + "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==" } } }, @@ -3684,9 +3882,9 @@ "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o=" }, "chokidar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz", - "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz", + "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==", "requires": { "anymatch": "^2.0.0", "async-each": "^1.0.1", @@ -3699,7 +3897,7 @@ "normalize-path": "^3.0.0", "path-is-absolute": "^1.0.0", "readdirp": "^2.2.1", - "upath": "^1.1.0" + "upath": "^1.1.1" } }, "chownr": { @@ -4103,9 +4301,9 @@ } }, "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==" + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" }, "commitizen": { "version": "3.0.7", @@ -4611,9 +4809,9 @@ } }, "csv-parse": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.3.3.tgz", - "integrity": "sha512-bZ+AZjm2LlWEp5+TKeFeXDldduCUUaxEif+KUv+zvAwmCvCKTqeSHVEyxztGCQ6OE+87ObRq4NsCmg91SuJbhQ==" + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.3.4.tgz", + "integrity": "sha512-M1R4WL+vt81+GnkKzi0s1qQM6WXvHQKDecNkpozzAEG8LHvIW9bq5eBnOKFQn50fTuAos7JodBh/07MK+J6G2Q==" }, "csv-parser": { "version": "1.12.1", @@ -5372,9 +5570,9 @@ } }, "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" }, "yallist": { "version": "2.1.2", @@ -6457,8 +6655,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -6476,13 +6673,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6495,18 +6690,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -6609,8 +6801,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -6620,7 +6811,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6633,20 +6823,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6663,7 +6850,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -6736,8 +6922,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -6747,7 +6932,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6823,8 +7007,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -6854,7 +7037,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6872,7 +7054,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6911,13 +7092,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -8356,9 +8535,9 @@ "dev": true }, "js-beautify": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.0.tgz", - "integrity": "sha512-P0skmY4IDjfLiVrx+GLDeme8w5G0R1IGXgccVU5HP2VM3lRblH7qN2LTea5vZAxrDjpZBD0Jv+ahpjwVcbz/rw==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz", + "integrity": "sha512-oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ==", "requires": { "config-chain": "^1.1.12", "editorconfig": "^0.15.2", @@ -9039,9 +9218,9 @@ } }, "marked": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz", - "integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==" + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.2.tgz", + "integrity": "sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==" }, "marked-terminal": { "version": "3.2.0", @@ -14164,9 +14343,9 @@ } }, "opn": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz", - "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz", + "integrity": "sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==", "requires": { "is-wsl": "^1.1.0" } @@ -16031,37 +16210,58 @@ } }, "sequelize": { - "version": "4.43.0", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.43.0.tgz", - "integrity": "sha512-GkwGFVREKBf/ql6W6RXwXy1fzb/HOk0lmOBbcQrJMvJtB65Jfg7CUh+sENh0deuWk5s79JedgZJ/yEjvtzHXaQ==", + "version": "5.2.12", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-5.2.12.tgz", + "integrity": "sha512-Pgqri8SlWzd6gZCX0Zk0kTEnZlratF/W2l2A5zHtw4EMxL7jff+Jj8EazdTWqoh/1akCRn3iq2j/uMXcOBdhVQ==", "requires": { "bluebird": "^3.5.0", "cls-bluebird": "^2.1.0", - "debug": "^3.1.0", - "depd": "^1.1.0", + "debug": "^4.1.1", "dottie": "^2.0.0", - "generic-pool": "3.5.0", "inflection": "1.12.0", - "lodash": "^4.17.1", - "moment": "^2.20.0", - "moment-timezone": "^0.5.14", - "retry-as-promised": "^2.3.2", - "semver": "^5.5.0", - "terraformer-wkt-parser": "^1.1.2", + "lodash": "^4.17.11", + "moment": "^2.24.0", + "moment-timezone": "^0.5.21", + "retry-as-promised": "^3.1.0", + "semver": "^5.6.0", + "sequelize-pool": "^1.0.2", "toposort-class": "^1.0.1", "uuid": "^3.2.1", - "validator": "^10.4.0", - "wkx": "^0.4.1" + "validator": "^10.11.0", + "wkx": "^0.4.6" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { "ms": "^2.1.1" } }, + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + }, + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + }, + "retry-as-promised": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-3.2.0.tgz", + "integrity": "sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg==", + "requires": { + "any-promise": "^1.3.0" + } + }, + "semver": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" + }, "validator": { "version": "10.11.0", "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", @@ -16069,27 +16269,40 @@ } } }, - "sequelize-typescript": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.7.tgz", - "integrity": "sha512-ae21Gq9VOVXlIjnh2vLdL42Kev6r4LC82xOQ2fXo0lHzQvjFeH8/GaWUlpvYv57AOgc+ZnElbYFbSLKdT9ue0w==", + "sequelize-pool": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-1.0.2.tgz", + "integrity": "sha512-VMKl/gCCdIvB1gFZ7p+oqLFEyZEz3oMMYjkKvfEC7GoO9bBcxmfOOU9RdkoltfXGgBZFigSChihRly2gKtsh2w==", "requires": { - "@types/bluebird": "3.5.18", - "@types/node": "6.0.41", - "@types/sequelize": "4.27.24", + "bluebird": "^3.5.3" + } + }, + "sequelize-typescript": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.9.tgz", + "integrity": "sha512-8A5gi8BpKx4Gk9BjD3Dxrv7Ps/7PpZuYfoVkQXNMuL9a4M2d2fKZiBLurSA/5KmNgdVrLKKRkyJxghBpFR7tNg==", + "requires": { + "@types/bluebird": "3.5.26", + "@types/node": "11.12.2", + "@types/sequelize": "4.27.46", "es6-shim": "0.35.3", "glob": "7.1.2" }, "dependencies": { + "@types/bluebird": { + "version": "3.5.26", + "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.26.tgz", + "integrity": "sha512-aj2mrBLn5ky0GmAg6IPXrQjnN0iB/ulozuJ+oZdrHRAzRbXjGmu4UXsNCjFvPbSaaPZmniocdOzsM392qLOlmQ==" + }, "@types/node": { - "version": "6.0.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.41.tgz", - "integrity": "sha1-V4z1Oq7GWIe8rxZ5L4ciky6P+Oo=" + "version": "11.12.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.12.2.tgz", + "integrity": "sha512-c82MtnqWB/CqqK7/zit74Ob8H1dBdV7bK+BcErwtXbe0+nUGkgzq5NTDmRW/pAv2lFtmeNmW95b0zK2hxpeklg==" }, "@types/sequelize": { - "version": "4.27.24", - "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.24.tgz", - "integrity": "sha512-5uMFsMa/0hU/7/8znyfBKSJy2Mbd57uRpYk5X1+Phz9dN0MRZLbTbj1JMeB3CJ4R9b1coNQGfp2kXh4OjI9UyA==", + "version": "4.27.46", + "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.46.tgz", + "integrity": "sha512-hqosowwLJsLrR+A8IOVgGQaToaBAZE54WLJmjxARaoHC4hl4lmfzXPNY/JGn3hmxNIhb6klHs7skQ2uJPrlXSA==", "requires": { "@types/bluebird": "*", "@types/continuation-local-storage": "*", @@ -16352,17 +16565,17 @@ } }, "simple-git": { - "version": "1.107.0", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.107.0.tgz", - "integrity": "sha512-t4OK1JRlp4ayKRfcW6owrWcRVLyHRUlhGd0uN6ZZTqfDq8a5XpcUdOKiGRNobHEuMtNqzp0vcJNvhYWwh5PsQA==", + "version": "1.110.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.110.0.tgz", + "integrity": "sha512-UYY0rQkknk0P5eb+KW+03F4TevZ9ou0H+LoGaj7iiVgpnZH4wdj/HTViy/1tNNkmIPcmtxuBqXWiYt2YwlRKOQ==", "requires": { "debug": "^4.0.1" }, "dependencies": { "debug": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { "ms": "^2.1.1" } @@ -17171,19 +17384,19 @@ } }, "tedious": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/tedious/-/tedious-5.0.3.tgz", - "integrity": "sha512-GSGmm7+o+5Zzi2vSKIKkC+8J4uRc9wOR+DZ3LTecz8quTpA+5KAd2cmfbENxi7dTWTP3ARobpY3jchBqbbo4WQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tedious/-/tedious-6.1.0.tgz", + "integrity": "sha512-ejIgokiYwyKwGzwqkcx5hdQ6faJOhwOZzStLMSC7E+mbetI5/Rl+JD1K7B/SlNH1Hz7WlGcZxMeRR7ioGpqWAw==", "requires": { "adal-node": "^0.1.22", "big-number": "1.0.0", - "bl": "^2.0.1", + "bl": "^2.2.0", "depd": "^1.1.2", "iconv-lite": "^0.4.23", "native-duplexpair": "^1.0.0", "punycode": "^2.1.0", - "readable-stream": "^3.0.3", - "sprintf-js": "^1.1.1" + "readable-stream": "^3.1.1", + "sprintf-js": "^1.1.2" }, "dependencies": { "punycode": { @@ -17192,9 +17405,9 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, "readable-stream": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz", - "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz", + "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -17635,9 +17848,9 @@ "integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=" }, "tslint": { - "version": "5.13.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.13.1.tgz", - "integrity": "sha512-fplQqb2miLbcPhyHoMV4FU9PtNRbgmm/zI5d3SZwwmJQM6V0eodju+hplpyfhLWpmwrDNfNYU57uYRb8s0zZoQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.15.0.tgz", + "integrity": "sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==", "dev": true, "requires": { "babel-code-frame": "^6.22.0", @@ -17646,13 +17859,25 @@ "commander": "^2.12.1", "diff": "^3.2.0", "glob": "^7.1.1", - "js-yaml": "^3.7.0", + "js-yaml": "^3.13.0", "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "resolve": "^1.3.2", "semver": "^5.3.0", "tslib": "^1.8.0", - "tsutils": "^2.27.2" + "tsutils": "^2.29.0" + }, + "dependencies": { + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + } } }, "tslint-microsoft-contrib": { @@ -17788,9 +18013,9 @@ } }, "typescript": { - "version": "3.3.3333", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz", - "integrity": "sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==" + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.1.tgz", + "integrity": "sha512-3NSMb2VzDQm8oBTLH6Nj55VVtUEpe/rgkIzMir0qVoLyjDZlnMBva0U6vDiV3IH+sl/Yu6oP5QwsAQtHPmDd2Q==" }, "typpy": { "version": "2.3.10", @@ -17982,9 +18207,9 @@ "dev": true }, "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", + "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==" }, "update-notifier": { "version": "2.3.0", diff --git a/package.json b/package.json index 466612a1f..e2161e278 100644 --- a/package.json +++ b/package.json @@ -57,28 +57,28 @@ "azure-arm-search": "^1.3.0-preview", "azure-arm-sql": "5.6.0", "azure-arm-website": "5.7.0", - "bluebird": "^3.5.3", + "bluebird": "^3.5.4", "body-parser": "1.18.3", - "botbuilder": "4.1.7", - "botbuilder-ai": "4.2.0", - "botbuilder-azure": "4.2.0", + "botbuilder": "4.3.4", + "botbuilder-ai": "4.3.4", + "botbuilder-azure": "4.3.4", "botbuilder-choices": "4.0.0-preview1.2", - "botbuilder-dialogs": "4.2.0", + "botbuilder-dialogs": "4.3.4", "botbuilder-prompts": "4.0.0-preview1.2", - "botlib": "^0.1.23", + "botlib": "0.1.24", "chai": "4.2.0", "child_process": "^1.0.2", - "chokidar": "2.1.2", + "chokidar": "2.1.5", "cli-spinner": "^0.2.10", - "csv-parse": "4.3.3", + "csv-parse": "4.3.4", "dotenv-extended": "2.4.0", "express": "4.16.4", "express-promise-router": "3.0.3", "fs-extra": "7.0.1", "ip": "^1.1.5", - "js-beautify": "^1.9.0", + "js-beautify": "^1.9.1", "localize": "0.4.7", - "marked": "0.6.1", + "marked": "0.6.2", "mocha": "6.0.2", "mocha-typescript": "1.1.17", "ms": "2.1.1", @@ -87,28 +87,28 @@ "nexmo": "2.4.1", "ngrok": "3.1.1", "nyc": "13.3.0", - "opn": "5.4.0", - "pragmatismo-io-framework": "1.0.19", + "opn": "6.0.0", + "pragmatismo-io-framework": "1.0.20", "process-exists": "3.1.0", "public-ip": "^3.0.0", "reflect-metadata": "0.1.13", "request-promise": "4.2.4", "request-promise-native": "1.0.7", "scanf": "^1.0.2", - "sequelize": "^4.43.0", - "sequelize-typescript": "0.6.7", + "sequelize": "^5.2.12", + "sequelize-typescript": "0.6.9", "shx": "0.3.2", - "simple-git": "1.107.0", + "simple-git": "1.110.0", "sqlite3": "4.0.6", "strict-password-generator": "^1.1.2", "swagger-client": "3.8.25", - "tedious": "5.0.3", + "tedious": "6.1.0", "temperature-js": "^0.1.0", "ts-node": "8.0.3", "typedoc": "0.14.2", "typedoc-plugin-external-module-name": "^2.0.0", "typedoc-plugin-markdown": "^1.1.27", - "typescript": "3.3.3333", + "typescript": "3.4.1", "url-join": "4.0.0", "vbscript-to-typescript": "^1.0.8", "wait-until": "0.0.2", @@ -124,7 +124,7 @@ "@semantic-release/release-notes-generator": "^7.1.4", "@types/chai": "4.1.7", "@types/mocha": "5.2.6", - "@types/sequelize": "4.27.39", + "@types/sequelize": "4.27.46", "@types/url-join": "4.0.0", "@types/winston": "2.4.4", "ban-sensitive-files": "1.9.2", @@ -142,7 +142,7 @@ "standard": "12.0.1", "travis-deploy-once": "5.0.11", "ts-loader": "^5.3.3", - "tslint": "^5.13.1", + "tslint": "^5.15.0", "tslint-microsoft-contrib": "^6.1.0" }, "eslintConfig": { diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts index eb27b4d4b..828bc9265 100644 --- a/packages/admin.gbapp/dialogs/AdminDialog.ts +++ b/packages/admin.gbapp/dialogs/AdminDialog.ts @@ -65,7 +65,7 @@ export class AdminDialog extends IGBDialog { if (!AdminDialog.isSharePointPath(packageName)) { const additionalPath = GBConfigService.get('ADDITIONAL_DEPLOY_PATH'); - if (additionalPath !== undefined) { + if (additionalPath === undefined) { throw new Error('ADDITIONAL_DEPLOY_PATH is not set and deployPackage was called.'); } await deployer.deployPackage(min, urlJoin(additionalPath, packageName)); diff --git a/packages/analytics.gblib/models/index.ts b/packages/analytics.gblib/models/index.ts index 34d4a4c71..f0f494f39 100644 --- a/packages/analytics.gblib/models/index.ts +++ b/packages/analytics.gblib/models/index.ts @@ -36,12 +36,6 @@ 'use strict'; -import { - DataTypeDate, - DataTypeDecimal, - DataTypes, - DataTypeUUIDv4 -} from 'sequelize'; import { AutoIncrement, diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 583436670..383af961e 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -218,7 +218,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { const query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${ this.provider - }/botServices/${botId}?api-version=${this.apiVersion}`; + }/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); @@ -313,7 +313,8 @@ export class AzureDeployerService implements IGBInstallationDeployer { GBLog.info(`Deploying Text Analytics...`); const textAnalytics = await this.createTextAnalytics(name, `${name}-textanalytics`, instance.cloudLocation); keys = await this.cognitiveClient.accounts.listKeys(name, textAnalytics.name); - instance.textAnalyticsEndpoint = textAnalytics.endpoint; + + instance.textAnalyticsEndpoint = textAnalytics.endpoint.replace(`/text/analytics/v2.0`, ''); instance.textAnalyticsKey = keys.key1; GBLog.info(`Deploying NLP...`); @@ -460,7 +461,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { const httpClient = new ServiceClient(); let query = `subscriptions/${subscriptionId}/resourceGroups/${group}/providers/${ this.provider - }/botServices/${botId}?api-version=${this.apiVersion}`; + }/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); @@ -475,7 +476,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { //tslint:disable-next-line:max-line-length 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); @@ -485,7 +486,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { } catch (error) { reject(error); } - }, 20000); + }, 20000); }); } diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index 71e18769c..438b1aded 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -121,8 +121,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'; @@ -137,9 +137,10 @@ export class GBCoreService implements IGBCoreService { dialect: this.dialect, storage: storage, dialectOptions: { - encrypt: encrypt - }, - pool: { + options: { + encrypt: encrypt + } + }, pool: { max: 32, min: 8, idle: 40000, @@ -345,8 +346,8 @@ STORAGE_SYNC=true GBCorePackage, GBSecurityPackage, GBKBPackage, - GBCustomerSatisfactionPackage, - GBWhatsappPackage + GBCustomerSatisfactionPackage + // GBWhatsappPackage ].forEach(e => { GBLog.info(`Loading sys package: ${e.name}...`); const p = Object.create(e.prototype) as IGBPackage; diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 12bdf7158..07a2de95a 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -140,7 +140,7 @@ export class GBMinService { // Install default VBA module. - deployer.deployPackage(min, 'packages/default.gbdialog'); + // DISABLED: deployer.deployPackage(min, 'packages/default.gbdialog'); // Call the loadBot context.activity for all packages. @@ -354,8 +354,8 @@ export class GBMinService { GBAdminPackage, GBKBPackage, GBAnalyticsPackage, - GBCustomerSatisfactionPackage, - GBWhatsappPackage + GBCustomerSatisfactionPackage + // DISABLED: GBWhatsappPackage ].forEach(sysPackage => { const p = Object.create(sysPackage.prototype) as IGBPackage; p.loadBot(min); diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index 7b581b8f8..d63178803 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -210,25 +210,29 @@ export class KBService { if (subjects) { const where = { from: from, - subject1: undefined, - subject2: undefined, - subject3: undefined, - subject4: undefined + // tslint:disable-next-line: no-null-keyword + subject1: null, + // tslint:disable-next-line: no-null-keyword + subject2: null, + // tslint:disable-next-line: no-null-keyword + subject3: null, + // tslint:disable-next-line: no-null-keyword + subject4: null }; - if (subjects[0]) { + if (subjects[0] && subjects[0].internalId) { where.subject1 = subjects[0].internalId; } - if (subjects[1]) { + if (subjects[1] && subjects[1].internalId) { where.subject2 = subjects[1].internalId; } - if (subjects[2]) { + if (subjects[2] && subjects[2].internalId) { where.subject3 = subjects[2].internalId; } - if (subjects[3]) { + if (subjects[3] && subjects[3].internalId) { where.subject4 = subjects[3].internalId; } @@ -329,7 +333,7 @@ export class KBService { packageId: packageId }); - if (lastAnswer !== null && lastQuestionId !== 0) { + if (lastAnswer !== undefined && lastQuestionId !== 0) { await lastAnswer.update({ nextId: lastQuestionId }); } lastAnswer = answer1; diff --git a/packages/security.gblib/models/index.ts b/packages/security.gblib/models/index.ts index e5e0e924e..215be2910 100644 --- a/packages/security.gblib/models/index.ts +++ b/packages/security.gblib/models/index.ts @@ -36,30 +36,17 @@ 'use strict'; -import { - DataTypeDate, - DataTypeDecimal, - DataTypes, - DataTypeUUIDv4 -} from 'sequelize'; import { AutoIncrement, BelongsTo, - BelongsToMany, Column, - CreatedAt, DataType, ForeignKey, - HasMany, - IsUUID, Length, Model, PrimaryKey, - Sequelize, - Table, - UpdatedAt -} from 'sequelize-typescript'; + Table} from 'sequelize-typescript'; import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; From 7ffe671c7e6b80d81b16f054ebc1efd7e4c7a974 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sun, 7 Apr 2019 19:48:47 -0300 Subject: [PATCH 13/15] fix(general): tslint being applied in all sources. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e2161e278..073afdd3e 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "botbuilder-choices": "4.0.0-preview1.2", "botbuilder-dialogs": "4.3.4", "botbuilder-prompts": "4.0.0-preview1.2", - "botlib": "0.1.24", + "botlib": "0.1.23", "chai": "4.2.0", "child_process": "^1.0.2", "chokidar": "2.1.5", @@ -88,7 +88,7 @@ "ngrok": "3.1.1", "nyc": "13.3.0", "opn": "6.0.0", - "pragmatismo-io-framework": "1.0.20", + "pragmatismo-io-framework": "1.0.19", "process-exists": "3.1.0", "public-ip": "^3.0.0", "reflect-metadata": "0.1.13", From 3f4d77123116d5c45cec1ca5a0a8400cd39a293a Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 8 Apr 2019 11:30:01 -0300 Subject: [PATCH 14/15] fix(general): tslint being applied in all sources. --- packages/core.gbapp/services/GBMinService.ts | 2 +- packages/kb.gbapp/dialogs/MenuDialog.ts | 10 ++++++---- packages/kb.gbapp/services/KBService.ts | 2 +- packages/kb.gbapp/strings.ts | 5 ++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 07a2de95a..555f36ac9 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -458,7 +458,7 @@ export class GBMinService { if (context.activity.name === 'whoAmI') { await step.beginDialog('/whoAmI'); } else if (context.activity.name === 'showSubjects') { - await step.beginDialog('/menu'); + await step.beginDialog('/menu', undefined); } else if (context.activity.name === 'giveFeedback') { await step.beginDialog('/feedback', { fromMenu: true diff --git a/packages/kb.gbapp/dialogs/MenuDialog.ts b/packages/kb.gbapp/dialogs/MenuDialog.ts index 9904fedc3..b0e9578dd 100644 --- a/packages/kb.gbapp/dialogs/MenuDialog.ts +++ b/packages/kb.gbapp/dialogs/MenuDialog.ts @@ -76,18 +76,20 @@ export class MenuDialog extends IGBDialog { const user = await min.userProfile.get(step.context, {}); const args: MenuDialogArgs = step.options; - let rootSubjectId; + // tslint:disable-next-line: no-null-keyword + let rootSubjectId = null; - if (args !== undefined) { + if (Object.keys(args).length > 0) { // If there is a shortcut specified as subject destination, go there. - if (args.to !== undefined) { + if (args.to !== null) { const dialog = args.to.split(':')[1]; return await step.replaceDialog(`/${dialog}`); } user.subjects.push(args); - rootSubjectId = args.subjectId; + // tslint:disable-next-line: no-null-keyword + rootSubjectId = args.subjectId === undefined ? null : args.subjectId; // Whenever a subject is selected, shows a faq about it. if (user.subjects.length > 0) { diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index d63178803..11029b48d 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -73,7 +73,7 @@ export class KBService { } public static getFormattedSubjectItems(subjects: GuaribasSubject[]) { - if (subjects !== null) { + if (subjects === null) { return ''; } const out = []; diff --git a/packages/kb.gbapp/strings.ts b/packages/kb.gbapp/strings.ts index 787d13053..341af5a05 100644 --- a/packages/kb.gbapp/strings.ts +++ b/packages/kb.gbapp/strings.ts @@ -10,9 +10,8 @@ export const Messages = { here_is_subjects: 'Here are some subjects to choose from...', menu_select: 'Select', lets_search: query => - `Vamos pesquisar sobre ${query}... O que deseja saber?`, - 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 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.', will_answer_projector: 'I\'ll answer on the projector to a better experience...', ask_first_time: 'What are you looking for?' From 27ba0eb3bfe24ea401d7388cd9168d6f5f64f74a Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 8 Apr 2019 11:59:55 -0300 Subject: [PATCH 15/15] fix(general): tslint being applied in all sources. --- package-lock.json | 281 ++-------------------------------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 271 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3724beea3..8b904408d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1539,7 +1539,8 @@ "@types/bluebird": { "version": "3.5.18", "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.18.tgz", - "integrity": "sha512-OTPWHmsyW18BhrnG5x8F7PzeZ2nFxmHGb42bZn79P9hl+GI5cMzyPgQTwNjbem0lJhoru/8vtjAFCUOu3+gE2w==" + "integrity": "sha512-OTPWHmsyW18BhrnG5x8F7PzeZ2nFxmHGb42bZn79P9hl+GI5cMzyPgQTwNjbem0lJhoru/8vtjAFCUOu3+gE2w==", + "dev": true }, "@types/caseless": { "version": "0.12.1", @@ -1594,11 +1595,6 @@ "@types/node": "*" } }, - "@types/geojson": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz", - "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==" - }, "@types/glob": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", @@ -3189,16 +3185,16 @@ "integrity": "sha512-8t+pyoMC1zN0w223SLh+qFe19ILYxcC12VPRRPXS8dydFqnCf8nV+SOpXoVFsx0eaKIhWXe868olz+Ms3ihTkA==" }, "botlib": { - "version": "0.1.23", - "resolved": "https://registry.npmjs.org/botlib/-/botlib-0.1.23.tgz", - "integrity": "sha512-hYDLME5hDuPJcPJ7wUU8rDjZ9WX8yfkDwEwaO8QbVxlKttygZuxs0Yu1dFBdNxjg7fdrqmZF560Z3DliyhkVhg==", + "version": "0.1.24", + "resolved": "https://registry.npmjs.org/botlib/-/botlib-0.1.24.tgz", + "integrity": "sha512-DJGDKVouvsV32dzjvZwfo55YE8LslTpO496C3AyDEv3X/K8hRxVhb6bwW5hY74Z3P6xnorGMSimKKNR+b5iFCg==", "requires": { "async": "2.6.2", - "botbuilder": "4.1.7", - "botbuilder-ai": "4.2.0", - "botbuilder-azure": "4.2.0", + "botbuilder": "4.3.4", + "botbuilder-ai": "4.3.4", + "botbuilder-azure": "4.3.4", "botbuilder-choices": "4.0.0-preview1.2", - "botbuilder-dialogs": "4.2.0", + "botbuilder-dialogs": "4.3.4", "botbuilder-prompts": "4.0.0-preview1.2", "chrono-node": "1.3.11", "dotenv-extended": "2.4.0", @@ -3206,173 +3202,12 @@ "ms": "2.1.1", "pragmatismo-io-framework": "1.0.19", "reflect-metadata": "0.1.13", - "sequelize": "4.43.0", - "sequelize-typescript": "0.6.7", + "sequelize": "5.2.12", + "sequelize-typescript": "0.6.9", "wait-until": "0.0.2", "winston": "3.2.1" }, "dependencies": { - "@microsoft/recognizers-text-choice": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-choice/-/recognizers-text-choice-1.1.2.tgz", - "integrity": "sha512-4hFdqxusM0YrOXYM2RVYPl2rLjItSh6VkRiACjWB95GKC/DBGjJRYQpTxhzuZAsJSkDMinu/aLf8DvQtwUaLtA==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "grapheme-splitter": "^1.0.2" - } - }, - "@microsoft/recognizers-text-number": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-number/-/recognizers-text-number-1.1.2.tgz", - "integrity": "sha512-GESjSF42dllym83diyd6pmlzFwdzidewoq/qSQz89lSoTx9HdJQHjbXxwdBp7w4Ax/Jroo2lcAedM3B7alZhYQ==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "bignumber.js": "^7.2.1", - "lodash.escaperegexp": "^4.1.2", - "lodash.sortby": "^4.7.0", - "lodash.trimend": "^4.5.1" - } - }, - "@microsoft/recognizers-text-suite": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-suite/-/recognizers-text-suite-1.1.2.tgz", - "integrity": "sha512-w3WCsKa//64jE1fGPFlV02rRg9+b3oDp+K5/skPAn4KDr80LjXxD1ulIgiJ2Ll/2OoBl8ociCiCjYA7zS3LpdQ==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "@microsoft/recognizers-text-choice": "~1.1.2", - "@microsoft/recognizers-text-date-time": "~1.1.2", - "@microsoft/recognizers-text-number": "~1.1.2", - "@microsoft/recognizers-text-number-with-unit": "~1.1.2", - "@microsoft/recognizers-text-sequence": "~1.1.2" - } - }, - "@types/node": { - "version": "9.6.47", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.47.tgz", - "integrity": "sha512-56wEJWXZs+3XXoTe/OCpdZ6czrONhy+6hT0GdPOb7HvudLTMJ1T5tuZPs37K5cPR5t+J9+vLPFDQgUQ8NWJE1w==" - }, - "@types/sequelize": { - "version": "4.27.24", - "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.24.tgz", - "integrity": "sha512-5uMFsMa/0hU/7/8znyfBKSJy2Mbd57uRpYk5X1+Phz9dN0MRZLbTbj1JMeB3CJ4R9b1coNQGfp2kXh4OjI9UyA==", - "requires": { - "@types/bluebird": "*", - "@types/continuation-local-storage": "*", - "@types/lodash": "*", - "@types/validator": "*" - } - }, - "botbuilder": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.1.7.tgz", - "integrity": "sha512-AlZhvjeqiCpeWGN1TkqBi09l6f0spYIh0Xzc4rJYF8feCFi4k2FEYC1IpiiOAtYhEBeQ9SOGFcUUwPaLmsI3Xg==", - "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^9.3.0", - "async-file": "^2.0.2", - "botbuilder-core": "^4.1.7", - "botframework-connector": "^4.1.7", - "filenamify": "^2.0.0", - "rimraf": "^2.6.2" - } - }, - "botbuilder-ai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.2.0.tgz", - "integrity": "sha512-dt2OydZ9pWyMSNgha3PlC6lBq3sXUXAYmadqogNqvWpYEmIMdBOCUc02Vn2w1suxLX84GdYqdBI2klwrRZ7oKg==", - "requires": { - "@microsoft/recognizers-text-date-time": "1.1.2", - "@types/html-entities": "^1.2.16", - "@types/node": "^9.3.0", - "@types/request-promise-native": "^1.0.10", - "azure-cognitiveservices-luis-runtime": "^1.0.0", - "botbuilder": "^4.2.0", - "html-entities": "^1.2.1", - "moment": "^2.20.1", - "ms-rest": "^2.3.6", - "mstranslator": "^3.0.0", - "request": "^2.87.0", - "request-promise-native": "1.0.5" - }, - "dependencies": { - "botbuilder": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.4.tgz", - "integrity": "sha512-7EizagbDXGKCwHlQi0ICp1UpjBXxlha2c67y1XxaXzORWJyCTmd8HNP2iFdnxsZUGluh90jgN4C1hmJLBzSCUw==", - "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^10.12.18", - "async-file": "^2.0.2", - "botbuilder-core": "^4.3.4", - "botframework-connector": "^4.3.4", - "filenamify": "^2.0.0" - }, - "dependencies": { - "@types/node": { - "version": "10.14.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", - "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" - } - } - } - } - }, - "botbuilder-azure": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.2.0.tgz", - "integrity": "sha512-WL8dHtVESE/qTFTGcJwlFeKyUeewoyoNr5ENavu1W40N8UjZB32ivmX2dvd0Zm4TIbeBwgmomF2gE9rE+0Rv3w==", - "requires": { - "@types/node": "^9.3.0", - "azure-storage": "^2.10.2", - "botbuilder": "^4.2.0", - "documentdb": "1.14.5", - "flat": "^4.0.0", - "semaphore": "^1.1.0" - }, - "dependencies": { - "botbuilder": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.3.4.tgz", - "integrity": "sha512-7EizagbDXGKCwHlQi0ICp1UpjBXxlha2c67y1XxaXzORWJyCTmd8HNP2iFdnxsZUGluh90jgN4C1hmJLBzSCUw==", - "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^10.12.18", - "async-file": "^2.0.2", - "botbuilder-core": "^4.3.4", - "botframework-connector": "^4.3.4", - "filenamify": "^2.0.0" - }, - "dependencies": { - "@types/node": { - "version": "10.14.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", - "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==" - } - } - } - } - }, - "botbuilder-dialogs": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.2.0.tgz", - "integrity": "sha512-wi7Vk/mRHqsjNVhCbXK6yoYsQ7uS7EySM+bcDRthw5uDQ9LyHHoRg3wzT+mqbfjzwgpKR/TXxPUDM4nDL8Hz+Q==", - "requires": { - "@microsoft/recognizers-text-choice": "1.1.2", - "@microsoft/recognizers-text-date-time": "1.1.2", - "@microsoft/recognizers-text-number": "1.1.2", - "@microsoft/recognizers-text-suite": "1.1.2", - "@types/node": "^9.3.0", - "botbuilder-core": "^4.2.0" - } - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -3380,64 +3215,6 @@ "requires": { "safer-buffer": ">= 2.1.2 < 3" } - }, - "request-promise-native": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", - "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", - "requires": { - "request-promise-core": "1.1.1", - "stealthy-require": "^1.1.0", - "tough-cookie": ">=2.3.3" - } - }, - "sequelize": { - "version": "4.43.0", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.43.0.tgz", - "integrity": "sha512-GkwGFVREKBf/ql6W6RXwXy1fzb/HOk0lmOBbcQrJMvJtB65Jfg7CUh+sENh0deuWk5s79JedgZJ/yEjvtzHXaQ==", - "requires": { - "bluebird": "^3.5.0", - "cls-bluebird": "^2.1.0", - "debug": "^3.1.0", - "depd": "^1.1.0", - "dottie": "^2.0.0", - "generic-pool": "3.5.0", - "inflection": "1.12.0", - "lodash": "^4.17.1", - "moment": "^2.20.0", - "moment-timezone": "^0.5.14", - "retry-as-promised": "^2.3.2", - "semver": "^5.5.0", - "terraformer-wkt-parser": "^1.1.2", - "toposort-class": "^1.0.1", - "uuid": "^3.2.1", - "validator": "^10.4.0", - "wkx": "^0.4.1" - } - }, - "sequelize-typescript": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.7.tgz", - "integrity": "sha512-ae21Gq9VOVXlIjnh2vLdL42Kev6r4LC82xOQ2fXo0lHzQvjFeH8/GaWUlpvYv57AOgc+ZnElbYFbSLKdT9ue0w==", - "requires": { - "@types/bluebird": "3.5.18", - "@types/node": "6.0.41", - "@types/sequelize": "4.27.24", - "es6-shim": "0.35.3", - "glob": "7.1.2" - }, - "dependencies": { - "@types/node": { - "version": "6.0.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.41.tgz", - "integrity": "sha1-V4z1Oq7GWIe8rxZ5L4ciky6P+Oo=" - } - } - }, - "validator": { - "version": "10.11.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", - "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==" } } }, @@ -7147,11 +6924,6 @@ "is-property": "^1.0.0" } }, - "generic-pool": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.5.0.tgz", - "integrity": "sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w==" - }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -9779,11 +9551,6 @@ "xml2js": "^0.4.19" } }, - "mstranslator": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mstranslator/-/mstranslator-3.0.0.tgz", - "integrity": "sha1-ancOpFD/tMZfaNXmruBRuC3gXPM=" - }, "mute-stream": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", @@ -15787,15 +15554,6 @@ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", "dev": true }, - "retry-as-promised": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.3.2.tgz", - "integrity": "sha1-zZdO5P2bX+A8vzGHHuSCIcB3N7c=", - "requires": { - "bluebird": "^3.4.6", - "debug": "^2.6.9" - } - }, "right-pad": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz", @@ -17430,23 +17188,6 @@ "execa": "^0.7.0" } }, - "terraformer": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.9.tgz", - "integrity": "sha512-YlmQ1fsMWTkKGDGibCRWgmLzrpDRUr63Q025LJ/taYQ6j1Yb8q9McKF7NBi6ACAyUXO6F/bl9w6v4MY307y5Ag==", - "requires": { - "@types/geojson": "^1.0.0" - } - }, - "terraformer-wkt-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.0.tgz", - "integrity": "sha512-QU3iA54St5lF8Za1jg1oj4NYc8sn5tCZ08aNSWDeGzrsaV48eZk1iAVWasxhNspYBoCqdHuoot1pUTUrE1AJ4w==", - "requires": { - "@types/geojson": "^1.0.0", - "terraformer": "~1.0.5" - } - }, "text-extensions": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", diff --git a/package.json b/package.json index 073afdd3e..b7cca44a7 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "botbuilder-choices": "4.0.0-preview1.2", "botbuilder-dialogs": "4.3.4", "botbuilder-prompts": "4.0.0-preview1.2", - "botlib": "0.1.23", + "botlib": "0.1.24", "chai": "4.2.0", "child_process": "^1.0.2", "chokidar": "2.1.5",