fix: get image by XHR

loo-y · Nov 4, 2023 · b6aa824 · b6aa824
1 parent 9ad2798
commit b6aa824
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/app/scripts/utils/fetches.ts b/app/scripts/utils/fetches.ts
@@ -140,6 +140,29 @@ export const fetchToGetImageBlob = async ({ imageUrl }: { imageUrl: string }): P
     return null
 }
 
+export const fetchToGetImageBlobByXHR = async ({ imageUrl }: { imageUrl: string }): Promise<null | Blob> => {
+    if (!imageUrl) return null
+    try {
+        const responseBlob = await new Promise<Blob | null>((resolve, reject) => {
+            const xhr = new XMLHttpRequest()
+            xhr.open('get', imageUrl)
+            xhr.responseType = 'blob'
+            xhr.onload = () => {
+                resolve(xhr.response as Blob)
+            }
+            xhr.send()
+            xhr.onerror = () => {
+                resolve(null)
+            }
+        })
+        await sleep(3 * Math.random())
+        return responseBlob
+    } catch (e) {
+        console.log(`fetchToGetImageBlobByXHR`, e)
+    }
+    return null
+}
+
 export const fetchToGetVideoBlob = async ({ videoUrl }: { videoUrl: string }): Promise<null | Blob> => {
     if (!videoUrl) return null
     try {
@@ -159,7 +182,7 @@ export const fetchToGetVideoBlob = async ({ videoUrl }: { videoUrl: string }): P
         await sleep(3 * Math.random())
         return respBlob
     } catch (e) {
-        console.log(`fetchToGetImageBlob`, e)
+        console.log(`fetchToGetVideoBlob`, e)
     }
     return null
 }
@@ -181,7 +204,7 @@ export const fetchToGetVideoBlobByXHR = async ({ videoUrl }: { videoUrl: string
         })
         return responseBlob
     } catch (e) {
-        console.log(`fetchToGetImageBlob`, e)
+        console.log(`fetchToGetVideoBlobByXHR`, e)
     }
     return null
 }
@@ -200,7 +223,7 @@ export const fetchToGetLongText = async ({ mblogId }: { mblogId?: string }) => {
         await sleep(3 * Math.random())
         return longTextContent || null
     } catch (e) {
-        console.log(`fetchToGetImageBlob`, e)
+        console.log(`fetchToGetLongText`, e)
     }
     return null
 }
diff --git a/app/scripts/utils/tools.ts b/app/scripts/utils/tools.ts
@@ -1,7 +1,7 @@
 import JSZip from 'jszip'
 const FileSaver = require('file-saver')
 import _ from 'lodash'
-import { fetchToGetImageBlob, fetchToGetVideoBlobByXHR, fetchToGetLongText } from './fetches'
+import { fetchToGetImageBlob, fetchToGetImageBlobByXHR, fetchToGetVideoBlobByXHR, fetchToGetLongText } from './fetches'
 import { favIcon32 } from './constants'
 
 // watch Element by MutationObserver
@@ -208,7 +208,7 @@ const convertBlogList = async ({
                     weiboCount: _count,
                     weiboPicCount: _count_pic_count,
                 })
-            const picBlob = await fetchToGetImageBlob({ imageUrl: picShow?.url })
+            const picBlob = await fetchToGetImageBlobByXHR({ imageUrl: picShow?.url })
             if (picBlob) {
                 imageFolder?.file(picShow.picName, picBlob)
             }
@@ -256,7 +256,7 @@ const convertBlogList = async ({
                         weiboCount: _count,
                         weiboPicCount: _count_pic_count,
                     })
-                const picBlob = await fetchToGetImageBlob({ imageUrl: retweetPicShow?.url })
+                const picBlob = await fetchToGetImageBlobByXHR({ imageUrl: retweetPicShow?.url })
                 if (picBlob) {
                     imageFolder?.file(retweetPicShow.picName, picBlob)
                 }
@@ -382,7 +382,7 @@ const convertBlogList = async ({
     const userPicUrl = userInfo?.avatar_hd || userInfo?.profile_image_url || userInfo?.avatar_large || undefined
     if (userPicUrl) {
         userInfo.picShow = matchImageOrVideoFromUrl(userPicUrl)
-        const picBlob = await fetchToGetImageBlob({ imageUrl: userPicUrl })
+        const picBlob = await fetchToGetImageBlobByXHR({ imageUrl: userPicUrl })
         if (picBlob) {
             imageFolder?.file(userInfo.picShow, picBlob)
         }