fix: respect global maxAge option as fallback

resolves #179
unjs · Oct 17, 2023 · 2abe014 · 2abe014
1 parent 2c33ece
commit 2abe014
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/ipx.ts b/src/ipx.ts
@@ -49,7 +49,7 @@ const SUPPORTED_FORMATS = new Set([
 export function createIPX(userOptions: IPXOptions): IPX {
   const options: IPXOptions = defu(userOptions, {
     alias: getEnv<Record<string, string>>("IPX_ALIAS") || {},
-    maxAge: getEnv<number>("IPX_MAX_AGE") || 300,
+    maxAge: getEnv<number>("IPX_MAX_AGE") ?? 60 /* 1 minute */,
     sharpOptions: {},
   } satisfies Omit<IPXOptions, "storage">);
 
@@ -110,11 +110,9 @@ export function createIPX(userOptions: IPXOptions): IPX {
           message: `Resource not found: ${id}`,
         });
       }
+      const _maxAge = sourceMeta.maxAge ?? options.maxAge;
       return {
-        maxAge:
-          typeof sourceMeta.maxAge === "string"
-            ? Number.parseInt(sourceMeta.maxAge)
-            : sourceMeta.maxAge,
+        maxAge: typeof _maxAge === "string" ? parseInt(_maxAge) : _maxAge,
         mtime: sourceMeta.mtime ? new Date(sourceMeta.mtime) : undefined,
       } satisfies IPXSourceMeta;
     });