@modern-js/prod-server 2.19.1 → 2.21.0

package/dist/esm-node/workerServer.js

@@ -1,68 +1,123 @@
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { Logger } from "./libs/logger";
 import { RouteMatchManager } from "./libs/route";
 import { metrics as defaultMetrics } from "./libs/metrics";
-export const handleUrl = (url) => {
-  return url.replace(/^https?:\/\/.*?\//gi, "/");
-};
+export class ReturnResponse {
+  /**
+  * Iterate a Object
+  * 1. adds the value if the key does not already exist.
+  * 2. append the value if the key does already exist.
+  *
+  * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/append
+  * @param headers
+  * @returns
+  */
+  appendHeaders(headers) {
+    Object.entries(headers).forEach(([key, value]) => {
+      this.headers.append(key, value.toString());
+    });
+    return this;
+  }
+  /**
+  * Iterate a Object
+  * 1. adds the value if the key does not already exist.
+  * 2. modify the value if the key does already exist.
+  *
+  * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/set
+  * @param headers
+  * @returns
+  */
+  setHeaders(headers) {
+    Object.entries(headers).forEach(([key, value]) => {
+      this.headers.set(key, value.toString());
+    });
+    return this;
+  }
+  constructor(body, status, headers = {}) {
+    _define_property(this, "body", void 0);
+    _define_property(this, "status", void 0);
+    _define_property(this, "headers", void 0);
+    this.body = body;
+    this.status = status;
+    this.headers = new Headers(headers);
+    this.headers.set("content-type", "text/html;charset=UTF-8");
+  }
+}
+const RESPONSE_NOTFOUND = new ReturnResponse("404: Page not found", 404);
 export const createHandler = (manifest) => {
   const routeMgr = new RouteMatchManager();
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
-  return async (ctx) => {
-    var _ctx_request, _ctx_request1, _ctx_request2;
-    const pageMatch = routeMgr.match(ctx.url);
+  return async (options) => {
+    const { request, loadableStats, routeManifest } = options;
+    const url = new URL(request.url);
+    const pageMatch = routeMgr.match(url.pathname);
     if (!pageMatch) {
-      ctx.body = "404: Page not found";
-      ctx.status = 404;
-      return;
+      return RESPONSE_NOTFOUND;
     }
     const page = pages[pageMatch.spec.urlPath];
-    var _query;
-    (_query = (_ctx_request = ctx.request).query) !== null && _query !== void 0 ? _query : _ctx_request.query = ctx.query;
-    var _pathname;
-    (_pathname = (_ctx_request1 = ctx.request).pathname) !== null && _pathname !== void 0 ? _pathname : _ctx_request1.pathname = ctx.pathname;
-    var _params;
-    (_params = (_ctx_request2 = ctx.request).params) !== null && _params !== void 0 ? _params : _ctx_request2.params = ctx.params;
-    const params = pageMatch.parseURLParams(ctx.url);
     if (page.serverRender) {
       try {
-        ctx.body = await page.serverRender({
-          entryName: page.entryName,
+        const responseLike = {
+          headers: {},
+          statusCode: 200,
+          locals: {},
+          setHeader(key, value) {
+            this.headers[key] = value;
+          },
+          status(code) {
+            this.statusCode = code;
+          }
+        };
+        const params = pageMatch.parseURLParams(url.pathname) || {};
+        const serverRenderContext = {
+          request: createServerRequest(url, request, params),
+          response: responseLike,
+          loadableStats,
+          routeManifest,
+          redirection: {},
           template: page.template,
-          query: ctx.query,
-          request: ctx.request,
-          response: ctx.response,
-          pathname: ctx.pathname,
-          req: ctx.request,
-          res: ctx.response,
-          params: ctx.params || params || {},
-          logger: ctx.logger || new Logger({
+          entryName: page.entryName,
+          logger: new Logger({
             level: "warn"
           }),
-          metrics: ctx.metrics || defaultMetrics,
-          loadableStats: ctx.loadableStats,
-          routeManifest: ctx.routeManifest
-        });
-        ctx.status = 200;
-        return;
+          metrics: defaultMetrics,
+          // FIXME: pass correctly req & res
+          req: request,
+          res: responseLike
+        };
+        const body = await page.serverRender(serverRenderContext);
+        return new ReturnResponse(body, responseLike.statusCode, responseLike.headers);
       } catch (e) {
-        if (page.template) {
-          ctx.body = page.template;
-          ctx.status = 200;
-          return;
-        } else {
-          ctx.body = "404: not found";
-          ctx.status = 404;
-          return;
-        }
+        console.warn(`page(${pageMatch.spec.urlPath}) serverRender occur error: `);
+        console.warn(e);
+        return createResponse(page.template);
       }
     }
-    if (page.template) {
-      ctx.body = page.template;
-      ctx.status = 200;
-      return;
+    console.warn(`Can't not page(${pageMatch.spec.urlPath}) serverRender`);
+    return createResponse(page.template);
+    function createServerRequest(url2, request2, params) {
+      const { pathname, host, searchParams } = url2;
+      const { headers: rawHeaders } = request2;
+      const headers = {};
+      rawHeaders.forEach((value, key) => {
+        headers[key] = value;
+      });
+      const query = Object.fromEntries(searchParams);
+      return {
+        pathname,
+        host,
+        headers,
+        params,
+        query
+      };
     }
-    ctx.body = "404: not found";
-    ctx.status = 404;
   };
 };
+function createResponse(template) {
+  if (template) {
+    return new ReturnResponse(template, 200);
+  } else {
+    return RESPONSE_NOTFOUND;
+  }
+}

package/dist/types/index.d.ts

@@ -6,7 +6,5 @@ export { ModernServer } from './server/modernServer';
 export { createProxyHandler } from './libs/proxy';
 export * from './type';
 export * from './constants';
-
 declare const _default: (options: ModernServerOptions) => Promise<Server>;
-
 export default _default;

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/fqLsTrQHy_76SvC3yCBK3/src/type" />
+/// <reference types=".dts-temp/dQl0PkddbjYymDTKBgvwm/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';
@@ -18,12 +18,10 @@ export declare class ModernServerContext implements ModernServerContextInterface
   /**
    * http response
    */
-
   res: ServerResponse;
   /**
    * url params
    */
-
   params: Record<string, string>;
   get logger(): import("@modern-js/types").Logger;
   get metrics(): import("@modern-js/types").Metrics;
@@ -54,7 +52,6 @@ export declare class ModernServerContext implements ModernServerContextInterface
   /**
    * 判断链接是否已经关闭
    */
-
   resHasHandled(): boolean;
   error(dig: string, e?: Error | string): void;
 }

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

@@ -6,7 +6,6 @@ export declare const requireConfig: (serverConfigPath: string) => any;
  * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
  * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
  */
-
 export declare const loadConfig: ({
   cliConfig,
   serverConfig,

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

@@ -44,7 +44,6 @@ declare const LOG_TYPES: {
     level: string;
   };
 };
-
 declare class Logger {
   private readonly level;
   private readonly config;
@@ -55,7 +54,6 @@ declare class Logger {
   private _log;
   private getLongestLabel;
 }
-
 type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
 declare const logger: Logger & LoggerInterface;
 export { Logger };

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

@@ -2,7 +2,5 @@
 import { Readable } from 'stream';
 import type { ModernServerContext } from '@modern-js/types';
 import { RenderFunction, SSRServerContext } from '../type';
-
 declare const _default: (renderFn: RenderFunction, ctx: ModernServerContext) => (context: SSRServerContext) => Promise<string | Readable>;
-
 export default _default;

package/dist/types/libs/render/cache/spr.d.ts

@@ -1,6 +1,5 @@
 import LRUCache from 'lru-cache';
 import { CacheContent, CacheManagerOptions, CacheResult, CacheContext, CacheConfig } from './type';
-
 declare class CacheManager {
   cache: LRUCache<string, CacheContent>;
   cacheOptions: CacheManagerOptions;
@@ -18,7 +17,6 @@ declare class CacheManager {
   set(context: CacheContext, html: string, cacheConfig: CacheConfig, sync?: boolean): Promise<any>;
   del(context: CacheContext, cacheHash: string): Promise<void>;
 }
-
 export declare function createCache(): CacheManager;
 export declare function destroyCache(): void;
 export {};

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

@@ -4,11 +4,13 @@ import { ModernRoute } from '../route';
 export declare const createRenderHandler: ({
   distDir,
   staticGenerate,
-  forceCSR
+  forceCSR,
+  nonce
 }: {
   distDir: string;
   staticGenerate: boolean;
   forceCSR?: boolean | undefined;
+  nonce?: string | undefined;
 }) => ({
   ctx,
   route,

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

@@ -8,4 +8,5 @@ export declare const render: (ctx: ModernServerContext, renderOptions: {
   entryName: string;
   staticGenerate: boolean;
   enableUnsafeCtx?: boolean;
+  nonce?: string;
 }, runner: ServerHookRunner) => Promise<RenderResult>;

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

@@ -26,14 +26,12 @@ export declare class Server {
    * - 执行 prepare hook
    * - 执行 server init
    */
-
   init(): Promise<this>;
   /**
    * Execute config hooks
    * @param runner
    * @param options
    */
-
   private runConfigHook;
   private runPrepareHook;
   private initServerConfig;
@@ -41,7 +39,6 @@ export declare class Server {
    *
    * merge cliConfig and serverConfig
    */
-
   private initConfig;
   close(): Promise<void>;
   listen<T extends number | ListenOptions | undefined>(options: T, listener: any): void;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/fqLsTrQHy_76SvC3yCBK3/src/type" />
+/// <reference types=".dts-temp/dQl0PkddbjYymDTKBgvwm/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,10 +1,39 @@
 import { ModernRouteInterface } from './libs/route';
 export type Context = Record<string, any>;
-export interface UrlQuery {
-  [key: string]: string;
+export interface HandlerOptions {
+  request: Request;
+  loadableStats: Record<string, any>;
+  routeManifest: Record<string, any>;
+}
+export declare class ReturnResponse {
+  body: string;
+  status: number;
+  headers: Headers;
+  constructor(body: string, status: number, headers?: Record<string, any>);
+  /**
+   * Iterate a Object
+   * 1. adds the value if the key does not already exist.
+   * 2. append the value if the key does already exist.
+   *
+   * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/append
+   * @param headers
+   * @returns
+   */
+  appendHeaders(headers: Record<string, any>): this;
+  /**
+   * Iterate a Object
+   * 1. adds the value if the key does not already exist.
+   * 2. modify the value if the key does already exist.
+   *
+   * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/set
+   * @param headers
+   * @returns
+   */
+  setHeaders(headers: Record<string, any>): this;
 }
 export type Manifest = {
-  pages: Record<string, // path
+  pages: Record<string,
+  // path
   {
     entryName: string;
     template: string;
@@ -12,5 +41,4 @@ export type Manifest = {
   }>;
   routes: ModernRouteInterface[];
 };
-export declare const handleUrl: (url: string) => string;
-export declare const createHandler: (manifest: Manifest) => (ctx: Context) => Promise<void>;
+export declare const createHandler: (manifest: Manifest) => (options: HandlerOptions) => Promise<ReturnResponse>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.19.1",
+  "version": "2.21.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -60,8 +60,9 @@
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.19.1",
-    "@modern-js/server-core": "2.19.1"
+    "@swc/helpers": "0.5.1",
+    "@modern-js/utils": "2.21.0",
+    "@modern-js/server-core": "2.21.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -76,11 +77,11 @@
     "jest": "^29",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
-    "typescript": "^4",
-    "@modern-js/types": "2.19.1",
-    "@modern-js/server-core": "2.19.1",
-    "@scripts/build": "2.19.1",
-    "@scripts/jest-config": "2.19.1"
+    "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"
   },
   "sideEffects": false,
   "publishConfig": {