@modern-js/prod-server 2.28.0 → 2.30.0

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

@@ -36,7 +36,21 @@ export class Server {
     if (!disableHttpServer) {
       this.app = await this.server.createHTTPServer(this.getRequestHandler());
     }
+    {
+      const result = await this.runner.beforeServerInit({
+        app: this.app,
+        server: this.server
+      });
+      ({ app: this.app = this.app, server: this.server } = result);
+    }
     await this.server.onInit(this.runner, this.app);
+    {
+      const result = await this.runner.afterServerInit({
+        app: this.app,
+        server: this.server
+      });
+      ({ app: this.app = this.app, server: this.server } = result);
+    }
     return this;
   }
   /**

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

@@ -2,6 +2,7 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createServer } from "http";
 import path from "path";
 import { fs, isPromise, isWebOnly, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { time } from "@modern-js/utils/universal/time";
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serveFile";
@@ -20,12 +21,11 @@ export class ModernServer {
     const { distDir, conf } = this;
     this.initReader();
     debug("final server conf", this.conf);
-    this.proxyHandler = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
-    if (this.proxyHandler) {
-      this.proxyHandler.forEach((handler) => {
-        this.addHandler(handler);
-      });
-    }
+    const proxyHandlers = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
+    app.on("upgrade", proxyHandlers.handleUpgrade);
+    proxyHandlers.handlers.forEach((handler) => {
+      this.addHandler(handler);
+    });
     (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
       this.reader.close();
     });
@@ -64,7 +64,9 @@ export class ModernServer {
   async render(req, res, url) {
     req.logger = req.logger || this.logger;
     req.metrics = req.metrics || this.metrics;
-    const context = createContext(req, res);
+    const context = createContext(req, res, {
+      metaName: this.metaName
+    });
     const matched = this.router.match(url || context.path);
     if (!matched) {
       return null;
@@ -265,12 +267,20 @@ export class ModernServer {
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   async routeHandler(context) {
-    const { res } = context;
+    const { res, reporter } = context;
     const matched = this.router.match(context.path);
     if (!matched) {
       this.render404(context);
       return;
     }
+    await reporter.init({
+      match: matched
+    });
+    const end = time();
+    res.on("finish", () => {
+      const cost = end();
+      reporter.reportTiming("server_handle_request", cost);
+    });
     let route = matched.generate(context.url);
     if (route.isApi) {
       await this.handleAPI(context);
@@ -279,9 +289,12 @@ export class ModernServer {
     if (route.entryName) {
       const afterMatchContext = createAfterMatchContext(context, route.entryName);
       if (this.runMode === RUN_MODE.FULL) {
+        const end2 = time();
         await this.runner.afterMatch(afterMatchContext, {
           onLast: noop
         });
+        const cost = end2();
+        reporter.reportTiming("server_hook_after_render", cost);
       }
       if (this.isSend(res)) {
         return;
@@ -303,7 +316,10 @@ export class ModernServer {
     if (this.frameWebHandler) {
       res.locals = res.locals || {};
       const middlewareContext = createMiddlewareContext(context);
+      const end2 = time();
       await this.frameWebHandler(middlewareContext);
+      const cost = end2();
+      reporter.reportTiming("server_middleware", cost);
       res.locals = {
         ...res.locals,
         ...middlewareContext.response.locals
@@ -325,9 +341,12 @@ export class ModernServer {
     if (route.entryName) {
       const afterRenderContext = createAfterRenderContext(context, response.toString());
       if (this.runMode === RUN_MODE.FULL) {
+        const end2 = time();
         await this.runner.afterRender(afterRenderContext, {
           onLast: noop
         });
+        const cost = end2();
+        reporter.reportTiming("server_hook_after_render", cost);
       }
       if (this.isSend(res)) {
         return;
@@ -460,7 +479,6 @@ export class ModernServer {
     _define_property(this, "loaderHandler", null);
     _define_property(this, "frameWebHandler", null);
     _define_property(this, "frameAPIHandler", null);
-    _define_property(this, "proxyHandler", null);
     _define_property(this, "_handler", void 0);
     require("ignore-styles");
     this.pwd = pwd;

package/dist/esm-node/workerServer.js

@@ -4,6 +4,7 @@ import { createAfterMatchContext, createAfterRenderContext, createMiddlewareCont
 import { Logger } from "./libs/logger";
 import { RouteMatchManager } from "./libs/route";
 import { metrics as defaultMetrics } from "./libs/metrics";
+import { defaultReporter } from "./libs/reporter";
 export class ReturnResponse {
   /**
   * Iterate a Object
@@ -82,7 +83,8 @@ export const createHandler = (manifest) => {
       level: "warn"
     });
     const metrics = defaultMetrics;
-    const hookContext = createWorkerHookContext(request.url, logger, metrics);
+    const reporter = defaultReporter;
+    const hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
     const afterMatchHookContext = createAfterMatchContext(hookContext, entryName);
     (_page = page) === null || _page === void 0 ? void 0 : (_page_serverHooks = _page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0);
     if (checkIsSent(hookContext)) {
@@ -118,9 +120,15 @@ export const createHandler = (manifest) => {
           template: page.template,
           entryName: page.entryName,
           logger,
+          reporter: defaultReporter,
           metrics,
           // FIXME: pass correctly req & res
           req: request,
+          serverTiming: {
+            addServeTiming() {
+              return this;
+            }
+          },
           res: responseLike
         };
         const body = await page.serverRender(serverRenderContext);
@@ -165,7 +173,7 @@ function createResponse(template) {
     return RESPONSE_NOTFOUND;
   }
 }
-function createWorkerHookContext(url, logger, metrics) {
+function createWorkerHookContext(url, logger, metrics, reporter) {
   const [res, req] = [
     {
       headers: new Headers(),
@@ -179,7 +187,8 @@ function createWorkerHookContext(url, logger, metrics) {
     res,
     req,
     logger,
-    metrics
+    metrics,
+    reporter
   };
 }
 function applyMiddlewares(ctx, middleware) {

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

@@ -2,11 +2,12 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/3ag51RGwEKkAOCZCey_Qe/src/type" />
+/// <reference types=".dts-temp/9d9muATSMGvby0DR5Il3_/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
-import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';
+import type { ModernServerContext as ModernServerContextInterface, Reporter as ModernServerReporter, ServerTiming as ModernServerTiming } from '@modern-js/types';
 export type ContextOptions = {
+  metaName?: string;
   etag?: boolean;
 };
 type ResponseBody = string | Buffer;
@@ -23,6 +24,8 @@ export declare class ModernServerContext implements ModernServerContextInterface
    * url params
    */
   params: Record<string, string>;
+  reporter: ModernServerReporter;
+  serverTiming: ModernServerTiming;
   get logger(): import("@modern-js/types").Logger;
   get metrics(): import("@modern-js/types").Metrics;
   serverData: Record<string, any>;

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

@@ -1,4 +1,4 @@
-import { AfterMatchContext, AfterRenderContext, HookContext, Logger, Metrics, MiddlewareContext } from '@modern-js/types/server';
+import { AfterMatchContext, AfterRenderContext, HookContext, Logger, Metrics, MiddlewareContext, Reporter } from '@modern-js/types/server';
 export interface WorkerResponse {
   headers: Headers;
   status: number;
@@ -10,6 +10,7 @@ export interface WorkerServerContext {
   res: WorkerResponse;
   req: Request;
   logger: Logger;
+  reporter: Reporter;
   metrics: Metrics;
 }
 export declare const base: (context: WorkerServerContext) => HookContext;

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

@@ -1,4 +1,11 @@
-import { ProxyDetail, NextFunction, BffProxyOptions, ModernServerContext } from '@modern-js/types';
+/// <reference types="node" />
+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 declare const createProxyHandler: (proxyOptions?: BffProxyOptions) => ((ctx: ModernServerContext, next: NextFunction) => Promise<void>)[] | null;
+export type HttpUpgradeHandler = NonNullable<RequestHandler['upgrade']>;
+export declare const createProxyHandler: (proxyOptions?: BffProxyOptions) => {
+  handlers: ModernServerHandler[];
+  handleUpgrade: (req: import("http-proxy-middleware/dist/types").Request, socket: import("net").Socket, head: any) => void;
+};

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

@@ -0,0 +1,2 @@
+import { Reporter } from '@modern-js/types/server';
+export declare const defaultReporter: Reporter;

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

@@ -0,0 +1,12 @@
+import { ServerTiming as IServerTiming } from '@modern-js/types';
+interface Res {
+  getHeader: (name: string) => number | string | string[] | undefined;
+  setHeader: (name: string, value: string) => void;
+}
+export declare class ServerTiming implements IServerTiming {
+  meta: string;
+  res: Res;
+  constructor(res: Res, meta: string);
+  addServeTiming(name: string, dur: number, desc?: string): this;
+}
+export {};

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

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse, Server } from 'http';
 import { Adapter, WebAdapter, APIServerStartInput, ServerOptions } from '@modern-js/server-core';
-import type { ModernServerContext, ServerRoute } from '@modern-js/types';
+import { type ModernServerContext, type ServerRoute } from '@modern-js/types';
 import type { ContextOptions } from '../libs/context';
 import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ModernServerInterface, BuildOptions, ModernServerHandler } from '../type';
 import { RouteMatchManager, ModernRouteInterface, ModernRoute } from '../libs/route';
@@ -30,7 +30,6 @@ export declare class ModernServer implements ModernServerInterface {
   private loaderHandler;
   private frameWebHandler;
   private frameAPIHandler;
-  private proxyHandler;
   private _handler;
   constructor({
     pwd,

package/dist/types/type.d.ts

@@ -11,6 +11,7 @@ declare module 'http' {
   interface IncomingMessage {
     logger: Logger;
     metrics: Metrics;
+    body?: any;
   }
 }
 export type ModernServerOptions = {

package/dist/types/utils.d.ts

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.28.0",
+  "version": "2.30.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -73,9 +73,9 @@
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.28.0",
-    "@modern-js/server-core": "2.28.0",
-    "@modern-js/plugin": "2.28.0"
+    "@modern-js/utils": "2.30.0",
+    "@modern-js/server-core": "2.30.0",
+    "@modern-js/plugin": "2.30.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -92,10 +92,12 @@
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "memfs": "^3.5.1",
-    "@modern-js/types": "2.28.0",
-    "@modern-js/server-core": "2.28.0",
-    "@scripts/build": "2.28.0",
-    "@scripts/jest-config": "2.28.0"
+    "ws": "^8.13.0",
+    "@types/ws": "^8.5.5",
+    "@modern-js/types": "2.30.0",
+    "@modern-js/server-core": "2.30.0",
+    "@scripts/build": "2.30.0",
+    "@scripts/jest-config": "2.30.0"
   },
   "sideEffects": false,
   "publishConfig": {