@modern-js/prod-server 2.31.2 → 2.32.0

package/dist/esm-node/server/modernServer.js

@@ -10,23 +10,25 @@ import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExte
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
-import { AGGRED_DIR, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE } from "../constants";
+import { AGGRED_DIR, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE, ServerReportTimings } from "../constants";
 import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "../libs/hook-api";
 const SERVER_DIR = "./server";
 export class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _app, _app1, _this_conf_output;
+    var _conf_bff, _app, _this_conf_output;
     this.runner = runner;
     const { distDir, conf } = this;
     this.initReader();
     debug("final server conf", this.conf);
-    const proxyHandlers = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
-    (_app = app) === null || _app === void 0 ? void 0 : _app.on("upgrade", proxyHandlers.handleUpgrade);
-    proxyHandlers.handlers.forEach((handler) => {
-      this.addHandler(handler);
-    });
-    (_app1 = app) === null || _app1 === void 0 ? void 0 : _app1.on("close", () => {
+    if ((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy) {
+      const { handlers, handleUpgrade } = createProxyHandler(conf.bff.proxy);
+      app && handleUpgrade(app);
+      handlers.forEach((handler) => {
+        this.addHandler(handler);
+      });
+    }
+    (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
       this.reader.close();
     });
     const usageRoutes = this.filterRoutes(this.getRoutes());
@@ -50,6 +52,7 @@ export class ModernServer {
       distDir,
       staticGenerate,
       forceCSR,
+      conf: this.conf,
       nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
       metaName
     });
@@ -244,7 +247,7 @@ export class ModernServer {
     if (this.isSend(res)) {
       return null;
     }
-    res.setHeader("content-type", renderResult.contentType);
+    res.set("content-type", renderResult.contentType);
     return renderResult;
   }
   async proxy() {
@@ -279,7 +282,7 @@ export class ModernServer {
     const end = time();
     res.on("finish", () => {
       const cost = end();
-      reporter.reportTiming("server_handle_request", cost);
+      reporter.reportTiming(ServerReportTimings.SERVER_HANDLE_REQUEST, cost);
     });
     let route = matched.generate(context.url);
     if (route.isApi) {
@@ -294,7 +297,7 @@ export class ModernServer {
           onLast: noop
         });
         const cost = end2();
-        reporter.reportTiming("server_hook_after_render", cost);
+        cost && reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_MATCH, cost);
       }
       if (this.isSend(res)) {
         return;
@@ -319,7 +322,7 @@ export class ModernServer {
       const end2 = time();
       await this.frameWebHandler(middlewareContext);
       const cost = end2();
-      reporter.reportTiming("server_middleware", cost);
+      cost && reporter.reportTiming(ServerReportTimings.SERVER_MIDDLEWARE, cost);
       res.locals = {
         ...res.locals,
         ...middlewareContext.response.locals
@@ -346,7 +349,7 @@ export class ModernServer {
           onLast: noop
         });
         const cost = end2();
-        reporter.reportTiming("server_hook_after_render", cost);
+        cost && reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_RENDER, cost);
       }
       if (this.isSend(res)) {
         return;
@@ -356,7 +359,7 @@ export class ModernServer {
     res.end(response);
   }
   isSend(res) {
-    if (res.headersSent) {
+    if (res.writableEnded) {
       return true;
     }
     if (res.getHeader("Location") && isRedirect(res.statusCode)) {
@@ -408,7 +411,9 @@ export class ModernServer {
     req.metrics = req.metrics || this.metrics;
     let context;
     try {
-      context = this.createContext(req, res);
+      context = this.createContext(req, res, {
+        metaName: this.metaName
+      });
     } catch (e) {
       this.logger.error(e);
       res.statusCode = 500;
@@ -422,7 +427,7 @@ export class ModernServer {
     }
   }
   redirect(res, url, status = 302) {
-    res.setHeader("Location", url);
+    res.set("Location", url);
     res.statusCode = status;
     res.end();
   }
@@ -433,7 +438,7 @@ export class ModernServer {
   async renderErrorPage(context, status) {
     const { res } = context;
     context.status = status;
-    res.setHeader("content-type", mime.contentType("html"));
+    res.set("content-type", mime.contentType("html"));
     const statusPage = `/${status}`;
     const customErrorPage = `/_error`;
     const matched = this.router.match(statusPage) || this.router.match(customErrorPage);

package/dist/types/constants.d.ts

@@ -21,4 +21,10 @@ export declare const ERROR_PAGE_TEXT: Record<number, string>;
 export declare const RUN_MODE: {
   FULL: string;
   TYPE: string;
-};
+};
+export declare enum ServerReportTimings {
+  SERVER_HANDLE_REQUEST = "server-handle-request",
+  SERVER_MIDDLEWARE = "server-middleware",
+  SERVER_HOOK_AFTER_RENDER = "server-hook-after-render",
+  SERVER_HOOK_AFTER_MATCH = "server-hook-after-match",
+}

package/dist/types/libs/context/context.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/Uq51sICZQ6QIQByOhN-rH/src/type" />
+/// <reference types=".dts-temp/h7cQDPEdPmsas3bCMYw2w/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface, Reporter as ModernServerReporter, ServerTiming as ModernServerTiming } from '@modern-js/types';

package/dist/types/libs/preload/flushServerHeader.d.ts

@@ -0,0 +1,20 @@
+/// <reference types="node" />
+import { OutgoingHttpHeaders } from 'http';
+import { ServerOptions } from '@modern-js/server-core';
+import { ModernServerContext } from '@modern-js/types';
+export declare function transformToRegExp(input: string | RegExp): RegExp;
+export declare function shouldFlushServerHeader(serverConf: ServerOptions['server'], userAgent?: string, disablePreload?: boolean): boolean;
+export interface FlushServerHeaderOptions {
+  ctx: ModernServerContext;
+  distDir: string;
+  template: string;
+  serverConf: ServerOptions['server'];
+  headers?: OutgoingHttpHeaders;
+}
+export declare function flushServerHeader({
+  serverConf,
+  ctx,
+  distDir,
+  template,
+  headers
+}: FlushServerHeaderOptions): Promise<void>;

package/dist/types/libs/preload/index.d.ts

@@ -0,0 +1,2 @@
+export * from './parseLinks';
+export * from './flushServerHeader';

package/dist/types/libs/preload/parseLinks.d.ts

@@ -0,0 +1,14 @@
+export interface Link {
+  uri: string;
+  as?: 'script' | 'style' | 'image' | 'video' | 'font' | string;
+}
+export interface ParseLinksOptions {
+  distDir: string;
+  pathname: string;
+  template: string;
+}
+export declare function parseLinks({
+  pathname,
+  distDir,
+  template
+}: ParseLinksOptions): Promise<Link[]>;

package/dist/types/libs/preload/transformLinks2String.d.ts

@@ -0,0 +1,3 @@
+import { SSRPreload } from '@modern-js/server-core';
+import { Link } from './parseLinks';
+export declare function transformLinks2String(links: Link[], preload: SSRPreload | boolean): string;

package/dist/types/libs/proxy.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="node" />
+import http from 'http';
 import { RequestHandler } from 'http-proxy-middleware';
 import { ProxyDetail, BffProxyOptions } from '@modern-js/types';
 import type { ModernServerHandler } from '../type';
 export type { BffProxyOptions };
 export declare function formatProxyOptions(proxyOptions: BffProxyOptions): ProxyDetail[];
 export type HttpUpgradeHandler = NonNullable<RequestHandler['upgrade']>;
-export declare const createProxyHandler: (proxyOptions?: BffProxyOptions) => {
+export declare const createProxyHandler: (proxyOptions: BffProxyOptions) => {
   handlers: ModernServerHandler[];
-  handleUpgrade: (req: import("http-proxy-middleware/dist/types").Request, socket: import("net").Socket, head: any) => void;
+  handleUpgrade: (server: http.Server) => void;
 };

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

@@ -1,4 +1,5 @@
 import type { ModernServerContext } from '@modern-js/types';
+import { ServerOptions } from '@modern-js/server-core';
 import { RenderResult, ServerHookRunner } from '../../type';
 import { ModernRoute } from '../route';
 import * as ssr from './ssr';
@@ -10,6 +11,7 @@ export type RenderHandler = (options: {
 type CreateRenderHandler = (ctx: {
   distDir: string;
   staticGenerate: boolean;
+  conf: ServerOptions;
   ssrRender?: typeof ssr.render;
   forceCSR?: boolean;
   nonce?: string;

package/dist/types/libs/serverTiming.d.ts

@@ -2,6 +2,7 @@ import { ServerTiming as IServerTiming } from '@modern-js/types';
 interface Res {
   getHeader: (name: string) => number | string | string[] | undefined;
   setHeader: (name: string, value: string) => void;
+  set: (name: string, value: any) => this;
 }
 export declare class ServerTiming implements IServerTiming {
   meta: string;

package/dist/types/type.d.ts

@@ -13,6 +13,9 @@ declare module 'http' {
     metrics: Metrics;
     body?: any;
   }
+  interface OutgoingMessage {
+    set: (key: string, value: any) => this;
+  }
 }
 export type ModernServerOptions = {
   pwd: string;

package/dist/types/utils.d.ts

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

package/package.json

@@ -15,37 +15,37 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.31.2",
+  "version": "2.32.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "exports": {
     ".": {
+      "types": "./dist/types/index.d.ts",
       "node": {
         "jsnext:source": "./src/index.ts",
         "import": "./dist/esm-node/index.js",
         "require": "./dist/cjs/index.js"
       },
-      "types": "./dist/types/index.d.ts",
       "default": "./dist/esm/index.js"
     },
     "./worker": {
+      "types": "./dist/types/workerServer.d.ts",
       "node": {
         "jsnext:source": "./src/workerServer.ts",
         "import": "./dist/esm-node/workerServer.js",
         "require": "./dist/cjs/workerServer.js"
       },
-      "types": "./dist/types/workerServer.d.ts",
       "default": "./dist/esm/workerServer.js"
     },
     "./renderHtml": {
+      "types": "./dist/types/renderHtml.d.ts",
       "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"
     }
   },
@@ -63,41 +63,42 @@
     }
   },
   "dependencies": {
+    "@swc/helpers": "0.5.1",
+    "cookie": "^0.4.2",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
-    "cookie": "^0.4.2",
     "http-proxy-middleware": "^2.0.1",
     "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",
-    "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.31.2",
-    "@modern-js/server-core": "2.31.2",
-    "@modern-js/plugin": "2.31.2"
+    "@modern-js/plugin": "2.32.0",
+    "@modern-js/server-core": "2.32.0",
+    "@modern-js/utils": "2.32.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.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/etag": "^1.8.1",
-    "@types/fresh": "^0.5.0",
     "@types/serve-static": "^1.13.10",
+    "@types/ws": "^8.5.5",
     "axios": "^1.2.1",
     "jest": "^29",
+    "memfs": "^3.5.1",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^5",
-    "memfs": "^3.5.1",
     "ws": "^8.13.0",
-    "@types/ws": "^8.5.5",
-    "@modern-js/types": "2.31.2",
-    "@modern-js/server-core": "2.31.2",
-    "@scripts/jest-config": "2.31.1",
-    "@scripts/build": "2.31.1"
+    "@modern-js/server-core": "2.32.0",
+    "@modern-js/types": "2.32.0",
+    "@scripts/build": "2.32.0",
+    "@scripts/jest-config": "2.32.0"
   },
   "sideEffects": false,
   "publishConfig": {