Merge pull request tangly1024#3904 from tangly1024/release/4.9.4.2

tangly1024 · web-flow · commit 766c1f8a7399 · 2026-04-06T12:44:56.000+08:00
Release/4.9.4.2
diff --git a/lib/build/prefetch.js b/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`)
+}
diff --git a/lib/build/staticPaths.js b/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)
+}
diff --git a/lib/cache/cache_manager.js b/lib/cache/cache_manager.js
@@ -141,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'
 }
 
diff --git a/lib/db/SiteDataApi.js b/lib/db/SiteDataApi.js
@@ -26,7 +26,7 @@ import {
 import { fetchPageFromNotion } from './notion/getNotionPost'
 import { processPostData } from '../utils/post'
 import { adapterNotionBlockMap } from '../utils/notion.util'
-import pLimit from 'p-limit'
+// import pLimit from 'p-limit'
 
 export { getAllTags } from './notion/getAllTags'
 export { fetchPageFromNotion as getPost } from './notion/getNotionPost'
diff --git a/lib/utils/buildMode.js b/lib/utils/buildMode.js
@@ -0,0 +1,8 @@
+/**
+ * 是否静态导出；或ISR动态站点
+ */
+function isExport() {
+  return process.env.EXPORT === 'true'
+}
+
+module.exports = { isExport }
diff --git a/lib/utils/pageId.js b/lib/utils/pageId.js
@@ -6,7 +6,7 @@
  */
 function extractLangPrefix(str) {
   const match = str.match(/^(.+?):/)
-  if (match && match[1]) {
+  if (match?.[1]) {
     return match[1]
   } else {
     return ''
@@ -22,7 +22,7 @@ function extractLangId(str) {
   // 使用正则表达式匹配字符串
   const match = str.match(/:\s*(.+)/)
   // 如果匹配成功，则返回匹配到的内容
-  if (match && match[1]) {
+  if (match?.[1]) {
     return match[1]
   } else {
     // 如果没有匹配到，则返回空字符串或者其他你想要返回的值
@@ -35,10 +35,11 @@ function extractLangId(str) {
  */
 
 function getShortId(uuid) {
-  if (!uuid || uuid.indexOf('-') < 0) {
+  if (!uuid?.includes('-')) {
     return uuid
   }
   return uuid.substring(14)
 }
 
+
 module.exports = { extractLangPrefix, extractLangId, getShortId }
diff --git a/next.config.js b/next.config.js
@@ -1,8 +1,9 @@
 const { THEME } = require('./blog.config')
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const BLOG = require('./blog.config')
 const { extractLangPrefix } = require('./lib/utils/pageId')
+const { isExport } = require('./lib/utils/buildMode')
 
 // 打包时是否分析代码
 const withBundleAnalyzer = require('@next/bundle-analyzer')({
@@ -18,8 +19,7 @@ const locales = (function () {
   const langs = [BLOG.LANG]
   if (BLOG.NOTION_PAGE_ID.indexOf(',') > 0) {
     const siteIds = BLOG.NOTION_PAGE_ID.split(',')
-    for (let index = 0; index < siteIds.length; index++) {
-      const siteId = siteIds[index]
+    for (const siteId of siteIds) {
       const prefix = extractLangPrefix(siteId)
       // 如果包含前缀 例如 zh , en 等
       if (prefix) {
@@ -36,8 +36,8 @@ const locales = (function () {
 // eslint-disable-next-line no-unused-vars
 const preBuild = (function () {
   if (
-    !process.env.npm_lifecycle_event === 'export' &&
-    !process.env.npm_lifecycle_event === 'build'
+    process.env.npm_lifecycle_event !== 'export' &&
+    process.env.npm_lifecycle_event !== 'build'
   ) {
     return
   }
@@ -81,7 +81,7 @@ function scanSubdirectories(directory) {
  */
 
 function getOutput() {
-  if (process.env.EXPORT) return 'export'
+  if (isExport()) return 'export'
   if (process.env.NEXT_BUILD_STANDALONE === 'true') return 'standalone'
   return undefined
 }
@@ -163,8 +163,7 @@ const nextConfig = {
       if (BLOG.NOTION_PAGE_ID.indexOf(',') > 0) {
         const siteIds = BLOG.NOTION_PAGE_ID.split(',')
         const langs = []
-        for (let index = 0; index < siteIds.length; index++) {
-          const siteId = siteIds[index]
+        for (const siteId of siteIds) {
           const prefix = extractLangPrefix(siteId)
           // 如果包含前缀 例如 zh , en 等
           if (prefix) {
diff --git a/pages/[prefix]/[slug]/[...suffix].js b/pages/[prefix]/[slug]/[...suffix].js
@@ -1,9 +1,10 @@
 import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { fetchGlobalAllData, resolvePostProps } from '@/lib/db/SiteDataApi'
-import { checkSlugHasMorThanTwoSlash, processPostData } from '@/lib/utils/post'
-import { idToUuid } from 'notion-utils'
+import { checkSlugHasMorThanTwoSlash } from '@/lib/utils/post'
 import Slug from '..'
+import { isExport } from '@/lib/utils/buildMode'
+import { getPriorityPages, prefetchAllBlockMaps } from '@/lib/build/prefetch'
 
 /**
  * 根据notion的slug访问页面
@@ -15,32 +16,44 @@ const PrefixSlug = props => {
   return <Slug {...props} />
 }
 
-/**
- * 编译渲染页面路径
- * @returns
- */
+
 export async function getStaticPaths() {
-  if (!BLOG.isProd) {
+  const from = 'slug-paths'
+  const { allPages } = await fetchGlobalAllData({ from })
+
+  // Export 模式：全量预生成
+  if (isExport()) {
+    await prefetchAllBlockMaps(allPages)
     return {
-      paths: [],
-      fallback: true
+      paths: allPages
+        ?.filter(row => checkSlugHasMorThanTwoSlash(row))
+        .map(row => ({
+          params: {
+            prefix: row.slug.split('/')[0],
+            slug: row.slug.split('/')[1],
+            suffix: row.slug.split('/').slice(2)
+          }
+        })),
+      fallback: false
     }
   }
 
-  const from = 'slug-paths'
-  const { allPages } = await fetchGlobalAllData({ from })
-  const paths = allPages
-    ?.filter(row => checkSlugHasMorThanTwoSlash(row))
-    .map(row => ({
-      params: {
-        prefix: row.slug.split('/')[0],
-        slug: row.slug.split('/')[1],
-        suffix: row.slug.split('/').slice(2)
-      }
-    }))
+  // ISR 模式：预生成最新10篇（仅三段以上路径格式）
+  const tops = getPriorityPages(allPages)
+
+  await prefetchAllBlockMaps(tops)
+
   return {
-    paths: paths,
-    fallback: true
+    paths: tops
+      .filter(p => checkSlugHasMorThanTwoSlash(p))
+      .map(row => ({
+        params: {
+          prefix: row.slug.split('/')[0],
+          slug: row.slug.split('/')[1],
+          suffix: row.slug.split('/').slice(2)
+        }
+      })),
+    fallback: 'blocking'
   }
 }
 
@@ -53,6 +66,7 @@ export async function getStaticProps({
   params: { prefix, slug, suffix },
   locale
 }) {
+
   const props = await resolvePostProps({
     prefix,
     slug,
@@ -62,13 +76,14 @@ export async function getStaticProps({
 
   return {
     props,
-    revalidate: process.env.EXPORT
+    revalidate: isExport()
       ? undefined
       : siteConfig(
         'NEXT_REVALIDATE_SECOND',
         BLOG.NEXT_REVALIDATE_SECOND,
         props.NOTION_CONFIG
-      )
+      ),
+    notFound: !props.post
   }
 }
 
diff --git a/pages/[prefix]/[slug]/index.js b/pages/[prefix]/[slug]/index.js
diff --git a/pages/[prefix]/index.js b/pages/[prefix]/index.js

Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,8 @@ export async function delCacheData(key) {`
`141`	`141`
`142`	`142`	`function getCacheType() {`
`143`	`143`	`if (hasRedis) return 'redis'`
`144`		`- if (isVercelEnv()) return 'vercel'`
`145`	`144`	`if (isBuildPhase) return 'file'`
	`145`	`+ // if (isVercelEnv()) return 'vercel'`
`146`	`146`	`return 'memory'`
`147`	`147`	`}`
`148`	`148`