@bleedingdev/modern-js-server-core 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

package/dist/cjs/adapters/node/hono.js

@@ -64,12 +64,22 @@ const httpCallBack2HonoMid = (handler)=>async (context, next)=>{
     };
 const noop = ()=>{};
 const connectMid2HonoMid = (handler)=>async (context, next)=>new Promise((resolve, reject)=>{
-            const { req, res } = context.env.node;
+            const { req, res: rawRes } = context.env.node;
+            const res = rawRes;
             if (handler.length < 3) resolve(handler(req, res, noop));
-            else handler(req, res, (err)=>{
-                if (err) reject(err);
-                else resolve(next());
-            });
+            else {
+                const onFinish = ()=>{
+                    context.res;
+                    context.finalized = true;
+                    resolve();
+                };
+                res.once?.('finish', onFinish);
+                handler(req, res, (err)=>{
+                    res.removeListener?.('finish', onFinish);
+                    if (err) reject(err);
+                    else resolve(next());
+                });
+            }
         });
 const connectMockMid2HonoMid = (handler)=>async (context, next)=>new Promise((resolve, reject)=>{
             const { req, res: rawRes } = context.env.node;

package/dist/cjs/adapters/node/index.js

@@ -44,12 +44,14 @@ __webpack_require__.d(__webpack_exports__, {
     loadServerPlugins: ()=>index_js_namespaceObject.loadServerPlugins,
     loadServerRuntimeConfig: ()=>index_js_namespaceObject.loadServerRuntimeConfig,
     sendResponse: ()=>external_node_js_namespaceObject.sendResponse,
+    serveStaticAsset: ()=>static_js_namespaceObject.serveStaticAsset,
     serverStaticPlugin: ()=>external_plugins_index_js_namespaceObject.serverStaticPlugin
 });
 const index_js_namespaceObject = require("./helper/index.js");
 const external_hono_js_namespaceObject = require("./hono.js");
 const external_node_js_namespaceObject = require("./node.js");
 const external_plugins_index_js_namespaceObject = require("./plugins/index.js");
+const static_js_namespaceObject = require("./plugins/static.js");
 exports.connectMid2HonoMid = __webpack_exports__.connectMid2HonoMid;
 exports.connectMockMid2HonoMid = __webpack_exports__.connectMockMid2HonoMid;
 exports.createNodeServer = __webpack_exports__.createNodeServer;
@@ -66,6 +68,7 @@ exports.loadServerEnv = __webpack_exports__.loadServerEnv;
 exports.loadServerPlugins = __webpack_exports__.loadServerPlugins;
 exports.loadServerRuntimeConfig = __webpack_exports__.loadServerRuntimeConfig;
 exports.sendResponse = __webpack_exports__.sendResponse;
+exports.serveStaticAsset = __webpack_exports__.serveStaticAsset;
 exports.serverStaticPlugin = __webpack_exports__.serverStaticPlugin;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "connectMid2HonoMid",
@@ -84,6 +87,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "loadServerPlugins",
     "loadServerRuntimeConfig",
     "sendResponse",
+    "serveStaticAsset",
     "serverStaticPlugin"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/adapters/node/plugins/static.js

@@ -39,14 +39,62 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createPublicMiddleware: ()=>createPublicMiddleware,
     createStaticMiddleware: ()=>createStaticMiddleware,
+    serveStaticAsset: ()=>serveStaticAsset,
     serverStaticPlugin: ()=>serverStaticPlugin
 });
+const fileReader_namespaceObject = require("@modern-js/runtime-utils/fileReader");
+const utils_namespaceObject = require("@modern-js/utils");
+const mime_namespaceObject = require("hono/utils/mime");
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const index_js_namespaceObject = require("../../../utils/index.js");
 const publicDir_js_namespaceObject = require("../../../utils/publicDir.js");
-const external_staticServing_js_namespaceObject = require("./staticServing.js");
-const serverStaticPlugin = ()=>({
+const isPathInside = (target, root)=>{
+    const relative = external_path_default().relative(external_path_default().resolve(root), external_path_default().resolve(target));
+    return '' === relative || !relative.startsWith(`..${external_path_default().sep}`) && '..' !== relative && !external_path_default().isAbsolute(relative);
+};
+async function serveStaticAsset(context, asset, respond) {
+    let { filename } = asset;
+    const { kind } = asset;
+    if (asset.root && !isPathInside(filename, asset.root)) return null;
+    if (asset.realpath) try {
+        const [realFilename, realRoot, stat] = await Promise.all([
+            utils_namespaceObject.fs.realpath(filename),
+            asset.root ? utils_namespaceObject.fs.realpath(asset.root) : Promise.resolve(void 0),
+            utils_namespaceObject.fs.stat(filename)
+        ]);
+        if (!stat.isFile() || realRoot && !isPathInside(realFilename, realRoot)) return null;
+        filename = realFilename;
+        asset = {
+            ...asset,
+            filename,
+            root: realRoot
+        };
+    } catch  {
+        return null;
+    }
+    if ('static' === kind && !await utils_namespaceObject.fs.pathExists(filename)) return null;
+    if (respond) return respond(asset, (representation)=>serveStaticAsset(context, {
+            ...asset,
+            ...representation,
+            filename: representation?.filename ?? asset.filename,
+            mimeFilename: asset.mimeFilename ?? filename
+        }));
+    const mimeType = (0, mime_namespaceObject.getMimeType)(asset.mimeFilename ?? filename);
+    if ('static' === kind && mimeType) context.header('Content-Type', mimeType);
+    const size = 'static' === kind ? (await utils_namespaceObject.fs.lstat(filename)).size : void 0;
+    const data = 'static' === kind ? await fileReader_namespaceObject.fileReader.readFileFromSystem(filename, 'buffer') : await fileReader_namespaceObject.fileReader.readFile(filename, 'buffer');
+    if ('static' === kind && (asset.contentLength ?? true)) context.header('Content-Length', String(true === asset.contentLength && data ? data.byteLength : size));
+    if (null === data) return null;
+    if ('public' === kind && mimeType) context.header('Content-Type', mimeType);
+    Object.entries(asset.responseHeaders || {}).forEach(([key, value])=>{
+        context.header(key, value);
+    });
+    if ('public' === kind && asset.contentLength) context.header('Content-Length', String(data.byteLength));
+    const body = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+    return context.body(body, 200);
+}
+const serverStaticPlugin = (options = {})=>({
         name: '@modern-js/plugin-server-static',
         setup (api) {
             api.onPrepare(()=>{
@@ -57,7 +105,9 @@ const serverStaticPlugin = ()=>({
                     routes,
                     output: config.output || {},
                     html: config.html || {},
-                    server: config.server || {}
+                    server: config.server || {},
+                    ...api.getServerContext().staticAssetResponders,
+                    ...options
                 });
                 middlewares.push({
                     name: 'server-static',
@@ -66,16 +116,33 @@ const serverStaticPlugin = ()=>({
             });
         }
     });
-function createPublicMiddleware({ pwd, routes }) {
+function createPublicMiddleware({ pwd, routes, pathPrefix = '/', respondAsset, respondPublicFallback }) {
     return async (c, next)=>{
-        const route = matchPublicRoute(c.req, routes);
-        if (route) {
-            const response = await (0, external_staticServing_js_namespaceObject.servePreCompressedPublicRouteAsset)(c, pwd, route);
-            if (null !== response) return response;
-        }
-        const generatedPublicAsset = await (0, external_staticServing_js_namespaceObject.servePublicDirectoryAsset)(c, pwd);
-        if (null !== generatedPublicAsset) return generatedPublicAsset;
-        return await next();
+        const respondPublic = async ()=>{
+            const route = matchPublicRoute(c.req, routes);
+            if (!route) return null;
+            const asset = {
+                filename: external_path_default().join(pwd, route.entryPath),
+                kind: 'public',
+                responseHeaders: route.responseHeaders
+            };
+            const serve = (representation)=>serveStaticAsset(c, {
+                    ...asset,
+                    ...representation,
+                    filename: representation?.filename ?? asset.filename,
+                    mimeFilename: asset.filename
+                });
+            const response = respondAsset ? await respondAsset(c, asset, serve, {
+                root: pwd,
+                pathPrefix
+            }) : void 0;
+            return void 0 === response ? serve() : response;
+        };
+        const response = respondPublicFallback ? await respondPublicFallback(c, respondPublic, {
+            root: pwd,
+            pathPrefix
+        }) : await respondPublic();
+        return response ?? next();
     };
 }
 function matchPublicRoute(req, routes) {
@@ -120,29 +187,38 @@ function createStaticMiddleware(options) {
         ...staticReg,
         ...iconReg
     ].join('|')})`);
-    const publicMiddleware = createPublicMiddleware({
-        pwd,
-        routes: routes || []
-    });
-    const moduleFederationStaticServing = (0, external_staticServing_js_namespaceObject.createModuleFederationStaticServing)({
-        pwd,
-        pathPrefix
-    });
     return async (c, next)=>{
         const pageRoute = c.get('route');
         const pathname = c.req.path;
         if (pageRoute && '' === external_path_default().extname(pathname)) return next();
         const hit = staticPathRegExp.test(pathname);
-        const staticServingRequest = await moduleFederationStaticServing.resolveRequest(pathname);
-        if (null === staticServingRequest) return next();
-        if (hit) {
-            const response = await moduleFederationStaticServing.serveStaticHit(c, staticServingRequest);
-            if (null !== response) return response;
-            return next();
+        if (!hit) return createPublicMiddleware({
+            pwd,
+            routes: routes || [],
+            pathPrefix,
+            respondAsset: options.respondAsset,
+            respondPublicFallback: options.respondPublicFallback
+        })(c, next);
+        else {
+            const filepath = external_path_default().join(pwd, pathname.replace(pathPrefix, ()=>''));
+            if (!isPathInside(filepath, pwd)) return next();
+            if (!await utils_namespaceObject.fs.pathExists(filepath)) return next();
+            const asset = {
+                filename: filepath,
+                kind: 'static'
+            };
+            const serve = (representation)=>serveStaticAsset(c, {
+                    ...asset,
+                    ...representation,
+                    filename: representation?.filename ?? asset.filename,
+                    mimeFilename: filepath
+                });
+            const response = options.respondAsset ? await options.respondAsset(c, asset, serve, {
+                root: pwd,
+                pathPrefix
+            }) : void 0;
+            return (void 0 === response ? await serve() : response) ?? next();
         }
-        const moduleFederationResponse = await moduleFederationStaticServing.serveModuleFederationAsset(c, staticServingRequest);
-        if (null !== moduleFederationResponse) return moduleFederationResponse;
-        return publicMiddleware(c, next);
     };
 }
 const prepareFavicons = (favicon)=>{
@@ -152,10 +228,12 @@ const prepareFavicons = (favicon)=>{
 };
 exports.createPublicMiddleware = __webpack_exports__.createPublicMiddleware;
 exports.createStaticMiddleware = __webpack_exports__.createStaticMiddleware;
+exports.serveStaticAsset = __webpack_exports__.serveStaticAsset;
 exports.serverStaticPlugin = __webpack_exports__.serverStaticPlugin;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createPublicMiddleware",
     "createStaticMiddleware",
+    "serveStaticAsset",
     "serverStaticPlugin"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/helper.js

@@ -31,7 +31,7 @@ const LOADER_CONTEXT = 'loaderContext';
 function getLoaderCtx(c) {
     const loaderContext = c.get(LOADER_CONTEXT);
     if (loaderContext) return loaderContext;
-    {
+    else {
         const loaderContext = new Map();
         c.set(LOADER_CONTEXT, loaderContext);
         return loaderContext;

package/dist/cjs/index.js

@@ -92,22 +92,19 @@ var __webpack_exports__ = {};
     var __rspack_reexport = {};
     for(const __rspack_import_key in _plugins__rspack_import_4)if ([
         "Hono",
-        "createSafeJsonFailureResponse",
         "createErrorHtml",
         "useHonoContext",
-        "createServerBase",
         "normalizePublicDir",
+        "createServerBase",
         "resolvePublicDirPaths",
-        "getSafeFailureStatus",
         "default",
         "normalizePublicDirPath",
         "onError",
-        "createSafeFailureHttpResult",
         "ErrorDigest",
         "getPublicDirConfig",
         "getPublicDirPatterns",
-        "getLoaderCtx",
         "getPublicDirRoutePrefixes",
+        "getLoaderCtx",
         "run",
         "AGGRED_DIR"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_plugins__rspack_import_4[__rspack_import_key];
@@ -117,22 +114,19 @@ var __webpack_exports__ = {};
     var __rspack_reexport = {};
     for(const __rspack_import_key in _types_config__rspack_import_6)if ([
         "Hono",
-        "createSafeJsonFailureResponse",
         "createErrorHtml",
         "useHonoContext",
-        "createServerBase",
         "normalizePublicDir",
+        "createServerBase",
         "resolvePublicDirPaths",
-        "getSafeFailureStatus",
         "default",
         "normalizePublicDirPath",
         "onError",
-        "createSafeFailureHttpResult",
         "ErrorDigest",
         "getPublicDirConfig",
         "getPublicDirPatterns",
-        "getLoaderCtx",
         "getPublicDirRoutePrefixes",
+        "getLoaderCtx",
         "run",
         "AGGRED_DIR"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types_config__rspack_import_6[__rspack_import_key];
@@ -141,22 +135,19 @@ var __webpack_exports__ = {};
     var __rspack_reexport = {};
     for(const __rspack_import_key in _types_plugins__rspack_import_7)if ([
         "Hono",
-        "createSafeJsonFailureResponse",
         "createErrorHtml",
         "useHonoContext",
-        "createServerBase",
         "normalizePublicDir",
+        "createServerBase",
         "resolvePublicDirPaths",
-        "getSafeFailureStatus",
         "default",
         "normalizePublicDirPath",
         "onError",
-        "createSafeFailureHttpResult",
         "ErrorDigest",
         "getPublicDirConfig",
         "getPublicDirPatterns",
-        "getLoaderCtx",
         "getPublicDirRoutePrefixes",
+        "getLoaderCtx",
         "run",
         "AGGRED_DIR"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types_plugins__rspack_import_7[__rspack_import_key];
@@ -165,22 +156,19 @@ var __webpack_exports__ = {};
     var __rspack_reexport = {};
     for(const __rspack_import_key in _types_render__rspack_import_8)if ([
         "Hono",
-        "createSafeJsonFailureResponse",
         "createErrorHtml",
         "useHonoContext",
-        "createServerBase",
         "normalizePublicDir",
+        "createServerBase",
         "resolvePublicDirPaths",
-        "getSafeFailureStatus",
         "default",
         "normalizePublicDirPath",
         "onError",
-        "createSafeFailureHttpResult",
         "ErrorDigest",
         "getPublicDirConfig",
         "getPublicDirPatterns",
-        "getLoaderCtx",
         "getPublicDirRoutePrefixes",
+        "getLoaderCtx",
         "run",
         "AGGRED_DIR"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types_render__rspack_import_8[__rspack_import_key];
@@ -189,22 +177,19 @@ var __webpack_exports__ = {};
     var __rspack_reexport = {};
     for(const __rspack_import_key in _types_requestHandler__rspack_import_9)if ([
         "Hono",
-        "createSafeJsonFailureResponse",
         "createErrorHtml",
         "useHonoContext",
-        "createServerBase",
         "normalizePublicDir",
+        "createServerBase",
         "resolvePublicDirPaths",
-        "getSafeFailureStatus",
         "default",
         "normalizePublicDirPath",
         "onError",
-        "createSafeFailureHttpResult",
         "ErrorDigest",
         "getPublicDirConfig",
         "getPublicDirPatterns",
-        "getLoaderCtx",
         "getPublicDirRoutePrefixes",
+        "getLoaderCtx",
         "run",
         "AGGRED_DIR"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types_requestHandler__rspack_import_9[__rspack_import_key];
@@ -216,14 +201,11 @@ var __webpack_exports__ = {};
         ErrorDigest: ()=>_utils__rspack_import_10.ErrorDigest,
         Hono: ()=>hono__rspack_import_0.Hono,
         createErrorHtml: ()=>_utils__rspack_import_10.createErrorHtml,
-        createSafeFailureHttpResult: ()=>_utils__rspack_import_10.createSafeFailureHttpResult,
-        createSafeJsonFailureResponse: ()=>_utils__rspack_import_10.createSafeJsonFailureResponse,
         createServerBase: ()=>_serverBase__rspack_import_5.createServerBase,
         getLoaderCtx: ()=>_helper__rspack_import_3.getLoaderCtx,
         getPublicDirConfig: ()=>_utils_publicDir__rspack_import_11.getPublicDirConfig,
         getPublicDirPatterns: ()=>_utils_publicDir__rspack_import_11.getPublicDirPatterns,
         getPublicDirRoutePrefixes: ()=>_utils_publicDir__rspack_import_11.getPublicDirRoutePrefixes,
-        getSafeFailureStatus: ()=>_utils__rspack_import_10.getSafeFailureStatus,
         normalizePublicDir: ()=>_utils_publicDir__rspack_import_11.normalizePublicDir,
         normalizePublicDirPath: ()=>_utils_publicDir__rspack_import_11.normalizePublicDirPath,
         onError: ()=>_utils__rspack_import_10.onError,
@@ -236,14 +218,11 @@ exports.AGGRED_DIR = __webpack_exports__.AGGRED_DIR;
 exports.ErrorDigest = __webpack_exports__.ErrorDigest;
 exports.Hono = __webpack_exports__.Hono;
 exports.createErrorHtml = __webpack_exports__.createErrorHtml;
-exports.createSafeFailureHttpResult = __webpack_exports__.createSafeFailureHttpResult;
-exports.createSafeJsonFailureResponse = __webpack_exports__.createSafeJsonFailureResponse;
 exports.createServerBase = __webpack_exports__.createServerBase;
 exports.getLoaderCtx = __webpack_exports__.getLoaderCtx;
 exports.getPublicDirConfig = __webpack_exports__.getPublicDirConfig;
 exports.getPublicDirPatterns = __webpack_exports__.getPublicDirPatterns;
 exports.getPublicDirRoutePrefixes = __webpack_exports__.getPublicDirRoutePrefixes;
-exports.getSafeFailureStatus = __webpack_exports__.getSafeFailureStatus;
 exports.normalizePublicDir = __webpack_exports__.normalizePublicDir;
 exports.normalizePublicDirPath = __webpack_exports__.normalizePublicDirPath;
 exports.onError = __webpack_exports__.onError;
@@ -255,14 +234,11 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "ErrorDigest",
     "Hono",
     "createErrorHtml",
-    "createSafeFailureHttpResult",
-    "createSafeJsonFailureResponse",
     "createServerBase",
     "getLoaderCtx",
     "getPublicDirConfig",
     "getPublicDirPatterns",
     "getPublicDirRoutePrefixes",
-    "getSafeFailureStatus",
     "normalizePublicDir",
     "normalizePublicDirPath",
     "onError",

package/dist/cjs/plugins/compat/index.js

@@ -36,6 +36,7 @@ const external_hooks_js_namespaceObject = require("./hooks.js");
 const compatPlugin = ()=>({
         name: '@modern-js/server-compat',
         registryHooks: {
+            handleError: (0, plugin_namespaceObject.createAsyncPipelineHook)(),
             prepareWebServer: (0, plugin_namespaceObject.createAsyncPipelineHook)(),
             prepareApiServer: (0, plugin_namespaceObject.createAsyncPipelineHook)(),
             afterMatch: (0, plugin_namespaceObject.createAsyncPipelineHook)(),

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

@@ -87,8 +87,7 @@ var __webpack_exports__ = {};
                 void 0,
                 {}
             ];
-        }
-        {
+        } else {
             const result = matchedRoutes[0];
             if (!result) return [
                 void 0,
@@ -243,7 +242,7 @@ var __webpack_exports__ = {};
         if (req.headers.get('x-rsc-action')) return 'rsc-action';
         if (req.headers.get('x-rsc-tree')) return 'rsc-tree';
         if (!isSSR) return 'csr';
-        {
+        else {
             if (query.__loader) return 'data';
             const fallbackHeaderValue = req.headers.get(fallbackHeader) || nodeReq?.headers[fallbackHeader];
             if (forceCSR && (query.csr || fallbackHeaderValue || contextForceCSR)) {
@@ -272,7 +271,7 @@ var __webpack_exports__ = {};
                 [external_constants_js_namespaceObject.X_MODERNJS_RENDER]: 'client'
             })
         });
-        return (0, external_csrRscRender_js_namespaceObject.csrRscRender)(request, options);
+        else return (0, external_csrRscRender_js_namespaceObject.csrRscRender)(request, options);
     }
 })();
 exports.createRender = __webpack_exports__.createRender;

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

@@ -35,54 +35,67 @@ __webpack_require__.d(__webpack_exports__, {
 const storer_namespaceObject = require("@modern-js/runtime-utils/storer");
 const external_constants_js_namespaceObject = require("../../constants.js");
 const index_js_namespaceObject = require("../../utils/index.js");
+const preventsSharedCaching = (headers)=>/(?:^|,)\s*(?:private|no-store|no-cache)\s*(?:[=,]|$)/i.test(headers.get('cache-control') || '');
+const isCacheableResponse = (response)=>200 === response.status && !preventsSharedCaching(response.headers) && !response.headers.has('set-cookie') && !response.headers.get('vary');
 const removeTailSlash = (s)=>s.replace(/\/+$/, '');
 const ZERO_RENDER_LEVEL = /"renderLevel":0/;
 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 deleteCache = async ()=>{
+        try {
+            await container.delete(key);
+        } catch  {
+            (onError || console.error)('[render-cache] delete cache failed');
+        }
+    };
+    if (!isCacheableResponse(response) || !response.body) {
+        await deleteCache();
+        return response;
+    }
+    const headers = Object.fromEntries(response.headers);
     const decoder = new TextDecoder();
     if (response.body) {
         const stream = (0, index_js_namespaceObject.createTransformStream)();
         const reader = response.body.getReader();
         const writer = stream.writable.getWriter();
         let html = '';
-        const push = ()=>reader.read().then(({ done, value })=>{
+        const push = ()=>reader.read().then(async ({ done, value })=>{
                 if (done) {
+                    html += decoder.decode();
                     const match = ZERO_RENDER_LEVEL.test(html) || NO_SSR_CACHE.test(html);
-                    if (match) return void writer.close();
+                    if (match) {
+                        await deleteCache();
+                        return writer.close();
+                    }
                     const current = Date.now();
                     const cache = {
                         val: html,
-                        cursor: current
+                        cursor: current,
+                        headers
                     };
                     container.set(key, JSON.stringify(cache), {
                         ttl
                     }).catch(()=>{
-                        if (onError) onError(`[render-cache] set cache failed, key: ${key}, value: ${JSON.stringify(cache)}`);
-                        else console.error(`[render-cache] set cache failed, key: ${key}, value: ${JSON.stringify(cache)}`);
+                        (onError || console.error)('[render-cache] set cache failed');
                     });
-                    writer.close();
-                    return;
+                    return writer.close();
                 }
-                const content = decoder.decode(value);
+                const content = decoder.decode(value, {
+                    stream: true
+                });
                 html += content;
-                writer.write(value);
-                push();
+                await writer.write(value);
+                return push();
             });
-        push();
+        push().catch(async (error)=>{
+            await Promise.allSettled([
+                writer.abort(error),
+                reader.cancel(error)
+            ]);
+            (onError || console.error)('[render-cache] response stream failed');
+        });
         cacheStatus && response.headers.set(external_constants_js_namespaceObject.X_RENDER_CACHE, cacheStatus);
         return new Response(stream.readable, {
             status: response.status,
@@ -97,9 +110,12 @@ function computedKey(req, cacheControl) {
     const pathname = (0, index_js_namespaceObject.getPathname)(req);
     const { customKey } = cacheControl;
     const defaultKey = '/' === pathname ? pathname : removeTailSlash(pathname);
-    if (!customKey) return defaultKey;
-    if ('string' == typeof customKey) return customKey;
-    return customKey(defaultKey);
+    if (customKey) if ('string' == typeof customKey) return customKey;
+    else return customKey(defaultKey);
+    else {
+        const url = new URL(req.url);
+        return `${url.origin}${defaultKey}${url.search}`;
+    }
 }
 function shouldUseCache(request) {
     const url = new URL(request.url);
@@ -110,7 +126,7 @@ function shouldUseCache(request) {
 }
 function matchCacheControl(cacheOption, req) {
     if (!cacheOption || !req) return;
-    {
+    else {
         if (isCacheControl(cacheOption)) return cacheOption;
         if (isCacheOptionProvider(cacheOption)) return cacheOption(req);
         const url = req.url;
@@ -129,13 +145,15 @@ function matchCacheControl(cacheOption, req) {
 async function getCacheResult(request, options) {
     const { cacheControl, container = storage, requestHandler, requestHandlerOptions } = options;
     const { onError } = requestHandlerOptions;
-    const key = computedKey(request, cacheControl);
+    const hasCredentials = request.headers.has('cookie') || request.headers.has('authorization');
+    if ('GET' !== request.method || !shouldUseCache(request) || preventsSharedCaching(request.headers) || hasCredentials && !cacheControl.customKey) return requestHandler(request, requestHandlerOptions);
+    const key = `${CACHE_NAMESPACE}:v2:${computedKey(request, cacheControl)}`;
     let value;
     try {
         value = await container.get(key);
     } catch (_) {
-        if (onError) onError(`[render-cache] get cache failed, key: ${key}`);
-        else console.error(`[render-cache] get cache failed, key: ${key}`);
+        if (onError) onError('[render-cache] get cache failed');
+        else console.error('[render-cache] get cache failed');
         value = void 0;
     }
     const { maxAge, staleWhileRevalidate } = cacheControl;
@@ -149,27 +167,27 @@ async function getCacheResult(request, options) {
         container,
         cacheStatus: 'miss'
     });
-    {
+    else {
         const cache = JSON.parse(value);
         const interval = Date.now() - cache.cursor;
         if (interval <= maxAge) {
             const cacheStatus = 'hit';
             return new Response(cache.val, {
                 headers: {
+                    ...cache.headers,
                     [external_constants_js_namespaceObject.X_RENDER_CACHE]: cacheStatus
                 }
             });
-        }
-        if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
-            key,
-            request,
-            requestHandler,
-            requestHandlerOptions,
-            ttl,
-            container,
-            cacheStatus: 'expired'
-        });
-        {
+        } else {
+            if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
+                key,
+                request,
+                requestHandler,
+                requestHandlerOptions,
+                ttl,
+                container,
+                cacheStatus: 'expired'
+            });
             processCache({
                 key,
                 request,
@@ -179,10 +197,13 @@ async function getCacheResult(request, options) {
                 container
             }).then(async (response)=>{
                 await response.text();
+            }).catch(()=>{
+                (onError || console.error)('[render-cache] revalidation failed');
             });
             const cacheStatus = 'stale';
             return new Response(cache.val, {
                 headers: {
+                    ...cache.headers,
                     [external_constants_js_namespaceObject.X_RENDER_CACHE]: cacheStatus
                 }
             });