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

package/dist/{js/treeshaking → esm}/server/modern-server.js

@@ -257,7 +257,7 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function onInit(runner, app) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var _conf_bff, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp;
+                    var _conf_bff, _this_conf_server, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp, ssrConfig, forceCSR;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -296,9 +296,12 @@ var ModernServer = /*#__PURE__*/ function() {
                                         target: distDir
                                     }
                                 ], _this.conf.output);
+                                ssrConfig = (_this_conf_server = _this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
+                                forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
                                 _this.routeRenderHandler = createRenderHandler({
                                     distDir: distDir,
-                                    staticGenerate: staticGenerate
+                                    staticGenerate: staticGenerate,
+                                    forceCSR: forceCSR
                                 });
                                 return [
                                     4,
@@ -393,8 +396,8 @@ var ModernServer = /*#__PURE__*/ function() {
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                req.logger = _this.logger;
-                                req.metrics = _this.metrics;
+                                req.logger = req.logger || _this.logger;
+                                req.metrics = req.metrics || _this.metrics;
                                 context = createContext(req, res);
                                 matched = _this.router.match(url || context.path);
                                 if (!matched) {
@@ -606,7 +609,8 @@ var ModernServer = /*#__PURE__*/ function() {
                             runner.prepareApiServer({
                                 pwd: workDir,
                                 config: extension,
-                                prefix: Array.isArray(prefix) ? prefix[0] : prefix
+                                prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+                                render: _this.render.bind(_this)
                             }, {
                                 onLast: function() {
                                     return null;
@@ -715,7 +719,9 @@ var ModernServer = /*#__PURE__*/ function() {
                 var bundles = this.router.getBundles();
                 bundles.forEach(function(bundle) {
                     var filepath = path.join(distDir, bundle);
-                    require(filepath);
+                    if (fs.existsSync(filepath)) {
+                        require(filepath);
+                    }
                 });
             }
         },
@@ -973,8 +979,8 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function requestHandler(req, res) {
                 var next = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : function() {};
                 res.statusCode = 200;
-                req.logger = this.logger;
-                req.metrics = this.metrics;
+                req.logger = req.logger || this.logger;
+                req.metrics = req.metrics || this.metrics;
                 var context;
                 try {
                     context = this.createContext(req, res);

package/dist/{js/modern → esm-node}/libs/hook-api/index.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-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 __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import cookie from "cookie";
 import { RouteAPI } from "./route";
 import { TemplateAPI } from "./template";
@@ -104,27 +85,31 @@ const base = (context) => {
 };
 const createAfterMatchContext = (context, entryName) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
+  return {
+    ...baseContext,
     router: new RouteAPI(entryName)
-  });
+  };
 };
 const createAfterRenderContext = (context, content) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
+  return {
+    ...baseContext,
     template: new TemplateAPI(content)
-  });
+  };
 };
 const createMiddlewareContext = (context) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
-    response: __spreadProps(__spreadValues({}, baseContext.response), {
+  return {
+    ...baseContext,
+    response: {
+      ...baseContext.response,
       locals: context.res.locals || {}
-    }),
+    },
     source: {
       req: context.req,
       res: context.res
     }
-  });
+  };
 };
 export {
   base,

package/dist/esm-node/libs/loadConfig.js

@@ -0,0 +1,45 @@
+import * as path from "path";
+import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import mergeDeep from "merge-deep";
+const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
+  const serverConfigPath = path.join(distDirectory, serverConfigFile);
+  return `${serverConfigPath}.js`;
+};
+const requireConfig = (serverConfigPath) => {
+  if (fs.pathExistsSync(serverConfigPath)) {
+    return compatRequire(serverConfigPath);
+  }
+  return {};
+};
+const loadConfig = ({
+  cliConfig,
+  serverConfig,
+  resolvedConfigPath
+}) => {
+  let config = null;
+  if (process.env.NODE_ENV === "production") {
+    const resolvedConfig = requireConfig(resolvedConfigPath);
+    config = mergeDeep(
+      {
+        ...resolvedConfig,
+        plugins: []
+      },
+      serverConfig,
+      cliConfig
+    );
+  } else {
+    config = mergeDeep(
+      {
+        ...cliConfig,
+        plugins: []
+      },
+      serverConfig
+    );
+  }
+  return config;
+};
+export {
+  getServerConfigPath,
+  loadConfig,
+  requireConfig
+};

package/dist/{js/modern → esm-node}/libs/logger.js

@@ -1,19 +1,3 @@
-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,
@@ -56,8 +40,11 @@ const DEFAULT_CONFIG = {
 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.config = { ...DEFAULT_CONFIG, ...options.config || {} };
+    this.types = {
+      ...LOG_TYPES,
+      ...options.types || {}
+    };
     this.longestLabel = this.getLongestLabel();
     Object.keys(this.types).forEach((type) => {
       this[type] = this._log.bind(this, type);

package/dist/{js/modern → esm-node}/libs/proxy.js

@@ -1,39 +1,3 @@
-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;
-};
-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());
-  });
-};
 import { createProxyMiddleware } from "http-proxy-middleware";
 import { debug } from "../utils";
 function formatProxyOptions(proxyOptions) {
@@ -47,11 +11,12 @@ function formatProxyOptions(proxyOptions) {
         Object.keys(proxyOptions).reduce(
           (total, source) => {
             const option = proxyOptions[source];
-            total.push(__spreadValues({
+            total.push({
               context: source,
               changeOrigin: true,
-              logLevel: "warn"
-            }, typeof option === "string" ? { target: option } : option));
+              logLevel: "warn",
+              ...typeof option === "string" ? { target: option } : option
+            });
             return total;
           },
           []
@@ -71,7 +36,7 @@ const createProxyHandler = (proxyOptions) => {
   const formattedProxy = formatProxyOptions(proxyOptions);
   const middlewares = formattedProxy.map((option) => {
     const middleware = createProxyMiddleware(option.context, option);
-    return (ctx, next) => __async(void 0, null, function* () {
+    return async (ctx, next) => {
       const { req, res } = ctx;
       const bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
       if (typeof bypassUrl === "boolean") {
@@ -82,7 +47,7 @@ const createProxyHandler = (proxyOptions) => {
         return next();
       }
       middleware(req, res, next);
-    });
+    };
   });
   return middlewares;
 };

package/dist/esm-node/libs/render/cache/__tests__/cache.fun.test.js

@@ -0,0 +1,83 @@
+import url from "url";
+import { createCache, destroyCache } from "../spr";
+import {
+  cacheAddition,
+  connectFactor,
+  fname,
+  maybeSync,
+  namespaceHash,
+  valueFactory,
+  withCoalescedInvoke
+} from "../util";
+describe("test spr util functions", () => {
+  it("should return value correctly", () => {
+    expect(connectFactor("bar", "foo")).toBe("bar-foo");
+    expect(fname(1)).toBe("f1");
+    expect(namespaceHash("modern", "!@#$%^&")).toBe("modern/!@#$%^&");
+  });
+  it("should create or destroy instance correctly", () => {
+    const ins1 = createCache();
+    const ins2 = createCache();
+    expect(ins1 === ins2).toBe(true);
+    destroyCache();
+    const ins3 = createCache();
+    expect(ins1 === ins3).toBe(false);
+    expect(ins2 === ins3).toBe(false);
+  });
+  it("should return function correctly", () => {
+    const urlParams = (() => new url.URLSearchParams())();
+    urlParams.set("name", "modern");
+    const getParam = valueFactory(urlParams);
+    expect(getParam("name")).toBe("modern");
+    const headers = { age: "12345" };
+    const getHeader = valueFactory(headers);
+    expect(getHeader("age")).toBe("12345");
+  });
+  it("should add target html content", () => {
+    const contentNoHead = "<div>123</div>";
+    const html = cacheAddition(contentNoHead, Math.random().toString());
+    expect(html).toBe(contentNoHead);
+    const contentWithHead = "<head></head><div>123</div>";
+    const hash = Math.random().toString();
+    const htmlWithHead = cacheAddition(contentWithHead, hash);
+    expect(htmlWithHead).toBe(
+      `<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`
+    );
+  });
+  it("should only invoke func one time", async () => {
+    let index = 0;
+    const fn = withCoalescedInvoke(
+      async () => new Promise((resolve) => {
+        setTimeout(() => {
+          index += 1;
+          resolve(index);
+        }, 500);
+      })
+    );
+    const key = "test";
+    const [res1, res2] = await Promise.all([fn(key, []), fn(key, [])]);
+    expect(res1.isOrigin && res2.isOrigin).toBe(false);
+    expect(res1.isOrigin || res2.isOrigin).toBe(true);
+    expect(res1.value).toBe(1);
+    expect(res2.value).toBe(1);
+  });
+  it("should invoke sync or async", async () => {
+    const foo = "";
+    const async = await maybeSync(
+      () => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(foo);
+        }, 100);
+      })
+    )(false);
+    expect(async).toBeUndefined();
+    const sync = await maybeSync(
+      () => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(foo);
+        }, 100);
+      })
+    )(true);
+    expect(sync).toBe(foo);
+  });
+});

package/dist/esm-node/libs/render/cache/__tests__/cache.test.js

@@ -0,0 +1,210 @@
+import { createCache, destroyCache } from "../spr";
+import { errorConfiguration } from "./error-configuration";
+import { cacheabelAry } from "./cacheable";
+import { matchedCacheableAry } from "./matched-cache";
+const createCacheConfig = (config = {}) => ({
+  excludes: null,
+  includes: null,
+  interval: 10,
+  staleLimit: false,
+  level: 0,
+  fallback: false,
+  matches: null,
+  ...config
+});
+jest.setTimeout(6e4);
+describe("cache", () => {
+  it("should cache correctly", async () => {
+    destroyCache();
+    const cache = createCache();
+    const context = {
+      entry: "",
+      pathname: "",
+      query: {},
+      headers: {}
+    };
+    const content = "hello";
+    const cacheConfig = createCacheConfig();
+    await cache.set(context, content, cacheConfig, true);
+    const cacheResult = await cache.get(context);
+    expect(cacheResult).not.toBe(null);
+    expect(cacheResult == null ? void 0 : cacheResult.content).toBe("hello");
+  });
+  it("should ignore cache set when cache config not exist", async () => {
+    destroyCache();
+    destroyCache();
+    const cache = createCache();
+    const context = {
+      entry: "",
+      pathname: "",
+      query: {},
+      headers: {}
+    };
+    const content = "hello";
+    const shouldCache = await cache.set(context, content, null, true);
+    expect(shouldCache).toBe(false);
+  });
+  it("should calcual cache key error", async () => {
+    destroyCache();
+    const cache = createCache();
+    const content = "hello";
+    for (const config of errorConfiguration) {
+      const cacheConfig = createCacheConfig(config);
+      const tmpEntry = Math.random().toString();
+      const context = {
+        entry: tmpEntry,
+        pathname: "",
+        query: {},
+        headers: {}
+      };
+      const shouldCache = await cache.set(context, content, cacheConfig);
+      expect(shouldCache).toBe(false);
+    }
+  });
+  it("should get nothing for diff requestKey", async () => {
+    destroyCache();
+    const cache = createCache();
+    const context = {
+      entry: "",
+      pathname: "",
+      query: {},
+      headers: {}
+    };
+    const content = "hello";
+    const cacheConfig = createCacheConfig({
+      level: 1,
+      includes: { query: ["name"] }
+    });
+    await cache.set(context, content, cacheConfig, true);
+    const context_req = {
+      entry: "",
+      pathname: "/home",
+      query: {},
+      headers: {}
+    };
+    const cacheResult = await cache.get(context_req);
+    expect(cacheResult).toBe(null);
+  });
+  it("should get nothing for diff cacheHash", async () => {
+    destroyCache();
+    const cache = createCache();
+    const context = {
+      entry: "",
+      pathname: "",
+      query: {},
+      headers: {}
+    };
+    const content = "hello";
+    const cacheConfig = createCacheConfig({
+      level: 1,
+      includes: { query: ["name"] }
+    });
+    await cache.set(context, content, cacheConfig, true);
+    const context_req = {
+      entry: "",
+      pathname: "",
+      query: { name: "zll" },
+      headers: {}
+    };
+    const cacheResult = await cache.get(context_req);
+    expect(cacheResult).toBe(null);
+  });
+  it("should get cache correctly", async () => {
+    destroyCache();
+    const cache = createCache();
+    for (const cacheable of cacheabelAry) {
+      const context = {
+        entry: "",
+        pathname: cacheable.requestOpt.url,
+        query: cacheable.requestOpt.query || {},
+        headers: cacheable.requestOpt.headers || {}
+      };
+      const cacheConfig = createCacheConfig(cacheable.cacheConfig || {});
+      await cache.set(context, cacheable.content, cacheConfig, true);
+      const cacheResult = await cache.get(context);
+      expect(cacheResult == null ? void 0 : cacheResult.content).toBe(cacheable.content);
+    }
+  });
+  it("should match cache correctly", async () => {
+    destroyCache();
+    const cache = createCache();
+    for (const cacheable of matchedCacheableAry) {
+      const [baseCacheable, matchOne, ...other] = cacheable;
+      const { requestOpt = {}, cacheConfig, content } = baseCacheable;
+      const context = {
+        entry: "",
+        pathname: requestOpt.url,
+        query: requestOpt.query,
+        headers: requestOpt.headers
+      };
+      await cache.set(context, content, createCacheConfig(cacheConfig), true);
+      const matchContext = {
+        entry: "",
+        pathname: matchOne.url,
+        query: matchOne.query,
+        headers: matchOne.headers
+      };
+      const cacheResult = await cache.get(matchContext);
+      expect(cacheResult == null ? void 0 : cacheResult.content).toBe(content);
+      for (const notMatch of other) {
+        const notMatchContext = {
+          entry: "",
+          pathname: notMatch.url,
+          query: notMatch.query,
+          headers: notMatch.headers
+        };
+        const nothing = await cache.get(notMatchContext);
+        expect(nothing).toBe(null);
+      }
+    }
+  });
+  it("should stale cache correctly", async () => {
+    destroyCache();
+    const cache = createCache();
+    const context = {
+      entry: "",
+      pathname: "",
+      query: {},
+      headers: {}
+    };
+    const config = createCacheConfig({ interval: 5 });
+    const content = "hello";
+    const shouldCache = await cache.set(context, content, config, true);
+    expect(shouldCache.value).toBe(true);
+    const freshResult = await cache.get(context);
+    expect(freshResult == null ? void 0 : freshResult.isStale).toBe(false);
+    await new Promise((resolve) => {
+      setTimeout(() => {
+        resolve();
+      }, 6e3);
+    });
+    const staleResult = await cache.get(context);
+    expect(staleResult == null ? void 0 : staleResult.isStale).toBe(true);
+  });
+  it("should garbage cache correctly", async () => {
+    destroyCache();
+    const cache = createCache();
+    const context = {
+      entry: "",
+      pathname: "",
+      query: {},
+      headers: {}
+    };
+    const config = createCacheConfig({
+      interval: 3,
+      staleLimit: 8
+    });
+    const content = "hello";
+    const shouldCache = await cache.set(context, content, config, true);
+    expect(shouldCache.value).toBe(true);
+    const freshResult = await cache.get(context);
+    expect(freshResult == null ? void 0 : freshResult.isGarbage).toBe(false);
+    await new Promise((resolve) => {
+      setTimeout(() => {
+        resolve();
+      }, 1e4);
+    });
+    const staleResult = await cache.get(context);
+    expect(staleResult == null ? void 0 : staleResult.isGarbage).toBe(true);
+  });
+});

package/dist/esm-node/libs/render/cache/index.js

@@ -0,0 +1,76 @@
+import { Transform } from "stream";
+import { ERROR_DIGEST } from "../../../constants";
+import { createCache } from "./spr";
+import { namespaceHash, withCoalescedInvoke } from "./util";
+var cache_default = (renderFn, ctx) => {
+  const sprCache = createCache();
+  const doRender = async (context) => {
+    const cacheContext = {
+      entry: context.entryName,
+      ...context.request
+    };
+    const cacheFile = await sprCache.get(cacheContext);
+    async function afterRender(source, onAfterRender) {
+      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);
+      }
+    }
+    if (!cacheFile) {
+      const renderResult = await renderFn(context);
+      return afterRender(renderResult, saveHtmlIntoCache);
+    }
+    const cacheHash = cacheFile == null ? void 0 : cacheFile.hash;
+    if (cacheFile.isGarbage) {
+      const renderResult = await renderFn(context);
+      return afterRender(renderResult, saveHtmlIntoCache);
+    } else if (cacheFile.isStale) {
+      const render = withCoalescedInvoke(() => renderFn(context)).bind(
+        null,
+        namespaceHash("render", cacheFile.hash),
+        []
+      );
+      render().then(async (res) => {
+        if (res.value && res.isOrigin) {
+          const { cacheConfig } = context;
+          if (cacheConfig) {
+            afterRender(res.value, async (html) => {
+              sprCache.set(cacheContext, html, cacheConfig);
+            });
+          } else {
+            sprCache.del(cacheContext, cacheHash);
+          }
+        }
+      }).catch((e) => {
+        sprCache.del(cacheContext, cacheHash);
+        ctx.error(ERROR_DIGEST.ERENDER, e);
+      });
+    }
+    ctx.res.setHeader("x-modern-spr", "1");
+    return cacheFile.content;
+  };
+  return doRender;
+};
+export {
+  cache_default as default
+};