fix: error handling

cardboard-ink · May 8, 2024 · e1bc9f7 · e1bc9f7
1 parent e4bb78f
commit e1bc9f7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/app/src/controllers/server-banner.controller.ts b/app/src/controllers/server-banner.controller.ts
@@ -6,7 +6,7 @@ export const serverBannerController = new Elysia()
         if (await serverBannerBucket.checkAssetExists(params.id)) {
             const lastModified = await serverBannerBucket.getAssetLastModified(params.id)
             if (Date.now() - lastModified.valueOf() > 24 * 60 * 60 * 1000) {
-                guildedServerProfileScrape(params.id, 'banner')
+                (async () => guildedServerProfileScrape(params.id, 'banner'))().catch((e) => console.error(e))
             }
             const banner = await serverBannerBucket.getAsset(params.id)
             return new Response(await streamToBuffer(banner), { headers: { 'Content-Type': 'image/webp' } })

diff --git a/app/src/controllers/server-icon.controller.ts b/app/src/controllers/server-icon.controller.ts
@@ -6,7 +6,7 @@ export const serverIconController = new Elysia()
         if (await serverIconBucket.checkAssetExists(params.id)) {
             const lastModified = await serverIconBucket.getAssetLastModified(params.id)
             if (Date.now() - lastModified.valueOf() > 24 * 60 * 60 * 1000) {
-                guildedServerProfileScrape(params.id, 'icon')
+                (async () => guildedServerProfileScrape(params.id, 'icon'))().catch((e) => console.error(e))
             }
             const avatar = await serverIconBucket.getAsset(params.id)
             const res = new Response(await streamToBuffer(avatar), { headers: { 'Content-Type': 'image/webp' } })

diff --git a/app/src/controllers/user-avatar.controller.ts b/app/src/controllers/user-avatar.controller.ts
@@ -7,8 +7,7 @@ export const userAvatarController = new Elysia()
             console.log('User avatar exists')
             const lastModified = await userAvatarBucket.getAssetLastModified(params.id)
             if (Date.now() - lastModified.valueOf() > 24 * 60 * 60 * 1000) {
-                console.log('User avatar is older than 24 hours')
-                guildedUserProfileScrape(params.id, 'avatar')
+                (async () => guildedUserProfileScrape(params.id, 'avatar'))().catch((e) => console.error(e))
             }
             console.log('Sending cached avatar')
             const avatar = await userAvatarBucket.getAsset(params.id)

diff --git a/app/src/controllers/user-banner.controller.ts b/app/src/controllers/user-banner.controller.ts
@@ -6,7 +6,7 @@ export const userBannerController = new Elysia()
         if (await userBannerBucket.checkAssetExists(params.id)) {
             const lastModified = await userBannerBucket.getAssetLastModified(params.id)
             if (Date.now() - lastModified.valueOf() > 24 * 60 * 60 * 1000) {
-                guildedUserProfileScrape(params.id, 'banner')
+                (async () => guildedUserProfileScrape(params.id, 'banner'))().catch((e) => console.error(e))
             }
             const banner = await userBannerBucket.getAsset(params.id)
             return new Response(await streamToBuffer(banner), { headers: { 'Content-Type': 'image/webp' } })

diff --git a/app/src/libs/guilded-scrape.ts b/app/src/libs/guilded-scrape.ts
@@ -25,7 +25,7 @@ export const guildedUserProfileScrape: (id: string, getElement: 'avatar' | 'bann
         }),
         keepalive: false
     })).json()
-    if (!signed) {
+    if (!signed || !signed.urlSignatures || !signed.urlSignatures[0] || !signed.urlSignatures[0].url) {
         return new Error('Failed to sign URL')
     }
     const signedSrc = signed.urlSignatures[0].url
@@ -56,7 +56,7 @@ export const guildedServerProfileScrape: (id: string, getElement: 'icon' | 'bann
             }),
             keepalive: false
         })).json()
-        if (!signed) {
+        if (!signed || !signed.urlSignatures || !signed.urlSignatures[0] || !signed.urlSignatures[0].url) {
             return new Error('Failed to sign URL')
         }
         const signedSrc = signed.urlSignatures[0].url