try to get filename from "Content-Disposition" header if present

Touffy · Mar 11, 2020 · 6864304 · 6864304
1 parent cee9ab2
commit 6864304
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/input.ts b/src/input.ts
@@ -23,10 +23,16 @@ export function normalizeInput(input: File | Response | BufferLike | StreamLike,
     modDate: modDate || new Date(input.lastModified),
     bytes: input.stream()
   }
-  if (input instanceof Response) return {
-    encodedName: encodedName || encodeString(new URL(input.url).pathname.split("/").pop()),
-    modDate: modDate || new Date(input.headers.get("Last-Modified")),
-    bytes: input.body
+  if (input instanceof Response) {
+    const contentDisposition = input.headers.get("content-disposition")
+    const filename = contentDisposition && contentDisposition.match(/;\s*filename\*?=["']?(.*?)["']?$/i)
+    const urlName = filename && filename[1] || new URL(input.url).pathname.split("/").pop()
+    const decoded = urlName && decodeURIComponent(urlName)
+    return {
+      encodedName: encodedName || encodeString(decoded || new URL(input.url).pathname.split("/").pop()),
+      modDate: modDate || new Date(input.headers.get("Last-Modified")),
+      bytes: input.body
+    }
   }
 
   if (!encodedName || encodedName.length === 0) throw new Error("The file must have a name.")