@modern-js/prod-server 2.19.1 → 2.21.0

package/dist/esm/workerServer.js

@@ -1,163 +1,106 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+import { _ as _create_class } from "@swc/helpers/_/_create_class";
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { Logger } from "./libs/logger";
+import { RouteMatchManager } from "./libs/route";
+import { metrics as defaultMetrics } from "./libs/metrics";
+export var ReturnResponse = /* @__PURE__ */ function() {
+  "use strict";
+  function ReturnResponse2(body, status) {
+    var headers = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+    _class_call_check(this, ReturnResponse2);
+    _define_property(this, "body", void 0);
+    _define_property(this, "status", void 0);
+    _define_property(this, "headers", void 0);
+    this.body = body;
+    this.status = status;
+    this.headers = new Headers(headers);
+    this.headers.set("content-type", "text/html;charset=UTF-8");
   }
-}
-function _async_to_generator(fn) {
-  return function() {
-    var self = this, args = arguments;
-    return new Promise(function(resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+  _create_class(ReturnResponse2, [
+    {
+      /**
+      * Iterate a Object
+      * 1. adds the value if the key does not already exist.
+      * 2. append the value if the key does already exist.
+      *
+      * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/append
+      * @param headers
+      * @returns
+      */
+      key: "appendHeaders",
+      value: function appendHeaders(headers) {
+        var _this = this;
+        Object.entries(headers).forEach(function(param) {
+          var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+          _this.headers.append(key, value.toString());
+        });
+        return this;
       }
-      _next(void 0);
-    });
-  };
-}
-var __generator = function(thisArg, body) {
-  var f, y, t, g, _ = {
-    label: 0,
-    sent: function() {
-      if (t[0] & 1)
-        throw t[1];
-      return t[1];
     },
-    trys: [],
-    ops: []
-  };
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-    return this;
-  }), g;
-  function verb(n) {
-    return function(v) {
-      return step([
-        n,
-        v
-      ]);
-    };
-  }
-  function step(op) {
-    if (f)
-      throw new TypeError("Generator is already executing.");
-    while (_)
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
-          return t;
-        if (y = 0, t)
-          op = [
-            op[0] & 2,
-            t.value
-          ];
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [
-              0
-            ];
-            continue;
-          case 7:
-            op = _.ops.pop();
-            _.trys.pop();
-            continue;
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-              _.ops.push(op);
-              break;
-            }
-            if (t[2])
-              _.ops.pop();
-            _.trys.pop();
-            continue;
-        }
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [
-          6,
-          e
-        ];
-        y = 0;
-      } finally {
-        f = t = 0;
+    {
+      /**
+      * Iterate a Object
+      * 1. adds the value if the key does not already exist.
+      * 2. modify the value if the key does already exist.
+      *
+      * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/set
+      * @param headers
+      * @returns
+      */
+      key: "setHeaders",
+      value: function setHeaders(headers) {
+        var _this = this;
+        Object.entries(headers).forEach(function(param) {
+          var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+          _this.headers.set(key, value.toString());
+        });
+        return this;
       }
-    if (op[0] & 5)
-      throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
-import { Logger } from "./libs/logger";
-import { RouteMatchManager } from "./libs/route";
-import { metrics as defaultMetrics } from "./libs/metrics";
-export var handleUrl = function(url) {
-  return url.replace(/^https?:\/\/.*?\//gi, "/");
-};
+    }
+  ]);
+  return ReturnResponse2;
+}();
+var RESPONSE_NOTFOUND = new ReturnResponse("404: Page not found", 404);
 export var createHandler = function(manifest) {
   var routeMgr = new RouteMatchManager();
   var pages = manifest.pages, routes = manifest.routes;
   routeMgr.reset(routes);
   return function() {
-    var _ref = _async_to_generator(function(ctx) {
-      var _ctx_request, _ctx_request1, _ctx_request2, pageMatch, page, _query, _pathname, _params, params, e;
-      return __generator(this, function(_state) {
+    var _ref = _async_to_generator(function(options) {
+      var request, loadableStats, routeManifest, url, pageMatch, page, responseLike, params, serverRenderContext, body, e;
+      function createServerRequest(url2, request2, params2) {
+        var pathname = url2.pathname, host = url2.host, searchParams = url2.searchParams;
+        var rawHeaders = request2.headers;
+        var headers = {};
+        rawHeaders.forEach(function(value, key) {
+          headers[key] = value;
+        });
+        var query = Object.fromEntries(searchParams);
+        return {
+          pathname: pathname,
+          host: host,
+          headers: headers,
+          params: params2,
+          query: query
+        };
+      }
+      return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
-            pageMatch = routeMgr.match(ctx.url);
+            request = options.request, loadableStats = options.loadableStats, routeManifest = options.routeManifest;
+            url = new URL(request.url);
+            pageMatch = routeMgr.match(url.pathname);
             if (!pageMatch) {
-              ctx.body = "404: Page not found";
-              ctx.status = 404;
               return [
-                2
+                2,
+                RESPONSE_NOTFOUND
               ];
             }
             page = pages[pageMatch.spec.urlPath];
-            (_query = (_ctx_request = ctx.request).query) !== null && _query !== void 0 ? _query : _ctx_request.query = ctx.query;
-            (_pathname = (_ctx_request1 = ctx.request).pathname) !== null && _pathname !== void 0 ? _pathname : _ctx_request1.pathname = ctx.pathname;
-            (_params = (_ctx_request2 = ctx.request).params) !== null && _params !== void 0 ? _params : _ctx_request2.params = ctx.params;
-            params = pageMatch.parseURLParams(ctx.url);
             if (!page.serverRender)
               return [
                 3,
@@ -171,69 +114,70 @@ export var createHandler = function(manifest) {
               ,
               4
             ]);
+            responseLike = {
+              headers: {},
+              statusCode: 200,
+              locals: {},
+              setHeader: function setHeader(key, value) {
+                this.headers[key] = value;
+              },
+              status: function status(code) {
+                this.statusCode = code;
+              }
+            };
+            params = pageMatch.parseURLParams(url.pathname) || {};
+            serverRenderContext = {
+              request: createServerRequest(url, request, params),
+              response: responseLike,
+              loadableStats: loadableStats,
+              routeManifest: routeManifest,
+              redirection: {},
+              template: page.template,
+              entryName: page.entryName,
+              logger: new Logger({
+                level: "warn"
+              }),
+              metrics: defaultMetrics,
+              // FIXME: pass correctly req & res
+              req: request,
+              res: responseLike
+            };
             return [
               4,
-              page.serverRender({
-                entryName: page.entryName,
-                template: page.template,
-                query: ctx.query,
-                request: ctx.request,
-                response: ctx.response,
-                pathname: ctx.pathname,
-                req: ctx.request,
-                res: ctx.response,
-                params: ctx.params || params || {},
-                logger: ctx.logger || new Logger({
-                  level: "warn"
-                }),
-                metrics: ctx.metrics || defaultMetrics,
-                loadableStats: ctx.loadableStats,
-                routeManifest: ctx.routeManifest
-              })
+              page.serverRender(serverRenderContext)
             ];
           case 2:
-            ctx.body = _state.sent();
-            ctx.status = 200;
+            body = _state.sent();
             return [
-              2
+              2,
+              new ReturnResponse(body, responseLike.statusCode, responseLike.headers)
             ];
           case 3:
             e = _state.sent();
-            if (page.template) {
-              ctx.body = page.template;
-              ctx.status = 200;
-              return [
-                2
-              ];
-            } else {
-              ctx.body = "404: not found";
-              ctx.status = 404;
-              return [
-                2
-              ];
-            }
+            console.warn("page(".concat(pageMatch.spec.urlPath, ") serverRender occur error: "));
+            console.warn(e);
             return [
-              3,
-              4
+              2,
+              createResponse(page.template)
             ];
           case 4:
-            if (page.template) {
-              ctx.body = page.template;
-              ctx.status = 200;
-              return [
-                2
-              ];
-            }
-            ctx.body = "404: not found";
-            ctx.status = 404;
+            console.warn("Can't not page(".concat(pageMatch.spec.urlPath, ") serverRender"));
             return [
-              2
+              2,
+              createResponse(page.template)
             ];
         }
       });
     });
-    return function(ctx) {
+    return function(options) {
       return _ref.apply(this, arguments);
     };
   }();
 };
+function createResponse(template) {
+  if (template) {
+    return new ReturnResponse(template, 200);
+  } else {
+    return RESPONSE_NOTFOUND;
+  }
+}

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { URL } from "url";
 import qs from "querystring";
 import { Buffer } from "buffer";

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import cookie from "cookie";
 import { RouteAPI } from "./route";
 import { TemplateAPI } from "./template";

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 export class RouteAPI {
   redirect(url, status = 302) {
     this.url = url;

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { Transform } from "stream";
 const RegList = {
   before: {

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 const LOG_LEVEL = {
   error: 0,
   warn: 1,

package/dist/esm-node/libs/render/cache/page-caches/lru.js

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import LRU from "lru-cache";
 export class LRUCaches {
   init() {

package/dist/esm-node/libs/render/cache/spr.js

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import crypto from "crypto";
 import LRUCache from "lru-cache";
 import { mime } from "@modern-js/utils";

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

@@ -5,7 +5,7 @@ import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
 import { injectServerData } from "./utils";
-export const createRenderHandler = ({ distDir, staticGenerate, forceCSR }) => async function render({ ctx, route, runner }) {
+export const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce }) => async function render({ ctx, route, runner }) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -32,7 +32,8 @@ export const createRenderHandler = ({ distDir, staticGenerate, forceCSR }) => as
         urlPath: route.urlPath,
         bundle: route.bundle,
         template: content.toString(),
-        staticGenerate
+        staticGenerate,
+        nonce
       }, runner);
       return result;
     } catch (err) {

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { fs } from "@modern-js/utils";
 import LRU from "lru-cache";
 const Byte = 1;

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

@@ -5,7 +5,7 @@ import { createLogger, createMetrics } from "./measure";
 import { injectServerDataStream, injectServerData } from "./utils";
 export const render = async (ctx, renderOptions, runner) => {
   var _ctx_res;
-  const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false } = renderOptions;
+  const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false, nonce } = renderOptions;
   const bundleJS = path.join(distDir, bundle);
   const loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
   const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
@@ -40,12 +40,14 @@ export const render = async (ctx, renderOptions, runner) => {
     metrics: void 0,
     req: ctx.req,
     res: ctx.res,
-    enableUnsafeCtx
+    enableUnsafeCtx,
+    nonce
   };
   context.logger = createLogger(context, ctx.logger);
   context.metrics = createMetrics(context, ctx.metrics);
   runner.extendSSRContext(context);
-  const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
+  const bundleJSContent = await Promise.resolve(require(bundleJS));
+  const serverRender = bundleJSContent[SERVER_RENDER_FUNCTION_NAME];
   const content = await cache(serverRender, ctx)(context);
   const { url, status = 302 } = context.redirection;
   if (url) {

package/dist/esm-node/libs/route/index.js

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { RouteMatcher } from "./matcher";
 export class RouteMatchManager {
   // get all routes matches pathname

package/dist/esm-node/libs/route/matcher.js

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { match, pathToRegexp, compile } from "path-to-regexp";
 import { ModernRoute } from "./route";
 const removeTailSlash = (s) => s.replace(/\/+$/, "");

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 export class ModernRoute {
   constructor(routeSpec) {
     _define_property(this, "entryName", void 0);

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import path from "path";
 import { fs, Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS } from "@modern-js/utils";
 import { serverManager, AppContext, ConfigContext, loadPlugins } from "@modern-js/server-core";

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

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createServer } from "http";
 import path from "path";
 import { fs, isPromise, isWebOnly, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
@@ -27,7 +15,7 @@ const SERVER_DIR = "./server";
 export class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _this_conf_server, _this_conf_output;
+    var _conf_bff, _this_conf_server, _conf_security, _this_conf_output;
     this.runner = runner;
     const { distDir, staticGenerate, conf } = this;
     debug("final server conf", this.conf);
@@ -51,7 +39,8 @@ export class ModernServer {
     this.routeRenderHandler = createRenderHandler({
       distDir,
       staticGenerate,
-      forceCSR
+      forceCSR,
+      nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce
     });
     await this.setupBeforeProdMiddleware();
     this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));