diff --git a/backend/package.json b/backend/package.json index 4bfcd9e..8769f57 100644 --- a/backend/package.json +++ b/backend/package.json @@ -65,7 +65,6 @@ "@nestjs/testing": "^9.2.1", "@types/bcrypt": "^5.0.0", "@types/cors": "^2.8.13", - "@types/ms": "^0.7.31", "@types/multer": "^1.4.7", "@types/node": "^18.11.17", "@types/passport-jwt": "^3.0.8", diff --git a/backend/src/config/late/jwt.config.service.ts b/backend/src/config/late/jwt.config.service.ts index 9856127..966178d 100644 --- a/backend/src/config/late/jwt.config.service.ts +++ b/backend/src/config/late/jwt.config.service.ts @@ -32,8 +32,8 @@ export class JwtConfigService implements JwtOptionsFactory { await this.prefService.getStringPreference('jwt_expires_in'), ); - let milliseconds = ms(expiresIn); - if (milliseconds === undefined) { + let milliseconds = ms(expiresIn as any); + if (isNaN(milliseconds)) { milliseconds = 1000 * 60 * 60 * 24; // 1 day } diff --git a/backend/src/managers/image/image-converter.service.ts b/backend/src/managers/image/image-converter.service.ts index 358fa96..9372856 100644 --- a/backend/src/managers/image/image-converter.service.ts +++ b/backend/src/managers/image/image-converter.service.ts @@ -3,7 +3,7 @@ import ms from 'ms'; import { ImageRequestParams } from 'picsur-shared/dist/dto/api/image.dto'; import { FileType, - SupportedFileTypeCategory, + SupportedFileTypeCategory } from 'picsur-shared/dist/dto/mimes.dto'; import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum'; import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types'; @@ -57,7 +57,8 @@ export class ImageConverterService { if (HasFailed(memLimit) || HasFailed(timeLimit)) { return Fail(FT.Internal, 'Failed to get conversion limits'); } - const timeLimitMS = ms(timeLimit); + let timeLimitMS = ms(timeLimit as any); + if (isNaN(timeLimitMS)) timeLimitMS = 15 * 1000; // 15 seconds const sharpWrapper = new SharpWrapper(timeLimitMS, memLimit); const sharpOptions: SharpOptions = { diff --git a/backend/src/managers/image/image.module.ts b/backend/src/managers/image/image.module.ts index 8060597..e8d0df2 100644 --- a/backend/src/managers/image/image.module.ts +++ b/backend/src/managers/image/image.module.ts @@ -53,8 +53,8 @@ export class ImageManagerModule implements OnModuleInit, OnModuleDestroy { return; } - const after_ms = ms(remove_derivatives_after); - if (after_ms === 0) { + const after_ms = ms(remove_derivatives_after as any); + if (isNaN(after_ms) || after_ms === 0) { this.logger.log('remove_derivatives_after is 0, skipping cron'); return; } diff --git a/package.json b/package.json index 7eb0e77..7fd74bd 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "terser": ">=5.14.2", "typeorm": ">=0.3.9", "typescript": "~4.8.2", + "ms": "3.0.0-canary.1", "fastify-static": "npm:@fastify/static@*", "fastify-formbody": "npm:@fastify/formbody@*", "minimist": "npm:minimist-lite@*" diff --git a/yarn.lock b/yarn.lock index 540a34c..17e9fe2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3544,13 +3544,6 @@ __metadata: languageName: node linkType: hard -"@types/ms@npm:^0.7.31": - version: 0.7.31 - resolution: "@types/ms@npm:0.7.31" - checksum: daadd354aedde024cce6f5aa873fefe7b71b22cd0e28632a69e8b677aeb48ae8caa1c60e5919bb781df040d116b01cb4316335167a3fc0ef6a63fa3614c0f6da - languageName: node - linkType: hard - "@types/multer@npm:^1.4.7": version: 1.4.7 resolution: "@types/multer@npm:1.4.7" @@ -8352,24 +8345,10 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.0.0": - version: 2.0.0 - resolution: "ms@npm:2.0.0" - checksum: 0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4 - languageName: node - linkType: hard - -"ms@npm:2.1.2": - version: 2.1.2 - resolution: "ms@npm:2.1.2" - checksum: 673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f - languageName: node - linkType: hard - -"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1, ms@npm:^2.1.3": - version: 2.1.3 - resolution: "ms@npm:2.1.3" - checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d +"ms@npm:3.0.0-canary.1": + version: 3.0.0-canary.1 + resolution: "ms@npm:3.0.0-canary.1" + checksum: 5ec76c0932cf83ac3e7f70f1a4c0d4db4dbc91de6ea5f7d336c67b48f513c8cb4c0fce3a07e3d84ee931dbdc9a48f33ed1c485e834279fff8906d385e86684ae languageName: node linkType: hard @@ -9395,7 +9374,6 @@ __metadata: "@nestjs/typeorm": ^9.0.1 "@types/bcrypt": ^5.0.0 "@types/cors": ^2.8.13 - "@types/ms": ^0.7.31 "@types/multer": ^1.4.7 "@types/node": ^18.11.17 "@types/passport-jwt": ^3.0.8