@modern-js/prod-server 2.4.0 → 2.4.1-beta.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/prod-server
 
+## 2.4.1-beta.0
+
+### Patch Changes
+
+- 11c053b: feat: ssr support deploy worker
+
+  feat: ssr 支持边缘部署
+
+- Updated dependencies [11c053b]
+  - @modern-js/server-core@2.4.1-beta.0
+  - @modern-js/utils@2.4.1-beta.0
+
 ## 2.4.0
 
 ### Patch Changes

package/dist/js/modern/libs/logger.js

@@ -0,0 +1,111 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+const LOG_LEVEL = {
+  error: 0,
+  warn: 1,
+  info: 2,
+  debug: 3,
+  log: 4
+};
+const LOG_TYPES = {
+  error: {
+    color: "red",
+    label: "error",
+    level: "error"
+  },
+  info: {
+    color: "cyan",
+    label: "info",
+    level: "info"
+  },
+  success: {
+    color: "green",
+    label: "Success",
+    level: "info"
+  },
+  warn: {
+    color: "yellow",
+    label: "warn",
+    level: "warn"
+  },
+  debug: {
+    color: "red",
+    label: "debug",
+    level: "debug"
+  },
+  log: { level: "log" }
+};
+const DEFAULT_CONFIG = {
+  displayLabel: true,
+  uppercaseLabel: false
+};
+class Logger {
+  constructor(options = {}) {
+    this.level = options.level || LOG_TYPES.log.level;
+    this.config = __spreadValues(__spreadValues({}, DEFAULT_CONFIG), options.config || {});
+    this.types = __spreadValues(__spreadValues({}, LOG_TYPES), options.types || {});
+    this.longestLabel = this.getLongestLabel();
+    Object.keys(this.types).forEach((type) => {
+      this[type] = this._log.bind(this, type);
+    });
+  }
+  _log(type, message, ...args) {
+    if (message === void 0 || message === null) {
+      console.log();
+      return;
+    }
+    if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
+      return;
+    }
+    let label = "";
+    let text = "";
+    const logType = this.types[type];
+    if (this.config.displayLabel && logType.label) {
+      label = this.config.uppercaseLabel ? logType.label.toUpperCase() : logType.label;
+      label = label.padEnd(this.longestLabel.length);
+    }
+    if (message instanceof Error) {
+      if (message.stack) {
+        const [name, ...rest] = message.stack.split("\n");
+        text = `${name}
+${rest.join("\n")}`;
+      } else {
+        text = message.message;
+      }
+    } else {
+      text = `${message}`;
+    }
+    const log = label.length > 0 ? `${label} ${text}` : text;
+    console.log(log, ...args);
+  }
+  getLongestLabel() {
+    let longestLabel = "";
+    Object.keys(this.types).forEach((type) => {
+      const { label = "" } = this.types[type];
+      if (label.length > longestLabel.length) {
+        longestLabel = label;
+      }
+    });
+    return longestLabel;
+  }
+}
+const logger = new Logger();
+logger.Logger = Logger;
+export {
+  Logger,
+  logger
+};

package/dist/js/modern/worker-server.js

@@ -18,7 +18,12 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+import { Logger } from "./libs/logger";
 import { RouteMatchManager } from "./libs/route";
+import { metrics as defaultMetrics } from "./libs/metrics";
+const handleUrl = (url) => {
+  return url.replace(/^https?:\/\/.*?\//gi, "/");
+};
 const createHandler = (manifest) => {
   const routeMgr = new RouteMatchManager();
   const { pages, routes } = manifest;
@@ -36,19 +41,49 @@ const createHandler = (manifest) => {
     (_d = (_c = ctx.request).pathname) != null ? _d : _c.pathname = ctx.pathname;
     (_f = (_e = ctx.request).params) != null ? _f : _e.params = ctx.params;
     const params = pageMatch.parseURLParams(ctx.url);
-    ctx.body = yield page.serverRender({
-      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 || {}
-    });
-    ctx.status = 200;
+    if (page.serverRender) {
+      try {
+        ctx.body = yield 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
+        });
+        ctx.status = 200;
+        return;
+      } catch (e) {
+        if (page.template) {
+          ctx.body = page.template;
+          ctx.status = 200;
+          return;
+        } else {
+          ctx.body = "404: not found";
+          ctx.status = 404;
+          return;
+        }
+      }
+    }
+    if (page.template) {
+      ctx.body = page.template;
+      ctx.status = 200;
+      return;
+    }
+    ctx.body = "404: not found";
+    ctx.status = 404;
   });
 };
 export {
-  createHandler
+  createHandler,
+  handleUrl
 };

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

@@ -0,0 +1,133 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+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 logger_exports = {};
+__export(logger_exports, {
+  Logger: () => Logger,
+  logger: () => logger
+});
+module.exports = __toCommonJS(logger_exports);
+const LOG_LEVEL = {
+  error: 0,
+  warn: 1,
+  info: 2,
+  debug: 3,
+  log: 4
+};
+const LOG_TYPES = {
+  error: {
+    color: "red",
+    label: "error",
+    level: "error"
+  },
+  info: {
+    color: "cyan",
+    label: "info",
+    level: "info"
+  },
+  success: {
+    color: "green",
+    label: "Success",
+    level: "info"
+  },
+  warn: {
+    color: "yellow",
+    label: "warn",
+    level: "warn"
+  },
+  debug: {
+    color: "red",
+    label: "debug",
+    level: "debug"
+  },
+  log: { level: "log" }
+};
+const DEFAULT_CONFIG = {
+  displayLabel: true,
+  uppercaseLabel: false
+};
+class Logger {
+  constructor(options = {}) {
+    this.level = options.level || LOG_TYPES.log.level;
+    this.config = __spreadValues(__spreadValues({}, DEFAULT_CONFIG), options.config || {});
+    this.types = __spreadValues(__spreadValues({}, LOG_TYPES), options.types || {});
+    this.longestLabel = this.getLongestLabel();
+    Object.keys(this.types).forEach((type) => {
+      this[type] = this._log.bind(this, type);
+    });
+  }
+  _log(type, message, ...args) {
+    if (message === void 0 || message === null) {
+      console.log();
+      return;
+    }
+    if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
+      return;
+    }
+    let label = "";
+    let text = "";
+    const logType = this.types[type];
+    if (this.config.displayLabel && logType.label) {
+      label = this.config.uppercaseLabel ? logType.label.toUpperCase() : logType.label;
+      label = label.padEnd(this.longestLabel.length);
+    }
+    if (message instanceof Error) {
+      if (message.stack) {
+        const [name, ...rest] = message.stack.split("\n");
+        text = `${name}
+${rest.join("\n")}`;
+      } else {
+        text = message.message;
+      }
+    } else {
+      text = `${message}`;
+    }
+    const log = label.length > 0 ? `${label} ${text}` : text;
+    console.log(log, ...args);
+  }
+  getLongestLabel() {
+    let longestLabel = "";
+    Object.keys(this.types).forEach((type) => {
+      const { label = "" } = this.types[type];
+      if (label.length > longestLabel.length) {
+        longestLabel = label;
+      }
+    });
+    return longestLabel;
+  }
+}
+const logger = new Logger();
+logger.Logger = Logger;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Logger,
+  logger
+});

package/dist/js/node/worker-server.js

@@ -37,10 +37,16 @@ var __async = (__this, __arguments, generator) => {
 };
 var worker_server_exports = {};
 __export(worker_server_exports, {
-  createHandler: () => createHandler
+  createHandler: () => createHandler,
+  handleUrl: () => handleUrl
 });
 module.exports = __toCommonJS(worker_server_exports);
+var import_logger = require("./libs/logger");
 var import_route = require("./libs/route");
+var import_metrics = require("./libs/metrics");
+const handleUrl = (url) => {
+  return url.replace(/^https?:\/\/.*?\//gi, "/");
+};
 const createHandler = (manifest) => {
   const routeMgr = new import_route.RouteMatchManager();
   const { pages, routes } = manifest;
@@ -58,20 +64,50 @@ const createHandler = (manifest) => {
     (_d = (_c = ctx.request).pathname) != null ? _d : _c.pathname = ctx.pathname;
     (_f = (_e = ctx.request).params) != null ? _f : _e.params = ctx.params;
     const params = pageMatch.parseURLParams(ctx.url);
-    ctx.body = yield page.serverRender({
-      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 || {}
-    });
-    ctx.status = 200;
+    if (page.serverRender) {
+      try {
+        ctx.body = yield 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 import_logger.Logger({
+            level: "warn"
+          }),
+          metrics: ctx.metrics || import_metrics.metrics,
+          loadableStats: ctx.loadableStats,
+          routeManifest: ctx.routeManifest
+        });
+        ctx.status = 200;
+        return;
+      } catch (e) {
+        if (page.template) {
+          ctx.body = page.template;
+          ctx.status = 200;
+          return;
+        } else {
+          ctx.body = "404: not found";
+          ctx.status = 404;
+          return;
+        }
+      }
+    }
+    if (page.template) {
+      ctx.body = page.template;
+      ctx.status = 200;
+      return;
+    }
+    ctx.body = "404: not found";
+    ctx.status = 404;
   });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createHandler
+  createHandler,
+  handleUrl
 });

package/dist/js/treeshaking/libs/context/context.js

@@ -75,7 +75,7 @@ var ModernServerContext = /*#__PURE__*/ function() {
             key: "bind",
             value: function bind() {
                 var _this = this;
-                var ref = this, req = ref.req, res = ref.res;
+                var _this1 = this, req = _this1.req, res = _this1.res;
                 req.get = function(key) {
                     return _this.getReqHeader(key);
                 };
@@ -140,7 +140,7 @@ var ModernServerContext = /*#__PURE__*/ function() {
         {
             key: "fresh",
             get: function get() {
-                var ref = this, status = ref.status, res = ref.res, method = ref.method;
+                var _this = this, status = _this.status, res = _this.res, method = _this.method;
                 if ("GET" !== method && "HEAD" !== method) {
                     return false;
                 }

package/dist/js/treeshaking/libs/hook-api/index.js

@@ -198,7 +198,7 @@ var Response = /*#__PURE__*/ function() {
             key: "raw",
             value: function raw(body, options) {
                 var _this = this;
-                var ref = options || {}, status = ref.status, _headers = ref.headers, headers = _headers === void 0 ? {} : _headers;
+                var _ref = options || {}, status = _ref.status, _ref_headers = _ref.headers, headers = _ref_headers === void 0 ? {} : _ref_headers;
                 Object.entries(headers).forEach(function(param) {
                     var _param = _slicedToArray(param, 2), key = _param[0], value = _param[1];
                     _this.res.setHeader(key, value);

package/dist/js/treeshaking/libs/logger.js

@@ -0,0 +1,205 @@
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function _toArray(arr) {
+    return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest();
+}
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+var LOG_LEVEL = {
+    error: 0,
+    warn: 1,
+    info: 2,
+    debug: 3,
+    log: 4
+};
+var LOG_TYPES = {
+    error: {
+        color: "red",
+        label: "error",
+        level: "error"
+    },
+    info: {
+        color: "cyan",
+        label: "info",
+        level: "info"
+    },
+    success: {
+        color: "green",
+        label: "Success",
+        level: "info"
+    },
+    warn: {
+        color: "yellow",
+        label: "warn",
+        level: "warn"
+    },
+    debug: {
+        color: "red",
+        label: "debug",
+        level: "debug"
+    },
+    log: {
+        level: "log"
+    }
+};
+var DEFAULT_CONFIG = {
+    displayLabel: true,
+    uppercaseLabel: false
+};
+var Logger = /*#__PURE__*/ function() {
+    "use strict";
+    function Logger() {
+        var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+        var _this = this;
+        _classCallCheck(this, Logger);
+        _defineProperty(this, "level", void 0);
+        _defineProperty(this, "config", void 0);
+        _defineProperty(this, "types", void 0);
+        _defineProperty(this, "longestLabel", void 0);
+        this.level = options.level || LOG_TYPES.log.level;
+        this.config = _objectSpread({}, DEFAULT_CONFIG, options.config || {});
+        this.types = _objectSpread({}, LOG_TYPES, options.types || {});
+        this.longestLabel = this.getLongestLabel();
+        Object.keys(this.types).forEach(function(type) {
+            _this[type] = _this._log.bind(_this, type);
+        });
+    }
+    _createClass(Logger, [
+        {
+            key: "_log",
+            value: function _log(type, message) {
+                for(var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++){
+                    args[_key - 2] = arguments[_key];
+                }
+                var _console;
+                if (message === void 0 || message === null) {
+                    console.log();
+                    return;
+                }
+                if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
+                    return;
+                }
+                var label = "";
+                var text = "";
+                var logType = this.types[type];
+                if (this.config.displayLabel && logType.label) {
+                    label = this.config.uppercaseLabel ? logType.label.toUpperCase() : logType.label;
+                    label = label.padEnd(this.longestLabel.length);
+                }
+                if (_instanceof(message, Error)) {
+                    if (message.stack) {
+                        var _message_stack_split = _toArray(message.stack.split("\n")), name = _message_stack_split[0], rest = _message_stack_split.slice(1);
+                        text = "".concat(name, "\n").concat(rest.join("\n"));
+                    } else {
+                        text = message.message;
+                    }
+                } else {
+                    text = "".concat(message);
+                }
+                var log = label.length > 0 ? "".concat(label, " ").concat(text) : text;
+                (_console = console).log.apply(_console, [
+                    log
+                ].concat(_toConsumableArray(args)));
+            }
+        },
+        {
+            key: "getLongestLabel",
+            value: function getLongestLabel() {
+                var _this = this;
+                var longestLabel = "";
+                Object.keys(this.types).forEach(function(type) {
+                    var _this_types_type = _this.types[type], _this_types_type_label = _this_types_type.label, label = _this_types_type_label === void 0 ? "" : _this_types_type_label;
+                    if (label.length > longestLabel.length) {
+                        longestLabel = label;
+                    }
+                });
+                return longestLabel;
+            }
+        }
+    ]);
+    return Logger;
+}();
+var logger = new Logger();
+logger.Logger = Logger;
+export { Logger, logger };

package/dist/js/treeshaking/libs/render/cache/__tests__/cache.fun.test.js

@@ -209,7 +209,7 @@ describe("test spr util functions", function() {
         expect(htmlWithHead).toBe('<head><meta name="x-moden-spr" content="'.concat(hash, '"></head><div>123</div>'));
     });
     it("should only invoke func one time", /*#__PURE__*/ _asyncToGenerator(function() {
-        var index, fn, key, ref, res1, res2;
+        var index, fn, key, _ref, res1, res2;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -236,10 +236,10 @@ describe("test spr util functions", function() {
                         ])
                     ];
                 case 1:
-                    ref = _slicedToArray.apply(void 0, [
+                    _ref = _slicedToArray.apply(void 0, [
                         _state.sent(),
                         2
-                    ]), res1 = ref[0], res2 = ref[1];
+                    ]), res1 = _ref[0], res2 = _ref[1];
                     expect(res1.isOrigin && res2.isOrigin).toBe(false);
                     expect(res1.isOrigin || res2.isOrigin).toBe(true);
                     expect(res1.value).toBe(1);

package/dist/js/treeshaking/libs/render/cache/__tests__/cache.test.js

@@ -517,7 +517,7 @@ describe("cache", function() {
         });
     }));
     it("should match cache correctly", /*#__PURE__*/ _asyncToGenerator(function() {
-        var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheable, baseCacheable, matchOne, other, _requestOpt, requestOpt, cacheConfig, content, context, matchContext, cacheResult, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, notMatch, notMatchContext, nothing, err, err;
+        var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheable, baseCacheable, matchOne, other, _baseCacheable_requestOpt, requestOpt, cacheConfig, content, context, matchContext, cacheResult, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, notMatch, notMatchContext, nothing, err, err;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -541,7 +541,7 @@ describe("cache", function() {
                     ];
                     cacheable = _step.value;
                     _cacheable = _toArray(cacheable), baseCacheable = _cacheable[0], matchOne = _cacheable[1], other = _cacheable.slice(2);
-                    _requestOpt = baseCacheable.requestOpt, requestOpt = _requestOpt === void 0 ? {} : _requestOpt, cacheConfig = baseCacheable.cacheConfig, content = baseCacheable.content;
+                    _baseCacheable_requestOpt = baseCacheable.requestOpt, requestOpt = _baseCacheable_requestOpt === void 0 ? {} : _baseCacheable_requestOpt, cacheConfig = baseCacheable.cacheConfig, content = baseCacheable.content;
                     context = {
                         entry: "",
                         pathname: requestOpt.url,

package/dist/js/treeshaking/libs/render/cache/spr.js

@@ -205,8 +205,8 @@ var CacheManager = /*#__PURE__*/ function() {
             max: Math.min(MAX_SIZE_EACH_CLUSTER, 600) * 1024 * 1024,
             length: function length(n) {
                 var len = n.caches.keys().reduce(function(total, cur) {
-                    var ref;
-                    return total + (((ref = n.caches.peek(cur)) === null || ref === void 0 ? void 0 : ref.size) || 0);
+                    var _n_caches_peek;
+                    return total + (((_n_caches_peek = n.caches.peek(cur)) === null || _n_caches_peek === void 0 ? void 0 : _n_caches_peek.size) || 0);
                 }, 1);
                 return len;
             }
@@ -266,9 +266,9 @@ var CacheManager = /*#__PURE__*/ function() {
         {
             key: "queryFactor",
             value: function queryFactor(context, data) {
-                var ref, ref1;
-                var queryKeys = (ref = data.includes) === null || ref === void 0 ? void 0 : ref.query;
-                var queryMatches = (ref1 = data.matches) === null || ref1 === void 0 ? void 0 : ref1.query;
+                var _data_includes, _data_matches;
+                var queryKeys = (_data_includes = data.includes) === null || _data_includes === void 0 ? void 0 : _data_includes.query;
+                var queryMatches = (_data_matches = data.matches) === null || _data_matches === void 0 ? void 0 : _data_matches.query;
                 if (!queryKeys || queryKeys.length === 0) {
                     return null;
                 }
@@ -280,9 +280,9 @@ var CacheManager = /*#__PURE__*/ function() {
         {
             key: "headerFactor",
             value: function headerFactor(context, data) {
-                var ref, ref1;
-                var headerKeys = (ref = data.includes) === null || ref === void 0 ? void 0 : ref.header;
-                var headerMatches = (ref1 = data.matches) === null || ref1 === void 0 ? void 0 : ref1.header;
+                var _data_includes, _data_matches;
+                var headerKeys = (_data_includes = data.includes) === null || _data_includes === void 0 ? void 0 : _data_includes.header;
+                var headerMatches = (_data_matches = data.matches) === null || _data_matches === void 0 ? void 0 : _data_matches.header;
                 if (!headerKeys || headerKeys.length === 0) {
                     return null;
                 }

package/dist/js/treeshaking/libs/render/measure.js

@@ -85,7 +85,7 @@ function _unsupportedIterableToArray(o, minLen) {
 import { headersWithoutCookie } from "../../utils";
 var createMetrics = function(context, metrics) {
     var entry = context.entryName, request = context.request;
-    var ref = request || {}, _pathname = ref.pathname, pathname = _pathname === void 0 ? "" : _pathname;
+    var _ref = request || {}, _ref_pathname = _ref.pathname, pathname = _ref_pathname === void 0 ? "" : _ref_pathname;
     var emitTimer = function(name, cost) {
         var tags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
         metrics.emitTimer(name, cost, _objectSpreadProps(_objectSpread({}, tags), {
@@ -107,7 +107,7 @@ var createMetrics = function(context, metrics) {
 };
 var createLogger = function(serverContext, logger) {
     var request = serverContext.request || {};
-    var _headers = request.headers, headers = _headers === void 0 ? {} : _headers, _pathname = request.pathname, pathname = _pathname === void 0 ? "" : _pathname;
+    var _request_headers = request.headers, headers = _request_headers === void 0 ? {} : _request_headers, _request_pathname = request.pathname, pathname = _request_pathname === void 0 ? "" : _request_pathname;
     var debug = function(message) {
         for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
             args[_key - 1] = arguments[_key];

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

@@ -129,7 +129,7 @@ import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
 var render = function() {
     var _ref = _asyncToGenerator(function(ctx, renderOptions, runner) {
-        var ref, urlPath, bundle, distDir, template, entryName, staticGenerate, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, serverRender, content, _redirection, url, _status, status;
+        var _ctx_res, urlPath, bundle, distDir, template, entryName, staticGenerate, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, serverRender, content, _context_redirection, url, _context_redirection_status, status;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -157,7 +157,7 @@ var render = function() {
                             status: function(code) {
                                 ctx.res.statusCode = code;
                             },
-                            locals: ((ref = ctx.res) === null || ref === void 0 ? void 0 : ref.locals) || {}
+                            locals: ((_ctx_res = ctx.res) === null || _ctx_res === void 0 ? void 0 : _ctx_res.locals) || {}
                         },
                         redirection: {},
                         template: template,
@@ -180,7 +180,7 @@ var render = function() {
                     ];
                 case 1:
                     content = _state.sent();
-                    _redirection = context.redirection, url = _redirection.url, _status = _redirection.status, status = _status === void 0 ? 302 : _status;
+                    _context_redirection = context.redirection, url = _context_redirection.url, _context_redirection_status = _context_redirection.status, status = _context_redirection_status === void 0 ? 302 : _context_redirection_status;
                     if (url) {
                         return [
                             2,

package/dist/js/treeshaking/libs/route/matcher.js

@@ -89,9 +89,9 @@ var RouteMatcher = /*#__PURE__*/ function() {
                 if (!this.urlReg) {
                     return this.urlPath.length;
                 } else {
-                    var ref;
+                    var _result_;
                     var result = this.urlReg.exec(pathname);
-                    return (result === null || result === void 0 ? void 0 : (ref = result[0]) === null || ref === void 0 ? void 0 : ref.length) || null;
+                    return (result === null || result === void 0 ? void 0 : (_result_ = result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
                 }
             }
         },

package/dist/js/treeshaking/libs/serve-file.js

@@ -147,10 +147,10 @@ var createStaticFileHandler = function(rules) {
     var output = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
     return function() {
         var _ref = _asyncToGenerator(function(context, next) {
-            var requestUrl, req, res, _assetPrefix, assetPrefix, hitRule, resume;
+            var requestUrl, req, res, _output_assetPrefix, assetPrefix, hitRule, resume;
             return __generator(this, function(_state) {
                 requestUrl = context.url, req = context.req, res = context.res;
-                _assetPrefix = output.assetPrefix, assetPrefix = _assetPrefix === void 0 ? "/" : _assetPrefix;
+                _output_assetPrefix = output.assetPrefix, assetPrefix = _output_assetPrefix === void 0 ? "/" : _output_assetPrefix;
                 hitRule = rules.find(function(item) {
                     if (isString(item.path) && requestUrl.startsWith(item.path)) {
                         return true;

package/dist/js/treeshaking/server/index.js

@@ -417,13 +417,13 @@ var Server = /*#__PURE__*/ function() {
             value: function createHookRunner() {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var options, _internalPlugins, internalPlugins, pwd, _plugins, plugins, serverPlugins, loadedPlugins, hooksRunner;
+                    var options, _options_internalPlugins, internalPlugins, pwd, _options_plugins, plugins, serverPlugins, loadedPlugins, hooksRunner;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 serverManager.clear();
                                 options = _this.options;
-                                _internalPlugins = options.internalPlugins, internalPlugins = _internalPlugins === void 0 ? INTERNAL_SERVER_PLUGINS : _internalPlugins, pwd = options.pwd, _plugins = options.plugins, plugins = _plugins === void 0 ? [] : _plugins;
+                                _options_internalPlugins = options.internalPlugins, internalPlugins = _options_internalPlugins === void 0 ? INTERNAL_SERVER_PLUGINS : _options_internalPlugins, pwd = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins;
                                 serverPlugins = _this.serverConfig.plugins || [];
                                 loadedPlugins = loadPlugins(pwd, _toConsumableArray(serverPlugins).concat(_toConsumableArray(plugins)), {
                                     internalPlugins: internalPlugins
@@ -471,7 +471,7 @@ var Server = /*#__PURE__*/ function() {
             key: "initAppContext",
             value: function initAppContext() {
                 var options = this.options;
-                var appDirectory = options.pwd, _plugins = options.plugins, plugins = _plugins === void 0 ? [] : _plugins, config = options.config;
+                var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config;
                 var serverPlugins = plugins.map(function(p) {
                     return {
                         server: p

package/dist/js/treeshaking/server/modern-server.js

@@ -257,14 +257,14 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function onInit(runner, app) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var ref, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp;
+                    var _conf_bff, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 _this.runner = runner;
                                 distDir = _this.distDir, staticGenerate = _this.staticGenerate, conf = _this.conf;
                                 debug("final server conf", _this.conf);
-                                _this.proxyHandler = createProxyHandler((ref = conf.bff) === null || ref === void 0 ? void 0 : ref.proxy);
+                                _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);
@@ -502,13 +502,13 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function prepareFrameHandler(options) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var workDir, runner, ref, onlyApi, onlyWeb, _ref, getMiddlewares, collector, ref1, pluginAPIExt, pluginWebExt, apiDir, serverDir, webExtension, apiExtension;
+                    var workDir, runner, _ref, onlyApi, onlyWeb, _createMiddlewareCollecter, getMiddlewares, collector, _getMiddlewares, pluginAPIExt, pluginWebExt, apiDir, serverDir, webExtension, apiExtension;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 workDir = _this.workDir, runner = _this.runner;
-                                ref = options || {}, onlyApi = ref.onlyApi, onlyWeb = ref.onlyWeb;
-                                _ref = createMiddlewareCollecter(), getMiddlewares = _ref.getMiddlewares, collector = _objectWithoutProperties(_ref, [
+                                _ref = options || {}, onlyApi = _ref.onlyApi, onlyWeb = _ref.onlyWeb;
+                                _createMiddlewareCollecter = createMiddlewareCollecter(), getMiddlewares = _createMiddlewareCollecter.getMiddlewares, collector = _objectWithoutProperties(_createMiddlewareCollecter, [
                                     "getMiddlewares"
                                 ]);
                                 return [
@@ -517,7 +517,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                 ];
                             case 1:
                                 _state.sent();
-                                ref1 = getMiddlewares(), pluginAPIExt = ref1.api, pluginWebExt = ref1.web;
+                                _getMiddlewares = getMiddlewares(), pluginAPIExt = _getMiddlewares.api, pluginWebExt = _getMiddlewares.web;
                                 apiDir = path.join(workDir, API_DIR);
                                 serverDir = path.join(workDir, SERVER_DIR);
                                 return [
@@ -731,7 +731,7 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function routeHandler(context) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var res, matched, route, afterMatchContext, _router, current, url, status, matched2, middlewareContext, renderResult, contentStream, response, afterRenderContext;
+                    var res, matched, route, afterMatchContext, _afterMatchContext_router, current, url, status, matched2, middlewareContext, renderResult, contentStream, response, afterRenderContext;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -778,7 +778,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                         2
                                     ];
                                 }
-                                _router = afterMatchContext.router, current = _router.current, url = _router.url, status = _router.status;
+                                _afterMatchContext_router = afterMatchContext.router, current = _afterMatchContext_router.current, url = _afterMatchContext_router.url, status = _afterMatchContext_router.status;
                                 if (url) {
                                     _this.redirect(res, url, status);
                                     return [

package/dist/js/treeshaking/utils.js

@@ -90,7 +90,7 @@ var useLocalPrefix = function(url) {
 };
 var getStaticReg = function() {
     var output = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, html = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var tmp = output.distPath, ref = tmp === void 0 ? {} : tmp, cssPath = ref.css, jsPath = ref.js, mediaPath = ref.media, _assetPrefix = output.assetPrefix, assetPrefix = _assetPrefix === void 0 ? "/" : _assetPrefix;
+    var tmp = output.distPath, _ref = tmp === void 0 ? {} : tmp, cssPath = _ref.css, jsPath = _ref.js, mediaPath = _ref.media, _output_assetPrefix = output.assetPrefix, assetPrefix = _output_assetPrefix === void 0 ? "/" : _output_assetPrefix;
     var favicon = html.favicon, faviconByEntries = html.faviconByEntries;
     var prefix = useLocalPrefix(assetPrefix) ? assetPrefix : "";
     var favicons = prepareFavicons(favicon, faviconByEntries);

package/dist/js/treeshaking/worker-server.js

@@ -122,15 +122,20 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-var _request, _request1, _request2;
+var _ctx_request, _ctx_request1, _ctx_request2;
+import { Logger } from "./libs/logger";
 import { RouteMatchManager } from "./libs/route";
+import { metrics as defaultMetrics } from "./libs/metrics";
+var handleUrl = function(url) {
+    return url.replace(/^https?:\/\/.*?\//gi, "/");
+};
 var createHandler = function(manifest) {
     var routeMgr = new RouteMatchManager();
     var pages = manifest.pages, routes = manifest.routes;
     routeMgr.reset(routes);
     return function() {
         var _ref = _asyncToGenerator(function(ctx) {
-            var pageMatch, page, _query, _pathname, _params, params;
+            var pageMatch, page, _query, _pathname, _params, params, e;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -143,13 +148,26 @@ var createHandler = function(manifest) {
                             ];
                         }
                         page = pages[pageMatch.spec.urlPath];
-                        (_query = (_request = ctx.request).query) !== null && _query !== void 0 ? _query : _request.query = ctx.query;
-                        (_pathname = (_request1 = ctx.request).pathname) !== null && _pathname !== void 0 ? _pathname : _request1.pathname = ctx.pathname;
-                        (_params = (_request2 = ctx.request).params) !== null && _params !== void 0 ? _params : _request2.params = ctx.params;
+                        (_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,
+                            4
+                        ];
+                        _state.label = 1;
+                    case 1:
+                        _state.trys.push([
+                            1,
+                            3,
+                            ,
+                            4
+                        ]);
                         return [
                             4,
                             page.serverRender({
+                                entryName: page.entryName,
                                 template: page.template,
                                 query: ctx.query,
                                 request: ctx.request,
@@ -157,15 +175,53 @@ var createHandler = function(manifest) {
                                 pathname: ctx.pathname,
                                 req: ctx.request,
                                 res: ctx.response,
-                                params: ctx.params || params || {}
+                                params: ctx.params || params || {},
+                                logger: ctx.logger || new Logger({
+                                    level: "warn"
+                                }),
+                                metrics: ctx.metrics || defaultMetrics,
+                                loadableStats: ctx.loadableStats,
+                                routeManifest: ctx.routeManifest
                             })
                         ];
-                    case 1:
+                    case 2:
                         ctx.body = _state.sent();
                         ctx.status = 200;
                         return [
                             2
                         ];
+                    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
+                            ];
+                        }
+                        return [
+                            3,
+                            4
+                        ];
+                    case 4:
+                        if (page.template) {
+                            ctx.body = page.template;
+                            ctx.status = 200;
+                            return [
+                                2
+                            ];
+                        }
+                        ctx.body = "404: not found";
+                        ctx.status = 404;
+                        return [
+                            2
+                        ];
                 }
             });
         });
@@ -174,4 +230,4 @@ var createHandler = function(manifest) {
         };
     }();
 };
-export { createHandler };
+export { createHandler, handleUrl };

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

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/XBGQpkiYSQfGGBSC-Qets/src/type" />
+/// <reference types=".dts-temp/lM3iZKWPu2jm0FkDHIE8Y/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { URL } from 'url';
 import qs from 'querystring';

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

@@ -0,0 +1,63 @@
+type LogLevel = 'debug' | 'info' | 'warn' | 'error';
+type LogMsg = number | string | Error | null;
+interface LoggerConfiguration {
+  label?: string;
+  level?: LogLevel;
+}
+interface InstanceConfiguration {
+  displayLabel?: boolean;
+  uppercaseLabel?: boolean;
+}
+interface ConstructorOptions {
+  config?: InstanceConfiguration;
+  level?: string;
+  types?: Record<string, LoggerConfiguration>;
+}
+type LoggerFunction = (message?: LogMsg, ...args: any[]) => void;
+declare const LOG_TYPES: {
+  error: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  info: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  success: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  warn: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  debug: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  log: {
+    level: string;
+  };
+};
+
+declare class Logger {
+  private readonly level;
+  private readonly config;
+  private readonly types;
+  private readonly longestLabel;
+  [key: string]: any;
+  constructor(options?: ConstructorOptions);
+  private _log;
+  private getLongestLabel;
+}
+
+type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
+declare const logger: Logger & LoggerInterface;
+export { Logger };
+export { logger };
+export type { LoggerInterface };

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/XBGQpkiYSQfGGBSC-Qets/src/type" />
+/// <reference types=".dts-temp/lM3iZKWPu2jm0FkDHIE8Y/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;

package/dist/types/worker-server.d.ts

@@ -8,8 +8,9 @@ export type Manifest = {
   {
     entryName: string;
     template: string;
-    serverRender: (ctx: Record<string, any>) => Promise<string>;
+    serverRender?: (ctx: Record<string, any>) => Promise<string>;
   }>;
   routes: ModernRouteInterface[];
 };
+export declare const handleUrl: (url: string) => string;
 export declare const createHandler: (manifest: Manifest) => (ctx: Context) => Promise<void>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.0",
+  "version": "2.4.1-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,8 +55,8 @@
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.4.0",
-    "@modern-js/server-core": "2.4.0"
+    "@modern-js/utils": "2.4.1-beta.0",
+    "@modern-js/server-core": "2.4.1-beta.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -73,7 +73,7 @@
     "portfinder": "^1.0.28",
     "typescript": "^4",
     "@modern-js/types": "2.4.0",
-    "@modern-js/server-core": "2.4.0",
+    "@modern-js/server-core": "2.4.1-beta.0",
     "@scripts/build": "2.4.0",
     "@scripts/jest-config": "2.4.0"
   },