Merge pull request #590 from dappforce/deploy/revalidate

Fix revalidation try catch

src/hooks/useWaitHasEnergy.ts

@@ -1,3 +1,4 @@
+import { ESTIMATED_ENERGY_FOR_ONE_TX } from '@/constants/subsocial'
 import { useMyAccount } from '@/stores/my-account'
 import { currentNetwork } from '@/utils/network'
 import { useCallback, useEffect, useRef } from 'react'
@@ -32,7 +33,11 @@ export default function useWaitHasEnergy(
   }, [timeout, resubscribeEnergy])
 
   useEffect(() => {
-    if (!energy || energy <= 0 || hasEnergyResolvers.current.length === 0)
+    if (
+      !energy ||
+      energy < ESTIMATED_ENERGY_FOR_ONE_TX ||
+      hasEnergyResolvers.current.length === 0
+    )
       return
     function resolveAllPending() {
       hasEnergyResolvers.current.forEach((resolve) => resolve())

src/pages/api/posts.ts

@@ -101,17 +101,22 @@ export async function getPostsServer(postIds: string[]): Promise<PostData[]> {
   })
 
   const metadataMap: Record<string, LinkMetadata> = {}
-  const metadataPromises = Array.from(linksToFetch).map(async (link) => {
+  const metadataPromises = Array.from(linksToFetch).map((link) => {
     // link fetching itself has timeout of 20_000, but for data fetching, it faster timeout
     // if it needs more than 8s, the post fetching is not delayed, but it will still be fetched and put to redis
     // so that in the next fetch, it will have the correct data from the redis
-    try {
-      setTimeout(() => {
-        throw new Error('Link metadata fetching timeout')
-      }, 8_000)
+    async function getMetadata() {
       const metadata = await getLinkMetadata(link)
       if (metadata) metadataMap[link] = metadata
-    } catch {}
+    }
+    return new Promise((resolve, reject) => {
+      setTimeout(() => {
+        reject('Link metadata fetching timeout')
+      }, 8_000)
+      getMetadata().then(() => {
+        resolve(null)
+      }, reject)
+    })
   })
   await Promise.allSettled(metadataPromises)
 
@@ -164,7 +169,7 @@ export async function getLinkMetadata(
     )
     return parsedMetadata
   } catch (err) {
-    console.error('Error fetching page metadata for link: ', link)
+    console.error('Error fetching link metadata for link: ', link)
     redisCallWrapper((redis) =>
       redis?.set(
         getMetadataRedisKey(link),