fix: requestErrorHandler to fetchQuery calls

Signed-off-by: Innei <i@innei.in>
Innei · Feb 4, 2024 · 8844c36 · 8844c36
1 parent 5499991
commit 8844c36
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/app/(app)/(page-detail)/[slug]/layout.tsx b/src/app/(app)/(page-detail)/[slug]/layout.tsx
@@ -10,6 +10,7 @@ import { attachUAAndRealIp } from '~/lib/attach-ua'
 import { getOgUrl } from '~/lib/helper.server'
 import { getSummaryFromMd } from '~/lib/markdown'
 import { getQueryClient } from '~/lib/query-client.server'
+import { requestErrorHandler } from '~/lib/request.server'
 import { CurrentPageDataProvider } from '~/providers/page/CurrentPageDataProvider'
 import { LayoutRightSideProvider } from '~/providers/shared/LayoutRightSideProvider'
 import { queries } from '~/queries/definition'
@@ -24,9 +25,9 @@ import {
 
 const getData = async (params: PageParams) => {
   attachUAAndRealIp()
-  const data = await getQueryClient().fetchQuery(
-    queries.page.bySlug(params.slug),
-  )
+  const data = await getQueryClient()
+    .fetchQuery(queries.page.bySlug(params.slug))
+    .catch(requestErrorHandler)
   return data
 }
 

diff --git a/src/app/not-found.tsx → src/app/(app)/not-found.tsx b/src/app/not-found.tsx → src/app/(app)/not-found.tsx
diff --git a/src/app/(app)/posts/(post-detail)/[category]/[slug]/layout.tsx b/src/app/(app)/posts/(post-detail)/[category]/[slug]/layout.tsx
@@ -10,6 +10,7 @@ import { attachUAAndRealIp } from '~/lib/attach-ua'
 import { getOgUrl } from '~/lib/helper.server'
 import { getSummaryFromMd } from '~/lib/markdown'
 import { getQueryClient } from '~/lib/query-client.server'
+import { requestErrorHandler } from '~/lib/request.server'
 import { CurrentPostDataProvider } from '~/providers/post/CurrentPostDataProvider'
 import { LayoutRightSideProvider } from '~/providers/shared/LayoutRightSideProvider'
 import { queries } from '~/queries/definition'
@@ -19,9 +20,9 @@ import PostPage from './pageImpl'
 const getData = async (params: PageParams) => {
   const { category, slug } = params
   attachUAAndRealIp()
-  const data = await getQueryClient().fetchQuery(
-    queries.post.bySlug(category, slug),
-  )
+  const data = await getQueryClient()
+    .fetchQuery(queries.post.bySlug(category, slug))
+    .catch(requestErrorHandler)
   return data
 }
 export const generateMetadata = async ({

diff --git a/src/lib/request.server.ts b/src/lib/request.server.ts
@@ -5,7 +5,10 @@ import { notFound } from 'next/navigation'
 import { RequestError } from '@mx-space/api-client'
 
 export const requestErrorHandler = (error: Error | RequestError) => {
-  if (error instanceof RequestError && error.status === 404) {
+  if (
+    error instanceof RequestError &&
+    (error.status === 404 || error.raw?.response?.status === 404)
+  ) {
     return notFound()
   }
   throw error