Merge pull request notionnext-org#3932 from tangly1024/release/4.9.4.2

Fix: 读取Notion列表窜数据

Author: tangly1024

lib/db/SiteDataApi.js

@@ -352,6 +352,8 @@ async function convertNotionToSiteData(
   for (const id of pageIds) {
     const pageBlock = normalizePageBlock(block[id])
     if (!pageBlock) continue
+    // Notion升级后数据发生乱窜，意外读取到其它数据库的列表，这里筛选
+    if (pageBlock.parent_id !== collectionId) continue
     const properties = (await getPageProperties(id, pageBlock, schema, null, getTagOptions(schema))) || null
     if (properties) collectionData.push(properties)
   }

lib/db/notion/getNotionConfig.js

@@ -11,204 +11,177 @@ import { deepClone } from '../../utils'
 import getAllPageIds from './getAllPageIds'
 import { fetchNotionPageBlocks } from './getPostBlocks'
 import { encryptEmail } from '@/lib/plugins/mailEncrypt'
-import { normalizeNotionMetadata, normalizeCollection, normalizeSchema, normalizePageBlock } from './normalizeUtil'
+import { normalizeCollection, normalizeSchema, normalizePageBlock } from './normalizeUtil'
 
 /**
  * 从Notion中读取Config配置表
  * @param {*} allPages
  * @returns
  */
 export async function getConfigMapFromConfigPage(allPages) {
-  // 默认返回配置文件
-  const notionConfig = {}
-
-  if (!allPages || !Array.isArray(allPages) || allPages.length === 0) {
+  if (!allPages?.length) {
     console.warn('[Notion配置] 忽略的配置')
     return null
   }
-  // 找到Config类
-  const configPage = allPages?.find(post => {
-    return (
-      post &&
-      post?.type &&
-      (post?.type === 'CONFIG' ||
-        post?.type === 'config' ||
-        post?.type === 'Config')
-    )
-  })
 
-  if (!configPage) {
-    // console.warn('[Notion配置] 未找到配置页面')
+  // ✅ 1. 找配置页
+  const configPage = findConfigPage(allPages)
+  if (!configPage) return null
+
+  // ✅ 2. 拉数据
+  const data = await fetchConfigPageData(configPage.id)
+  if (!data) return null
+
+  // ✅ 3. 解析
+  return parseConfigFromPage(data.pageRecordMap, data.content)
+}
+
+
+function normalizeId(id) {
+  return String(id || '').replace(/-/g, '')
+}
+
+export function findConfigPage(allPages) {
+  const configPages = (allPages || []).filter(post =>
+    post?.type && ['CONFIG', 'config', 'Config'].includes(post.type)
+  )
+
+  if (!configPages.length) {
+    console.warn('[Notion配置] 未找到配置页面')
     return null
   }
-  const configPageId = configPage.id
-  //   console.log('[Notion配置]请求配置数据 ', configPage.id)
+
+  const selected = configPages[0]
+
+  console.warn('[Notion配置] ✅:', {
+    id: selected.id,
+    title: selected.title
+  })
+
+  return selected
+}
+
+
+export async function fetchConfigPageData(configPageId) {
   let pageRecordMap = await fetchNotionPageBlocks(configPageId, 'config-table')
-  //   console.log('配置中心Page', configPageId, pageRecordMap)
-  let content = normalizePageBlock(pageRecordMap.block[configPageId].value)?.content
+
+  const pageBlock = pageRecordMap?.block?.[configPageId]?.value
+  let content = normalizePageBlock(pageBlock)?.content
+
+
   for (const table of ['Config-Table', 'CONFIG-TABLE']) {
     if (content) break
     pageRecordMap = await fetchNotionPageBlocks(configPageId, table)
     content = pageRecordMap.block[configPageId]?.value?.content
   }
 
   if (!content) {
-    // console.warn(
-    //   '[Notion配置] 未找到配置表格',
-    //   pageRecordMap.block[configPageId],
-    //   pageRecordMap.block[configPageId].value
-    // )
+    console.warn('[Notion配置] 未找到配置表')
     return null
   }
 
-  // 找到PAGE文件中的database
-  const configTableId = content?.find(contentId => {
-    return normalizePageBlock(pageRecordMap.block[contentId].value)?.type === 'collection_view'
+  return { pageRecordMap, content }
+}
+
+
+export function parseConfigFromPage(pageRecordMap, content) {
+  const notionConfig = {}
+
+  const configTableId = content.find(contentId => {
+    const blockItem = pageRecordMap.block?.[contentId]?.value
+    return normalizePageBlock(blockItem)?.type === 'collection_view'
   })
 
-  // eslint-disable-next-line no-constant-condition, no-self-compare
-  if (!configTableId) {
-    // console.warn(
-    //   '[Notion配置]未找到配置表格数据',
-    //   pageRecordMap.block[configPageId],
-    //   pageRecordMap.block[configPageId].value
-    // )
-    return null
-  }
+  if (!configTableId) return null
 
-  // 页内查找数据表格
   const block = pageRecordMap.block || {}
   const rawMetadata = normalizePageBlock(pageRecordMap.block[configTableId])
-  // Check Type Page-Database和Inline-Database
+
   if (
     rawMetadata?.type !== 'collection_view_page' &&
     rawMetadata?.type !== 'collection_view'
   ) {
     console.error(`pageId "${configTableId}" is not a database`)
     return null
   }
-  const collectionId = rawMetadata?.collection_id
-  const collection = normalizeCollection(pageRecordMap.collection[collectionId].value)
-  const collectionQuery = pageRecordMap.collection_query
-  const collectionView = pageRecordMap.collection_view
+
+  const collectionId = rawMetadata.collection_id
+  const collection = normalizeCollection(
+    pageRecordMap.collection[collectionId].value
+  )
   const schema = normalizeSchema(collection?.schema || {})
-  const viewIds = rawMetadata?.view_ids
-  const pageIds = getAllPageIds(
-    collectionQuery,
+
+  const rowPageIds = getAllPageIds(
+    pageRecordMap.collection_query,
     collectionId,
-    collectionView,
-    viewIds
+    pageRecordMap.collection_view,
+    rawMetadata.view_ids
   )
-  if (pageIds?.length === 0) {
-    console.error(
-      '[Notion配置]获取到的文章列表为空，请检查notion模板',
-      collectionQuery,
-      collection,
-      collectionView,
-      viewIds,
-      databaseRecordMap
-    )
-  }
-  // 遍历用户的表格
-  for (let i = 0; i < pageIds.length; i++) {
-    const id = pageIds[i]
+
+  for (const id of rowPageIds) {
     const value = block[id]?.value
-    if (!value) {
-      continue
-    }
-    const temp = normalizePageBlock(block?.[id]?.value)
-    if(!temp?.properties){
-      continue
-    }
-    const rawProperties = Object.entries(temp?.properties || [])
-    const excludeProperties = ['date', 'select', 'multi_select', 'person']
-    const properties = {}
-    for (let i = 0; i < rawProperties.length; i++) {
-      const [key, val] = rawProperties[i]
-      properties.id = id
-      if (schema[key]?.type && !excludeProperties.includes(schema[key].type)) {
+    if (!value) continue
+
+    const temp = normalizePageBlock(value)
+    if (!temp?.properties) continue
+
+    const rawProperties = Object.entries(temp.properties)
+    const exclude = ['date', 'select', 'multi_select', 'person']
+
+    const properties = { id }
+
+    for (const [key, val] of rawProperties) {
+      if (schema[key]?.type && !exclude.includes(schema[key].type)) {
         properties[schema[key].name] = getTextContent(val)
       } else {
         switch (schema[key]?.type) {
           case 'date': {
-            const dateProperty = getDateValue(val)
-            delete dateProperty.type
-            properties[schema[key].name] = dateProperty
+            const date = getDateValue(val)
+            delete date.type
+            properties[schema[key].name] = date
             break
           }
           case 'select':
           case 'multi_select': {
             const selects = getTextContent(val)
-            if (selects[0]?.length) {
+            if (selects) {
               properties[schema[key].name] = selects.split(',')
             }
             break
           }
-          default:
-            break
         }
       }
     }
 
-    if (properties && typeof properties === 'object' && !Array.isArray(properties) && Object.keys(properties).length > 0) {
-      // 将表格中的字段映射成 英文
-      const config = {
-        enable: (properties['启用'] || properties.Enable) === 'Yes',
-        key: properties['配置名'] || properties.Name,
-        value: properties['配置值'] || properties.Value
-      }
+    const config = {
+      enable: (properties['启用'] || properties.Enable) === 'Yes',
+      key: properties['配置名'] || properties.Name,
+      value: properties['配置值'] || properties.Value
+    }
 
-      // 只导入生效的配置
-      if (config.enable) {
-        // console.log('[Notion配置]', config.key, config.value)
-        if (config.key === 'CONTACT_EMAIL') {
-          notionConfig[config.key] =
-            (config.value && encryptEmail(config.value)) || null
-        } else {
-          notionConfig[config.key] =
-            parseTextToJson(config.value) || config.value || null
-          // 配置不能是undefined，至少是null
-        }
+    if (config.enable && config.key) {
+      if (config.key === 'CONTACT_EMAIL') {
+        notionConfig[config.key] =
+          (config.value && encryptEmail(config.value)) || null
+      } else {
+        notionConfig[config.key] =
+          parseTextToJson(config.value) || config.value || null
       }
     }
   }
 
-  let combine = notionConfig
+  // INLINE_CONFIG 合并
   try {
-    // 将INLINE_CONFIG合并，@see https://docs.tangly1024.com/article/notion-next-inline-config
-    combine = Object.assign(
-      {},
-      deepClone(notionConfig),
-      notionConfig?.INLINE_CONFIG
-    )
+    return {
+      ...deepClone(notionConfig),
+      ...notionConfig?.INLINE_CONFIG
+    }
   } catch (err) {
-    console.warn('解析 INLINE_CONFIG 配置时出错,请检查JSON格式', err)
+    console.warn('INLINE_CONFIG 解析失败', err)
+    return notionConfig
   }
-  return combine
 }
 
-/**
- * 解析INLINE_CONFIG
- * @param {*} configString
- * @returns
- */
-export function parseConfig(configString) {
-  if (!configString) {
-    return {}
-  }
-  // 解析对象
-  try {
-    // eslint-disable-next-line no-eval
-    const config = eval('(' + configString + ')')
-    return config
-  } catch (evalError) {
-    console.warn(
-      '解析 eval(INLINE_CONFIG) 配置时出错,请检查JSON格式',
-      evalError
-    )
-    return {}
-  }
-}
 
 /**
  * 解析文本为JSON