diff --git a/VERSION.md b/VERSION.md index 4f32cddc..9f8b9659 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1,11 +1,15 @@ # Release History +## Version 0.0.26 +- Update of dependencies versions (package.json). +- If a bot package's name begins with '.', then it is ignored. +- Created DATABASE_LOGGING environment parameter. + ## Version 0.0.25 - FIX: Whastapp line now can be turned off; - FIX: More error logging on BuildMin. - ## Version 0.0.24 - FIX: AskDialog compilation error. diff --git a/deploy/core.gbapp/services/GBCoreService.ts b/deploy/core.gbapp/services/GBCoreService.ts index 5e50cca7..c6f87b6e 100644 --- a/deploy/core.gbapp/services/GBCoreService.ts +++ b/deploy/core.gbapp/services/GBCoreService.ts @@ -82,12 +82,21 @@ export class GBCoreService implements IGBCoreService { storage = GBConfigService.get("DATABASE_STORAGE"); } + let value = GBConfigService.get("DATABASE_LOGGING"); + let logging: boolean | Function = false; + + if (value && value == "1") { + logging = (str) => { + logger.trace(str); + }; + } + this.sequelize = new Sequelize({ host: host, database: database, username: username, password: password, - logging: false, + logging: logging, operatorsAliases: false, dialect: this.dialect, storage: storage, diff --git a/deploy/core.gbapp/services/GBMinService.ts b/deploy/core.gbapp/services/GBMinService.ts index bbf42e02..0c74c59b 100644 --- a/deploy/core.gbapp/services/GBMinService.ts +++ b/deploy/core.gbapp/services/GBMinService.ts @@ -254,7 +254,7 @@ export class GBMinService { if ( event.type === "conversationUpdate" && - event.membersAdded.length > 0 + event.membersAdded.length > 0 // TODO: Is it really Necessary? !event.membersAdded[0].id.startsWith('general-bot-9672a8d3') //DEMO: min.botId) //TODO: Check entire collection. ) { @@ -334,14 +334,19 @@ export class GBMinService { let dirs = getDirectories(path); dirs.forEach(element => { - if (element.endsWith('.gbot')) { - botPackages.push(element); - } - else if (element.endsWith('.gbapp')) { - gbappPackages.push(element); + if (element.startsWith('.')) { + logger.trace(`Ignoring ${element}...`); } else { - generalPackages.push(element); + if (element.endsWith('.gbot')) { + botPackages.push(element); + } + else if (element.endsWith('.gbapp')) { + gbappPackages.push(element); + } + else { + generalPackages.push(element); + } } }); diff --git a/package-lock.json b/package-lock.json index 869ca416..04aec24f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "0.0.25", + "version": "0.0.26", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -131,9 +131,9 @@ } }, "@types/lodash": { - "version": "4.14.108", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.108.tgz", - "integrity": "sha512-WD2vUOKfBBVHxWUV9iMR9RMfpuf8HquxWeAq2yqGVL7Nc4JW2+sQama0pREMqzNI3Tutj0PyxYUJwuoxxvX+xA==" + "version": "4.14.109", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.109.tgz", + "integrity": "sha512-hop8SdPUEzbcJm6aTsmuwjIYQo1tqLseKCM+s2bBqTU2gErwI4fE+aqUVOlscPSQbKHKgtMMPoC+h4AIGOJYvw==" }, "@types/marked": { "version": "0.3.0", @@ -183,7 +183,7 @@ "requires": { "@types/bluebird": "3.5.18", "@types/continuation-local-storage": "3.2.1", - "@types/lodash": "4.14.108", + "@types/lodash": "4.14.109", "@types/validator": "9.4.1" } }, @@ -671,7 +671,7 @@ "iconv-lite": "0.4.19", "pragmatismo-io-framework": "1.0.12", "reflect-metadata": "0.1.12", - "sequelize": "4.37.7", + "sequelize": "4.37.10", "typescript": "2.8.3", "urljoin": "0.1.5", "wait-until": "0.0.2", @@ -3504,7 +3504,7 @@ "requires": { "azure-search": "0.0.20", "cogserv-text-analytics": "0.3.2", - "sequelize-typescript": "0.6.4", + "sequelize-typescript": "0.6.5", "url-join": "4.0.0" } }, @@ -3902,9 +3902,9 @@ } }, "sequelize": { - "version": "4.37.7", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.37.7.tgz", - "integrity": "sha512-1/M1Aua2GgejZbUI3T90G3uXXjcM4gTfFC36jGsepaJh3cRK9plPmlZeKkAQWWn4bCJaJozeEtuxfyPfQUY9wg==", + "version": "4.37.10", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.37.10.tgz", + "integrity": "sha512-Ugfqfciorsq2xX2xOimp/f2VVQdMAnClrl+0i34OgjVgQOAXDjgbbA5TwYTgGNxuv/a7r3+ELQi28mNmoizsSw==", "requires": { "bluebird": "3.5.1", "cls-bluebird": "2.1.0", @@ -3918,7 +3918,7 @@ "moment-timezone": "0.5.17", "retry-as-promised": "2.3.2", "semver": "5.5.0", - "terraformer-wkt-parser": "1.1.2", + "terraformer-wkt-parser": "1.2.0", "toposort-class": "1.0.1", "uuid": "3.2.1", "validator": "9.4.1", @@ -3936,9 +3936,9 @@ } }, "sequelize-typescript": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.4.tgz", - "integrity": "sha512-5Xl2mTr+b3SXClmBSrL4l2xoOK2lhkW0vZVKBA6aCpM5hPC5iZexq1mLizGzgLualE3cUg5C8xDo7Tt0FuIyJQ==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.5.tgz", + "integrity": "sha512-5K/+g5zU995fg4z2tgVdaSgGoRiPRMFJ4iY6WVG3przWbZY85zDgAZrNVaj/URzm51Ea+UvXHfrIwt+yY5fHeg==", "requires": { "@types/bluebird": "3.5.18", "@types/node": "6.0.41", @@ -4820,10 +4820,11 @@ } }, "terraformer-wkt-parser": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.2.tgz", - "integrity": "sha1-M2oMj8gglKWv+DKI9prt7NNpvww=", + "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.6", "terraformer": "1.0.8" } }, diff --git a/package.json b/package.json index a1583ed3..193f50d6 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,14 @@ { "name": "botserver", - "version": "0.0.25", + "version": "0.0.26", "description": "General Bot Community Edition open-core server.", "contributors": [ - "Rodrigo Rodriguez " + "Rodrigo Rodriguez ", + "Jorge Ramos " ], "license": "AGPL-3.0", "main": "./src/app.ts", - "preferGlobal": "true", + "preferGlobal": true, "bin": { "gbot": "./dist/src/app.js" }, @@ -36,7 +37,7 @@ "async": "^2.6.0", "body-parser": "^1.18.2", "botbuilder": "^3.15.0", - "botlib": "0.0.23", + "botlib": "^0.0.23", "chai": "^4.1.2", "chokidar": "^2.0.2", "csv-parse": "^2.4.0", @@ -50,8 +51,8 @@ "pragmatismo-io-framework": "^1.0.12", "reflect-metadata": "^0.1.12", "request-promise-native": "^1.0.5", - "sequelize": "^4.37.6", - "sequelize-typescript": "^0.6.3", + "sequelize": "^4.37.10", + "sequelize-typescript": "^0.6.5", "sqlite3": "^4.0.0", "swagger-client": "^2.1.18", "tedious": "^2.1.1", @@ -62,4 +63,4 @@ "wait-until": "0.0.2", "winston": "^2.4.0" } -} +} \ No newline at end of file