refactor: http to server. request

Author: rowthan

apps/web/const/notion.ts

@@ -7,8 +7,8 @@ export const SEO_MAP: Record<string, string> = {
 }
 
 export const databaseList = [
+    'd093839d-1d66-4880-811c-bb060627dd5d',// 博文列表
     'd8423c93-e14c-4089-97c0-eaa23eda1d71',// 地图数据源
-    '20a2d306f3b04b4da32dfa0ddf68ed4f',// 博文列表
     // 'fd2ef32a46bb42a69711f826cb70a267', // 地图
     // '5c0aa83127014f3791e9c66ce70687dc', // 发布历史
 ]

apps/web/pages/api/doc.ts

@@ -54,10 +54,9 @@ async function fetchDocByPath(path: string): Promise<string | null> {
     const queryResult = await queryIdByPathInDatabase(id,path);
     if(queryResult){
       console.log('从遍历数据源中获取ID',path,id)
+      return queryResult;
     }
-    return queryResult;
   }
-
   return null
 }
 
@@ -68,7 +67,7 @@ async function queryIdByPathInDatabase(databaseId: string, path: string) {
   }
   try{
     const queryResultFromDataSource = await officialNotion.dataSources.query({
-      data_source_id: databaseId,
+      data_source_id: parsePageId(databaseId),
       filter: {
         or:  [
           {
@@ -104,22 +103,20 @@ async function queryIdByPathInDatabase(databaseId: string, path: string) {
   }
 }
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  const notionIdOrUrlPath = (req.query.id || '').toString()
-  // 基于文章ID 或 path 查询详情
+export async function getNotionDocByIdOrPathFromServer(notionIdOrUrlPath: string) {
   let notionId = notionIdOrUrlPath
   /**
    * 如果是 URL path，需要查询对应的 notion id
    * */
   if (!/^(\w|\d){8}/.test(notionIdOrUrlPath) || notionIdOrUrlPath.length < 20) {
     notionId =
-      SEO_REVERT_MAP[notionIdOrUrlPath] ||
-      (await fetchDocByPath(notionIdOrUrlPath)) ||
-      ''
+        SEO_REVERT_MAP[notionIdOrUrlPath] ||
+        (await fetchDocByPath(notionIdOrUrlPath)) ||
+        ''
     if (!notionId) {
       console.error(notionIdOrUrlPath, 'no page')
       // throw Error('找不到 notion 页面')
-      return res.status(404).json(null)
+      return null;
     }
   }
 
@@ -138,7 +135,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     // }
   } catch (e) {
     console.error(e,'fetch recordMap error')
-    return res.status(200).json(null)
+    return null
   }
   /**
    * 为了通过获取 page 的property属性 title path description keywords
@@ -147,22 +144,22 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   let notionPage = null
   if (recordMap && recordMap.block[notionId]?.value.type === 'page' && getOfficialNotion()) {
     notionPage = await getOfficialNotion()
-      ?.pages.retrieve({
-        page_id: notionId,
-      })
-      .catch(function (e) {
-        console.warn(e, '获取文章详情失败')
-      })
+        ?.pages.retrieve({
+          page_id: notionId,
+        })
+        .catch(function (e) {
+          console.warn(e, '获取文章详情失败')
+        })
   }
   const properties = recordMap?.block[notionId]?.value?.properties
   const title = get(properties, 'title.0.0') || null
   // const description = get(properties, 'description.0.0') || null;
   // console.log(notionPage.properties,'notionPage')
   const path = get(notionPage, 'properties.path.url') || null
   const description =
-    get(notionPage, 'properties.description.rich_text[0].plain_text') || null
+      get(notionPage, 'properties.description.rich_text[0].plain_text') || null
   const keywords = (
-    get(notionPage, 'properties.keywords.multi_select') || []
+      get(notionPage, 'properties.keywords.multi_select') || []
   ).map(function (item) {
     //@ts-ignore
     return item.name || ''
@@ -182,6 +179,17 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     writeCacheFile(notionIdOrUrlPath, responseData)
   }
 
+  return responseData
+}
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const notionIdOrUrlPath = (req.query.id || '').toString()
+  // 基于文章ID 或 path 查询详情
+  const responseData = await getNotionDocByIdOrPathFromServer(notionIdOrUrlPath);
+  if(!responseData){
+    return res.status(404);
+  }
+
   // 增加缓存相应头
   const cacheTime = 60 * 30;
   res.setHeader('Cache-Control', `max-age=${cacheTime},public`);

apps/web/service/server/doc.ts

@@ -1,10 +1,11 @@
 import {isDev} from '../../const/env'
 import {databaseList, DEFAULT_BASE_DOC_PATH} from '../../const/notion'
 import {getCacheContent} from './cache'
-import { getNotionDetailFromServer, WEB_HOST} from "./api";
 import {NotionDocProp} from "../../components/notion/NotionDoc";
 import {getOfficialNotion} from "./notion";
 import {GetStaticPathsResult} from "next/types";
+import {getNotionDocByIdOrPathFromServer} from "../../pages/api/doc";
+import {parsePageId} from "notion-utils";
 export interface DocNotion {
   notFound?: boolean,
   props?: NotionDocProp,
@@ -21,8 +22,8 @@ export async function getNotionDocDetail(id: string, notFound: boolean = true):P
     let result =  getCacheContent(id);
     if(!result){
       try{
-        result = await getNotionDetailFromServer(id);
-        console.log(id,'get from server ',WEB_HOST, result)
+        result = await getNotionDocByIdOrPathFromServer(id);
+        console.log(id,'get from server ::', result)
       }catch (e) {
         console.error(id,'fetch doc detail error')
       }
@@ -61,7 +62,7 @@ export async function computeStaticPaths() {
   // 从数据库中获取文章列表
   for(let i=0; i<databaseList.length; i++){
     const dataSource = await getOfficialNotion()?.dataSources.query({
-      data_source_id: databaseList[0],
+      data_source_id: parsePageId(databaseList[0]),
     })
 
     dataSource?.results.forEach(function (item) {