代码缓存逻辑调整

2026-06-01 15:10:14 +00:00 · 2024-11-13 10:50:17 +08:00
parent 4798b5b422
commit eed08777d1
5 changed files with 327 additions and 333 deletions
--- a/lib/notion/getNotionConfig.js
+++ b/lib/notion/getNotionConfig.js
@@ -157,7 +157,8 @@ export async function getConfigMapFromConfigPage(allPages) {
      // 只导入生效的配置
      if (config.enable) {
        // console.log('[Notion配置]', config.key, config.value)
-        notionConfig[config.key] = config.value
+        notionConfig[config.key] = config.value || ''
+        // 配置不能是undefined，至少是空字符串
      }
    }
  }
--- a/lib/notion/getPageProperties.js
+++ b/lib/notion/getPageProperties.js
@@ -180,9 +180,7 @@ export function adjustPageProperties(properties, NOTION_CONFIG) {
  // 1.按照用户配置的URL_PREFIX 转换一下slug
  // 2.为文章添加一个href字段，存储最终调整的路径
  if (properties.type === 'Post') {
-    if (siteConfig('POST_URL_PREFIX', '', NOTION_CONFIG)) {
-      properties.slug = generateCustomizeSlug(properties, NOTION_CONFIG)
-    }
+    properties.slug = generateCustomizeSlug(properties, NOTION_CONFIG)
    properties.href = properties.slug ?? properties.id
  } else if (properties.type === 'Page') {
    properties.href = properties.slug ?? properties.id
@@ -245,11 +243,9 @@ function generateCustomizeSlug(postProperties, NOTION_CONFIG) {
    return postProperties.slug
  }
  let fullPrefix = ''
-  const allSlugPatterns = siteConfig(
-    'POST_URL_PREFIX',
-    '',
-    NOTION_CONFIG
-  ).split('/')
+  const allSlugPatterns =
+    NOTION_CONFIG?.POST_URL_PREFIX ||
+    siteConfig('POST_URL_PREFIX', '', NOTION_CONFIG).split('/')

  const POST_URL_PREFIX_MAPPING_CATEGORY = siteConfig(
    'POST_URL_PREFIX_MAPPING_CATEGORY',
--- a/lib/notion/getPostBlocks.js
+++ b/lib/notion/getPostBlocks.js
@@ -10,19 +10,20 @@ import { deepClone, delay } from '../utils'
 * @param {*} slice
 * @returns
 */
-export async function getPage(id, from, slice) {
-  const cacheKey = 'page_block_' + id
+export async function getPage(id, from = null, slice) {
+  const cacheKey = `page_block_${id}`
  let pageBlock = await getDataFromCache(cacheKey)
  if (pageBlock) {
-    // console.log('[API<<--缓存]', `from:${from}`, cacheKey)
-    return filterPostBlocks(id, pageBlock, slice)
+    // console.debug('[API<<--缓存]', `from:${from}`, cacheKey)
+    return convertNotionBlocksToPost(id, pageBlock, slice)
  }

+  // 抓取最新数据
  pageBlock = await getPageWithRetry(id, from)

  if (pageBlock) {
    await setDataToCache(cacheKey, pageBlock)
-    return filterPostBlocks(id, pageBlock, slice)
+    return convertNotionBlocksToPost(id, pageBlock, slice)
  }
  return pageBlock
 }
@@ -69,7 +70,7 @@ export async function getPageWithRetry(id, from, retryAttempts = 3) {
 }

 /**
- * 获取到的页面BLOCK特殊处理
+ * Notion页面BLOCK格式化处理
 * 1.删除冗余字段
 * 2.比如文件、视频、音频、url格式化
 * 3.代码块等元素兼容
@@ -78,72 +79,72 @@ export async function getPageWithRetry(id, from, retryAttempts = 3) {
 * @param {*} slice 截取数量
 * @returns
 */
-function filterPostBlocks(id, blockMap, slice) {
+function convertNotionBlocksToPost(id, blockMap, slice) {
  const clonePageBlock = deepClone(blockMap)
  let count = 0
  const blocksToProcess = Object.keys(clonePageBlock?.block || {})

  // 循环遍历文档的每个block
  for (let i = 0; i < blocksToProcess.length; i++) {
-  const blockId = blocksToProcess[i]
-  const b = clonePageBlock?.block[blockId]
-  
-  if (slice && slice > 0 && count > slice) {
-    delete clonePageBlock?.block[blockId]
-    continue
-  }
-  
-  // 当BlockId等于PageId时移除
-  if (b?.value?.id === id) {
-    // 此block含有敏感信息
-    delete b?.value?.properties
-    continue
-  }
-  
-  count++
-  
-  if (b?.value?.type === 'sync_block' && b?.value?.children) {
-    const childBlocks = b.value.children
-    // 移除同步块
-    delete clonePageBlock.block[blockId]
-    // 用子块替代同步块
-    childBlocks.forEach((childBlock, index) => {
-      const newBlockId = `${blockId}_child_${index}`
-      clonePageBlock.block[newBlockId] = childBlock
-      blocksToProcess.splice(i + index + 1, 0, newBlockId)
-    })
-    // 重新处理新加入的子块
-    i--
-    continue
-  }
-  
-  // 处理 c++、c#、汇编等语言名字映射
-  if (b?.value?.type === 'code') {
-    if (b?.value?.properties?.language?.[0][0] === 'C++') {
-      b.value.properties.language[0][0] = 'cpp'
+    const blockId = blocksToProcess[i]
+    const b = clonePageBlock?.block[blockId]
+
+    if (slice && slice > 0 && count > slice) {
+      delete clonePageBlock?.block[blockId]
+      continue
    }
-    if (b?.value?.properties?.language?.[0][0] === 'C#') {
-      b.value.properties.language[0][0] = 'csharp'
+
+    // 当BlockId等于PageId时移除
+    if (b?.value?.id === id) {
+      // 此block含有敏感信息
+      delete b?.value?.properties
+      continue
    }
-    if (b?.value?.properties?.language?.[0][0] === 'Assembly') {
-      b.value.properties.language[0][0] = 'asm6502'
+
+    count++
+
+    if (b?.value?.type === 'sync_block' && b?.value?.children) {
+      const childBlocks = b.value.children
+      // 移除同步块
+      delete clonePageBlock.block[blockId]
+      // 用子块替代同步块
+      childBlocks.forEach((childBlock, index) => {
+        const newBlockId = `${blockId}_child_${index}`
+        clonePageBlock.block[newBlockId] = childBlock
+        blocksToProcess.splice(i + index + 1, 0, newBlockId)
+      })
+      // 重新处理新加入的子块
+      i--
+      continue
+    }
+
+    // 处理 c++、c#、汇编等语言名字映射
+    if (b?.value?.type === 'code') {
+      if (b?.value?.properties?.language?.[0][0] === 'C++') {
+        b.value.properties.language[0][0] = 'cpp'
+      }
+      if (b?.value?.properties?.language?.[0][0] === 'C#') {
+        b.value.properties.language[0][0] = 'csharp'
+      }
+      if (b?.value?.properties?.language?.[0][0] === 'Assembly') {
+        b.value.properties.language[0][0] = 'asm6502'
+      }
+    }
+
+    // 如果是文件，或嵌入式PDF，需要重新加密签名
+    if (
+      (b?.value?.type === 'file' ||
+        b?.value?.type === 'pdf' ||
+        b?.value?.type === 'video' ||
+        b?.value?.type === 'audio') &&
+      b?.value?.properties?.source?.[0][0] &&
+      b?.value?.properties?.source?.[0][0].indexOf('amazonaws.com') > 0
+    ) {
+      const oldUrl = b?.value?.properties?.source?.[0][0]
+      const newUrl = `https://notion.so/signed/${encodeURIComponent(oldUrl)}?table=block&id=${b?.value?.id}`
+      b.value.properties.source[0][0] = newUrl
    }
  }
-  
-  // 如果是文件，或嵌入式PDF，需要重新加密签名
-  if (
-    (b?.value?.type === 'file' ||
-      b?.value?.type === 'pdf' ||
-      b?.value?.type === 'video' ||
-      b?.value?.type === 'audio') &&
-    b?.value?.properties?.source?.[0][0] &&
-    b?.value?.properties?.source?.[0][0].indexOf('amazonaws.com') > 0
-  ) {
-    const oldUrl = b?.value?.properties?.source?.[0][0]
-    const newUrl = `https://notion.so/signed/${encodeURIComponent(oldUrl)}?table=block&id=${b?.value?.id}`
-    b.value.properties.source[0][0] = newUrl
-  }
-}

  // 去掉不用的字段
  if (id === BLOG.NOTION_PAGE_ID) {