fix: 前台构建器减少初始化边缘情况引起的错误日志

Mereithhh · Aug 26, 2022 · f28525b · f28525b
1 parent 31fca3b
commit f28525b
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 35 deletions.
diff --git a/packages/website/api/addViewer.ts b/packages/website/api/addViewer.ts
@@ -17,7 +17,10 @@ export async function addViewer(pathname: string): Promise<any> {
     const res = await fetch(url, {
       method: "POST",
     });
-    const { data } = await res.json();
+    const { statusCode, data } = await res.json();
+    if (statusCode == 233) {
+      return { viewer: 0, visited: 0 };
+    }
     return data;
   } catch (err) {
     console.log(err);

diff --git a/packages/website/api/getAllData.ts b/packages/website/api/getAllData.ts
@@ -81,11 +81,53 @@ export interface PublicAllProp {
 }
 export const version = process.env["VAN_BLOG_VERSION"] || "dev";
 
+const defaultMeta: MetaProps = {
+  categories: [],
+  menus: [],
+  links: [],
+  socials: [],
+  rewards: [],
+  about: {
+    updatedAt: new Date().toISOString(),
+    content: "",
+  },
+  siteInfo: {
+    author: "作者名字",
+    authorDesc: "作者描述",
+    authorLogo: "/logo.svg",
+    siteLogo: "/logo.svg",
+    favicon: "/logo.svg",
+    siteName: "VanBlog",
+    siteDesc: "Vanblog",
+    beianNumber: "",
+    beianUrl: "",
+    payAliPay: "",
+    payWechat: "",
+    payAliPayDark: "",
+    payWechatDark: "",
+    since: "",
+    enableComment: "true",
+    baseUrl: "",
+    showDonateInfo: "true",
+    showFriends: "true",
+    showAdminButton: "true",
+  },
+};
+
 export async function getPublicMeta(): Promise<PublicMetaProp> {
   try {
     const url = `${config.baseUrl}api/public/meta`;
     const res = await fetch(url);
-    const { data } = await res.json();
+    const { statusCode, data } = await res.json();
+    if (statusCode == 233) {
+      return {
+        version: version,
+        totalWordCount: 0,
+        tags: [],
+        totalArticles: 0,
+        meta: defaultMeta,
+      };
+    }
     return data;
   } catch (err) {
     if (process.env.isBuild == "t") {
@@ -96,38 +138,7 @@ export async function getPublicMeta(): Promise<PublicMetaProp> {
         totalWordCount: 0,
         tags: [],
         totalArticles: 0,
-        meta: {
-          categories: [],
-          menus: [],
-          links: [],
-          socials: [],
-          rewards: [],
-          about: {
-            updatedAt: new Date().toISOString(),
-            content: "",
-          },
-          siteInfo: {
-            author: "作者名字",
-            authorDesc: "作者描述",
-            authorLogo: "",
-            siteLogo: "/logo.svg",
-            favicon: "/logo.svg",
-            siteName: "VanBlog",
-            siteDesc: "Vanblog",
-            beianNumber: "",
-            beianUrl: "",
-            payAliPay: "",
-            payWechat: "",
-            payAliPayDark: "",
-            payWechatDark: "",
-            since: "",
-            enableComment: "true",
-            baseUrl: "",
-            showDonateInfo: "true",
-            showFriends: "true",
-            showAdminButton: "true",
-          },
-        },
+        meta: defaultMeta,
       };
     } else {
       throw err;

diff --git a/packages/website/api/getArticles.ts b/packages/website/api/getArticles.ts
@@ -22,7 +22,10 @@ export const getArticlesByOption = async (
   try {
     const url = `${config.baseUrl}api/public/article?${queryString}`;
     const res = await fetch(url);
-    const { data } = await res.json();
+    const { statusCode, data } = await res.json();
+    if (statusCode == 233) {
+      return { articles: [], total: 0, totalWordCount: 0 };
+    }
     return data;
   } catch (err) {
     if (process.env.isBuild == "t") {