@modern-js/prod-server 2.42.2 → 2.43.0

package/dist/types/libs/render/ssrCache/cacheMod.d.ts

@@ -0,0 +1,8 @@
+import type { CacheOption, Container } from '@modern-js/types';
+declare class ServerCacheMod {
+    customContainer?: Container;
+    cacheOption?: CacheOption;
+    loadServerCacheMod(pwd?: string): void;
+}
+export declare const cacheMod: ServerCacheMod;
+export {};

package/dist/types/libs/render/ssrCache/index.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="dist/types/type" />
+import { IncomingMessage } from 'http';
+import { type Readable } from 'stream';
+import { RenderFunction, SSRServerContext } from '../type';
+export declare function ssrCache(req: IncomingMessage, render: RenderFunction, ssrContext: SSRServerContext): Promise<string | Readable>;

package/dist/types/libs/render/ssrCache/manager.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="dist/types/type" />
+import { IncomingMessage } from 'http';
+import { Readable } from 'stream';
+import { CacheControl, Container } from '@modern-js/types';
+import { RenderFunction, SSRServerContext } from '../type';
+export declare class CacheManager {
+    private containter;
+    constructor(containter: Container<string, string>);
+    getCacheResult(req: IncomingMessage, cacheControl: CacheControl, render: RenderFunction, ssrContext: SSRServerContext): Promise<string | Readable>;
+    private processCache;
+    private computedKey;
+}

package/dist/types/renderHtml.d.ts

@@ -1,4 +1,6 @@
+/// <reference path="type.d.ts" />
 /// <reference types="node" />
+/// <reference types="node/http" />
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
 import { ModernServerOptions } from './type';
 export interface RenderHtmlOptions {

package/dist/types/server/index.d.ts

@@ -1,6 +1,8 @@
+/// <reference path="../type.d.ts" />
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node/http" />
 import { IncomingMessage, ServerResponse } from 'http';
 import type { ListenOptions } from 'net';
 import { ModernServerOptions, ServerConstructor } from '../type';

package/dist/types/server/modernServer.d.ts

@@ -1,5 +1,7 @@
+/// <reference path="../type.d.ts" />
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node/http" />
 import { IncomingMessage, ServerResponse, Server } from 'http';
 import { Adapter, WebAdapter, APIServerStartInput, ServerOptions } from '@modern-js/server-core';
 import { type ModernServerContext, type ServerRoute } from '@modern-js/types';
@@ -8,7 +10,6 @@ import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, M
 import { RouteMatchManager, ModernRouteInterface, ModernRoute } from '../libs/route';
 import { RenderHandler } from '../libs/render';
 import { mergeExtension } from '../utils';
-import * as reader from '../libs/render/reader';
 type ModernServerAsyncHandler = (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export declare class ModernServer implements ModernServerInterface {
     pwd: string;
@@ -22,7 +23,6 @@ export declare class ModernServer implements ModernServerInterface {
     protected readonly logger: Logger;
     protected readonly metrics: Metrics;
     protected readonly runMode: string;
-    protected reader: typeof reader;
     protected readonly proxyTarget: ModernServerOptions['proxyTarget'];
     protected routeRenderHandler: RenderHandler;
     protected readonly staticGenerate: boolean;
@@ -38,7 +38,6 @@ export declare class ModernServer implements ModernServerInterface {
     getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
     render(req: IncomingMessage, res: ServerResponse, url?: string): Promise<string | import("stream").Readable | null>;
     createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server<typeof IncomingMessage, typeof ServerResponse>>;
-    protected initReader(): void;
     protected onServerChange({ filepath }: {
         filepath: string;
     }): Promise<void>;

package/dist/types/type.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node/http" />
 import { IncomingMessage, Server, ServerResponse } from 'http';
 import { Readable } from 'stream';
 import { serverManager, ServerOptions } from '@modern-js/server-core';
@@ -69,6 +70,7 @@ export interface ModernServerInterface {
     getRequestHandler: () => (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;
     createHTTPServer: (handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void) => Promise<Server>;
     render: (req: IncomingMessage, res: ServerResponse, url?: string) => Promise<string | Readable | null>;
+    close?: () => Promise<void>;
 }
 export type ServerConstructor = (options: ModernServerOptions) => ModernServerInterface;
 export type ModernServerHandler = (context: ModernServerContext, next: NextFunction) => Promise<void> | void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.42.2",
+  "version": "2.43.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,22 +69,20 @@
     "fresh": "^0.5.2",
     "http-proxy-middleware": "^2.0.4",
     "ignore-styles": "^5.0.1",
-    "lru-cache": "^6.0.0",
     "merge-deep": "^3.0.3",
     "node-html-parser": "^6.1.5",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/plugin": "2.42.2",
-    "@modern-js/server-core": "2.42.2",
-    "@modern-js/utils": "2.42.2",
-    "@modern-js/runtime-utils": "2.42.2"
+    "@modern-js/server-core": "2.43.0",
+    "@modern-js/utils": "2.43.0",
+    "@modern-js/runtime-utils": "2.43.0",
+    "@modern-js/plugin": "2.43.0"
   },
   "devDependencies": {
     "@types/cookie": "0.5.1",
     "@types/etag": "^1.8.1",
     "@types/fresh": "^0.5.0",
     "@types/jest": "^29",
-    "@types/lru-cache": "^5.1.1",
     "@types/merge-deep": "^3.0.0",
     "@types/node": "^14",
     "@types/serve-static": "^1.13.10",
@@ -96,10 +94,9 @@
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "ws": "^8.13.0",
-    "@modern-js/server-core": "2.42.2",
-    "@modern-js/types": "2.42.2",
-    "@scripts/build": "2.42.2",
-    "@scripts/jest-config": "2.42.2"
+    "@modern-js/types": "2.43.0",
+    "@scripts/jest-config": "2.43.0",
+    "@scripts/build": "2.43.0"
   },
   "sideEffects": false,
   "publishConfig": {

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

@@ -1,95 +0,0 @@
-"use strict";
-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 __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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var import_url = __toESM(require("url"));
-var import_spr = require("../spr");
-var import_util = require("../util");
-describe("test spr util functions", () => {
-  it("should return value correctly", () => {
-    expect((0, import_util.connectFactor)("bar", "foo")).toBe("bar-foo");
-    expect((0, import_util.fname)(1)).toBe("f1");
-    expect((0, import_util.namespaceHash)("modern", "!@#$%^&")).toBe("modern/!@#$%^&");
-  });
-  it("should create or destroy instance correctly", () => {
-    const ins1 = (0, import_spr.createCache)();
-    const ins2 = (0, import_spr.createCache)();
-    expect(ins1 === ins2).toBe(true);
-    (0, import_spr.destroyCache)();
-    const ins3 = (0, import_spr.createCache)();
-    expect(ins1 === ins3).toBe(false);
-    expect(ins2 === ins3).toBe(false);
-  });
-  it("should return function correctly", () => {
-    const urlParams = (() => new import_url.default.URLSearchParams())();
-    urlParams.set("name", "modern");
-    const getParam = (0, import_util.valueFactory)(urlParams);
-    expect(getParam("name")).toBe("modern");
-    const headers = {
-      age: "12345"
-    };
-    const getHeader = (0, import_util.valueFactory)(headers);
-    expect(getHeader("age")).toBe("12345");
-  });
-  it("should add target html content", () => {
-    const contentNoHead = "<div>123</div>";
-    const html = (0, import_util.cacheAddition)(contentNoHead, Math.random().toString());
-    expect(html).toBe(contentNoHead);
-    const contentWithHead = "<head></head><div>123</div>";
-    const hash = Math.random().toString();
-    const htmlWithHead = (0, import_util.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 = (0, import_util.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 (0, import_util.maybeSync)(() => new Promise((resolve) => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(false);
-    expect(async).toBeUndefined();
-    const sync = await (0, import_util.maybeSync)(() => new Promise((resolve) => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(true);
-    expect(sync).toBe(foo);
-  });
-});

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

@@ -1,223 +0,0 @@
-"use strict";
-var import_spr = require("../spr");
-var import_error_configuration = require("./error-configuration");
-var import_cacheable = require("./cacheable");
-var import_matched_cache = require("./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 () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.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 () => {
-    (0, import_spr.destroyCache)();
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.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 () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
-    const content = "hello";
-    for (const config of import_error_configuration.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 () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.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 () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.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 () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
-    for (const cacheable of import_cacheable.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 () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.createCache)();
-    for (const cacheable of import_matched_cache.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 () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.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 () => {
-    (0, import_spr.destroyCache)();
-    const cache = (0, import_spr.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/cjs/libs/render/cache/__tests__/cacheable.js

@@ -1,93 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var cacheable_exports = {};
-__export(cacheable_exports, {
-  cacheabelAry: () => cacheabelAry
-});
-module.exports = __toCommonJS(cacheable_exports);
-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"
-  }
-];
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  cacheabelAry
-});

package/dist/cjs/libs/render/cache/__tests__/error-configuration.js

@@ -1,71 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var error_configuration_exports = {};
-__export(error_configuration_exports, {
-  errorConfiguration: () => errorConfiguration
-});
-module.exports = __toCommonJS(error_configuration_exports);
-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: []
-    }
-  }
-];
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  errorConfiguration
-});