hsu-utils 0.0.52 → 0.0.54

package/dist/hsu-utils.min.js.LICENSE.txt

@@ -1,6 +1,6 @@
 /*!
  * 
- * hsu-utils v0.0.51
+ * hsu-utils v0.0.53
  *
  * some front-end utils
  *

package/es/DownloadFile/index.d.ts

@@ -1 +1,8 @@
+type ResponseLike = Response | {
+    headers: Record<string, string> | {
+        get(name: string): string | null;
+    };
+};
+export declare function getFileNameFromHeader(response: ResponseLike): string | null;
 export default function downloadFile(file: ArrayBuffer | Blob | string, fileName?: string, signal?: AbortSignal): Promise<void>;
+export {};

package/es/DownloadFile/index.js

@@ -8,12 +8,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { Typeof } from '..';
+export function getFileNameFromHeader(response) {
+    let contentDisposition = null;
+    if (response.headers && typeof response.headers.get === 'function') {
+        contentDisposition = response.headers.get('Content-Disposition');
+    }
+    else if (response.headers && typeof response.headers === 'object') {
+        const headers = response.headers;
+        contentDisposition = headers['content-disposition'] || headers['Content-Disposition'] || null;
+    }
+    if (!contentDisposition) {
+        return null;
+    }
+    const filenameStarMatch = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i);
+    if (filenameStarMatch) {
+        return decodeURIComponent(filenameStarMatch[1]);
+    }
+    const filenameMatch = contentDisposition.match(/filename=["']?([^;"']+)["']?/i);
+    if (filenameMatch) {
+        return decodeURIComponent(filenameMatch[1]);
+    }
+    return null;
+}
 function downloadFileByUrl(url, fileName, signal) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const response = yield fetch(url, { signal });
+            let finalFileName = fileName;
+            if (!finalFileName) {
+                finalFileName = getFileNameFromHeader(response) || undefined;
+            }
             const arrayBuffer = yield response.arrayBuffer();
-            downloadFile(arrayBuffer, fileName);
+            downloadFile(arrayBuffer, finalFileName);
         }
         catch (error) {
             if ((error === null || error === void 0 ? void 0 : error.name) !== 'AbortError') {

package/lib/DownloadFile/index.d.ts

@@ -1 +1,8 @@
+type ResponseLike = Response | {
+    headers: Record<string, string> | {
+        get(name: string): string | null;
+    };
+};
+export declare function getFileNameFromHeader(response: ResponseLike): string | null;
 export default function downloadFile(file: ArrayBuffer | Blob | string, fileName?: string, signal?: AbortSignal): Promise<void>;
+export {};

package/lib/DownloadFile/index.js

@@ -36,10 +36,34 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFileNameFromHeader = void 0;
 var __1 = require("..");
+function getFileNameFromHeader(response) {
+    var contentDisposition = null;
+    if (response.headers && typeof response.headers.get === 'function') {
+        contentDisposition = response.headers.get('Content-Disposition');
+    }
+    else if (response.headers && typeof response.headers === 'object') {
+        var headers = response.headers;
+        contentDisposition = headers['content-disposition'] || headers['Content-Disposition'] || null;
+    }
+    if (!contentDisposition) {
+        return null;
+    }
+    var filenameStarMatch = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i);
+    if (filenameStarMatch) {
+        return decodeURIComponent(filenameStarMatch[1]);
+    }
+    var filenameMatch = contentDisposition.match(/filename=["']?([^;"']+)["']?/i);
+    if (filenameMatch) {
+        return decodeURIComponent(filenameMatch[1]);
+    }
+    return null;
+}
+exports.getFileNameFromHeader = getFileNameFromHeader;
 function downloadFileByUrl(url, fileName, signal) {
     return __awaiter(this, void 0, void 0, function () {
-        var response, arrayBuffer, error_1, downloadElement;
+        var response, finalFileName, arrayBuffer, error_1, downloadElement;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -47,10 +71,14 @@ function downloadFileByUrl(url, fileName, signal) {
                     return [4, fetch(url, { signal: signal })];
                 case 1:
                     response = _a.sent();
+                    finalFileName = fileName;
+                    if (!finalFileName) {
+                        finalFileName = getFileNameFromHeader(response) || undefined;
+                    }
                     return [4, response.arrayBuffer()];
                 case 2:
                     arrayBuffer = _a.sent();
-                    downloadFile(arrayBuffer, fileName);
+                    downloadFile(arrayBuffer, finalFileName);
                     return [3, 4];
                 case 3:
                     error_1 = _a.sent();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsu-utils",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "some front-end utils",
   "repository": "git@github.com:VitaTsui/hsu-utils.git",
   "author": "VitaHsu <vitahsu7@gmail.com>",