@modern-js/server-core 3.9.1 → 3.9.3

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

@@ -68,7 +68,9 @@ const createWebRequest = (req, res, body)=>{
         headers: headerRecord,
         signal: controller.signal
     };
-    res.on('close', ()=>controller.abort('res closed'));
+    res.on('close', ()=>{
+        if (!res.writableFinished || req.aborted) controller.abort('res closed');
+    });
     const url = `http://${req.headers.host}${req.url}`;
     const needsRequestBody = body || !('GET' === method || 'HEAD' === method);
     const cloneableReq = needsRequestBody ? external_cloneable_readable_default()(req) : null;

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

@@ -143,7 +143,7 @@ function createStaticMiddleware(options) {
             pwd,
             routes: routes || []
         })(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();

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/plugins/render/render.js

@@ -87,8 +87,7 @@ var __webpack_exports__ = {};
                 void 0,
                 {}
             ];
-        }
-        {
+        } else {
             const result = matchedRoutes[0];
             if (!result) return [
                 void 0,
@@ -242,7 +241,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)) {
@@ -271,7 +270,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

@@ -59,30 +59,59 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
         const reader = response.body.getReader();
         const writer = stream.writable.getWriter();
         let html = '';
-        const push = ()=>reader.read().then(({ done, value })=>{
-                if (done) {
-                    const match = ZERO_RENDER_LEVEL.test(html) || NO_SSR_CACHE.test(html);
-                    if (match) return void writer.close();
-                    const current = Date.now();
+        let cancelled = false;
+        const cancel = async (reason)=>{
+            cancelled = true;
+            await reader.cancel(reason);
+        };
+        writer.closed.catch(cancel).catch(()=>{});
+        const onAbort = ()=>{
+            Promise.allSettled([
+                cancel(request.signal.reason),
+                writer.abort(request.signal.reason)
+            ]);
+        };
+        request.signal.addEventListener('abort', onAbort, {
+            once: true
+        });
+        if (request.signal.aborted) onAbort();
+        const pumping = (async ()=>{
+            try {
+                for(;;){
+                    const { done, value } = await reader.read();
+                    if (cancelled) return;
+                    if (done) break;
+                    html += decoder.decode(value, {
+                        stream: true
+                    });
+                    await writer.write(value);
+                }
+                html += decoder.decode();
+                await writer.close();
+                if (!cancelled && !ZERO_RENDER_LEVEL.test(html) && !NO_SSR_CACHE.test(html)) {
                     const cache = {
                         val: html,
-                        cursor: current
+                        cursor: Date.now()
                     };
-                    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)}`);
-                    });
-                    writer.close();
-                    return;
+                    try {
+                        await container.set(key, JSON.stringify(cache), {
+                            ttl
+                        });
+                    } catch (error) {
+                        if (onError) onError(error, 'render-cache');
+                        else console.error(`[render-cache] set cache failed, key: ${key}`, error);
+                    }
                 }
-                const content = decoder.decode(value);
-                html += content;
-                writer.write(value);
-                push();
-            });
-        push();
+            } catch (error) {
+                await Promise.allSettled([
+                    cancel(error),
+                    writer.abort(error)
+                ]);
+            } finally{
+                request.signal.removeEventListener('abort', onAbort);
+            }
+        })();
+        pumping.catch(()=>{});
         cacheStatus && response.headers.set(external_constants_js_namespaceObject.X_RENDER_CACHE, cacheStatus);
         return new Response(stream.readable, {
             status: response.status,
@@ -98,8 +127,8 @@ function computedKey(req, cacheControl) {
     const { customKey } = cacheControl;
     const defaultKey = '/' === pathname ? pathname : removeTailSlash(pathname);
     if (!customKey) return defaultKey;
-    if ('string' == typeof customKey) return customKey;
-    return customKey(defaultKey);
+    else if ('string' == typeof customKey) return customKey;
+    else return customKey(defaultKey);
 }
 function shouldUseCache(request) {
     const url = new URL(request.url);
@@ -110,7 +139,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;
@@ -149,7 +178,7 @@ async function getCacheResult(request, options) {
         container,
         cacheStatus: 'miss'
     });
-    {
+    else {
         const cache = JSON.parse(value);
         const interval = Date.now() - cache.cursor;
         if (interval <= maxAge) {
@@ -159,17 +188,16 @@ async function getCacheResult(request, options) {
                     [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,6 +207,11 @@ async function getCacheResult(request, options) {
                 container
             }).then(async (response)=>{
                 await response.text();
+            }).catch((error)=>{
+                try {
+                    if (onError) onError(error, 'render-cache');
+                    else console.error('[render-cache] revalidation failed', error);
+                } catch  {}
             });
             const cacheStatus = 'stale';
             return new Response(cache.val, {

package/dist/cjs/serverBase.js

@@ -138,7 +138,7 @@ function applyMiddlewares() {
         if (middleware.before) {
             const targetIndex = finalMiddlewares.findIndex((item)=>{
                 if (middleware.before?.includes(item.name)) return true;
-                return false;
+                else return false;
             });
             if (-1 !== targetIndex) finalMiddlewares.splice(targetIndex, 0, middleware);
             else finalMiddlewares.push(middleware);
@@ -159,7 +159,7 @@ function applyMiddlewares() {
     }
     function handler2Handlers(handler) {
         if (Array.isArray(handler)) return handler;
-        return [
+        else return [
             handler
         ];
     }

package/dist/cjs/utils/transformStream.js

@@ -43,7 +43,7 @@ function transformResponse(response, transformCb) {
     if (response.body) {
         const stream = createTransformStream(async (before)=>{
             if (Array.isArray(transformCb)) return transformCb.reduce(async (before, cb)=>cb(await before), Promise.resolve(before));
-            return transformCb(before);
+            else return transformCb(before);
         });
         response.body.pipeThrough(stream);
         readable = stream.readable;

package/dist/esm/adapters/node/node.mjs

@@ -24,7 +24,9 @@ const createWebRequest = (req, res, body)=>{
         headers: headerRecord,
         signal: controller.signal
     };
-    res.on('close', ()=>controller.abort('res closed'));
+    res.on('close', ()=>{
+        if (!res.writableFinished || req.aborted) controller.abort('res closed');
+    });
     const url = `http://${req.headers.host}${req.url}`;
     const needsRequestBody = body || !('GET' === method || 'HEAD' === method);
     const cloneableReq = needsRequestBody ? cloneable_readable(req) : null;

package/dist/esm/adapters/node/plugins/static.mjs

@@ -99,7 +99,7 @@ function createStaticMiddleware(options) {
             pwd,
             routes: routes || []
         })(c, next);
-        {
+        else {
             const filepath = path.join(pwd, pathname.replace(pathPrefix, ()=>''));
             if (!isPathInside(filepath, pwd)) return next();
             if (!await fs.pathExists(filepath)) return next();

package/dist/esm/helper.mjs

@@ -2,7 +2,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/esm/plugins/render/render.mjs

@@ -7,12 +7,6 @@ import { dataHandler } from "./dataHandler.mjs";
 import { renderRscHandler } from "./renderRscHandler.mjs";
 import { serverActionHandler } from "./serverActionHandler.mjs";
 import { ssrRender } from "./ssrRender.mjs";
-import { __webpack_require__ } from "../../rslib-runtime~1.mjs";
-__webpack_require__.add({
-    718 (module) {
-        module.exports = require("@modern-js/runtime-utils/router");
-    }
-});
 const DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
     const dynamicRoutes = [];
@@ -45,8 +39,7 @@ function matchRoute(router, pathname, entryName) {
             void 0,
             {}
         ];
-    }
-    {
+    } else {
         const result = matchedRoutes[0];
         if (!result) return [
             void 0,
@@ -162,7 +155,7 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
         const { nestedRoutesJson } = serverManifest;
         const routes = nestedRoutesJson?.[options.routeInfo.entryName];
         if (routes) {
-            const { matchRoutes } = __webpack_require__(718);
+            const { matchRoutes } = require("@modern-js/runtime-utils/router");
             const url = new URL(request.url);
             const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
             if (matchedRoutes) {
@@ -200,7 +193,7 @@ async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFa
     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)) {
@@ -229,6 +222,6 @@ async function csrRender(request, options) {
             [X_MODERNJS_RENDER]: 'client'
         })
     });
-    return csrRscRender(request, options);
+    else return csrRscRender(request, options);
 }
 export { createRender, matchRoute };

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

@@ -25,30 +25,59 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
         const reader = response.body.getReader();
         const writer = stream.writable.getWriter();
         let html = '';
-        const push = ()=>reader.read().then(({ done, value })=>{
-                if (done) {
-                    const match = ZERO_RENDER_LEVEL.test(html) || NO_SSR_CACHE.test(html);
-                    if (match) return void writer.close();
-                    const current = Date.now();
+        let cancelled = false;
+        const cancel = async (reason)=>{
+            cancelled = true;
+            await reader.cancel(reason);
+        };
+        writer.closed.catch(cancel).catch(()=>{});
+        const onAbort = ()=>{
+            Promise.allSettled([
+                cancel(request.signal.reason),
+                writer.abort(request.signal.reason)
+            ]);
+        };
+        request.signal.addEventListener('abort', onAbort, {
+            once: true
+        });
+        if (request.signal.aborted) onAbort();
+        const pumping = (async ()=>{
+            try {
+                for(;;){
+                    const { done, value } = await reader.read();
+                    if (cancelled) return;
+                    if (done) break;
+                    html += decoder.decode(value, {
+                        stream: true
+                    });
+                    await writer.write(value);
+                }
+                html += decoder.decode();
+                await writer.close();
+                if (!cancelled && !ZERO_RENDER_LEVEL.test(html) && !NO_SSR_CACHE.test(html)) {
                     const cache = {
                         val: html,
-                        cursor: current
+                        cursor: Date.now()
                     };
-                    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)}`);
-                    });
-                    writer.close();
-                    return;
+                    try {
+                        await container.set(key, JSON.stringify(cache), {
+                            ttl
+                        });
+                    } catch (error) {
+                        if (onError) onError(error, 'render-cache');
+                        else console.error(`[render-cache] set cache failed, key: ${key}`, error);
+                    }
                 }
-                const content = decoder.decode(value);
-                html += content;
-                writer.write(value);
-                push();
-            });
-        push();
+            } catch (error) {
+                await Promise.allSettled([
+                    cancel(error),
+                    writer.abort(error)
+                ]);
+            } finally{
+                request.signal.removeEventListener('abort', onAbort);
+            }
+        })();
+        pumping.catch(()=>{});
         cacheStatus && response.headers.set(X_RENDER_CACHE, cacheStatus);
         return new Response(stream.readable, {
             status: response.status,
@@ -64,8 +93,8 @@ function computedKey(req, cacheControl) {
     const { customKey } = cacheControl;
     const defaultKey = '/' === pathname ? pathname : removeTailSlash(pathname);
     if (!customKey) return defaultKey;
-    if ('string' == typeof customKey) return customKey;
-    return customKey(defaultKey);
+    else if ('string' == typeof customKey) return customKey;
+    else return customKey(defaultKey);
 }
 function shouldUseCache(request) {
     const url = new URL(request.url);
@@ -76,7 +105,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;
@@ -115,7 +144,7 @@ async function getCacheResult(request, options) {
         container,
         cacheStatus: 'miss'
     });
-    {
+    else {
         const cache = JSON.parse(value);
         const interval = Date.now() - cache.cursor;
         if (interval <= maxAge) {
@@ -125,17 +154,16 @@ async function getCacheResult(request, options) {
                     [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,
@@ -145,6 +173,11 @@ async function getCacheResult(request, options) {
                 container
             }).then(async (response)=>{
                 await response.text();
+            }).catch((error)=>{
+                try {
+                    if (onError) onError(error, 'render-cache');
+                    else console.error('[render-cache] revalidation failed', error);
+                } catch  {}
             });
             const cacheStatus = 'stale';
             return new Response(cache.val, {

package/dist/esm/serverBase.mjs

@@ -105,7 +105,7 @@ function applyMiddlewares() {
         if (middleware.before) {
             const targetIndex = finalMiddlewares.findIndex((item)=>{
                 if (middleware.before?.includes(item.name)) return true;
-                return false;
+                else return false;
             });
             if (-1 !== targetIndex) finalMiddlewares.splice(targetIndex, 0, middleware);
             else finalMiddlewares.push(middleware);
@@ -126,7 +126,7 @@ function applyMiddlewares() {
     }
     function handler2Handlers(handler) {
         if (Array.isArray(handler)) return handler;
-        return [
+        else return [
             handler
         ];
     }

package/dist/esm/utils/transformStream.mjs

@@ -14,7 +14,7 @@ function transformResponse(response, transformCb) {
     if (response.body) {
         const stream = createTransformStream(async (before)=>{
             if (Array.isArray(transformCb)) return transformCb.reduce(async (before, cb)=>cb(await before), Promise.resolve(before));
-            return transformCb(before);
+            else return transformCb(before);
         });
         response.body.pipeThrough(stream);
         readable = stream.readable;

package/dist/esm-node/adapters/node/node.mjs

@@ -25,7 +25,9 @@ const createWebRequest = (req, res, body)=>{
         headers: headerRecord,
         signal: controller.signal
     };
-    res.on('close', ()=>controller.abort('res closed'));
+    res.on('close', ()=>{
+        if (!res.writableFinished || req.aborted) controller.abort('res closed');
+    });
     const url = `http://${req.headers.host}${req.url}`;
     const needsRequestBody = body || !('GET' === method || 'HEAD' === method);
     const cloneableReq = needsRequestBody ? cloneable_readable(req) : null;

package/dist/esm-node/adapters/node/plugins/static.mjs

@@ -100,7 +100,7 @@ function createStaticMiddleware(options) {
             pwd,
             routes: routes || []
         })(c, next);
-        {
+        else {
             const filepath = path.join(pwd, pathname.replace(pathPrefix, ()=>''));
             if (!isPathInside(filepath, pwd)) return next();
             if (!await fs.pathExists(filepath)) return next();

package/dist/esm-node/helper.mjs

@@ -3,7 +3,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/esm-node/plugins/render/render.mjs

@@ -8,14 +8,8 @@ import { dataHandler } from "./dataHandler.mjs";
 import { renderRscHandler } from "./renderRscHandler.mjs";
 import { serverActionHandler } from "./serverActionHandler.mjs";
 import { ssrRender } from "./ssrRender.mjs";
-import { __webpack_require__ } from "../../rslib-runtime~0.mjs";
 import { createRequire as __rspack_createRequire } from "node:module";
 const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
-__webpack_require__.add({
-    "@modern-js/runtime-utils/router" (module) {
-        module.exports = __rspack_createRequire_require("@modern-js/runtime-utils/router");
-    }
-});
 const DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
     const dynamicRoutes = [];
@@ -48,8 +42,7 @@ function matchRoute(router, pathname, entryName) {
             void 0,
             {}
         ];
-    }
-    {
+    } else {
         const result = matchedRoutes[0];
         if (!result) return [
             void 0,
@@ -165,7 +158,7 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
         const { nestedRoutesJson } = serverManifest;
         const routes = nestedRoutesJson?.[options.routeInfo.entryName];
         if (routes) {
-            const { matchRoutes } = __webpack_require__("@modern-js/runtime-utils/router");
+            const { matchRoutes } = __rspack_createRequire_require("@modern-js/runtime-utils/router");
             const url = new URL(request.url);
             const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
             if (matchedRoutes) {
@@ -203,7 +196,7 @@ async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFa
     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)) {
@@ -232,6 +225,6 @@ async function csrRender(request, options) {
             [X_MODERNJS_RENDER]: 'client'
         })
     });
-    return csrRscRender(request, options);
+    else return csrRscRender(request, options);
 }
 export { createRender, matchRoute };

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

@@ -26,30 +26,59 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
         const reader = response.body.getReader();
         const writer = stream.writable.getWriter();
         let html = '';
-        const push = ()=>reader.read().then(({ done, value })=>{
-                if (done) {
-                    const match = ZERO_RENDER_LEVEL.test(html) || NO_SSR_CACHE.test(html);
-                    if (match) return void writer.close();
-                    const current = Date.now();
+        let cancelled = false;
+        const cancel = async (reason)=>{
+            cancelled = true;
+            await reader.cancel(reason);
+        };
+        writer.closed.catch(cancel).catch(()=>{});
+        const onAbort = ()=>{
+            Promise.allSettled([
+                cancel(request.signal.reason),
+                writer.abort(request.signal.reason)
+            ]);
+        };
+        request.signal.addEventListener('abort', onAbort, {
+            once: true
+        });
+        if (request.signal.aborted) onAbort();
+        const pumping = (async ()=>{
+            try {
+                for(;;){
+                    const { done, value } = await reader.read();
+                    if (cancelled) return;
+                    if (done) break;
+                    html += decoder.decode(value, {
+                        stream: true
+                    });
+                    await writer.write(value);
+                }
+                html += decoder.decode();
+                await writer.close();
+                if (!cancelled && !ZERO_RENDER_LEVEL.test(html) && !NO_SSR_CACHE.test(html)) {
                     const cache = {
                         val: html,
-                        cursor: current
+                        cursor: Date.now()
                     };
-                    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)}`);
-                    });
-                    writer.close();
-                    return;
+                    try {
+                        await container.set(key, JSON.stringify(cache), {
+                            ttl
+                        });
+                    } catch (error) {
+                        if (onError) onError(error, 'render-cache');
+                        else console.error(`[render-cache] set cache failed, key: ${key}`, error);
+                    }
                 }
-                const content = decoder.decode(value);
-                html += content;
-                writer.write(value);
-                push();
-            });
-        push();
+            } catch (error) {
+                await Promise.allSettled([
+                    cancel(error),
+                    writer.abort(error)
+                ]);
+            } finally{
+                request.signal.removeEventListener('abort', onAbort);
+            }
+        })();
+        pumping.catch(()=>{});
         cacheStatus && response.headers.set(X_RENDER_CACHE, cacheStatus);
         return new Response(stream.readable, {
             status: response.status,
@@ -65,8 +94,8 @@ function computedKey(req, cacheControl) {
     const { customKey } = cacheControl;
     const defaultKey = '/' === pathname ? pathname : removeTailSlash(pathname);
     if (!customKey) return defaultKey;
-    if ('string' == typeof customKey) return customKey;
-    return customKey(defaultKey);
+    else if ('string' == typeof customKey) return customKey;
+    else return customKey(defaultKey);
 }
 function shouldUseCache(request) {
     const url = new URL(request.url);
@@ -77,7 +106,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;
@@ -116,7 +145,7 @@ async function getCacheResult(request, options) {
         container,
         cacheStatus: 'miss'
     });
-    {
+    else {
         const cache = JSON.parse(value);
         const interval = Date.now() - cache.cursor;
         if (interval <= maxAge) {
@@ -126,17 +155,16 @@ async function getCacheResult(request, options) {
                     [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,
@@ -146,6 +174,11 @@ async function getCacheResult(request, options) {
                 container
             }).then(async (response)=>{
                 await response.text();
+            }).catch((error)=>{
+                try {
+                    if (onError) onError(error, 'render-cache');
+                    else console.error('[render-cache] revalidation failed', error);
+                } catch  {}
             });
             const cacheStatus = 'stale';
             return new Response(cache.val, {

package/dist/esm-node/serverBase.mjs

@@ -106,7 +106,7 @@ function applyMiddlewares() {
         if (middleware.before) {
             const targetIndex = finalMiddlewares.findIndex((item)=>{
                 if (middleware.before?.includes(item.name)) return true;
-                return false;
+                else return false;
             });
             if (-1 !== targetIndex) finalMiddlewares.splice(targetIndex, 0, middleware);
             else finalMiddlewares.push(middleware);
@@ -127,7 +127,7 @@ function applyMiddlewares() {
     }
     function handler2Handlers(handler) {
         if (Array.isArray(handler)) return handler;
-        return [
+        else return [
             handler
         ];
     }

package/dist/esm-node/utils/transformStream.mjs

@@ -15,7 +15,7 @@ function transformResponse(response, transformCb) {
     if (response.body) {
         const stream = createTransformStream(async (before)=>{
             if (Array.isArray(transformCb)) return transformCb.reduce(async (before, cb)=>cb(await before), Promise.resolve(before));
-            return transformCb(before);
+            else return transformCb(before);
         });
         response.body.pipeThrough(stream);
         readable = stream.readable;

package/dist/types/adapters/node/plugins/static.d.ts

@@ -1,11 +1,11 @@
 import type { ServerRoute } from '@modern-js/types';
 import type { HtmlNormalizedConfig, Middleware, OutputNormalizedConfig, ServerNormalizedConfig, ServerPlugin } from '../../../types/index.js';
 export declare const serverStaticPlugin: () => ServerPlugin;
-export type PublicMiddlwareOptions = {
+export type PublicMiddlewareOptions = {
     pwd: string;
     routes: ServerRoute[];
 };
-export declare function createPublicMiddleware({ pwd, routes, }: PublicMiddlwareOptions): Middleware;
+export declare function createPublicMiddleware({ pwd, routes, }: PublicMiddlewareOptions): Middleware;
 export interface ServerStaticOptions {
     pwd: string;
     output: OutputNormalizedConfig;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.1",
+  "version": "3.9.3",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -70,20 +70,20 @@
     "cloneable-readable": "^3.0.0",
     "flatted": "^3.4.4",
     "hono": "^4.11.7",
-    "ts-deepmerge": "7.0.3",
-    "@modern-js/plugin": "3.9.1",
-    "@modern-js/runtime-utils": "3.9.1",
-    "@modern-js/utils": "3.9.1"
+    "ts-deepmerge": "8.0.0",
+    "@modern-js/plugin": "3.9.3",
+    "@modern-js/runtime-utils": "3.9.3",
+    "@modern-js/utils": "3.9.3"
   },
   "devDependencies": {
-    "@rslib/core": "1.0.0",
+    "@rslib/core": "1.0.1",
     "@types/cloneable-readable": "^2.0.3",
     "@types/merge-deep": "^3.0.3",
     "@types/node": "^20",
     "http-proxy-middleware": "^2.0.10",
     "typescript": "^5",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/types": "3.9.1",
+    "@modern-js/types": "3.9.3",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,

package/dist/esm/rslib-runtime~1.mjs

@@ -1,18 +0,0 @@
-var __webpack_modules__ = {};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };

package/dist/esm-node/rslib-runtime~0.mjs

@@ -1,19 +0,0 @@
-import "node:module";
-var __webpack_modules__ = {};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };