@modern-js/prod-server 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/js/modern/utils.js

@@ -1,10 +1,6 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 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; }
-
-import { compile } from 'path-to-regexp';
 import { createDebugger, isProd } from '@modern-js/utils';
 export const debug = createDebugger('prod-server');
 export const mergeExtension = users => {
@@ -13,7 +9,8 @@ export const mergeExtension = users => {
     middleware: output.concat(users)
   };
 };
-export const noop = () => {// noop
+export const noop = () => {
+  // noop
 };
 export const createErrorDocument = (status, text) => {
   const title = `${status}: ${text}`;
@@ -51,44 +48,38 @@ export const createErrorDocument = (status, text) => {
 export const createMiddlewareCollecter = () => {
   const webMiddlewares = [];
   const apiMiddlewares = [];
-
   const addWebMiddleware = input => {
     webMiddlewares.push(input);
   };
-
   const addAPIMiddleware = input => {
     apiMiddlewares.push(input);
   };
-
   const getMiddlewares = () => ({
     web: webMiddlewares,
     api: apiMiddlewares
   });
-
   return {
     getMiddlewares,
     addWebMiddleware,
     addAPIMiddleware
   };
 };
-export const toPath = (reg, params) => {
-  const fn = compile(reg, {
-    encode: encodeURIComponent
-  });
-  return fn(params);
-};
 export const useLocalPrefix = url => {
   return isProd() && !url.includes('.');
 };
-export const getStaticReg = (output = {}) => {
+export const getStaticReg = (output = {}, html = {}) => {
   const {
-    favicon,
-    faviconByEntries,
-    cssPath,
-    jsPath,
-    mediaPath,
+    distPath: {
+      css: cssPath,
+      js: jsPath,
+      media: mediaPath
+    } = {},
     assetPrefix = '/'
   } = output;
+  const {
+    favicon,
+    faviconByEntries
+  } = html;
   const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter(v => Boolean(v));
@@ -100,31 +91,25 @@ export const getStaticReg = (output = {}) => {
 };
 export const prepareFavicons = (favicon, faviconByEntries) => {
   const faviconNames = [];
-
   if (favicon) {
     faviconNames.push(favicon.substring(favicon.lastIndexOf('/') + 1));
   }
-
   if (faviconByEntries) {
     Object.keys(faviconByEntries).forEach(f => {
       const curFavicon = faviconByEntries[f];
-
       if (curFavicon) {
         faviconNames.push(curFavicon.substring(curFavicon.lastIndexOf('/') + 1));
       }
     });
   }
-
   return faviconNames;
 };
 export const headersWithoutCookie = headers => {
   if (typeof headers.cookie !== 'undefined') {
     const safeHeaders = _objectSpread({}, headers);
-
     delete safeHeaders.cookie;
     return safeHeaders;
   }
-
   return headers;
 };
 export const isRedirect = code => {

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

@@ -0,0 +1,34 @@
+import { RouteMatchManager } from "./libs/route";
+export const createHandler = manifest => {
+  const routeMgr = new RouteMatchManager();
+  const {
+    pages,
+    routes
+  } = manifest;
+  routeMgr.reset(routes);
+  return async ctx => {
+    var _ctx$request, _ctx$request$query, _ctx$request2, _ctx$request2$pathnam, _ctx$request3, _ctx$request3$params;
+    const pageMatch = routeMgr.match(ctx.url);
+    if (!pageMatch) {
+      ctx.body = '404: Page not found';
+      ctx.status = 404;
+      return;
+    }
+    const page = pages[pageMatch.spec.urlPath];
+    (_ctx$request$query = (_ctx$request = ctx.request).query) !== null && _ctx$request$query !== void 0 ? _ctx$request$query : _ctx$request.query = ctx.query;
+    (_ctx$request2$pathnam = (_ctx$request2 = ctx.request).pathname) !== null && _ctx$request2$pathnam !== void 0 ? _ctx$request2$pathnam : _ctx$request2.pathname = ctx.pathname;
+    (_ctx$request3$params = (_ctx$request3 = ctx.request).params) !== null && _ctx$request3$params !== void 0 ? _ctx$request3$params : _ctx$request3.params = ctx.params;
+    const params = pageMatch.parseURLParams(ctx.url);
+    ctx.body = await 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;
+  };
+};

package/dist/js/node/constants.js

@@ -14,12 +14,10 @@ const AGGRED_DIR = {
 exports.AGGRED_DIR = AGGRED_DIR;
 let ApiServerMode;
 exports.ApiServerMode = ApiServerMode;
-
 (function (ApiServerMode) {
   ApiServerMode["func"] = "function";
   ApiServerMode["frame"] = "framework";
 })(ApiServerMode || (exports.ApiServerMode = ApiServerMode = {}));
-
 const ERROR_DIGEST = {
   INIT: 'Server init error',
   ENOTF: 'Page could not be found',

package/dist/js/node/index.js

@@ -27,15 +27,10 @@ Object.defineProperty(exports, "createProxyHandler", {
   }
 });
 exports.default = void 0;
-
 var _server = require("./server");
-
 var _modernServer = require("./server/modern-server");
-
 var _proxy = require("./libs/proxy");
-
 var _type = require("./type");
-
 Object.keys(_type).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -47,9 +42,7 @@ Object.keys(_type).forEach(function (key) {
     }
   });
 });
-
 var _constants = require("./constants");
-
 Object.keys(_constants).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -61,14 +54,11 @@ Object.keys(_constants).forEach(function (key) {
     }
   });
 });
-
 var _default = options => {
   if (options == null) {
     throw new Error('can not start mserver without options');
   }
-
   const server = new _server.Server(options);
   return server.init();
 };
-
 exports.default = _default;

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

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModernServerContext = void 0;
-
 var _url = require("url");
-
 var _querystring = _interopRequireDefault(require("querystring"));
-
 var _buffer = require("buffer");
-
 var _etag = _interopRequireDefault(require("etag"));
-
 var _fresh = _interopRequireDefault(require("fresh"));
-
 var _utils = require("../../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 class ModernServerContext {
   /**
    * http request
@@ -33,223 +24,177 @@ class ModernServerContext {
   /**
    * url params
    */
+
   get logger() {
     return this.req.logger;
   }
-
   get metrics() {
     return this.req.metrics;
   }
-
   constructor(req, res, options) {
     _defineProperty(this, "req", void 0);
-
     _defineProperty(this, "res", void 0);
-
     _defineProperty(this, "params", {});
-
     _defineProperty(this, "serverData", void 0);
-
     _defineProperty(this, "options", {});
-
     this.req = req;
     this.res = res;
     this.options = options || {};
     this.serverData = {};
     this.bind();
   }
-
   bind() {
     const {
       req,
       res
     } = this;
-
     req.get = key => this.getReqHeader(key);
-
     res.set = (key, value) => this.res.setHeader(key, value);
-
     res.send = body => {
       this.send(body);
     };
-  } // compat express res.send, only support etag now
-
+  }
 
+  // compat express res.send, only support etag now
   send(body) {
     try {
       const generateETag = !this.res.getHeader('ETag') && this.options.etag;
-
       if (body !== undefined && generateETag) {
         const encoding = typeof body === 'string' ? 'utf-8' : undefined;
         const buf = !_buffer.Buffer.isBuffer(body) ? _buffer.Buffer.from(body, encoding) : body;
         const etag = (0, _etag.default)(buf, {
           weak: true
         });
-
         if (etag) {
           this.res.setHeader('ETag', etag);
         }
       }
-
       if (this.fresh) {
         this.status = 304;
       }
     } catch (e) {
       this.logger.error(e.message);
     }
-
     this.res.end(body);
   }
-
   setParams(params) {
     this.params = params;
   }
-
   setServerData(key, value) {
     this.serverData[key] = value;
   }
-
   getReqHeader(key) {
     const {
       req
     } = this;
     const field = key.toLowerCase();
-
     switch (field) {
       case 'referer':
       case 'referrer':
         return req.headers.referrer || req.headers.referer || '';
-
       default:
         return req.headers[field] || '';
     }
   }
-
   get fresh() {
     const {
       status,
       res,
       method
-    } = this; // GET or HEAD for weak freshness validation only
+    } = this;
 
+    // GET or HEAD for weak freshness validation only
     if ('GET' !== method && 'HEAD' !== method) {
       return false;
     }
-
     if (status >= 200 && status < 300 || 304 === status) {
       return (0, _fresh.default)(this.headers, {
         etag: res.getHeader('ETag'),
         'last-modified': res.getHeader('Last-Modified')
       });
     }
-
     return false;
   }
-  /* request property */
-
 
+  /* request property */
   get headers() {
     return this.req.headers;
   }
-
   get method() {
     return this.req.method;
   }
-
   get url() {
     return this.req.url || '';
   }
-
   set url(val) {
     this.req.url = val;
   }
-
   get host() {
     let host = this.getReqHeader('X-Forwarded-Host');
-
     if (!host) {
       host = this.getReqHeader('Host');
     }
-
     return host.split(/\s*,\s*/, 1)[0] || '';
   }
-
   get protocol() {
     if (this.req.socket.encrypted) {
       return 'https';
     }
-
     const proto = this.getReqHeader('X-Forwarded-Proto');
     return proto ? proto.split(/\s*,\s*/, 1)[0] : 'http';
   }
-
   get origin() {
     return `${this.protocol}://${this.host}`;
   }
-
   get href() {
     return this.origin + this.url;
   }
-
   get parsedURL() {
     const url = new _url.URL(this.req.url, this.origin);
     return url;
   }
-
   get path() {
     return this.parsedURL.pathname;
   }
-
   set path(p) {
-    const url = new _url.URL(this.req.url, this.origin); // this should never happened
-
+    const url = new _url.URL(this.req.url, this.origin);
+    // this should never happened
     if (!url || !p) {
       return;
     }
-
     if (url.pathname === p) {
       return;
     }
-
     url.pathname = p;
     this.url = url.toString();
   }
-
   get querystring() {
     if (!this.req) {
       return '';
     }
-
     return this.parsedURL.search.replace(/^\?/, '') || '';
   }
-
   get query() {
     const str = this.querystring;
     return _querystring.default.parse(str);
   }
-  /* response property */
-
 
+  /* response property */
   get status() {
     return this.res.statusCode;
   }
-
   set status(statusCode) {
     this.res.statusCode = statusCode;
   }
+
   /**
    * 判断链接是否已经关闭
    */
-
-
   resHasHandled() {
     return this.res.writableEnded;
   }
-
   error(dig, e = '') {
     this.logger.error(`Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, this.path, (0, _utils.headersWithoutCookie)(this.headers));
   }
-
 }
-
 exports.ModernServerContext = ModernServerContext;

package/dist/js/node/libs/context/index.js

@@ -10,9 +10,6 @@ Object.defineProperty(exports, "ModernServerContext", {
   }
 });
 exports.createContext = void 0;
-
 var _context = require("./context");
-
 const createContext = (req, res, options) => new _context.ModernServerContext(req, res, options);
-
 exports.createContext = createContext;

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

@@ -4,29 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMiddlewareContext = exports.createAfterRenderContext = exports.createAfterMatchContext = exports.base = void 0;
-
 var _cookie = _interopRequireDefault(require("cookie"));
-
 var _route = require("./route");
-
 var _template = require("./template");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 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; }
-
 class Response {
   constructor(res) {
     _defineProperty(this, "cookies", void 0);
-
     _defineProperty(this, "res", void 0);
-
     _defineProperty(this, "_cookie", void 0);
-
     this.res = res;
     this._cookie = _cookie.default.parse(res.getHeader('set-cookie') || '');
     this.cookies = {
@@ -37,49 +26,39 @@ class Response {
       apply: this.applyCookie.bind(this)
     };
   }
-
   get(key) {
     return this.res.getHeader(key);
   }
-
   set(key, value) {
     return this.res.setHeader(key, value);
   }
-
   status(code) {
     this.res.statusCode = code;
   }
-
   getCookie(key) {
     return this._cookie[key];
   }
-
   setCookie(key, value) {
     this._cookie[key] = value;
   }
-
   deleteCookie(key) {
     if (this._cookie[key]) {
       delete this._cookie[key];
     }
   }
-
   clearCookie() {
     this._cookie = {};
   }
-
   applyCookie() {
     const str = Object.entries(this._cookie).map(([key, value]) => {
       return _cookie.default.serialize(key, value);
     }).join('; ');
-
     if (str) {
       this.res.setHeader('set-cookie', str);
     } else {
       this.res.removeHeader('set-cookie');
     }
   }
-
   raw(body, {
     status,
     headers
@@ -87,32 +66,21 @@ class Response {
     Object.entries(headers).forEach(([key, value]) => {
       this.res.setHeader(key, value);
     });
-
     if (status) {
       this.res.statusCode = status;
     }
-
     this.res.end(body);
   }
-
 }
-
 class Request {
   constructor(ctx) {
     _defineProperty(this, "host", void 0);
-
     _defineProperty(this, "pathname", void 0);
-
     _defineProperty(this, "query", void 0);
-
     _defineProperty(this, "headers", void 0);
-
     _defineProperty(this, "cookie", void 0);
-
     _defineProperty(this, "cookies", void 0);
-
     _defineProperty(this, "_cookie", void 0);
-
     this.host = ctx.host;
     this.pathname = ctx.path;
     this.query = ctx.query;
@@ -123,13 +91,10 @@ class Request {
       get: this.getCookie.bind(this)
     };
   }
-
   getCookie(key) {
     return this._cookie[key];
   }
-
 }
-
 const base = context => {
   const {
     res
@@ -141,27 +106,21 @@ const base = context => {
     metrics: context.metrics
   };
 };
-
 exports.base = base;
-
 const createAfterMatchContext = (context, entryName) => {
   const baseContext = base(context);
   return _objectSpread(_objectSpread({}, baseContext), {}, {
     router: new _route.RouteAPI(entryName)
   });
 };
-
 exports.createAfterMatchContext = createAfterMatchContext;
-
 const createAfterRenderContext = (context, content) => {
   const baseContext = base(context);
   return _objectSpread(_objectSpread({}, baseContext), {}, {
     template: new _template.TemplateAPI(content)
   });
 };
-
 exports.createAfterRenderContext = createAfterRenderContext;
-
 const createMiddlewareContext = context => {
   const baseContext = base(context);
   return _objectSpread(_objectSpread({}, baseContext), {}, {
@@ -174,5 +133,4 @@ const createMiddlewareContext = context => {
     }
   });
 };
-
 exports.createMiddlewareContext = createMiddlewareContext;

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

@@ -4,35 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RouteAPI = void 0;
-
 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; }
-
 class RouteAPI {
   constructor(entryName) {
     _defineProperty(this, "current", void 0);
-
     _defineProperty(this, "status", void 0);
-
     _defineProperty(this, "url", void 0);
-
     this.current = entryName;
     this.status = 200;
     this.url = '';
   }
-
   redirect(url, status = 302) {
     this.url = url;
     this.status = status;
   }
-
   rewrite(entryName) {
     this.current = entryName;
   }
-
   use(entryName) {
     this.rewrite(entryName);
   }
-
 }
-
 exports.RouteAPI = RouteAPI;