diff --git a/packages/feedback-service/.env.example b/packages/feedback-service/.env.example index c92ab771a..3a1e6713f 100644 --- a/packages/feedback-service/.env.example +++ b/packages/feedback-service/.env.example @@ -10,6 +10,10 @@ DB_NAME=db_name NODE_TLS_REJECT_UNAUTHORIZED= +## REDIS +REDIS_HOST=localhost +REDIS_PORT=6379 + ## Github Configuration GITHUB_API= GITHUB_AUTH_TOKEN= diff --git a/packages/feedback-service/.eslintrc.js b/packages/feedback-service/.eslintrc.js index 9ce05393b..0b46b66ff 100644 --- a/packages/feedback-service/.eslintrc.js +++ b/packages/feedback-service/.eslintrc.js @@ -15,6 +15,7 @@ module.exports = { }, plugins: ['@typescript-eslint'], rules: { - 'no-underscore-dangle':'off' + 'no-underscore-dangle': 'off', + 'space-in-parens': ['never'] }, }; diff --git a/packages/feedback-service/.prettierrc b/packages/feedback-service/.prettierrc new file mode 100644 index 000000000..2aa9b5e11 --- /dev/null +++ b/packages/feedback-service/.prettierrc @@ -0,0 +1,6 @@ +{ + "tabWidth": 2, + "useTabs": false, + "singleQuote": true, + "bracketSpacing": false +} diff --git a/packages/feedback-service/package-lock.json b/packages/feedback-service/package-lock.json index 7faffd539..46c1c2aae 100644 --- a/packages/feedback-service/package-lock.json +++ b/packages/feedback-service/package-lock.json @@ -9,12 +9,15 @@ "version": "0.1.1", "license": "MIT", "dependencies": { + "@bull-board/api": "5.8.0", + "@bull-board/express": "5.8.0", "@graphql-tools/schema": "^8.3.1", "apollo-server-core": "^3.4.0", "apollo-server-express": "^3.4.0", "async": "^3.2.2", "axios": "^0.24.0", "body-parser": "1.19.0", + "bullmq": "4.8.0", "clean-webpack-plugin": "4.0.0", "cookie-parser": "1.4.5", "cors": "2.8.5", @@ -690,6 +693,269 @@ "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, + "node_modules/@bull-board/api": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@bull-board/api/-/api-5.8.0.tgz", + "integrity": "sha512-jHJ7Mw/CHixNgIsrbUihyYVxIdlM/lzii+ZUo7E8CFEsOCjE+Um5RDr9boYghWVHuJykkLy7b+wPvbnTwmX0SA==", + "dependencies": { + "redis-info": "^3.0.8" + }, + "peerDependencies": { + "@bull-board/ui": "5.8.0" + } + }, + "node_modules/@bull-board/express": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@bull-board/express/-/express-5.8.0.tgz", + "integrity": "sha512-ZMhwtGd+o+0WtcLBuZJJunHFdgBpfEU6CXt5fO2I0YXTn6AzbmhvyHAyFLRajBvYIlFsiDTJ82/uKdXP4LVEDA==", + "dependencies": { + "@bull-board/api": "5.8.0", + "@bull-board/ui": "5.8.0", + "ejs": "3.1.7", + "express": "4.17.3" + } + }, + "node_modules/@bull-board/express/node_modules/body-parser": { + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz", + "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.8.1", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.9.7", + "raw-body": "2.4.3", + "type-is": "~1.6.18" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/@bull-board/express/node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/@bull-board/express/node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/@bull-board/express/node_modules/cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/@bull-board/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/@bull-board/express/node_modules/ejs": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz", + "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@bull-board/express/node_modules/express": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz", + "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.19.2", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.4.2", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.9.7", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.17.2", + "serve-static": "1.14.2", + "setprototypeof": "1.2.0", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/@bull-board/express/node_modules/http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/@bull-board/express/node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/@bull-board/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/@bull-board/express/node_modules/qs": { + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@bull-board/express/node_modules/raw-body": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", + "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "1.8.1", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/@bull-board/express/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/@bull-board/express/node_modules/send": { + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", + "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "1.8.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/@bull-board/express/node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/@bull-board/express/node_modules/serve-static": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", + "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/@bull-board/express/node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "node_modules/@bull-board/express/node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/@bull-board/ui": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@bull-board/ui/-/ui-5.8.0.tgz", + "integrity": "sha512-O2imjnV7KFictoy6FsrG2y5u10Z60BIuX+nghLbhdEkZL/B4B2VUM+655d9wMIpjXocXkr2DN5ELJkUXewl9wQ==", + "dependencies": { + "@bull-board/api": "5.8.0" + } + }, "node_modules/@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -836,6 +1102,11 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@ioredis/commands": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", + "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -1201,6 +1472,78 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz", + "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz", + "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz", + "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz", + "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz", + "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz", + "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2702,6 +3045,67 @@ "node": ">=0.10.0" } }, + "node_modules/bullmq": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-4.8.0.tgz", + "integrity": "sha512-M5NPxrzHQ53yeRSH3j52dOu0U6Lssdhumet9CJ9LzTh2GNbhad9VPQunaariEmPmK0zCFF2uf08PVWtRbXnQkQ==", + "dependencies": { + "cron-parser": "^4.6.0", + "glob": "^8.0.3", + "ioredis": "^5.3.2", + "lodash": "^4.17.21", + "msgpackr": "^1.6.2", + "node-abort-controller": "^3.1.1", + "semver": "^7.5.4", + "tslib": "^2.0.0", + "uuid": "^9.0.0" + } + }, + "node_modules/bullmq/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/bullmq/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/bullmq/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/bullmq/node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -2858,6 +3262,14 @@ "node": ">=6" } }, + "node_modules/cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -3045,6 +3457,17 @@ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" }, + "node_modules/cron-parser": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", + "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==", + "dependencies": { + "luxon": "^3.2.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -4121,11 +4544,30 @@ } }, "node_modules/filelist": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", - "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", "dependencies": { - "minimatch": "^3.0.4" + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" } }, "node_modules/fill-range": { @@ -4704,6 +5146,37 @@ "node": ">= 0.10" } }, + "node_modules/ioredis": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz", + "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==", + "dependencies": { + "@ioredis/commands": "^1.1.1", + "cluster-key-slot": "^1.1.0", + "debug": "^4.3.4", + "denque": "^2.1.0", + "lodash.defaults": "^4.2.0", + "lodash.isarguments": "^3.1.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0", + "standard-as-callback": "^2.1.0" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/ioredis" + } + }, + "node_modules/ioredis/node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "engines": { + "node": ">=0.10" + } + }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -5083,14 +5556,14 @@ } }, "node_modules/jake": { - "version": "10.8.4", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.4.tgz", - "integrity": "sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA==", + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", "dependencies": { - "async": "0.9.x", + "async": "^3.2.3", "chalk": "^4.0.2", - "filelist": "^1.0.1", - "minimatch": "^3.0.4" + "filelist": "^1.0.4", + "minimatch": "^3.1.2" }, "bin": { "jake": "bin/cli.js" @@ -5099,11 +5572,6 @@ "node": ">=10" } }, - "node_modules/jake/node_modules/async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" - }, "node_modules/jest": { "version": "27.3.1", "resolved": "https://registry.npmjs.org/jest/-/jest-27.3.1.tgz", @@ -5901,6 +6369,16 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" + }, + "node_modules/lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==" + }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -5963,6 +6441,14 @@ "node": ">=10" } }, + "node_modules/luxon": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.2.tgz", + "integrity": "sha512-uBoAVCVcajsrqy3pv7eo5jEUz1oeLmCcnMv8n4AJpT5hbpN9lUssAXibNElpbLce3Mhm9dyBzwYLs9zctM/0tA==", + "engines": { + "node": ">=12" + } + }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -6315,6 +6801,35 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/msgpackr": { + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.7.tgz", + "integrity": "sha512-baUNaLvKQvVhzfWTNO07njwbZK1Lxjtb0P1JL6/EhXdLTHzR57/mZqqJC39TtQKvOmkJA4pcejS4dbk7BDgLLA==", + "optionalDependencies": { + "msgpackr-extract": "^3.0.2" + } + }, + "node_modules/msgpackr-extract": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz", + "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "node-gyp-build-optional-packages": "5.0.7" + }, + "bin": { + "download-msgpackr-prebuilds": "bin/download-prebuilds.js" + }, + "optionalDependencies": { + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2" + } + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -6333,6 +6848,11 @@ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, + "node_modules/node-abort-controller": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz", + "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==" + }, "node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -6371,6 +6891,17 @@ "webidl-conversions": "^3.0.0" } }, + "node_modules/node-gyp-build-optional-packages": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz", + "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==", + "optional": true, + "bin": { + "node-gyp-build-optional-packages": "bin.js", + "node-gyp-build-optional-packages-optional": "optional.js", + "node-gyp-build-optional-packages-test": "build-test.js" + } + }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -7108,6 +7639,33 @@ "node": ">= 0.10" } }, + "node_modules/redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", + "engines": { + "node": ">=4" + } + }, + "node_modules/redis-info": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/redis-info/-/redis-info-3.1.0.tgz", + "integrity": "sha512-ER4L9Sh/vm63DkIE0bkSjxluQlioBiBgf5w1UuldaW/3vPcecdljVDisZhmnCMvsxHNiARTTDDHGg9cGwTfrKg==", + "dependencies": { + "lodash": "^4.17.11" + } + }, + "node_modules/redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "dependencies": { + "redis-errors": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/regexp-clone": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", @@ -7305,9 +7863,9 @@ } }, "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -7577,6 +8135,11 @@ "node": ">=8" } }, + "node_modules/standard-as-callback": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" + }, "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -9417,6 +9980,214 @@ "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, + "@bull-board/api": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@bull-board/api/-/api-5.8.0.tgz", + "integrity": "sha512-jHJ7Mw/CHixNgIsrbUihyYVxIdlM/lzii+ZUo7E8CFEsOCjE+Um5RDr9boYghWVHuJykkLy7b+wPvbnTwmX0SA==", + "requires": { + "redis-info": "^3.0.8" + } + }, + "@bull-board/express": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@bull-board/express/-/express-5.8.0.tgz", + "integrity": "sha512-ZMhwtGd+o+0WtcLBuZJJunHFdgBpfEU6CXt5fO2I0YXTn6AzbmhvyHAyFLRajBvYIlFsiDTJ82/uKdXP4LVEDA==", + "requires": { + "@bull-board/api": "5.8.0", + "@bull-board/ui": "5.8.0", + "ejs": "3.1.7", + "express": "4.17.3" + }, + "dependencies": { + "body-parser": { + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz", + "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.8.1", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.9.7", + "raw-body": "2.4.3", + "type-is": "~1.6.18" + } + }, + "bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + }, + "content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "requires": { + "safe-buffer": "5.2.1" + } + }, + "cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ejs": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz", + "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==", + "requires": { + "jake": "^10.8.5" + } + }, + "express": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz", + "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==", + "requires": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.19.2", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.4.2", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.9.7", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.17.2", + "serve-static": "1.14.2", + "setprototypeof": "1.2.0", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + } + }, + "http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "qs": { + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==" + }, + "raw-body": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", + "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", + "requires": { + "bytes": "3.1.2", + "http-errors": "1.8.1", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "send": { + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", + "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "1.8.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "dependencies": { + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + } + } + }, + "serve-static": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", + "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.2" + } + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + } + } + }, + "@bull-board/ui": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@bull-board/ui/-/ui-5.8.0.tgz", + "integrity": "sha512-O2imjnV7KFictoy6FsrG2y5u10Z60BIuX+nghLbhdEkZL/B4B2VUM+655d9wMIpjXocXkr2DN5ELJkUXewl9wQ==", + "requires": { + "@bull-board/api": "5.8.0" + } + }, "@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -9532,6 +10303,11 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@ioredis/commands": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", + "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -9813,6 +10589,42 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "@msgpackr-extract/msgpackr-extract-darwin-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz", + "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-darwin-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz", + "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-linux-arm": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz", + "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-linux-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz", + "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-linux-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz", + "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-win32-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz", + "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==", + "optional": true + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -11042,6 +11854,57 @@ "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, + "bullmq": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-4.8.0.tgz", + "integrity": "sha512-M5NPxrzHQ53yeRSH3j52dOu0U6Lssdhumet9CJ9LzTh2GNbhad9VPQunaariEmPmK0zCFF2uf08PVWtRbXnQkQ==", + "requires": { + "cron-parser": "^4.6.0", + "glob": "^8.0.3", + "ioredis": "^5.3.2", + "lodash": "^4.17.21", + "msgpackr": "^1.6.2", + "node-abort-controller": "^3.1.1", + "semver": "^7.5.4", + "tslib": "^2.0.0", + "uuid": "^9.0.0" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "requires": { + "brace-expansion": "^2.0.1" + } + }, + "uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==" + } + } + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -11144,6 +12007,11 @@ "shallow-clone": "^3.0.0" } }, + "cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==" + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -11308,6 +12176,14 @@ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" }, + "cron-parser": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", + "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==", + "requires": { + "luxon": "^3.2.1" + } + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -12151,11 +13027,29 @@ } }, "filelist": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", - "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", "requires": { - "minimatch": "^3.0.4" + "minimatch": "^5.0.1" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "fill-range": { @@ -12557,6 +13451,29 @@ "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", "dev": true }, + "ioredis": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz", + "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==", + "requires": { + "@ioredis/commands": "^1.1.1", + "cluster-key-slot": "^1.1.0", + "debug": "^4.3.4", + "denque": "^2.1.0", + "lodash.defaults": "^4.2.0", + "lodash.isarguments": "^3.1.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0", + "standard-as-callback": "^2.1.0" + }, + "dependencies": { + "denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" + } + } + }, "ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -12818,21 +13735,14 @@ } }, "jake": { - "version": "10.8.4", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.4.tgz", - "integrity": "sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA==", + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", "requires": { - "async": "0.9.x", + "async": "^3.2.3", "chalk": "^4.0.2", - "filelist": "^1.0.1", - "minimatch": "^3.0.4" - }, - "dependencies": { - "async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" - } + "filelist": "^1.0.4", + "minimatch": "^3.1.2" } }, "jest": { @@ -13447,6 +14357,16 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==" + }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -13499,6 +14419,11 @@ "yallist": "^4.0.0" } }, + "luxon": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.2.tgz", + "integrity": "sha512-uBoAVCVcajsrqy3pv7eo5jEUz1oeLmCcnMv8n4AJpT5hbpN9lUssAXibNElpbLce3Mhm9dyBzwYLs9zctM/0tA==" + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -13756,6 +14681,29 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "msgpackr": { + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.7.tgz", + "integrity": "sha512-baUNaLvKQvVhzfWTNO07njwbZK1Lxjtb0P1JL6/EhXdLTHzR57/mZqqJC39TtQKvOmkJA4pcejS4dbk7BDgLLA==", + "requires": { + "msgpackr-extract": "^3.0.2" + } + }, + "msgpackr-extract": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz", + "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==", + "optional": true, + "requires": { + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2", + "node-gyp-build-optional-packages": "5.0.7" + } + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -13771,6 +14719,11 @@ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, + "node-abort-controller": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz", + "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==" + }, "node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -13800,6 +14753,12 @@ } } }, + "node-gyp-build-optional-packages": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz", + "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==", + "optional": true + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -14329,6 +15288,27 @@ "resolve": "^1.9.0" } }, + "redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==" + }, + "redis-info": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/redis-info/-/redis-info-3.1.0.tgz", + "integrity": "sha512-ER4L9Sh/vm63DkIE0bkSjxluQlioBiBgf5w1UuldaW/3vPcecdljVDisZhmnCMvsxHNiARTTDDHGg9cGwTfrKg==", + "requires": { + "lodash": "^4.17.11" + } + }, + "redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "requires": { + "redis-errors": "^1.0.0" + } + }, "regexp-clone": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", @@ -14458,9 +15438,9 @@ } }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -14686,6 +15666,11 @@ } } }, + "standard-as-callback": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", diff --git a/packages/feedback-service/package.json b/packages/feedback-service/package.json index 0eb91727a..a1efd3bcb 100644 --- a/packages/feedback-service/package.json +++ b/packages/feedback-service/package.json @@ -45,12 +45,15 @@ ], "license": "MIT", "dependencies": { + "@bull-board/api": "5.8.0", + "@bull-board/express": "5.8.0", "@graphql-tools/schema": "^8.3.1", "apollo-server-core": "^3.4.0", "apollo-server-express": "^3.4.0", "async": "^3.2.2", "axios": "^0.24.0", "body-parser": "1.19.0", + "bullmq": "4.8.0", "clean-webpack-plugin": "4.0.0", "cookie-parser": "1.4.5", "cors": "2.8.5", diff --git a/packages/feedback-service/service.ts b/packages/feedback-service/service.ts index 8ea1643da..dfaaf950a 100644 --- a/packages/feedback-service/service.ts +++ b/packages/feedback-service/service.ts @@ -11,6 +11,8 @@ import FeedbackResolver from './src/feedbacks/resolver'; import FeedbackSchema from './src/feedbacks/typedef.graphql'; import FeedbackConfigResolver from './src/feedback-config/resolver'; import FeedbackConfigSchema from './src/feedback-config/typedef.graphql'; +import { setupWorkers } from './src/jobs'; +import { serverAdapter } from './src/lib/bullboard'; if (process.env.NODE_ENV === 'test') { dotenv.config({ path: '.test.env' }); @@ -26,6 +28,9 @@ const app = express(); app.use(cookieParser()); app.use(json()); +/* Setting up job workers */ +setupWorkers(); + /* Configuring Mongoose */ mongoose.plugin((schema: any) => { const mongoSchema = schema; @@ -48,7 +53,7 @@ mongoose.connection.on('error', (error) => { Logger.error(error); }); -app.use(morgan(':method :url :status :res[content-length] - :response-time ms')); +app.use('/admin', serverAdapter.getRouter()); const schema = mergeSchemas({ typeDefs: [FeedbackConfigSchema, FeedbackSchema], diff --git a/packages/feedback-service/src/feedbacks/resolver.ts b/packages/feedback-service/src/feedbacks/resolver.ts index de90728b8..7e331e419 100644 --- a/packages/feedback-service/src/feedbacks/resolver.ts +++ b/packages/feedback-service/src/feedbacks/resolver.ts @@ -1,22 +1,12 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ -/** - * MIT License - * Copyright (c) 2021 Red Hat One Platform - * - * @version 0.0.6 - * - * GraphQL interface for managing the business logic - * - * @author Rigin Oommen - * - * Created at : 2021-01-14 13:50:01 - * Last modified : 2021-06-28 17:21:06 - */ import * as _ from 'lodash'; import { Feedback } from './schema'; -import FeedbackHelper from './helpers'; +import FeedbackHelper from '../helpers'; import { FeedbackConfig } from '../feedback-config/schema'; -import Logger from '../lib/logger'; +import { jiraQueue, gitlabQueue, githubQueue } from '../lib/queue'; +import { JIRA_JOB_NAME } from '../jobs/createJira'; +import { WorkerProps } from '../jobs'; +import { GITHUB_JOB_NAME } from '../jobs/createGithubIssue'; +import { GITLAB_JOB_NAME } from '../jobs/createGitlabIssue'; const FeedbackResolver = { FeedbackSortType: { @@ -137,14 +127,23 @@ const FeedbackResolver = { async createFeedback(root: any, args: any, ctx: any) { const userFeedback = args.input; let userData: any[] = []; - let integrationResponse; if (!userFeedback.createdBy) { throw new Error('Field `createdBy` is missing in the request'); } - const userQuery = FeedbackHelper.buildUserQuery([userFeedback.createdBy]); - userData = await FeedbackHelper.getUserProfiles(userQuery); + if (typeof userFeedback.createdBy === 'string' && userFeedback.createdBy.startsWith('user:')) { + const [_, cn] = userFeedback.createdBy.split('/'); + userData = [ { + cn, + mail: `${ cn }@redhat.com`, + uid: cn, + rhatUUID: userFeedback.createdBy, + } ]; + } else { + const userQuery = FeedbackHelper.buildUserQuery([userFeedback.createdBy]); + userData = await FeedbackHelper.getUserProfiles(userQuery); + } const { projectId } = userFeedback; if (!projectId) { @@ -160,46 +159,35 @@ const FeedbackResolver = { 'Feedback configuration not registered. Please visit developer-console', ); } - // TODO: This can be an enum or object - if (feedbackConfig?.sourceType === 'GITHUB') { - integrationResponse = await FeedbackHelper.createGithubIssue( - [feedbackConfig], - userFeedback, - projectId, - userData, - ); - userFeedback.state = integrationResponse.issue.state; - } else if (feedbackConfig?.sourceType === 'JIRA') { - integrationResponse = await FeedbackHelper.createJira( - [feedbackConfig], - userFeedback, - projectId, - userData, - ); - userFeedback.ticketUrl = `${ - new URL(integrationResponse.self).origin - }/browse/${integrationResponse.key}`; - userFeedback.state = 'To Do'; - } else if (feedbackConfig?.sourceType === 'GITLAB') { - integrationResponse = await FeedbackHelper.createGitlabIssue( - [feedbackConfig], - userFeedback, - projectId, - userData, - ); - userFeedback.state = integrationResponse.state; - } else if (feedbackConfig?.sourceType === 'EMAIL') { - userFeedback.state = 'To Do'; - } - if (feedbackConfig.sourceType !== 'JIRA') { - userFeedback.ticketUrl = integrationResponse?.issue?.url - || integrationResponse?.webUrl - || null; - } + userFeedback.state = 'To Do'; + return new Feedback(userFeedback) .save() .then(async (response: FeedbackType) => { + /* Create tickets/issues for the respective sourceType */ + if (feedbackConfig?.sourceType === 'GITHUB') { + await githubQueue.add(GITHUB_JOB_NAME, { + feedbackConfig, + userFeedback: response, + app: projectId, + userData, + }); + } else if (feedbackConfig?.sourceType === 'JIRA') { + await jiraQueue.add(JIRA_JOB_NAME, { + feedbackConfig, + userFeedback, + app: projectId, + userData, + }); + } else if (feedbackConfig?.sourceType === 'GITLAB') { + await gitlabQueue.add(GITLAB_JOB_NAME, { + feedbackConfig, + userFeedback, + app: projectId, + userData, + }); + } const emailTemplate = FeedbackHelper.createEmailTemplate( userData, userFeedback, @@ -238,11 +226,27 @@ const FeedbackResolver = { .then(async (feedbacks: FeedbackType[]) => { feedbacks.forEach(async (data: FeedbackType) => { userList.push(data.createdBy as string, data.updatedBy as string); - const userQuery = FeedbackHelper.buildUserQuery(userList); - const userData = await FeedbackHelper.getUserProfiles(userQuery); + + const userData = await Promise.all( + [data.createdBy, data.updatedBy].map((user) => { + if (typeof user === 'string' && user.startsWith('user:')) { + const [_, cn] = user.split('/'); + return [ + { + cn, + mail: `${cn}@redhat.com`, + uid: cn, + rhatUUID: user, + }, + ]; + } + const userQuery = FeedbackHelper.buildUserQuery([user as string]); + return FeedbackHelper.getUserProfiles(userQuery); + }) + ); const formattedSearchResponse = FeedbackHelper.formatSearchInput( data, - userData, + userData ); FeedbackHelper.manageSearchIndex(formattedSearchResponse, 'index'); }); diff --git a/packages/feedback-service/src/feedbacks/helpers.ts b/packages/feedback-service/src/helpers.ts similarity index 76% rename from packages/feedback-service/src/feedbacks/helpers.ts rename to packages/feedback-service/src/helpers.ts index ef4f2932f..656b9fb1d 100644 --- a/packages/feedback-service/src/feedbacks/helpers.ts +++ b/packages/feedback-service/src/helpers.ts @@ -7,9 +7,9 @@ import flattenDeep from 'lodash/flattenDeep'; import uniq from 'lodash/uniq'; import { HttpsProxyAgent } from 'https-proxy-agent'; -import { FeedbackConfig } from '../feedback-config/schema'; -import logger from '../lib/logger'; -import { FeedbackModel } from './schema'; +import { FeedbackConfig } from './feedback-config/schema'; +import logger from './lib/logger'; +import { FeedbackModel } from './feedbacks/schema'; const nodemailer = require('nodemailer'); @@ -23,11 +23,12 @@ const transporter = nodemailer.createTransport({ logger: false, debug: false, }); -const proxyAgent = process.env.ENABLE_HYDRA_PROXY === 'true' + +export const proxyAgent = process.env.ENABLE_HYDRA_PROXY === 'true' ? { httpsAgent: new HttpsProxyAgent(`${process.env.AKAMAI_API}`) } : {}; -function processIntegrationInput(userFeedback: FeedbackType, app: any, userData: any) { +export function processIntegrationInput(userFeedback: FeedbackType, app: any, userData: any) { const feedback = userFeedback; const descriptionTemplate = ` ${ @@ -52,155 +53,6 @@ Reported by - ${userData[0].cn} (${userData[0].mail})`; return feedback; } -async function createGithubIssue( - feedbackConfig: Array, - userFeedback: any, - app: any, - userData: any, -) { - const processedFeedback = processIntegrationInput( - userFeedback, - app, - userData, - ); - const params = { - githubIssueInput: { - title: processedFeedback.summary, - body: processedFeedback.description, - repositoryId: feedbackConfig[0].projectKey, - }, - sourceUrl: feedbackConfig[0].sourceApiUrl, - }; - const githubResponse = await axios - .request({ - url: `${params.sourceUrl || process.env.GITHUB_API}`, - method: 'POST', - headers: { - Authorization: `${process.env.GITHUB_AUTH_TOKEN}`, - 'Content-Type': 'application/json', - }, - data: JSON.stringify({ - query: `mutation CreateGithubIssue($input: CreateIssueInput!) { - createIssue(input: $input) { - issue { - title - body - url - state - createdAt - author { - login - } - } - } - }`, - variables: { - input: params.githubIssueInput, - }, - }), - }) - .then((response) => response.data.data.createIssue) - .catch((err: Error) => { - logger.error(err); - throw new Error('createGithubIssue operation failed'); - }); - return githubResponse; -} -async function createJira( - feedbackConfig: Array, - userFeedback: FeedbackType, - app: any, - userData: any, -) { - const processedFeedback = processIntegrationInput( - userFeedback, - app, - userData, - ); - const params = { - jiraIssueInput: { - fields: { - project: { - key: feedbackConfig[0].projectKey, - }, - summary: processedFeedback.summary, - description: processedFeedback.description.replace(/(<([^>]+)>)/gi, ''), - labels: ['Reported-via-One-Platform'], - issuetype: { - name: 'Task', - }, - }, - }, - sourceUrl: feedbackConfig[0].sourceApiUrl || process.env.JIRA_HOST, - }; - const jiraResponse = await axios.request({ - url: `${params.sourceUrl || process.env.JIRA_HOST}/rest/api/2/issue/`, - method: 'POST', - headers: { - Authorization: `${process.env.JIRA_AUTH_TOKEN}`, - 'Content-Type': 'application/json', - }, - data: JSON.stringify(params.jiraIssueInput), - ...proxyAgent, - }); - return jiraResponse.data; -} -async function createGitlabIssue( - feedbackConfig: Array, - userFeedback: FeedbackType, - app: any, - userData: any, -) { - const processedFeedback = processIntegrationInput( - userFeedback, - app, - userData, - ); - const params = { - gitlabIssueInput: { - title: processedFeedback.summary, - description: processedFeedback.description, - projectPath: feedbackConfig[0].projectKey, - }, - sourceUrl: feedbackConfig[0].sourceApiUrl, - }; - const gitlabResponse = await axios - .request({ - url: `${params.sourceUrl || process.env.GITLAB_API}`, - method: 'POST', - headers: { - Authorization: `${process.env.GITLAB_AUTH_TOKEN}`, - 'Content-Type': 'application/json', - }, - data: JSON.stringify({ - query: ` - mutation CreateGitlabIssue($input: CreateIssueInput!) { - createIssue(input: $input) { - issue { - title - webUrl - state - description - author { - name - email - webUrl - } - } - } - }`, - variables: { - input: params.gitlabIssueInput, - }, - }), - }) - .then((response) => response.data.data.createIssue.issue) - .catch((err: Error) => { - logger.error(err); - throw new Error('createGitlabIssue operation failed'); - }); - return gitlabResponse; -} async function listApps(): Promise { const appsResponse = await axios.request({ url: process.env.API_GATEWAY, @@ -461,7 +313,6 @@ async function manageSearchIndex(data: any, mode: string) { }) .catch((err: Error) => { logger.error(err.message); - throw new Error('ManageIndex operation failed with Search Microservice'); }); return searchResponse; } @@ -479,12 +330,12 @@ We have received the ${feedback.category.toLowerCase()} for the ${ Summary: ${feedback.summary}

URL: ${new URL(process.env.FEEDBACK_CLIENT as string).origin}${ - (feedback.stackInfo as any).path -}

-A ticket has opened for the reported ${feedback.category.toLowerCase()} and you can track the progress at ${ - feedback.ticketUrl + (feedback.stackInfo as any)?.path }

+${ feedback.ticketUrl ? `A ticket has opened for the reported ${feedback.category.toLowerCase()} and you can track the progress at ${ + feedback.ticketUrl +}

` : ''} Thanks

P.S.: This is an automated email. Please do not reply. @@ -512,7 +363,6 @@ async function processFeedbackRecords(userFeedbacks: any) { let intResponse: any = []; const jiraResponses: any = []; let jiraQueryPromises: any = null; - const appList = await listApps(); // eslint-disable-next-line @typescript-eslint/no-unused-vars const integrationPromise = new Promise((resolve, reject) => { Object.keys(feedbacks).forEach(async (key: string, index: number) => { @@ -523,6 +373,7 @@ async function processFeedbackRecords(userFeedbacks: any) { (conf) => key.toString() === conf._id.toString(), ); if (!config) return; + if (!record.ticketUrl) return; const issueIdParam = record.ticketUrl.split('/').length; if (config.sourceType === 'JIRA') { query += `issue=${ @@ -626,12 +477,27 @@ async function processFeedbackRecords(userFeedbacks: any) { return flattenDeep(mergedJira.concat(intResponses)); }) .then(async (integrationResponses) => { - const userQuery = buildUserQuery(userList); - const userData = await getUserProfiles(userQuery); + let userData: any[] = []; + const ldapUsers = userList.filter(user => user && !user.startsWith('user:')); + if (ldapUsers.length > 0) { + const userQuery = buildUserQuery(ldapUsers); + userData = [userData, ...await getUserProfiles(userQuery)]; + } + /* For other users */ + userList.filter(user => user?.startsWith('user:')).forEach(user => { + const [ _, cn ] = user.split('/'); + userData.push({ + cn, + mail: `${cn}@redhat.com`, + uid: cn, + rhatUUID: user, + }); + }); const userDataObj = userData.reduce((prev, curr) => { const userObj = { ...prev, [curr.rhatUUID]: curr }; return userObj; }, {}); + return userFeedbacks.map(async (feedback: FeedbackModel) => { const userFeedback = feedback.toObject({ virtuals: true }); const selectedResponse: any = await integrationResponses.filter( @@ -641,9 +507,7 @@ async function processFeedbackRecords(userFeedbacks: any) { (conf) => feedback.config === conf._id.toString(), ); userFeedback.source = config?.sourceType || ''; - userFeedback.module = appList.find( - (app: any) => app.id === config?.appId, - )?.name || ''; + userFeedback.module = config?.projectId?.split('/')?.[1] ?? ''; userFeedback.state = selectedResponse?.state || feedback?.state; userFeedback.assignee = selectedResponse?.assignee || {}; userFeedback.createdBy = userDataObj?.[feedback.createdBy as string] || null; @@ -658,9 +522,6 @@ async function processFeedbackRecords(userFeedbacks: any) { export default { buildUserQuery, createEmailTemplate, - createGithubIssue, - createGitlabIssue, - createJira, formatSearchInput, getApp, getUserProfiles, diff --git a/packages/feedback-service/src/jobs/createGithubIssue.ts b/packages/feedback-service/src/jobs/createGithubIssue.ts new file mode 100644 index 000000000..70c875698 --- /dev/null +++ b/packages/feedback-service/src/jobs/createGithubIssue.ts @@ -0,0 +1,63 @@ +import {Worker} from 'bullmq'; +import {redisConfiguration} from '../lib/queue'; +import {WorkerProps} from '.'; +import {processIntegrationInput} from '../helpers'; +import axios from 'axios'; +import logger from '../lib/logger'; + +export const GITHUB_JOB_NAME = 'createGithubIssue'; +export const createGithubIssue = new Worker( + GITHUB_JOB_NAME, + async (job) => { + const {feedbackConfig, userFeedback, app, userData} = job.data; + + const processedFeedback = processIntegrationInput( + userFeedback, + app, + userData + ); + const params = { + githubIssueInput: { + title: processedFeedback.summary, + body: processedFeedback.description, + repositoryId: feedbackConfig.projectKey, + }, + sourceUrl: feedbackConfig.sourceApiUrl, + }; + const githubResponse = await axios + .request({ + url: `${params.sourceUrl || process.env.GITHUB_API}`, + method: 'POST', + headers: { + Authorization: `${process.env.GITHUB_AUTH_TOKEN}`, + 'Content-Type': 'application/json', + }, + data: JSON.stringify({ + query: `mutation CreateGithubIssue($input: CreateIssueInput!) { + createIssue(input: $input) { + issue { + title + body + url + state + createdAt + author { + login + } + } + } + }`, + variables: { + input: params.githubIssueInput, + }, + }), + }) + .then((response) => response.data.data.createIssue) + .catch((err: Error) => { + logger.error(err); + throw new Error('createGithubIssue operation failed'); + }); + return githubResponse; + }, + redisConfiguration +); diff --git a/packages/feedback-service/src/jobs/createGitlabIssue.ts b/packages/feedback-service/src/jobs/createGitlabIssue.ts new file mode 100644 index 000000000..fa2ebb583 --- /dev/null +++ b/packages/feedback-service/src/jobs/createGitlabIssue.ts @@ -0,0 +1,65 @@ +import {Worker} from 'bullmq'; +import {redisConfiguration} from '../lib/queue'; +import {processIntegrationInput} from '../helpers'; +import {WorkerProps} from '.'; +import axios from 'axios'; +import logger from '../lib/logger'; + +export const GITLAB_JOB_NAME = 'createGitlabIssue'; +export const createGitlabIssue = new Worker( + GITLAB_JOB_NAME, + async (job) => { + const {feedbackConfig, userFeedback, app, userData} = job.data; + + const processedFeedback = processIntegrationInput( + userFeedback, + app, + userData + ); + const params = { + gitlabIssueInput: { + title: processedFeedback.summary, + description: processedFeedback.description, + projectPath: feedbackConfig.projectKey, + }, + sourceUrl: feedbackConfig.sourceApiUrl, + }; + const gitlabResponse = await axios + .request({ + url: `${params.sourceUrl || process.env.GITLAB_API}`, + method: 'POST', + headers: { + Authorization: `${process.env.GITLAB_AUTH_TOKEN}`, + 'Content-Type': 'application/json', + }, + data: JSON.stringify({ + query: ` + mutation CreateGitlabIssue($input: CreateIssueInput!) { + createIssue(input: $input) { + issue { + title + webUrl + state + description + author { + name + email + webUrl + } + } + } + }`, + variables: { + input: params.gitlabIssueInput, + }, + }), + }) + .then((response) => response.data.data.createIssue.issue) + .catch((err: Error) => { + logger.error(err); + throw new Error('createGitlabIssue operation failed'); + }); + return gitlabResponse; + }, + redisConfiguration +); diff --git a/packages/feedback-service/src/jobs/createJira.ts b/packages/feedback-service/src/jobs/createJira.ts new file mode 100644 index 000000000..f9cf1b981 --- /dev/null +++ b/packages/feedback-service/src/jobs/createJira.ts @@ -0,0 +1,66 @@ +import {Worker} from 'bullmq'; +import {redisConfiguration} from '../lib/queue'; +import {processIntegrationInput, proxyAgent} from '../helpers'; +import axios from 'axios'; +import {WorkerProps} from '.'; +import {Feedback} from '../feedbacks/schema'; +import logger from '../lib/logger'; + +export const JIRA_JOB_NAME = 'createJira'; +export const createJira = new Worker( + JIRA_JOB_NAME, + async (job) => { + logger.info('processing...'); + + const {feedbackConfig, userFeedback, app, userData} = job.data; + + const processedFeedback = processIntegrationInput( + userFeedback, + app, + userData + ); + const params = { + jiraIssueInput: { + fields: { + project: { + key: feedbackConfig.projectKey, + }, + summary: processedFeedback.summary, + description: processedFeedback.description.replace( + /(<([^>]+)>)/gi, + '' + ), + labels: ['Reported-via-One-Platform'], + issuetype: { + name: 'Task', + }, + }, + }, + sourceUrl: feedbackConfig.sourceApiUrl || process.env.JIRA_HOST, + }; + try { + const jiraResponse = await axios.request({ + url: `${params.sourceUrl || process.env.JIRA_HOST}/rest/api/2/issue/`, + method: 'POST', + headers: { + Authorization: `${process.env.JIRA_AUTH_TOKEN}`, + 'Content-Type': 'application/json', + }, + data: JSON.stringify(params.jiraIssueInput), + ...proxyAgent, + }); + + return Feedback.findOneAndUpdate(userFeedback, { + ticketUrl: jiraResponse.data.key, + }).exec(); + } catch (err: any) { + logger.error(err); + throw err; + } + }, + redisConfiguration +); + +createJira.on('active', (job) => { + logger.info('job started'); +}); diff --git a/packages/feedback-service/src/jobs/index.ts b/packages/feedback-service/src/jobs/index.ts new file mode 100644 index 000000000..cdcc8f899 --- /dev/null +++ b/packages/feedback-service/src/jobs/index.ts @@ -0,0 +1,16 @@ +import {createJira} from './createJira'; +import {createGitlabIssue} from './createGitlabIssue'; +import {createGithubIssue} from './createGithubIssue'; + +export type WorkerProps = { + feedbackConfig: FeedbackConfigType, + userFeedback: FeedbackType, + app: any, + userData: any, +} + +export const setupWorkers = () => ({ + createJira, + createGitlabIssue, + createGithubIssue, +}); diff --git a/packages/feedback-service/src/lib/bullboard.ts b/packages/feedback-service/src/lib/bullboard.ts new file mode 100644 index 000000000..df3838aef --- /dev/null +++ b/packages/feedback-service/src/lib/bullboard.ts @@ -0,0 +1,16 @@ +import {ExpressAdapter} from '@bull-board/express'; +import {jiraQueue, gitlabQueue, githubQueue} from './queue'; +import {createBullBoard} from '@bull-board/api'; +import {BullMQAdapter} from '@bull-board/api/bullMQAdapter'; + +export const serverAdapter = new ExpressAdapter(); +createBullBoard({ + queues: [ + new BullMQAdapter(jiraQueue), + new BullMQAdapter(githubQueue), + new BullMQAdapter(gitlabQueue), + ], + serverAdapter, +}); + +serverAdapter.setBasePath('/admin'); diff --git a/packages/feedback-service/src/lib/logger.ts b/packages/feedback-service/src/lib/logger.ts index 09d5fbd04..050394827 100644 --- a/packages/feedback-service/src/lib/logger.ts +++ b/packages/feedback-service/src/lib/logger.ts @@ -1,46 +1,9 @@ -import winston from 'winston'; +import {createLogger, format, LoggerOptions, transports} from 'winston'; -const levels = { - error: 0, - warn: 1, - info: 2, - http: 3, - debug: 4, +export const winstonOptions: LoggerOptions = { + transports: [new transports.Console()], + format: format.combine(format.timestamp(), format.json()), + silent: process.env.NODE_ENV === 'test', }; -const level = () => { - const env = process.env.NODE_ENV || 'development'; - const isDevelopment = env === 'development'; - return isDevelopment ? 'debug' : 'warn'; -}; - -const colors = { - error: 'red', - warn: 'yellow', - info: 'green', - http: 'magenta', - debug: 'white', -}; - -winston.addColors(colors); - -const format = winston.format.combine( - winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss:ms' }), - winston.format.colorize({ all: true }), - winston.format.printf( - (info) => `${info.timestamp} ${info.level}: ${info.message}`, - ), -); - -const transports = [ - new winston.transports.Console(), -]; - -const Logger = winston.createLogger({ - level: level(), - levels, - format, - transports, -}); - -export default Logger; +export default createLogger(winstonOptions); diff --git a/packages/feedback-service/src/lib/queue.ts b/packages/feedback-service/src/lib/queue.ts new file mode 100644 index 000000000..a4163c699 --- /dev/null +++ b/packages/feedback-service/src/lib/queue.ts @@ -0,0 +1,15 @@ +import { Queue, QueueOptions } from 'bullmq'; +import { JIRA_JOB_NAME } from '../jobs/createJira'; +import { GITLAB_JOB_NAME } from '../jobs/createGitlabIssue'; +import { GITHUB_JOB_NAME } from '../jobs/createGithubIssue'; + +export const redisConfiguration: QueueOptions = { + connection: { + host: process.env.REDIS_HOST, + port: Number.parseInt(process.env.REDIS_PORT ?? '6379'), + } +} + +export const jiraQueue = new Queue(JIRA_JOB_NAME, redisConfiguration); +export const gitlabQueue = new Queue(GITLAB_JOB_NAME, redisConfiguration); +export const githubQueue = new Queue(GITHUB_JOB_NAME, redisConfiguration);