@modern-js/server-core 2.68.19 → 2.68.20

package/dist/cjs/plugins/render/ssrCache.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var ssrCache_exports = {};
 __export(ssrCache_exports, {
   getCacheResult: () => getCacheResult,
-  matchCacheControl: () => matchCacheControl
+  matchCacheControl: () => matchCacheControl,
+  shouldUseCache: () => shouldUseCache
 });
 module.exports = __toCommonJS(ssrCache_exports);
 var import_storer = require("@modern-js/runtime-utils/storer");
@@ -31,6 +32,20 @@ const NO_SSR_CACHE = /<meta\s+[^>]*name=["']no-ssr-cache["'][^>]*>/i;
 async function processCache({ request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus }) {
   const response = await requestHandler(request, requestHandlerOptions);
   const { onError } = requestHandlerOptions;
+  const nonCacheableStatusCodes = [
+    204,
+    305,
+    404,
+    405,
+    500,
+    501,
+    502,
+    503,
+    504
+  ];
+  if (nonCacheableStatusCodes.includes(response.status)) {
+    return response;
+  }
   const decoder = new TextDecoder();
   if (response.body) {
     const stream = (0, import_utils.createTransformStream)();
@@ -91,6 +106,13 @@ function computedKey(req, cacheControl) {
     return defaultKey;
   }
 }
+function shouldUseCache(request) {
+  const url = new URL(request.url);
+  const hasRSCAction = request.headers.has("x-rsc-action");
+  const hasRSCTree = request.headers.has("x-rsc-tree");
+  const hasLoaderQuery = url.searchParams.has("__loader");
+  return !(hasRSCAction || hasRSCTree || hasLoaderQuery);
+}
 function matchCacheControl(cacheOption, req) {
   if (!cacheOption || !req) {
     return void 0;
@@ -189,5 +211,6 @@ async function getCacheResult(request, options) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getCacheResult,
-  matchCacheControl
+  matchCacheControl,
+  shouldUseCache
 });

package/dist/cjs/plugins/render/ssrRender.js

@@ -71,7 +71,7 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
   };
   const cacheControl = await (0, import_ssrCache.matchCacheControl)(cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.strategy, nodeReq || new IncomingMessgeProxy(request));
   let response;
-  if (cacheControl) {
+  if (cacheControl && (0, import_ssrCache.shouldUseCache)(request)) {
     response = await (0, import_ssrCache.getCacheResult)(request, {
       cacheControl,
       container: cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.container,

package/dist/esm/plugins/render/ssrCache.js

@@ -16,7 +16,7 @@ function processCache(_) {
 }
 function _processCache() {
   _processCache = _async_to_generator(function(param) {
-    var request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus, response, onError, decoder, stream, reader, writer, html, push;
+    var request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus, response, onError, nonCacheableStatusCodes, decoder, stream, reader, writer, html, push;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -28,6 +28,23 @@ function _processCache() {
         case 1:
           response = _state.sent();
           onError = requestHandlerOptions.onError;
+          nonCacheableStatusCodes = [
+            204,
+            305,
+            404,
+            405,
+            500,
+            501,
+            502,
+            503,
+            504
+          ];
+          if (nonCacheableStatusCodes.includes(response.status)) {
+            return [
+              2,
+              response
+            ];
+          }
           decoder = new TextDecoder();
           if (response.body) {
             stream = createTransformStream();
@@ -101,6 +118,13 @@ function computedKey(req, cacheControl) {
     return defaultKey;
   }
 }
+function shouldUseCache(request) {
+  var url = new URL(request.url);
+  var hasRSCAction = request.headers.has("x-rsc-action");
+  var hasRSCTree = request.headers.has("x-rsc-tree");
+  var hasLoaderQuery = url.searchParams.has("__loader");
+  return !(hasRSCAction || hasRSCTree || hasLoaderQuery);
+}
 function matchCacheControl(cacheOption, req) {
   if (!cacheOption || !req) {
     return void 0;
@@ -276,5 +300,6 @@ function _getCacheResult() {
 }
 export {
   getCacheResult,
-  matchCacheControl
+  matchCacheControl,
+  shouldUseCache
 };

package/dist/esm/plugins/render/ssrRender.js

@@ -4,7 +4,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { X_MODERNJS_RENDER } from "../../constants";
 import { getPathname, parseHeaders } from "../../utils";
-import { getCacheResult, matchCacheControl } from "./ssrCache";
+import { getCacheResult, matchCacheControl, shouldUseCache } from "./ssrCache";
 import { createRequestHandlerConfig } from "./utils";
 var SERVER_RUNTIME_ENTRY = "requestHandler";
 function ssrRender(request, _) {
@@ -68,7 +68,7 @@ function _ssrRender() {
           ];
         case 2:
           cacheControl = _state.sent();
-          if (!cacheControl)
+          if (!(cacheControl && shouldUseCache(request)))
             return [
               3,
               4

package/dist/esm-node/plugins/render/ssrCache.js

@@ -7,6 +7,20 @@ const NO_SSR_CACHE = /<meta\s+[^>]*name=["']no-ssr-cache["'][^>]*>/i;
 async function processCache({ request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus }) {
   const response = await requestHandler(request, requestHandlerOptions);
   const { onError } = requestHandlerOptions;
+  const nonCacheableStatusCodes = [
+    204,
+    305,
+    404,
+    405,
+    500,
+    501,
+    502,
+    503,
+    504
+  ];
+  if (nonCacheableStatusCodes.includes(response.status)) {
+    return response;
+  }
   const decoder = new TextDecoder();
   if (response.body) {
     const stream = createTransformStream();
@@ -67,6 +81,13 @@ function computedKey(req, cacheControl) {
     return defaultKey;
   }
 }
+function shouldUseCache(request) {
+  const url = new URL(request.url);
+  const hasRSCAction = request.headers.has("x-rsc-action");
+  const hasRSCTree = request.headers.has("x-rsc-tree");
+  const hasLoaderQuery = url.searchParams.has("__loader");
+  return !(hasRSCAction || hasRSCTree || hasLoaderQuery);
+}
 function matchCacheControl(cacheOption, req) {
   if (!cacheOption || !req) {
     return void 0;
@@ -164,5 +185,6 @@ async function getCacheResult(request, options) {
 }
 export {
   getCacheResult,
-  matchCacheControl
+  matchCacheControl,
+  shouldUseCache
 };

package/dist/esm-node/plugins/render/ssrRender.js

@@ -1,7 +1,7 @@
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { X_MODERNJS_RENDER } from "../../constants";
 import { getPathname, parseHeaders } from "../../utils";
-import { getCacheResult, matchCacheControl } from "./ssrCache";
+import { getCacheResult, matchCacheControl, shouldUseCache } from "./ssrCache";
 import { createRequestHandlerConfig } from "./utils";
 const SERVER_RUNTIME_ENTRY = "requestHandler";
 async function ssrRender(request, { routeInfo, html, config: userConfig, staticGenerate, nodeReq, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, cacheConfig, logger, metrics, onError, onTiming }) {
@@ -48,7 +48,7 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
   };
   const cacheControl = await matchCacheControl(cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.strategy, nodeReq || new IncomingMessgeProxy(request));
   let response;
-  if (cacheControl) {
+  if (cacheControl && shouldUseCache(request)) {
     response = await getCacheResult(request, {
       cacheControl,
       container: cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.container,

package/dist/types/plugins/render/ssrCache.d.ts

@@ -3,6 +3,10 @@ import type { NodeRequest } from '@modern-js/types/server';
 import type { RequestHandler, RequestHandlerOptions } from '../../types/requestHandler';
 export type CacheStatus = 'hit' | 'stale' | 'expired' | 'miss';
 type MaybeAsync<T> = Promise<T> | T;
+/**
+ * Check if a request should be processed through cache logic
+ */
+export declare function shouldUseCache(request: Request): boolean;
 export declare function matchCacheControl(cacheOption?: CacheOption, req?: NodeRequest): MaybeAsync<CacheControl | undefined | false>;
 export interface GetCacheResultOptions {
     cacheControl: CacheControl;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.19",
+  "version": "2.68.20",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -62,10 +62,10 @@
     "flatted": "^3.3.3",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/plugin": "2.68.19",
-    "@modern-js/plugin-v2": "2.68.19",
-    "@modern-js/runtime-utils": "2.68.19",
-    "@modern-js/utils": "2.68.19"
+    "@modern-js/plugin": "2.68.20",
+    "@modern-js/plugin-v2": "2.68.20",
+    "@modern-js/runtime-utils": "2.68.20",
+    "@modern-js/utils": "2.68.20"
   },
   "devDependencies": {
     "@types/cloneable-readable": "^2.0.3",
@@ -76,7 +76,7 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.68.19",
+    "@modern-js/types": "2.68.20",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },