fix: 🐛 loadFromURL for application/octet-stream Content-Type (#69)

* fix: 🐛 loadFromURL for application/octet-stream Content-Type * chore: 🤖 update error message
dotlottie · Apr 24, 2024 · a83b8f5 · a83b8f5
1 parent f1a4e63
commit a83b8f5
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/packages/dotlottie-js/src/common/utils.ts b/packages/dotlottie-js/src/common/utils.ts
@@ -564,9 +564,9 @@ export async function loadFromURL(src: string): Promise<Uint8Array> {
 
   const contentType = response.headers.get('content-type');
 
-  if (!contentType?.includes('application/zip')) {
+  if (!['application/zip', 'application/octet-stream'].includes(contentType || '')) {
     throw new DotLottieError(
-      'Invalid content type provided for .lottie file, expected application/zip',
+      `Invalid content type for .lottie file, expected application/zip or application/octet-stream, received ${contentType}`,
       ErrorCodes.INVALID_DOTLOTTIE,
     );
   }

diff --git a/packages/dotlottie-js/src/tests/utils-browser.spec.ts b/packages/dotlottie-js/src/tests/utils-browser.spec.ts
@@ -75,12 +75,27 @@ describe('loadFromUrl', () => {
 
     await expectAsync(loadFromURL(dotLottieURL)).toBeRejectedWith(
       new DotLottieError(
-        'Invalid content type provided for .lottie file, expected application/zip',
+        'Invalid content type for .lottie file, expected application/zip or application/octet-stream, received text/html',
         ErrorCodes.INVALID_DOTLOTTIE,
       ),
     );
   });
 
+  it('loads a dotlottie from a url with content-type application/octet-stream', async () => {
+    const fetchSpy = spyOn(typeof window === 'undefined' ? global : window, 'fetch').and.returnValue(
+      Promise.resolve(new Response(dotLottieAnimation, { headers: { 'content-type': 'application/octet-stream' } })),
+    );
+
+    const dotLottieURL = 'https://lottiefiles.fake/animation/animation.lottie';
+
+    const dotLottie = await loadFromURL(dotLottieURL);
+
+    expect(dotLottie).toBeDefined();
+    expect(dotLottie).toBeInstanceOf(Uint8Array);
+
+    expect(fetchSpy).toHaveBeenCalledWith(dotLottieURL);
+  });
+
   it('loads a dotlottie from a url', async () => {
     const fetchSpy = spyOn(typeof window === 'undefined' ? global : window, 'fetch').and.returnValue(
       Promise.resolve(new Response(dotLottieAnimation, { headers: { 'content-type': 'application/zip' } })),

diff --git a/packages/dotlottie-js/src/tests/utils-node.spec.ts b/packages/dotlottie-js/src/tests/utils-node.spec.ts
@@ -75,12 +75,27 @@ describe('loadFromUrl', () => {
 
     await expectAsync(loadFromURL(dotLottieURL)).toBeRejectedWith(
       new DotLottieError(
-        'Invalid content type provided for .lottie file, expected application/zip',
+        'Invalid content type for .lottie file, expected application/zip or application/octet-stream, received text/html',
         ErrorCodes.INVALID_DOTLOTTIE,
       ),
     );
   });
 
+  it('loads a dotlottie from a url with content-type application/octet-stream', async () => {
+    const fetchSpy = spyOn(typeof window === 'undefined' ? global : window, 'fetch').and.returnValue(
+      Promise.resolve(new Response(dotLottieAnimation, { headers: { 'content-type': 'application/octet-stream' } })),
+    );
+
+    const dotLottieURL = 'https://lottiefiles.fake/animation/animation.lottie';
+
+    const dotLottie = await loadFromURL(dotLottieURL);
+
+    expect(dotLottie).toBeDefined();
+    expect(dotLottie).toBeInstanceOf(Uint8Array);
+
+    expect(fetchSpy).toHaveBeenCalledWith(dotLottieURL);
+  });
+
   it('loads a dotlottie from a url', async () => {
     const fetchSpy = spyOn(typeof window === 'undefined' ? global : window, 'fetch').and.returnValue(
       Promise.resolve(new Response(dotLottieAnimation, { headers: { 'content-type': 'application/zip' } })),