Merge branch 'main' into feat/post/extract-page-content

lib/notion/getPageProperties.js

@@ -4,11 +4,7 @@ import formatDate from '../utils/formatDate'
 // import { createHash } from 'crypto'
 import md5 from 'js-md5'
 import { siteConfig } from '../config'
-import {
-  checkStartWithHttp,
-  convertUrlStartWithOneSlash,
-  getLastSegmentFromUrl
-} from '../utils'
+import { convertUrlStartWithOneSlash, getLastSegmentFromUrl, isHttpLink, isMailOrTelLink } from '../utils'
 import { extractLangPrefix } from '../utils/pageId'
 import { mapImgUrl } from './mapImage'
 import notionAPI from '@/lib/notion/getNotionAPI'
@@ -85,8 +81,9 @@ export default async function getPageProperties(
   const fieldNames = BLOG.NOTION_PROPERTY_NAME
   if (fieldNames) {
     Object.keys(fieldNames).forEach(key => {
-      if (fieldNames[key] && properties[fieldNames[key]])
+      if (fieldNames[key] && properties[fieldNames[key]]) {
         properties[key] = properties[fieldNames[key]]
+      }
     })
   }
 
@@ -190,9 +187,12 @@ export function adjustPageProperties(properties, NOTION_CONFIG) {
   }
 
   // http or https 开头的视为外链
-  if (checkStartWithHttp(properties?.href)) {
+  if (isHttpLink(properties?.href)) {
     properties.href = properties?.slug
     properties.target = '_blank'
+  } else if (isMailOrTelLink(properties?.href)) {
+    properties.href = properties?.slug
+    properties.target = '_self'
   } else {
     properties.target = '_self'
     // 伪静态路径右侧拼接.html
@@ -238,7 +238,7 @@ export function adjustPageProperties(properties, NOTION_CONFIG) {
  */
 function generateCustomizeSlug(postProperties, NOTION_CONFIG) {
   // 外链不处理
-  if (checkStartWithHttp(postProperties.slug)) {
+  if (isHttpLink(postProperties.slug)) {
     return postProperties.slug
   }
   let fullPrefix = ''

lib/notion/mapImage.js

@@ -119,10 +119,19 @@ const compressImage = (image, width, quality = 50, fmt = 'webp') => {
     width = siteConfig('IMAGE_COMPRESS_WIDTH')
   }
 
-  // 将URL解析为一个对象
-  const urlObj = new URL(image)
-  // 获取URL参数
-  const params = new URLSearchParams(urlObj.search)
+
+  let urlObj
+  let params
+  try {
+    // 将URL解析为一个对象
+    urlObj = new URL(image)
+    // 获取URL参数
+    params = new URLSearchParams(urlObj.search)
+  } catch (err) {
+    // 捕获异常并打印错误的url
+    console.error('compressImage: Invalid URL:', image, err)
+    return image
+  }
 
   // Notion图床
   if (