diff --git a/package-lock.json b/package-lock.json index 19e4507..dfc7174 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,10 +16,12 @@ "@nestjs/platform-express": "^11.0.1", "@nestjs/swagger": "^11.2.1", "jose": "^6.1.0", + "minio": "^8.0.6", "mongoose": "^8.19.3", "nats": "^2.29.3", "reflect-metadata": "^0.2.2", - "rxjs": "^7.8.1" + "rxjs": "^7.8.1", + "temporal-polyfill": "^0.3.0" }, "devDependencies": { "@eslint/eslintrc": "^3.2.0", @@ -29,6 +31,7 @@ "@nestjs/testing": "^11.0.1", "@types/express": "^5.0.0", "@types/jest": "^30.0.0", + "@types/multer": "^2.0.0", "@types/node": "^22.10.7", "@types/supertest": "^6.0.2", "eslint": "^9.18.0", @@ -4864,6 +4867,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/multer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/multer/-/multer-2.0.0.tgz", + "integrity": "sha512-C3Z9v9Evij2yST3RSBktxP9STm6OdMc5uR1xF1SGr98uv8dUlAL2hqwrZ3GVB3uyMyiegnscEK6PGtYvNrjTjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*" + } + }, "node_modules/@types/node": { "version": "22.19.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.0.tgz", @@ -5693,6 +5706,13 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/@zxing/text-encoding": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz", + "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==", + "license": "(Unlicense OR Apache-2.0)", + "optional": true + }, "node_modules/accepts": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", @@ -5949,12 +5969,33 @@ "dev": true, "license": "MIT" }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "license": "MIT" + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "license": "MIT" }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/axios": { "version": "1.13.2", "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz", @@ -6115,6 +6156,15 @@ "readable-stream": "^3.4.0" } }, + "node_modules/block-stream2": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/block-stream2/-/block-stream2-2.1.0.tgz", + "integrity": "sha512-suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg==", + "license": "MIT", + "dependencies": { + "readable-stream": "^3.4.0" + } + }, "node_modules/body-parser": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", @@ -6177,6 +6227,12 @@ "node": ">=8" } }, + "node_modules/browser-or-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-2.1.1.tgz", + "integrity": "sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==", + "license": "MIT" + }, "node_modules/browserslist": { "version": "4.27.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.27.0.tgz", @@ -6268,6 +6324,15 @@ "ieee754": "^1.1.13" } }, + "node_modules/buffer-crc32": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz", + "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==", + "license": "MIT", + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -6294,6 +6359,24 @@ "node": ">= 0.8" } }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", @@ -6820,6 +6903,15 @@ } } }, + "node_modules/decode-uri-component": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", + "license": "MIT", + "engines": { + "node": ">=0.10" + } + }, "node_modules/dedent": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.0.tgz", @@ -6865,6 +6957,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -7333,6 +7442,12 @@ "node": ">= 0.6" } }, + "node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "license": "MIT" + }, "node_modules/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", @@ -7617,6 +7732,15 @@ "node": ">=8" } }, + "node_modules/filter-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", + "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/finalhandler": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", @@ -7692,6 +7816,21 @@ } } }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/foreground-child": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", @@ -7863,6 +8002,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/generator-function": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz", + "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -8084,6 +8232,18 @@ "node": ">=8" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", @@ -8285,6 +8445,22 @@ "node": ">= 0.10" } }, + "node_modules/is-arguments": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz", + "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -8292,6 +8468,18 @@ "dev": true, "license": "MIT" }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -8322,6 +8510,25 @@ "node": ">=6" } }, + "node_modules/is-generator-function": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz", + "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.4", + "generator-function": "^2.0.0", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -8361,6 +8568,24 @@ "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", "license": "MIT" }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -8374,6 +8599,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", @@ -9725,6 +9965,79 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minio": { + "version": "8.0.6", + "resolved": "https://registry.npmjs.org/minio/-/minio-8.0.6.tgz", + "integrity": "sha512-sOeh2/b/XprRmEtYsnNRFtOqNRTPDvYtMWh+spWlfsuCV/+IdxNeKVUMKLqI7b5Dr07ZqCPuaRGU/rB9pZYVdQ==", + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.4", + "block-stream2": "^2.1.0", + "browser-or-node": "^2.1.1", + "buffer-crc32": "^1.0.0", + "eventemitter3": "^5.0.1", + "fast-xml-parser": "^4.4.1", + "ipaddr.js": "^2.0.1", + "lodash": "^4.17.21", + "mime-types": "^2.1.35", + "query-string": "^7.1.3", + "stream-json": "^1.8.0", + "through2": "^4.0.2", + "web-encoding": "^1.1.5", + "xml2js": "^0.5.0 || ^0.6.2" + }, + "engines": { + "node": "^16 || ^18 || >=20" + } + }, + "node_modules/minio/node_modules/fast-xml-parser": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz", + "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "dependencies": { + "strnum": "^1.1.1" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, + "node_modules/minio/node_modules/ipaddr.js": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz", + "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==", + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/minio/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minio/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", @@ -10439,6 +10752,15 @@ "node": ">=4" } }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -10566,6 +10888,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/query-string": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz", + "integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==", + "license": "MIT", + "dependencies": { + "decode-uri-component": "^0.2.2", + "filter-obj": "^1.1.0", + "split-on-first": "^1.0.0", + "strict-uri-encode": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -10816,12 +11156,35 @@ ], "license": "MIT" }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, + "node_modules/sax": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz", + "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==", + "license": "BlueOak-1.0.0" + }, "node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", @@ -10901,6 +11264,23 @@ "node": ">= 18" } }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -11071,6 +11451,15 @@ "memory-pager": "^1.0.2" } }, + "node_modules/split-on-first": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", + "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -11110,6 +11499,21 @@ "node": ">= 0.8" } }, + "node_modules/stream-chain": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/stream-chain/-/stream-chain-2.2.5.tgz", + "integrity": "sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA==", + "license": "BSD-3-Clause" + }, + "node_modules/stream-json": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.9.1.tgz", + "integrity": "sha512-uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==", + "license": "BSD-3-Clause", + "dependencies": { + "stream-chain": "^2.2.5" + } + }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -11118,6 +11522,15 @@ "node": ">=10.0.0" } }, + "node_modules/strict-uri-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -11439,6 +11852,21 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/temporal-polyfill": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.3.0.tgz", + "integrity": "sha512-qNsTkX9K8hi+FHDfHmf22e/OGuXmfBm9RqNismxBrnSmZVJKegQ+HYYXT+R7Ha8F/YSm2Y34vmzD4cxMu2u95g==", + "license": "MIT", + "dependencies": { + "temporal-spec": "0.3.0" + } + }, + "node_modules/temporal-spec": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.3.0.tgz", + "integrity": "sha512-n+noVpIqz4hYgFSMOSiINNOUOMFtV5cZQNCmmszA6GiVFVRt3G7AqVyhXjhCSmowvQn+NsGn+jMDMKJYHd3bSQ==", + "license": "ISC" + }, "node_modules/terser": { "version": "5.44.1", "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.1.tgz", @@ -11643,6 +12071,15 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/through2": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "license": "MIT", + "dependencies": { + "readable-stream": "3" + } + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -12142,6 +12579,19 @@ "punycode": "^2.1.0" } }, + "node_modules/util": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "is-arguments": "^1.0.4", + "is-generator-function": "^1.0.7", + "is-typed-array": "^1.1.3", + "which-typed-array": "^1.1.2" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -12226,6 +12676,18 @@ "defaults": "^1.0.3" } }, + "node_modules/web-encoding": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/web-encoding/-/web-encoding-1.1.5.tgz", + "integrity": "sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==", + "license": "MIT", + "dependencies": { + "util": "^0.12.3" + }, + "optionalDependencies": { + "@zxing/text-encoding": "0.9.0" + } + }, "node_modules/webidl-conversions": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", @@ -12465,6 +12927,27 @@ "node": ">= 8" } }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -12582,6 +13065,28 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/xml2js": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", + "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==", + "license": "MIT", + "dependencies": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/xmlbuilder": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", + "license": "MIT", + "engines": { + "node": ">=4.0" + } + }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/package.json b/package.json index 52d76da..b3c3d3f 100644 --- a/package.json +++ b/package.json @@ -27,10 +27,12 @@ "@nestjs/platform-express": "^11.0.1", "@nestjs/swagger": "^11.2.1", "jose": "^6.1.0", + "minio": "^8.0.6", "mongoose": "^8.19.3", "nats": "^2.29.3", "reflect-metadata": "^0.2.2", - "rxjs": "^7.8.1" + "rxjs": "^7.8.1", + "temporal-polyfill": "^0.3.0" }, "devDependencies": { "@eslint/eslintrc": "^3.2.0", @@ -40,6 +42,7 @@ "@nestjs/testing": "^11.0.1", "@types/express": "^5.0.0", "@types/jest": "^30.0.0", + "@types/multer": "^2.0.0", "@types/node": "^22.10.7", "@types/supertest": "^6.0.2", "eslint": "^9.18.0", diff --git a/src/app.module.ts b/src/app.module.ts index 09096f4..4c146ff 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -4,6 +4,7 @@ import { AppService } from './app.service'; import { GlobalModule } from './modules/global/global.module'; import { ConfigModule } from '@nestjs/config'; import { AccountModule } from './modules/account/account.module'; +import { ImageModule } from './modules/image/image.module'; @Module({ imports: [ @@ -12,7 +13,9 @@ import { AccountModule } from './modules/account/account.module'; envFilePath: process.env.NODE_ENV === 'prod' ? '.env.prod' : process.env.NODE_ENV === 'test' ? '.env.test' : '.env.dev', }), GlobalModule, - AccountModule], + AccountModule, + ImageModule + ], controllers: [AppController], providers: [AppService], }) diff --git a/src/main.ts b/src/main.ts index ee03f58..6eba89e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -13,6 +13,10 @@ async function bootstrap() { .setDescription('The Gemwiki API description') .setVersion('1.0') .addTag('gemwiki') + .addServer(`https:/wiki.dahyeon.us/`) + .addBearerAuth({ + type: 'openIdConnect' + }) .build(); const options: SwaggerCustomOptions = { ui: false, @@ -23,6 +27,7 @@ async function bootstrap() { } app.setGlobalPrefix(`v${apiVersion}`); + app.enableCors() await app.listen(process.env.PORT ?? 3415); } bootstrap(); diff --git a/src/modules/account/account.service.ts b/src/modules/account/account.service.ts index 4401fd4..8e7ba48 100644 --- a/src/modules/account/account.service.ts +++ b/src/modules/account/account.service.ts @@ -7,6 +7,7 @@ export class AccountService { } getAccountInfo(): string { + console.log('Fetching account information'); return 'Account Information'; } } diff --git a/src/modules/global/auth/auth.module.ts b/src/modules/global/auth/auth.module.ts new file mode 100644 index 0000000..e668441 --- /dev/null +++ b/src/modules/global/auth/auth.module.ts @@ -0,0 +1,8 @@ +import { Module } from "@nestjs/common"; +import { JwtService } from "./jwt.service"; + +@Module({ + providers: [JwtService], + exports: [JwtService], +}) +export class AuthModule {} \ No newline at end of file diff --git a/src/modules/global/auth/jwt.service.ts b/src/modules/global/auth/jwt.service.ts index 2d90151..fc21149 100644 --- a/src/modules/global/auth/jwt.service.ts +++ b/src/modules/global/auth/jwt.service.ts @@ -27,6 +27,49 @@ export type IdentityProviderName = 'MICROSOFT_ENTRAID' | 'AMAZON_COGNITO'; // jwksUri: string; // } +/** + * https://learn.microsoft.com/en-us/entra/identity-platform/access-token-claims-reference + * Microsoft Entra access-token의 페이로드 클레임. (v2.0) + * { + aud: 'd182d8e3-fa47-4b93-a736-8c4b7c25bc97', + iss: 'https://login.microsoftonline.com/5ef88004-e953-4b04-93db-64bbf49c6863/v2.0', + iat: 1762581073, + nbf: 1762581073, + exp: 1762584973, + idp: 'https://sts.windows.net/9188040d-6c67-4c5b-b112-36a304b66dad/', + name: '박 다현', + nonce: '019a6209-2ad0-7ff3-b602-717dc84110c7', + oid: 'f0e47b9f-00cd-4dcc-b324-982c87925be3', + preferred_username: 'park@dahyeon.us', + prov_data: [ [Object] ], + rh: '1.ASsABID4XlPpBEuT22S79JxoY-PYgtFH-pNLpzaMS3wlvJfCAPErAA.', + sid: '00a91929-edb8-af0a-4867-1a286d232132', + sub: 'wOWxMykMnhSt4ze00IBprHGCXR17VGmpB384UmoJb4I', + tid: '5ef88004-e953-4b04-93db-64bbf49c6863', + uti: 'Zum6q_BVMkmKGtgKL21UAA', + ver: '2.0' + }, + */ +export type EntraIDPayloadClaims = { + aud: string; + iss: string; + iat: number; + lap: string; + nbf: number; + exp: number; + name: string; + nonce: string; + oid: string; + preferred_username: string; + prov_data: [{}], + rh: string; + sid: string; + sub: string; + tid: string; + uti: string; + ver: '2.0'; +} + @Injectable() export class JwtService implements OnModuleInit { private jwtClaimAudience: string; @@ -35,7 +78,7 @@ export class JwtService implements OnModuleInit { private MICROSOFT_ENTRAID_allowedAlgs: string; private MICROSOFT_ENTRAID_issuer: string; private MICROSOFT_ENTRAID_jwksUri: string; - private MICROSOFT_ENTRAID_jwks: ReturnType; + private MICROSOFT_ENTRAID_jwks: () => Promise; private readonly tokenSigningAlgValuesSupported = ['RS256']; private readonly clockTolerance = @@ -52,31 +95,48 @@ export class JwtService implements OnModuleInit { this.MICROSOFT_ENTRAID_tenantId = await this.secretService.get('MICROSOFT_ENTRAID_TENANT_ID') this.MICROSOFT_ENTRAID_allowedAlgs = await this.secretService.get('MICROSOFT_ENTRAID_ALLOWED_ALGS') this.MICROSOFT_ENTRAID_issuer = `https://login.microsoftonline.com/${this.MICROSOFT_ENTRAID_tenantId}/v2.0`; - this.MICROSOFT_ENTRAID_jwksUri = `https://login.microsoftonline.com/${this.MICROSOFT_ENTRAID_tenantId}/discovery/v2.0/keys`; - this.MICROSOFT_ENTRAID_jwks = createRemoteJWKSet(new URL(this.MICROSOFT_ENTRAID_jwksUri), { + this.MICROSOFT_ENTRAID_jwksUri = `https://login.microsoftonline.com/common/discovery/v2.0/keys`; + const remoteJWKSet = createRemoteJWKSet(new URL(this.MICROSOFT_ENTRAID_jwksUri), { // cache: true, - cooldownDuration: 30_000, // 30s - timeoutDuration: 10_000, // 10s - }); + cooldownDuration: 30_000, + timeoutDuration: 10_000, + }) + this.MICROSOFT_ENTRAID_jwks = remoteJWKSet; + try { + await remoteJWKSet.reload(); + } catch (e) { + // 초기 로드 실패는 무시하거나 로깅 + console.warn('Failed to preload Entra JWKs:', e); + } + + console.log(remoteJWKSet.jwks(), 'Entra JWKs loaded'); } /** * Authorization: Bearer 의 부분을 검증. - * - iss: v2.0 발급자 + * - iss: IdP 별 설정에 따라. * - aud: Application ID URI와 정확히 일치해야 함 - * - alg: RS256(기본) + * - alg: IdP 마다 허용된 설정에 따라야 함 */ async verify( token: string, identityProvider: IdentityProviderName ): Promise> { + console.log('Verifying JWT token'); if (!token) { throw new Error('Empty token'); } // IdP별 설정 매핑 - const providers = { + const providers: { + [x in IdentityProviderName]: { + jwks: () => Promise; + issuer: string; + audience: string; + extraValidate?: (payload: JWTPayload) => void; + }; + } = { MICROSOFT_ENTRAID: { jwks: this.MICROSOFT_ENTRAID_jwks, issuer: this.MICROSOFT_ENTRAID_issuer, @@ -92,44 +152,49 @@ export class JwtService implements OnModuleInit { }, }, AMAZON_COGNITO: { - // 아래 3개 필드는 onModuleInit에서 Entra와 동일하게 준비해야 함 - // this.AMAZON_COGNITO_jwks = createRemoteJWKSet(new URL(this.AMAZON_COGNITO_jwksUri), {...}) + // TODO : Cognito 통합.. 언젠가... jwks: this['AMAZON_COGNITO_jwks'], issuer: this['AMAZON_COGNITO_issuer'], audience: this['AMAZON_COGNITO_audience'], extraValidate: (payload: JWTPayload) => { - // 필요하면 Cognito 전용 검증(예: token_use, cognito:username 등) 추가 - // if (payload['token_use'] && payload['token_use'] !== 'id' /* or 'access' */) { ... } }, }, } as const; const provider = providers[identityProvider]; + console.log('Using identity provider:', provider.jwks); if (!provider?.jwks || !provider?.issuer || !provider?.audience) { throw new Error(`Identity provider not configured: ${identityProvider}`); } - // 허용 알고리즘: 환경변수(콤마 구분) -> 기본값(['RS256']) const allowedAlgs = (this.MICROSOFT_ENTRAID_allowedAlgs ? this.MICROSOFT_ENTRAID_allowedAlgs.split(',').map(s => s.trim()).filter(Boolean) : this.tokenSigningAlgValuesSupported) as string[]; - const result = await jwtVerify(token, provider.jwks, { - issuer: provider.issuer, - audience: provider.audience, - algorithms: allowedAlgs, - clockTolerance: this.clockTolerance, - }); + let result + + try { + result = await jwtVerify(token, provider.jwks, { + issuer: provider.issuer, + audience: provider.audience, + algorithms: allowedAlgs, + clockTolerance: this.clockTolerance, + }); + console.log(result, 'jwt verify result'); + } catch (e) { + // const msg = e instanceof Error ? e.message : 'JWT verification error'; + // throw new Error(`JWT verification failed: ${msg}`); + console.log('JWT verification failed:', e); + throw e; + } const { payload, protectedHeader } = result; - // 공통: alg 확인 if (!allowedAlgs.includes(protectedHeader.alg as string)) { throw new Error(`Unexpected alg: ${protectedHeader.alg}`); } - // 프로바이더별 추가 검증 provider.extraValidate?.(payload); return result; diff --git a/src/modules/global/global.module.ts b/src/modules/global/global.module.ts index 9744f58..afb2cc5 100644 --- a/src/modules/global/global.module.ts +++ b/src/modules/global/global.module.ts @@ -3,11 +3,13 @@ import { SecretModule } from './secret/secret.module'; // import { DatabaseModule } from './database/database.module'; import { NatsModule } from './nats/nats.module'; import { JwtService } from './auth/jwt.service'; +import { MinioModule } from './minio/minio.module'; +import { AuthModule } from './auth/auth.module'; @Global() @Module({ - imports: [SecretModule, NatsModule], + imports: [SecretModule, NatsModule, MinioModule, AuthModule, MinioModule], providers: [JwtService], - exports: [SecretModule, NatsModule, JwtService], + exports: [SecretModule, NatsModule, MinioModule, AuthModule, MinioModule], }) export class GlobalModule {} \ No newline at end of file diff --git a/src/modules/global/minio/minio.module.ts b/src/modules/global/minio/minio.module.ts new file mode 100644 index 0000000..fb14440 --- /dev/null +++ b/src/modules/global/minio/minio.module.ts @@ -0,0 +1,8 @@ +import { Module } from "@nestjs/common"; +import { MinioService } from "./minio.service"; + +@Module({ + providers: [MinioService], + exports: [MinioService], +}) +export class MinioModule {} diff --git a/src/modules/global/minio/minio.service.ts b/src/modules/global/minio/minio.service.ts new file mode 100644 index 0000000..5e9c9e4 --- /dev/null +++ b/src/modules/global/minio/minio.service.ts @@ -0,0 +1,60 @@ +import { Injectable, OnModuleInit } from "@nestjs/common"; +import { SecretService } from "../secret/secret.service"; +import * as Minio from 'minio' +import { Temporal } from "temporal-polyfill"; + +@Injectable() +export class MinioService implements OnModuleInit { + private minioClient: Minio.Client; + private endpoint: string; + private accessKey: string; + private secretKey: string; + + private readonly bucketName = 'wiki-image' + + constructor( + private readonly secretService: SecretService + ) {} + + public async onModuleInit() { + await this.secretService.ready() + + this.endpoint = await this.secretService.get('MINIO_ENDPOINT') + this.accessKey = await this.secretService.get('MINIO_ACCESS_KEY') + this.secretKey = await this.secretService.get('MINIO_SECRET_KEY') + + this.minioClient = new Minio.Client({ + endPoint: this.endpoint, + useSSL: true, + accessKey: this.accessKey, + secretKey: this.secretKey, + }) + } + + // uploadFile(file: Buffer): Promise + // uploadFile(file: Express.Multer.File): Promise + public async uploadFile(file: Express.Multer.File): Promise { + const date = Temporal.Now.plainDateISO().toString() + const s3ObjectKey = `${date}/${file.originalname}` + const metaData = { + 'Content-Type': file.mimetype, + 'X-Amz-Meta-serviceName': 'wiki', + } + const fileBuffer = Buffer.from(file.buffer) + await this.minioClient.putObject(this.bucketName, s3ObjectKey, fileBuffer, file.size, metaData) + return s3ObjectKey + } + + public async uploadImage(file: Express.Multer.File): Promise { + const date = Temporal.Now.plainDateISO().toString() + const s3ObjectKey = `${date}/${file.originalname.split('.')[0]}/original.${file.originalname.split('.').pop()}` + console.log(s3ObjectKey) + const metaData = { + 'Content-Type': file.mimetype, + 'X-Amz-Meta-serviceName': 'wiki', + } + const fileBuffer = Buffer.from(file.buffer) + await this.minioClient.putObject(this.bucketName, s3ObjectKey, fileBuffer, file.size, metaData) + return s3ObjectKey + } +} diff --git a/src/modules/global/nats/nats.service.ts b/src/modules/global/nats/nats.service.ts index df4f8e7..a655e4c 100644 --- a/src/modules/global/nats/nats.service.ts +++ b/src/modules/global/nats/nats.service.ts @@ -1,5 +1,5 @@ import { Injectable, OnModuleDestroy, OnModuleInit } from "@nestjs/common"; -import { NatsConnection, connect } from "nats"; +import { NatsConnection, StringCodec, connect } from "nats"; import { SecretService } from "../secret/secret.service"; import fs from "fs/promises"; @@ -10,6 +10,8 @@ export class NatsService implements OnModuleInit, OnModuleDestroy { private user: string; private password: string; + private readonly stringCodec = StringCodec(); + constructor( private readonly secretService: SecretService ) {} @@ -22,28 +24,41 @@ export class NatsService implements OnModuleInit, OnModuleDestroy { // console.log(this.endpoint) const cacert = (await fs.readFile("internal-service-ca.pem")).toString() this.natsClient = await connect({ + name : "wiki-server", servers: [this.endpoint], tls: { ca: cacert, }, - authenticator: () => { - return { - user: this.user, - pass: this.password - } - } + maxReconnectAttempts: -1, + reconnectTimeWait: 500, + reconnect: true, + pingInterval: 20000, + timeout: 5000, + user: this.user, + pass: this.password }); // const result = await this.natsClient.status(); // console.log(result) } async onModuleDestroy() { - const done = this.natsClient.closed(); - await this.natsClient.close(); - const err = await done; - if (err) { - console.log(`error closing:`, err); + if (!this.natsClient) return; + try { + // 안전 종료: drain -> closed 대기 + const closed = this.natsClient.closed(); + await this.natsClient.drain(); + const err = await closed; + if (err) console.error("NATS closed with error:", err); + } catch (e) { + // drain 실패 시 강제 close + try { await this.natsClient.close(); } catch {} } } + + public async publish(subject: string, data: T): Promise { + + this.natsClient.publish(subject, this.stringCodec.encode(JSON.stringify(data))); + await this.natsClient.flush(); + } } \ No newline at end of file diff --git a/src/modules/image/image.controller.ts b/src/modules/image/image.controller.ts index 82013ba..cc76795 100644 --- a/src/modules/image/image.controller.ts +++ b/src/modules/image/image.controller.ts @@ -1,7 +1,14 @@ -import { Controller } from '@nestjs/common'; +import { Controller, Post, UploadedFile, UseInterceptors } from '@nestjs/common'; import { ImageService } from './image.service'; +import { FileInterceptor } from '@nestjs/platform-express'; @Controller('image') export class ImageController { constructor(private readonly imageService: ImageService) {} + + @Post() + @UseInterceptors(FileInterceptor('file')) + async uploadImage(@UploadedFile() file: Express.Multer.File) { + return this.imageService.uploadImage(file) + } } diff --git a/src/modules/image/image.service.ts b/src/modules/image/image.service.ts index 366cd50..168b6d6 100644 --- a/src/modules/image/image.service.ts +++ b/src/modules/image/image.service.ts @@ -1,4 +1,21 @@ import { Injectable } from '@nestjs/common'; +import { MinioService } from '../global/minio/minio.service'; +import { NatsService } from '../global/nats/nats.service'; @Injectable() -export class ImageService {} +export class ImageService { + constructor( + private readonly minioService: MinioService, + private readonly natsService: NatsService + ) {} + + public async uploadImage(file: Express.Multer.File): Promise { + try { + const s3ObjectKey = await this.minioService.uploadImage(file); + await this.natsService.publish('generate-derivatives', { s3ObjectKey: s3ObjectKey }); + } catch (error) { + + } + return this.minioService.uploadFile(file) + } +}