npm - @modern-js/prod-server - Versions diffs - 2.42.2 → 2.43.0 - Mend

@modern-js/prod-server 2.42.2 → 2.43.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (82) hide show

package/dist/cjs/libs/render/index.js +3 -11
package/dist/cjs/libs/render/ssr.js +2 -2
package/dist/cjs/libs/render/{cache/page-caches/lru.js → ssrCache/cacheMod.js} +21 -31
package/dist/cjs/libs/render/ssrCache/index.js +81 -0
package/dist/cjs/libs/render/ssrCache/manager.js +104 -0
package/dist/cjs/libs/render/static.js +5 -5
package/dist/cjs/server/index.js +2 -0
package/dist/cjs/server/modernServer.js +2 -9
package/dist/esm/libs/render/index.js +3 -11
package/dist/esm/libs/render/ssr.js +2 -2
package/dist/esm/libs/render/ssrCache/cacheMod.js +33 -0
package/dist/esm/libs/render/ssrCache/index.js +146 -0
package/dist/esm/libs/render/ssrCache/manager.js +159 -0
package/dist/esm/libs/render/static.js +5 -5
package/dist/esm/server/index.js +14 -4
package/dist/esm/server/modernServer.js +32 -42
package/dist/esm-node/libs/render/index.js +3 -11
package/dist/esm-node/libs/render/ssr.js +2 -2
package/dist/esm-node/libs/render/ssrCache/cacheMod.js +22 -0
package/dist/esm-node/libs/render/ssrCache/index.js +57 -0
package/dist/esm-node/libs/render/ssrCache/manager.js +80 -0
package/dist/esm-node/libs/render/static.js +5 -5
package/dist/esm-node/server/index.js +2 -0
package/dist/esm-node/server/modernServer.js +2 -9
package/dist/types/libs/context/index.d.ts +2 -0
package/dist/types/libs/preload/flushServerHeader.d.ts +2 -0
package/dist/types/libs/proxy.d.ts +2 -0
package/dist/types/libs/render/ssrCache/cacheMod.d.ts +8 -0
package/dist/types/libs/render/ssrCache/index.d.ts +7 -0
package/dist/types/libs/render/ssrCache/manager.d.ts +14 -0
package/dist/types/renderHtml.d.ts +2 -0
package/dist/types/server/index.d.ts +2 -0
package/dist/types/server/modernServer.d.ts +2 -3
package/dist/types/type.d.ts +2 -0
package/package.json +8 -11
package/dist/cjs/libs/render/cache/__tests__/cache.fun.test.js +0 -95
package/dist/cjs/libs/render/cache/__tests__/cache.test.js +0 -223
package/dist/cjs/libs/render/cache/__tests__/cacheable.js +0 -93
package/dist/cjs/libs/render/cache/__tests__/error-configuration.js +0 -71
package/dist/cjs/libs/render/cache/__tests__/matched-cache.js +0 -173
package/dist/cjs/libs/render/cache/index.js +0 -92
package/dist/cjs/libs/render/cache/page-caches/index.js +0 -36
package/dist/cjs/libs/render/cache/spr.js +0 -247
package/dist/cjs/libs/render/cache/type.js +0 -16
package/dist/cjs/libs/render/cache/util.js +0 -121
package/dist/cjs/libs/render/reader.js +0 -131
package/dist/esm/libs/render/cache/__tests__/cache.fun.test.js +0 -124
package/dist/esm/libs/render/cache/__tests__/cache.test.js +0 -612
package/dist/esm/libs/render/cache/__tests__/cacheable.js +0 -69
package/dist/esm/libs/render/cache/__tests__/error-configuration.js +0 -47
package/dist/esm/libs/render/cache/__tests__/matched-cache.js +0 -149
package/dist/esm/libs/render/cache/index.js +0 -204
package/dist/esm/libs/render/cache/page-caches/index.js +0 -34
package/dist/esm/libs/render/cache/page-caches/lru.js +0 -57
package/dist/esm/libs/render/cache/spr.js +0 -345
package/dist/esm/libs/render/cache/type.js +0 -0
package/dist/esm/libs/render/cache/util.js +0 -105
package/dist/esm/libs/render/reader.js +0 -196
package/dist/esm-node/libs/render/cache/__tests__/cache.fun.test.js +0 -72
package/dist/esm-node/libs/render/cache/__tests__/cache.test.js +0 -222
package/dist/esm-node/libs/render/cache/__tests__/cacheable.js +0 -69
package/dist/esm-node/libs/render/cache/__tests__/error-configuration.js +0 -47
package/dist/esm-node/libs/render/cache/__tests__/matched-cache.js +0 -149
package/dist/esm-node/libs/render/cache/index.js +0 -72
package/dist/esm-node/libs/render/cache/page-caches/index.js +0 -12
package/dist/esm-node/libs/render/cache/page-caches/lru.js +0 -32
package/dist/esm-node/libs/render/cache/spr.js +0 -212
package/dist/esm-node/libs/render/cache/type.js +0 -0
package/dist/esm-node/libs/render/cache/util.js +0 -80
package/dist/esm-node/libs/render/reader.js +0 -93
package/dist/types/libs/render/cache/__tests__/cache.fun.test.d.ts +0 -1
package/dist/types/libs/render/cache/__tests__/cache.test.d.ts +0 -1
package/dist/types/libs/render/cache/__tests__/cacheable.d.ts +0 -62
package/dist/types/libs/render/cache/__tests__/error-configuration.d.ts +0 -28
package/dist/types/libs/render/cache/__tests__/matched-cache.d.ts +0 -124
package/dist/types/libs/render/cache/index.d.ts +0 -6
package/dist/types/libs/render/cache/page-caches/index.d.ts +0 -2
package/dist/types/libs/render/cache/page-caches/lru.d.ts +0 -15
package/dist/types/libs/render/cache/spr.d.ts +0 -22
package/dist/types/libs/render/cache/type.d.ts +0 -48
package/dist/types/libs/render/cache/util.d.ts +0 -18
package/dist/types/libs/render/reader.d.ts +0 -20

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

@@ -1,72 +0,0 @@
-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 DELETED Viewed

@@ -1,222 +0,0 @@
-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 || cacheResult === void 0 ? 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 || cacheResult === void 0 ? 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 || cacheResult === void 0 ? 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 || freshResult === void 0 ? void 0 : freshResult.isStale).toBe(false);
-    await new Promise((resolve) => {
-      setTimeout(() => {
-        resolve();
-      }, 6e3);
-    });
-    const staleResult = await cache.get(context);
-    expect(staleResult === null || staleResult === void 0 ? 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 || freshResult === void 0 ? void 0 : freshResult.isGarbage).toBe(false);
-    await new Promise((resolve) => {
-      setTimeout(() => {
-        resolve();
-      }, 1e4);
-    });
-    const staleResult = await cache.get(context);
-    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isGarbage).toBe(true);
-  });
-});

package/dist/esm-node/libs/render/cache/__tests__/cacheable.js DELETED Viewed

@@ -1,69 +0,0 @@
-const cacheabelAry = [
-  {
-    requestOpt: {
-      url: "/"
-    },
-    cacheConfig: {},
-    content: "level0"
-  },
-  {
-    requestOpt: {
-      url: "/level-one",
-      query: {
-        name: "modern"
-      }
-    },
-    cacheConfig: {
-      level: 1,
-      includes: {
-        query: [
-          "name"
-        ]
-      }
-    },
-    content: "level1"
-  },
-  {
-    requestOpt: {
-      url: "/level-two",
-      headers: {
-        age: "18"
-      }
-    },
-    cacheConfig: {
-      level: 2,
-      includes: {
-        header: [
-          "age"
-        ]
-      }
-    },
-    content: "level2"
-  },
-  {
-    requestOpt: {
-      url: "/level-three",
-      query: {
-        name: "modern"
-      },
-      headers: {
-        age: "18"
-      }
-    },
-    cacheConfig: {
-      level: 3,
-      includes: {
-        query: [
-          "name"
-        ],
-        header: [
-          "age"
-        ]
-      }
-    },
-    content: "level3"
-  }
-];
-export {
-  cacheabelAry
-};

package/dist/esm-node/libs/render/cache/__tests__/error-configuration.js DELETED Viewed

@@ -1,47 +0,0 @@
-const errorConfiguration = [
-  {
-    level: 1
-  },
-  {
-    level: 1,
-    includes: {}
-  },
-  {
-    level: 1,
-    includes: {
-      query: []
-    }
-  },
-  {
-    level: 2,
-    includes: {}
-  },
-  {
-    level: 2,
-    includes: {
-      header: []
-    }
-  },
-  {
-    level: 3,
-    includes: {
-      header: []
-    }
-  },
-  {
-    level: 3,
-    includes: {
-      query: []
-    }
-  },
-  {
-    level: 3,
-    includes: {
-      query: [],
-      header: []
-    }
-  }
-];
-export {
-  errorConfiguration
-};

package/dist/esm-node/libs/render/cache/__tests__/matched-cache.js DELETED Viewed

@@ -1,149 +0,0 @@
-const matchedCacheableAry = [
-  [
-    {
-      requestOpt: {
-        url: "/level-one",
-        headers: {},
-        query: {
-          name: "byted"
-        }
-      },
-      cacheConfig: {
-        level: 1,
-        includes: {
-          query: [
-            "name"
-          ]
-        },
-        matches: {
-          query: {
-            name: {
-              weixin: "^byted"
-            }
-          }
-        }
-      },
-      content: "level1"
-    },
-    {
-      url: "/level-one",
-      headers: {},
-      query: {
-        name: "byted_likely"
-      }
-    },
-    {
-      url: "/level-one",
-      headers: {},
-      query: {
-        name: "not_byted"
-      }
-    }
-  ],
-  [
-    {
-      requestOpt: {
-        url: "/level-two",
-        query: {},
-        headers: {
-          age: "17"
-        }
-      },
-      cacheConfig: {
-        level: 2,
-        includes: {
-          header: [
-            "age"
-          ]
-        },
-        matches: {
-          header: {
-            age: {
-              one: "^1"
-            }
-          }
-        }
-      },
-      content: "level2"
-    },
-    {
-      url: "/level-two",
-      query: {},
-      headers: {
-        age: "11"
-      }
-    },
-    {
-      url: "/level-two",
-      query: {},
-      headers: {
-        age: "22"
-      }
-    }
-  ],
-  [
-    {
-      requestOpt: {
-        url: "/level-three",
-        headers: {
-          age: "17"
-        },
-        query: {
-          name: "byted"
-        }
-      },
-      cacheConfig: {
-        level: 3,
-        includes: {
-          query: [
-            "name"
-          ],
-          header: [
-            "age"
-          ]
-        },
-        matches: {
-          query: {
-            name: {
-              weixin: "^byted"
-            }
-          },
-          header: {
-            age: {
-              one: "^1"
-            }
-          }
-        }
-      },
-      content: "level3"
-    },
-    {
-      url: "/level-three",
-      query: {
-        name: "byted_likely"
-      },
-      headers: {
-        age: "19"
-      }
-    },
-    {
-      url: "/level-three",
-      query: {
-        name: "byted_likely"
-      },
-      headers: {}
-    },
-    {
-      url: "/level-three",
-      query: {
-        name: "not_byted"
-      },
-      headers: {
-        age: "19"
-      }
-    }
-  ]
-];
-export {
-  matchedCacheableAry
-};

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

@@ -1,72 +0,0 @@
-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 || cacheFile === void 0 ? 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
-};

package/dist/esm-node/libs/render/cache/page-caches/index.js DELETED Viewed

@@ -1,12 +0,0 @@
-import { LRUCaches } from "./lru";
-async function createPageCaches(max) {
-  const constructorOptions = {
-    max
-  };
-  const cacheInstance = new LRUCaches(constructorOptions);
-  await cacheInstance.init();
-  return cacheInstance;
-}
-export {
-  createPageCaches
-};

package/dist/esm-node/libs/render/cache/page-caches/lru.js DELETED Viewed

@@ -1,32 +0,0 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import LRU from "lru-cache";
-class LRUCaches {
-  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);
-  }
-  constructor(options) {
-    _define_property(this, "caches", void 0);
-    _define_property(this, "max", void 0);
-    this.max = options.max;
-    this.caches = new LRU(this.max);
-  }
-}
-export {
-  LRUCaches
-};