@modern-js/prod-server 2.21.0 → 2.22.0

package/dist/types/libs/hook-api/base.d.ts

@@ -0,0 +1,53 @@
+import { CookieAPI, Metrics, ModernRequest, ModernResponse, Logger } from '@modern-js/types/server';
+export interface ServerResponseLike {
+  statusCode?: number;
+  locals?: Record<string, any>;
+  getHeader: (key: string) => string | undefined | string[] | number;
+  setHeader: (key: string, value: string | number | string[]) => this | void;
+  removeHeader: (key: string) => void;
+  end: (body: string) => this | void;
+}
+export declare class BaseResponse implements ModernResponse {
+  cookies: CookieAPI;
+  private res;
+  constructor(res: ServerResponseLike);
+  get(key: string): string | number | string[] | undefined;
+  set(key: string, value: string | number): void | ServerResponseLike;
+  status(code: number): void;
+  private setCookie;
+  private clearCookie;
+  raw(body: string, options?: {
+    status?: number;
+    headers?: Record<string, any>;
+  }): void;
+}
+export interface ServerRequestLike {
+  url: string;
+  host: string;
+  path: string;
+  query: Record<string, any>;
+  headers: Record<string, any>;
+}
+export declare class BaseRequest implements ModernRequest {
+  readonly url: string;
+  readonly host: string;
+  readonly pathname: string;
+  readonly query: Record<string, any>;
+  readonly headers: Record<string, any>;
+  readonly cookie: string;
+  cookies: Pick<CookieAPI, 'get'>;
+  private _cookie;
+  constructor(request: ServerRequestLike);
+  private getCookie;
+}
+export interface ServerContextLike {
+  res: ServerResponseLike;
+  req: any;
+  metrics: Metrics;
+  logger: Logger;
+  url: string;
+  host: string;
+  path: string;
+  query: Record<string, any>;
+  headers: Record<string, any>;
+}

package/dist/types/libs/hook-api/index.worker.d.ts

@@ -0,0 +1,18 @@
+import { AfterMatchContext, AfterRenderContext, HookContext, Logger, Metrics, MiddlewareContext } from '@modern-js/types/server';
+export interface WorkerResponse {
+  headers: Headers;
+  status: number;
+  isSent: boolean;
+  locals?: Record<string, any>;
+  body?: string;
+}
+export interface WorkerServerContext {
+  res: WorkerResponse;
+  req: Request;
+  logger: Logger;
+  metrics: Metrics;
+}
+export declare const base: (context: WorkerServerContext) => HookContext;
+export declare const createAfterMatchContext: (context: WorkerServerContext, entryName: string) => AfterMatchContext;
+export declare const createAfterRenderContext: (context: WorkerServerContext, content: string) => AfterRenderContext;
+export declare const createMiddlewareContext: (context: WorkerServerContext) => MiddlewareContext<'worker'>;

package/dist/types/libs/hook-api/template.d.ts

@@ -1,5 +1,13 @@
-/// <reference types="node" />
-import { Transform } from 'stream';
+export declare const RegList: {
+  before: {
+    head: string;
+    body: string;
+  };
+  after: {
+    head: string;
+    body: string;
+  };
+};
 export declare class TemplateAPI {
   private content;
   constructor(content: string);
@@ -10,15 +18,4 @@ export declare class TemplateAPI {
   prependBody(fragment: string): void;
   appendBody(fragment: string): void;
   private replace;
-}
-export declare const templateInjectableStream: ({
-  prependHead,
-  appendHead,
-  prependBody,
-  appendBody
-}: {
-  prependHead?: string | undefined;
-  appendHead?: string | undefined;
-  prependBody?: string | undefined;
-  appendBody?: string | undefined;
-}) => Transform;
+}

package/dist/types/libs/hook-api/templateForStream.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+import { Transform } from 'stream';
+export declare const templateInjectableStream: ({
+  prependHead,
+  appendHead,
+  prependBody,
+  appendBody
+}: {
+  prependHead?: string | undefined;
+  appendHead?: string | undefined;
+  prependBody?: string | undefined;
+  appendBody?: string | undefined;
+}) => Transform;

package/dist/types/libs/render/reader.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" />
+import type { IFs } from 'memfs';
 export declare class LruReader {
   private readonly cache;
+  private fs;
   constructor();
-  init(): void;
+  init(fs?: IFs): void;
   close(): void;
   read(filepath: string): Promise<{
     content: Buffer;
@@ -14,5 +16,5 @@ export declare class LruReader {
 }
 export declare const readFile: (filepath: string) => Promise<Buffer | undefined>;
 export declare const updateFile: () => void;
-export declare const init: () => void;
+export declare const init: (fs?: IFs) => void;
 export declare const close: () => void;

package/dist/types/renderHtml.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="node" />
+import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
+import { ModernServerOptions } from './type';
+export interface RenderHtmlOptions {
+  /** request url */
+  url: string;
+  /** request method */
+  method?: string;
+  /** request headers  */
+  headers?: IncomingHttpHeaders;
+  /** request body */
+  body?: string;
+  serverOptions: ModernServerOptions;
+}
+export interface ReturnResponse {
+  headers: OutgoingHttpHeaders;
+  redirected: boolean;
+  status: number;
+  url: string;
+  body: string;
+}

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

@@ -26,7 +26,11 @@ export declare class Server {
    * - 执行 prepare hook
    * - 执行 server init
    */
-  init(): Promise<this>;
+  init({
+    disableHttpServer
+  }?: {
+    disableHttpServer: boolean;
+  }): Promise<this>;
   /**
    * Execute config hooks
    * @param runner

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

@@ -42,14 +42,15 @@ export declare class ModernServer implements ModernServerInterface {
   }: ModernServerOptions);
   onInit(runner: ServerHookRunner, app: Server): Promise<void>;
   onRepack(_: BuildOptions): void;
+  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>;
-  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 getRoutes(): ServerRoute[];
   protected addHandler(handler: ModernServerHandler): void;
   protected render404(context: ModernServerContext): void;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/dQl0PkddbjYymDTKBgvwm/src/type" />
+/// <reference types=".dts-temp/t0a-Q86lFJHlugCUZWCMB/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;

package/dist/types/workerServer.d.ts

@@ -1,3 +1,4 @@
+import { AfterMatchContext, AfterRenderContext, MiddlewareContext, NextFunction } from '@modern-js/types';
 import { ModernRouteInterface } from './libs/route';
 export type Context = Record<string, any>;
 export interface HandlerOptions {
@@ -31,14 +32,24 @@ export declare class ReturnResponse {
    */
   setHeaders(headers: Record<string, any>): this;
 }
+type Middleware = (context: MiddlewareContext<'worker'>, next: NextFunction) => Promise<void> | void;
+type ServerHooks = {
+  middleware?: Middleware | Middleware[];
+  afterRender?: (ctx: AfterRenderContext, next: unknown) => Promise<void> | void;
+  afterMatch?: (ctx: AfterMatchContext, next: unknown) => Promise<void> | void;
+};
+type Page = {
+  entryName: string;
+  template: string;
+  serverHooks?: ServerHooks;
+  serverRender?: (ctx: Record<string, any>) => Promise<string>;
+};
 export type Manifest = {
-  pages: Record<string,
-  // path
-  {
-    entryName: string;
-    template: string;
-    serverRender?: (ctx: Record<string, any>) => Promise<string>;
-  }>;
+  /**
+   * @param key - path
+   */
+  pages: Record<string, Page>;
   routes: ModernRouteInterface[];
 };
-export declare const createHandler: (manifest: Manifest) => (options: HandlerOptions) => Promise<ReturnResponse>;
+export declare const createHandler: (manifest: Manifest) => (options: HandlerOptions) => Promise<ReturnResponse>;
+export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.21.0",
+  "version": "2.22.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -38,6 +38,15 @@
       },
       "types": "./dist/types/workerServer.d.ts",
       "default": "./dist/esm/workerServer.js"
+    },
+    "./renderHtml": {
+      "node": {
+        "jsnext:source": "./src/renderHtml.ts",
+        "import": "./dist/esm-node/renderHtml.js",
+        "require": "./dist/cjs/renderHtml.js"
+      },
+      "types": "./dist/types/renderHtml.d.ts",
+      "default": "./dist/esm/renderHtml.js"
     }
   },
   "typesVersions": {
@@ -47,6 +56,9 @@
       ],
       "worker": [
         "./dist/types/workerServer.d.ts"
+      ],
+      "renderHtml": [
+        "./dist/types/renderHtml.d.ts"
       ]
     }
   },
@@ -61,8 +73,9 @@
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.21.0",
-    "@modern-js/server-core": "2.21.0"
+    "@modern-js/server-core": "2.22.0",
+    "@modern-js/plugin": "2.22.0",
+    "@modern-js/utils": "2.22.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -78,10 +91,11 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^5",
-    "@modern-js/types": "2.21.0",
-    "@modern-js/server-core": "2.21.0",
-    "@scripts/jest-config": "2.21.0",
-    "@scripts/build": "2.21.0"
+    "memfs": "^3.5.1",
+    "@modern-js/types": "2.22.0",
+    "@modern-js/server-core": "2.22.0",
+    "@scripts/build": "2.22.0",
+    "@scripts/jest-config": "2.22.0"
   },
   "sideEffects": false,
   "publishConfig": {