fix: logger maybe undefined when server occur error (#5884)

.changeset/orange-cows-yawn.md

@@ -0,0 +1,7 @@
+---
+'@modern-js/prod-server': patch
+'@modern-js/server-core': patch
+---
+
+fix: logger maybe undefined when server occur error
+fix: logger 可能是 undefined 当 server 发生错误时

packages/runtime/plugin-runtime/package.json

@@ -216,7 +216,6 @@
     "@types/cookie": "0.5.1",
     "@modern-js/app-tools": "workspace:*",
     "@modern-js/core": "workspace:*",
-    "@modern-js/server-core": "workspace:*",
     "@remix-run/web-fetch": "^4.1.3",
     "@scripts/build": "workspace:*",
     "@scripts/jest-config": "workspace:*",

packages/server/core/src/plugins/render/render.ts

@@ -145,7 +145,7 @@ export async function createRender({
     );
 
     const onError = async (e: unknown) => {
-      onErrorFn(logger, ErrorDigest.ERENDER, e as string | Error, req);
+      onErrorFn(ErrorDigest.ERENDER, e as string | Error, logger, req);
       await onFallback?.('error', e);
     };
 

packages/server/core/src/utils/error.ts

@@ -1,4 +1,5 @@
 import type { Logger } from '@modern-js/types';
+import { parseHeaders } from './request';
 
 const ERROR_PAGE_TEXT: Record<number, string> = {
   404: 'This page could not be found.',
@@ -50,20 +51,35 @@ export enum ErrorDigest {
 }
 
 export function onError(
-  logger: Logger,
   digest: ErrorDigest,
   error: Error | string,
+  logger?: Logger,
   req?: Request,
 ) {
-  const headers = req?.headers;
-  headers?.delete('cookie');
+  const headerData = req && parseHeaders(req);
 
-  logger.error(
-    req
-      ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o`
-      : `Server Error - ${digest}, error = %s`,
-    error instanceof Error ? error.stack || error.message : error,
-    req?.url,
-    headers,
-  );
+  headerData && delete headerData.cookie;
+
+  if (logger) {
+    logger.error(
+      req
+        ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o`
+        : `Server Error - ${digest}, error = %s`,
+      error instanceof Error ? error.stack || error.message : error,
+      req?.url,
+      headerData,
+    );
+  } else if (req) {
+    console.error(
+      `Server Error - ${digest}, error = ${
+        error instanceof Error ? error.stack || error.message : error
+      }, req.url = ${req.url}, req.headers = ${JSON.stringify(headerData)}`,
+    );
+  } else {
+    console.error(
+      `Server Error - ${digest}, error = ${
+        error instanceof Error ? error.stack || error.message : error
+      } `,
+    );
+  }
 }

packages/server/prod-server/src/apply.ts

@@ -41,13 +41,13 @@ export async function applyPlugins(
 
   serverBase.notFound(c => {
     const logger = c.get('logger');
-    onError(logger, ErrorDigest.ENOTF, '404 not found', c.req.raw);
+    onError(ErrorDigest.ENOTF, '404 not found', logger, c.req.raw);
     return c.html(createErrorHtml(404), 404);
   });
 
   serverBase.onError((err, c) => {
     const logger = c.get('logger');
-    onError(logger, ErrorDigest.EINTER, err, c.req.raw);
+    onError(ErrorDigest.EINTER, err, logger, c.req.raw);
     return c.html(createErrorHtml(500), 500);
   });