@modern-js/server-core 2.50.0 → 2.51.1-alpha.0

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

@@ -29,6 +29,7 @@ const httpCallBack2HonoMid = (handler) => {
     req.__templates = context.get("templates") || {};
     req.__serverManifest = context.get("serverManifest") || {};
     await handler(req, res);
+    await new Promise((resolve) => setTimeout(resolve, 0));
     if (res.headersSent) {
       context.finalized = true;
     } else {

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

@@ -30,7 +30,8 @@ __export(node_exports, {
   injectTemplates: () => import_middlewares.injectTemplates,
   loadServerEnv: () => import_loadServer.loadServerEnv,
   registerMockHandlers: () => import_middlewares.registerMockHandlers,
-  sendResponse: () => import_node.sendResponse
+  sendResponse: () => import_node.sendResponse,
+  writeReadableStreamToWritable: () => import_node.writeReadableStreamToWritable
 });
 module.exports = __toCommonJS(node_exports);
 var import_loadServer = require("./loadServer");
@@ -52,5 +53,6 @@ var import_middlewares = require("./middlewares");
   injectTemplates,
   loadServerEnv,
   registerMockHandlers,
-  sendResponse
+  sendResponse,
+  writeReadableStreamToWritable
 });

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

@@ -30,12 +30,14 @@ var node_exports = {};
 __export(node_exports, {
   createNodeServer: () => createNodeServer,
   createWebRequest: () => createWebRequest,
-  sendResponse: () => sendResponse
+  sendResponse: () => sendResponse,
+  writeReadableStreamToWritable: () => import_polyfills.writeReadableStreamToWritable
 });
 module.exports = __toCommonJS(node_exports);
 var import_node_http = require("node:http");
 var import_stream = require("./polyfills/stream");
 var import_install = require("./polyfills/install");
+var import_polyfills = require("./polyfills");
 (0, import_install.installGlobals)();
 const createWebRequest = (req, res, body) => {
   var _req_url;
@@ -140,5 +142,6 @@ const createNodeServer = async (requestHandler, httpsOptions) => {
 0 && (module.exports = {
   createNodeServer,
   createWebRequest,
-  sendResponse
+  sendResponse,
+  writeReadableStreamToWritable
 });

package/dist/cjs/base/middlewares/customServer/index.js

@@ -105,7 +105,7 @@ class CustomServer {
       return getUnstableMiddlewares(serverMiddleware);
     }
     return async (c, next) => {
-      var _c_env;
+      var _c_env_node_res, _c_env_node, _c_env;
       const reporter = c.get("reporter");
       const locals = {};
       const resArgs = {
@@ -120,7 +120,7 @@ class CustomServer {
       if (isRedirect(resArgs.headers, resArgs.status)) {
         return c.redirect(resArgs.headers.get("Location") || "", resArgs.status || 302);
       }
-      if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : _c_env.node.res.headersSent) {
+      if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : (_c_env_node = _c_env.node) === null || _c_env_node === void 0 ? void 0 : (_c_env_node_res = _c_env_node.res) === null || _c_env_node_res === void 0 ? void 0 : _c_env_node_res.headersSent) {
         return void 0;
       }
       if (!c.finalized) {

package/dist/cjs/base/middlewares/renderHandler/ssrCache.js

@@ -93,17 +93,27 @@ class CacheManager {
         html += chunk;
         return chunk;
       });
-      stream.readable.getReader().closed.then(() => {
-        const current = Date.now();
-        const cache = {
-          val: html,
-          cursor: current
-        };
-        this.container.set(key, JSON.stringify(cache), {
-          ttl
+      const reader = body.getReader();
+      const writer = stream.writable.getWriter();
+      const push = () => {
+        reader.read().then(({ done, value }) => {
+          if (done) {
+            const current = Date.now();
+            const cache = {
+              val: html,
+              cursor: current
+            };
+            this.container.set(key, JSON.stringify(cache), {
+              ttl
+            });
+            writer.close();
+            return;
+          }
+          writer.write(value);
+          push();
         });
-      });
-      body.pipeThrough(stream);
+      };
+      push();
       return {
         data: stream.readable,
         status

package/dist/esm/base/adapters/node/hono.js

@@ -16,26 +16,34 @@ var httpCallBack2HonoMid = function(handler) {
               handler(req, res)
             ];
           case 1:
+            _state.sent();
+            return [
+              4,
+              new Promise(function(resolve) {
+                return setTimeout(resolve, 0);
+              })
+            ];
+          case 2:
             _state.sent();
             if (!res.headersSent)
               return [
                 3,
-                2
+                3
               ];
             context.finalized = true;
             return [
               3,
-              4
+              5
             ];
-          case 2:
+          case 3:
             return [
               4,
               next()
             ];
-          case 3:
-            _state.sent();
-            _state.label = 4;
           case 4:
+            _state.sent();
+            _state.label = 5;
+          case 5:
             return [
               2
             ];

package/dist/esm/base/adapters/node/index.js

@@ -1,6 +1,6 @@
 import { loadServerEnv } from "./loadServer";
 import { httpCallBack2HonoMid, connectMid2HonoMid } from "./hono";
-import { createNodeServer, sendResponse, createWebRequest } from "./node";
+import { createNodeServer, sendResponse, createWebRequest, writeReadableStreamToWritable } from "./node";
 import { bindBFFHandler } from "./bff";
 import { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates, getServerManifest } from "./middlewares";
 export {
@@ -16,5 +16,6 @@ export {
   injectTemplates,
   loadServerEnv,
   registerMockHandlers,
-  sendResponse
+  sendResponse,
+  writeReadableStreamToWritable
 };

package/dist/esm/base/adapters/node/node.js

@@ -5,6 +5,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ServerResponse } from "node:http";
 import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
 import { installGlobals } from "./polyfills/install";
+import { writeReadableStreamToWritable as writeReadableStreamToWritable2 } from "./polyfills";
 installGlobals();
 var createWebRequest = function(req, res, body) {
   var _req_url;
@@ -232,5 +233,6 @@ var createNodeServer = function() {
 export {
   createNodeServer,
   createWebRequest,
-  sendResponse
+  sendResponse,
+  writeReadableStreamToWritable2 as writeReadableStreamToWritable
 };

package/dist/esm/base/middlewares/customServer/index.js

@@ -187,7 +187,7 @@ var CustomServer = /* @__PURE__ */ function() {
               2,
               function() {
                 var _ref = _async_to_generator(function(c, next) {
-                  var _c_env, reporter, locals, resArgs, customMiddlewareCtx, getCost, cost;
+                  var _c_env_node_res, _c_env_node, _c_env, reporter, locals, resArgs, customMiddlewareCtx, getCost, cost;
                   return _ts_generator(this, function(_state2) {
                     switch (_state2.label) {
                       case 0:
@@ -213,7 +213,7 @@ var CustomServer = /* @__PURE__ */ function() {
                             c.redirect(resArgs.headers.get("Location") || "", resArgs.status || 302)
                           ];
                         }
-                        if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : _c_env.node.res.headersSent) {
+                        if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : (_c_env_node = _c_env.node) === null || _c_env_node === void 0 ? void 0 : (_c_env_node_res = _c_env_node.res) === null || _c_env_node_res === void 0 ? void 0 : _c_env_node_res.headersSent) {
                           return [
                             2,
                             void 0

package/dist/esm/base/middlewares/renderHandler/ssrCache.js

@@ -73,7 +73,7 @@ var CacheManager = /* @__PURE__ */ function() {
   _proto.processCache = function processCache(key, render, ssrContext, ttl, status) {
     var _this = this;
     return _async_to_generator(function() {
-      var renderResult, current, cache, body, html, stream;
+      var renderResult, current, cache, body, html, stream, reader, writer, push;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -128,17 +128,28 @@ var CacheManager = /* @__PURE__ */ function() {
               html += chunk;
               return chunk;
             });
-            stream.readable.getReader().closed.then(function() {
-              var current2 = Date.now();
-              var cache2 = {
-                val: html,
-                cursor: current2
-              };
-              _this.container.set(key, JSON.stringify(cache2), {
-                ttl
+            reader = body.getReader();
+            writer = stream.writable.getWriter();
+            push = function() {
+              reader.read().then(function(param) {
+                var done = param.done, value = param.value;
+                if (done) {
+                  var current2 = Date.now();
+                  var cache2 = {
+                    val: html,
+                    cursor: current2
+                  };
+                  _this.container.set(key, JSON.stringify(cache2), {
+                    ttl
+                  });
+                  writer.close();
+                  return;
+                }
+                writer.write(value);
+                push();
               });
-            });
-            body.pipeThrough(stream);
+            };
+            push();
             return [
               2,
               {

package/dist/esm-node/base/adapters/node/hono.js

@@ -5,6 +5,7 @@ const httpCallBack2HonoMid = (handler) => {
     req.__templates = context.get("templates") || {};
     req.__serverManifest = context.get("serverManifest") || {};
     await handler(req, res);
+    await new Promise((resolve) => setTimeout(resolve, 0));
     if (res.headersSent) {
       context.finalized = true;
     } else {

package/dist/esm-node/base/adapters/node/index.js

@@ -1,6 +1,6 @@
 import { loadServerEnv } from "./loadServer";
 import { httpCallBack2HonoMid, connectMid2HonoMid } from "./hono";
-import { createNodeServer, sendResponse, createWebRequest } from "./node";
+import { createNodeServer, sendResponse, createWebRequest, writeReadableStreamToWritable } from "./node";
 import { bindBFFHandler } from "./bff";
 import { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates, getServerManifest } from "./middlewares";
 export {
@@ -16,5 +16,6 @@ export {
   injectTemplates,
   loadServerEnv,
   registerMockHandlers,
-  sendResponse
+  sendResponse,
+  writeReadableStreamToWritable
 };

package/dist/esm-node/base/adapters/node/node.js

@@ -1,6 +1,7 @@
 import { ServerResponse } from "node:http";
 import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
 import { installGlobals } from "./polyfills/install";
+import { writeReadableStreamToWritable as writeReadableStreamToWritable2 } from "./polyfills";
 installGlobals();
 const createWebRequest = (req, res, body) => {
   var _req_url;
@@ -104,5 +105,6 @@ const createNodeServer = async (requestHandler, httpsOptions) => {
 export {
   createNodeServer,
   createWebRequest,
-  sendResponse
+  sendResponse,
+  writeReadableStreamToWritable2 as writeReadableStreamToWritable
 };

package/dist/esm-node/base/middlewares/customServer/index.js

@@ -81,7 +81,7 @@ class CustomServer {
       return getUnstableMiddlewares(serverMiddleware);
     }
     return async (c, next) => {
-      var _c_env;
+      var _c_env_node_res, _c_env_node, _c_env;
       const reporter = c.get("reporter");
       const locals = {};
       const resArgs = {
@@ -96,7 +96,7 @@ class CustomServer {
       if (isRedirect(resArgs.headers, resArgs.status)) {
         return c.redirect(resArgs.headers.get("Location") || "", resArgs.status || 302);
       }
-      if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : _c_env.node.res.headersSent) {
+      if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : (_c_env_node = _c_env.node) === null || _c_env_node === void 0 ? void 0 : (_c_env_node_res = _c_env_node.res) === null || _c_env_node_res === void 0 ? void 0 : _c_env_node_res.headersSent) {
         return void 0;
       }
       if (!c.finalized) {

package/dist/esm-node/base/middlewares/renderHandler/ssrCache.js

@@ -59,17 +59,27 @@ class CacheManager {
         html += chunk;
         return chunk;
       });
-      stream.readable.getReader().closed.then(() => {
-        const current = Date.now();
-        const cache = {
-          val: html,
-          cursor: current
-        };
-        this.container.set(key, JSON.stringify(cache), {
-          ttl
+      const reader = body.getReader();
+      const writer = stream.writable.getWriter();
+      const push = () => {
+        reader.read().then(({ done, value }) => {
+          if (done) {
+            const current = Date.now();
+            const cache = {
+              val: html,
+              cursor: current
+            };
+            this.container.set(key, JSON.stringify(cache), {
+              ttl
+            });
+            writer.close();
+            return;
+          }
+          writer.write(value);
+          push();
         });
-      });
-      body.pipeThrough(stream);
+      };
+      push();
       return {
         data: stream.readable,
         status

package/dist/types/base/adapters/node/index.d.ts

@@ -1,6 +1,6 @@
 export { loadServerEnv } from './loadServer';
 export { httpCallBack2HonoMid, connectMid2HonoMid } from './hono';
 export type { ServerNodeContext, ServerNodeMiddleware } from './hono';
-export { createNodeServer, sendResponse, createWebRequest } from './node';
+export { createNodeServer, sendResponse, createWebRequest, writeReadableStreamToWritable, } from './node';
 export { bindBFFHandler } from './bff';
 export { createStaticMiddleware, registerMockHandlers, injectServerManifest, injectTemplates, getHtmlTemplates, getServerManifest, } from './middlewares';

package/dist/types/base/adapters/node/node.d.ts

@@ -4,6 +4,7 @@ import { Server as NodeServer } from 'node:http';
 import type { Server as NodeHttpsServer } from 'node:https';
 import { NodeRequest, NodeResponse } from '../../../core/plugin';
 import { RequestHandler } from '../../../core/server';
+export { writeReadableStreamToWritable } from './polyfills';
 export declare const createWebRequest: (req: NodeRequest, res: NodeResponse, body?: BodyInit) => Request;
 export declare const sendResponse: (response: Response, res: NodeResponse) => Promise<void>;
 declare const getRequestListener: (handler: RequestHandler) => (req: NodeRequest, res: NodeResponse) => Promise<void>;
@@ -12,4 +13,3 @@ type NodeServerWrapper = (NodeServer | NodeHttpsServer) & {
     getRequestHandler: () => RequestHandler;
 };
 export declare const createNodeServer: (requestHandler: RequestHandler, httpsOptions?: Record<string, unknown>) => Promise<NodeServerWrapper>;
-export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.50.0",
+  "version": "2.51.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,9 +69,9 @@
     "hono": "^3.12.2",
     "isbot": "3.8.0",
     "merge-deep": "^3.0.3",
-    "@modern-js/runtime-utils": "2.50.0",
-    "@modern-js/plugin": "2.50.0",
-    "@modern-js/utils": "2.50.0"
+    "@modern-js/utils": "2.51.0",
+    "@modern-js/plugin": "2.51.0",
+    "@modern-js/runtime-utils": "2.51.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -81,9 +81,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.50.0",
-    "@scripts/build": "2.50.0",
-    "@scripts/jest-config": "2.50.0"
+    "@modern-js/types": "2.51.0",
+    "@scripts/build": "2.51.0",
+    "@scripts/jest-config": "2.51.0"
   },
   "sideEffects": false,
   "publishConfig": {