diff --git a/lib/command-handler/adddownline.js b/lib/command-handler/adddownline.js index 99259ce..b2bb14d 100644 --- a/lib/command-handler/adddownline.js +++ b/lib/command-handler/adddownline.js @@ -1,5 +1,4 @@ -"use strict"; - +const moment = require('moment'); const common = require('../common'); const commandError = require('./error'); const coreapi = require('../coreapi'); @@ -18,8 +17,8 @@ function help(keyword) { } function execute(tokens, params, cb) { - - if (!tokens || tokens.length < 3) { + const newStoreName = ((tokens && tokens[1]) || '').trim(); + if (!tokens || tokens.length < 3 || !newStoreName) { const responseParams = { body: `${ commandError.ERR_INVALID_FORMAT }. ${ help(tokens[0]) }` } @@ -31,7 +30,7 @@ function execute(tokens, params, cb) { const coreParams = { asker_terminal_name: params.from, asker_terminal_password: null, - new_store_name: tokens[1], + new_store_name: `${newStoreName} - ${moment().format('YYMMDDHHmm')}`, new_terminal_name: null, markup: null, }; diff --git a/package-lock.json b/package-lock.json index 1d78053..89cfcb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -137,7 +137,8 @@ "arr-union": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "optional": true }, "array-flatten": { "version": "1.1.1", @@ -388,23 +389,6 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" }, - "bytewise": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz", - "integrity": "sha1-HRPL/3F65xWAlKqIGzXQgbOHJT4=", - "requires": { - "bytewise-core": "^1.2.2", - "typewise": "^1.0.3" - } - }, - "bytewise-core": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz", - "integrity": "sha1-P7QQx+kVWOsasiqCg0V3qmvWHUI=", - "requires": { - "typewise-core": "^1.2" - } - }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -1973,7 +1957,8 @@ "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "optional": true }, "getpass": { "version": "0.1.7", @@ -2242,7 +2227,8 @@ "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "optional": true }, "is-data-descriptor": { "version": "0.1.4", @@ -2286,7 +2272,8 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "optional": true }, "is-extglob": { "version": "2.1.1", @@ -2332,6 +2319,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "optional": true, "requires": { "isobject": "^3.0.1" } @@ -2371,7 +2359,8 @@ "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "optional": true }, "isstream": { "version": "0.1.2", @@ -2455,18 +2444,17 @@ "fs-copy-file": "^2.1.2", "json-query": "^2.2.2", "lru-cache": "^4.1.1", - "macaddress": "^0.2.8", - "moment": "^2.19.1", + "macaddress": "^0.2.9", + "moment": "^2.24.0", "node-machine-id": "^1.1.10", "node-natural-sort": "^0.8.6", "numeral": "^2.0.6", - "nunjucks": "^3.0.1", + "nunjucks": "^3.2.0", "pkginfo": "^0.4.1", "redis": "^2.8.0", - "request": "^2.81.0", + "request": "^2.88.0", "sha1": "^1.1.1", "simple-git": "^1.80.1", - "sort-object": "^3.0.2", "strftime": "^0.10.0", "string-natural-compare": "^2.0.2", "uniqid": "^4.1.1", @@ -3737,61 +3725,6 @@ } } }, - "sort-asc": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz", - "integrity": "sha1-AKSelHvCXVEL/eLLuN/9qfUOsvw=" - }, - "sort-desc": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.2.0.tgz", - "integrity": "sha1-KAwb2vxld4h87brR7S5BwDeXZkY=" - }, - "sort-object": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-3.0.2.tgz", - "integrity": "sha1-2vK2k/YR990qIbgrgF5OrCMPdV4=", - "requires": { - "bytewise": "^1.1.0", - "get-value": "^2.0.2", - "is-extendable": "^0.1.1", - "sort-asc": "^0.2.0", - "sort-desc": "^0.2.0", - "union-value": "^0.2.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - }, - "union-value": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-0.2.4.tgz", - "integrity": "sha1-c3UVJ4ZnkFfns3qmdug0aPwCdPA=", - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - } - } - } - }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -4011,6 +3944,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "optional": true, "requires": { "kind-of": "^3.0.2" }, @@ -4019,6 +3953,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -4110,19 +4045,6 @@ "mime-types": "~2.1.24" } }, - "typewise": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz", - "integrity": "sha1-EGeTZUCvl5N8xdz5kiSG6fooRlE=", - "requires": { - "typewise-core": "^1.2.0" - } - }, - "typewise-core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz", - "integrity": "sha1-l+uRgFx/VdL5QXSPpQ0xXZke8ZU=" - }, "uid-safe": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", diff --git a/package.json b/package.json index c3bd764..aafe866 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "express": "^4.17.1", "express-ipfilter": "^1.0.1", "komodo-sdk": "git+http://gitlab.kodesumber.com/komodo/komodo-sdk.git", + "moment": "^2.24.0", "mysql": "^2.17.1", "natural-compare-lite": "^1.4.0", "redis": "^2.8.0",