fix crashing when image download fails

hfxbse · May 14, 2024 · ba32de6 · ba32de6
1 parent b7c81fe
commit ba32de6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/src/cli/graph.ts b/src/cli/graph.ts
@@ -14,14 +14,13 @@ export async function settleGraph(graph: UnsettledUserGraph) {
             profile: {
                 ...user.profile,
                 image: await user.profile.image
-                    .then(blobToDataUrl)
-                    .catch((reason: any) => {
-                        console.error({
-                            message: `Failed to download profile picture. (User: ${user.profile.username})`,
-                            reason
-                        })
+                    .then((image: Blob | null) => {
+                        if (!image) {
+                            console.error(`Failed to download profile picture. (User: ${user.profile.username})`)
+                            return null;
+                        }
 
-                        return null;
+                        return blobToDataUrl(image)
                     })
             }
         }

diff --git a/src/instagram/user.ts b/src/instagram/user.ts
@@ -72,18 +72,24 @@ export async function fetchUser(username: string, session?: SessionData): Promis
     return mapped;
 }
 
-export async function downloadProfilePicture(source: string | undefined): Promise<Blob> | null {
+export async function downloadProfilePicture(source: string | undefined): Promise<Blob | null> {
     if (!source) return null
 
-    const response = await fetch(source, {
-        headers: {
-            "Sec-Fetch-Site": "same-origin",
+    try {
+        const response = await fetch(source, {
+            headers: {
+                "Sec-Fetch-Site": "same-origin",
+            }
+        })
+
+        if (!response.ok) {
+            await response.text().then(console.error, () => {})
+            return null
         }
-    })
 
-    if (!response.ok) {
-        throw Error(await response.text())
+        return await response.blob()
+    } catch (e) {
+        return null
     }
 
-    return await response.blob()
 }