@modern-js/server-core 2.49.4 → 2.49.5-alpha.0

package/dist/cjs/base/index.js

@@ -24,6 +24,7 @@ __export(base_exports, {
   createErrorHtml: () => import_utils.createErrorHtml,
   createServerBase: () => import_serverBase.createServerBase,
   favionFallbackMiddleware: () => import_middlewares.favionFallbackMiddleware,
+  getLoaderCtx: () => import_middlewares.getLoaderCtx,
   getRenderHandler: () => import_middlewares.getRenderHandler,
   injectLogger: () => import_middlewares.injectLogger,
   injectReporter: () => import_middlewares.injectReporter,
@@ -44,6 +45,7 @@ var import_serverBase = require("./serverBase");
   createErrorHtml,
   createServerBase,
   favionFallbackMiddleware,
+  getLoaderCtx,
   getRenderHandler,
   injectLogger,
   injectReporter,

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

@@ -18,14 +18,17 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var customServer_exports = {};
 __export(customServer_exports, {
-  CustomServer: () => CustomServer
+  CustomServer: () => CustomServer,
+  getLoaderCtx: () => import_loader2.getLoaderCtx
 });
 module.exports = __toCommonJS(customServer_exports);
 var import_time = require("@modern-js/runtime-utils/time");
 var import_utils = require("../../utils");
 var import_constants = require("../../constants");
+var import_loader = require("./loader");
 var import_context = require("./context");
 var import_base = require("./base");
+var import_loader2 = require("./loader");
 const noop = () => {
 };
 const isHtmlResponse = (response) => {
@@ -93,13 +96,16 @@ class CustomServer {
       }
     };
   }
-  getServerMiddleware() {
+  async getServerMiddleware() {
+    const serverMiddleware = await this.serverMiddlewarePromise;
+    if (!serverMiddleware) {
+      return;
+    }
+    if (Array.isArray(serverMiddleware)) {
+      return getUnstableMiddlewares(serverMiddleware);
+    }
     return async (c, next) => {
-      var _c_env;
-      const serverMiddleware = await this.serverMiddlewarePromise;
-      if (!serverMiddleware) {
-        return next();
-      }
+      var _c_env_node_res, _c_env_node, _c_env;
       const reporter = c.get("reporter");
       const locals = {};
       const resArgs = {
@@ -114,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) {
@@ -132,7 +138,7 @@ class CustomServer {
         middleware: webExtension
       }
     }, {
-      onLast: () => null
+      onLast: () => []
     });
   }
 }
@@ -144,7 +150,41 @@ function isRedirect(headers, code) {
     308
   ].includes(code || 0) || headers.get("Location");
 }
+function getUnstableMiddlewares(serverMiddleware) {
+  return serverMiddleware.map((middleware) => {
+    return async (c, next) => {
+      const context = createMiddlewareContextFromHono(c);
+      return middleware(context, next);
+    };
+  });
+}
+function createMiddlewareContextFromHono(c) {
+  const loaderContext = (0, import_loader.getLoaderCtx)(c);
+  return {
+    get request() {
+      return c.req.raw;
+    },
+    get response() {
+      return c.res;
+    },
+    set response(newRes) {
+      c.res = newRes;
+    },
+    get(key) {
+      return loaderContext.get(key);
+    },
+    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)
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  CustomServer
+  CustomServer,
+  getLoaderCtx
 });

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

@@ -0,0 +1,37 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var loader_exports = {};
+__export(loader_exports, {
+  getLoaderCtx: () => getLoaderCtx
+});
+module.exports = __toCommonJS(loader_exports);
+function getLoaderCtx(c) {
+  const loaderContext = c.get("loaderContext");
+  if (loaderContext) {
+    return loaderContext;
+  } else {
+    const loaderContext2 = /* @__PURE__ */ new Map();
+    c.set("loaderContext", loaderContext2);
+    return loaderContext2;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLoaderCtx
+});

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

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -14,14 +18,19 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var middlewares_exports = {};
+__export(middlewares_exports, {
+  getLoaderCtx: () => import_customServer.getLoaderCtx
+});
 module.exports = __toCommonJS(middlewares_exports);
 __reExport(middlewares_exports, require("./faviconFallback"), module.exports);
 __reExport(middlewares_exports, require("./monitor"), module.exports);
 __reExport(middlewares_exports, require("./renderHandler"), module.exports);
 __reExport(middlewares_exports, require("./logger"), module.exports);
 __reExport(middlewares_exports, require("./frameworkHeader"), module.exports);
+var import_customServer = require("./customServer");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getLoaderCtx,
   ...require("./faviconFallback"),
   ...require("./monitor"),
   ...require("./renderHandler"),

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

@@ -45,6 +45,7 @@ function createRenderHandler(render) {
     const serverManifest = c.get("serverManifest") || {};
     const locals = c.get("locals");
     const metrics = c.get("metrics");
+    const loaderContext = (0, import_customServer.getLoaderCtx)(c);
     const request = c.req.raw;
     const nodeReq = (_c_env_node = c.env.node) === null || _c_env_node === void 0 ? void 0 : _c_env_node.req;
     const res = await render(request, {
@@ -54,6 +55,7 @@ function createRenderHandler(render) {
       templates,
       metrics,
       serverManifest,
+      loaderContext,
       locals
     });
     const { body, status, headers } = res;
@@ -108,8 +110,14 @@ async function bindRenderHandler(server, options) {
       const customServerHookMiddleware = customServer.getHookMiddleware(entryName || "main", routes);
       server.use(urlPath, (0, import_monitor.initReporter)(entryName));
       !disableCustomHook && server.use(urlPath, customServerHookMiddleware);
-      const customServerMiddleware = customServer.getServerMiddleware();
-      server.use(urlPath, customServerMiddleware);
+      const customServerMiddleware = await customServer.getServerMiddleware();
+      if (customServerMiddleware) {
+        if (Array.isArray(customServerMiddleware)) {
+          server.use(urlPath, ...customServerMiddleware);
+        } else {
+          server.use(urlPath, customServerMiddleware);
+        }
+      }
       render && server.all(urlPath, createRenderHandler(render));
     }
   }

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

@@ -23,8 +23,8 @@ __export(render_exports, {
 module.exports = __toCommonJS(render_exports);
 var import_universal = require("@modern-js/utils/universal");
 var import_trie_router = require("hono/router/trie-router");
-var import_constants = require("../../../base/constants");
 var import_utils = require("../../utils");
+var import_constants = require("../../../base/constants");
 var import_dataHandler = require("./dataHandler");
 var import_ssrRender = require("./ssrRender");
 function getRouter(routes) {
@@ -45,7 +45,7 @@ function matchRoute(router, request) {
 }
 async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce, onFallback: onFallbackFn }) {
   const router = getRouter(routes);
-  return async (req, { logger, nodeReq, reporter, templates, serverManifest, locals, metrics }) => {
+  return async (req, { logger, nodeReq, reporter, templates, serverManifest, locals, metrics, loaderContext }) => {
     const [routeInfo, params] = matchRoute(router, req);
     const onFallback = async (reason, error) => {
       return onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
@@ -90,7 +90,8 @@ async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, n
       params,
       locals,
       serverManifest,
-      metrics
+      metrics,
+      loaderContext: loaderContext || /* @__PURE__ */ new Map()
     };
     switch (renderMode) {
       case "data":

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

@@ -35,8 +35,8 @@ module.exports = __toCommonJS(ssrCache_exports);
 var import_stream = require("stream");
 var import_utils = require("@modern-js/utils");
 var import_storer = require("@modern-js/runtime-utils/storer");
-var import_stream2 = require("../../adapters/node/polyfills/stream");
 var import_utils2 = require("../../utils");
+var import_stream2 = require("../../adapters/node/polyfills/stream");
 class CacheManager {
   async getCacheResult(req, cacheControl, render, ssrContext) {
     const key = this.computedKey(req, cacheControl);

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

@@ -49,7 +49,7 @@ const defaultReporter = {
   reportWarn() {
   }
 };
-async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, params, metrics }) {
+async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, params, metrics, loaderContext }) {
   var _serverManifest_renderBundles;
   const { entryName } = routeInfo;
   const loadableStats = serverManifest.loadableStats || {};
@@ -88,6 +88,7 @@ async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, meta
     redirection: {},
     template: html,
     loadableStats,
+    loaderContext,
     routeManifest,
     entryName,
     staticGenerate,

package/dist/cjs/base/utils/index.js

@@ -16,19 +16,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./env"), module.exports);
-__reExport(utils_exports, require("./request"), module.exports);
 __reExport(utils_exports, require("./transformStream"), module.exports);
 __reExport(utils_exports, require("./middlewareCollector"), module.exports);
 __reExport(utils_exports, require("./error"), module.exports);
 __reExport(utils_exports, require("./warmup"), module.exports);
 __reExport(utils_exports, require("./entry"), module.exports);
+__reExport(utils_exports, require("./request"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./env"),
-  ...require("./request"),
   ...require("./transformStream"),
   ...require("./middlewareCollector"),
   ...require("./error"),
   ...require("./warmup"),
-  ...require("./entry")
+  ...require("./entry"),
+  ...require("./request")
 });

package/dist/cjs/base/utils/request.js

@@ -20,18 +20,19 @@ var request_exports = {};
 __export(request_exports, {
   getHost: () => getHost,
   getPathname: () => getPathname,
+  parseCookie: () => parseCookie,
   parseHeaders: () => parseHeaders,
   parseQuery: () => parseQuery
 });
 module.exports = __toCommonJS(request_exports);
-function parseQuery(request) {
-  const { url } = request;
-  const q = url.split("?")[1];
+function parseQuery(req) {
   const query = {};
+  const { url } = req;
+  const q = url.split("?")[1];
   if (q) {
-    q.split("&").forEach((item) => {
-      const [key, value] = item.split("=");
-      query[key] = value;
+    const search = new URLSearchParams(q);
+    search.forEach((v, k) => {
+      query[k] = v;
     });
   }
   return query;
@@ -56,10 +57,22 @@ function getHost(request) {
   host = (host === null || host === void 0 ? void 0 : host.split(/\s*,\s*/, 1)[0]) || "undefined";
   return host;
 }
+function parseCookie(req) {
+  const _cookie = req.headers.get("Cookie");
+  const cookie = {};
+  _cookie === null || _cookie === void 0 ? void 0 : _cookie.trim().split(";").forEach((item) => {
+    const [k, v] = item.trim().split("=");
+    if (k) {
+      cookie[k] = v;
+    }
+  });
+  return cookie;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getHost,
   getPathname,
+  parseCookie,
   parseHeaders,
   parseQuery
 });

package/dist/esm/base/index.js

@@ -1,6 +1,6 @@
 import { createErrorHtml, onError, ErrorDigest } from "./utils";
 import { AGGRED_DIR } from "./constants";
-import { favionFallbackMiddleware, injectReporter, injectLogger, getRenderHandler, bindRenderHandler, logHandler, processedBy } from "./middlewares";
+import { favionFallbackMiddleware, injectReporter, injectLogger, getRenderHandler, bindRenderHandler, logHandler, processedBy, getLoaderCtx } from "./middlewares";
 import { createServerBase } from "./serverBase";
 export {
   AGGRED_DIR,
@@ -9,6 +9,7 @@ export {
   createErrorHtml,
   createServerBase,
   favionFallbackMiddleware,
+  getLoaderCtx,
   getRenderHandler,
   injectLogger,
   injectReporter,

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

@@ -4,8 +4,10 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { time } from "@modern-js/runtime-utils/time";
 import { transformResponse } from "../../utils";
 import { ServerReportTimings } from "../../constants";
+import { getLoaderCtx } from "./loader";
 import { getAfterMatchCtx, getAfterRenderCtx, createCustomMiddlewaresCtx, createAfterStreamingRenderContext } from "./context";
 import { createBaseHookContext } from "./base";
+import { getLoaderCtx as getLoaderCtx2 } from "./loader";
 var noop = function() {
 };
 var isHtmlResponse = function(response) {
@@ -26,7 +28,7 @@ var CustomServer = /* @__PURE__ */ function() {
       }
     }, {
       onLast: function() {
-        return null;
+        return [];
       }
     });
   }
@@ -159,68 +161,84 @@ var CustomServer = /* @__PURE__ */ function() {
   };
   _proto.getServerMiddleware = function getServerMiddleware() {
     var _this = this;
-    return function() {
-      var _ref = _async_to_generator(function(c, next) {
-        var _c_env, serverMiddleware, reporter, locals, resArgs, customMiddlewareCtx, getCost, cost;
-        return _ts_generator(this, function(_state) {
-          switch (_state.label) {
-            case 0:
+    return _async_to_generator(function() {
+      var serverMiddleware;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            return [
+              4,
+              _this.serverMiddlewarePromise
+            ];
+          case 1:
+            serverMiddleware = _state.sent();
+            if (!serverMiddleware) {
               return [
-                4,
-                _this.serverMiddlewarePromise
+                2
               ];
-            case 1:
-              serverMiddleware = _state.sent();
-              if (!serverMiddleware) {
-                return [
-                  2,
-                  next()
-                ];
-              }
-              reporter = c.get("reporter");
-              locals = {};
-              resArgs = {
-                headers: new Headers()
-              };
-              customMiddlewareCtx = createCustomMiddlewaresCtx(c, locals, resArgs);
-              getCost = time();
+            }
+            if (Array.isArray(serverMiddleware)) {
               return [
-                4,
-                serverMiddleware(customMiddlewareCtx)
+                2,
+                getUnstableMiddlewares(serverMiddleware)
               ];
-            case 2:
-              _state.sent();
-              cost = getCost();
-              cost && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(ServerReportTimings.SERVER_MIDDLEWARE, cost));
-              c.set("locals", locals);
-              if (isRedirect(resArgs.headers, resArgs.status)) {
-                return [
-                  2,
-                  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) {
-                return [
-                  2,
-                  void 0
-                ];
-              }
-              if (!c.finalized) {
-                return [
-                  2,
-                  next()
-                ];
-              }
-              return [
-                2
-              ];
-          }
-        });
+            }
+            return [
+              2,
+              function() {
+                var _ref = _async_to_generator(function(c, next) {
+                  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:
+                        reporter = c.get("reporter");
+                        locals = {};
+                        resArgs = {
+                          headers: new Headers()
+                        };
+                        customMiddlewareCtx = createCustomMiddlewaresCtx(c, locals, resArgs);
+                        getCost = time();
+                        return [
+                          4,
+                          serverMiddleware(customMiddlewareCtx)
+                        ];
+                      case 1:
+                        _state2.sent();
+                        cost = getCost();
+                        cost && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(ServerReportTimings.SERVER_MIDDLEWARE, cost));
+                        c.set("locals", locals);
+                        if (isRedirect(resArgs.headers, resArgs.status)) {
+                          return [
+                            2,
+                            c.redirect(resArgs.headers.get("Location") || "", resArgs.status || 302)
+                          ];
+                        }
+                        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
+                          ];
+                        }
+                        if (!c.finalized) {
+                          return [
+                            2,
+                            next()
+                          ];
+                        }
+                        return [
+                          2
+                        ];
+                    }
+                  });
+                });
+                return function(c, next) {
+                  return _ref.apply(this, arguments);
+                };
+              }()
+            ];
+        }
       });
-      return function(c, next) {
-        return _ref.apply(this, arguments);
-      };
-    }();
+    })();
   };
   return CustomServer2;
 }();
@@ -232,6 +250,51 @@ function isRedirect(headers, code) {
     308
   ].includes(code || 0) || headers.get("Location");
 }
+function getUnstableMiddlewares(serverMiddleware) {
+  return serverMiddleware.map(function(middleware) {
+    return function() {
+      var _ref = _async_to_generator(function(c, next) {
+        var context;
+        return _ts_generator(this, function(_state) {
+          context = createMiddlewareContextFromHono(c);
+          return [
+            2,
+            middleware(context, next)
+          ];
+        });
+      });
+      return function(c, next) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  });
+}
+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)
+  };
+}
 export {
-  CustomServer
+  CustomServer,
+  getLoaderCtx2 as getLoaderCtx
 };

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

@@ -0,0 +1,13 @@
+function getLoaderCtx(c) {
+  var loaderContext = c.get("loaderContext");
+  if (loaderContext) {
+    return loaderContext;
+  } else {
+    var loaderContext1 = /* @__PURE__ */ new Map();
+    c.set("loaderContext", loaderContext1);
+    return loaderContext1;
+  }
+}
+export {
+  getLoaderCtx
+};

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

@@ -3,3 +3,7 @@ export * from "./monitor";
 export * from "./renderHandler";
 export * from "./logger";
 export * from "./frameworkHeader";
+import { getLoaderCtx } from "./customServer";
+export {
+  getLoaderCtx
+};