fix: update parse-duration

kukhariev · Jun 10, 2023 · 414b1fd · 414b1fd
1 parent a43b2f5
commit 414b1fd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "bytes": "^3.1.0",
     "multiparty": "^4.2.2",
-    "parse-duration": "^1.0.0"
+    "parse-duration": "^1.1.0"
   },
   "devDependencies": {
     "@types/bytes": "3.1.1",

diff --git a/packages/core/src/utils/primitives.ts b/packages/core/src/utils/primitives.ts
@@ -87,17 +87,18 @@ export function extendObject<T extends Record<any, any>>(target: T, ...sources:
 /**
  * Convert a human-readable duration to ms
  */
-export function toMilliseconds(value: string | number | undefined): number | null {
+export function toMilliseconds(value: string | number | undefined): number | undefined {
   if (isNumber(value)) return value;
-  if (!value) return null;
+  if (!value) return undefined;
   return duration(value);
 }
 /**
  * Convert a human-readable duration to seconds
  */
-export function toSeconds(value: string | number): number {
+export function toSeconds(value: string | number): number | undefined {
   if (isNumber(value)) return value;
-  return duration(value, 'sec');
+  const s = duration(value, 'sec');
+  return s ? ~~s : s;
 }
 
 /**

diff --git a/packages/s3/src/s3-storage.ts b/packages/s3/src/s3-storage.ts
@@ -284,7 +284,7 @@ export class S3Storage extends BaseStorage<S3File> {
     file.partSize ??= this._partSize;
     const partsNum = ~~(file.size / this._partSize) + 1;
     const promises = [];
-    const expiresIn = ~~toSeconds(this.config.expiration?.maxAge || '6hrs');
+    const expiresIn = toSeconds(this.config.expiration?.maxAge || '6hrs');
     for (let i = 0; i < partsNum; i++) {
       const partCommandInput = {
         Bucket: this.bucket,