@modern-js/server-core 2.47.1-alpha.4 → 2.47.1-alpha.6

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

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(hono_exports);
 const httpCallBack2HonoMid = (handler) => {
   return async (context, next) => {
     const { req, res } = context.env.node;
-    req.__honoRequest = context.req;
+    req.__Request = context.req.raw;
     req.__templates = context.get("templates") || {};
     await handler(req, res);
     if (res.headersSent) {

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

@@ -28,7 +28,6 @@ var import_stream = require("./polyfills/stream");
 var import_install = require("./polyfills/install");
 (0, import_install.installGlobals)();
 const createWebRequest = (req, res) => {
-  var _req_url;
   const headerRecord = [];
   const len = req.rawHeaders.length;
   for (let i = 0; i < len; i += 2) {
@@ -45,12 +44,9 @@ const createWebRequest = (req, res) => {
     signal: controller.signal
   };
   res.on("close", () => controller.abort());
-  if (!(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
-    init.body = (0, import_stream.createReadableStreamFromReadable)(req);
-    init.duplex = "half";
-  }
   const url = `http://${req.headers.host}${req.url}`;
   const request = new Request(url, init);
+  request.__rawReq = req;
   return request;
 };
 const sendResponse = async (response, res) => {

package/dist/cjs/base/index.js

@@ -27,6 +27,7 @@ __export(base_exports, {
   createNodeServer: () => import_node.createNodeServer,
   createServerBase: () => createServerBase,
   createStaticMiddleware: () => import_node.createStaticMiddleware,
+  createWebRequest: () => import_node.createWebRequest,
   favionFallbackMiddleware: () => import_middlewares.favionFallbackMiddleware,
   getHtmlTemplates: () => import_utils.getHtmlTemplates,
   getRenderHandler: () => import_middlewares.getRenderHandler,
@@ -61,6 +62,7 @@ function createServerBase(options) {
   createNodeServer,
   createServerBase,
   createStaticMiddleware,
+  createWebRequest,
   favionFallbackMiddleware,
   getHtmlTemplates,
   getRenderHandler,

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

@@ -1,7 +1,7 @@
 const httpCallBack2HonoMid = (handler) => {
   return async (context, next) => {
     const { req, res } = context.env.node;
-    req.__honoRequest = context.req;
+    req.__Request = context.req.raw;
     req.__templates = context.get("templates") || {};
     await handler(req, res);
     if (res.headersSent) {

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

@@ -1,9 +1,8 @@
 import { createServer, ServerResponse } from "node:http";
-import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
+import { writeReadableStreamToWritable } from "./polyfills/stream";
 import { installGlobals } from "./polyfills/install";
 installGlobals();
 const createWebRequest = (req, res) => {
-  var _req_url;
   const headerRecord = [];
   const len = req.rawHeaders.length;
   for (let i = 0; i < len; i += 2) {
@@ -20,12 +19,9 @@ const createWebRequest = (req, res) => {
     signal: controller.signal
   };
   res.on("close", () => controller.abort());
-  if (!(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
-    init.body = createReadableStreamFromReadable(req);
-    init.duplex = "half";
-  }
   const url = `http://${req.headers.host}${req.url}`;
   const request = new Request(url, init);
+  request.__rawReq = req;
   return request;
 };
 const sendResponse = async (response, res) => {

package/dist/esm/base/index.js

@@ -1,7 +1,7 @@
 import { ServerBase } from "./serverBase";
 import { createErrorHtml, getHtmlTemplates } from "./utils";
 import { AGGRED_DIR } from "./constants";
-import { httpCallBack2HonoMid, createNodeServer, loadServerEnv, connectMid2HonoMid, sendResponse, createStaticMiddleware, bindBFFHandler, registerMockHandlers, createInjectHtml } from "./adapters/node";
+import { httpCallBack2HonoMid, createNodeServer, loadServerEnv, connectMid2HonoMid, sendResponse, createStaticMiddleware, bindBFFHandler, registerMockHandlers, createInjectHtml, createWebRequest } from "./adapters/node";
 import { favionFallbackMiddleware, injectReporter, getRenderHandler, injectLogger, bindRenderHandler } from "./middlewares";
 function createServerBase(options) {
   if (options == null) {
@@ -20,6 +20,7 @@ export {
   createNodeServer,
   createServerBase,
   createStaticMiddleware,
+  createWebRequest,
   favionFallbackMiddleware,
   getHtmlTemplates,
   getRenderHandler,

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

@@ -1,11 +1,11 @@
 import { Metrics, Reporter } from '@modern-js/types/server';
 import { Logger } from '@modern-js/types';
 import { NodeRequest, NodeResponse } from '../../../core/plugin';
-import { HonoContext, HonoRequest, Middleware, Next } from '../../../core/server';
+import { HonoContext, Middleware, Next } from '../../../core/server';
 type NodeBindings = {
     node: {
         req: NodeRequest & {
-            __honoRequest: HonoRequest;
+            __Request: Request;
             __templates: Record<string, string>;
         };
         res: NodeResponse;

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

@@ -1,7 +1,12 @@
 /// <reference types="node" />
-import { Server as NodeServer } from 'node:http';
+import { Server as NodeServer, type IncomingMessage } from 'node:http';
 import { NodeRequest, NodeResponse } from '../../../core/plugin';
 import { RequestHandler } from '../../../core/server';
+declare global {
+    interface Request {
+        __rawReq?: IncomingMessage;
+    }
+}
 export declare const createWebRequest: (req: NodeRequest, res: NodeResponse) => Request;
 export declare const sendResponse: (response: Response, res: NodeResponse) => Promise<void>;
 declare const getRequestListener: (handler: RequestHandler) => (req: NodeRequest, res: NodeResponse) => Promise<void>;

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

@@ -2,7 +2,7 @@ import type { ServerBaseOptions, Next, Middleware, HonoEnv } from '../core/serve
 import { ServerBase } from './serverBase';
 export { createErrorHtml, getHtmlTemplates } from './utils';
 export { AGGRED_DIR } from './constants';
-export { httpCallBack2HonoMid, createNodeServer, loadServerEnv, connectMid2HonoMid, sendResponse, createStaticMiddleware, bindBFFHandler, registerMockHandlers, createInjectHtml, type ServerNodeContext, type ServerNodeMiddleware, } from './adapters/node';
+export { httpCallBack2HonoMid, createNodeServer, loadServerEnv, connectMid2HonoMid, sendResponse, createStaticMiddleware, bindBFFHandler, registerMockHandlers, createInjectHtml, createWebRequest, type ServerNodeContext, type ServerNodeMiddleware, } from './adapters/node';
 export { favionFallbackMiddleware, injectReporter, getRenderHandler, injectLogger, bindRenderHandler, } from './middlewares';
 export type { BindRenderHandleOptions } from './middlewares';
 export declare function createServerBase<E extends HonoEnv>(options: ServerBaseOptions): ServerBase<E>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.47.1-alpha.4",
+  "version": "2.47.1-alpha.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -54,8 +54,8 @@
     "hono": "^3.12.2",
     "isbot": "3.8.0",
     "merge-deep": "^3.0.3",
-    "@modern-js/plugin": "2.47.0",
     "@modern-js/utils": "2.47.0",
+    "@modern-js/plugin": "2.47.0",
     "@modern-js/runtime-utils": "2.47.0"
   },
   "devDependencies": {