@modern-js/server-core 2.56.0 → 2.56.2

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

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var customServer_exports = {};
 __export(customServer_exports, {
@@ -146,7 +156,7 @@ class CustomServer {
 function getServerMidFromUnstableMid(serverMiddleware) {
   return serverMiddleware.map((middleware) => {
     return async (c, next) => {
-      const context = createMiddlewareContextFromHono(c);
+      const context = await createMiddlewareContextFromHono(c);
       return middleware(context, next);
     };
   });
@@ -159,11 +169,28 @@ function isRedirect(headers, code) {
     308
   ].includes(code || 0) || headers.get("Location");
 }
-function createMiddlewareContextFromHono(c) {
+async function createMiddlewareContextFromHono(c) {
   const loaderContext = (0, import_loader.getLoaderCtx)(c);
+  let rawRequest = c.req.raw;
+  const method = rawRequest.method.toUpperCase();
+  if (![
+    "GET",
+    "HEAD"
+  ].includes(method) && !rawRequest.body && c.env.node.req) {
+    const streamPath = "../../adapters/node/polyfills/stream";
+    const { createReadableStreamFromReadable } = await Promise.resolve().then(() => __toESM(require(streamPath)));
+    const init = {
+      body: createReadableStreamFromReadable(c.env.node.req),
+      headers: rawRequest.headers,
+      signal: rawRequest.signal,
+      method: rawRequest.method
+    };
+    init.duplex = "half";
+    rawRequest = new Request(rawRequest.url, init);
+  }
   return {
     get request() {
-      return c.req.raw;
+      return rawRequest;
     },
     get response() {
       return c.res;

package/dist/esm/plugins/customServer/index.js

@@ -248,11 +248,19 @@ function getServerMidFromUnstableMid(serverMiddleware) {
       var _ref = _async_to_generator(function(c, next) {
         var context;
         return _ts_generator(this, function(_state) {
-          context = createMiddlewareContextFromHono(c);
-          return [
-            2,
-            middleware(context, next)
-          ];
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                createMiddlewareContextFromHono(c)
+              ];
+            case 1:
+              context = _state.sent();
+              return [
+                2,
+                middleware(context, next)
+              ];
+          }
         });
       });
       return function(c, next) {
@@ -270,29 +278,71 @@ function isRedirect(headers, code) {
   ].includes(code || 0) || headers.get("Location");
 }
 function createMiddlewareContextFromHono(c) {
-  var loaderContext = getLoaderCtx(c);
-  return {
-    get request() {
-      return c.req.raw;
-    },
-    get response() {
-      return c.res;
-    },
-    set response(newRes) {
-      c.res = newRes;
-    },
-    get: function get(key) {
-      return loaderContext.get(key);
-    },
-    set: function set(key, value) {
-      return loaderContext.set(key, value);
-    },
-    status: c.status.bind(c),
-    header: c.header.bind(c),
-    body: c.body.bind(c),
-    html: c.html.bind(c),
-    redirect: c.redirect.bind(c)
-  };
+  return _createMiddlewareContextFromHono.apply(this, arguments);
+}
+function _createMiddlewareContextFromHono() {
+  _createMiddlewareContextFromHono = _async_to_generator(function(c) {
+    var loaderContext, rawRequest, method, streamPath, createReadableStreamFromReadable, init;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          loaderContext = getLoaderCtx(c);
+          rawRequest = c.req.raw;
+          method = rawRequest.method.toUpperCase();
+          if (!(![
+            "GET",
+            "HEAD"
+          ].includes(method) && !rawRequest.body && c.env.node.req))
+            return [
+              3,
+              2
+            ];
+          streamPath = "../../adapters/node/polyfills/stream";
+          return [
+            4,
+            import(streamPath)
+          ];
+        case 1:
+          createReadableStreamFromReadable = _state.sent().createReadableStreamFromReadable;
+          init = {
+            body: createReadableStreamFromReadable(c.env.node.req),
+            headers: rawRequest.headers,
+            signal: rawRequest.signal,
+            method: rawRequest.method
+          };
+          init.duplex = "half";
+          rawRequest = new Request(rawRequest.url, init);
+          _state.label = 2;
+        case 2:
+          return [
+            2,
+            {
+              get request() {
+                return rawRequest;
+              },
+              get response() {
+                return c.res;
+              },
+              set response(newRes) {
+                c.res = newRes;
+              },
+              get: function get(key) {
+                return loaderContext.get(key);
+              },
+              set: function set(key, value) {
+                return loaderContext.set(key, value);
+              },
+              status: c.status.bind(c),
+              header: c.header.bind(c),
+              body: c.body.bind(c),
+              html: c.html.bind(c),
+              redirect: c.redirect.bind(c)
+            }
+          ];
+      }
+    });
+  });
+  return _createMiddlewareContextFromHono.apply(this, arguments);
 }
 export {
   CustomServer,

package/dist/esm-node/plugins/customServer/index.js

@@ -121,7 +121,7 @@ class CustomServer {
 function getServerMidFromUnstableMid(serverMiddleware) {
   return serverMiddleware.map((middleware) => {
     return async (c, next) => {
-      const context = createMiddlewareContextFromHono(c);
+      const context = await createMiddlewareContextFromHono(c);
       return middleware(context, next);
     };
   });
@@ -134,11 +134,28 @@ function isRedirect(headers, code) {
     308
   ].includes(code || 0) || headers.get("Location");
 }
-function createMiddlewareContextFromHono(c) {
+async function createMiddlewareContextFromHono(c) {
   const loaderContext = getLoaderCtx(c);
+  let rawRequest = c.req.raw;
+  const method = rawRequest.method.toUpperCase();
+  if (![
+    "GET",
+    "HEAD"
+  ].includes(method) && !rawRequest.body && c.env.node.req) {
+    const streamPath = "../../adapters/node/polyfills/stream";
+    const { createReadableStreamFromReadable } = await import(streamPath);
+    const init = {
+      body: createReadableStreamFromReadable(c.env.node.req),
+      headers: rawRequest.headers,
+      signal: rawRequest.signal,
+      method: rawRequest.method
+    };
+    init.duplex = "half";
+    rawRequest = new Request(rawRequest.url, init);
+  }
   return {
     get request() {
-      return c.req.raw;
+      return rawRequest;
     },
     get response() {
       return c.res;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.56.0",
+  "version": "2.56.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -52,9 +52,9 @@
     "@web-std/file": "^3.0.3",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.0",
-    "@modern-js/plugin": "2.56.0",
-    "@modern-js/runtime-utils": "2.56.0",
-    "@modern-js/utils": "2.56.0"
+    "@modern-js/plugin": "2.56.2",
+    "@modern-js/runtime-utils": "2.56.2",
+    "@modern-js/utils": "2.56.2"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -64,9 +64,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.56.0",
-    "@scripts/build": "2.56.0",
-    "@scripts/jest-config": "2.56.0"
+    "@modern-js/types": "2.56.2",
+    "@scripts/build": "2.56.2",
+    "@scripts/jest-config": "2.56.2"
   },
   "sideEffects": false,
   "publishConfig": {