Mirror of https://github.com/roostorg/coop github.com/roostorg/coop
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

BullMQ Upgrade to latest (#45)

authored by

Juan Mrad and committed by
GitHub
d83baa19 5006c18a

+124 -132
+104 -126
server/package-lock.json
··· 50 50 "avsc": "^5.7.7", 51 51 "bcryptjs": "^2.4.3", 52 52 "body-parser": "^1.20.2", 53 - "bullmq": "^3.16.2", 53 + "bullmq": "^5.0.0", 54 54 "cassandra-driver": "^4.8.0", 55 55 "cls-hooked": "^4.2.2", 56 56 "connect-pg-simple": "^7.0.0", ··· 1800 1800 "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", 1801 1801 "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", 1802 1802 "dev": true, 1803 - "peer": true, 1804 1803 "dependencies": { 1805 1804 "@ampproject/remapping": "^2.2.0", 1806 1805 "@babel/code-frame": "^7.22.5", ··· 3004 3003 "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==" 3005 3004 }, 3006 3005 "node_modules/@ioredis/commands": { 3007 - "version": "1.2.0", 3008 - "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", 3009 - "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" 3006 + "version": "1.5.0", 3007 + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.5.0.tgz", 3008 + "integrity": "sha512-eUgLqrMf8nJkZxT24JvVRrQya1vZkQh8BBeYNwGDqa5I0VUi8ACx7uFvAaLxintokpTenkK6DASvo/bvNbBGow==", 3009 + "license": "MIT" 3010 3010 }, 3011 3011 "node_modules/@isaacs/cliui": { 3012 3012 "version": "8.0.2", ··· 3629 3629 } 3630 3630 }, 3631 3631 "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { 3632 - "version": "3.0.2", 3633 - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz", 3634 - "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==", 3632 + "version": "3.0.3", 3633 + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz", 3634 + "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==", 3635 3635 "cpu": [ 3636 3636 "arm64" 3637 3637 ], 3638 + "license": "MIT", 3638 3639 "optional": true, 3639 3640 "os": [ 3640 3641 "darwin" 3641 3642 ] 3642 3643 }, 3643 3644 "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { 3644 - "version": "3.0.2", 3645 - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz", 3646 - "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==", 3645 + "version": "3.0.3", 3646 + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz", 3647 + "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==", 3647 3648 "cpu": [ 3648 3649 "x64" 3649 3650 ], 3651 + "license": "MIT", 3650 3652 "optional": true, 3651 3653 "os": [ 3652 3654 "darwin" 3653 3655 ] 3654 3656 }, 3655 3657 "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { 3656 - "version": "3.0.2", 3657 - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz", 3658 - "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==", 3658 + "version": "3.0.3", 3659 + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz", 3660 + "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==", 3659 3661 "cpu": [ 3660 3662 "arm" 3661 3663 ], 3664 + "license": "MIT", 3662 3665 "optional": true, 3663 3666 "os": [ 3664 3667 "linux" 3665 3668 ] 3666 3669 }, 3667 3670 "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { 3668 - "version": "3.0.2", 3669 - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz", 3670 - "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==", 3671 + "version": "3.0.3", 3672 + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz", 3673 + "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==", 3671 3674 "cpu": [ 3672 3675 "arm64" 3673 3676 ], 3677 + "license": "MIT", 3674 3678 "optional": true, 3675 3679 "os": [ 3676 3680 "linux" 3677 3681 ] 3678 3682 }, 3679 3683 "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { 3680 - "version": "3.0.2", 3681 - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz", 3682 - "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==", 3684 + "version": "3.0.3", 3685 + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz", 3686 + "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==", 3683 3687 "cpu": [ 3684 3688 "x64" 3685 3689 ], 3690 + "license": "MIT", 3686 3691 "optional": true, 3687 3692 "os": [ 3688 3693 "linux" 3689 3694 ] 3690 3695 }, 3691 3696 "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { 3692 - "version": "3.0.2", 3693 - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz", 3694 - "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==", 3697 + "version": "3.0.3", 3698 + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz", 3699 + "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==", 3695 3700 "cpu": [ 3696 3701 "x64" 3697 3702 ], 3703 + "license": "MIT", 3698 3704 "optional": true, 3699 3705 "os": [ 3700 3706 "win32" ··· 11305 11311 "node_modules/@types/node": { 11306 11312 "version": "18.17.3", 11307 11313 "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.3.tgz", 11308 - "integrity": "sha512-2x8HWtFk0S99zqVQABU9wTpr8wPoaDHZUcAkoTKH+nL7kPv3WUI9cRi/Kk5Mz4xdqXSqTkKP7IWNoQQYCnDsTA==", 11309 - "peer": true 11314 + "integrity": "sha512-2x8HWtFk0S99zqVQABU9wTpr8wPoaDHZUcAkoTKH+nL7kPv3WUI9cRi/Kk5Mz4xdqXSqTkKP7IWNoQQYCnDsTA==" 11310 11315 }, 11311 11316 "node_modules/@types/node-fetch": { 11312 11317 "version": "2.6.4", ··· 11741 11746 "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz", 11742 11747 "integrity": "sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==", 11743 11748 "dev": true, 11744 - "peer": true, 11745 11749 "dependencies": { 11746 11750 "@typescript-eslint/scope-manager": "6.20.0", 11747 11751 "@typescript-eslint/types": "6.20.0", ··· 12220 12224 "version": "8.10.0", 12221 12225 "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", 12222 12226 "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", 12223 - "peer": true, 12224 12227 "bin": { 12225 12228 "acorn": "bin/acorn" 12226 12229 }, ··· 12279 12282 "version": "8.12.0", 12280 12283 "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", 12281 12284 "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", 12282 - "peer": true, 12283 12285 "dependencies": { 12284 12286 "fast-deep-equal": "^3.1.1", 12285 12287 "json-schema-traverse": "^1.0.0", ··· 12716 12718 "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", 12717 12719 "dev": true 12718 12720 }, 12721 + "node_modules/asn1.js": { 12722 + "version": "5.4.1", 12723 + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", 12724 + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", 12725 + "license": "MIT", 12726 + "optional": true, 12727 + "dependencies": { 12728 + "bn.js": "^4.0.0", 12729 + "inherits": "^2.0.1", 12730 + "minimalistic-assert": "^1.0.0", 12731 + "safer-buffer": "^2.1.0" 12732 + } 12733 + }, 12719 12734 "node_modules/asn1.js-rfc2560": { 12720 12735 "version": "5.0.1", 12721 12736 "resolved": "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-5.0.1.tgz", ··· 12798 12813 "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz", 12799 12814 "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==", 12800 12815 "license": "MIT", 12801 - "peer": true, 12802 12816 "dependencies": { 12803 12817 "follow-redirects": "^1.15.6", 12804 12818 "form-data": "^4.0.4", ··· 13070 13084 "url": "https://github.com/sponsors/ai" 13071 13085 } 13072 13086 ], 13073 - "peer": true, 13074 13087 "dependencies": { 13075 13088 "caniuse-lite": "^1.0.30001517", 13076 13089 "electron-to-chromium": "^1.4.477", ··· 13137 13150 } 13138 13151 }, 13139 13152 "node_modules/bullmq": { 13140 - "version": "3.16.2", 13141 - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-3.16.2.tgz", 13142 - "integrity": "sha512-wZIsCdI2H6lza6GdePquCWbrslhYHS7GnDPpP0hzoHkvKiBOt/5jHcsHcHhJi/fob+dfo8dazWKTSLlGLFFqUw==", 13153 + "version": "5.67.3", 13154 + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.67.3.tgz", 13155 + "integrity": "sha512-eeQobOJn8M0Rj8tcZCVFLrimZgJQallJH1JpclOoyut2nDNkDwTEPMVcZzLeSR2fGeIVbfJTjU96F563Qkge5A==", 13143 13156 "license": "MIT", 13144 13157 "dependencies": { 13145 - "cron-parser": "^4.6.0", 13146 - "glob": "^8.0.3", 13147 - "ioredis": "^5.3.2", 13148 - "lodash": "^4.17.21", 13149 - "msgpackr": "^1.6.2", 13150 - "semver": "^7.3.7", 13151 - "tslib": "^2.0.0", 13152 - "uuid": "^9.0.0" 13158 + "cron-parser": "4.9.0", 13159 + "ioredis": "5.9.2", 13160 + "msgpackr": "1.11.5", 13161 + "node-abort-controller": "3.1.1", 13162 + "semver": "7.7.3", 13163 + "tslib": "2.8.1", 13164 + "uuid": "11.1.0" 13153 13165 } 13154 13166 }, 13155 13167 "node_modules/bullmq/node_modules/uuid": { 13156 - "version": "9.0.0", 13157 - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", 13158 - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", 13168 + "version": "11.1.0", 13169 + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", 13170 + "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", 13171 + "funding": [ 13172 + "https://github.com/sponsors/broofa", 13173 + "https://github.com/sponsors/ctavan" 13174 + ], 13175 + "license": "MIT", 13159 13176 "bin": { 13160 - "uuid": "dist/bin/uuid" 13177 + "uuid": "dist/esm/bin/uuid" 13161 13178 } 13162 13179 }, 13163 13180 "node_modules/bytes": { ··· 13697 13714 "dev": true 13698 13715 }, 13699 13716 "node_modules/cron-parser": { 13700 - "version": "4.8.1", 13701 - "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.8.1.tgz", 13702 - "integrity": "sha512-jbokKWGcyU4gl6jAfX97E1gDpY12DJ1cLJZmoDzaAln/shZ+S3KBFBuA2Q6WeUN4gJf/8klnV1EfvhA2lK5IRQ==", 13717 + "version": "4.9.0", 13718 + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", 13719 + "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==", 13720 + "license": "MIT", 13703 13721 "dependencies": { 13704 13722 "luxon": "^3.2.1" 13705 13723 }, ··· 14333 14351 "version": "8.57.0", 14334 14352 "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", 14335 14353 "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", 14336 - "peer": true, 14337 14354 "dependencies": { 14338 14355 "@eslint-community/eslint-utils": "^4.2.0", 14339 14356 "@eslint-community/regexpp": "^4.6.1", ··· 14544 14561 "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", 14545 14562 "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", 14546 14563 "dev": true, 14547 - "peer": true, 14548 14564 "dependencies": { 14549 14565 "array-includes": "^3.1.6", 14550 14566 "array.prototype.findlastindex": "^1.2.2", ··· 15123 15139 "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", 15124 15140 "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", 15125 15141 "license": "MIT", 15126 - "peer": true, 15127 15142 "dependencies": { 15128 15143 "accepts": "~1.3.8", 15129 15144 "array-flatten": "1.1.1", ··· 15925 15940 "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", 15926 15941 "license": "MIT" 15927 15942 }, 15928 - "node_modules/glob": { 15929 - "version": "8.1.0", 15930 - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", 15931 - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", 15932 - "dependencies": { 15933 - "fs.realpath": "^1.0.0", 15934 - "inflight": "^1.0.4", 15935 - "inherits": "2", 15936 - "minimatch": "^5.0.1", 15937 - "once": "^1.3.0" 15938 - }, 15939 - "engines": { 15940 - "node": ">=12" 15941 - }, 15942 - "funding": { 15943 - "url": "https://github.com/sponsors/isaacs" 15944 - } 15945 - }, 15946 15943 "node_modules/glob-parent": { 15947 15944 "version": "6.0.2", 15948 15945 "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", ··· 15954 15951 "node": ">=10.13.0" 15955 15952 } 15956 15953 }, 15957 - "node_modules/glob/node_modules/brace-expansion": { 15958 - "version": "2.0.2", 15959 - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", 15960 - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", 15961 - "license": "MIT", 15962 - "dependencies": { 15963 - "balanced-match": "^1.0.0" 15964 - } 15965 - }, 15966 - "node_modules/glob/node_modules/minimatch": { 15967 - "version": "5.1.6", 15968 - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", 15969 - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", 15970 - "dependencies": { 15971 - "brace-expansion": "^2.0.1" 15972 - }, 15973 - "engines": { 15974 - "node": ">=10" 15975 - } 15976 - }, 15977 15954 "node_modules/globals": { 15978 15955 "version": "13.24.0", 15979 15956 "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", ··· 16216 16193 "version": "16.8.2", 16217 16194 "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz", 16218 16195 "integrity": "sha512-cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg==", 16219 - "peer": true, 16220 16196 "engines": { 16221 16197 "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" 16222 16198 } ··· 16665 16641 } 16666 16642 }, 16667 16643 "node_modules/ioredis": { 16668 - "version": "5.3.2", 16669 - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz", 16670 - "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==", 16671 - "peer": true, 16644 + "version": "5.9.2", 16645 + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.9.2.tgz", 16646 + "integrity": "sha512-tAAg/72/VxOUW7RQSX1pIxJVucYKcjFjfvj60L57jrZpYCHC3XN0WCQ3sNYL4Gmvv+7GPvTAjc+KSdeNuE8oWQ==", 16647 + "license": "MIT", 16672 16648 "dependencies": { 16673 - "@ioredis/commands": "^1.1.1", 16649 + "@ioredis/commands": "1.5.0", 16674 16650 "cluster-key-slot": "^1.1.0", 16675 16651 "debug": "^4.3.4", 16676 16652 "denque": "^2.1.0", ··· 17108 17084 "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz", 17109 17085 "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==", 17110 17086 "dev": true, 17111 - "peer": true, 17112 17087 "dependencies": { 17113 17088 "@jest/core": "^29.6.2", 17114 17089 "@jest/types": "^29.6.1", ··· 18223 18198 } 18224 18199 }, 18225 18200 "node_modules/luxon": { 18226 - "version": "3.3.0", 18227 - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", 18228 - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==", 18201 + "version": "3.7.2", 18202 + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz", 18203 + "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==", 18204 + "license": "MIT", 18229 18205 "engines": { 18230 18206 "node": ">=12" 18231 18207 } ··· 18471 18447 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" 18472 18448 }, 18473 18449 "node_modules/msgpackr": { 18474 - "version": "1.11.8", 18475 - "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.8.tgz", 18476 - "integrity": "sha512-bC4UGzHhVvgDNS7kn9tV8fAucIYUBuGojcaLiz7v+P63Lmtm0Xeji8B/8tYKddALXxJLpwIeBmUN3u64C4YkRA==", 18450 + "version": "1.11.5", 18451 + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.5.tgz", 18452 + "integrity": "sha512-UjkUHN0yqp9RWKy0Lplhh+wlpdt9oQBYgULZOiFhV3VclSF1JnSQWZ5r9gORQlNYaUKQoR8itv7g7z1xDDuACA==", 18477 18453 "license": "MIT", 18478 18454 "optionalDependencies": { 18479 18455 "msgpackr-extract": "^3.0.2" 18480 18456 } 18481 18457 }, 18482 18458 "node_modules/msgpackr-extract": { 18483 - "version": "3.0.2", 18484 - "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz", 18485 - "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==", 18459 + "version": "3.0.3", 18460 + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz", 18461 + "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==", 18486 18462 "hasInstallScript": true, 18463 + "license": "MIT", 18487 18464 "optional": true, 18488 18465 "dependencies": { 18489 - "node-gyp-build-optional-packages": "5.0.7" 18466 + "node-gyp-build-optional-packages": "5.2.2" 18490 18467 }, 18491 18468 "bin": { 18492 18469 "download-msgpackr-prebuilds": "bin/download-prebuilds.js" 18493 18470 }, 18494 18471 "optionalDependencies": { 18495 - "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2", 18496 - "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2", 18497 - "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2", 18498 - "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2", 18499 - "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2", 18500 - "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2" 18472 + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3", 18473 + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3", 18474 + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3", 18475 + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3", 18476 + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3", 18477 + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3" 18501 18478 } 18502 18479 }, 18503 18480 "node_modules/napi-build-utils": { ··· 18623 18600 } 18624 18601 }, 18625 18602 "node_modules/node-gyp-build-optional-packages": { 18626 - "version": "5.0.7", 18627 - "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz", 18628 - "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==", 18603 + "version": "5.2.2", 18604 + "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz", 18605 + "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==", 18606 + "license": "MIT", 18629 18607 "optional": true, 18608 + "dependencies": { 18609 + "detect-libc": "^2.0.1" 18610 + }, 18630 18611 "bin": { 18631 18612 "node-gyp-build-optional-packages": "bin.js", 18632 18613 "node-gyp-build-optional-packages-optional": "optional.js", ··· 19080 19061 "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz", 19081 19062 "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==", 19082 19063 "license": "MIT", 19083 - "peer": true, 19084 19064 "dependencies": { 19085 19065 "passport-strategy": "1.x.x", 19086 19066 "pause": "0.0.1", ··· 20169 20149 } 20170 20150 }, 20171 20151 "node_modules/semver": { 20172 - "version": "7.6.2", 20173 - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", 20174 - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", 20152 + "version": "7.7.3", 20153 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", 20154 + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", 20155 + "license": "ISC", 20175 20156 "bin": { 20176 20157 "semver": "bin/semver.js" 20177 20158 }, ··· 21437 21418 "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", 21438 21419 "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", 21439 21420 "dev": true, 21440 - "peer": true, 21441 21421 "dependencies": { 21442 21422 "@cspotcode/source-map-support": "^0.8.0", 21443 21423 "@tsconfig/node10": "^1.0.7", ··· 21537 21517 } 21538 21518 }, 21539 21519 "node_modules/tslib": { 21540 - "version": "2.6.3", 21541 - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", 21542 - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" 21520 + "version": "2.8.1", 21521 + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", 21522 + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", 21523 + "license": "0BSD" 21543 21524 }, 21544 21525 "node_modules/tsutils": { 21545 21526 "version": "3.21.0", 21546 21527 "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", 21547 21528 "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", 21548 21529 "dev": true, 21549 - "peer": true, 21550 21530 "dependencies": { 21551 21531 "tslib": "^1.8.1" 21552 21532 }, ··· 21715 21695 "version": "5.5.2", 21716 21696 "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", 21717 21697 "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", 21718 - "peer": true, 21719 21698 "bin": { 21720 21699 "tsc": "bin/tsc", 21721 21700 "tsserver": "bin/tsserver" ··· 21785 21764 "version": "7.14.1", 21786 21765 "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.14.1.tgz", 21787 21766 "integrity": "sha512-8lKUOebNLcR0D7RvlcloOacTOWzOqemWEWkKSVpMZVF/XVcwjPR+3MD08QzbW9TCGJ+DwIc6zUSGZ9vd8cO1IA==", 21788 - "peer": true, 21789 21767 "dependencies": { 21790 21768 "@typescript-eslint/scope-manager": "7.14.1", 21791 21769 "@typescript-eslint/types": "7.14.1",
+1 -2
server/package.json
··· 64 64 "avsc": "^5.7.7", 65 65 "bcryptjs": "^2.4.3", 66 66 "body-parser": "^1.20.2", 67 - "bullmq": "^3.16.2", 67 + "bullmq": "^5.0.0", 68 68 "cassandra-driver": "^4.8.0", 69 69 "cls-hooked": "^4.2.2", 70 70 "connect-pg-simple": "^7.0.0", ··· 160 160 "//": "Use an override to remove the @types/restify dependency, b/c it conflicts w/ pino-http. And a fork of retry-axios that has fixed type defs for TS's new module resolution algorithm.", 161 161 "overrides": { 162 162 "@types/restify": "npm:pino@8.6.0", 163 - "msgpackr": "^1.11.2", 164 163 "@googlemaps/google-maps-services-js@^3.3.16": { 165 164 "retry-axios": "npm:@ethanresnick/retry-axios@2.6.1" 166 165 },
+14 -2
server/routes/reporting/submitReport.ts
··· 439 439 await enqueueWithRetries(); 440 440 }, 441 441 ); 442 - // Do nothing on error, as the span will already be marked as failed 443 - } catch {} 442 + // Record on active span and log so we can diagnose when enqueue fails (e.g. no default queue, BullMQ/Redis errors) 443 + } catch (e) { 444 + const activeSpan = Tracer.getActiveSpan(); 445 + if (activeSpan?.isRecording()) { 446 + activeSpan.recordException(e as Exception); 447 + } 448 + // eslint-disable-next-line no-console 449 + console.error( 450 + 'Failed to enqueue report to manual review queue', 451 + reportId, 452 + orgId, 453 + e, 454 + ); 455 + } 444 456 // this error handling only triggers on errors before the `res.sendStatus` call 445 457 } catch (e: unknown) { 446 458 const activeSpan = Tracer.getActiveSpan();
+5 -2
server/services/manualReviewToolService/modules/QueueOperations.ts
··· 821 821 const queue = await this.#getBullQueue(orgId, queueId); 822 822 const { bullId } = parseExternalId(jobId); 823 823 const job = await queue.getJob(bullId); 824 - await job?.update(data); 824 + await job?.updateData(data); 825 825 826 826 // Because the `data` arg above is a ManualReviewJob, we know the stored 827 827 // data for this particular job won't be in the legacy format. ··· 1356 1356 /** 1357 1357 * We want Bull to dedupe jobs on the same item, so this function maps each 1358 1358 * distinct item identifier object to a string that can be used as a Bull job id. 1359 + * Uses '.' as separator because BullMQ v5 disallows ':' in custom job ids. 1359 1360 * 1360 1361 * NB: only exported for use in tests. 1361 1362 * @private 1362 1363 */ 1364 + const BULL_JOB_ID_SEPARATOR = '.'; 1365 + 1363 1366 export function itemIdToBullJobId({ typeId, id }: ItemIdentifier) { 1364 1367 if (!typeId || !id) { 1365 1368 throw new Error('itemTypeId and itemId cannot be empty strings'); 1366 1369 } 1367 1370 1368 1371 return instantiateOpaqueType<BullJobId>( 1369 - [typeId, id].map(b64UrlEncode).join(':'), 1372 + [typeId, id].map(b64UrlEncode).join(BULL_JOB_ID_SEPARATOR), 1370 1373 ); 1371 1374 } 1372 1375