Merge branch 'main' into feat/op-generator

web-infra-dev · Oct 16, 2024 · 5b404e2 · 5b404e2
2 parents 8994fd0 + 518b783
commit 5b404e2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/.changeset/famous-balloons-rule.md b/.changeset/famous-balloons-rule.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/server-core': patch
+---
+
+feat(server): add catch logic for ssrCache container operation
+feat(server): 为 ssr 缓存容器操作添加错误捕获逻辑
diff --git a/packages/server/core/src/plugins/render/ssrCache.ts b/packages/server/core/src/plugins/render/ssrCache.ts
@@ -11,7 +11,12 @@ import type {
   RequestHandler,
   RequestHandlerOptions,
 } from '../../types/requestHandler';
-import { createTransformStream, getPathname } from '../../utils';
+import {
+  ErrorDigest,
+  createTransformStream,
+  getPathname,
+  onError,
+} from '../../utils';
 
 interface CacheStruct {
   val: string;
@@ -66,7 +71,16 @@ async function processCache({
             val: html,
             cursor: current,
           };
-          container.set(key, JSON.stringify(cache), { ttl });
+
+          container.set(key, JSON.stringify(cache), { ttl }).catch(() => {
+            onError(
+              ErrorDigest.ERENDER_CACHE,
+              `[render-cache] set cache failed, key: ${key}, value: ${JSON.stringify(
+                cache,
+              )}`,
+            );
+          });
+
           writer.close();
           return;
         }
@@ -177,7 +191,16 @@ export async function getCacheResult(
 
   const key = computedKey(request, cacheControl);
 
-  const value = await container.get(key);
+  let value: string | undefined;
+  try {
+    value = await container.get(key);
+  } catch (_) {
+    onError(
+      ErrorDigest.ERENDER_CACHE,
+      `[render-cache] get cache failed, key: ${key}`,
+    );
+    value = undefined;
+  }
   const { maxAge, staleWhileRevalidate } = cacheControl;
   const ttl = maxAge + staleWhileRevalidate;
 

diff --git a/packages/server/core/src/utils/error.ts b/packages/server/core/src/utils/error.ts
@@ -45,6 +45,7 @@ export enum ErrorDigest {
   ENOTF = 'Page could not be found',
   EINTER = 'Internal server error',
   ERENDER = 'SSR render failed',
+  ERENDER_CACHE = 'SSR render cache failed',
   // INIT: 'Server init error',
   // WARMUP: 'SSR warmup failed',
   // EMICROINJ: 'Get micro-frontend info failed',