@modern-js/server-core 3.10.1 → 3.10.3

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

@@ -109,6 +109,67 @@ const createWebRequest = (req, res, body)=>{
     }
     return originalRequest;
 };
+const noop = ()=>{};
+const isDestroyed = (res)=>'stream' in res ? res.stream.destroyed : res.destroyed;
+const createAbortError = ()=>Object.assign(new Error('The operation was aborted'), {
+        name: 'AbortError',
+        code: 'ABORT_ERR'
+    });
+const writeBody = async (body, res)=>{
+    const reader = body.getReader();
+    let abortError;
+    let cancelled;
+    let resume;
+    let waitsForDrain = false;
+    const onDrain = ()=>resume?.();
+    const abort = (error)=>{
+        if (cancelled) return;
+        abortError = error;
+        cancelled = reader.cancel(error);
+        cancelled.catch(noop);
+        resume?.();
+    };
+    const onClose = ()=>abort(createAbortError());
+    res.on('close', onClose);
+    res.on('error', abort);
+    try {
+        if (isDestroyed(res)) onClose();
+        while(!cancelled){
+            let result;
+            try {
+                result = await reader.read();
+            } catch (error) {
+                res.destroy(error);
+                throw error;
+            }
+            if (result.done || cancelled) break;
+            try {
+                if (!res.write(result.value) && !cancelled) {
+                    if (!waitsForDrain) {
+                        waitsForDrain = true;
+                        res.on('drain', onDrain);
+                    }
+                    await new Promise((resolve)=>{
+                        resume = resolve;
+                    });
+                    resume = void 0;
+                }
+            } catch (error) {
+                abort(error);
+            }
+        }
+        if (cancelled) {
+            await cancelled;
+            throw abortError;
+        }
+        res.end();
+    } finally{
+        res.off('close', onClose);
+        res.off('error', abort);
+        if (waitsForDrain) res.off('drain', onDrain);
+        reader.releaseLock();
+    }
+};
 const sendResponse = async (response, res)=>{
     res.statusMessage = response.statusText;
     res.statusCode = response.status;
@@ -117,10 +178,8 @@ const sendResponse = async (response, res)=>{
     else res.setHeader(key, value);
     if (cookies.length > 0) res.setHeader('set-cookie', cookies);
     if (response.headers.get('Content-Type')?.match(/text\/event-stream/i) && res instanceof external_node_http_namespaceObject.ServerResponse) res.flushHeaders();
-    if (response.body) {
-        const writable = external_node_stream_namespaceObject.Writable.toWeb(res);
-        await response.body.pipeTo(writable);
-    } else res.end();
+    if (response.body) await writeBody(response.body, res);
+    else res.end();
 };
 const handleResponseError = (e, res)=>{
     const err = e instanceof Error ? e : new Error('unknown error', {

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

@@ -69,8 +69,9 @@ const serverStaticPlugin = ()=>({
         }
     });
 function createPublicMiddleware({ pwd, routes }) {
+    const publicRoutes = routes.filter((route)=>!route.isSSR && route.entryPath?.startsWith('public')).sort(index_js_namespaceObject.sortRoutes);
     return async (c, next)=>{
-        const route = matchPublicRoute(c.req, routes);
+        const route = matchPublicRoute(c.req, publicRoutes);
         if (route) {
             const { entryPath } = route;
             const filename = external_path_default().join(pwd, entryPath);
@@ -88,8 +89,8 @@ function createPublicMiddleware({ pwd, routes }) {
         return await next();
     };
 }
-function matchPublicRoute(req, routes) {
-    for (const route of routes.sort(index_js_namespaceObject.sortRoutes))if (!route.isSSR && route.entryPath.startsWith('public') && req.path.startsWith(route.urlPath)) return route;
+function matchPublicRoute(req, publicRoutes) {
+    return publicRoutes.find((route)=>req.path.startsWith(route.urlPath));
 }
 const isPathInside = (target, root)=>{
     const relative = external_path_default().relative(external_path_default().resolve(root), external_path_default().resolve(target));
@@ -134,26 +135,26 @@ function createStaticMiddleware(options) {
         ...staticReg,
         ...iconReg
     ].join('|')})`);
+    const publicMiddleware = createPublicMiddleware({
+        pwd,
+        routes: routes || []
+    });
     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);
-        if (!hit) return createPublicMiddleware({
-            pwd,
-            routes: routes || []
-        })(c, next);
+        if (!hit) return publicMiddleware(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 mimeType = (0, mime_namespaceObject.getMimeType)(filepath);
-            if (mimeType) c.header('Content-Type', mimeType);
-            const stat = await utils_namespaceObject.fs.lstat(filepath);
-            const { size } = stat;
+            const stat = await utils_namespaceObject.fs.stat(filepath).catch(()=>null);
+            if (!stat?.isFile()) return next();
             const chunk = await fileReader_namespaceObject.fileReader.readFileFromSystem(filepath, 'buffer');
-            c.header('Content-Length', String(size));
             if (null === chunk) return next();
+            const mimeType = (0, mime_namespaceObject.getMimeType)(filepath);
+            if (mimeType) c.header('Content-Type', mimeType);
+            c.header('Content-Length', String(chunk.byteLength));
             const body = new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength);
             return c.body(body, 200);
         }

package/dist/cjs/plugins/monitors.js

@@ -158,13 +158,10 @@ const injectServerTiming = ()=>({
                         const monitors = c.get('monitors');
                         monitors?.push(timingMonitor);
                         await next();
-                        serverTimings.forEach((serverTiming)=>{
-                            const { name, desc, dur } = serverTiming;
-                            const _name = `bd-${metaName}-${name}`;
-                            const value = `${_name};${desc ? `decs="${desc}";` : ''} dur=${dur}`;
-                            c.header(external_constants_js_namespaceObject.SERVER_TIMING, value, {
-                                append: true
-                            });
+                        if (0 === serverTimings.length) return;
+                        const value = serverTimings.map(({ name, desc, dur })=>`bd-${metaName}-${name};${desc ? `decs="${desc}";` : ''} dur=${dur}`).join(', ');
+                        c.header(external_constants_js_namespaceObject.SERVER_TIMING, value, {
+                            append: true
                         });
                     }
                 });

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

@@ -70,10 +70,6 @@ var __webpack_exports__ = {};
         "default"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_inject__rspack_import_3[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    const DYNAMIC_ROUTE_REG = /\/:./;
-    function escapeRegexSpecialChars(path) {
-        return path.replace(/[()[\]{}*+?.^$|\\]/g, '\\$&');
-    }
     const renderPlugin = ()=>({
             name: '@modern-js/plugin-render',
             setup (api) {
@@ -87,9 +83,7 @@ var __webpack_exports__ = {};
                     });
                     for (const route of pageRoutes){
                         const { urlPath: originUrlPath } = route;
-                        const isDynamic = DYNAMIC_ROUTE_REG.test(originUrlPath);
-                        const escapedPath = isDynamic ? originUrlPath : escapeRegexSpecialChars(originUrlPath);
-                        const urlPath = escapedPath.endsWith('/') ? `${escapedPath}*` : `${escapedPath}/*`;
+                        const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
                         renderMiddlewares?.forEach((m)=>{
                             middlewares.push({
                                 name: m.name,

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

@@ -48,6 +48,7 @@ var __webpack_exports__ = {};
     });
     const universal_namespaceObject = require("@modern-js/utils/universal");
     const trie_router_namespaceObject = require("hono/router/trie-router");
+    const url_namespaceObject = require("hono/utils/url");
     const external_constants_js_namespaceObject = require("../../constants.js");
     const index_js_namespaceObject = require("../../utils/index.js");
     const external_csrRscRender_js_namespaceObject = require("./csrRscRender.js");
@@ -109,11 +110,11 @@ var __webpack_exports__ = {};
     }
     async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config }) {
         const router = getRouter(routes);
+        const framework = (0, universal_namespaceObject.cutNameByHyphen)(metaName || 'modern-js');
+        const fallbackHeader = `x-${framework}-ssr-fallback`;
         return async (req, { monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext, contextForceCSR, reporter })=>{
-            const forMatchpathname = matchPathname ?? (0, index_js_namespaceObject.getPathname)(req);
+            const forMatchpathname = matchPathname ?? (0, url_namespaceObject.getPath)(req);
             const [routeInfo, params] = matchRoute(router, forMatchpathname, matchEntryName);
-            const framework = (0, universal_namespaceObject.cutNameByHyphen)(metaName || 'modern-js');
-            const fallbackHeader = `x-${framework}-ssr-fallback`;
             let fallbackReason = null;
             const fallbackWrapper = (reason)=>{
                 fallbackReason = reason;
@@ -139,9 +140,8 @@ var __webpack_exports__ = {};
             });
             const finalForceCSR = routeInfo.entryName ? forceCSRMap?.get(routeInfo.entryName) ?? forceCSR : forceCSR;
             const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, finalForceCSR, nodeReq, fallbackWrapper, contextForceCSR);
-            const headerData = (0, index_js_namespaceObject.parseHeaders)(req);
             const onError = (e, key)=>{
-                monitors?.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));
+                monitors?.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie((0, index_js_namespaceObject.parseHeaders)(req)));
             };
             const onTiming = (name, dur)=>{
                 monitors?.timing(name, dur, 'SSR');

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

@@ -137,6 +137,15 @@ function shouldUseCache(request) {
     const hasLoaderQuery = url.searchParams.has('__loader');
     return !(hasRSCAction || hasRSCTree || hasLoaderQuery);
 }
+const cacheKeyRegExps = new Map();
+function getCacheKeyRegExp(key) {
+    let regExp = cacheKeyRegExps.get(key);
+    if (!regExp) {
+        regExp = new RegExp(key);
+        cacheKeyRegExps.set(key, regExp);
+    }
+    return regExp;
+}
 function matchCacheControl(cacheOption, req) {
     if (!cacheOption || !req) return;
     else {
@@ -144,7 +153,7 @@ function matchCacheControl(cacheOption, req) {
         if (isCacheOptionProvider(cacheOption)) return cacheOption(req);
         const url = req.url;
         const options = Object.entries(cacheOption);
-        for (const [key, option] of options)if ('*' === key || new RegExp(key).test(url)) if ('function' == typeof option) return option(req);
+        for (const [key, option] of options)if ('*' === key || getCacheKeyRegExp(key).test(url)) if ('function' == typeof option) return option(req);
         else return option;
         return;
     }

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

@@ -40,10 +40,6 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
     const { entryName } = routeInfo;
     const loadableStats = serverManifest.loadableStats || {};
     const routeManifest = serverManifest.routeManifest || {};
-    const headers = (0, index_js_namespaceObject.parseHeaders)(request);
-    if (nodeReq) {
-        for(const key in nodeReq.headers)if (!headers[key]) headers[key] = nodeReq.headers[key];
-    }
     const renderBundle = serverManifest.renderBundles?.[entryName || constants_namespaceObject.MAIN_ENTRY_NAME];
     if (!renderBundle) throw new Error(`Can't find renderBundle ${entryName || constants_namespaceObject.MAIN_ENTRY_NAME}`);
     const requestHandler = await renderBundle[SERVER_RUNTIME_ENTRY];

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

@@ -1,5 +1,5 @@
 import { ServerResponse } from "node:http";
-import { Readable, Writable } from "node:stream";
+import { Readable } from "node:stream";
 import cloneable_readable from "cloneable-readable";
 import { isResFinalized } from "./helper/index.mjs";
 const createWebRequest = (req, res, body)=>{
@@ -65,6 +65,67 @@ const createWebRequest = (req, res, body)=>{
     }
     return originalRequest;
 };
+const noop = ()=>{};
+const isDestroyed = (res)=>'stream' in res ? res.stream.destroyed : res.destroyed;
+const createAbortError = ()=>Object.assign(new Error('The operation was aborted'), {
+        name: 'AbortError',
+        code: 'ABORT_ERR'
+    });
+const writeBody = async (body, res)=>{
+    const reader = body.getReader();
+    let abortError;
+    let cancelled;
+    let resume;
+    let waitsForDrain = false;
+    const onDrain = ()=>resume?.();
+    const abort = (error)=>{
+        if (cancelled) return;
+        abortError = error;
+        cancelled = reader.cancel(error);
+        cancelled.catch(noop);
+        resume?.();
+    };
+    const onClose = ()=>abort(createAbortError());
+    res.on('close', onClose);
+    res.on('error', abort);
+    try {
+        if (isDestroyed(res)) onClose();
+        while(!cancelled){
+            let result;
+            try {
+                result = await reader.read();
+            } catch (error) {
+                res.destroy(error);
+                throw error;
+            }
+            if (result.done || cancelled) break;
+            try {
+                if (!res.write(result.value) && !cancelled) {
+                    if (!waitsForDrain) {
+                        waitsForDrain = true;
+                        res.on('drain', onDrain);
+                    }
+                    await new Promise((resolve)=>{
+                        resume = resolve;
+                    });
+                    resume = void 0;
+                }
+            } catch (error) {
+                abort(error);
+            }
+        }
+        if (cancelled) {
+            await cancelled;
+            throw abortError;
+        }
+        res.end();
+    } finally{
+        res.off('close', onClose);
+        res.off('error', abort);
+        if (waitsForDrain) res.off('drain', onDrain);
+        reader.releaseLock();
+    }
+};
 const sendResponse = async (response, res)=>{
     res.statusMessage = response.statusText;
     res.statusCode = response.status;
@@ -73,10 +134,8 @@ const sendResponse = async (response, res)=>{
     else res.setHeader(key, value);
     if (cookies.length > 0) res.setHeader('set-cookie', cookies);
     if (response.headers.get('Content-Type')?.match(/text\/event-stream/i) && res instanceof ServerResponse) res.flushHeaders();
-    if (response.body) {
-        const writable = Writable.toWeb(res);
-        await response.body.pipeTo(writable);
-    } else res.end();
+    if (response.body) await writeBody(response.body, res);
+    else res.end();
 };
 const handleResponseError = (e, res)=>{
     const err = e instanceof Error ? e : new Error('unknown error', {

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

@@ -25,8 +25,9 @@ const serverStaticPlugin = ()=>({
         }
     });
 function createPublicMiddleware({ pwd, routes }) {
+    const publicRoutes = routes.filter((route)=>!route.isSSR && route.entryPath?.startsWith('public')).sort(sortRoutes);
     return async (c, next)=>{
-        const route = matchPublicRoute(c.req, routes);
+        const route = matchPublicRoute(c.req, publicRoutes);
         if (route) {
             const { entryPath } = route;
             const filename = path.join(pwd, entryPath);
@@ -44,8 +45,8 @@ function createPublicMiddleware({ pwd, routes }) {
         return await next();
     };
 }
-function matchPublicRoute(req, routes) {
-    for (const route of routes.sort(sortRoutes))if (!route.isSSR && route.entryPath.startsWith('public') && req.path.startsWith(route.urlPath)) return route;
+function matchPublicRoute(req, publicRoutes) {
+    return publicRoutes.find((route)=>req.path.startsWith(route.urlPath));
 }
 const isPathInside = (target, root)=>{
     const relative = path.relative(path.resolve(root), path.resolve(target));
@@ -90,26 +91,26 @@ function createStaticMiddleware(options) {
         ...staticReg,
         ...iconReg
     ].join('|')})`);
+    const publicMiddleware = createPublicMiddleware({
+        pwd,
+        routes: routes || []
+    });
     return async (c, next)=>{
         const pageRoute = c.get('route');
         const pathname = c.req.path;
         if (pageRoute && '' === path.extname(pathname)) return next();
         const hit = staticPathRegExp.test(pathname);
-        if (!hit) return createPublicMiddleware({
-            pwd,
-            routes: routes || []
-        })(c, next);
+        if (!hit) return publicMiddleware(c, next);
         else {
             const filepath = path.join(pwd, pathname.replace(pathPrefix, ()=>''));
             if (!isPathInside(filepath, pwd)) return next();
-            if (!await fs.pathExists(filepath)) return next();
-            const mimeType = getMimeType(filepath);
-            if (mimeType) c.header('Content-Type', mimeType);
-            const stat = await fs.lstat(filepath);
-            const { size } = stat;
+            const stat = await fs.stat(filepath).catch(()=>null);
+            if (!stat?.isFile()) return next();
             const chunk = await fileReader.readFileFromSystem(filepath, 'buffer');
-            c.header('Content-Length', String(size));
             if (null === chunk) return next();
+            const mimeType = getMimeType(filepath);
+            if (mimeType) c.header('Content-Type', mimeType);
+            c.header('Content-Length', String(chunk.byteLength));
             const body = new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength);
             return c.body(body, 200);
         }

package/dist/esm/plugins/monitors.mjs

@@ -123,13 +123,10 @@ const injectServerTiming = ()=>({
                         const monitors = c.get('monitors');
                         monitors?.push(timingMonitor);
                         await next();
-                        serverTimings.forEach((serverTiming)=>{
-                            const { name, desc, dur } = serverTiming;
-                            const _name = `bd-${metaName}-${name}`;
-                            const value = `${_name};${desc ? `decs="${desc}";` : ''} dur=${dur}`;
-                            c.header(SERVER_TIMING, value, {
-                                append: true
-                            });
+                        if (0 === serverTimings.length) return;
+                        const value = serverTimings.map(({ name, desc, dur })=>`bd-${metaName}-${name};${desc ? `decs="${desc}";` : ''} dur=${dur}`).join(', ');
+                        c.header(SERVER_TIMING, value, {
+                            append: true
                         });
                     }
                 });

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

@@ -2,10 +2,6 @@ import { getLoaderCtx } from "../../helper.mjs";
 import { sortRoutes } from "../../utils/index.mjs";
 import { requestLatencyMiddleware } from "../monitors.mjs";
 export * from "./inject.mjs";
-const DYNAMIC_ROUTE_REG = /\/:./;
-function escapeRegexSpecialChars(path) {
-    return path.replace(/[()[\]{}*+?.^$|\\]/g, '\\$&');
-}
 const renderPlugin = ()=>({
         name: '@modern-js/plugin-render',
         setup (api) {
@@ -19,9 +15,7 @@ const renderPlugin = ()=>({
                 });
                 for (const route of pageRoutes){
                     const { urlPath: originUrlPath } = route;
-                    const isDynamic = DYNAMIC_ROUTE_REG.test(originUrlPath);
-                    const escapedPath = isDynamic ? originUrlPath : escapeRegexSpecialChars(originUrlPath);
-                    const urlPath = escapedPath.endsWith('/') ? `${escapedPath}*` : `${escapedPath}/*`;
+                    const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
                     renderMiddlewares?.forEach((m)=>{
                         middlewares.push({
                             name: m.name,

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

@@ -1,7 +1,8 @@
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
+import { getPath } from "hono/utils/url";
 import { X_MODERNJS_RENDER } from "../../constants.mjs";
-import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes, uniqueKeyByRoute } from "../../utils/index.mjs";
+import { ErrorDigest, createErrorHtml, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes, uniqueKeyByRoute } from "../../utils/index.mjs";
 import { csrRscRender } from "./csrRscRender.mjs";
 import { dataHandler } from "./dataHandler.mjs";
 import { renderRscHandler } from "./renderRscHandler.mjs";
@@ -61,11 +62,11 @@ function getHeadersWithoutCookie(headers) {
 }
 async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config }) {
     const router = getRouter(routes);
+    const framework = cutNameByHyphen(metaName || 'modern-js');
+    const fallbackHeader = `x-${framework}-ssr-fallback`;
     return async (req, { monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext, contextForceCSR, reporter })=>{
-        const forMatchpathname = matchPathname ?? getPathname(req);
+        const forMatchpathname = matchPathname ?? getPath(req);
         const [routeInfo, params] = matchRoute(router, forMatchpathname, matchEntryName);
-        const framework = cutNameByHyphen(metaName || 'modern-js');
-        const fallbackHeader = `x-${framework}-ssr-fallback`;
         let fallbackReason = null;
         const fallbackWrapper = (reason)=>{
             fallbackReason = reason;
@@ -91,9 +92,8 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         });
         const finalForceCSR = routeInfo.entryName ? forceCSRMap?.get(routeInfo.entryName) ?? forceCSR : forceCSR;
         const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, finalForceCSR, nodeReq, fallbackWrapper, contextForceCSR);
-        const headerData = parseHeaders(req);
         const onError = (e, key)=>{
-            monitors?.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));
+            monitors?.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(parseHeaders(req)));
         };
         const onTiming = (name, dur)=>{
             monitors?.timing(name, dur, 'SSR');

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

@@ -103,6 +103,15 @@ function shouldUseCache(request) {
     const hasLoaderQuery = url.searchParams.has('__loader');
     return !(hasRSCAction || hasRSCTree || hasLoaderQuery);
 }
+const cacheKeyRegExps = new Map();
+function getCacheKeyRegExp(key) {
+    let regExp = cacheKeyRegExps.get(key);
+    if (!regExp) {
+        regExp = new RegExp(key);
+        cacheKeyRegExps.set(key, regExp);
+    }
+    return regExp;
+}
 function matchCacheControl(cacheOption, req) {
     if (!cacheOption || !req) return;
     else {
@@ -110,7 +119,7 @@ function matchCacheControl(cacheOption, req) {
         if (isCacheOptionProvider(cacheOption)) return cacheOption(req);
         const url = req.url;
         const options = Object.entries(cacheOption);
-        for (const [key, option] of options)if ('*' === key || new RegExp(key).test(url)) if ('function' == typeof option) return option(req);
+        for (const [key, option] of options)if ('*' === key || getCacheKeyRegExp(key).test(url)) if ('function' == typeof option) return option(req);
         else return option;
         return;
     }

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

@@ -1,6 +1,6 @@
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { X_MODERNJS_RENDER } from "../../constants.mjs";
-import { getPathname, parseHeaders } from "../../utils/index.mjs";
+import { getPathname } from "../../utils/index.mjs";
 import { getCacheResult, matchCacheControl, shouldUseCache } from "./ssrCache.mjs";
 import { createRequestHandlerConfig } from "./utils.mjs";
 const SERVER_RUNTIME_ENTRY = 'requestHandler';
@@ -8,10 +8,6 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
     const { entryName } = routeInfo;
     const loadableStats = serverManifest.loadableStats || {};
     const routeManifest = serverManifest.routeManifest || {};
-    const headers = parseHeaders(request);
-    if (nodeReq) {
-        for(const key in nodeReq.headers)if (!headers[key]) headers[key] = nodeReq.headers[key];
-    }
     const renderBundle = serverManifest.renderBundles?.[entryName || MAIN_ENTRY_NAME];
     if (!renderBundle) throw new Error(`Can't find renderBundle ${entryName || MAIN_ENTRY_NAME}`);
     const requestHandler = await renderBundle[SERVER_RUNTIME_ENTRY];

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

@@ -1,6 +1,6 @@
 import "node:module";
 import { ServerResponse } from "node:http";
-import { Readable, Writable } from "node:stream";
+import { Readable } from "node:stream";
 import cloneable_readable from "cloneable-readable";
 import { isResFinalized } from "./helper/index.mjs";
 const createWebRequest = (req, res, body)=>{
@@ -66,6 +66,67 @@ const createWebRequest = (req, res, body)=>{
     }
     return originalRequest;
 };
+const noop = ()=>{};
+const isDestroyed = (res)=>'stream' in res ? res.stream.destroyed : res.destroyed;
+const createAbortError = ()=>Object.assign(new Error('The operation was aborted'), {
+        name: 'AbortError',
+        code: 'ABORT_ERR'
+    });
+const writeBody = async (body, res)=>{
+    const reader = body.getReader();
+    let abortError;
+    let cancelled;
+    let resume;
+    let waitsForDrain = false;
+    const onDrain = ()=>resume?.();
+    const abort = (error)=>{
+        if (cancelled) return;
+        abortError = error;
+        cancelled = reader.cancel(error);
+        cancelled.catch(noop);
+        resume?.();
+    };
+    const onClose = ()=>abort(createAbortError());
+    res.on('close', onClose);
+    res.on('error', abort);
+    try {
+        if (isDestroyed(res)) onClose();
+        while(!cancelled){
+            let result;
+            try {
+                result = await reader.read();
+            } catch (error) {
+                res.destroy(error);
+                throw error;
+            }
+            if (result.done || cancelled) break;
+            try {
+                if (!res.write(result.value) && !cancelled) {
+                    if (!waitsForDrain) {
+                        waitsForDrain = true;
+                        res.on('drain', onDrain);
+                    }
+                    await new Promise((resolve)=>{
+                        resume = resolve;
+                    });
+                    resume = void 0;
+                }
+            } catch (error) {
+                abort(error);
+            }
+        }
+        if (cancelled) {
+            await cancelled;
+            throw abortError;
+        }
+        res.end();
+    } finally{
+        res.off('close', onClose);
+        res.off('error', abort);
+        if (waitsForDrain) res.off('drain', onDrain);
+        reader.releaseLock();
+    }
+};
 const sendResponse = async (response, res)=>{
     res.statusMessage = response.statusText;
     res.statusCode = response.status;
@@ -74,10 +135,8 @@ const sendResponse = async (response, res)=>{
     else res.setHeader(key, value);
     if (cookies.length > 0) res.setHeader('set-cookie', cookies);
     if (response.headers.get('Content-Type')?.match(/text\/event-stream/i) && res instanceof ServerResponse) res.flushHeaders();
-    if (response.body) {
-        const writable = Writable.toWeb(res);
-        await response.body.pipeTo(writable);
-    } else res.end();
+    if (response.body) await writeBody(response.body, res);
+    else res.end();
 };
 const handleResponseError = (e, res)=>{
     const err = e instanceof Error ? e : new Error('unknown error', {

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

@@ -26,8 +26,9 @@ const serverStaticPlugin = ()=>({
         }
     });
 function createPublicMiddleware({ pwd, routes }) {
+    const publicRoutes = routes.filter((route)=>!route.isSSR && route.entryPath?.startsWith('public')).sort(sortRoutes);
     return async (c, next)=>{
-        const route = matchPublicRoute(c.req, routes);
+        const route = matchPublicRoute(c.req, publicRoutes);
         if (route) {
             const { entryPath } = route;
             const filename = path.join(pwd, entryPath);
@@ -45,8 +46,8 @@ function createPublicMiddleware({ pwd, routes }) {
         return await next();
     };
 }
-function matchPublicRoute(req, routes) {
-    for (const route of routes.sort(sortRoutes))if (!route.isSSR && route.entryPath.startsWith('public') && req.path.startsWith(route.urlPath)) return route;
+function matchPublicRoute(req, publicRoutes) {
+    return publicRoutes.find((route)=>req.path.startsWith(route.urlPath));
 }
 const isPathInside = (target, root)=>{
     const relative = path.relative(path.resolve(root), path.resolve(target));
@@ -91,26 +92,26 @@ function createStaticMiddleware(options) {
         ...staticReg,
         ...iconReg
     ].join('|')})`);
+    const publicMiddleware = createPublicMiddleware({
+        pwd,
+        routes: routes || []
+    });
     return async (c, next)=>{
         const pageRoute = c.get('route');
         const pathname = c.req.path;
         if (pageRoute && '' === path.extname(pathname)) return next();
         const hit = staticPathRegExp.test(pathname);
-        if (!hit) return createPublicMiddleware({
-            pwd,
-            routes: routes || []
-        })(c, next);
+        if (!hit) return publicMiddleware(c, next);
         else {
             const filepath = path.join(pwd, pathname.replace(pathPrefix, ()=>''));
             if (!isPathInside(filepath, pwd)) return next();
-            if (!await fs.pathExists(filepath)) return next();
-            const mimeType = getMimeType(filepath);
-            if (mimeType) c.header('Content-Type', mimeType);
-            const stat = await fs.lstat(filepath);
-            const { size } = stat;
+            const stat = await fs.stat(filepath).catch(()=>null);
+            if (!stat?.isFile()) return next();
             const chunk = await fileReader.readFileFromSystem(filepath, 'buffer');
-            c.header('Content-Length', String(size));
             if (null === chunk) return next();
+            const mimeType = getMimeType(filepath);
+            if (mimeType) c.header('Content-Type', mimeType);
+            c.header('Content-Length', String(chunk.byteLength));
             const body = new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength);
             return c.body(body, 200);
         }

package/dist/esm-node/plugins/monitors.mjs

@@ -124,13 +124,10 @@ const injectServerTiming = ()=>({
                         const monitors = c.get('monitors');
                         monitors?.push(timingMonitor);
                         await next();
-                        serverTimings.forEach((serverTiming)=>{
-                            const { name, desc, dur } = serverTiming;
-                            const _name = `bd-${metaName}-${name}`;
-                            const value = `${_name};${desc ? `decs="${desc}";` : ''} dur=${dur}`;
-                            c.header(SERVER_TIMING, value, {
-                                append: true
-                            });
+                        if (0 === serverTimings.length) return;
+                        const value = serverTimings.map(({ name, desc, dur })=>`bd-${metaName}-${name};${desc ? `decs="${desc}";` : ''} dur=${dur}`).join(', ');
+                        c.header(SERVER_TIMING, value, {
+                            append: true
                         });
                     }
                 });

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

@@ -3,10 +3,6 @@ import { getLoaderCtx } from "../../helper.mjs";
 import { sortRoutes } from "../../utils/index.mjs";
 import { requestLatencyMiddleware } from "../monitors.mjs";
 export * from "./inject.mjs";
-const DYNAMIC_ROUTE_REG = /\/:./;
-function escapeRegexSpecialChars(path) {
-    return path.replace(/[()[\]{}*+?.^$|\\]/g, '\\$&');
-}
 const renderPlugin = ()=>({
         name: '@modern-js/plugin-render',
         setup (api) {
@@ -20,9 +16,7 @@ const renderPlugin = ()=>({
                 });
                 for (const route of pageRoutes){
                     const { urlPath: originUrlPath } = route;
-                    const isDynamic = DYNAMIC_ROUTE_REG.test(originUrlPath);
-                    const escapedPath = isDynamic ? originUrlPath : escapeRegexSpecialChars(originUrlPath);
-                    const urlPath = escapedPath.endsWith('/') ? `${escapedPath}*` : `${escapedPath}/*`;
+                    const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
                     renderMiddlewares?.forEach((m)=>{
                         middlewares.push({
                             name: m.name,

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

@@ -1,8 +1,9 @@
 import "node:module";
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
+import { getPath } from "hono/utils/url";
 import { X_MODERNJS_RENDER } from "../../constants.mjs";
-import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes, uniqueKeyByRoute } from "../../utils/index.mjs";
+import { ErrorDigest, createErrorHtml, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes, uniqueKeyByRoute } from "../../utils/index.mjs";
 import { csrRscRender } from "./csrRscRender.mjs";
 import { dataHandler } from "./dataHandler.mjs";
 import { renderRscHandler } from "./renderRscHandler.mjs";
@@ -64,11 +65,11 @@ function getHeadersWithoutCookie(headers) {
 }
 async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config }) {
     const router = getRouter(routes);
+    const framework = cutNameByHyphen(metaName || 'modern-js');
+    const fallbackHeader = `x-${framework}-ssr-fallback`;
     return async (req, { monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext, contextForceCSR, reporter })=>{
-        const forMatchpathname = matchPathname ?? getPathname(req);
+        const forMatchpathname = matchPathname ?? getPath(req);
         const [routeInfo, params] = matchRoute(router, forMatchpathname, matchEntryName);
-        const framework = cutNameByHyphen(metaName || 'modern-js');
-        const fallbackHeader = `x-${framework}-ssr-fallback`;
         let fallbackReason = null;
         const fallbackWrapper = (reason)=>{
             fallbackReason = reason;
@@ -94,9 +95,8 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         });
         const finalForceCSR = routeInfo.entryName ? forceCSRMap?.get(routeInfo.entryName) ?? forceCSR : forceCSR;
         const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, finalForceCSR, nodeReq, fallbackWrapper, contextForceCSR);
-        const headerData = parseHeaders(req);
         const onError = (e, key)=>{
-            monitors?.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));
+            monitors?.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(parseHeaders(req)));
         };
         const onTiming = (name, dur)=>{
             monitors?.timing(name, dur, 'SSR');

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

@@ -104,6 +104,15 @@ function shouldUseCache(request) {
     const hasLoaderQuery = url.searchParams.has('__loader');
     return !(hasRSCAction || hasRSCTree || hasLoaderQuery);
 }
+const cacheKeyRegExps = new Map();
+function getCacheKeyRegExp(key) {
+    let regExp = cacheKeyRegExps.get(key);
+    if (!regExp) {
+        regExp = new RegExp(key);
+        cacheKeyRegExps.set(key, regExp);
+    }
+    return regExp;
+}
 function matchCacheControl(cacheOption, req) {
     if (!cacheOption || !req) return;
     else {
@@ -111,7 +120,7 @@ function matchCacheControl(cacheOption, req) {
         if (isCacheOptionProvider(cacheOption)) return cacheOption(req);
         const url = req.url;
         const options = Object.entries(cacheOption);
-        for (const [key, option] of options)if ('*' === key || new RegExp(key).test(url)) if ('function' == typeof option) return option(req);
+        for (const [key, option] of options)if ('*' === key || getCacheKeyRegExp(key).test(url)) if ('function' == typeof option) return option(req);
         else return option;
         return;
     }

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

@@ -1,7 +1,7 @@
 import "node:module";
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { X_MODERNJS_RENDER } from "../../constants.mjs";
-import { getPathname, parseHeaders } from "../../utils/index.mjs";
+import { getPathname } from "../../utils/index.mjs";
 import { getCacheResult, matchCacheControl, shouldUseCache } from "./ssrCache.mjs";
 import { createRequestHandlerConfig } from "./utils.mjs";
 const SERVER_RUNTIME_ENTRY = 'requestHandler';
@@ -9,10 +9,6 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
     const { entryName } = routeInfo;
     const loadableStats = serverManifest.loadableStats || {};
     const routeManifest = serverManifest.routeManifest || {};
-    const headers = parseHeaders(request);
-    if (nodeReq) {
-        for(const key in nodeReq.headers)if (!headers[key]) headers[key] = nodeReq.headers[key];
-    }
     const renderBundle = serverManifest.renderBundles?.[entryName || MAIN_ENTRY_NAME];
     if (!renderBundle) throw new Error(`Can't find renderBundle ${entryName || MAIN_ENTRY_NAME}`);
     const requestHandler = await renderBundle[SERVER_RUNTIME_ENTRY];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.10.1",
+  "version": "3.10.3",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -71,9 +71,9 @@
     "flatted": "^3.4.4",
     "hono": "^4.11.7",
     "ts-deepmerge": "8.0.0",
-    "@modern-js/plugin": "3.10.1",
-    "@modern-js/utils": "3.10.1",
-    "@modern-js/runtime-utils": "3.10.1"
+    "@modern-js/runtime-utils": "3.10.3",
+    "@modern-js/utils": "3.10.3",
+    "@modern-js/plugin": "3.10.3"
   },
   "devDependencies": {
     "@types/cloneable-readable": "^2.0.3",
@@ -81,9 +81,9 @@
     "@types/node": "^20",
     "http-proxy-middleware": "^2.0.10",
     "typescript": "^5",
-    "@modern-js/rslib": "2.68.10",
-    "@modern-js/types": "3.10.1",
-    "@scripts/rstest-config": "2.66.0"
+    "@modern-js/rslib": "3.10.3",
+    "@modern-js/types": "3.10.3",
+    "@scripts/rstest-config": "2.66.2"
   },
   "sideEffects": false,
   "publishConfig": {