From ca63ddea603bd5ca5f74c50b07dbaa1a53d321dd Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Mon, 20 Apr 2026 19:31:03 +0300 Subject: [PATCH 01/32] =?UTF-8?q?feat:=20=D0=A3=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D1=82=20`express`=20=D0=B8=20=D1=82=D0=B8?= =?UTF-8?q?=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 1467 ++++++++++++++++++++++++++++++--------------- package.json | 2 + 2 files changed, 978 insertions(+), 491 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17b3193..a07c89f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "convict-format-with-validator": "6.2.0", "dayjs": "1.11.19", "dotenv": "17.3.1", + "express": "5.2.1", "got": "14.6.6", "inversify": "7.11.0", "mongoose": "7.8.9", @@ -23,6 +24,7 @@ "devDependencies": { "@types/convict": "6.1.6", "@types/convict-format-with-validator": "6.0.6", + "@types/express": "5.0.6", "@types/node": "18.17.17", "@typescript-eslint/eslint-plugin": "6.7.0", "@typescript-eslint/parser": "6.7.0", @@ -955,6 +957,25 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" }, + "node_modules/@types/body-parser": { + "version": "1.19.6", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", + "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==", + "dev": true, + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/convict": { "version": "6.1.6", "resolved": "https://registry.npmjs.org/@types/convict/-/convict-6.1.6.tgz", @@ -973,11 +994,40 @@ "@types/convict": "*" } }, + "node_modules/@types/express": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.6.tgz", + "integrity": "sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==", + "dev": true, + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^5.0.0", + "@types/serve-static": "^2" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.1.tgz", + "integrity": "sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A==", + "dev": true, + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, "node_modules/@types/http-cache-semantics": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", "integrity": "sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==" }, + "node_modules/@types/http-errors": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", + "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==", + "dev": true + }, "node_modules/@types/json-schema": { "version": "7.0.13", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", @@ -995,12 +1045,43 @@ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, + "node_modules/@types/qs": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==", + "dev": true + }, + "node_modules/@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "dev": true + }, "node_modules/@types/semver": { "version": "7.5.2", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz", "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==", "dev": true }, + "node_modules/@types/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz", + "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/serve-static": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==", + "dev": true, + "dependencies": { + "@types/http-errors": "*", + "@types/node": "*" + } + }, "node_modules/@types/webidl-conversions": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", @@ -1666,7 +1747,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -1718,7 +1798,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -1731,7 +1810,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, "dependencies": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" @@ -1974,22 +2052,21 @@ } }, "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==", - "dev": true, - "dependencies": { - "safe-buffer": "5.2.1" - }, + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz", + "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==", "engines": { - "node": ">= 0.6" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/content-type": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -2029,16 +2106,17 @@ "version": "0.7.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/cookie-signature": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", - "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", - "dev": true + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "engines": { + "node": ">=6.6.0" + } }, "node_modules/cors": { "version": "2.8.6", @@ -2144,11 +2222,11 @@ "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==" }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -2217,7 +2295,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -2280,7 +2357,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -2300,8 +2376,7 @@ "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -2314,7 +2389,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -2426,7 +2500,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -2435,7 +2508,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -2471,7 +2543,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, "dependencies": { "es-errors": "^1.3.0" }, @@ -2577,8 +2648,7 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "node_modules/escape-string-regexp": { "version": "4.0.0", @@ -2958,7 +3028,6 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -2980,45 +3049,41 @@ } }, "node_modules/express": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", - "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", - "dev": true, - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "~1.20.3", - "content-disposition": "~0.5.4", - "content-type": "~1.0.4", - "cookie": "~0.7.1", - "cookie-signature": "~1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.3.1", - "fresh": "~0.5.2", - "http-errors": "~2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "~2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "~0.1.12", - "proxy-addr": "~2.0.7", - "qs": "~6.14.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "~0.19.0", - "serve-static": "~1.16.2", - "setprototypeof": "1.2.0", - "statuses": "~2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", + "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", + "dependencies": { + "accepts": "^2.0.0", + "body-parser": "^2.2.1", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "depd": "^2.0.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" }, "engines": { - "node": ">= 0.10.0" + "node": ">= 18" }, "funding": { "type": "opencollective", @@ -3044,20 +3109,113 @@ "isarray": "0.0.1" } }, - "node_modules/express/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "node_modules/express/node_modules/accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", "dependencies": { - "ms": "2.0.0" + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" + }, + "engines": { + "node": ">= 0.6" } }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "node_modules/express/node_modules/body-parser": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", + "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.3", + "http-errors": "^2.0.0", + "iconv-lite": "^0.7.0", + "on-finished": "^2.4.1", + "qs": "^6.14.1", + "raw-body": "^3.0.1", + "type-is": "^2.0.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/iconv-lite": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/mime-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/raw-body": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", + "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", + "dependencies": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.7.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/express/node_modules/type-is": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "dependencies": { + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 0.6" + } }, "node_modules/fast-copy": { "version": "3.0.2", @@ -3160,38 +3318,25 @@ } }, "node_modules/finalhandler": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", - "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", - "dev": true, + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", + "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==", "dependencies": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "~2.4.1", - "parseurl": "~1.3.3", - "statuses": "~2.0.2", - "unpipe": "~1.0.0" + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" }, "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" + "node": ">= 18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -3316,18 +3461,16 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true, + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/fs.realpath": { @@ -3355,7 +3498,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3411,7 +3553,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", @@ -3435,7 +3576,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -3601,7 +3741,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -3709,7 +3848,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -3736,7 +3874,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -3765,7 +3902,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", - "dev": true, "dependencies": { "depd": "~2.0.0", "inherits": "~2.0.4", @@ -3886,8 +4022,7 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/internal-slot": { "version": "1.1.0", @@ -3925,7 +4060,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true, "engines": { "node": ">= 0.10" } @@ -4518,30 +4652,190 @@ "node": ">=12" } }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "node_modules/jsx-ast-utils": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", - "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", + "node_modules/json-server/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==", "dev": true, "dependencies": { - "array-includes": "^3.1.5", - "object.assign": "^4.1.3" + "safe-buffer": "5.2.1" }, "engines": { - "node": ">=4.0" + "node": ">= 0.6" } }, - "node_modules/kareem": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz", - "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==", - "engines": { + "node_modules/json-server/node_modules/cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", + "dev": true + }, + "node_modules/json-server/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/json-server/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/json-server/node_modules/express": { + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", + "dev": true, + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "~1.20.3", + "content-disposition": "~0.5.4", + "content-type": "~1.0.4", + "cookie": "~0.7.1", + "cookie-signature": "~1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.3.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "~0.1.12", + "proxy-addr": "~2.0.7", + "qs": "~6.14.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "~0.19.0", + "serve-static": "~1.16.2", + "setprototypeof": "1.2.0", + "statuses": "~2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/json-server/node_modules/finalhandler": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", + "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", + "dev": true, + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "statuses": "~2.0.2", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/json-server/node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/json-server/node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/json-server/node_modules/path-to-regexp": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", + "dev": true + }, + "node_modules/json-server/node_modules/send": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", + "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", + "dev": true, + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.4.1", + "range-parser": "~1.2.1", + "statuses": "~2.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/json-server/node_modules/serve-static": { + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", + "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", + "dev": true, + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "~0.19.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", + "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.5", + "object.assign": "^4.1.3" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/kareem": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz", + "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==", + "engines": { "node": ">=12.0.0" } }, @@ -4673,7 +4967,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -4694,10 +4987,12 @@ "optional": true }, "node_modules/merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "dev": true, + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "engines": { + "node": ">=18" + }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -4780,7 +5075,6 @@ "version": "1.54.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -4927,11 +5221,6 @@ "url": "https://opencollective.com/mongoose" } }, - "node_modules/mongoose/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/morgan": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", @@ -4995,9 +5284,9 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/nanoid": { "version": "3.3.11", @@ -5199,7 +5488,6 @@ "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -5299,7 +5587,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, "dependencies": { "ee-first": "1.1.1" }, @@ -5320,7 +5607,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -5447,7 +5733,6 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -5510,10 +5795,13 @@ "license": "ISC" }, "node_modules/path-to-regexp": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", - "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", - "dev": true + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } }, "node_modules/path-type": { "version": "4.0.0", @@ -5669,7 +5957,6 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -5706,7 +5993,6 @@ "version": "6.14.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz", "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", - "dev": true, "dependencies": { "side-channel": "^1.1.0" }, @@ -5757,7 +6043,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -6101,6 +6386,26 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/router/node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==" + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -6227,8 +6532,7 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/secure-json-parse": { "version": "2.7.0", @@ -6254,63 +6558,61 @@ "dev": true }, "node_modules/send": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", - "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", - "dev": true, - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "~0.5.2", - "http-errors": "~2.0.1", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "~2.4.1", - "range-parser": "~1.2.1", - "statuses": "~2.0.2" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", + "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", + "dependencies": { + "debug": "^4.4.3", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.1", + "mime-types": "^3.0.2", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.2" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "node_modules/send/node_modules/mime-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", "dependencies": { - "ms": "2.0.0" + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "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==", - "dev": true - }, "node_modules/serve-static": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", - "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", - "dev": true, + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", + "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "~0.19.1" + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/server-destroy": { @@ -6368,8 +6670,7 @@ "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "node_modules/shebang-command": { "version": "2.0.0", @@ -6396,7 +6697,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", @@ -6415,7 +6715,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" @@ -6431,7 +6730,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -6449,7 +6747,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -6585,7 +6882,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -6888,7 +7184,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true, "engines": { "node": ">=0.6" } @@ -7146,7 +7441,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -7197,7 +7491,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -7432,8 +7725,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/y18n": { "version": "5.0.8", @@ -8059,6 +8351,25 @@ } } }, + "@types/body-parser": { + "version": "1.19.6", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", + "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==", + "dev": true, + "requires": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/convict": { "version": "6.1.6", "resolved": "https://registry.npmjs.org/@types/convict/-/convict-6.1.6.tgz", @@ -8077,11 +8388,40 @@ "@types/convict": "*" } }, + "@types/express": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.6.tgz", + "integrity": "sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==", + "dev": true, + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^5.0.0", + "@types/serve-static": "^2" + } + }, + "@types/express-serve-static-core": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.1.tgz", + "integrity": "sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A==", + "dev": true, + "requires": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, "@types/http-cache-semantics": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", "integrity": "sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==" }, + "@types/http-errors": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", + "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==", + "dev": true + }, "@types/json-schema": { "version": "7.0.13", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", @@ -8099,12 +8439,43 @@ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, + "@types/qs": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==", + "dev": true + }, + "@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "dev": true + }, "@types/semver": { "version": "7.5.2", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz", "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==", "dev": true }, + "@types/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz", + "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/serve-static": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==", + "dev": true, + "requires": { + "@types/http-errors": "*", + "@types/node": "*" + } + }, "@types/webidl-conversions": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", @@ -8542,8 +8913,7 @@ "bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" }, "cacheable-lookup": { "version": "7.0.0", @@ -8580,7 +8950,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, "requires": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -8590,7 +8959,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, "requires": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" @@ -8775,19 +9143,14 @@ "dev": true }, "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==", - "dev": true, - "requires": { - "safe-buffer": "5.2.1" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz", + "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==" }, "content-type": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" }, "convict": { "version": "6.2.4", @@ -8816,14 +9179,12 @@ "cookie": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "dev": true + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==" }, "cookie-signature": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", - "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", - "dev": true + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==" }, "cors": { "version": "2.8.6", @@ -8897,11 +9258,11 @@ "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==" }, "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "requires": { - "ms": "2.1.2" + "ms": "^2.1.3" } }, "decompress-response": { @@ -8943,8 +9304,7 @@ "depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" }, "destroy": { "version": "1.2.0", @@ -8985,7 +9345,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "requires": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -9001,8 +9360,7 @@ "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "emoji-regex": { "version": "9.2.2", @@ -9013,8 +9371,7 @@ "encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" }, "end-of-stream": { "version": "1.4.5", @@ -9109,14 +9466,12 @@ "es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==" }, "es-errors": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" }, "es-iterator-helpers": { "version": "1.2.2", @@ -9146,7 +9501,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, "requires": { "es-errors": "^1.3.0" } @@ -9226,8 +9580,7 @@ "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "escape-string-regexp": { "version": "4.0.0", @@ -9477,91 +9830,143 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, - "requires": { - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true - }, - "event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - }, - "events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" - }, - "express": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", - "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", - "dev": true, - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "~1.20.3", - "content-disposition": "~0.5.4", - "content-type": "~1.0.4", - "cookie": "~0.7.1", - "cookie-signature": "~1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.3.1", - "fresh": "~0.5.2", - "http-errors": "~2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "~2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "~0.1.12", - "proxy-addr": "~2.0.7", - "qs": "~6.14.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "~0.19.0", - "serve-static": "~1.16.2", - "setprototypeof": "1.2.0", - "statuses": "~2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "requires": { + "estraverse": "^5.2.0" + } + }, + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" + }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, + "events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" + }, + "express": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", + "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", + "requires": { + "accepts": "^2.0.0", + "body-parser": "^2.2.1", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "depd": "^2.0.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" + }, + "dependencies": { + "accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", "requires": { - "ms": "2.0.0" + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "body-parser": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", + "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "requires": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.3", + "http-errors": "^2.0.0", + "iconv-lite": "^0.7.0", + "on-finished": "^2.4.1", + "qs": "^6.14.1", + "raw-body": "^3.0.1", + "type-is": "^2.0.1" + } + }, + "iconv-lite": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + }, + "media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==" + }, + "mime-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", + "requires": { + "mime-db": "^1.54.0" + } + }, + "negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==" + }, + "raw-body": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", + "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", + "requires": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.7.0", + "unpipe": "~1.0.0" + } + }, + "type-is": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "requires": { + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + } } } }, @@ -9673,35 +10078,16 @@ } }, "finalhandler": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", - "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", - "dev": true, + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", + "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==", "requires": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "~2.4.1", - "parseurl": "~1.3.3", - "statuses": "~2.0.2", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" } }, "find-up": { @@ -9792,14 +10178,12 @@ "forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" }, "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==" }, "fs.realpath": { "version": "1.0.0", @@ -9817,8 +10201,7 @@ "function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "function.prototype.name": { "version": "1.1.8", @@ -9856,7 +10239,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, "requires": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", @@ -9874,7 +10256,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "requires": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -9988,8 +10369,7 @@ "gopd": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==" }, "got": { "version": "14.6.6", @@ -10061,8 +10441,7 @@ "has-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" }, "has-tostringtag": { "version": "1.0.2", @@ -10077,7 +10456,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "requires": { "function-bind": "^1.1.2" } @@ -10103,7 +10481,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", - "dev": true, "requires": { "depd": "~2.0.0", "inherits": "~2.0.4", @@ -10182,8 +10559,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "internal-slot": { "version": "1.1.0", @@ -10214,8 +10590,7 @@ "ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, "is-array-buffer": { "version": "3.0.5", @@ -10611,6 +10986,145 @@ "pluralize": "^8.0.0", "server-destroy": "^1.0.1", "yargs": "^17.0.1" + }, + "dependencies": { + "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==", + "dev": true, + "requires": { + "safe-buffer": "5.2.1" + } + }, + "cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", + "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + } + } + }, + "express": { + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", + "dev": true, + "requires": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "~1.20.3", + "content-disposition": "~0.5.4", + "content-type": "~1.0.4", + "cookie": "~0.7.1", + "cookie-signature": "~1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.3.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "~0.1.12", + "proxy-addr": "~2.0.7", + "qs": "~6.14.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "~0.19.0", + "serve-static": "~1.16.2", + "setprototypeof": "1.2.0", + "statuses": "~2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + } + }, + "finalhandler": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", + "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", + "dev": true, + "requires": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "statuses": "~2.0.2", + "unpipe": "~1.0.0" + } + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true + }, + "merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true + }, + "path-to-regexp": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", + "dev": true + }, + "send": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", + "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", + "dev": true, + "requires": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.4.1", + "range-parser": "~1.2.1", + "statuses": "~2.0.2" + } + }, + "serve-static": { + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", + "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", + "dev": true, + "requires": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "~0.19.1" + } + } } }, "json-stable-stringify-without-jsonify": { @@ -10730,8 +11244,7 @@ "math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" }, "media-typer": { "version": "0.3.0", @@ -10746,10 +11259,9 @@ "optional": true }, "merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "dev": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==" }, "merge2": { "version": "1.4.1", @@ -10811,8 +11323,7 @@ "mime-db": { "version": "1.54.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==" }, "mime-types": { "version": "2.1.35", @@ -10895,13 +11406,6 @@ "mquery": "5.0.0", "ms": "2.1.3", "sift": "16.0.1" - }, - "dependencies": { - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - } } }, "morgan": { @@ -10957,9 +11461,9 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "nanoid": { "version": "3.3.11", @@ -11098,8 +11602,7 @@ "object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==" }, "object-keys": { "version": "1.1.1", @@ -11166,7 +11669,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, "requires": { "ee-first": "1.1.1" } @@ -11181,7 +11683,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "requires": { "wrappy": "1" } @@ -11270,8 +11771,7 @@ "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, "path-exists": { "version": "4.0.0", @@ -11316,10 +11816,9 @@ } }, "path-to-regexp": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", - "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", - "dev": true + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==" }, "path-type": { "version": "4.0.0", @@ -11445,7 +11944,6 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, "requires": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -11476,7 +11974,6 @@ "version": "6.14.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz", "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", - "dev": true, "requires": { "side-channel": "^1.1.0" } @@ -11500,8 +11997,7 @@ "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { "version": "2.5.3", @@ -11744,6 +12240,25 @@ "glob": "^10.2.5" } }, + "router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "requires": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "dependencies": { + "is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==" + } + } + }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -11825,8 +12340,7 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "secure-json-parse": { "version": "2.7.0", @@ -11846,61 +12360,42 @@ "dev": true }, "send": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", - "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "~0.5.2", - "http-errors": "~2.0.1", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "~2.4.1", - "range-parser": "~1.2.1", - "statuses": "~2.0.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", + "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", + "requires": { + "debug": "^4.4.3", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.1", + "mime-types": "^3.0.2", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.2" + }, + "dependencies": { + "mime-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } + "mime-db": "^1.54.0" } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true } } }, "serve-static": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", - "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", - "dev": true, + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", + "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", "requires": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "~0.19.1" + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" } }, "server-destroy": { @@ -11949,8 +12444,7 @@ "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "shebang-command": { "version": "2.0.0", @@ -11971,7 +12465,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, "requires": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", @@ -11984,7 +12477,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, "requires": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" @@ -11994,7 +12486,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, "requires": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -12006,7 +12497,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, "requires": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -12112,8 +12602,7 @@ "statuses": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", - "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", - "dev": true + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==" }, "steno": { "version": "0.4.4", @@ -12331,8 +12820,7 @@ "toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" }, "touch": { "version": "3.1.1", @@ -12498,8 +12986,7 @@ "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" }, "uri-js": { "version": "4.4.1", @@ -12540,8 +13027,7 @@ "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" }, "webidl-conversions": { "version": "7.0.0", @@ -12702,8 +13188,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "y18n": { "version": "5.0.8", diff --git a/package.json b/package.json index 265f834..d08b9a2 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "devDependencies": { "@types/convict": "6.1.6", "@types/convict-format-with-validator": "6.0.6", + "@types/express": "5.0.6", "@types/node": "18.17.17", "@typescript-eslint/eslint-plugin": "6.7.0", "@typescript-eslint/parser": "6.7.0", @@ -47,6 +48,7 @@ "convict-format-with-validator": "6.2.0", "dayjs": "1.11.19", "dotenv": "17.3.1", + "express": "5.2.1", "got": "14.6.6", "inversify": "7.11.0", "mongoose": "7.8.9", From 645f39697b805b6c2f8c9f7105ae117a50e031b7 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Tue, 21 Apr 2026 00:15:42 +0300 Subject: [PATCH 02/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20`express`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rest/rest.application.ts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/rest/rest.application.ts b/src/rest/rest.application.ts index c39def1..3357770 100644 --- a/src/rest/rest.application.ts +++ b/src/rest/rest.application.ts @@ -1,3 +1,4 @@ +import express, { Express } from 'express'; import { inject, injectable } from 'inversify'; import { Component } from '../shared/types/index.js'; import { Logger } from '../shared/libs/logger/index.js'; @@ -7,11 +8,15 @@ import { DatabaseClient } from '../shared/libs/database-client/index.js'; @injectable() export class RestApplication { + private readonly server: Express; + constructor( @inject(Component.Logger) private readonly logger: Logger, @inject(Component.Config) private readonly config: Config, @inject(Component.DatabaseClient) private readonly databaseClient: DatabaseClient, - ) {} + ) { + this.server = express(); + } private async initDb() { const mongoUri = getMongoURI( @@ -25,12 +30,20 @@ export class RestApplication { return this.databaseClient.connect(mongoUri); } + private async _initServer() { + const port = this.config.get('PORT'); + this.server.listen(port); + } + public async init() { this.logger.info('Application initialization'); - this.logger.info(`Get value from env $PORT: ${this.config.get('PORT')}`); this.logger.info('Init database…'); await this.initDb(); this.logger.info('Init database completed'); + + this.logger.info('Try to init server…'); + await this._initServer(); + this.logger.info(`🚀 Server started on http://localhost:${this.config.get('PORT')}`); } } From 725500437217e36457c59d43301dc0e39b0a9333 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Tue, 21 Apr 2026 00:25:02 +0300 Subject: [PATCH 03/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?= =?UTF-8?q?=D1=81=20`Route`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/libs/rest/index.ts | 2 ++ src/shared/libs/rest/types/http-method.enum.ts | 7 +++++++ src/shared/libs/rest/types/route.interface.ts | 8 ++++++++ 3 files changed, 17 insertions(+) create mode 100644 src/shared/libs/rest/index.ts create mode 100644 src/shared/libs/rest/types/http-method.enum.ts create mode 100644 src/shared/libs/rest/types/route.interface.ts diff --git a/src/shared/libs/rest/index.ts b/src/shared/libs/rest/index.ts new file mode 100644 index 0000000..af34e43 --- /dev/null +++ b/src/shared/libs/rest/index.ts @@ -0,0 +1,2 @@ +export * from './types/route.interface.js'; +export * from './types/http-method.enum.js'; diff --git a/src/shared/libs/rest/types/http-method.enum.ts b/src/shared/libs/rest/types/http-method.enum.ts new file mode 100644 index 0000000..f46a2a9 --- /dev/null +++ b/src/shared/libs/rest/types/http-method.enum.ts @@ -0,0 +1,7 @@ +export enum HttpMethod { + Get = 'get', + Post = 'post', + Delete = 'delete', + Patch = 'patch', + Put = 'put', +} diff --git a/src/shared/libs/rest/types/route.interface.ts b/src/shared/libs/rest/types/route.interface.ts new file mode 100644 index 0000000..2cc6c16 --- /dev/null +++ b/src/shared/libs/rest/types/route.interface.ts @@ -0,0 +1,8 @@ +import { HttpMethod } from './http-method.enum.js'; +import { NextFunction, Request, Response } from 'express'; + +export interface Route { + path: string; + method: HttpMethod; + handler: (req: Request, res: Response, next: NextFunction) => void; +} From ca5b4fe76cbb057e00ede6ccc53ae622f3cb4597 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Tue, 21 Apr 2026 02:16:15 +0300 Subject: [PATCH 04/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?= =?UTF-8?q?=D1=81=20`Controller`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libs/rest/controller/controller.interface.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/shared/libs/rest/controller/controller.interface.ts diff --git a/src/shared/libs/rest/controller/controller.interface.ts b/src/shared/libs/rest/controller/controller.interface.ts new file mode 100644 index 0000000..7f94b68 --- /dev/null +++ b/src/shared/libs/rest/controller/controller.interface.ts @@ -0,0 +1,11 @@ +import { Response, Router } from 'express'; +import { Route } from '../types/route.interface.js'; + +export interface Controller { + readonly router: Router; + addRoute(route: Route): void; + send(res: Response, statusCode: number, data: T): void; + ok(res: Response, data: T): void; + created(res: Response, data: T): void; + noContent(res: Response, data: T): void; +} From 72ae1285bf295d4e57d6979ea40fa7139b7759fa Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Tue, 21 Apr 2026 02:24:23 +0300 Subject: [PATCH 05/32] =?UTF-8?q?feat:=20=D0=A3=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D1=82=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20`ht?= =?UTF-8?q?tp-status-codes`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 11 +++++++++++ package.json | 1 + 2 files changed, 12 insertions(+) diff --git a/package-lock.json b/package-lock.json index a07c89f..9919d87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "dotenv": "17.3.1", "express": "5.2.1", "got": "14.6.6", + "http-status-codes": "2.3.0", "inversify": "7.11.0", "mongoose": "7.8.9", "pino": "8.21.0", @@ -3917,6 +3918,11 @@ "url": "https://opencollective.com/express" } }, + "node_modules/http-status-codes": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.3.0.tgz", + "integrity": "sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==" + }, "node_modules/http2-wrapper": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", @@ -10489,6 +10495,11 @@ "toidentifier": "~1.0.1" } }, + "http-status-codes": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.3.0.tgz", + "integrity": "sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==" + }, "http2-wrapper": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", diff --git a/package.json b/package.json index d08b9a2..90d89dc 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "dotenv": "17.3.1", "express": "5.2.1", "got": "14.6.6", + "http-status-codes": "2.3.0", "inversify": "7.11.0", "mongoose": "7.8.9", "pino": "8.21.0", From 5807b2c55ec83927f1ba64b69f01726a51af138a Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 22 Apr 2026 11:16:19 +0300 Subject: [PATCH 06/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=B0=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20`BaseCont?= =?UTF-8?q?roller`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base-controller.abstract.ts | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/shared/libs/rest/controller/base-controller.abstract.ts diff --git a/src/shared/libs/rest/controller/base-controller.abstract.ts b/src/shared/libs/rest/controller/base-controller.abstract.ts new file mode 100644 index 0000000..9d2959d --- /dev/null +++ b/src/shared/libs/rest/controller/base-controller.abstract.ts @@ -0,0 +1,47 @@ +import { injectable } from 'inversify'; +import { Response, Router } from 'express'; +import { Logger } from '../../logger/index.js'; +import { StatusCodes } from 'http-status-codes'; +import { Route } from '../types/route.interface.js'; +import { Controller } from './controller.interface.js'; + +const DEFAULT_CONTENT_TYPE = 'application/json'; + +@injectable() +export abstract class BaseController implements Controller { + private readonly _router: Router; + + constructor( + protected readonly logger: Logger + ) { + this._router = Router(); + } + + get router() { + return this._router; + } + + public addRoute(route: Route) { + this._router[route.method](route.path, route.handler.bind(this)); + this.logger.info(`Route registered: ${route.method.toUpperCase()} ${route.path}`); + } + + public send(res: Response, statusCode: number, data: T): void { + res + .type(DEFAULT_CONTENT_TYPE) + .status(statusCode) + .json(data); + } + + public created(res: Response, data: T): void { + this.send(res, StatusCodes.CREATED, data); + } + + public noContent(res: Response, data: T): void { + this.send(res, StatusCodes.NO_CONTENT, data); + } + + public ok(res: Response, data: T): void { + this.send(res, StatusCodes.OK, data); + } +} From 92b5e80709a061fcf4dd0af5d121c8df9cff74db Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 22 Apr 2026 17:50:08 +0300 Subject: [PATCH 07/32] =?UTF-8?q?feat:=20=D0=A3=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D1=82=20`class-transformer`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 11 +++++++++++ package.json | 1 + 2 files changed, 12 insertions(+) diff --git a/package-lock.json b/package-lock.json index 9919d87..02a9a1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@typegoose/typegoose": "11.8.1", "chalk": "4.1.2", + "class-transformer": "0.5.1", "convict": "6.2.4", "convict-format-with-validator": "6.2.0", "dayjs": "1.11.19", @@ -1898,6 +1899,11 @@ "node": ">=8" } }, + "node_modules/class-transformer": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz", + "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==" + }, "node_modules/clean-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz", @@ -9018,6 +9024,11 @@ "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", "dev": true }, + "class-transformer": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz", + "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==" + }, "clean-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz", diff --git a/package.json b/package.json index 90d89dc..89c4487 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "dependencies": { "@typegoose/typegoose": "11.8.1", "chalk": "4.1.2", + "class-transformer": "0.5.1", "convict": "6.2.4", "convict-format-with-validator": "6.2.0", "dayjs": "1.11.19", From d773a3aae7fbd851bde34c34727053a38c454d75 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 22 Apr 2026 17:53:11 +0300 Subject: [PATCH 08/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?= =?UTF-8?q?=D1=81=20`ExceptionFilter`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libs/rest/exception-filter/exception-filter.interface.ts | 5 +++++ src/shared/libs/rest/index.ts | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 src/shared/libs/rest/exception-filter/exception-filter.interface.ts diff --git a/src/shared/libs/rest/exception-filter/exception-filter.interface.ts b/src/shared/libs/rest/exception-filter/exception-filter.interface.ts new file mode 100644 index 0000000..a88eb58 --- /dev/null +++ b/src/shared/libs/rest/exception-filter/exception-filter.interface.ts @@ -0,0 +1,5 @@ +import { NextFunction, Request, Response } from 'express'; + +export interface ExceptionFilter { + catch(error: Error, req: Request, res: Response, next:NextFunction): void; +} diff --git a/src/shared/libs/rest/index.ts b/src/shared/libs/rest/index.ts index af34e43..f5c42b8 100644 --- a/src/shared/libs/rest/index.ts +++ b/src/shared/libs/rest/index.ts @@ -1,2 +1,5 @@ export * from './types/route.interface.js'; export * from './types/http-method.enum.js'; +export * from './controller/controller.interface.js'; +export * from './controller/base-controller.abstract.js'; +export * from './exception-filter/exception-filter.interface.js'; From cb4271e4ea4e34df41204ef8cab1040ceb69ffcb Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 22 Apr 2026 18:00:07 +0300 Subject: [PATCH 09/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20`AppExceptionFi?= =?UTF-8?q?lter`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception-filter/app-exception.filter.ts | 22 +++++++++++++++++++ src/shared/libs/rest/index.ts | 1 + 2 files changed, 23 insertions(+) create mode 100644 src/shared/libs/rest/exception-filter/app-exception.filter.ts diff --git a/src/shared/libs/rest/exception-filter/app-exception.filter.ts b/src/shared/libs/rest/exception-filter/app-exception.filter.ts new file mode 100644 index 0000000..f70586c --- /dev/null +++ b/src/shared/libs/rest/exception-filter/app-exception.filter.ts @@ -0,0 +1,22 @@ +import { Logger } from '../../logger/index.js'; +import { inject, injectable } from 'inversify'; +import { StatusCodes } from 'http-status-codes'; +import { Component } from '../../../types/index.js'; +import { NextFunction, Request, Response } from 'express'; +import { ExceptionFilter } from './exception-filter.interface.js'; + +@injectable() +export class AppExceptionFilter implements ExceptionFilter { + constructor( + @inject(Component.Logger) private readonly logger: Logger + ) { + this.logger.info('Register AppExceptionFilter'); + } + + public catch(error: Error, _req: Request, res: Response, _next: NextFunction): void { + this.logger.error(error.message, error); + res + .status(StatusCodes.INTERNAL_SERVER_ERROR) + .json({error: error.message}); + } +} diff --git a/src/shared/libs/rest/index.ts b/src/shared/libs/rest/index.ts index f5c42b8..0b11f91 100644 --- a/src/shared/libs/rest/index.ts +++ b/src/shared/libs/rest/index.ts @@ -2,4 +2,5 @@ export * from './types/route.interface.js'; export * from './types/http-method.enum.js'; export * from './controller/controller.interface.js'; export * from './controller/base-controller.abstract.js'; +export * from './exception-filter/app-exception.filter.js'; export * from './exception-filter/exception-filter.interface.js'; From 3f47f7d63a1aadb7d18ad3ee68dfd5cc1713d857 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 22 Apr 2026 18:16:13 +0300 Subject: [PATCH 10/32] =?UTF-8?q?feat:=20=D0=9F=D0=BE=D0=B4=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B8=D1=82=20`AppExceptionFilter`=20=D0=B2=20`Res?= =?UTF-8?q?tApplication`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rest/rest.application.ts | 10 ++++++++++ src/rest/rest.container.ts | 2 ++ src/shared/types/component.enum.ts | 1 + 3 files changed, 13 insertions(+) diff --git a/src/rest/rest.application.ts b/src/rest/rest.application.ts index 3357770..2cb7054 100644 --- a/src/rest/rest.application.ts +++ b/src/rest/rest.application.ts @@ -5,6 +5,7 @@ import { Logger } from '../shared/libs/logger/index.js'; import { getMongoURI } from '../shared/helpers/index.js'; import { Config, RestSchema } from '../shared/libs/config/index.js'; import { DatabaseClient } from '../shared/libs/database-client/index.js'; +import { ExceptionFilter } from '../shared/libs/rest/index.js'; @injectable() export class RestApplication { @@ -14,6 +15,7 @@ export class RestApplication { @inject(Component.Logger) private readonly logger: Logger, @inject(Component.Config) private readonly config: Config, @inject(Component.DatabaseClient) private readonly databaseClient: DatabaseClient, + @inject(Component.ExceptionFilter) private readonly exceptionFilter: ExceptionFilter, ) { this.server = express(); } @@ -35,6 +37,10 @@ export class RestApplication { this.server.listen(port); } + private async _initExceptionFilters() { + this.server.use(this.exceptionFilter.catch.bind(this.exceptionFilter)); + } + public async init() { this.logger.info('Application initialization'); @@ -42,6 +48,10 @@ export class RestApplication { await this.initDb(); this.logger.info('Init database completed'); + this.logger.info('Init exception filters'); + await this._initExceptionFilters(); + this.logger.info('Exception filters initialization completed'); + this.logger.info('Try to init server…'); await this._initServer(); this.logger.info(`🚀 Server started on http://localhost:${this.config.get('PORT')}`); diff --git a/src/rest/rest.container.ts b/src/rest/rest.container.ts index 77d7ec9..7a1821d 100644 --- a/src/rest/rest.container.ts +++ b/src/rest/rest.container.ts @@ -3,6 +3,7 @@ import { Component } from '../shared/types/index.js'; import { RestApplication } from './rest.application.js'; import { Logger, PinoLogger } from '../shared/libs/logger/index.js'; import { Config, RestConfig, RestSchema } from '../shared/libs/config/index.js'; +import { AppExceptionFilter, ExceptionFilter } from '../shared/libs/rest/index.js'; import { DatabaseClient, MongoDatabaseClient } from '../shared/libs/database-client/index.js'; export function createRestApplicationContainer() { @@ -12,6 +13,7 @@ export function createRestApplicationContainer() { restApplicationContainer.bind(Component.Logger).to(PinoLogger).inSingletonScope(); restApplicationContainer.bind>(Component.Config).to(RestConfig).inSingletonScope(); restApplicationContainer.bind(Component.DatabaseClient).to(MongoDatabaseClient).inSingletonScope(); + restApplicationContainer.bind(Component.ExceptionFilter).to(AppExceptionFilter).inSingletonScope(); return restApplicationContainer; } diff --git a/src/shared/types/component.enum.ts b/src/shared/types/component.enum.ts index ef1c87b..9f6d93f 100644 --- a/src/shared/types/component.enum.ts +++ b/src/shared/types/component.enum.ts @@ -11,4 +11,5 @@ export const Component = { CommentModel: Symbol.for('CommentModel'), FavoriteService: Symbol.for('FavoriteService'), FavoriteModel: Symbol.for('FavoriteModel'), + ExceptionFilter: Symbol.for('ExceptionFilter'), } as const; From a49241f72ee385a92ea2698c323083daf644633e Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Thu, 23 Apr 2026 00:46:45 +0300 Subject: [PATCH 11/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB?= =?UTF-8?q?=D0=B5=D1=80=20`UserController`.=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rest/rest.application.ts | 11 +++++++- src/shared/libs/rest/index.ts | 2 ++ .../libs/rest/types/request-body.type.ts | 1 + .../libs/rest/types/request.params.type.ts | 1 + .../modules/user/create-user-request.type.ts | 5 ++++ src/shared/modules/user/index.ts | 1 + src/shared/modules/user/user.container.ts | 3 +++ src/shared/modules/user/user.controller.ts | 25 +++++++++++++++++++ src/shared/modules/user/user.http | 15 +++++++++++ src/shared/types/component.enum.ts | 1 + 10 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/shared/libs/rest/types/request-body.type.ts create mode 100644 src/shared/libs/rest/types/request.params.type.ts create mode 100644 src/shared/modules/user/create-user-request.type.ts create mode 100644 src/shared/modules/user/user.controller.ts create mode 100644 src/shared/modules/user/user.http diff --git a/src/rest/rest.application.ts b/src/rest/rest.application.ts index 2cb7054..f4932a4 100644 --- a/src/rest/rest.application.ts +++ b/src/rest/rest.application.ts @@ -5,7 +5,7 @@ import { Logger } from '../shared/libs/logger/index.js'; import { getMongoURI } from '../shared/helpers/index.js'; import { Config, RestSchema } from '../shared/libs/config/index.js'; import { DatabaseClient } from '../shared/libs/database-client/index.js'; -import { ExceptionFilter } from '../shared/libs/rest/index.js'; +import { Controller, ExceptionFilter } from '../shared/libs/rest/index.js'; @injectable() export class RestApplication { @@ -16,6 +16,7 @@ export class RestApplication { @inject(Component.Config) private readonly config: Config, @inject(Component.DatabaseClient) private readonly databaseClient: DatabaseClient, @inject(Component.ExceptionFilter) private readonly exceptionFilter: ExceptionFilter, + @inject(Component.UserController) private readonly userController: Controller, ) { this.server = express(); } @@ -37,6 +38,10 @@ export class RestApplication { this.server.listen(port); } + private async _initControllers() { + this.server.use('/users', this.userController.router); + } + private async _initExceptionFilters() { this.server.use(this.exceptionFilter.catch.bind(this.exceptionFilter)); } @@ -48,6 +53,10 @@ export class RestApplication { await this.initDb(); this.logger.info('Init database completed'); + this.logger.info('Init controllers'); + await this._initControllers(); + this.logger.info('Controller initialization completed'); + this.logger.info('Init exception filters'); await this._initExceptionFilters(); this.logger.info('Exception filters initialization completed'); diff --git a/src/shared/libs/rest/index.ts b/src/shared/libs/rest/index.ts index 0b11f91..c8383b3 100644 --- a/src/shared/libs/rest/index.ts +++ b/src/shared/libs/rest/index.ts @@ -1,5 +1,7 @@ export * from './types/route.interface.js'; export * from './types/http-method.enum.js'; +export * from './types/request-body.type.js'; +export * from './types/request.params.type.js'; export * from './controller/controller.interface.js'; export * from './controller/base-controller.abstract.js'; export * from './exception-filter/app-exception.filter.js'; diff --git a/src/shared/libs/rest/types/request-body.type.ts b/src/shared/libs/rest/types/request-body.type.ts new file mode 100644 index 0000000..bfe8e0e --- /dev/null +++ b/src/shared/libs/rest/types/request-body.type.ts @@ -0,0 +1 @@ +export type RequestBody = Record; diff --git a/src/shared/libs/rest/types/request.params.type.ts b/src/shared/libs/rest/types/request.params.type.ts new file mode 100644 index 0000000..4ac722d --- /dev/null +++ b/src/shared/libs/rest/types/request.params.type.ts @@ -0,0 +1 @@ +export type RequestParams = Record; diff --git a/src/shared/modules/user/create-user-request.type.ts b/src/shared/modules/user/create-user-request.type.ts new file mode 100644 index 0000000..ae27604 --- /dev/null +++ b/src/shared/modules/user/create-user-request.type.ts @@ -0,0 +1,5 @@ +import { Request } from 'express'; +import { CreateUserDto } from './dto/create-user.dto.js'; +import { RequestBody, RequestParams } from '../../libs/rest/index.js'; + +export type CreateUserRequest = Request; diff --git a/src/shared/modules/user/index.ts b/src/shared/modules/user/index.ts index 3f24e56..47715bc 100644 --- a/src/shared/modules/user/index.ts +++ b/src/shared/modules/user/index.ts @@ -1,4 +1,5 @@ export * from './user.entity.js'; export * from './user.container.js'; +export * from './user.controller.js'; export * from './dto/create-user.dto.js'; export * from './default-user.service.js'; diff --git a/src/shared/modules/user/user.container.ts b/src/shared/modules/user/user.container.ts index e6bcf95..61778f1 100644 --- a/src/shared/modules/user/user.container.ts +++ b/src/shared/modules/user/user.container.ts @@ -1,6 +1,8 @@ import { Container } from 'inversify'; import { types } from '@typegoose/typegoose'; import { Component } from '../../types/index.js'; +import { Controller } from '../../libs/rest/index.js'; +import { UserController } from './user.controller.js'; import { UserEntity, UserModel } from './user.entity.js'; import { UserService } from './user-service.interface.js'; import { DefaultUserService } from './default-user.service.js'; @@ -9,6 +11,7 @@ export function createUserContainer(parent?: Container) { const userContainer = new Container(parent ? { parent } : undefined); userContainer.bind(Component.UserService).to(DefaultUserService).inSingletonScope(); userContainer.bind>(Component.UserModel).toConstantValue(UserModel); + userContainer.bind(Component.UserController).to(UserController).inSingletonScope(); return userContainer; } diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts new file mode 100644 index 0000000..0007a89 --- /dev/null +++ b/src/shared/modules/user/user.controller.ts @@ -0,0 +1,25 @@ +import { Response } from 'express'; +import { inject, injectable } from 'inversify'; +import { Component } from '../../types/index.js'; +import { Logger } from '../../libs/logger/index.js'; +import { CreateUserRequest } from './create-user-request.type.js'; +import { BaseController, HttpMethod } from '../../libs/rest/index.js'; + +@injectable() +export class UserController extends BaseController { + constructor( + @inject(Component.Logger) protected readonly logger: Logger, + ) { + super(logger); + this.logger.info('Register routes for UserController…'); + + this.addRoute({ path: '/register', method: HttpMethod.Post, handler: this.create }); + } + + public create( + _req: CreateUserRequest, + _res: Response + ): void { + throw new Error('[UserController] Oops'); + } +} diff --git a/src/shared/modules/user/user.http b/src/shared/modules/user/user.http new file mode 100644 index 0000000..a79f683 --- /dev/null +++ b/src/shared/modules/user/user.http @@ -0,0 +1,15 @@ +# Пользователи +## Создать нового пользователя + +POST http://localhost:4000/users/register HTTP/1.1 +Content-Type: application/json + +{ + "email": "torans@overlook.net", + "avatarPath": "torrance.png", + "firstname": "Jack", + "lastname": "Torrance", + "password": "shining" +} + +### diff --git a/src/shared/types/component.enum.ts b/src/shared/types/component.enum.ts index 9f6d93f..f20470c 100644 --- a/src/shared/types/component.enum.ts +++ b/src/shared/types/component.enum.ts @@ -12,4 +12,5 @@ export const Component = { FavoriteService: Symbol.for('FavoriteService'), FavoriteModel: Symbol.for('FavoriteModel'), ExceptionFilter: Symbol.for('ExceptionFilter'), + UserController: Symbol.for('UserController'), } as const; From 518cc9a3601710d4f2f37b12a73676010c616113 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Thu, 23 Apr 2026 00:51:16 +0300 Subject: [PATCH 12/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20`=5FinitMiddlew?= =?UTF-8?q?are`=20=D0=B2=20`RestApplication`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rest/rest.application.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/rest/rest.application.ts b/src/rest/rest.application.ts index f4932a4..aa4a12c 100644 --- a/src/rest/rest.application.ts +++ b/src/rest/rest.application.ts @@ -46,6 +46,10 @@ export class RestApplication { this.server.use(this.exceptionFilter.catch.bind(this.exceptionFilter)); } + private async _initMiddleware() { + this.server.use(express.json()); + } + public async init() { this.logger.info('Application initialization'); @@ -53,6 +57,10 @@ export class RestApplication { await this.initDb(); this.logger.info('Init database completed'); + this.logger.info('Init app-level middleware'); + await this._initMiddleware(); + this.logger.info('App-level middleware initialization completed'); + this.logger.info('Init controllers'); await this._initControllers(); this.logger.info('Controller initialization completed'); From aca54f14ab331a6ab330633fbdc1a03e5e2b28f3 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Thu, 23 Apr 2026 00:56:21 +0300 Subject: [PATCH 13/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=B2=20=D0=B0=D1=81=D0=B8?= =?UTF-8?q?=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=BD=D0=BE=D0=BC=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=87=D0=B8=D0=BA=D0=B5.=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/user/user.controller.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts index 0007a89..4345f75 100644 --- a/src/shared/modules/user/user.controller.ts +++ b/src/shared/modules/user/user.controller.ts @@ -16,10 +16,10 @@ export class UserController extends BaseController { this.addRoute({ path: '/register', method: HttpMethod.Post, handler: this.create }); } - public create( + public async create( _req: CreateUserRequest, _res: Response - ): void { + ): Promise { throw new Error('[UserController] Oops'); } } From e9bf6d0d87381760003eb17cc629a7c2aef383e6 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Thu, 23 Apr 2026 01:01:47 +0300 Subject: [PATCH 14/32] =?UTF-8?q?fest:=20=D0=9E=D0=B1=D0=B5=D1=80=D0=BD?= =?UTF-8?q?=D1=91=D1=82=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=B2=20?= =?UTF-8?q?`next`.=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/user/user.controller.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts index 4345f75..b380981 100644 --- a/src/shared/modules/user/user.controller.ts +++ b/src/shared/modules/user/user.controller.ts @@ -1,6 +1,6 @@ -import { Response } from 'express'; import { inject, injectable } from 'inversify'; import { Component } from '../../types/index.js'; +import { Response, NextFunction } from 'express'; import { Logger } from '../../libs/logger/index.js'; import { CreateUserRequest } from './create-user-request.type.js'; import { BaseController, HttpMethod } from '../../libs/rest/index.js'; @@ -18,8 +18,13 @@ export class UserController extends BaseController { public async create( _req: CreateUserRequest, - _res: Response + _res: Response, + next: NextFunction ): Promise { - throw new Error('[UserController] Oops'); + try { + throw new Error('[UserController] Oops'); + } catch (error) { + return next(error); + } } } From 92d2b2c406ab9751c3462abe7f15bd8662241c7c Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Thu, 23 Apr 2026 01:04:35 +0300 Subject: [PATCH 15/32] =?UTF-8?q?feat:=20=D0=A3=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D1=82=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20`ex?= =?UTF-8?q?press-async-handler`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 11 +++++++++++ package.json | 1 + 2 files changed, 12 insertions(+) diff --git a/package-lock.json b/package-lock.json index 02a9a1a..7ce6c92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "dayjs": "1.11.19", "dotenv": "17.3.1", "express": "5.2.1", + "express-async-handler": "1.2.0", "got": "14.6.6", "http-status-codes": "2.3.0", "inversify": "7.11.0", @@ -3097,6 +3098,11 @@ "url": "https://opencollective.com/express" } }, + "node_modules/express-async-handler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/express-async-handler/-/express-async-handler-1.2.0.tgz", + "integrity": "sha512-rCSVtPXRmQSW8rmik/AIb2P0op6l7r1fMW538yyvTMltCO4xQEWMmobfrIxN2V1/mVrgxB8Az3reYF6yUZw37w==" + }, "node_modules/express-urlrewrite": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.4.0.tgz", @@ -9987,6 +9993,11 @@ } } }, + "express-async-handler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/express-async-handler/-/express-async-handler-1.2.0.tgz", + "integrity": "sha512-rCSVtPXRmQSW8rmik/AIb2P0op6l7r1fMW538yyvTMltCO4xQEWMmobfrIxN2V1/mVrgxB8Az3reYF6yUZw37w==" + }, "express-urlrewrite": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.4.0.tgz", diff --git a/package.json b/package.json index 89c4487..c39bafe 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "dayjs": "1.11.19", "dotenv": "17.3.1", "express": "5.2.1", + "express-async-handler": "1.2.0", "got": "14.6.6", "http-status-codes": "2.3.0", "inversify": "7.11.0", From ead2b7457cfb374d76eb542f9fe573cf8c78b82e Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Thu, 23 Apr 2026 01:09:47 +0300 Subject: [PATCH 16/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20`asyncHandler`=20=D0=B2=20`BaseController`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/libs/rest/controller/base-controller.abstract.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/libs/rest/controller/base-controller.abstract.ts b/src/shared/libs/rest/controller/base-controller.abstract.ts index 9d2959d..76ae630 100644 --- a/src/shared/libs/rest/controller/base-controller.abstract.ts +++ b/src/shared/libs/rest/controller/base-controller.abstract.ts @@ -2,6 +2,7 @@ import { injectable } from 'inversify'; import { Response, Router } from 'express'; import { Logger } from '../../logger/index.js'; import { StatusCodes } from 'http-status-codes'; +import asyncHandler from 'express-async-handler'; import { Route } from '../types/route.interface.js'; import { Controller } from './controller.interface.js'; @@ -22,7 +23,8 @@ export abstract class BaseController implements Controller { } public addRoute(route: Route) { - this._router[route.method](route.path, route.handler.bind(this)); + const wrapperAsyncHandler = asyncHandler(route.handler.bind(this)); + this._router[route.method](route.path, wrapperAsyncHandler); this.logger.info(`Route registered: ${route.method.toUpperCase()} ${route.path}`); } From 83558390ee35f5600bc0d6e8c891f169af7bcdec Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Thu, 23 Apr 2026 01:13:34 +0300 Subject: [PATCH 17/32] =?UTF-8?q?feat:=20=D0=9F=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=B8=D1=82=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=83=20`as?= =?UTF-8?q?yncHandler`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/user/user.controller.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts index b380981..ec7f4a1 100644 --- a/src/shared/modules/user/user.controller.ts +++ b/src/shared/modules/user/user.controller.ts @@ -19,12 +19,8 @@ export class UserController extends BaseController { public async create( _req: CreateUserRequest, _res: Response, - next: NextFunction + _next: NextFunction ): Promise { - try { - throw new Error('[UserController] Oops'); - } catch (error) { - return next(error); - } + throw new Error('[UserController] Oops'); } } From 9c1467fd2eb89479804962927623e855d230f7f6 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 29 Apr 2026 00:56:31 +0300 Subject: [PATCH 18/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20`HttpErro?= =?UTF-8?q?r`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/libs/rest/errors/http-error.ts | 12 ++++++++++++ src/shared/libs/rest/errors/index.ts | 1 + src/shared/libs/rest/index.ts | 1 + 3 files changed, 14 insertions(+) create mode 100644 src/shared/libs/rest/errors/http-error.ts create mode 100644 src/shared/libs/rest/errors/index.ts diff --git a/src/shared/libs/rest/errors/http-error.ts b/src/shared/libs/rest/errors/http-error.ts new file mode 100644 index 0000000..db565a8 --- /dev/null +++ b/src/shared/libs/rest/errors/http-error.ts @@ -0,0 +1,12 @@ +export class HttpError extends Error { + public httpStatusCode!: number; + public detail?: string; + + constructor(httpStatusCode: number, message: string, detail?: string) { + super(message); + + this.httpStatusCode = httpStatusCode; + this.message = message; + this.detail = detail; + } +} diff --git a/src/shared/libs/rest/errors/index.ts b/src/shared/libs/rest/errors/index.ts new file mode 100644 index 0000000..0c80068 --- /dev/null +++ b/src/shared/libs/rest/errors/index.ts @@ -0,0 +1 @@ +export * from './http-error.js'; diff --git a/src/shared/libs/rest/index.ts b/src/shared/libs/rest/index.ts index c8383b3..a81ee2b 100644 --- a/src/shared/libs/rest/index.ts +++ b/src/shared/libs/rest/index.ts @@ -1,3 +1,4 @@ +export * from './errors/index.js'; export * from './types/route.interface.js'; export * from './types/http-method.enum.js'; export * from './types/request-body.type.js'; From 9e4e04b7f0f1dd309e6b6ede48ddf9c6cb8255d5 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 29 Apr 2026 00:58:46 +0300 Subject: [PATCH 19/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E=20`cr?= =?UTF-8?q?eateErrorObject`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/helpers/common.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/shared/helpers/common.ts b/src/shared/helpers/common.ts index 8052a4a..86e92ee 100644 --- a/src/shared/helpers/common.ts +++ b/src/shared/helpers/common.ts @@ -15,3 +15,9 @@ export function getRandomItem(items: T[]):T { export function getErrorMessage(error: unknown): string { return error instanceof Error ? error.message : ''; } + +export function createErrorObject(message: string) { + return { + error: message, + }; +} From 0f2ae7640c56626daac96c3303889f2c46aaf8c3 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 29 Apr 2026 01:06:28 +0300 Subject: [PATCH 20/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BC=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?= =?UTF-8?q?=D1=83=20`HttpError`=20=D0=B2=20`AppExceptionFilter`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception-filter/app-exception.filter.ts | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/shared/libs/rest/exception-filter/app-exception.filter.ts b/src/shared/libs/rest/exception-filter/app-exception.filter.ts index f70586c..7f33fa1 100644 --- a/src/shared/libs/rest/exception-filter/app-exception.filter.ts +++ b/src/shared/libs/rest/exception-filter/app-exception.filter.ts @@ -1,8 +1,10 @@ import { Logger } from '../../logger/index.js'; import { inject, injectable } from 'inversify'; +import { HttpError } from '../errors/index.js'; import { StatusCodes } from 'http-status-codes'; import { Component } from '../../../types/index.js'; import { NextFunction, Request, Response } from 'express'; +import { createErrorObject } from '../../../helpers/index.js'; import { ExceptionFilter } from './exception-filter.interface.js'; @injectable() @@ -13,10 +15,25 @@ export class AppExceptionFilter implements ExceptionFilter { this.logger.info('Register AppExceptionFilter'); } - public catch(error: Error, _req: Request, res: Response, _next: NextFunction): void { + private handleHttpError(error: HttpError, _req: Request, res: Response, _next: NextFunction) { + this.logger.error(`[${error.detail}]: ${error.httpStatusCode} — ${error.message}`, error); + res + .status(error.httpStatusCode) + .json(createErrorObject(error.message)); + } + + private handleOtherError(error: Error, _req: Request, res: Response, _next: NextFunction) { this.logger.error(error.message, error); res .status(StatusCodes.INTERNAL_SERVER_ERROR) - .json({error: error.message}); + .json(createErrorObject(error.message)); + } + + public catch(error: Error | HttpError, req: Request, res: Response, next: NextFunction): void { + if (error instanceof HttpError) { + return this.handleHttpError(error, req, res, next); + } + + this.handleOtherError(error, req, res, next); } } From 61cfb9fa37e6f70ad938e8099105c1447d972b8f Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Tue, 12 May 2026 17:04:04 +0300 Subject: [PATCH 21/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9=20=D0=B2=20UserController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/helpers/common.ts | 6 +++++ src/shared/modules/user/rdo/user.rdo.ts | 15 +++++++++++ src/shared/modules/user/user.controller.ts | 29 +++++++++++++++++----- src/shared/modules/user/user.http | 21 +++++++++++++--- 4 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 src/shared/modules/user/rdo/user.rdo.ts diff --git a/src/shared/helpers/common.ts b/src/shared/helpers/common.ts index 86e92ee..a421d7c 100644 --- a/src/shared/helpers/common.ts +++ b/src/shared/helpers/common.ts @@ -1,3 +1,5 @@ +import { ClassConstructor, plainToInstance } from 'class-transformer'; + export function generateRandomValue(min:number, max: number, numAfterDigit = 0) { return +((Math.random() * (max - min)) + min).toFixed(numAfterDigit); } @@ -16,6 +18,10 @@ export function getErrorMessage(error: unknown): string { return error instanceof Error ? error.message : ''; } +export function fillDTO(someDto: ClassConstructor, plainObject: V) { + return plainToInstance(someDto, plainObject, { excludeExtraneousValues: true }); +} + export function createErrorObject(message: string) { return { error: message, diff --git a/src/shared/modules/user/rdo/user.rdo.ts b/src/shared/modules/user/rdo/user.rdo.ts new file mode 100644 index 0000000..271fbf6 --- /dev/null +++ b/src/shared/modules/user/rdo/user.rdo.ts @@ -0,0 +1,15 @@ +import { Expose } from 'class-transformer'; + +export class UserRdo { + @Expose() + public email: string ; + + @Expose() + public avatarPath: string; + + @Expose() + public name: string; + + @Expose() + public isPro: boolean; +} diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts index ec7f4a1..80e35dd 100644 --- a/src/shared/modules/user/user.controller.ts +++ b/src/shared/modules/user/user.controller.ts @@ -1,14 +1,21 @@ +import { Response } from 'express'; +import { UserRdo } from './rdo/user.rdo.js'; import { inject, injectable } from 'inversify'; +import { StatusCodes } from 'http-status-codes'; +import { fillDTO } from '../../helpers/index.js'; import { Component } from '../../types/index.js'; -import { Response, NextFunction } from 'express'; import { Logger } from '../../libs/logger/index.js'; +import { UserService } from './user-service.interface.js'; +import { Config, RestSchema } from '../../libs/config/index.js'; import { CreateUserRequest } from './create-user-request.type.js'; -import { BaseController, HttpMethod } from '../../libs/rest/index.js'; +import { BaseController, HttpError, HttpMethod } from '../../libs/rest/index.js'; @injectable() export class UserController extends BaseController { constructor( @inject(Component.Logger) protected readonly logger: Logger, + @inject(Component.UserService) private readonly userService: UserService, + @inject(Component.Config) private readonly configService: Config, ) { super(logger); this.logger.info('Register routes for UserController…'); @@ -17,10 +24,20 @@ export class UserController extends BaseController { } public async create( - _req: CreateUserRequest, - _res: Response, - _next: NextFunction + { body }: CreateUserRequest, + res: Response, ): Promise { - throw new Error('[UserController] Oops'); + const existsUser = await this.userService.findByEmail(body.email); + + if (existsUser) { + throw new HttpError( + StatusCodes.CONFLICT, + `User with email «${body.email}» exists.`, + 'UserController' + ); + } + + const result = await this.userService.create(body, this.configService.get('SALT')); + this.created(res, fillDTO(UserRdo, result)); } } diff --git a/src/shared/modules/user/user.http b/src/shared/modules/user/user.http index a79f683..f0cd0f3 100644 --- a/src/shared/modules/user/user.http +++ b/src/shared/modules/user/user.http @@ -5,11 +5,24 @@ POST http://localhost:4000/users/register HTTP/1.1 Content-Type: application/json { - "email": "torans@overlook.net", + "email": "jacktorrance@overlook.net", "avatarPath": "torrance.png", - "firstname": "Jack", - "lastname": "Torrance", - "password": "shining" + "name": "Jack Torrance", + "password": "shining", + "isPro": false +} + +### + +POST http://localhost:4000/users/register HTTP/1.1 +Content-Type: application/json + +{ + "email": "dannytorrance@overlook.net", + "avatarPath": "danny.png", + "name": "Danny Torrance", + "password": "shining1", + "isPro": true } ### From 24dcdb8a03fd0d07b32f1c03ee2d57ea742275a8 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Wed, 13 May 2026 01:29:13 +0300 Subject: [PATCH 22/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20login=20=D0=B2?= =?UTF-8?q?=20UserController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/user/dto/login-user.dto.ts | 4 ++++ .../modules/user/login-user-request.type.ts | 5 ++++ src/shared/modules/user/user.controller.ts | 23 +++++++++++++++++++ src/shared/modules/user/user.http | 11 ++++----- 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/shared/modules/user/dto/login-user.dto.ts create mode 100644 src/shared/modules/user/login-user-request.type.ts diff --git a/src/shared/modules/user/dto/login-user.dto.ts b/src/shared/modules/user/dto/login-user.dto.ts new file mode 100644 index 0000000..338ed08 --- /dev/null +++ b/src/shared/modules/user/dto/login-user.dto.ts @@ -0,0 +1,4 @@ +export class LoginUserDto { + public email: string; + public password: string; +} diff --git a/src/shared/modules/user/login-user-request.type.ts b/src/shared/modules/user/login-user-request.type.ts new file mode 100644 index 0000000..1939951 --- /dev/null +++ b/src/shared/modules/user/login-user-request.type.ts @@ -0,0 +1,5 @@ +import { Request } from 'express'; +import { LoginUserDto } from './dto/login-user.dto.js'; +import { RequestBody, RequestParams } from '../../libs/rest/index.js'; + +export type LoginUserRequest = Request; diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts index 80e35dd..89a6374 100644 --- a/src/shared/modules/user/user.controller.ts +++ b/src/shared/modules/user/user.controller.ts @@ -7,6 +7,7 @@ import { Component } from '../../types/index.js'; import { Logger } from '../../libs/logger/index.js'; import { UserService } from './user-service.interface.js'; import { Config, RestSchema } from '../../libs/config/index.js'; +import { LoginUserRequest } from './login-user-request.type.js'; import { CreateUserRequest } from './create-user-request.type.js'; import { BaseController, HttpError, HttpMethod } from '../../libs/rest/index.js'; @@ -21,6 +22,7 @@ export class UserController extends BaseController { this.logger.info('Register routes for UserController…'); this.addRoute({ path: '/register', method: HttpMethod.Post, handler: this.create }); + this.addRoute({ path: '/login', method: HttpMethod.Post, handler: this.login }); } public async create( @@ -40,4 +42,25 @@ export class UserController extends BaseController { const result = await this.userService.create(body, this.configService.get('SALT')); this.created(res, fillDTO(UserRdo, result)); } + + public async login( + { body }: LoginUserRequest, + _res: Response, + ): Promise { + const existsUser = await this.userService.findByEmail(body.email); + + if (! existsUser) { + throw new HttpError( + StatusCodes.UNAUTHORIZED, + `User with email ${body.email} not found.`, + 'UserController', + ); + } + + throw new HttpError( + StatusCodes.NOT_IMPLEMENTED, + 'Not implemented', + 'UserController', + ); + } } diff --git a/src/shared/modules/user/user.http b/src/shared/modules/user/user.http index f0cd0f3..c75f7fc 100644 --- a/src/shared/modules/user/user.http +++ b/src/shared/modules/user/user.http @@ -14,15 +14,14 @@ Content-Type: application/json ### -POST http://localhost:4000/users/register HTTP/1.1 +## Авторизовать пользователя + +POST http://localhost:4000/users/login HTTP/1.1 Content-Type: application/json { - "email": "dannytorrance@overlook.net", - "avatarPath": "danny.png", - "name": "Danny Torrance", - "password": "shining1", - "isPro": true + "email": "jacktorrance@overlook.net", + "password": "shining" } ### From b1a8a775c13917737d9f2713193fb7fe91648c5d Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Tue, 19 May 2026 03:10:04 +0300 Subject: [PATCH 23/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BF=D0=BE=D0=BB=D0=B5=20id=20=D0=B2=20UserRdo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/user/rdo/user.rdo.ts | 7 +++++-- src/shared/modules/user/user.http | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/shared/modules/user/rdo/user.rdo.ts b/src/shared/modules/user/rdo/user.rdo.ts index 271fbf6..a3e1406 100644 --- a/src/shared/modules/user/rdo/user.rdo.ts +++ b/src/shared/modules/user/rdo/user.rdo.ts @@ -2,14 +2,17 @@ import { Expose } from 'class-transformer'; export class UserRdo { @Expose() - public email: string ; + public id: string; @Expose() - public avatarPath: string; + public email: string ; @Expose() public name: string; + @Expose() + public avatarPath: string; + @Expose() public isPro: boolean; } diff --git a/src/shared/modules/user/user.http b/src/shared/modules/user/user.http index c75f7fc..2c797aa 100644 --- a/src/shared/modules/user/user.http +++ b/src/shared/modules/user/user.http @@ -14,6 +14,19 @@ Content-Type: application/json ### +POST http://localhost:4000/users/register HTTP/1.1 +Content-Type: application/json + +{ + "email": "jacktorrent@overlook.net", + "avatarPath": "torrent.png", + "name": "Jack Torrent", + "password": "doctor", + "isPro": false +} + +### + ## Авторизовать пользователя POST http://localhost:4000/users/login HTTP/1.1 From 71bfbd8674f4c9cd4f14bd16922002bae6fa7a65 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Sat, 23 May 2026 05:36:38 +0300 Subject: [PATCH 24/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=B0=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/user/user.controller.ts | 18 +++++++++++------- src/shared/modules/user/user.http | 10 ++++++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts index 89a6374..9355450 100644 --- a/src/shared/modules/user/user.controller.ts +++ b/src/shared/modules/user/user.controller.ts @@ -1,4 +1,4 @@ -import { Response } from 'express'; +import { Request, Response } from 'express'; import { UserRdo } from './rdo/user.rdo.js'; import { inject, injectable } from 'inversify'; import { StatusCodes } from 'http-status-codes'; @@ -23,6 +23,7 @@ export class UserController extends BaseController { this.addRoute({ path: '/register', method: HttpMethod.Post, handler: this.create }); this.addRoute({ path: '/login', method: HttpMethod.Post, handler: this.login }); + this.addRoute({ path: '/login', method: HttpMethod.Get, handler: this.checkLogin }); } public async create( @@ -45,7 +46,7 @@ export class UserController extends BaseController { public async login( { body }: LoginUserRequest, - _res: Response, + res: Response, ): Promise { const existsUser = await this.userService.findByEmail(body.email); @@ -57,10 +58,13 @@ export class UserController extends BaseController { ); } - throw new HttpError( - StatusCodes.NOT_IMPLEMENTED, - 'Not implemented', - 'UserController', - ); + this.ok(res, fillDTO(UserRdo, existsUser)); + } + + public async checkLogin( + _req: Request, + _res: Response, + ): Promise { + throw new HttpError(StatusCodes.NOT_IMPLEMENTED, 'Not implemented', 'UserController'); } } diff --git a/src/shared/modules/user/user.http b/src/shared/modules/user/user.http index 2c797aa..170ef34 100644 --- a/src/shared/modules/user/user.http +++ b/src/shared/modules/user/user.http @@ -33,8 +33,14 @@ POST http://localhost:4000/users/login HTTP/1.1 Content-Type: application/json { - "email": "jacktorrance@overlook.net", - "password": "shining" + "email": "jacktorrent@overlook.net", + "password": "doctor" } ### + +## Проверить состояние авторизации + +GET http://localhost:4000/users/login HTTP/1.1 + +### From eec85cb0640e0a5d34041cdb3f939b1b5502fcde Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Sat, 23 May 2026 05:39:08 +0300 Subject: [PATCH 25/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=20log?= =?UTF-8?q?out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/user/user.controller.ts | 8 ++++++++ src/shared/modules/user/user.http | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts index 9355450..293ba2b 100644 --- a/src/shared/modules/user/user.controller.ts +++ b/src/shared/modules/user/user.controller.ts @@ -24,6 +24,7 @@ export class UserController extends BaseController { this.addRoute({ path: '/register', method: HttpMethod.Post, handler: this.create }); this.addRoute({ path: '/login', method: HttpMethod.Post, handler: this.login }); this.addRoute({ path: '/login', method: HttpMethod.Get, handler: this.checkLogin }); + this.addRoute({ path: '/logout', method: HttpMethod.Get, handler: this.logout }); } public async create( @@ -67,4 +68,11 @@ export class UserController extends BaseController { ): Promise { throw new HttpError(StatusCodes.NOT_IMPLEMENTED, 'Not implemented', 'UserController'); } + + public async logout( + _req: Request, + _res: Response, + ): Promise { + throw new HttpError(StatusCodes.NOT_IMPLEMENTED, 'Not implemented', 'UserController'); + } } diff --git a/src/shared/modules/user/user.http b/src/shared/modules/user/user.http index 170ef34..416a2e2 100644 --- a/src/shared/modules/user/user.http +++ b/src/shared/modules/user/user.http @@ -44,3 +44,7 @@ Content-Type: application/json GET http://localhost:4000/users/login HTTP/1.1 ### + +GET http://localhost:4000/users/logout HTTP/1.1 + +### From 37528bf1a4664825415e5f252a0c1c99b18e1da7 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Sat, 23 May 2026 05:46:03 +0300 Subject: [PATCH 26/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=20upl?= =?UTF-8?q?oadAvatar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/user/user.controller.ts | 10 +++++++++- src/shared/modules/user/user.http | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/shared/modules/user/user.controller.ts b/src/shared/modules/user/user.controller.ts index 293ba2b..b6651f1 100644 --- a/src/shared/modules/user/user.controller.ts +++ b/src/shared/modules/user/user.controller.ts @@ -24,7 +24,8 @@ export class UserController extends BaseController { this.addRoute({ path: '/register', method: HttpMethod.Post, handler: this.create }); this.addRoute({ path: '/login', method: HttpMethod.Post, handler: this.login }); this.addRoute({ path: '/login', method: HttpMethod.Get, handler: this.checkLogin }); - this.addRoute({ path: '/logout', method: HttpMethod.Get, handler: this.logout }); + this.addRoute({ path: '/logout', method: HttpMethod.Post, handler: this.logout }); + this.addRoute({ path: '/:userId/avatar', method: HttpMethod.Post, handler: this.uploadAvatar }); } public async create( @@ -75,4 +76,11 @@ export class UserController extends BaseController { ): Promise { throw new HttpError(StatusCodes.NOT_IMPLEMENTED, 'Not implemented', 'UserController'); } + + public async uploadAvatar( + _req: Request, + _res: Response, + ): Promise { + throw new HttpError(StatusCodes.NOT_IMPLEMENTED, 'Not implemented', 'UserController'); + } } diff --git a/src/shared/modules/user/user.http b/src/shared/modules/user/user.http index 416a2e2..2b3100b 100644 --- a/src/shared/modules/user/user.http +++ b/src/shared/modules/user/user.http @@ -45,6 +45,15 @@ GET http://localhost:4000/users/login HTTP/1.1 ### -GET http://localhost:4000/users/logout HTTP/1.1 +POST http://localhost:4000/users/logout HTTP/1.1 + +### + +POST http://localhost:4000/users/1/avatar HTTP/1.1 +Content-Type: multipart/form-data + +{ + "avatar": "avatar.png" +} ### From 4ba9ca466eb608f5a637e65ab50af83412969d5d Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Sat, 23 May 2026 06:27:49 +0300 Subject: [PATCH 27/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB?= =?UTF-8?q?=D0=B5=D1=80=20'OfferController'=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rest/rest.application.ts | 2 + .../offer/create-offer-request.type.ts | 5 ++ src/shared/modules/offer/index.ts | 1 + src/shared/modules/offer/offer.container.ts | 5 +- src/shared/modules/offer/offer.controller.ts | 29 ++++++++++ src/shared/modules/offer/offer.http | 4 ++ src/shared/modules/offer/rdo/offer.rdo.ts | 57 +++++++++++++++++++ src/shared/types/component.enum.ts | 1 + 8 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 src/shared/modules/offer/create-offer-request.type.ts create mode 100644 src/shared/modules/offer/offer.controller.ts create mode 100644 src/shared/modules/offer/offer.http create mode 100644 src/shared/modules/offer/rdo/offer.rdo.ts diff --git a/src/rest/rest.application.ts b/src/rest/rest.application.ts index aa4a12c..d6e4d98 100644 --- a/src/rest/rest.application.ts +++ b/src/rest/rest.application.ts @@ -17,6 +17,7 @@ export class RestApplication { @inject(Component.DatabaseClient) private readonly databaseClient: DatabaseClient, @inject(Component.ExceptionFilter) private readonly exceptionFilter: ExceptionFilter, @inject(Component.UserController) private readonly userController: Controller, + @inject(Component.OfferController) private readonly offerController: Controller, ) { this.server = express(); } @@ -40,6 +41,7 @@ export class RestApplication { private async _initControllers() { this.server.use('/users', this.userController.router); + this.server.use('/offers', this.offerController.router); } private async _initExceptionFilters() { diff --git a/src/shared/modules/offer/create-offer-request.type.ts b/src/shared/modules/offer/create-offer-request.type.ts new file mode 100644 index 0000000..e3d7575 --- /dev/null +++ b/src/shared/modules/offer/create-offer-request.type.ts @@ -0,0 +1,5 @@ +import { Request } from 'express'; +import { CreateOfferDto } from './dto/create-offer.dto.js'; +import { RequestBody, RequestParams } from '../../libs/rest/index.js'; + +export type CreateOfferRequest = Request; diff --git a/src/shared/modules/offer/index.ts b/src/shared/modules/offer/index.ts index 01154db..0f503c3 100644 --- a/src/shared/modules/offer/index.ts +++ b/src/shared/modules/offer/index.ts @@ -1,5 +1,6 @@ export * from './offer.entity.js'; export * from './offer.container.js'; +export * from './offer.controller.js'; export * from './dto/create-offer.dto.js'; export * from './default-offer.service.js'; export * from './offer-service.interface.js'; diff --git a/src/shared/modules/offer/offer.container.ts b/src/shared/modules/offer/offer.container.ts index ce6f2af..0b1be61 100644 --- a/src/shared/modules/offer/offer.container.ts +++ b/src/shared/modules/offer/offer.container.ts @@ -1,6 +1,8 @@ import { Container } from 'inversify'; import { types } from '@typegoose/typegoose'; import { Component } from '../../types/index.js'; +import { Controller } from '../../libs/rest/index.js'; +import { OfferController } from './offer.controller.js'; import { OfferService } from './offer-service.interface.js'; import { OfferEntity, OfferModel } from './offer.entity.js'; import { DefaultOfferService } from './default-offer.service.js'; @@ -8,8 +10,9 @@ import { DefaultOfferService } from './default-offer.service.js'; export function createOfferContainer(parent?: Container) { const offerContainer = new Container(parent ? { parent } : undefined); - offerContainer.bind(Component.OfferService).to(DefaultOfferService); + offerContainer.bind(Component.OfferService).to(DefaultOfferService).inSingletonScope(); offerContainer.bind>(Component.OfferModel).toConstantValue(OfferModel); + offerContainer.bind(Component.OfferController).to(OfferController).inSingletonScope(); return offerContainer; } diff --git a/src/shared/modules/offer/offer.controller.ts b/src/shared/modules/offer/offer.controller.ts new file mode 100644 index 0000000..5a22247 --- /dev/null +++ b/src/shared/modules/offer/offer.controller.ts @@ -0,0 +1,29 @@ +import { Request, Response } from 'express'; +import { OfferRdo } from './rdo/offer.rdo.js'; +import { inject, injectable } from 'inversify'; +import { fillDTO } from '../../helpers/index.js'; +import { Component } from '../../types/index.js'; +import { Logger } from '../../libs/logger/index.js'; +import { OfferService } from './offer-service.interface.js'; +import { BaseController, HttpMethod } from '../../libs/rest/index.js'; + +@injectable() +export class OfferController extends BaseController { + constructor( + @inject(Component.Logger) protected readonly logger: Logger, + @inject(Component.OfferService) private readonly offerService: OfferService, + ) { + super(logger); + this.logger.info('Register routes for OfferController…'); + + this.addRoute({ path: '/', method: HttpMethod.Get, handler: this.index }); + } + + public async index( + _req: Request, + res: Response, + ): Promise { + const offers = await this.offerService.find(); + this.ok(res, offers.map((offer) => fillDTO(OfferRdo, offer))); + } +} diff --git a/src/shared/modules/offer/offer.http b/src/shared/modules/offer/offer.http new file mode 100644 index 0000000..10e09d2 --- /dev/null +++ b/src/shared/modules/offer/offer.http @@ -0,0 +1,4 @@ +### Список предложений +GET http://localhost:4000/offers HTTP/1.1 + +### diff --git a/src/shared/modules/offer/rdo/offer.rdo.ts b/src/shared/modules/offer/rdo/offer.rdo.ts new file mode 100644 index 0000000..a434b3e --- /dev/null +++ b/src/shared/modules/offer/rdo/offer.rdo.ts @@ -0,0 +1,57 @@ +import { Expose } from 'class-transformer'; +import { OfferLocation } from '../offer.entity.js'; +import { City } from '../../../types/cities.enum.js'; +import { HousingType } from '../../../types/housing-type.enum.js'; + +export class OfferRdo { + @Expose() + public id: string; + + @Expose() + public title: string; + + @Expose() + public description: string; + + @Expose() + public postDate: Date; + + @Expose() + public city: City; + + @Expose() + public previewImage: string; + + @Expose() + public images: string[]; + + @Expose() + public isPremium: boolean; + + @Expose() + public isFavorite: boolean; + + @Expose() + public rating: number; + + @Expose() + public type: HousingType; + + @Expose() + public bedrooms: number; + + @Expose() + public maxAdults: number; + + @Expose() + public price: number; + + @Expose() + public goods: string[]; + + @Expose() + public userId: string; + + @Expose() + public location: OfferLocation; +} diff --git a/src/shared/types/component.enum.ts b/src/shared/types/component.enum.ts index f20470c..9239b24 100644 --- a/src/shared/types/component.enum.ts +++ b/src/shared/types/component.enum.ts @@ -13,4 +13,5 @@ export const Component = { FavoriteModel: Symbol.for('FavoriteModel'), ExceptionFilter: Symbol.for('ExceptionFilter'), UserController: Symbol.for('UserController'), + OfferController: Symbol.for('OfferController'), } as const; From ef8ceb38d0b868dbc2d1a928526978eaf95aa848 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Sat, 23 May 2026 07:11:51 +0300 Subject: [PATCH 28/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=20id=20=D0=B2=20OfferController=20W?= =?UTF-8?q?IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/offer/offer-by-id-request.type.ts | 4 ++++ src/shared/modules/offer/offer.controller.ts | 21 ++++++++++++++++++- src/shared/modules/offer/offer.http | 3 ++- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 src/shared/modules/offer/offer-by-id-request.type.ts diff --git a/src/shared/modules/offer/offer-by-id-request.type.ts b/src/shared/modules/offer/offer-by-id-request.type.ts new file mode 100644 index 0000000..894d373 --- /dev/null +++ b/src/shared/modules/offer/offer-by-id-request.type.ts @@ -0,0 +1,4 @@ +import { Request } from 'express'; +import { RequestBody, RequestParams } from '../../libs/rest/index.js'; + +export type OfferByIdRequest = Request; diff --git a/src/shared/modules/offer/offer.controller.ts b/src/shared/modules/offer/offer.controller.ts index 5a22247..ee6f3ea 100644 --- a/src/shared/modules/offer/offer.controller.ts +++ b/src/shared/modules/offer/offer.controller.ts @@ -1,11 +1,13 @@ import { Request, Response } from 'express'; import { OfferRdo } from './rdo/offer.rdo.js'; import { inject, injectable } from 'inversify'; +import { StatusCodes } from 'http-status-codes'; import { fillDTO } from '../../helpers/index.js'; import { Component } from '../../types/index.js'; import { Logger } from '../../libs/logger/index.js'; import { OfferService } from './offer-service.interface.js'; -import { BaseController, HttpMethod } from '../../libs/rest/index.js'; +import { OfferByIdRequest } from './offer-by-id-request.type.js'; +import { BaseController, HttpError, HttpMethod } from '../../libs/rest/index.js'; @injectable() export class OfferController extends BaseController { @@ -17,6 +19,7 @@ export class OfferController extends BaseController { this.logger.info('Register routes for OfferController…'); this.addRoute({ path: '/', method: HttpMethod.Get, handler: this.index }); + this.addRoute({ path: '/:offerId', method: HttpMethod.Get, handler: this.show }); } public async index( @@ -26,4 +29,20 @@ export class OfferController extends BaseController { const offers = await this.offerService.find(); this.ok(res, offers.map((offer) => fillDTO(OfferRdo, offer))); } + + public async show( + { params }: OfferByIdRequest, + res: Response, + ): Promise { + const offerId = params.offerId as string; + const offer = await this.offerService.findById(offerId); + if (! offer) { + throw new HttpError( + StatusCodes.NOT_FOUND, + `Offer with id «${offerId}» not found.`, + 'OfferController', + ); + } + this.ok(res, fillDTO(OfferRdo, offer)); + } } diff --git a/src/shared/modules/offer/offer.http b/src/shared/modules/offer/offer.http index 10e09d2..cdd2090 100644 --- a/src/shared/modules/offer/offer.http +++ b/src/shared/modules/offer/offer.http @@ -1,4 +1,5 @@ -### Список предложений +# Предложения +## Список предложений GET http://localhost:4000/offers HTTP/1.1 ### From b1d549d72f72acedee2c23b8803e5ea2b58352f5 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Mon, 1 Jun 2026 22:48:42 +0300 Subject: [PATCH 29/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=B2=20OfferController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/offer/offer.controller.ts | 10 ++++++ src/shared/modules/offer/offer.http | 36 ++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/src/shared/modules/offer/offer.controller.ts b/src/shared/modules/offer/offer.controller.ts index ee6f3ea..e47e808 100644 --- a/src/shared/modules/offer/offer.controller.ts +++ b/src/shared/modules/offer/offer.controller.ts @@ -7,6 +7,7 @@ import { Component } from '../../types/index.js'; import { Logger } from '../../libs/logger/index.js'; import { OfferService } from './offer-service.interface.js'; import { OfferByIdRequest } from './offer-by-id-request.type.js'; +import { CreateOfferRequest } from './create-offer-request.type.js'; import { BaseController, HttpError, HttpMethod } from '../../libs/rest/index.js'; @injectable() @@ -19,6 +20,7 @@ export class OfferController extends BaseController { this.logger.info('Register routes for OfferController…'); this.addRoute({ path: '/', method: HttpMethod.Get, handler: this.index }); + this.addRoute({ path: '/', method: HttpMethod.Post, handler: this.create }); this.addRoute({ path: '/:offerId', method: HttpMethod.Get, handler: this.show }); } @@ -30,6 +32,14 @@ export class OfferController extends BaseController { this.ok(res, offers.map((offer) => fillDTO(OfferRdo, offer))); } + public async create( + { body }: CreateOfferRequest, + res: Response, + ): Promise { + const offer = await this.offerService.create(body); + this.created(res, fillDTO(OfferRdo, offer)); + } + public async show( { params }: OfferByIdRequest, res: Response, diff --git a/src/shared/modules/offer/offer.http b/src/shared/modules/offer/offer.http index cdd2090..be42411 100644 --- a/src/shared/modules/offer/offer.http +++ b/src/shared/modules/offer/offer.http @@ -3,3 +3,39 @@ GET http://localhost:4000/offers HTTP/1.1 ### + +## Создать предложение + +POST http://localhost:4000/offers HTTP/1.1 +Content-Type: application/json + +{ + "title": "Wood and stone place", + "description": "A quiet cozy and picturesque place.", + "postDate": "2026-04-13T14:30:00.000Z", + "city": "Paris", + "previewImage": "preview.jpg", + "images": ["image1.jpg", "image2.jpg"], + "isPremium": true, + "isFavorite": false, + "rating": 4.5, + "type": "apartment", + "bedrooms": 2, + "maxAdults": 4, + "price": 120, + "goods": ["Breakfast", "Wi-Fi"], + "userId": "6a0ba82cebee1e24f57fce39", + "location": { + "latitude": 48.85661, + "longitude": 2.351499 + } +} + +### + +## Информация о предложении +# offerId — id из ответа POST /offers + +GET http://localhost:4000/offers/6a1de03e3767260a14051049 HTTP/1.1 + +### From 162bd93883758a0006531e75013551b01fff0b93 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Mon, 1 Jun 2026 22:48:56 +0300 Subject: [PATCH 30/32] =?UTF-8?q?feat:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=82=20OfferRdo=20=D0=B4=D0=BB=D1=8F=20location?= =?UTF-8?q?=20=D0=B8=20userId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/offer/rdo/offer.rdo.ts | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/shared/modules/offer/rdo/offer.rdo.ts b/src/shared/modules/offer/rdo/offer.rdo.ts index a434b3e..61ebf3d 100644 --- a/src/shared/modules/offer/rdo/offer.rdo.ts +++ b/src/shared/modules/offer/rdo/offer.rdo.ts @@ -1,8 +1,15 @@ -import { Expose } from 'class-transformer'; -import { OfferLocation } from '../offer.entity.js'; import { City } from '../../../types/cities.enum.js'; +import { Expose, Transform, Type } from 'class-transformer'; import { HousingType } from '../../../types/housing-type.enum.js'; +export class OfferLocationRdo { + @Expose() + public latitude: number; + + @Expose() + public longitude: number; +} + export class OfferRdo { @Expose() public id: string; @@ -50,8 +57,16 @@ export class OfferRdo { public goods: string[]; @Expose() + @Transform(({ obj }) => { + if (obj.userId && typeof obj.userId === 'object' && '_id' in obj.userId) { + return obj.userId._id.toString(); + } + + return obj.userId?.toString(); + }) public userId: string; @Expose() - public location: OfferLocation; + @Type(() => OfferLocationRdo) + public location: OfferLocationRdo; } From 690878d1ce0a16da5d2a7622d60dd7470ab82231 Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Mon, 1 Jun 2026 23:19:22 +0300 Subject: [PATCH 31/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B4=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=20OfferController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/offer/offer.controller.ts | 20 +++++++++++++++++++ src/shared/modules/offer/offer.http | 11 ++++++++++ .../offer/update-offer-request.type.ts | 5 +++++ 3 files changed, 36 insertions(+) create mode 100644 src/shared/modules/offer/update-offer-request.type.ts diff --git a/src/shared/modules/offer/offer.controller.ts b/src/shared/modules/offer/offer.controller.ts index e47e808..6509ece 100644 --- a/src/shared/modules/offer/offer.controller.ts +++ b/src/shared/modules/offer/offer.controller.ts @@ -8,6 +8,7 @@ import { Logger } from '../../libs/logger/index.js'; import { OfferService } from './offer-service.interface.js'; import { OfferByIdRequest } from './offer-by-id-request.type.js'; import { CreateOfferRequest } from './create-offer-request.type.js'; +import { UpdateOfferRequest } from './update-offer-request.type.js'; import { BaseController, HttpError, HttpMethod } from '../../libs/rest/index.js'; @injectable() @@ -22,6 +23,7 @@ export class OfferController extends BaseController { this.addRoute({ path: '/', method: HttpMethod.Get, handler: this.index }); this.addRoute({ path: '/', method: HttpMethod.Post, handler: this.create }); this.addRoute({ path: '/:offerId', method: HttpMethod.Get, handler: this.show }); + this.addRoute({ path: '/:offerId', method: HttpMethod.Patch, handler: this.update }); } public async index( @@ -55,4 +57,22 @@ export class OfferController extends BaseController { } this.ok(res, fillDTO(OfferRdo, offer)); } + + public async update( + { params, body }: UpdateOfferRequest, + res: Response, + ): Promise { + const offerId = params.offerId as string; + const offer = await this.offerService.updateById(offerId, body); + + if (! offer) { + throw new HttpError( + StatusCodes.NOT_FOUND, + `Offer with id «${offerId}» not found.`, + 'OfferController', + ); + } + + this.ok(res, fillDTO(OfferRdo, offer)); + } } diff --git a/src/shared/modules/offer/offer.http b/src/shared/modules/offer/offer.http index be42411..4ae17f8 100644 --- a/src/shared/modules/offer/offer.http +++ b/src/shared/modules/offer/offer.http @@ -39,3 +39,14 @@ Content-Type: application/json GET http://localhost:4000/offers/6a1de03e3767260a14051049 HTTP/1.1 ### + +## Обновить предложение + +PATCH http://localhost:4000/offers/6a1de03e3767260a14051049 HTTP/1.1 +Content-Type: application/json + +{ + "price": 200 +} + +### diff --git a/src/shared/modules/offer/update-offer-request.type.ts b/src/shared/modules/offer/update-offer-request.type.ts new file mode 100644 index 0000000..a82ba11 --- /dev/null +++ b/src/shared/modules/offer/update-offer-request.type.ts @@ -0,0 +1,5 @@ +import { Request } from 'express'; +import { UpdateOfferDto } from './dto/update-offer.dto.js'; +import { RequestBody, RequestParams } from '../../libs/rest/index.js'; + +export type UpdateOfferRequest = Request; From 770ad552ffb53a043d3e8ae06d2031239db88dbe Mon Sep 17 00:00:00 2001 From: Eldar Dusmuratov Date: Mon, 1 Jun 2026 23:26:53 +0300 Subject: [PATCH 32/32] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=20?= =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2?= =?UTF-8?q?=20OfferController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/modules/offer/offer.controller.ts | 19 +++++++++++++++++++ src/shared/modules/offer/offer.http | 12 +++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/shared/modules/offer/offer.controller.ts b/src/shared/modules/offer/offer.controller.ts index 6509ece..f895645 100644 --- a/src/shared/modules/offer/offer.controller.ts +++ b/src/shared/modules/offer/offer.controller.ts @@ -24,6 +24,7 @@ export class OfferController extends BaseController { this.addRoute({ path: '/', method: HttpMethod.Post, handler: this.create }); this.addRoute({ path: '/:offerId', method: HttpMethod.Get, handler: this.show }); this.addRoute({ path: '/:offerId', method: HttpMethod.Patch, handler: this.update }); + this.addRoute({ path: '/:offerId', method: HttpMethod.Delete, handler: this.delete }); } public async index( @@ -75,4 +76,22 @@ export class OfferController extends BaseController { this.ok(res, fillDTO(OfferRdo, offer)); } + + public async delete( + { params }: OfferByIdRequest, + res: Response, + ): Promise { + const offerId = params.offerId as string; + const offer = await this.offerService.deleteById(offerId); + + if (! offer) { + throw new HttpError( + StatusCodes.NOT_FOUND, + `Offer with id «${offerId}» not found.`, + 'OfferController', + ); + } + + this.noContent(res, {}); + } } diff --git a/src/shared/modules/offer/offer.http b/src/shared/modules/offer/offer.http index 4ae17f8..39b3a65 100644 --- a/src/shared/modules/offer/offer.http +++ b/src/shared/modules/offer/offer.http @@ -36,17 +36,23 @@ Content-Type: application/json ## Информация о предложении # offerId — id из ответа POST /offers -GET http://localhost:4000/offers/6a1de03e3767260a14051049 HTTP/1.1 +GET http://localhost:4000/offers/6a1dea7d009844c22a0d5b4d HTTP/1.1 ### ## Обновить предложение -PATCH http://localhost:4000/offers/6a1de03e3767260a14051049 HTTP/1.1 +PATCH http://localhost:4000/offers/6a1dea7d009844c22a0d5b4d HTTP/1.1 Content-Type: application/json { - "price": 200 + "price": 150 } ### + +## Удалить предложение + +DELETE http://localhost:4000/offers/6a1dea7d009844c22a0d5b4d HTTP/1.1 + +###