fix: set response type as arraybuffer when downloading file content

jgazeau · Nov 12, 2023 · 71e85ec · 71e85ec
1 parent 480991b
commit 71e85ec
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 16 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,4 @@
 # Test ignores
 test/**/*.md
-test/**/*.json
+test/**/*.json
+*.md
diff --git a/README.md b/README.md
@@ -92,9 +92,9 @@ The generated file has the following characteristics:
 ```json
 [
   {
-    "package": "asset1Package",
-    "name": "asset1",
+    "package": "package1",
     "hold": false,
+    "name": "asset1",
     "localPath": "path/asset1.min.js",
     "assetManager": {
       "name": "cdnjs",
@@ -104,16 +104,39 @@ The generated file has the following characteristics:
     "currentVersion": "0.0.1"
   },
   {
-    "package": "asset2Package",
-    "name": "asset2",
+    "package": "package2",
     "hold": false,
+    "name": "asset2",
     "localPath": "./path/asset2.min.js",
     "assetManager": {
       "name": "github",
       "owner": "owner",
       "repository": "repository",
       "filePath": "dir/asset2.min.js"
     }
+  },
+  {
+    "package": "package3",
+    "hold": false,
+    "name": "asset3",
+    "localPath": "./path/asset3.min.js",
+    "assetManager": {
+      "name": "unpkg",
+      "library": "asset3",
+      "filePath": "dist/asset3.min.js"
+    }
+  },
+  {
+    "package": "package4",
+    "hold": false,
+    "name": "asset4",
+    "localPath": "./path/asset4.min.js",
+    "assetManager": {
+      "name": "jsdelivr",
+      "cdn": "npm",
+      "package": "asset4",
+      "filePath": "dist/asset4.min.js"
+    }
   }
 ]
 ```

diff --git a/src/model/assetManagers/cdnjs.ts b/src/model/assetManagers/cdnjs.ts
@@ -9,7 +9,6 @@ const CDNJS_API_URL = 'https://api.cdnjs.com';
 const CDNJS_LIBRARIES_PATH = 'libraries';
 const CDNJS_LIBS_HOST = 'https://cdnjs.cloudflare.com';
 const CDNJS_LIBS_ROOT_PATH = 'ajax/libs';
-const CDNJS_LIBS_ENCODING = 'utf-8';
 
 export class Cdnjs extends AssetManager {
   @IsDefined()
@@ -64,16 +63,15 @@ export class Cdnjs extends AssetManager {
       maxContentLength: 100000000,
       maxBodyLength: 100000000,
       method: 'get',
+      responseType: 'arraybuffer',
       url: url,
     })
       .then((response: any) => {
         if (response.data) {
-          return Promise.resolve(
-            Buffer.from(response.data, CDNJS_LIBS_ENCODING)
-          );
+          return Promise.resolve(Buffer.from(response.data));
         } else {
           throw new BmycError(
-            `Cannot get content of library ${this.fileName} (${assetVersion})`
+            `Cannot get content of ${this.fileName} (${assetVersion})`
           );
         }
       })

diff --git a/src/model/assetManagers/jsdelivr.ts b/src/model/assetManagers/jsdelivr.ts
@@ -69,10 +69,17 @@ export class Jsdelivr extends AssetManager {
     const url = `${JSDELIVR_DATA_URL}/${this.cdn}/${this.package}@${assetVersion}/${this.filePath}`;
     return axios({
       method: 'get',
+      responseType: 'arraybuffer',
       url: url,
     })
       .then((response: any) => {
-        return Promise.resolve(response.data);
+        if (response.data) {
+          return Promise.resolve(Buffer.from(response.data));
+        } else {
+          throw new BmycError(
+            `Cannot get content of ${this.filePath} (${assetVersion})`
+          );
+        }
       })
       .catch((error: Error) => {
         throw new BmycError(`${url}:\n${error.message}`);

diff --git a/src/model/assetManagers/unpkg.ts b/src/model/assetManagers/unpkg.ts
@@ -60,10 +60,17 @@ export class Unpkg extends AssetManager {
     const url = `${UNPKG_API_URL}/${this.library}@${assetVersion}/${this.filePath}`;
     return axios({
       method: 'get',
+      responseType: 'arraybuffer',
       url: url,
     })
       .then((response: any) => {
-        return Promise.resolve(response.data);
+        if (response.data) {
+          return Promise.resolve(Buffer.from(response.data));
+        } else {
+          throw new BmycError(
+            `Cannot get content of ${this.filePath} (${assetVersion})`
+          );
+        }
       })
       .catch((error: Error) => {
         throw new BmycError(`${url}:\n${error.message}`);

diff --git a/tempDirectory/tempSubdir/bmyc-github-content-ok.js b/tempDirectory/tempSubdir/bmyc-github-content-ok.js
diff --git a/tempDirectory/tempSubdir/bmyc-unpkg-axios-ok.js b/tempDirectory/tempSubdir/bmyc-unpkg-axios-ok.js
diff --git a/test/resources/config-ok.json b/test/resources/config-ok.json
@@ -30,8 +30,8 @@
     "localPath": "./path/asset3.min.js",
     "assetManager": {
       "name": "unpkg",
-      "library": "axios",
-      "filePath": "dist/axios.min.js"
+      "library": "asset3",
+      "filePath": "dist/asset3.min.js"
     }
   },
   {
@@ -42,8 +42,8 @@
     "assetManager": {
       "name": "jsdelivr",
       "cdn": "npm",
-      "package": "axios",
-      "filePath": "dist/axios.min.js"
+      "package": "asset4",
+      "filePath": "dist/asset4.min.js"
     }
   }
 ]