Merge branch 'tangly1024:main' into main

Author: lifeafter619

lib/build/prefetch.js

@@ -0,0 +1,78 @@
+// lib/build/prefetch.js
+import pLimit from 'p-limit'
+import { fetchNotionPageBlocks } from '@/lib/db/notion/getPostBlocks'
+import {
+  getDataFromCache,
+  setDataToCache
+
+} from '@/lib/cache/cache_manager'
+
+
+// lib/build/prefetch.js 中新增，或单独放 lib/build/buildUtils.js
+
+/**
+ * 获取优先预生成的页面
+ * - 最新5篇（按发布时间倒序）
+ * - 默认排序前5篇（allPages 原始顺序）
+ * - 两者合并去重
+ */
+export function getPriorityPages(allPages) {
+  const published = (allPages ?? []).filter(
+    p => p.type === 'Post' && p.status === 'Published'
+  )
+
+  // 默认排序前5
+  const top5Default = published.slice(0, 5)
+
+  // 按发布时间最新5
+  const top5Latest = [...published]
+    .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate))
+    .slice(0, 5)
+
+  // 合并去重
+  const seen = new Set()
+  return [...top5Default, ...top5Latest].filter(p => {
+    if (seen.has(p.id)) return false
+    seen.add(p.id)
+    return true
+  })
+}
+
+/**
+ * 预热所有页面的 block 数据
+ * @param {*} allPages 页面列表
+ * @param {*} concurrency 并发数
+ */
+export async function prefetchAllBlockMaps(allPages, concurrency = 8) {
+  const limit = pLimit(concurrency)
+  let hit = 0, fetched = 0, failed = 0
+
+  console.log(`[Prefetch] 开始预热 ${allPages.length} 个页面 block`)
+  const start = Date.now()
+
+  await Promise.all(
+    allPages.map(page =>
+      limit(async () => {
+        const cacheKey = `page_block_${page.id}`
+        
+        // 已有缓存跳过
+        if (await getDataFromCache(cacheKey)) {
+          hit++
+          return
+        }
+
+        try {
+          const block = await fetchNotionPageBlocks(page.id, 'prefetch')
+          await setDataToCache(cacheKey, block, 1000 * 60 * 60 * 2) // 2小时
+          fetched++
+        } catch (e) {
+          console.warn('[Prefetch Failed]', page.id, e.message)
+          failed++
+        }
+      })
+    )
+  )
+
+  const elapsed = ((Date.now() - start) / 1000).toFixed(1)
+  console.log(`[Prefetch] 完成: 命中缓存=${hit} 新拉取=${fetched} 失败=${failed} 耗时=${elapsed}s`)
+}

lib/build/staticPaths.js

@@ -0,0 +1,43 @@
+
+// lib/build/staticPaths.js
+import { fetchGlobalAllData } from '@/lib/db/notion'
+import { prefetchAllBlockMaps } from '@/lib/build/prefetch'
+import { isExport } from '../utils/buildMode'
+
+let _prefetchDone = false // 模块级标记，同一构建进程只预热一次
+
+export async function getStaticPathsBase(filterFn) {
+  if (!isExport()) {
+    return { paths: [], fallback: 'blocking' }
+  }
+
+  const { allPages } = await fetchGlobalAllData({ from: 'static-paths' })
+
+  // 只在第一个调用的路由文件里执行预热
+  if (!_prefetchDone) {
+    _prefetchDone = true
+    // 预热全部，但优先处理最新5篇
+    await prefetchAllBlockMaps(allPages)
+  }
+
+  return {
+    paths: allPages.filter(filterFn).map(pageToParams),
+    fallback: false
+  }
+}
+
+// 把最新5篇单独导出，供各路由文件复用
+export async function getLatestSlugs(allPages, count = 5) {
+  return [...allPages]
+    .filter(p => p.type === 'Post' && p.status === 'Published')
+    .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate))
+    .slice(0, count)
+}
+
+// 把最新5篇单独导出，供各路由文件复用
+export async function getLatestSlugs(allPages, count = 5) {
+  return [...allPages]
+    .filter(p => p.type === 'Post' && p.status === 'Published')
+    .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate))
+    .slice(0, count)
+}

lib/cache/cache_manager.js

@@ -2,7 +2,7 @@ import BLOG from '@/blog.config'
 import FileCache from './local_file_cache'
 import MemoryCache from './memory_cache'
 import RedisCache from './redis_cache'
-import VercelCache from './vercel_cache'
+// import VercelCache from './vercel_cache'
 
 const cacheStats = {
   hit: 0,
@@ -17,8 +17,6 @@ const isBuildPhase =
   process.env.npm_lifecycle_event === 'build' ||
   process.env.npm_lifecycle_event === 'export'
 
-
-  
 const enableLocalCache = isBuildPhase || !BLOG['isProd']
 const hasRedis = !!BLOG.REDIS_URL
 
@@ -58,7 +56,7 @@ export async function getOrSetDataWithCustomCache(
     return inflightMap.get(key)
   }
 
-  // cacheLog('MISS', key, '缓存未命中，发起真实请求')
+  cacheLog('MISS', key, '缓存未命中，发起真实请求')
 
   const promise = getDataFunction(...getDataArgs)
     .then(async data => {
@@ -71,7 +69,7 @@ export async function getOrSetDataWithCustomCache(
     })
     .catch(err => {
       inflightMap.delete(key)
-      // cacheLog('ERROR', key, err.message)
+      cacheLog('ERROR', key, err.message)
       throw err
     })
 
@@ -125,7 +123,7 @@ export async function getDataFromCache(key, force) {
       console.warn(`[Cache] ${name} get failed key:${key}`, e.message)
     }
   }
-cacheStats.miss++
+  cacheStats.miss++
   return null
 }
 
@@ -143,8 +141,8 @@ export async function delCacheData(key) {
 
 function getCacheType() {
   if (hasRedis) return 'redis'
-  if (isVercelEnv()) return 'vercel'
   if (isBuildPhase) return 'file'
+  // if (isVercelEnv()) return 'vercel'
   return 'memory'
 }
 
@@ -154,8 +152,10 @@ export function getApi() {
   switch (type) {
     case 'redis':
       return RedisCache
-    case 'vercel':
-      return VercelCache
+    // case 'vercel':
+    // VercelCache 目前不稳定（有大小限制），先注释掉
+    //   return VercelCache
+    // 文件速度和内存消耗存疑
     case 'file':
       return FileCache
     default:
@@ -170,9 +170,9 @@ function getCacheChain() {
     chain.push({ name: 'redis', api: RedisCache })
   }
 
-  if (isVercelEnv()) {
-    chain.push({ name: 'vercel', api: VercelCache })
-  }
+  // if (isVercelEnv()) {
+  //   chain.push({ name: 'vercel', api: VercelCache })
+  // }
 
   if (isBuildPhase || !BLOG.isProd) {
     chain.push({ name: 'file', api: FileCache })