@modern-js/prod-server 1.21.5 → 2.0.0-beta.1

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

@@ -5,104 +5,75 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createCache = createCache;
 exports.destroyCache = destroyCache;
-
 var _crypto = _interopRequireDefault(require("crypto"));
-
 var _lruCache = _interopRequireDefault(require("lru-cache"));
-
 var _utils = require("@modern-js/utils");
-
 var _util = require("./util");
-
 var _pageCaches = require("./page-caches");
-
 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; }
-
 const MAX_CACHE_EACH_REQ = Number(process.env.ROUTE_CACHE_LIMIT) || 10;
 const MAX_SIZE_EACH_CLUSTER = Number(process.env.CLUSTER_CACHE_LIMIT) || 100;
 const BASE_LEVEL = 0;
 const QUERY_LEVEL = 1;
 const HEADER_LEVEL = 2;
 const QUERY_HEADER_LEVEL = 3;
-
 class CacheManager {
   constructor(cacheOptions) {
     _defineProperty(this, "cache", void 0);
-
     _defineProperty(this, "cacheOptions", void 0);
-
     _defineProperty(this, "find", (() => {
       {
         // eslint-disable-next-line consistent-this,@typescript-eslint/no-this-alias
         const _this = this;
-
         return {
-          [(0, _util.fname)(BASE_LEVEL)](context, cacheKey // data: CacheContent,
+          [(0, _util.fname)(BASE_LEVEL)](context, cacheKey
+          // data: CacheContent,
           ) {
             return _this.md5(cacheKey);
           },
-
           [(0, _util.fname)(QUERY_LEVEL)](context, cacheKey, data) {
             const queryFactor = _this.queryFactor(context, data);
-
             if (!queryFactor) {
               return null;
             }
-
             return _this.md5((0, _util.connectFactor)(cacheKey, queryFactor));
           },
-
           [(0, _util.fname)(HEADER_LEVEL)](context, cacheKey, data) {
             const headerFactor = _this.headerFactor(context, data);
-
             if (!headerFactor) {
               return null;
             }
-
             return _this.md5((0, _util.connectFactor)(cacheKey, headerFactor));
           },
-
           [(0, _util.fname)(QUERY_HEADER_LEVEL)](context, cacheKey, data) {
             const queryFactor = _this.queryFactor(context, data);
-
             const headerFactor = _this.headerFactor(context, data);
-
             if (!queryFactor || !headerFactor) {
               return null;
             }
-
             return _this.md5((0, _util.connectFactor)(cacheKey, headerFactor, queryFactor));
           }
-
         };
       }
     })());
-
     this.cacheOptions = cacheOptions;
     this.cache = new _lruCache.default({
       max: Math.min(MAX_SIZE_EACH_CLUSTER, 600) * 1024 * 1024,
-
       // 默认存 100M，最大 600M
       length(n) {
         const len = n.caches.keys().reduce((total, cur) => {
           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;
       }
-
     });
   }
-
   md5(content) {
     const md5 = _crypto.default.createHash('md5');
-
     return md5.update(content).digest('hex');
   }
-
   generateRequestKey(context) {
     const {
       pathname,
@@ -110,81 +81,63 @@ class CacheManager {
     } = context;
     return this.md5(`${pathname}_${entry}`);
   }
-
   replaceValue(value, matcher) {
     let final = value;
     Object.keys(matcher).some(replacer => {
       const reg = new RegExp(matcher[replacer]);
-
       if (reg.test(value)) {
         final = replacer;
         return true;
       }
-
       return false;
     });
     return final;
   }
-
   factor(keys, obj, matches = {}) {
     keys.sort();
     const getValue = (0, _util.valueFactory)(obj);
     const factorAry = keys.reduce((ary, key) => {
       let value = getValue(key) || '';
       const matcher = matches[key];
-
       if (matcher) {
         value = this.replaceValue(value, matcher);
       }
-
       return ary.concat([key, value]);
     }, []);
     return factorAry.join(',');
   }
-
   queryFactor(context, data) {
     var _data$includes, _data$matches;
-
     const queryKeys = (_data$includes = data.includes) === null || _data$includes === void 0 ? void 0 : _data$includes.query;
     const queryMatches = (_data$matches = data.matches) === null || _data$matches === void 0 ? void 0 : _data$matches.query;
-
     if (!queryKeys || queryKeys.length === 0) {
       return null;
     }
-
     const requestQuery = context.query;
     const queryFactor = this.factor(queryKeys, requestQuery, queryMatches);
     return queryFactor;
   }
-
   headerFactor(context, data) {
     var _data$includes2, _data$matches2;
-
     const headerKeys = (_data$includes2 = data.includes) === null || _data$includes2 === void 0 ? void 0 : _data$includes2.header;
     const headerMatches = (_data$matches2 = data.matches) === null || _data$matches2 === void 0 ? void 0 : _data$matches2.header;
-
     if (!headerKeys || headerKeys.length === 0) {
       return null;
     }
-
     const requestHeader = context.headers;
     const headerFactor = this.factor(headerKeys, requestHeader, headerMatches);
     return headerFactor;
   }
-
   async best(context, cacheKey, data) {
     const {
       level
     } = data;
     const cacheHash = this.find[(0, _util.fname)(level)](context, cacheKey, data);
-
     if (!cacheHash) {
       return null;
     }
-
     return data.caches.get(cacheHash);
   }
-
   createCacheContent(config, caches) {
     return {
       level: config.level,
@@ -195,21 +148,19 @@ class CacheManager {
       caches
     };
   }
-
   async get(context) {
     const cacheKey = this.generateRequestKey(context);
-    const data = this.cache.get(cacheKey); // no cache key matched
+    const data = this.cache.get(cacheKey);
 
+    // no cache key matched
     if (!data) {
       return null;
     }
-
-    const dest = await this.best(context, cacheKey, data); // no cache for current page with current config
-
+    const dest = await this.best(context, cacheKey, data);
+    // no cache for current page with current config
     if (!dest) {
       return null;
     }
-
     const {
       expireTime,
       limitTime,
@@ -226,27 +177,24 @@ class CacheManager {
       hash: cacheHash
     };
   }
-
   async set(context, html, cacheConfig, sync = false) {
     if (!cacheConfig) {
       return false;
-    } // each version with route is a separate cache
-
+    }
 
+    // each version with route is a separate cache
     const cacheKey = this.generateRequestKey(context);
     let data = this.cache.get(cacheKey);
-
     if (!data) {
       const caches = await (0, _pageCaches.createPageCaches)(MAX_CACHE_EACH_REQ);
       data = this.createCacheContent(cacheConfig, caches);
     }
+    const cacheHash = this.find[(0, _util.fname)(cacheConfig.level)](context, cacheKey, data);
 
-    const cacheHash = this.find[(0, _util.fname)(cacheConfig.level)](context, cacheKey, data); // if cacheHash is null, maybe level not match meta key, do not cache
-
+    // if cacheHash is null, maybe level not match meta key, do not cache
     if (!cacheHash) {
       return false;
     }
-
     const cacheSyncOrAsync = async () => {
       const next = data;
       const limit = cacheConfig.staleLimit;
@@ -261,37 +209,30 @@ class CacheManager {
       });
       this.cache.set(cacheKey, next);
       return true;
-    }; // cache set is async, each hash is cached only once at the same time
-
+    };
 
+    // cache set is async, each hash is cached only once at the same time
     const doCache = (0, _util.withCoalescedInvoke)(cacheSyncOrAsync).bind(null, (0, _util.namespaceHash)('stream', cacheHash), []);
     return (0, _util.maybeSync)(doCache)(sync);
   }
-
   async del(context, cacheHash) {
     const cacheKey = this.generateRequestKey(context);
     const data = this.cache.get(cacheKey);
     data === null || data === void 0 ? void 0 : data.caches.del(cacheHash);
   }
-
 }
-
 let manager;
-
 function createCache() {
   if (manager) {
     return manager;
   }
-
   manager = new CacheManager({
     max: 0
   });
   return manager;
 }
-
 function destroyCache() {
   manager = null;
 }
 /* eslint-enable no-lone-blocks */
-
 /* eslint-enable @typescript-eslint/member-ordering */

package/dist/js/node/libs/render/cache/util.js

@@ -11,23 +11,17 @@ exports.maybeSync = maybeSync;
 exports.namespaceHash = namespaceHash;
 exports.valueFactory = valueFactory;
 exports.withCoalescedInvoke = withCoalescedInvoke;
-
 var _url = _interopRequireDefault(require("url"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function namespaceHash(namespace, hash) {
   return `${namespace}/${hash}`;
 }
-
 function fname(lv) {
   return `f${lv}`;
 }
-
 function connectFactor(...args) {
   return args.join('-');
 }
-
 function valueFactory(obj) {
   if (obj instanceof _url.default.URLSearchParams) {
     return function (key) {
@@ -36,44 +30,34 @@ function valueFactory(obj) {
   } else {
     return function (key) {
       const value = obj[key];
-
       if (Array.isArray(value)) {
         return value.join(',');
       }
-
       return value;
     };
   }
 }
-
 function getTime([s, ns]) {
   return Math.floor(s * 1e3 + ns / 1e6);
 }
-
 const RE_START_IN_HEAD = /<head>/;
-
 function cacheAddition(html, hash) {
   const additionHtml = html.replace(RE_START_IN_HEAD, `<head><meta name="x-moden-spr" content="${hash}">`);
   return additionHtml;
 }
-
 const globalInvokeCache = new Map();
-
 function withCoalescedInvoke(func) {
   return async function (key, args) {
     const entry = globalInvokeCache.get(key);
-
     if (entry) {
       return entry.then(res => ({
         isOrigin: false,
         value: res.value
       }));
     }
-
     function __wrapper() {
       return func(...args);
     }
-
     const future = __wrapper().then(res => {
       globalInvokeCache.delete(key);
       return {
@@ -84,12 +68,10 @@ function withCoalescedInvoke(func) {
       globalInvokeCache.delete(key);
       throw err;
     });
-
     globalInvokeCache.set(key, future);
     return future;
   };
 }
-
 function maybeSync(fn) {
   return sync => {
     if (sync) {

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

@@ -4,27 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRenderHandler = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _constants = require("../../constants");
-
 var _static = require("./static");
-
 var _reader = require("./reader");
-
 var ssr = _interopRequireWildcard(require("./ssr"));
-
 var _modern = require("./modern");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const createRenderHandler = ({
   distDir,
   staticGenerate
@@ -36,38 +25,31 @@ const createRenderHandler = ({
   if (ctx.resHasHandled()) {
     return null;
   }
-
   const {
     entryPath,
     urlPath
   } = route;
-
   const entry = _path.default.join(distDir, entryPath);
-
   if (!route.isSPA) {
     const result = await (0, _static.handleDirectory)(ctx, entry, urlPath);
     return result;
-  } // only spa can use es6-html
-
+  }
 
+  // only spa can use es6-html
   const modernEntry = (0, _modern.getModernEntry)(entry);
-
-  const useModern = // route.enableModernMode &&
+  const useModern =
+  // route.enableModernMode &&
   (0, _modern.supportModern)(ctx) && _utils.fs.existsSync(modernEntry);
-
   const templatePath = useModern ? modernEntry : entry;
-
   if (!_utils.fs.existsSync(templatePath)) {
     throw new Error(`Could not find template file: ${templatePath}`);
   }
-
   const content = await (0, _reader.readFile)(templatePath);
-
   if (!content) {
     return null;
-  } // handles ssr first
-
+  }
 
+  // handles ssr first
   if (route.isSSR) {
     try {
       const result = await ssr.render(ctx, {
@@ -84,11 +66,9 @@ const createRenderHandler = ({
       ctx.res.setHeader('x-modern-ssr-fallback', '1');
     }
   }
-
   return {
     content,
     contentType: _utils.mime.contentType(_path.default.extname(templatePath))
   };
 };
-
 exports.createRenderHandler = createRenderHandler;

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

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMetrics = exports.createLogger = void 0;
-
 var _utils = require("../../utils");
-
 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; }
-
 const createMetrics = (context, metrics) => {
   const {
     entryName: entry,
@@ -21,53 +16,48 @@ const createMetrics = (context, metrics) => {
   const {
     pathname = ''
   } = request || {};
-
   const emitTimer = (name, cost, tags = {}) => {
     metrics.emitTimer(name, cost, _objectSpread(_objectSpread({}, tags), {}, {
       pathname,
       entry
     }));
   };
-
   const emitCounter = (name, counter, tags = {}) => {
     metrics.emitCounter(name, counter, _objectSpread(_objectSpread({}, tags), {}, {
       pathname,
       entry
     }));
   };
-
   return {
     emitTimer,
     emitCounter
   };
 };
-
 exports.createMetrics = createMetrics;
-
 const createLogger = (serverContext, logger) => {
   const request = serverContext.request || {};
   const {
     headers = {},
     pathname = ''
   } = request;
-
   const debug = (message, ...args) => {
     logger.debug(`SSR Debug - ${message}, req.url = %s`, ...args, pathname);
   };
-
   const info = (message, ...args) => {
     logger.info(`SSR Info - ${message}, req.url = %s`, ...args, pathname);
   };
-
   const error = (message, e) => {
+    if (!e) {
+      e = message;
+      message = '';
+    }
     logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, (0, _utils.headersWithoutCookie)(headers));
   };
-
   return {
     error,
     info,
     debug
   };
 };
-
+/* eslint-enable no-param-reassign */
 exports.createLogger = createLogger;

package/dist/js/node/libs/render/modern/index.js

@@ -4,51 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.supportModern = exports.getModernEntry = void 0;
-
 var _uaParserJs = _interopRequireDefault(require("ua-parser-js"));
-
 var _compareVersions = _interopRequireDefault(require("compare-versions"));
-
 var _browserList = require("./browser-list");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const nativeModules = require('@babel/compat-data/native-modules');
-
 const supportModern = context => {
   var _context$query;
-
   if ((_context$query = context.query) !== null && _context$query !== void 0 && _context$query.modern_es6) {
     return true;
-  } // no ua in request headers
-
+  }
 
+  // no ua in request headers
   const userAgent = context.headers['user-agent'];
-
   if (!userAgent || typeof userAgent !== 'string') {
     return false;
   }
-
   const parsedUA = (0, _uaParserJs.default)(userAgent);
   const browserName = parsedUA.browser.name;
   const browserVersion = parsedUA.browser.version;
-
   if (!browserName || !browserVersion) {
     return false;
   }
-
   const nativeUAName = _browserList.NativeModuleNameMap[browserName];
-
   if (!nativeUAName) {
     return false;
   }
-
   const version = nativeModules['es6.module'][nativeUAName];
-
   if (!version) {
     return false;
   }
-
   try {
     const result = (0, _compareVersions.default)(browserVersion, version);
     return result >= 0;
@@ -56,9 +41,6 @@ const supportModern = context => {
     return false;
   }
 };
-
 exports.supportModern = supportModern;
-
 const getModernEntry = filepath => filepath.replace(/\.html$/, '-es6.html');
-
 exports.getModernEntry = getModernEntry;