@modern-js/prod-server 2.29.0 → 2.31.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/prod-server
 
+## 2.31.0
+
+### Patch Changes
+
+- 56eaa0b: fix(prod-server): the app maybe undefined, when use renderHtml
+  fix(prod-server): 当使用 renderHtml 时，app 可能是个 undefined
+- d9cc4d8: fix: the issue when set more than two cookie
+  fix: 修复设置多余两个 cookie 时的问题
+- Updated dependencies [1882366]
+  - @modern-js/utils@2.31.0
+  - @modern-js/server-core@2.31.0
+  - @modern-js/plugin@2.31.0
+
+## 2.30.0
+
+### Minor Changes
+
+- a5ee81a: feat(server): add new server hooks `beforeServerInit` & `afterServerInit`
+  feat(server): 添加新的服务端钩子 `beforeServerInit` & `afterServerInit`
+
+### Patch Changes
+
+- 9f21f28: fix(server): add catch and imporve url parse logic in modern server
+  fix(server): 在 modern server 中优化 url 解析逻辑并添加错误捕获并
+- 883692c: fix: can't proxy WebSocket without the initial http request
+  fix: WebSocket 代理只能在首次 http 请求后生效
+- b6ab299: fix(prod-server): remove req bodyParser, let uesr parses body by themself.
+  fix(prod-server): 移除 req bodyParser, 让用户自行解析 body
+- Updated dependencies [a5ee81a]
+  - @modern-js/server-core@2.30.0
+  - @modern-js/utils@2.30.0
+  - @modern-js/plugin@2.30.0
+
 ## 2.29.0
 
 ### Minor Changes

package/dist/cjs/libs/context/context.js

@@ -28,8 +28,12 @@ class ModernServerContext {
     return this.req.metrics;
   }
   get parsedURL() {
-    const url = new _url.URL(this.req.url, MOCK_URL_BASE);
-    return url;
+    try {
+      return new _url.URL(this.req.url, MOCK_URL_BASE);
+    } catch (e) {
+      this.logger.error("Parse URL error", e.stack || e.message);
+      return new _url.URL("/_modern_mock_path", MOCK_URL_BASE);
+    }
   }
   bind() {
     const { req, res } = this;

package/dist/cjs/libs/hook-api/base.js

@@ -31,7 +31,7 @@ class BaseResponse {
     this.res.statusCode = code;
   }
   setCookie(key, value, options) {
-    const cookieValue = String(this.res.getHeader("set-cookie") || "");
+    const cookieValue = this.res.getHeader("set-cookie") || "";
     const fmt = Array.isArray(cookieValue) ? cookieValue : [
       cookieValue
     ].filter(Boolean);

package/dist/cjs/libs/proxy.js

@@ -45,24 +45,42 @@ function formatProxyOptions(proxyOptions) {
 }
 const createProxyHandler = (proxyOptions) => {
   (0, _utils.debug)("createProxyHandler", proxyOptions);
+  const middlewares = [];
+  const handlers = [];
+  const handleUpgrade = (req, socket, head) => {
+    for (const middleware of middlewares) {
+      if (typeof middleware.upgrade === "function") {
+        middleware.upgrade(req, socket, head);
+      }
+    }
+  };
   if (!proxyOptions) {
-    return null;
+    return {
+      handlers,
+      handleUpgrade
+    };
   }
-  const formattedProxy = formatProxyOptions(proxyOptions);
-  const middlewares = formattedProxy.map((option) => {
-    const middleware = (0, _httpproxymiddleware.createProxyMiddleware)(option.context, option);
-    return async (ctx, next) => {
+  const formattedOptionsList = formatProxyOptions(proxyOptions);
+  for (const options of formattedOptionsList) {
+    const middleware = (0, _httpproxymiddleware.createProxyMiddleware)(options.context, options);
+    const handler = async (ctx, next) => {
       const { req, res } = ctx;
-      const bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
+      const bypassUrl = typeof options.bypass === "function" ? options.bypass(req, res, options) : null;
       if (typeof bypassUrl === "boolean") {
         ctx.status = 404;
-        return next();
+        next();
       } else if (typeof bypassUrl === "string") {
         ctx.url = bypassUrl;
-        return next();
+        next();
+      } else {
+        middleware(req, res, next);
       }
-      middleware(req, res, next);
     };
-  });
-  return middlewares;
+    middlewares.push(middleware);
+    handlers.push(handler);
+  }
+  return {
+    handlers,
+    handleUpgrade
+  };
 };

package/dist/cjs/libs/render/ssr.js

@@ -30,8 +30,7 @@ const render = async (ctx, renderOptions, runner) => {
       host: ctx.host,
       query: ctx.query,
       url: ctx.href,
-      headers: ctx.headers,
-      body: ctx.req.body
+      headers: ctx.headers
     },
     response: {
       setHeader: (key, value) => {

package/dist/cjs/server/index.js

@@ -47,7 +47,21 @@ class Server {
     if (!disableHttpServer) {
       this.app = await this.server.createHTTPServer(this.getRequestHandler());
     }
+    {
+      const result = await this.runner.beforeServerInit({
+        app: this.app,
+        server: this.server
+      });
+      ({ app: this.app = this.app, server: this.server } = result);
+    }
     await this.server.onInit(this.runner, this.app);
+    {
+      const result = await this.runner.afterServerInit({
+        app: this.app,
+        server: this.server
+      });
+      ({ app: this.app = this.app, server: this.server } = result);
+    }
     return this;
   }
   /**

package/dist/cjs/server/modernServer.js

@@ -28,18 +28,17 @@ const SERVER_DIR = "./server";
 class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _app, _this_conf_output;
+    var _conf_bff, _app, _app1, _this_conf_output;
     this.runner = runner;
     const { distDir, conf } = this;
     this.initReader();
     (0, _utils1.debug)("final server conf", this.conf);
-    this.proxyHandler = (0, _proxy.createProxyHandler)((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
-    if (this.proxyHandler) {
-      this.proxyHandler.forEach((handler) => {
-        this.addHandler(handler);
-      });
-    }
-    (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
+    const proxyHandlers = (0, _proxy.createProxyHandler)((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
+    (_app = app) === null || _app === void 0 ? void 0 : _app.on("upgrade", proxyHandlers.handleUpgrade);
+    proxyHandlers.handlers.forEach((handler) => {
+      this.addHandler(handler);
+    });
+    (_app1 = app) === null || _app1 === void 0 ? void 0 : _app1.on("close", () => {
       this.reader.close();
     });
     const usageRoutes = this.filterRoutes(this.getRoutes());
@@ -280,7 +279,7 @@ class ModernServer {
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   async routeHandler(context) {
-    const { res, req, reporter } = context;
+    const { res, reporter } = context;
     const matched = this.router.match(context.path);
     if (!matched) {
       this.render404(context);
@@ -299,7 +298,6 @@ class ModernServer {
       await this.handleAPI(context);
       return;
     }
-    await (0, _utils1.bodyParser)(req);
     if (route.entryName) {
       const afterMatchContext = (0, _hookapi.createAfterMatchContext)(context, route.entryName);
       if (this.runMode === _constants.RUN_MODE.FULL) {
@@ -493,7 +491,6 @@ class ModernServer {
     _define_property._(this, "loaderHandler", null);
     _define_property._(this, "frameWebHandler", null);
     _define_property._(this, "frameAPIHandler", null);
-    _define_property._(this, "proxyHandler", null);
     _define_property._(this, "_handler", void 0);
     require("ignore-styles");
     this.pwd = pwd;

package/dist/cjs/utils.js

@@ -36,9 +36,6 @@ _export(exports, {
   },
   isRedirect: function() {
     return isRedirect;
-  },
-  bodyParser: function() {
-    return bodyParser;
   }
 });
 const _utils = require("@modern-js/utils");
@@ -162,33 +159,3 @@ const isRedirect = (code) => {
     308
   ].includes(code);
 };
-function parseBodyTypes(headers, body) {
-  switch (headers["content-type"]) {
-    case "application/json":
-      return JSON.parse(body);
-    default:
-      return body;
-  }
-}
-const getRequestBody = (req) => new Promise((resolve, reject) => {
-  var _req;
-  if (((_req = req) === null || _req === void 0 ? void 0 : _req.method) && req.method.toLowerCase() !== "get") {
-    let body = "";
-    req.on("data", (chunk) => {
-      body += chunk.toString();
-    });
-    req.on("end", () => {
-      resolve(parseBodyTypes(req.headers, body));
-    });
-    req.on("error", (err) => {
-      reject(err);
-    });
-  } else {
-    resolve(void 0);
-  }
-});
-const bodyParser = async (req) => {
-  if (!req.body) {
-    req.body = await getRequestBody(req);
-  }
-};

package/dist/esm/libs/context/context.js

@@ -46,8 +46,12 @@ export var ModernServerContext = /* @__PURE__ */ function() {
     {
       key: "parsedURL",
       get: function get() {
-        var url = new URL(this.req.url, MOCK_URL_BASE);
-        return url;
+        try {
+          return new URL(this.req.url, MOCK_URL_BASE);
+        } catch (e) {
+          this.logger.error("Parse URL error", e.stack || e.message);
+          return new URL("/_modern_mock_path", MOCK_URL_BASE);
+        }
       }
     },
     {

package/dist/esm/libs/hook-api/base.js

@@ -37,7 +37,7 @@ export var BaseResponse = /* @__PURE__ */ function() {
     {
       key: "setCookie",
       value: function setCookie(key, value, options) {
-        var cookieValue = String(this.res.getHeader("set-cookie") || "");
+        var cookieValue = this.res.getHeader("set-cookie") || "";
         var fmt = Array.isArray(cookieValue) ? cookieValue : [
           cookieValue
         ].filter(Boolean);

package/dist/esm/libs/proxy.js

@@ -30,41 +30,89 @@ export function formatProxyOptions(proxyOptions) {
 }
 export var createProxyHandler = function(proxyOptions) {
   debug("createProxyHandler", proxyOptions);
+  var middlewares = [];
+  var handlers = [];
+  var handleUpgrade = function(req, socket, head) {
+    var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
+    try {
+      for (var _iterator2 = middlewares[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+        var middleware = _step2.value;
+        if (typeof middleware.upgrade === "function") {
+          middleware.upgrade(req, socket, head);
+        }
+      }
+    } catch (err) {
+      _didIteratorError2 = true;
+      _iteratorError2 = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+          _iterator2.return();
+        }
+      } finally {
+        if (_didIteratorError2) {
+          throw _iteratorError2;
+        }
+      }
+    }
+  };
   if (!proxyOptions) {
-    return null;
+    return {
+      handlers: handlers,
+      handleUpgrade: handleUpgrade
+    };
   }
-  var formattedProxy = formatProxyOptions(proxyOptions);
-  var middlewares = formattedProxy.map(function(option) {
-    var middleware = createProxyMiddleware(option.context, option);
-    return function() {
-      var _ref = _async_to_generator(function(ctx, next) {
-        var req, res, bypassUrl;
-        return _ts_generator(this, function(_state) {
-          req = ctx.req, res = ctx.res;
-          bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
-          if (typeof bypassUrl === "boolean") {
-            ctx.status = 404;
-            return [
-              2,
-              next()
-            ];
-          } else if (typeof bypassUrl === "string") {
-            ctx.url = bypassUrl;
+  var formattedOptionsList = formatProxyOptions(proxyOptions);
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    var _loop = function() {
+      var options = _step.value;
+      var middleware = createProxyMiddleware(options.context, options);
+      var handler = function() {
+        var _ref = _async_to_generator(function(ctx, next) {
+          var req, res, bypassUrl;
+          return _ts_generator(this, function(_state) {
+            req = ctx.req, res = ctx.res;
+            bypassUrl = typeof options.bypass === "function" ? options.bypass(req, res, options) : null;
+            if (typeof bypassUrl === "boolean") {
+              ctx.status = 404;
+              next();
+            } else if (typeof bypassUrl === "string") {
+              ctx.url = bypassUrl;
+              next();
+            } else {
+              middleware(req, res, next);
+            }
             return [
-              2,
-              next()
+              2
             ];
-          }
-          middleware(req, res, next);
-          return [
-            2
-          ];
+          });
         });
-      });
-      return function(ctx, next) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-  });
-  return middlewares;
+        return function handler2(ctx, next) {
+          return _ref.apply(this, arguments);
+        };
+      }();
+      middlewares.push(middleware);
+      handlers.push(handler);
+    };
+    for (var _iterator = formattedOptionsList[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)
+      _loop();
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  return {
+    handlers: handlers,
+    handleUpgrade: handleUpgrade
+  };
 };

package/dist/esm/libs/render/ssr.js

@@ -25,8 +25,7 @@ export var render = function() {
               host: ctx.host,
               query: ctx.query,
               url: ctx.href,
-              headers: ctx.headers,
-              body: ctx.req.body
+              headers: ctx.headers
             },
             response: {
               setHeader: function(key, value) {

package/dist/esm/server/index.js

@@ -54,7 +54,7 @@ export var Server = /* @__PURE__ */ function() {
           }, _ref_disableHttpServer = _ref.disableHttpServer, disableHttpServer = _ref_disableHttpServer === void 0 ? false : _ref_disableHttpServer;
           var _this = this;
           return _async_to_generator(function() {
-            var options;
+            var options, result, ref, ref1, result1, ref2, ref3;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -112,10 +112,30 @@ export var Server = /* @__PURE__ */ function() {
                 case 8:
                   return [
                     4,
-                    _this.server.onInit(_this.runner, _this.app)
+                    _this.runner.beforeServerInit({
+                      app: _this.app,
+                      server: _this.server
+                    })
                   ];
                 case 9:
+                  result = _state.sent();
+                  ref = result, ref1 = ref.app, _this.app = ref1 === void 0 ? _this.app : ref1, _this.server = ref.server, ref;
+                  return [
+                    4,
+                    _this.server.onInit(_this.runner, _this.app)
+                  ];
+                case 10:
                   _state.sent();
+                  return [
+                    4,
+                    _this.runner.afterServerInit({
+                      app: _this.app,
+                      server: _this.server
+                    })
+                  ];
+                case 11:
+                  result1 = _state.sent();
+                  ref2 = result1, ref3 = ref2.app, _this.app = ref3 === void 0 ? _this.app : ref3, _this.server = ref2.server, ref2;
                   return [
                     2,
                     _this

package/dist/esm/server/modernServer.js

@@ -12,7 +12,7 @@ import { time } from "@modern-js/utils/universal/time";
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serveFile";
-import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop, debug, isRedirect, bodyParser } from "../utils";
+import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop, debug, isRedirect } from "../utils";
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
@@ -44,7 +44,6 @@ export var ModernServer = /* @__PURE__ */ function() {
     _define_property(this, "loaderHandler", null);
     _define_property(this, "frameWebHandler", null);
     _define_property(this, "frameAPIHandler", null);
-    _define_property(this, "proxyHandler", null);
     _define_property(this, "_handler", void 0);
     require("ignore-styles");
     this.pwd = pwd;
@@ -69,7 +68,7 @@ export var ModernServer = /* @__PURE__ */ function() {
         function onInit(runner, app) {
           var _this = this;
           return _async_to_generator(function() {
-            var _conf_bff, _app, _this_conf_output, distDir, conf, usageRoutes;
+            var _conf_bff, _app, _app1, _this_conf_output, distDir, conf, proxyHandlers, usageRoutes;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -77,13 +76,12 @@ export var ModernServer = /* @__PURE__ */ function() {
                   distDir = _this.distDir, conf = _this.conf;
                   _this.initReader();
                   debug("final server conf", _this.conf);
-                  _this.proxyHandler = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
-                  if (_this.proxyHandler) {
-                    _this.proxyHandler.forEach(function(handler) {
-                      _this.addHandler(handler);
-                    });
-                  }
-                  (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", function() {
+                  proxyHandlers = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
+                  (_app = app) === null || _app === void 0 ? void 0 : _app.on("upgrade", proxyHandlers.handleUpgrade);
+                  proxyHandlers.handlers.forEach(function(handler) {
+                    _this.addHandler(handler);
+                  });
+                  (_app1 = app) === null || _app1 === void 0 ? void 0 : _app1.on("close", function() {
                     _this.reader.close();
                   });
                   usageRoutes = _this.filterRoutes(_this.getRoutes());
@@ -669,11 +667,11 @@ export var ModernServer = /* @__PURE__ */ function() {
         function routeHandler(context) {
           var _this = this;
           return _async_to_generator(function() {
-            var res, req, reporter, matched, end, route, afterMatchContext, end1, cost, _afterMatchContext_router, current, url, status, matched1, middlewareContext, end2, cost1, renderResult, responseStream, response, afterRenderContext, end3, cost2;
+            var res, reporter, matched, end, route, afterMatchContext, end1, cost, _afterMatchContext_router, current, url, status, matched1, middlewareContext, end2, cost1, renderResult, responseStream, response, afterRenderContext, end3, cost2;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
-                  res = context.res, req = context.req, reporter = context.reporter;
+                  res = context.res, reporter = context.reporter;
                   matched = _this.router.match(context.path);
                   if (!matched) {
                     _this.render404(context);
@@ -710,22 +708,16 @@ export var ModernServer = /* @__PURE__ */ function() {
                     2
                   ];
                 case 3:
-                  return [
-                    4,
-                    bodyParser(req)
-                  ];
-                case 4:
-                  _state.sent();
                   if (!route.entryName)
                     return [
                       3,
-                      7
+                      6
                     ];
                   afterMatchContext = createAfterMatchContext(context, route.entryName);
                   if (!(_this.runMode === RUN_MODE.FULL))
                     return [
                       3,
-                      6
+                      5
                     ];
                   end1 = time();
                   return [
@@ -734,12 +726,12 @@ export var ModernServer = /* @__PURE__ */ function() {
                       onLast: noop
                     })
                   ];
-                case 5:
+                case 4:
                   _state.sent();
                   cost = end1();
                   reporter.reportTiming("server_hook_after_render", cost);
-                  _state.label = 6;
-                case 6:
+                  _state.label = 5;
+                case 5:
                   if (_this.isSend(res)) {
                     return [
                       2
@@ -762,12 +754,12 @@ export var ModernServer = /* @__PURE__ */ function() {
                     }
                     route = matched1.generate(context.url);
                   }
-                  _state.label = 7;
-                case 7:
+                  _state.label = 6;
+                case 6:
                   if (!_this.frameWebHandler)
                     return [
                       3,
-                      9
+                      8
                     ];
                   res.locals = res.locals || {};
                   middlewareContext = createMiddlewareContext(context);
@@ -776,7 +768,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                     4,
                     _this.frameWebHandler(middlewareContext)
                   ];
-                case 8:
+                case 7:
                   _state.sent();
                   cost1 = end2();
                   reporter.reportTiming("server_middleware", cost1);
@@ -786,13 +778,13 @@ export var ModernServer = /* @__PURE__ */ function() {
                       2
                     ];
                   }
-                  _state.label = 9;
-                case 9:
+                  _state.label = 8;
+                case 8:
                   return [
                     4,
                     _this.handleWeb(context, route)
                   ];
-                case 10:
+                case 9:
                   renderResult = _state.sent();
                   if (!renderResult) {
                     return [
@@ -810,13 +802,13 @@ export var ModernServer = /* @__PURE__ */ function() {
                   if (!route.entryName)
                     return [
                       3,
-                      13
+                      12
                     ];
                   afterRenderContext = createAfterRenderContext(context, response.toString());
                   if (!(_this.runMode === RUN_MODE.FULL))
                     return [
                       3,
-                      12
+                      11
                     ];
                   end3 = time();
                   return [
@@ -825,20 +817,20 @@ export var ModernServer = /* @__PURE__ */ function() {
                       onLast: noop
                     })
                   ];
-                case 11:
+                case 10:
                   _state.sent();
                   cost2 = end3();
                   reporter.reportTiming("server_hook_after_render", cost2);
-                  _state.label = 12;
-                case 12:
+                  _state.label = 11;
+                case 11:
                   if (_this.isSend(res)) {
                     return [
                       2
                     ];
                   }
                   response = afterRenderContext.template.get();
-                  _state.label = 13;
-                case 13:
+                  _state.label = 12;
+                case 12:
                   res.end(response);
                   return [
                     2

package/dist/esm/utils.js

@@ -1,7 +1,5 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createDebugger } from "@modern-js/utils";
 export var debug = createDebugger("prod-server");
 export var mergeExtension = function(users) {
@@ -92,58 +90,3 @@ export var isRedirect = function(code) {
     308
   ].includes(code);
 };
-function parseBodyTypes(headers, body) {
-  switch (headers["content-type"]) {
-    case "application/json":
-      return JSON.parse(body);
-    default:
-      return body;
-  }
-}
-var getRequestBody = function(req) {
-  return new Promise(function(resolve, reject) {
-    var _req;
-    if (((_req = req) === null || _req === void 0 ? void 0 : _req.method) && req.method.toLowerCase() !== "get") {
-      var body = "";
-      req.on("data", function(chunk) {
-        body += chunk.toString();
-      });
-      req.on("end", function() {
-        resolve(parseBodyTypes(req.headers, body));
-      });
-      req.on("error", function(err) {
-        reject(err);
-      });
-    } else {
-      resolve(void 0);
-    }
-  });
-};
-export var bodyParser = function() {
-  var _ref = _async_to_generator(function(req) {
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          if (!!req.body)
-            return [
-              3,
-              2
-            ];
-          return [
-            4,
-            getRequestBody(req)
-          ];
-        case 1:
-          req.body = _state.sent();
-          _state.label = 2;
-        case 2:
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function bodyParser2(req) {
-    return _ref.apply(this, arguments);
-  };
-}();

package/dist/esm-node/libs/context/context.js

@@ -17,8 +17,12 @@ export class ModernServerContext {
     return this.req.metrics;
   }
   get parsedURL() {
-    const url = new URL(this.req.url, MOCK_URL_BASE);
-    return url;
+    try {
+      return new URL(this.req.url, MOCK_URL_BASE);
+    } catch (e) {
+      this.logger.error("Parse URL error", e.stack || e.message);
+      return new URL("/_modern_mock_path", MOCK_URL_BASE);
+    }
   }
   bind() {
     const { req, res } = this;

package/dist/esm-node/libs/hook-api/base.js

@@ -11,7 +11,7 @@ export class BaseResponse {
     this.res.statusCode = code;
   }
   setCookie(key, value, options) {
-    const cookieValue = String(this.res.getHeader("set-cookie") || "");
+    const cookieValue = this.res.getHeader("set-cookie") || "";
     const fmt = Array.isArray(cookieValue) ? cookieValue : [
       cookieValue
     ].filter(Boolean);

package/dist/esm-node/libs/proxy.js

@@ -26,24 +26,42 @@ export function formatProxyOptions(proxyOptions) {
 }
 export const createProxyHandler = (proxyOptions) => {
   debug("createProxyHandler", proxyOptions);
+  const middlewares = [];
+  const handlers = [];
+  const handleUpgrade = (req, socket, head) => {
+    for (const middleware of middlewares) {
+      if (typeof middleware.upgrade === "function") {
+        middleware.upgrade(req, socket, head);
+      }
+    }
+  };
   if (!proxyOptions) {
-    return null;
+    return {
+      handlers,
+      handleUpgrade
+    };
   }
-  const formattedProxy = formatProxyOptions(proxyOptions);
-  const middlewares = formattedProxy.map((option) => {
-    const middleware = createProxyMiddleware(option.context, option);
-    return async (ctx, next) => {
+  const formattedOptionsList = formatProxyOptions(proxyOptions);
+  for (const options of formattedOptionsList) {
+    const middleware = createProxyMiddleware(options.context, options);
+    const handler = async (ctx, next) => {
       const { req, res } = ctx;
-      const bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
+      const bypassUrl = typeof options.bypass === "function" ? options.bypass(req, res, options) : null;
       if (typeof bypassUrl === "boolean") {
         ctx.status = 404;
-        return next();
+        next();
       } else if (typeof bypassUrl === "string") {
         ctx.url = bypassUrl;
-        return next();
+        next();
+      } else {
+        middleware(req, res, next);
       }
-      middleware(req, res, next);
     };
-  });
-  return middlewares;
+    middlewares.push(middleware);
+    handlers.push(handler);
+  }
+  return {
+    handlers,
+    handleUpgrade
+  };
 };

package/dist/esm-node/libs/render/ssr.js

@@ -19,8 +19,7 @@ export const render = async (ctx, renderOptions, runner) => {
       host: ctx.host,
       query: ctx.query,
       url: ctx.href,
-      headers: ctx.headers,
-      body: ctx.req.body
+      headers: ctx.headers
     },
     response: {
       setHeader: (key, value) => {

package/dist/esm-node/server/index.js

@@ -36,7 +36,21 @@ export class Server {
     if (!disableHttpServer) {
       this.app = await this.server.createHTTPServer(this.getRequestHandler());
     }
+    {
+      const result = await this.runner.beforeServerInit({
+        app: this.app,
+        server: this.server
+      });
+      ({ app: this.app = this.app, server: this.server } = result);
+    }
     await this.server.onInit(this.runner, this.app);
+    {
+      const result = await this.runner.afterServerInit({
+        app: this.app,
+        server: this.server
+      });
+      ({ app: this.app = this.app, server: this.server } = result);
+    }
     return this;
   }
   /**

package/dist/esm-node/server/modernServer.js

@@ -6,7 +6,7 @@ import { time } from "@modern-js/utils/universal/time";
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serveFile";
-import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop, debug, isRedirect, bodyParser } from "../utils";
+import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop, debug, isRedirect } from "../utils";
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
@@ -16,18 +16,17 @@ const SERVER_DIR = "./server";
 export class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _app, _this_conf_output;
+    var _conf_bff, _app, _app1, _this_conf_output;
     this.runner = runner;
     const { distDir, conf } = this;
     this.initReader();
     debug("final server conf", this.conf);
-    this.proxyHandler = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
-    if (this.proxyHandler) {
-      this.proxyHandler.forEach((handler) => {
-        this.addHandler(handler);
-      });
-    }
-    (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
+    const proxyHandlers = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
+    (_app = app) === null || _app === void 0 ? void 0 : _app.on("upgrade", proxyHandlers.handleUpgrade);
+    proxyHandlers.handlers.forEach((handler) => {
+      this.addHandler(handler);
+    });
+    (_app1 = app) === null || _app1 === void 0 ? void 0 : _app1.on("close", () => {
       this.reader.close();
     });
     const usageRoutes = this.filterRoutes(this.getRoutes());
@@ -268,7 +267,7 @@ export class ModernServer {
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   async routeHandler(context) {
-    const { res, req, reporter } = context;
+    const { res, reporter } = context;
     const matched = this.router.match(context.path);
     if (!matched) {
       this.render404(context);
@@ -287,7 +286,6 @@ export class ModernServer {
       await this.handleAPI(context);
       return;
     }
-    await bodyParser(req);
     if (route.entryName) {
       const afterMatchContext = createAfterMatchContext(context, route.entryName);
       if (this.runMode === RUN_MODE.FULL) {
@@ -481,7 +479,6 @@ export class ModernServer {
     _define_property(this, "loaderHandler", null);
     _define_property(this, "frameWebHandler", null);
     _define_property(this, "frameAPIHandler", null);
-    _define_property(this, "proxyHandler", null);
     _define_property(this, "_handler", void 0);
     require("ignore-styles");
     this.pwd = pwd;

package/dist/esm-node/utils.js

@@ -119,33 +119,3 @@ export const isRedirect = (code) => {
     308
   ].includes(code);
 };
-function parseBodyTypes(headers, body) {
-  switch (headers["content-type"]) {
-    case "application/json":
-      return JSON.parse(body);
-    default:
-      return body;
-  }
-}
-const getRequestBody = (req) => new Promise((resolve, reject) => {
-  var _req;
-  if (((_req = req) === null || _req === void 0 ? void 0 : _req.method) && req.method.toLowerCase() !== "get") {
-    let body = "";
-    req.on("data", (chunk) => {
-      body += chunk.toString();
-    });
-    req.on("end", () => {
-      resolve(parseBodyTypes(req.headers, body));
-    });
-    req.on("error", (err) => {
-      reject(err);
-    });
-  } else {
-    resolve(void 0);
-  }
-});
-export const bodyParser = async (req) => {
-  if (!req.body) {
-    req.body = await getRequestBody(req);
-  }
-};

package/dist/types/libs/context/context.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/rFczrZA4GO714tUiIeLuz/src/type" />
+/// <reference types=".dts-temp/GWYELZ4kWR3lwdimqb5Eh/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface, Reporter as ModernServerReporter, ServerTiming as ModernServerTiming } from '@modern-js/types';

package/dist/types/libs/proxy.d.ts

@@ -1,4 +1,11 @@
-import { ProxyDetail, NextFunction, BffProxyOptions, ModernServerContext } from '@modern-js/types';
+/// <reference types="node" />
+import { RequestHandler } from 'http-proxy-middleware';
+import { ProxyDetail, BffProxyOptions } from '@modern-js/types';
+import type { ModernServerHandler } from '../type';
 export type { BffProxyOptions };
 export declare function formatProxyOptions(proxyOptions: BffProxyOptions): ProxyDetail[];
-export declare const createProxyHandler: (proxyOptions?: BffProxyOptions) => ((ctx: ModernServerContext, next: NextFunction) => Promise<void>)[] | null;
+export type HttpUpgradeHandler = NonNullable<RequestHandler['upgrade']>;
+export declare const createProxyHandler: (proxyOptions?: BffProxyOptions) => {
+  handlers: ModernServerHandler[];
+  handleUpgrade: (req: import("http-proxy-middleware/dist/types").Request, socket: import("net").Socket, head: any) => void;
+};

package/dist/types/server/modernServer.d.ts

@@ -30,7 +30,6 @@ export declare class ModernServer implements ModernServerInterface {
   private loaderHandler;
   private frameWebHandler;
   private frameAPIHandler;
-  private proxyHandler;
   private _handler;
   constructor({
     pwd,

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/rFczrZA4GO714tUiIeLuz/src/type" />
+/// <reference types=".dts-temp/GWYELZ4kWR3lwdimqb5Eh/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;
@@ -21,5 +21,4 @@ export declare const createMiddlewareCollecter: () => {
 export declare const getStaticReg: (output?: OutputNormalizedConfig, html?: HtmlNormalizedConfig, prefix?: string) => RegExp;
 export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];
 export declare const headersWithoutCookie: (headers: IncomingMessage['headers']) => import("http").IncomingHttpHeaders;
-export declare const isRedirect: (code: number) => boolean;
-export declare const bodyParser: (req: IncomingMessage) => Promise<void>;
+export declare const isRedirect: (code: number) => boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.29.0",
+  "version": "2.31.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -73,9 +73,9 @@
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.29.0",
-    "@modern-js/server-core": "2.29.0",
-    "@modern-js/plugin": "2.29.0"
+    "@modern-js/server-core": "2.31.0",
+    "@modern-js/plugin": "2.31.0",
+    "@modern-js/utils": "2.31.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -92,10 +92,12 @@
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "memfs": "^3.5.1",
-    "@modern-js/types": "2.29.0",
-    "@modern-js/server-core": "2.29.0",
-    "@scripts/jest-config": "2.29.0",
-    "@scripts/build": "2.29.0"
+    "ws": "^8.13.0",
+    "@types/ws": "^8.5.5",
+    "@modern-js/types": "2.31.0",
+    "@modern-js/server-core": "2.31.0",
+    "@scripts/jest-config": "2.31.0",
+    "@scripts/build": "2.31.0"
   },
   "sideEffects": false,
   "publishConfig": {