@modern-js/prod-server 1.1.2 → 1.1.5

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

@@ -0,0 +1,10 @@
+import { BaseSSRServerContext, Logger, Metrics } from '@modern-js/types';
+export declare const createMetrics: (context: BaseSSRServerContext, metrics: Metrics) => {
+  emitTimer: (name: string, cost: number, tags?: Record<string, unknown>) => void;
+  emitCounter: (name: string, counter: number, tags?: Record<string, unknown>) => void;
+};
+export declare const createLogger: (serverContext: BaseSSRServerContext, logger: Logger) => {
+  error: (message: string, e: Error | string) => void;
+  info: (message: string, ...args: any[]) => void;
+  debug: (message: string, ...args: any[]) => void;
+};

package/dist/types/server/modern-server.d.ts

@@ -46,7 +46,7 @@ export declare class ModernServer implements ModernServerInterface {
   onRepack(_: BuildOptions): void;
   onListening(_: Server): void;
   protected onServerChange(_: Record<string, any>): void;
-  getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;
+  getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
   createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server>;
   protected getRoutes(): ModernRouteInterface[];
   protected addHandler(handler: ModernServerHandler): void;
@@ -59,7 +59,7 @@ export declare class ModernServer implements ModernServerInterface {
     context: ModernServerContext;
     [propsName: string]: any;
   }): Promise<any>;
-  protected preServerInit(): Promise<void>;
+  protected setupBeforeProdMiddleware(): Promise<void>;
   protected handleAPI(context: ModernServerContext): Promise<void>;
   protected handleWeb(context: ModernServerContext, route: ModernRoute): Promise<import("../type").RenderResult | null>;
   protected proxy(): Promise<any>;

package/dist/types/utils.d.ts

@@ -3,7 +3,6 @@ export declare const debug: any;
 export declare const mergeExtension: (users: any[]) => {
   middleware: any[];
 };
-export declare const toMessage: (dig: string, e: Error | string) => string;
 export declare const noop: () => void;
 export declare const createErrorDocument: (status: number, text: string) => string;
 export declare type CollectMiddlewaresResult = {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.2",
+  "version": "1.1.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,9 +28,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "^1.6.0",
+    "@modern-js/utils": "^1.7.3",
     "@babel/compat-data": "^7.17.0",
-    "@modern-js/server-core": "^1.3.2",
+    "@modern-js/server-core": "^1.3.5",
     "axios": "^0.24.0",
     "compare-versions": "^3.6.0",
     "cookie": "^0.4.2",
@@ -43,18 +43,17 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.5.1",
-    "@modern-js/core": "1.9.0",
+    "@modern-js/types": "1.5.3",
+    "@modern-js/core": "1.10.2",
     "@scripts/jest-config": "0.0.0",
     "@scripts/build": "0.0.0",
     "@types/cookie": "^0.4.1",
-    "@types/jest": "^26.0.9",
+    "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",
     "@types/merge-deep": "^3.0.0",
     "@types/node": "^14",
     "@types/serve-static": "^1.13.10",
     "@types/ua-parser-js": "^0.7.36",
-    "del-cli": "^4.0.1",
     "jest": "^27",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
@@ -70,11 +69,33 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "wireit": {
+    "build": {
+      "command": "modern build",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": [
+        "dist/**/*"
+      ]
+    },
+    "test": {
+      "command": "jest",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": []
+    }
+  },
   "scripts": {
     "new": "modern new",
-    "build": "modern build",
+    "build": "wireit",
     "dev": "modern build --watch",
-    "test": "jest"
+    "test": "wireit"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/.eslintrc.js

@@ -1,8 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@modern-js'],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-  },
-};

package/dist/js/styles/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "sourceMap": true
-  },
-  "paths": {},
-  "exclude": ["src/__test__/fixtures/**"]
-}

package/jest.config.js

@@ -1,8 +0,0 @@
-const sharedConfig = require('@scripts/jest-config');
-
-/** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = {
-  ...sharedConfig,
-  testEnvironment: 'node',
-  rootDir: __dirname,
-};

package/modern.config.js

@@ -1,2 +0,0 @@
-// https://modernjs.dev/docs/apis/config/overview
-module.exports = {};

package/src/constants.ts

@@ -1,31 +0,0 @@
-export const AGGRED_DIR = {
-  mock: 'config/mock',
-  server: 'server',
-  api: 'api',
-  shared: 'shared',
-  lambda: 'lambda',
-};
-
-export enum ApiServerMode {
-  func = 'function',
-  frame = 'framework',
-}
-
-export const ERROR_DIGEST = {
-  INIT: 'Server init error',
-  ENOTF: 'Page could not be found',
-  WARMUP: 'SSR warmup failed',
-  EINTER: 'Internal server error',
-  ERENDER: 'SSR render failed',
-  EMICROINJ: 'Get micro-frontend info failed',
-};
-
-export const ERROR_PAGE_TEXT: Record<number, string> = {
-  404: 'This page could not be found.',
-  500: 'Internal Server Error.',
-};
-
-export const RUN_MODE = {
-  FULL: 'full',
-  TYPE: 'type',
-};

package/src/index.ts

@@ -1,19 +0,0 @@
-import { ModernServerOptions } from './type';
-import { Server } from './server';
-
-export { Server };
-export type { ServerConfig } from '@modern-js/server-core';
-export { ModernServer } from './server/modern-server';
-export { createProxyHandler } from './libs/proxy';
-export * from './type';
-export * from './constants';
-
-export default (options: ModernServerOptions): Promise<Server> => {
-  if (options == null) {
-    throw new Error('can not start mserver without options');
-  }
-
-  const server = new Server(options);
-
-  return server.init();
-};

package/src/libs/context/context.ts

@@ -1,183 +0,0 @@
-import { IncomingMessage, ServerResponse } from 'http';
-import { URL } from 'url';
-import qs from 'querystring';
-import type {
-  ModernServerContext as ModernServerContextInterface,
-  Metrics,
-  Logger,
-} from '@modern-js/types/server';
-import { toMessage } from '../../utils';
-
-export type ContextOptions = {
-  logger?: Logger;
-  metrics?: Metrics;
-};
-
-export class ModernServerContext implements ModernServerContextInterface {
-  /**
-   * http request
-   */
-  public req: IncomingMessage;
-
-  /**
-   * http response
-   */
-  public res: ServerResponse;
-
-  /**
-   * url params
-   */
-  public params: Record<string, string> = {};
-
-  public logger: Logger;
-
-  public metrics?: Metrics;
-
-  public serverData: Record<string, any>;
-
-  constructor(req: IncomingMessage, res: ServerResponse) {
-    this.req = req;
-    this.res = res;
-    this.logger = req.logger;
-    this.metrics = req.metrics;
-    this.serverData = {};
-
-    this.bind();
-  }
-
-  private bind() {
-    const { req, res } = this as any;
-    req.get = (key: string) => this.getReqHeader(key);
-    res.set = (key: string, value: any) => this.res.setHeader(key, value);
-  }
-
-  public setParams(params: Record<string, string>) {
-    this.params = params;
-  }
-
-  public setServerData(key: string, value: any) {
-    this.serverData[key] = value;
-  }
-
-  public getReqHeader(key: string) {
-    const { req } = this;
-    const field = key.toLowerCase();
-    switch (field) {
-      case 'referer':
-      case 'referrer':
-        return req.headers.referrer || req.headers.referer || '';
-      default:
-        return req.headers[field] || '';
-    }
-  }
-
-  /* request property */
-  public get headers() {
-    return this.req.headers;
-  }
-
-  public get method(): string {
-    return this.req.method!;
-  }
-
-  public get url() {
-    return this.req.url || '';
-  }
-
-  public set url(val) {
-    this.req.url = val;
-  }
-
-  public get host() {
-    let host = this.getReqHeader('X-Forwarded-Host');
-    if (!host) {
-      host = this.getReqHeader('Host');
-    }
-    return (host as string).split(/\s*,\s*/, 1)[0] || '';
-  }
-
-  public get protocol() {
-    if ((this.req.socket as any).encrypted) {
-      return 'https';
-    }
-
-    const proto = this.getReqHeader('X-Forwarded-Proto');
-    return proto ? (proto as string).split(/\s*,\s*/, 1)[0] : 'http';
-  }
-
-  public get origin() {
-    return `${this.protocol}://${this.host}`;
-  }
-
-  public get href() {
-    return this.origin + this.url;
-  }
-
-  public get parsedURL() {
-    const url = new URL(this.req.url!, this.origin);
-    return url;
-  }
-
-  public get path() {
-    return this.parsedURL.pathname;
-  }
-
-  public set path(p) {
-    const url = new URL(this.req.url!, this.origin);
-    // this should never happend
-    if (!url || !p) {
-      return;
-    }
-
-    if (url.pathname === p) {
-      return;
-    }
-
-    url.pathname = p;
-
-    this.url = url.toString();
-  }
-
-  public get querystring() {
-    if (!this.req) {
-      return '';
-    }
-    return this.parsedURL.search.replace(/^\?/, '') || '';
-  }
-
-  public get query() {
-    const str = this.querystring;
-    return qs.parse(str);
-  }
-
-  /* response property */
-  public get status() {
-    return this.res.statusCode;
-  }
-
-  public set status(statusCode) {
-    this.res.statusCode = statusCode;
-  }
-
-  /**
-   * 判断链接是否已经关闭
-   */
-  public resHasHandled(): boolean {
-    return this.res.writableEnded;
-  }
-
-  public logInfo() {
-    return {
-      headers: this.headers,
-      href: this.href,
-      url: this.url,
-    };
-  }
-
-  public error(dig: string, err: Error | string = '') {
-    const message = toMessage(dig, err);
-    const reqInfo = this.logInfo();
-
-    this.logger.error(`${reqInfo.url} - ${message}`, reqInfo);
-  }
-}

package/src/libs/context/index.ts

@@ -1,7 +0,0 @@
-import { IncomingMessage, ServerResponse } from 'http';
-import { ModernServerContext } from './context';
-
-export const createContext = (req: IncomingMessage, res: ServerResponse) =>
-  new ModernServerContext(req, res);
-
-export { ModernServerContext };

package/src/libs/hook-api/route.ts

@@ -1,42 +0,0 @@
-import { RouteMatchManager, RouteMatcher } from '../route';
-
-class RouteAPI {
-  private readonly router: RouteMatchManager;
-
-  private current: RouteMatcher;
-
-  private readonly url: string;
-
-  constructor(matched: RouteMatcher, router: RouteMatchManager, url: string) {
-    this.current = matched;
-    this.router = router;
-    this.url = url;
-  }
-
-  public cur() {
-    return this.current.generate(this.url);
-  }
-
-  public get(entryName: string) {
-    const { router } = this;
-    const matched = router.matchEntry(entryName);
-    return matched ? matched.generate(this.url) : null;
-  }
-
-  public use(entryName: string) {
-    const { router } = this;
-    const matched = router.matchEntry(entryName);
-    if (matched) {
-      this.current = matched;
-      return true;
-    } else {
-      return false;
-    }
-  }
-}
-
-export const createRouteAPI = (
-  matched: RouteMatcher,
-  router: RouteMatchManager,
-  url: string,
-) => new RouteAPI(matched, router, url);

package/src/libs/hook-api/template.ts

@@ -1,53 +0,0 @@
-const RegList = {
-  before: {
-    head: '<head>',
-    body: '<body>',
-  },
-  after: {
-    head: '</head>',
-    body: '</body>',
-  },
-};
-
-class TemplateAPI {
-  private content: string;
-
-  constructor(content: string) {
-    this.content = content;
-  }
-
-  public get() {
-    return this.content;
-  }
-
-  public set(content: string) {
-    this.content = content;
-  }
-
-  public prependHead(fragment: string) {
-    const { head } = RegList.before;
-    return this.replace(head, `${head}${fragment}`);
-  }
-
-  public appendHead(fragment: string) {
-    const { head } = RegList.after;
-    return this.replace(head, `${fragment}${head}`);
-  }
-
-  public prependBody(fragment: string) {
-    const { body } = RegList.before;
-    return this.replace(body, `${body}${fragment}`);
-  }
-
-  public appendBody(fragment: string) {
-    const { body } = RegList.after;
-    return this.replace(body, `${fragment}${body}`);
-  }
-
-  public replace(reg: RegExp | string, text: string) {
-    this.content = this.content.replace(reg, text);
-    return this;
-  }
-}
-
-export const createTemplateAPI = (content: string) => new TemplateAPI(content);

package/src/libs/loadConfig.ts

@@ -1,59 +0,0 @@
-import * as path from 'path';
-import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
-import type { NormalizedConfig } from '@modern-js/core';
-import type { ServerConfig } from '@modern-js/server-core';
-import mergeDeep from 'merge-deep';
-
-export const getServerConfigPath = (
-  distDirectory: string,
-  serverConfigFile: string = DEFAULT_SERVER_CONFIG,
-) => {
-  const serverConfigPath = path.join(distDirectory, serverConfigFile);
-  return `${serverConfigPath}.js`;
-};
-
-export const requireConfig = (serverConfigPath: string) => {
-  if (fs.pathExistsSync(serverConfigPath)) {
-    return compatRequire(serverConfigPath);
-  }
-
-  return {};
-};
-
-/**
- * 对配置进行合并，开发环境下,cliConfig 与 serverConfig 进行深合并
- * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
- * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
- */
-export const loadConfig = ({
-  cliConfig,
-  serverConfig,
-  resolvedConfigPath,
-}: {
-  cliConfig: NormalizedConfig;
-  serverConfig: ServerConfig;
-  resolvedConfigPath: string;
-}) => {
-  let config = null;
-  if (process.env.NODE_ENV === 'production') {
-    const resolvedConfig = requireConfig(resolvedConfigPath);
-    // cli config has a higher priority,because it's an argument passed in.
-    config = mergeDeep(
-      {
-        ...resolvedConfig,
-        plugins: [], // filter cli plugins
-      },
-      serverConfig,
-      cliConfig,
-    );
-  } else {
-    config = mergeDeep(
-      {
-        ...cliConfig,
-        plugins: [],
-      },
-      serverConfig,
-    );
-  }
-  return config;
-};

package/src/libs/metrics.ts

@@ -1,15 +0,0 @@
-import { Metrics } from '../type';
-
-const metrics: Metrics = {
-  gauges() {
-    // no impl
-  },
-  counter() {
-    // no impl
-  },
-  timer() {
-    // no impl
-  },
-};
-
-export { metrics };

package/src/libs/proxy.ts

@@ -1,44 +0,0 @@
-import { createProxyMiddleware } from 'http-proxy-middleware';
-import { NextFunction, BffProxyOptions } from '@modern-js/types';
-import { formatProxyOptions } from '@modern-js/utils';
-import { debug } from '../utils';
-import { ModernServerContext } from './context';
-
-export type { BffProxyOptions };
-
-export const createProxyHandler = (proxyOptions?: BffProxyOptions) => {
-  debug('createProxyHandler', proxyOptions);
-  if (!proxyOptions) {
-    return null;
-  }
-
-  // If it is not an array, it may be an object that uses the context attribute
-  // or an object in the form of { source: ProxyDetail }
-  const formatedProxy = formatProxyOptions(proxyOptions);
-
-  const middlewares = formatedProxy.map(option => {
-    const middleware = createProxyMiddleware(option.context!, option);
-
-    // eslint-disable-next-line consistent-return
-    return async (ctx: ModernServerContext, next: NextFunction) => {
-      const { req, res } = ctx;
-      const bypassUrl =
-        typeof option.bypass === 'function'
-          ? option.bypass(req, res, option)
-          : null;
-
-      // only false, no true
-      if (typeof bypassUrl === 'boolean') {
-        ctx.status = 404;
-        return next();
-      } else if (typeof bypassUrl === 'string') {
-        ctx.url = bypassUrl;
-        return next();
-      }
-
-      (middleware as any)(req, res, next);
-    };
-  });
-
-  return middlewares;
-};