@modern-js/prod-server 2.0.0-beta.3 → 2.0.0-beta.4

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

@@ -1,17 +1,57 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  createCache: () => createCache,
+  destroyCache: () => destroyCache
 });
-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; }
+module.exports = __toCommonJS(stdin_exports);
+var import_crypto = __toESM(require("crypto"));
+var import_lru_cache = __toESM(require("lru-cache"));
+var import_utils = require("@modern-js/utils");
+var import_util = require("./util");
+var import_page_caches = require("./page-caches");
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 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;
@@ -20,70 +60,61 @@ 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", (() => {
+    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, import_util.fname)(BASE_LEVEL)](context, cacheKey) {
             return _this.md5(cacheKey);
           },
-          [(0, _util.fname)(QUERY_LEVEL)](context, cacheKey, data) {
+          [(0, import_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));
+            return _this.md5((0, import_util.connectFactor)(cacheKey, queryFactor));
           },
-          [(0, _util.fname)(HEADER_LEVEL)](context, cacheKey, data) {
+          [(0, import_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));
+            return _this.md5((0, import_util.connectFactor)(cacheKey, headerFactor));
           },
-          [(0, _util.fname)(QUERY_HEADER_LEVEL)](context, cacheKey, data) {
+          [(0, import_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));
+            return _this.md5((0, import_util.connectFactor)(cacheKey, headerFactor, queryFactor));
           }
         };
       }
-    })());
+    })();
     this.cacheOptions = cacheOptions;
-    this.cache = new _lruCache.default({
+    this.cache = new import_lru_cache.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);
+          var _a;
+          return total + (((_a = n.caches.peek(cur)) == null ? void 0 : _a.size) || 0);
         }, 1);
         return len;
       }
     });
   }
   md5(content) {
-    const md5 = _crypto.default.createHash('md5');
-    return md5.update(content).digest('hex');
+    const md5 = import_crypto.default.createHash("md5");
+    return md5.update(content).digest("hex");
   }
   generateRequestKey(context) {
-    const {
-      pathname,
-      entry
-    } = context;
+    const { pathname, entry } = context;
     return this.md5(`${pathname}_${entry}`);
   }
   replaceValue(value, matcher) {
     let final = value;
-    Object.keys(matcher).some(replacer => {
+    Object.keys(matcher).some((replacer) => {
       const reg = new RegExp(matcher[replacer]);
       if (reg.test(value)) {
         final = replacer;
@@ -95,21 +126,21 @@ class CacheManager {
   }
   factor(keys, obj, matches = {}) {
     keys.sort();
-    const getValue = (0, _util.valueFactory)(obj);
+    const getValue = (0, import_util.valueFactory)(obj);
     const factorAry = keys.reduce((ary, key) => {
-      let value = getValue(key) || '';
+      let value = getValue(key) || "";
       const matcher = matches[key];
       if (matcher) {
         value = this.replaceValue(value, matcher);
       }
       return ary.concat([key, value]);
     }, []);
-    return factorAry.join(',');
+    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;
+    var _a, _b;
+    const queryKeys = (_a = data.includes) == null ? void 0 : _a.query;
+    const queryMatches = (_b = data.matches) == null ? void 0 : _b.query;
     if (!queryKeys || queryKeys.length === 0) {
       return null;
     }
@@ -118,9 +149,9 @@ class CacheManager {
     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;
+    var _a, _b;
+    const headerKeys = (_a = data.includes) == null ? void 0 : _a.header;
+    const headerMatches = (_b = data.matches) == null ? void 0 : _b.header;
     if (!headerKeys || headerKeys.length === 0) {
       return null;
     }
@@ -128,15 +159,15 @@ class CacheManager {
     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);
+  best(context, cacheKey, data) {
+    return __async(this, null, function* () {
+      const { level } = data;
+      const cacheHash = this.find[(0, import_util.fname)(level)](context, cacheKey, data);
+      if (!cacheHash) {
+        return null;
+      }
+      return data.caches.get(cacheHash);
+    });
   }
   createCacheContent(config, caches) {
     return {
@@ -148,77 +179,77 @@ class CacheManager {
       caches
     };
   }
-  async get(context) {
-    const cacheKey = this.generateRequestKey(context);
-    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
-    if (!dest) {
-      return null;
-    }
-    const {
-      expireTime,
-      limitTime,
-      html,
-      cacheHash
-    } = dest;
-    const isStale = Date.now() - expireTime > 0;
-    const isGarbage = limitTime ? Date.now() - limitTime > 0 : false;
-    return {
-      content: html || '',
-      contentType: _utils.mime.contentType('html'),
-      isStale,
-      isGarbage,
-      hash: cacheHash
-    };
+  get(context) {
+    return __async(this, null, function* () {
+      const cacheKey = this.generateRequestKey(context);
+      const data = this.cache.get(cacheKey);
+      if (!data) {
+        return null;
+      }
+      const dest = yield this.best(context, cacheKey, data);
+      if (!dest) {
+        return null;
+      }
+      const { expireTime, limitTime, html, cacheHash } = dest;
+      const isStale = Date.now() - expireTime > 0;
+      const isGarbage = limitTime ? Date.now() - limitTime > 0 : false;
+      return {
+        content: html || "",
+        contentType: import_utils.mime.contentType("html"),
+        isStale,
+        isGarbage,
+        hash: cacheHash
+      };
+    });
   }
-  async set(context, html, cacheConfig, sync = false) {
-    if (!cacheConfig) {
-      return false;
-    }
-
-    // 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);
-
-    // 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;
-      const storeHTML = (0, _util.cacheAddition)(html, cacheHash);
-      const size = storeHTML.length;
-      await next.caches.set(cacheHash, {
-        expireTime: Date.now() + cacheConfig.interval * 1000,
-        limitTime: typeof limit === 'number' ? Date.now() + limit * 1000 : null,
-        cacheHash,
-        html: storeHTML,
-        size
+  set(context, html, cacheConfig, sync = false) {
+    return __async(this, null, function* () {
+      if (!cacheConfig) {
+        return false;
+      }
+      const cacheKey = this.generateRequestKey(context);
+      let data = this.cache.get(cacheKey);
+      if (!data) {
+        const caches = yield (0, import_page_caches.createPageCaches)(MAX_CACHE_EACH_REQ);
+        data = this.createCacheContent(cacheConfig, caches);
+      }
+      const cacheHash = this.find[(0, import_util.fname)(cacheConfig.level)](
+        context,
+        cacheKey,
+        data
+      );
+      if (!cacheHash) {
+        return false;
+      }
+      const cacheSyncOrAsync = () => __async(this, null, function* () {
+        const next = data;
+        const limit = cacheConfig.staleLimit;
+        const storeHTML = (0, import_util.cacheAddition)(html, cacheHash);
+        const size = storeHTML.length;
+        yield next.caches.set(cacheHash, {
+          expireTime: Date.now() + cacheConfig.interval * 1e3,
+          limitTime: typeof limit === "number" ? Date.now() + limit * 1e3 : null,
+          cacheHash,
+          html: storeHTML,
+          size
+        });
+        this.cache.set(cacheKey, next);
+        return true;
       });
-      this.cache.set(cacheKey, next);
-      return true;
-    };
-
-    // 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);
+      const doCache = (0, import_util.withCoalescedInvoke)(cacheSyncOrAsync).bind(
+        null,
+        (0, import_util.namespaceHash)("stream", cacheHash),
+        []
+      );
+      return (0, import_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);
+  del(context, cacheHash) {
+    return __async(this, null, function* () {
+      const cacheKey = this.generateRequestKey(context);
+      const data = this.cache.get(cacheKey);
+      data == null ? void 0 : data.caches.del(cacheHash);
+    });
   }
 }
 let manager;
@@ -226,13 +257,9 @@ function createCache() {
   if (manager) {
     return manager;
   }
-  manager = new CacheManager({
-    max: 0
-  });
+  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/type.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});

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

@@ -1,18 +1,59 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  cacheAddition: () => cacheAddition,
+  connectFactor: () => connectFactor,
+  fname: () => fname,
+  getTime: () => getTime,
+  maybeSync: () => maybeSync,
+  namespaceHash: () => namespaceHash,
+  valueFactory: () => valueFactory,
+  withCoalescedInvoke: () => withCoalescedInvoke
 });
-exports.cacheAddition = cacheAddition;
-exports.connectFactor = connectFactor;
-exports.fname = fname;
-exports.getTime = getTime;
-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 }; }
+module.exports = __toCommonJS(stdin_exports);
+var import_url = __toESM(require("url"));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 function namespaceHash(namespace, hash) {
   return `${namespace}/${hash}`;
 }
@@ -20,18 +61,18 @@ function fname(lv) {
   return `f${lv}`;
 }
 function connectFactor(...args) {
-  return args.join('-');
+  return args.join("-");
 }
 function valueFactory(obj) {
-  if (obj instanceof _url.default.URLSearchParams) {
-    return function (key) {
+  if (obj instanceof import_url.default.URLSearchParams) {
+    return function(key) {
       return obj.get(key);
     };
   } else {
-    return function (key) {
+    return function(key) {
       const value = obj[key];
       if (Array.isArray(value)) {
-        return value.join(',');
+        return value.join(",");
       }
       return value;
     };
@@ -42,38 +83,40 @@ function getTime([s, ns]) {
 }
 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}">`);
+  const additionHtml = html.replace(
+    RE_START_IN_HEAD,
+    `<head><meta name="x-moden-spr" content="${hash}">`
+  );
   return additionHtml;
 }
-const globalInvokeCache = new Map();
+const globalInvokeCache = /* @__PURE__ */ 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 {
-        isOrigin: true,
-        value: res
-      };
-    }).catch(err => {
-      globalInvokeCache.delete(key);
-      throw err;
+  return function(key, args) {
+    return __async(this, null, function* () {
+      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 { isOrigin: true, value: res };
+      }).catch((err) => {
+        globalInvokeCache.delete(key);
+        throw err;
+      });
+      globalInvokeCache.set(key, future);
+      return future;
     });
-    globalInvokeCache.set(key, future);
-    return future;
   };
 }
 function maybeSync(fn) {
-  return sync => {
+  return (sync) => {
     if (sync) {
       return fn();
     } else {
@@ -81,4 +124,4 @@ function maybeSync(fn) {
       return Promise.resolve();
     }
   };
-}
+}