@modern-js/server-core 3.9.2 → 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/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,
@@ -178,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/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/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 = [];
@@ -161,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) {

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,
@@ -144,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-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/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 = [];
@@ -164,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) {

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,
@@ -145,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/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.2",
+  "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.2",
-    "@modern-js/runtime-utils": "3.9.2",
-    "@modern-js/utils": "3.9.2"
+    "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.2",
+    "@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__ };