Merge branch 'pr/qixing-jk/3117'

2026-05-13 23:16:47 +00:00 · 2025-01-05 19:30:29 +08:00
parent 5b115b75b1 ff565a1204
commit 01011c0f23
5 changed files with 120 additions and 63 deletions
--- a/blog.config.js
+++ b/blog.config.js
@@ -422,6 +422,9 @@ const BLOG = {
  DESCRIPTION:
    process.env.NEXT_PUBLIC_DESCRIPTION || '这是一个由NotionNext生成的站点', // 站点描述，被notion中的页面描述覆盖

+  // Redis 缓存数据库地址
+  REDIS_URL: process.env.REDIS_URL || '',
+
  // 开发相关
  NOTION_ACTIVE_USER: process.env.NOTION_ACTIVE_USER || '',
  NOTION_TOKEN_V2: process.env.NOTION_TOKEN_V2 || '', // Useful if you prefer not to make your database public
--- a/lib/cache/cache_manager.js
+++ b/lib/cache/cache_manager.js
@@ -1,46 +1,7 @@
 import BLOG from '@/blog.config'
 import FileCache from './local_file_cache'
 import MemoryCache from './memory_cache'
-
-// 配置是否开启Vercel环境中的缓存，因为Vercel中现有两种缓存方式在无服务环境下基本都是无意义的，纯粹的浪费资源
-const enableCacheInVercel =
-  process.env.npm_lifecycle_event === 'build' ||
-  process.env.npm_lifecycle_event === 'export' ||
-  !BLOG['isProd']
-
-/**
- * 尝试从缓存中获取数据，如果没有则尝试获取数据并写入缓存，最终返回所需数据
- * @param key
- * @param getDataFunction
- * @param getDataArgs
- * @returns {Promise<*|null>}
- */
-export async function getOrSetDataWithCache(key, getDataFunction, ...getDataArgs) {
-  return getOrSetDataWithCustomCache(key, null, getDataFunction, ...getDataArgs)
-}
-
-
-/**
- * 尝试从缓存中获取数据，如果没有则尝试获取数据并自定义写入缓存，最终返回所需数据
- * @param key
- * @param customCacheTime
- * @param getDataFunction
- * @param getDataArgs
- * @returns {Promise<*|null>}
- */
-export async function getOrSetDataWithCustomCache(key, customCacheTime, getDataFunction, ...getDataArgs) {
-  const dataFromCache = await getDataFromCache(key)
-  if (dataFromCache) {
-    console.log('[缓存-->>API]:', key)
-    return dataFromCache
-  }
-  const data = await getDataFunction(...getDataArgs)
-  if (data) {
-    console.log('[API-->>缓存]:', key)
-    await setDataToCache(key, data, customCacheTime)
-  }
-  return data || null
-}
+import RedisCache from './redis_cache'

 /**
 * 为减少频繁接口请求，notion数据将被缓存
@@ -49,7 +10,7 @@ export async function getOrSetDataWithCustomCache(key, customCacheTime, getDataF
 */
 export async function getDataFromCache(key, force) {
  if (enableCacheInVercel || BLOG.ENABLE_CACHE || force) {
-    const dataFromCache = await cacheApi.getCache(key)
+    const dataFromCache = await getApi().getCache(key)
    if (!dataFromCache || JSON.stringify(dataFromCache) === '[]') {
      return null
    }
@@ -65,15 +26,26 @@ export async function setDataToCache(key, data, customCacheTime) {
    return
  }
  //   console.trace('[API-->>缓存写入]:', key)
-  await cacheApi.setCache(key, data, customCacheTime)
+  await getApi().setCache(key, data, customCacheTime)
 }

 export async function delCacheData(key) {
  if (!JSON.parse(BLOG.ENABLE_CACHE)) {
    return
  }
-  await cacheApi.delCache(key)
+  await getApi().delCache(key)
 }

-// 缓存实现类
-const cacheApi = process.env.ENABLE_FILE_CACHE ? FileCache : MemoryCache
+/**
+ * 缓存实现类
+ * @returns
+ */
+function getApi() {
+  if (BLOG.REDIS_URL) {
+    return RedisCache
+  } else if (process.env.ENABLE_FILE_CACHE) {
+    return FileCache
+  } else {
+    return MemoryCache
+  }
+}
--- a/lib/cache/redis_cache.js
+++ b/lib/cache/redis_cache.js
@@ -0,0 +1,40 @@
+import Redis from 'ioredis'
+import BLOG from '@/blog.config'
+import { siteConfig } from '@/lib/config'
+
+export const redisClient = new Redis(BLOG.REDIS_URL)
+const cacheTime = Math.trunc(
+  siteConfig('NEXT_REVALIDATE_SECOND', BLOG.NEXT_REVALIDATE_SECOND) * 1.5
+)
+
+export async function getCache(key) {
+  try {
+    const data = await redisClient.get(key)
+    return data ? JSON.parse(data) : null
+  } catch (e) {
+    console.error('redisClient读取失败 ' + e)
+  }
+}
+
+export async function setCache(key, data, customCacheTime) {
+  try {
+    await redisClient.set(
+      key,
+      JSON.stringify(data),
+      'EX',
+      customCacheTime || cacheTime
+    )
+  } catch (e) {
+    console.error('redisClient写入失败 ' + e)
+  }
+}
+
+export async function delCache(key) {
+  try {
+    await redisClient.del(key)
+  } catch (e) {
+    console.error('redisClient删除失败 ' + e)
+  }
+}
+
+export default { getCache, setCache, delCache }
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
    "algoliasearch": "^4.18.0",
    "axios": "^1.7.2",
    "feed": "^4.2.2",
+    "ioredis": "^5.4.2",
    "js-md5": "^0.7.3",
    "lodash.throttle": "^4.1.1",
    "memory-cache": "^0.2.0",
--- a/yarn.lock
+++ b/yarn.lock
@@ -299,6 +299,11 @@
  resolved "https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==

+"@ioredis/commands@^1.1.1":
+  version "1.2.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/@ioredis/commands/-/commands-1.2.0.tgz#6d61b3097470af1fdbbe622795b8921d42018e11"
+  integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
+
 "@isaacs/cliui@^8.0.2":
  version "8.0.2"
  resolved "https://registry.npmmirror.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -1238,6 +1243,11 @@ clone-response@^1.0.2:
  dependencies:
    mimic-response "^1.0.0"

+cluster-key-slot@^1.1.0:
+  version "1.1.2"
+  resolved "https://mirrors.cloud.tencent.com/npm/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
+  integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
+
 color-convert@^2.0.1:
  version "2.0.1"
  resolved "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
@@ -1443,6 +1453,11 @@ delayed-stream@~1.0.0:
  resolved "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==

+denque@^2.1.0:
+  version "2.1.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
+  integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
+
 didyoumean@^1.2.2:
  version "1.2.2"
  resolved "https://registry.npmmirror.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
@@ -2404,6 +2419,21 @@ invariant@^2.2.4:
  dependencies:
    loose-envify "^1.0.0"

+ioredis@^5.4.2:
+  version "5.4.2"
+  resolved "https://mirrors.cloud.tencent.com/npm/ioredis/-/ioredis-5.4.2.tgz#ebb6f1a10b825b2c0fb114763d7e82114a0bee6c"
+  integrity sha512-0SZXGNGZ+WzISQ67QDyZ2x0+wVxjjUndtD8oSeik/4ajifeiRufed8fCb8QW8VMyi4MXcS+UO1k/0NGhvq1PAg==
+  dependencies:
+    "@ioredis/commands" "^1.1.1"
+    cluster-key-slot "^1.1.0"
+    debug "^4.3.4"
+    denque "^2.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.isarguments "^3.1.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.1.0"
+
 is-array-buffer@^3.0.4:
  version "3.0.4"
  resolved "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
@@ -2770,6 +2800,16 @@ locate-path@^6.0.0:
  dependencies:
    p-locate "^5.0.0"

+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
+
+lodash.isarguments@^3.1.0:
+  version "3.1.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
+
 lodash.merge@^4.6.2:
  version "4.6.2"
  resolved "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -3604,6 +3644,18 @@ readdirp@~3.6.0:
  dependencies:
    picomatch "^2.2.1"

+redis-errors@^1.0.0, redis-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==
+
+redis-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==
+  dependencies:
+    redis-errors "^1.0.0"
+
 reflect.getprototypeof@^1.0.4, reflect.getprototypeof@^1.0.6:
  version "1.0.8"
  resolved "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.8.tgz#c58afb17a4007b4d1118c07b92c23fca422c5d82"
@@ -3917,6 +3969,11 @@ stacktrace-js@^2.0.2:
    stack-generator "^2.0.5"
    stacktrace-gps "^3.0.4"

+standard-as-callback@^2.1.0:
+  version "2.1.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
+  integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
+
 std-env@^3.7.0:
  version "3.8.0"
  resolved "https://registry.npmmirror.com/std-env/-/std-env-3.8.0.tgz#b56ffc1baf1a29dcc80a3bdf11d7fca7c315e7d5"
@@ -3927,16 +3984,7 @@ streamsearch@^1.1.0:
  resolved "https://registry.npmmirror.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==

-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
  version "4.2.3"
  resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -4017,14 +4065,7 @@ string.prototype.trimstart@^1.0.8:
    define-properties "^1.2.1"
    es-object-atoms "^1.0.0"

-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
  version "6.0.1"
  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==