diff --git a/server/package.json b/server/package.json index 0bcc0bd02..01e55ff68 100644 --- a/server/package.json +++ b/server/package.json @@ -13,30 +13,30 @@ "author": "zkldi", "license": "ISC", "devDependencies": { - "@types/bcrypt": "^3.0.0", + "@types/bcrypt": "^3.0.1", "@types/connect-redis": "^0.0.16", "@types/express": "^4.17.11", "@types/express-session": "^1.17.3", "@types/multer": "^1.4.5", - "@types/node": "^14.14.37", - "@types/node-fetch": "^2.5.8", + "@types/node": "15", + "@types/node-fetch": "^2.5.10", "@types/proxyquire": "^1.3.28", "@types/range-parser": "^1.2.3", "@types/supertest": "^2.0.11", "@types/tap": "^15.0.0", - "@typescript-eslint/eslint-plugin": "^4.20.0", - "@typescript-eslint/parser": "^4.20.0", - "eslint": "^7.23.0", - "eslint-config-prettier": "^8.1.0", + "@typescript-eslint/eslint-plugin": "^4.22.0", + "@typescript-eslint/parser": "^4.22.0", + "eslint": "^7.25.0", + "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-prettier": "^3.3.1", - "express-request-mock": "^3.0.0", + "eslint-plugin-prettier": "^3.4.0", + "express-request-mock": "^3.1.0", "node-mocks-http": "^1.10.1", "prettier": "^2.2.1", "proxyquire": "^2.1.3", "supertest": "^6.1.3", - "tap": "^15.0.2", - "treport": "^2.0.0", + "tap": "^15.0.5", + "treport": "^2.0.1", "ts-node": "^9.1.1", "why-is-node-running": "^2.2.0" }, @@ -44,8 +44,8 @@ "bcrypt": "^5.0.1", "bee-queue": "^1.3.1", "commander": "^7.2.0", - "connect-redis": "^5.1.0", - "csv-parse": "^4.15.3", + "connect-redis": "^5.2.0", + "csv-parse": "^4.15.4", "deepmerge": "^4.2.2", "dotenv": "^8.2.0", "escape-string-regexp": "^1.0.5", @@ -59,7 +59,7 @@ "multer": "^1.4.2", "node-fetch": "^2.6.1", "prudence": "^0.8.9", - "redis": "^3.1.0", + "redis": "^3.1.2", "typescript": "^4.2.4", "winston": "^3.3.3" }, diff --git a/server/pnpm-lock.yaml b/server/pnpm-lock.yaml index 254af2e57..6af92ce96 100644 --- a/server/pnpm-lock.yaml +++ b/server/pnpm-lock.yaml @@ -1,34 +1,34 @@ lockfileVersion: 5.3 specifiers: - '@types/bcrypt': ^3.0.0 + '@types/bcrypt': ^3.0.1 '@types/connect-redis': ^0.0.16 '@types/express': ^4.17.11 '@types/express-session': ^1.17.3 '@types/multer': ^1.4.5 - '@types/node': ^14.14.37 - '@types/node-fetch': ^2.5.8 + '@types/node': '15' + '@types/node-fetch': ^2.5.10 '@types/proxyquire': ^1.3.28 '@types/range-parser': ^1.2.3 '@types/supertest': ^2.0.11 '@types/tap': ^15.0.0 - '@typescript-eslint/eslint-plugin': ^4.20.0 - '@typescript-eslint/parser': ^4.20.0 + '@typescript-eslint/eslint-plugin': ^4.22.0 + '@typescript-eslint/parser': ^4.22.0 bcrypt: ^5.0.1 bee-queue: ^1.3.1 commander: ^7.2.0 - connect-redis: ^5.1.0 - csv-parse: ^4.15.3 + connect-redis: ^5.2.0 + csv-parse: ^4.15.4 deepmerge: ^4.2.2 dotenv: ^8.2.0 escape-string-regexp: ^1.0.5 - eslint: ^7.23.0 - eslint-config-prettier: ^8.1.0 + eslint: ^7.25.0 + eslint-config-prettier: ^8.3.0 eslint-plugin-import: ^2.22.1 - eslint-plugin-prettier: ^3.3.1 + eslint-plugin-prettier: ^3.4.0 express: ^4.17.1 express-async-errors: ^3.1.1 - express-request-mock: ^3.0.0 + express-request-mock: ^3.1.0 express-session: ^1.17.1 fast-json-stable-hash: ^1.0.1 kamaitachi-common: github:zkldi/Kamaitachi-common @@ -40,10 +40,10 @@ specifiers: prettier: ^2.2.1 proxyquire: ^2.1.3 prudence: ^0.8.9 - redis: ^3.1.0 + redis: ^3.1.2 supertest: ^6.1.3 - tap: ^15.0.2 - treport: ^2.0.0 + tap: ^15.0.5 + treport: ^2.0.1 ts-node: ^9.1.1 typescript: ^4.2.4 why-is-node-running: ^2.2.0 @@ -53,7 +53,7 @@ dependencies: bcrypt: 5.0.1 bee-queue: 1.3.1 commander: 7.2.0 - connect-redis: 5.1.0 + connect-redis: 5.2.0 csv-parse: 4.15.4 deepmerge: 4.2.2 dotenv: 8.2.0 @@ -78,24 +78,24 @@ devDependencies: '@types/express': 4.17.11 '@types/express-session': 1.17.3 '@types/multer': 1.4.5 - '@types/node': 14.14.41 + '@types/node': 15.0.1 '@types/node-fetch': 2.5.10 '@types/proxyquire': 1.3.28 '@types/range-parser': 1.2.3 '@types/supertest': 2.0.11 '@types/tap': 15.0.0 - '@typescript-eslint/eslint-plugin': 4.22.0_9acede93a3623dd7abe65c65a7010e73 - '@typescript-eslint/parser': 4.22.0_eslint@7.24.0+typescript@4.2.4 - eslint: 7.24.0 - eslint-config-prettier: 8.2.0_eslint@7.24.0 - eslint-plugin-import: 2.22.1_eslint@7.24.0 - eslint-plugin-prettier: 3.4.0_64fa1aa96df95a5df14fce32631d8e89 + '@typescript-eslint/eslint-plugin': 4.22.0_e3b52a83531895e7febd6ecd5ba813eb + '@typescript-eslint/parser': 4.22.0_eslint@7.25.0+typescript@4.2.4 + eslint: 7.25.0 + eslint-config-prettier: 8.3.0_eslint@7.25.0 + eslint-plugin-import: 2.22.1_eslint@7.25.0 + eslint-plugin-prettier: 3.4.0_ed07edc0d33fb90bb2bebf56b9b5e0f9 express-request-mock: 3.1.0 node-mocks-http: 1.10.1 prettier: 2.2.1 proxyquire: 2.1.3 supertest: 6.1.3 - tap: 15.0.4_ts-node@9.1.1+typescript@4.2.4 + tap: 15.0.5_ts-node@9.1.1+typescript@4.2.4 treport: 2.0.1 ts-node: 9.1.1_typescript@4.2.4 why-is-node-running: 2.2.0 @@ -163,7 +163,7 @@ packages: '@babel/compat-data': 7.13.15 '@babel/core': 7.13.16 '@babel/helper-validator-option': 7.12.17 - browserslist: 4.16.4 + browserslist: 4.16.5 semver: 6.3.0 dev: true @@ -458,13 +458,13 @@ packages: resolution: {integrity: sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==} dependencies: '@types/connect': 3.4.34 - '@types/node': 14.14.41 + '@types/node': 14.14.43 dev: true /@types/bson/4.0.3: resolution: {integrity: sha512-mVRvYnTOZJz3ccpxhr3wgxVmSeiYinW+zlzQz3SXWaJmD1DuL05Jeq7nKw3SnbKmbleW5qrLG5vdyWe/A9sXhw==} dependencies: - '@types/node': 14.14.42 + '@types/node': 14.14.43 dev: false /@types/connect-redis/0.0.16: @@ -472,14 +472,14 @@ packages: dependencies: '@types/express': 4.17.11 '@types/express-session': 1.17.3 - '@types/ioredis': 4.22.3 + '@types/ioredis': 4.26.0 '@types/redis': 2.8.28 dev: true /@types/connect/3.4.34: resolution: {integrity: sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==} dependencies: - '@types/node': 14.14.41 + '@types/node': 14.14.43 dev: true /@types/cookiejar/2.1.2: @@ -489,7 +489,7 @@ packages: /@types/express-serve-static-core/4.17.19: resolution: {integrity: sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==} dependencies: - '@types/node': 14.14.41 + '@types/node': 14.14.43 '@types/qs': 6.9.6 '@types/range-parser': 1.2.3 dev: true @@ -509,10 +509,10 @@ packages: '@types/serve-static': 1.13.9 dev: true - /@types/ioredis/4.22.3: - resolution: {integrity: sha512-V23g0XZUmkm0Hp/GsQYV5Wz12ynm6h6lyi5v/o63iyqFV7+8t3k5YxCnFWVWFEjO6mvRI7V6f7YxNVxIjPsSUw==} + /@types/ioredis/4.26.0: + resolution: {integrity: sha512-lxF+O7a5lu08g8rmPTAlD105SorTbu1A3jZdH8CIra0eh3lmpqkRkJ3FAYFPTAXSlnE549xqbQIo1BLzx5smNg==} dependencies: - '@types/node': 14.14.41 + '@types/node': 14.14.43 dev: true /@types/json-schema/7.0.7: @@ -531,7 +531,7 @@ packages: resolution: {integrity: sha512-49aEzQD5VdHPxyd5dRyQdqEveAg9LanwrH8RQipnMuulwzKmODXIZRp0umtxi1eBUfEusRkoy8AVOMr+kVuFog==} dependencies: '@types/bson': 4.0.3 - '@types/node': 14.14.42 + '@types/node': 14.14.43 dev: false /@types/multer/1.4.5: @@ -543,17 +543,16 @@ packages: /@types/node-fetch/2.5.10: resolution: {integrity: sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==} dependencies: - '@types/node': 14.14.41 + '@types/node': 14.14.43 form-data: 3.0.1 dev: true - /@types/node/14.14.41: - resolution: {integrity: sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==} - dev: true + /@types/node/14.14.43: + resolution: {integrity: sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==} - /@types/node/14.14.42: - resolution: {integrity: sha512-88QoObqn9WYIUMRzOx92GmSHmU3JCyukC2ulEv8tFjUG9VeV2FQ/cA7VQ1gi+rB/+gBMVvzVFcTnz8RdMDVIWw==} - dev: false + /@types/node/15.0.1: + resolution: {integrity: sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==} + dev: true /@types/proxyquire/1.3.28: resolution: {integrity: sha512-SQaNzWQ2YZSr7FqAyPPiA3FYpux2Lqh3HWMZQk47x3xbMCqgC/w0dY3dw9rGqlweDDkrySQBcaScXWeR+Yb11Q==} @@ -570,21 +569,21 @@ packages: /@types/redis/2.8.28: resolution: {integrity: sha512-8l2gr2OQ969ypa7hFOeKqtFoY70XkHxISV0pAwmQ2nm6CSPb1brmTmqJCGGrekCo+pAZyWlNXr+Kvo6L/1wijA==} dependencies: - '@types/node': 14.14.41 + '@types/node': 14.14.43 dev: true /@types/serve-static/1.13.9: resolution: {integrity: sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==} dependencies: '@types/mime': 1.3.2 - '@types/node': 14.14.41 + '@types/node': 14.14.43 dev: true /@types/superagent/4.1.10: resolution: {integrity: sha512-xAgkb2CMWUMCyVc/3+7iQfOEBE75NvuZeezvmixbUw3nmENf2tCnQkW5yQLTYqvXUQ+R6EXxdqKKbal2zM5V/g==} dependencies: '@types/cookiejar': 2.1.2 - '@types/node': 14.14.41 + '@types/node': 14.14.43 dev: true /@types/supertest/2.0.11: @@ -596,14 +595,14 @@ packages: /@types/tap/15.0.0: resolution: {integrity: sha512-AAsxWamgPOFWAQoSVOkQgGpi/wdk28Bmof7/KWI8T97mnDsjwHFrwclLBNGhaeXYhQABQZ1e2ovPIS7OAuM4vQ==} dependencies: - '@types/node': 14.14.41 + '@types/node': 14.14.43 dev: true /@types/yoga-layout/1.9.2: resolution: {integrity: sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==} dev: true - /@typescript-eslint/eslint-plugin/4.22.0_9acede93a3623dd7abe65c65a7010e73: + /@typescript-eslint/eslint-plugin/4.22.0_e3b52a83531895e7febd6ecd5ba813eb: resolution: {integrity: sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -614,11 +613,11 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 4.22.0_eslint@7.24.0+typescript@4.2.4 - '@typescript-eslint/parser': 4.22.0_eslint@7.24.0+typescript@4.2.4 + '@typescript-eslint/experimental-utils': 4.22.0_eslint@7.25.0+typescript@4.2.4 + '@typescript-eslint/parser': 4.22.0_eslint@7.25.0+typescript@4.2.4 '@typescript-eslint/scope-manager': 4.22.0 debug: 4.3.1 - eslint: 7.24.0 + eslint: 7.25.0 functional-red-black-tree: 1.0.1 lodash: 4.17.21 regexpp: 3.1.0 @@ -629,7 +628,7 @@ packages: - supports-color dev: true - /@typescript-eslint/experimental-utils/4.22.0_eslint@7.24.0+typescript@4.2.4: + /@typescript-eslint/experimental-utils/4.22.0_eslint@7.25.0+typescript@4.2.4: resolution: {integrity: sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -639,7 +638,7 @@ packages: '@typescript-eslint/scope-manager': 4.22.0 '@typescript-eslint/types': 4.22.0 '@typescript-eslint/typescript-estree': 4.22.0_typescript@4.2.4 - eslint: 7.24.0 + eslint: 7.25.0 eslint-scope: 5.1.1 eslint-utils: 2.1.0 transitivePeerDependencies: @@ -647,7 +646,7 @@ packages: - typescript dev: true - /@typescript-eslint/parser/4.22.0_eslint@7.24.0+typescript@4.2.4: + /@typescript-eslint/parser/4.22.0_eslint@7.25.0+typescript@4.2.4: resolution: {integrity: sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -661,7 +660,7 @@ packages: '@typescript-eslint/types': 4.22.0 '@typescript-eslint/typescript-estree': 4.22.0_typescript@4.2.4 debug: 4.3.1 - eslint: 7.24.0 + eslint: 7.25.0 typescript: 4.2.4 transitivePeerDependencies: - supports-color @@ -760,8 +759,8 @@ packages: uri-js: 4.4.1 dev: true - /ajv/8.1.0: - resolution: {integrity: sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==} + /ajv/8.2.0: + resolution: {integrity: sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==} dependencies: fast-deep-equal: 3.1.3 json-schema-traverse: 1.0.0 @@ -1023,14 +1022,14 @@ packages: fill-range: 7.0.1 dev: true - /browserslist/4.16.4: - resolution: {integrity: sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==} + /browserslist/4.16.5: + resolution: {integrity: sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001214 + caniuse-lite: 1.0.30001218 colorette: 1.2.2 - electron-to-chromium: 1.3.717 + electron-to-chromium: 1.3.722 escalade: 3.1.1 node-releases: 1.1.71 dev: true @@ -1101,8 +1100,8 @@ packages: engines: {node: '>=6'} dev: true - /caniuse-lite/1.0.30001214: - resolution: {integrity: sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg==} + /caniuse-lite/1.0.30001218: + resolution: {integrity: sha512-0ASydOWSy3bB88FbDpJSTt+PfDwnMqrym3yRZfqG8EXSQ06OZhF+q5wgYP/EN+jJMERItNcDQUqMyNjzZ+r5+Q==} dev: true /cardinal/2.1.1: @@ -1134,8 +1133,8 @@ packages: supports-color: 7.2.0 dev: true - /chalk/4.1.0: - resolution: {integrity: sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==} + /chalk/4.1.1: + resolution: {integrity: sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==} engines: {node: '>=10'} dependencies: ansi-styles: 4.3.0 @@ -1299,8 +1298,8 @@ packages: typedarray: 0.0.6 dev: false - /connect-redis/5.1.0: - resolution: {integrity: sha512-Cosy8gGUdkBPEYG84svgkzIGzspKBb98NUX4Nfc5eTJOF0A++41ZV15rPwWW0n5nU/FusNgNzuMeXhLVEQF80Q==} + /connect-redis/5.2.0: + resolution: {integrity: sha512-wcv1lZWa2K7RbsdSlrvwApBQFLQx+cia+oirLIeim0axR3D/9ZJbHdeTM/j8tJYYKk34dVs2QPAuAqcIklWD+Q==} engines: {node: '>=10.0.0'} dev: false @@ -1514,8 +1513,8 @@ packages: resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} dev: false - /electron-to-chromium/1.3.717: - resolution: {integrity: sha512-OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ==} + /electron-to-chromium/1.3.722: + resolution: {integrity: sha512-aAsc906l0RBsVTsGTK+KirVfey9eNtxyejdkbNzkISGxb7AFna3Kf0qvsp8tMttzBt9Bz3HddtYQ+++/PZtRYA==} dev: true /emoji-regex/7.0.3: @@ -1599,13 +1598,13 @@ packages: engines: {node: '>=8'} dev: true - /eslint-config-prettier/8.2.0_eslint@7.24.0: - resolution: {integrity: sha512-dWV9EVeSo2qodOPi1iBYU/x6F6diHv8uujxbxr77xExs3zTAlNXvVZKiyLsQGNz7yPV2K49JY5WjPzNIuDc2Bw==} + /eslint-config-prettier/8.3.0_eslint@7.25.0: + resolution: {integrity: sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 7.24.0 + eslint: 7.25.0 dev: true /eslint-import-resolver-node/0.3.4: @@ -1623,7 +1622,7 @@ packages: pkg-dir: 2.0.0 dev: true - /eslint-plugin-import/2.22.1_eslint@7.24.0: + /eslint-plugin-import/2.22.1_eslint@7.25.0: resolution: {integrity: sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==} engines: {node: '>=4'} peerDependencies: @@ -1634,7 +1633,7 @@ packages: contains-path: 0.1.0 debug: 2.6.9 doctrine: 1.5.0 - eslint: 7.24.0 + eslint: 7.25.0 eslint-import-resolver-node: 0.3.4 eslint-module-utils: 2.6.0 has: 1.0.3 @@ -1645,7 +1644,7 @@ packages: tsconfig-paths: 3.9.0 dev: true - /eslint-plugin-prettier/3.4.0_64fa1aa96df95a5df14fce32631d8e89: + /eslint-plugin-prettier/3.4.0_ed07edc0d33fb90bb2bebf56b9b5e0f9: resolution: {integrity: sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==} engines: {node: '>=6.0.0'} peerDependencies: @@ -1656,8 +1655,8 @@ packages: eslint-config-prettier: optional: true dependencies: - eslint: 7.24.0 - eslint-config-prettier: 8.2.0_eslint@7.24.0 + eslint: 7.25.0 + eslint-config-prettier: 8.3.0_eslint@7.25.0 prettier: 2.2.1 prettier-linter-helpers: 1.0.0 dev: true @@ -1687,15 +1686,15 @@ packages: engines: {node: '>=10'} dev: true - /eslint/7.24.0: - resolution: {integrity: sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==} + /eslint/7.25.0: + resolution: {integrity: sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==} engines: {node: ^10.12.0 || >=12.0.0} hasBin: true dependencies: '@babel/code-frame': 7.12.11 '@eslint/eslintrc': 0.4.0 ajv: 6.12.6 - chalk: 4.1.0 + chalk: 4.1.1 cross-spawn: 7.0.3 debug: 4.3.1 doctrine: 3.0.0 @@ -1726,7 +1725,7 @@ packages: semver: 7.3.5 strip-ansi: 6.0.0 strip-json-comments: 3.1.1 - table: 6.3.2 + table: 6.6.0 text-table: 0.2.0 v8-compile-cache: 2.3.0 transitivePeerDependencies: @@ -2389,8 +2388,8 @@ packages: ci-info: 2.0.0 dev: true - /is-core-module/2.2.0: - resolution: {integrity: sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==} + /is-core-module/2.3.0: + resolution: {integrity: sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==} dependencies: has: 1.0.3 dev: true @@ -3661,7 +3660,7 @@ packages: /resolve/1.20.0: resolution: {integrity: sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==} dependencies: - is-core-module: 2.2.0 + is-core-module: 2.3.0 path-parse: 1.0.6 dev: true @@ -4090,19 +4089,17 @@ packages: has-flag: 4.0.0 dev: true - /table/6.3.2: - resolution: {integrity: sha512-I9/Ca6Huf2oxFag7crD0DhA+arIdfLtWunSn0NIXSzjtUlDgIBGVZY7SsMkNPNT3Psd/z4gza0nuEpmra9eRbg==} + /table/6.6.0: + resolution: {integrity: sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==} engines: {node: '>=10.0.0'} dependencies: - ajv: 8.1.0 - is-boolean-object: 1.1.0 - is-number-object: 1.0.4 - is-string: 1.0.5 + ajv: 8.2.0 lodash.clonedeep: 4.5.0 lodash.flatten: 4.4.0 lodash.truncate: 4.4.2 slice-ansi: 4.0.0 string-width: 4.2.2 + strip-ansi: 6.0.0 dev: true /tap-mocha-reporter/5.0.1: @@ -4138,8 +4135,8 @@ packages: yaml: 1.10.2 dev: true - /tap/15.0.4_ts-node@9.1.1+typescript@4.2.4: - resolution: {integrity: sha512-OCOm+CaXU1OleruihHk/9pX3xFYFfwQIEo+mbSsMZTIqG2b8qMrzJ/g3+3cEWx63/2u7SYJQ5/TwmYfFLElHbQ==} + /tap/15.0.5_ts-node@9.1.1+typescript@4.2.4: + resolution: {integrity: sha512-9txwiDv7Sj8e4O15bjWtjSsPSJOiBGFbQj8gW0Wc7GXPXe6Zy46q9Eax71Ez7gAwhElnu7f9qgtfiCYzH8U2/w==} engines: {node: '>=10'} hasBin: true peerDependencies: diff --git a/server/src/logger.ts b/server/src/logger.ts index 0cb89d42c..5c6854840 100644 --- a/server/src/logger.ts +++ b/server/src/logger.ts @@ -1,4 +1,4 @@ -import winston, { format, LeveledLogMethod, Logger, transports } from "winston"; +import winston, { format, transports } from "winston"; import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import { FormatUserDoc } from "./core/format-user"; import { KtLogger } from "./types"; diff --git a/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts b/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts index c9a940b77..3a198ac5b 100644 --- a/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts +++ b/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts @@ -213,10 +213,10 @@ async function EamScoreConverterWrapper( return err; } else if (err instanceof ScoreImportFatalError) { throw err; // throw it all the way up. - } else { - logger.error(`Unknown error: `, { err }); - return new InternalFailure("An unknown internal failure has occured."); } + + logger.error(`Unknown error: `, { err }); + return new InternalFailure("An unknown internal failure has occured."); } }