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

package/dist/js/modern/libs/loadConfig.js

@@ -1,9 +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 * as path from 'path';
 import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
 import mergeDeep from 'merge-deep';
@@ -15,34 +12,30 @@ export const requireConfig = serverConfigPath => {
   if (fs.pathExistsSync(serverConfigPath)) {
     return compatRequire(serverConfigPath);
   }
-
   return {};
 };
+
 /**
  * 对配置进行合并，开发环境下，cliConfig 与 serverConfig 进行深合并
  * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
  * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
  */
-
 export const loadConfig = ({
   cliConfig,
   serverConfig,
   resolvedConfigPath
 }) => {
   let config = null;
-
   if (process.env.NODE_ENV === 'production') {
-    const resolvedConfig = requireConfig(resolvedConfigPath); // cli config has a higher priority,because it's an argument passed in.
-
+    const resolvedConfig = requireConfig(resolvedConfigPath);
+    // cli config has a higher priority,because it's an argument passed in.
     config = mergeDeep(_objectSpread(_objectSpread({}, resolvedConfig), {}, {
       plugins: [] // filter cli plugins
-
     }), serverConfig, cliConfig);
   } else {
     config = mergeDeep(_objectSpread(_objectSpread({}, cliConfig), {}, {
       plugins: []
     }), serverConfig);
   }
-
   return config;
 };

package/dist/js/modern/libs/metrics.js

@@ -1,12 +1,12 @@
 const metrics = {
-  gauges() {// no impl
+  gauges() {
+    // no impl
   },
-
-  emitCounter() {// no impl
+  emitCounter() {
+    // no impl
   },
-
-  emitTimer() {// no impl
+  emitTimer() {
+    // no impl
   }
-
 };
 export { metrics };

package/dist/js/modern/libs/proxy.js

@@ -1,14 +1,10 @@
 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 { createProxyMiddleware } from 'http-proxy-middleware';
 import { debug } from "../utils";
 export function formatProxyOptions(proxyOptions) {
   const formattedProxy = [];
-
   if (!Array.isArray(proxyOptions)) {
     if ('target' in proxyOptions) {
       formattedProxy.push(proxyOptions);
@@ -28,29 +24,29 @@ export function formatProxyOptions(proxyOptions) {
   } else {
     formattedProxy.push(...proxyOptions);
   }
-
   return formattedProxy;
 }
 export const createProxyHandler = proxyOptions => {
   debug('createProxyHandler', proxyOptions);
-
   if (!proxyOptions) {
     return null;
-  } // If it is not an array, it may be an object that uses the context attribute
-  // or an object in the form of { source: ProxyDetail }
-
+  }
 
+  // If it is not an array, it may be an object that uses the context attribute
+  // or an object in the form of { source: ProxyDetail }
   const formattedProxy = formatProxyOptions(proxyOptions);
   const middlewares = formattedProxy.map(option => {
-    const middleware = createProxyMiddleware(option.context, option); // eslint-disable-next-line consistent-return
+    const middleware = createProxyMiddleware(option.context, option);
 
+    // eslint-disable-next-line consistent-return
     return async (ctx, next) => {
       const {
         req,
         res
       } = ctx;
-      const bypassUrl = typeof option.bypass === 'function' ? option.bypass(req, res, option) : null; // only false, no true
+      const bypassUrl = typeof option.bypass === 'function' ? option.bypass(req, res, option) : null;
 
+      // only false, no true
       if (typeof bypassUrl === 'boolean') {
         ctx.status = 404;
         return next();
@@ -58,7 +54,6 @@ export const createProxyHandler = proxyOptions => {
         ctx.url = bypassUrl;
         return next();
       }
-
       middleware(req, res, next);
     };
   });

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

@@ -18,7 +18,6 @@ describe('test spr util functions', () => {
   });
   it('should return function correctly', () => {
     const urlParams = (() => new url.URLSearchParams())();
-
     urlParams.set('name', 'modern');
     const getParam = valueFactory(urlParams);
     expect(getParam('name')).toBe('modern');

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

@@ -1,14 +1,10 @@
 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 { createCache, destroyCache } from "../spr";
 import { errorConfiguration } from "./error-configuration";
 import { cacheabelAry } from "./cacheable";
 import { matchedCacheableAry } from "./matched-cache";
-
 const createCacheConfig = (config = {}) => _objectSpread({
   excludes: null,
   includes: null,
@@ -18,7 +14,6 @@ const createCacheConfig = (config = {}) => _objectSpread({
   fallback: false,
   matches: null
 }, config);
-
 jest.setTimeout(60000);
 describe('cache', () => {
   it('should cache correctly', async () => {
@@ -55,7 +50,6 @@ describe('cache', () => {
     destroyCache();
     const cache = createCache();
     const content = 'hello';
-
     for (const config of errorConfiguration) {
       const cacheConfig = createCacheConfig(config);
       const tmpEntry = Math.random().toString();
@@ -126,7 +120,6 @@ describe('cache', () => {
   it('should get cache correctly', async () => {
     destroyCache();
     const cache = createCache();
-
     for (const cacheable of cacheabelAry) {
       const context = {
         entry: '',
@@ -143,7 +136,6 @@ describe('cache', () => {
   it('should match cache correctly', async () => {
     destroyCache();
     const cache = createCache();
-
     for (const cacheable of matchedCacheableAry) {
       const [baseCacheable, matchOne, ...other] = cacheable;
       const {
@@ -166,7 +158,6 @@ describe('cache', () => {
       };
       const cacheResult = await cache.get(matchContext);
       expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(content);
-
       for (const notMatch of other) {
         const notMatchContext = {
           entry: '',

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

@@ -1,59 +1,70 @@
 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 { Transform } from 'stream';
 import { ERROR_DIGEST } from "../../../constants";
 import { createCache } from "./spr";
 import { namespaceHash, withCoalescedInvoke } from "./util";
 export default ((renderFn, ctx) => {
   const sprCache = createCache();
-
   const doRender = async context => {
     const cacheContext = _objectSpread({
       entry: context.entryName
     }, context.request);
-
-    const cacheFile = await sprCache.get(cacheContext); // no cache, render sync
-
-    if (!cacheFile) {
-      const html = await renderFn(context);
+    const cacheFile = await sprCache.get(cacheContext);
+    async function afterRender(source, onAfterRender) {
+      // e.g. source is undefined when redirects occur during render
+      if (!source) {
+        return '';
+      }
+      if (typeof source === 'string') {
+        await onAfterRender(source);
+        return source;
+      } else {
+        let htmlForStream = '';
+        const cacheStream = new Transform({
+          write(chunk, _, callback) {
+            htmlForStream += chunk.toString();
+            this.push(chunk);
+            callback();
+          }
+        });
+        cacheStream.on('close', () => onAfterRender(htmlForStream));
+        return source(cacheStream);
+      }
+    }
+    async function saveHtmlIntoCache(html) {
       const {
         cacheConfig
       } = context;
-
       if (html && cacheConfig) {
         await sprCache.set(cacheContext, html, cacheConfig);
       }
-
-      return html;
     }
 
-    const cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash; // completely expired
+    // no cache, render sync
+    if (!cacheFile) {
+      const renderResult = await renderFn(context);
+      return afterRender(renderResult, saveHtmlIntoCache);
+    }
+    const cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash;
 
+    // completely expired
     if (cacheFile.isGarbage) {
-      const html = await renderFn(context);
-      const {
-        cacheConfig
-      } = context;
-
-      if (html && cacheConfig) {
-        await sprCache.set(cacheContext, html, cacheConfig);
-      }
-
-      return html;
+      const renderResult = await renderFn(context);
+      return afterRender(renderResult, saveHtmlIntoCache);
     } else if (cacheFile.isStale) {
       // if file is stale, request async
       const render = withCoalescedInvoke(() => renderFn(context)).bind(null, namespaceHash('render', cacheFile.hash), []);
-      render().then(res => {
+      render().then(async res => {
         if (res.value && res.isOrigin) {
           const {
             cacheConfig
           } = context;
-
           if (cacheConfig) {
-            sprCache.set(cacheContext, res.value, cacheConfig);
+            afterRender(res.value, async html => {
+              sprCache.set(cacheContext, html, cacheConfig);
+            });
           } else {
             sprCache.del(cacheContext, cacheHash);
           }
@@ -63,10 +74,8 @@ export default ((renderFn, ctx) => {
         ctx.error(ERROR_DIGEST.ERENDER, e);
       });
     }
-
     ctx.res.setHeader('x-modern-spr', '1');
     return cacheFile.content;
   };
-
   return doRender;
 });

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

@@ -1,39 +1,29 @@
 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 LRU from 'lru-cache';
 export class LRUCaches {
   constructor(options) {
     _defineProperty(this, "caches", void 0);
-
     _defineProperty(this, "max", void 0);
-
     this.max = options.max;
     this.caches = new LRU(this.max);
   }
-
   init() {
     return Promise.resolve();
   }
-
   keys() {
     return this.caches.keys();
   }
-
   get(key) {
     return Promise.resolve(this.caches.get(key) || null);
   }
-
   peek(key) {
     return this.caches.peek(key) || null;
   }
-
   set(key, cache) {
     this.caches.set(key, cache);
     return Promise.resolve();
   }
-
   del(key) {
     this.caches.del(key);
   }
-
 }

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

@@ -1,7 +1,5 @@
 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; }
-
 /* eslint-disable @typescript-eslint/member-ordering */
-
 /* eslint-disable no-lone-blocks */
 import crypto from 'crypto';
 import LRUCache from 'lru-cache';
@@ -14,82 +12,62 @@ 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 {
-          [fname(BASE_LEVEL)](context, cacheKey // data: CacheContent,
+          [fname(BASE_LEVEL)](context, cacheKey
+          // data: CacheContent,
           ) {
             return _this.md5(cacheKey);
           },
-
           [fname(QUERY_LEVEL)](context, cacheKey, data) {
             const queryFactor = _this.queryFactor(context, data);
-
             if (!queryFactor) {
               return null;
             }
-
             return _this.md5(connectFactor(cacheKey, queryFactor));
           },
-
           [fname(HEADER_LEVEL)](context, cacheKey, data) {
             const headerFactor = _this.headerFactor(context, data);
-
             if (!headerFactor) {
               return null;
             }
-
             return _this.md5(connectFactor(cacheKey, headerFactor));
           },
-
           [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(connectFactor(cacheKey, headerFactor, queryFactor));
           }
-
         };
       }
     })());
-
     this.cacheOptions = cacheOptions;
     this.cache = new LRUCache({
       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.createHash('md5');
     return md5.update(content).digest('hex');
   }
-
   generateRequestKey(context) {
     const {
       pathname,
@@ -97,81 +75,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 = 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[fname(level)](context, cacheKey, data);
-
     if (!cacheHash) {
       return null;
     }
-
     return data.caches.get(cacheHash);
   }
-
   createCacheContent(config, caches) {
     return {
       level: config.level,
@@ -182,21 +142,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,
@@ -213,27 +171,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 createPageCaches(MAX_CACHE_EACH_REQ);
       data = this.createCacheContent(cacheConfig, caches);
     }
+    const cacheHash = this.find[fname(cacheConfig.level)](context, cacheKey, data);
 
-    const cacheHash = this.find[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;
@@ -248,27 +203,23 @@ 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 = withCoalescedInvoke(cacheSyncOrAsync).bind(null, namespaceHash('stream', cacheHash), []);
     return 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;
 export function createCache() {
   if (manager) {
     return manager;
   }
-
   manager = new CacheManager({
     max: 0
   });
@@ -278,5 +229,4 @@ export function destroyCache() {
   manager = null;
 }
 /* eslint-enable no-lone-blocks */
-
 /* eslint-enable @typescript-eslint/member-ordering */

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

@@ -16,11 +16,9 @@ export function valueFactory(obj) {
   } else {
     return function (key) {
       const value = obj[key];
-
       if (Array.isArray(value)) {
         return value.join(',');
       }
-
       return value;
     };
   }
@@ -37,18 +35,15 @@ const globalInvokeCache = new Map();
 export 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 {
@@ -59,7 +54,6 @@ export function withCoalescedInvoke(func) {
       globalInvokeCache.delete(key);
       throw err;
     });
-
     globalInvokeCache.set(key, future);
     return future;
   };