@modern-js/server 0.0.0-plugins-202111301002 → 0.0.0-runtime-2021112193858

package/dist/types/type.d.ts

@@ -2,7 +2,7 @@
 import type Webpack from 'webpack';
 import { serverManager } from '@modern-js/server-plugin';
 import type { NormalizedConfig } from '@modern-js/core';
-import type { Measure, Logger, NextFunction } from '@modern-js/types/server';
+import type { Metrics, Logger, NextFunction } from '@modern-js/types/server';
 import { ModernRouteInterface } from './libs/route';
 declare module '@modern-js/core' {
   interface UserConfig {
@@ -41,11 +41,16 @@ export declare type ModernServerOptions = {
   staticGenerate?: boolean;
   customServer?: boolean;
   loggerOptions?: Record<string, string>;
-  measureOptions?: Record<string, string>;
+  metricsOptions?: Record<string, string>;
   logger?: Logger;
-  measure?: Measure;
+  metrics?: Metrics;
   apiOnly?: boolean;
+  ssrOnly?: boolean;
   webOnly?: boolean;
+  proxyTarget?: {
+    ssr?: string;
+    api?: string;
+  };
 };
 export declare type RenderResult = {
   content: string | Buffer;
@@ -63,4 +68,4 @@ export declare type ServerHookRunner = Then<ReturnType<typeof serverManager.init
 export declare type ReadyOptions = {
   routes?: ModernRouteInterface[];
 };
-export type { Measure, Logger, NextFunction };
+export type { Metrics, Logger, NextFunction };

package/dist/types/utils.d.ts

@@ -1,6 +1,7 @@
-export declare const mergeExtension: (users: any[], plugins: 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 const createErrorDocument: (status: number, text: string) => string;
+export declare function applyMixins(derivedCtor: any, constructors: any[]): void;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-plugins-202111301002",
+  "version": "0.0.0-runtime-2021112193858",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -26,14 +26,6 @@
       "default": "./dist/js/treeshaking/index.js"
     }
   },
-  "scripts": {
-    "prepare": "pnpm build",
-    "prepublishOnly": "pnpm build --platform",
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
-  },
   "dependencies": {
     "@babel/core": "^7.15.0",
     "@babel/compat-data": "^7.15.0",
@@ -41,12 +33,12 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.1.2",
-    "@modern-js/hmr-client": "^1.1.1",
-    "@modern-js/server-plugin": "^1.1.1",
-    "@modern-js/server-utils": "^1.1.1",
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/utils": "^1.1.2",
+    "@modern-js/core": "^0.0.0-runtime-2021112193858",
+    "@modern-js/hmr-client": "^0.0.0-runtime-2021112193858",
+    "@modern-js/server-plugin": "^0.0.0-runtime-2021112193858",
+    "@modern-js/server-utils": "^0.0.0-runtime-2021112193858",
+    "@modern-js/bff-utils": "^0.0.0-runtime-2021112193858",
+    "@modern-js/utils": "^0.0.0-runtime-2021112193858",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -69,9 +61,9 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^1.1.1",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/types": "^1.1.2",
+    "@modern-js/module-tools": "^0.0.0-runtime-2021112193858",
+    "@modern-js/plugin-testing": "^0.0.0-runtime-2021112193858",
+    "@modern-js/types": "^0.0.0-runtime-2021112193858",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",
@@ -85,7 +77,7 @@
     "@types/ua-parser-js": "^0.7.36",
     "@types/webpack-dev-middleware": "^5.0.2",
     "@types/ws": "^7.4.7",
-    "typescript": "^4",
+    "typescript": "^4.4.4",
     "webpack": "^5.54.0"
   },
   "peerDependencies": {
@@ -100,5 +92,11 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
+  },
+  "scripts": {
+    "new": "modern new",
+    "build": "modern build",
+    "dev": "modern build --watch",
+    "test": "modern test --passWithNoTests"
   }
-}
+}

package/src/libs/context/context.ts

@@ -3,7 +3,7 @@ import { URL } from 'url';
 import qs from 'querystring';
 import type {
   ModernServerContext as ModernServerContextInterface,
-  Measure,
+  Metrics,
   Logger,
 } from '@modern-js/types/server';
 import { toMessage } from '../../utils';
@@ -26,17 +26,25 @@ export class ModernServerContext implements ModernServerContextInterface {
 
   public logger: Logger;
 
-  public measure?: Measure;
+  public metrics?: Metrics;
 
   constructor(
     req: IncomingMessage,
     res: ServerResponse,
-    { logger, measure }: { logger: Logger; measure: Measure },
+    { logger, metrics }: { logger: Logger; metrics: Metrics },
   ) {
     this.req = req;
     this.res = res;
     this.logger = logger;
-    this.measure = measure;
+    this.metrics = metrics;
+
+    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>) {
@@ -60,10 +68,6 @@ export class ModernServerContext implements ModernServerContextInterface {
     return this.req.headers;
   }
 
-  public set headers(val) {
-    this.req.headers = val;
-  }
-
   public get method(): string {
     return this.req.method!;
   }

package/src/libs/context/index.ts

@@ -1,11 +1,11 @@
 import { IncomingMessage, ServerResponse } from 'http';
-import { Measure, Logger } from '../../type';
+import { Metrics, Logger } from '../../type';
 import { ModernServerContext } from './context';
 
 export const createContext = (
   req: IncomingMessage,
   res: ServerResponse,
-  { logger, measure }: { logger: Logger; measure: Measure },
-) => new ModernServerContext(req, res, { logger, measure });
+  { logger, metrics }: { logger: Logger; metrics: Metrics },
+) => new ModernServerContext(req, res, { logger, metrics });
 
 export { ModernServerContext };

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

@@ -0,0 +1,38 @@
+import { RouteMatchManager, RouteMatcher } from '../route';
+
+class RouteAPI {
+  private readonly router: RouteMatchManager;
+
+  private current: RouteMatcher;
+
+  constructor(matched: RouteMatcher, router: RouteMatchManager) {
+    this.current = matched;
+    this.router = router;
+  }
+
+  public cur() {
+    return this.current.generate();
+  }
+
+  public get(entryName: string) {
+    const { router } = this;
+    const matched = router.matchEntry(entryName);
+    return matched ? matched.generate() : 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,
+) => new RouteAPI(matched, router);

package/src/libs/{measure.ts → metrics.ts}

@@ -1,6 +1,6 @@
-import { Measure } from '@/type';
+import { Metrics } from '@/type';
 
-const measure: Measure = {
+const metrics: Metrics = {
   gauges() {
     // no impl
   },
@@ -12,4 +12,4 @@ const measure: Measure = {
   },
 };
 
-export { measure };
+export { metrics };

package/src/libs/render/ssr.ts

@@ -34,7 +34,7 @@ export const render = async (
     distDir,
     staticGenerate,
     logger: ctx.logger,
-    measure: ctx.measure,
+    metrics: ctx.metrics,
   };
 
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];

package/src/libs/render/type.ts

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders } from 'http';
-import { Measure, Logger } from '../../type';
+import { Metrics, Logger } from '../../type';
 
 type MetaKeyMap = {
   header?: string[];
@@ -39,7 +39,7 @@ export type SSRServerContext = {
   template: string;
   entryName: string;
   logger: Logger;
-  measure?: Measure;
+  metrics?: Metrics;
   loadableManifest?: string;
   cacheConfig?: CacheConfig;
   staticGenerate?: boolean;

package/src/libs/route/index.ts

@@ -60,6 +60,10 @@ export class RouteMatchManager {
     return best;
   }
 
+  public matchEntry(entryname: string) {
+    return this.matchers.find(matcher => matcher.matchEntry(entryname));
+  }
+
   public getBundles() {
     const bundles = this.specs
       .filter(route => route.isSSR)

package/src/libs/route/matcher.ts

@@ -75,6 +75,10 @@ export class RouteMatcher {
     }
   }
 
+  public matchEntry(entryName: string): boolean {
+    return this.spec.entryName === entryName;
+  }
+
   // compiler urlPath to regexp if necessary
   private setupUrlPath() {
     const { urlPath } = this.spec;

package/src/libs/route/route.ts

@@ -1,22 +1,6 @@
-export interface ModernRouteInterface {
-  // modern js web entry name
-  entryName: string;
-  // the url path for request match
-  urlPath: string;
-  // the default resource file to response to route
-  entryPath?: string;
-  // if route is spa page
-  isSPA?: boolean;
-  // if route is ssr page
-  isSSR?: boolean;
-  // if route is api service
-  isApi?: boolean;
-  // ssr js bundle for ssr page
-  bundle?: string;
-  // if route has modern product
-  enableModernMode?: boolean;
-  // specialHeader?: SpecialHeader[];
-}
+import { ServerRoute as ModernRouteInterface } from '@modern-js/types';
+
+export type { ModernRouteInterface };
 
 export class ModernRoute implements ModernRouteInterface {
   public entryName: string;
@@ -36,7 +20,7 @@ export class ModernRoute implements ModernRouteInterface {
   public enableModernMode?: boolean;
 
   constructor(routeSpec: ModernRouteInterface) {
-    this.entryName = routeSpec.entryName;
+    this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
     this.isSSR = routeSpec.isSSR || false;

package/src/server/{web-server.ts → dev-server/dev-server-split.ts}

@@ -1,13 +1,13 @@
+import type { APIServerStartInput } from '@modern-js/server-plugin';
 import { ModernDevServer } from './dev-server';
-import { ModernServer } from './modern-server';
 import { mergeExtension } from '@/utils';
 import { ModernRouteInterface } from '@/libs/route';
 import { ApiServerMode } from '@/constants';
 
-export class WebModernServer extends ModernServer {
+export class ModernSSRDevServer extends ModernDevServer {
   protected prepareAPIHandler(
     _m: ApiServerMode,
-    _: ReturnType<typeof mergeExtension>,
+    _: APIServerStartInput['config'],
   ) {
     return null as any;
   }
@@ -23,21 +23,19 @@ export class WebModernServer extends ModernServer {
   }
 }
 
-export class WebModernDevServer extends ModernDevServer {
-  protected prepareAPIHandler(
-    _m: ApiServerMode,
-    _: ReturnType<typeof mergeExtension>,
+export class ModernAPIDevServer extends ModernDevServer {
+  protected async prepareAPIHandler(
+    mode: ApiServerMode,
+    extension: APIServerStartInput['config'],
   ) {
-    return null as any;
+    return super.prepareAPIHandler(mode, extension);
   }
 
-  protected async prepareWebHandler(
-    extension: ReturnType<typeof mergeExtension>,
-  ) {
-    return super.prepareWebHandler(extension);
+  protected filterRoutes(routes: ModernRouteInterface[]) {
+    return routes.filter(route => route.isApi);
   }
 
-  protected filterRoutes(routes: ModernRouteInterface[]) {
-    return routes.filter(route => route.entryName);
+  protected async preServerInit() {
+    // noop
   }
 }

package/src/server/{dev-server.ts → dev-server/dev-server.ts}

@@ -1,27 +1,36 @@
-import http, { Server } from 'http';
+import http, {
+  Server,
+  createServer,
+  IncomingMessage,
+  ServerResponse,
+} from 'http';
 import path from 'path';
-import { HMR_SOCK_PATH } from '@modern-js/utils';
+import { createServer as createHttpsServer } from 'https';
+import {
+  API_DIR,
+  HMR_SOCK_PATH,
+  SERVER_DIR,
+  SHARED_DIR,
+} from '@modern-js/utils';
 import type { MultiCompiler, Compiler } from 'webpack';
-import webpackDevMiddleware, {
-  WebpackDevMiddleware,
-} from 'webpack-dev-middleware';
-import { createMockHandler } from '../dev-tools/mock';
-import { createProxyHandler, ProxyOptions } from '../libs/proxy';
+import webpackDevMiddleware from 'webpack-dev-middleware';
+import { ModernServer } from '../modern-server';
+import { createMockHandler } from '@/dev-tools/mock';
+import { createProxyHandler, ProxyOptions } from '@/libs/proxy';
 import {
   DevServerOptions,
   ModernServerOptions,
   NextFunction,
   ServerHookRunner,
   ReadyOptions,
-} from '../type';
-import SocketServer from '../dev-tools/socket-server';
-import DevServerPlugin from '../dev-tools/dev-server-plugin';
-import { ModernServerContext } from '../libs/context';
-import { createLaunchEditorHandler } from '../dev-tools/launch-editor';
-import { enableRegister } from '../dev-tools/babel/register';
-import * as reader from '../libs/render/reader';
-import Watcher from '../dev-tools/watcher';
-import { ModernServer } from './modern-server';
+} from '@/type';
+import SocketServer from '@/dev-tools/socket-server';
+import DevServerPlugin from '@/dev-tools/dev-server-plugin';
+import { ModernServerContext } from '@/libs/context';
+import { createLaunchEditorHandler } from '@/dev-tools/launch-editor';
+import { enableRegister } from '@/dev-tools/babel/register';
+import * as reader from '@/libs/render/reader';
+import Watcher from '@/dev-tools/watcher';
 import { AGGRED_DIR } from '@/constants';
 
 const DEFAULT_DEV_OPTIONS: DevServerOptions = {
@@ -50,15 +59,13 @@ export class ModernDevServer extends ModernServer {
 
   private watcher!: Watcher;
 
-  private devMiddleware!: WebpackDevMiddleware &
-    ((
-      req: http.IncomingMessage,
-      res: http.ServerResponse,
-      next: NextFunction,
-    ) => void);
+  private devMiddleware!: webpackDevMiddleware.API<
+    http.IncomingMessage,
+    http.ServerResponse
+  >;
 
-  constructor(options: ModernServerOptions, runner: ServerHookRunner) {
-    super(options, runner);
+  constructor(options: ModernServerOptions) {
+    super(options);
 
     // set webpack compiler
     this.compiler = options.compiler!;
@@ -66,14 +73,14 @@ export class ModernDevServer extends ModernServer {
     // set dev server options, like webpack-dev-server
     this.dev =
       typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : options.dev!;
+
+    enableRegister(this.pwd, this.conf);
   }
 
   // Complete the preparation of services
-  public async init() {
+  public async init(runner: ServerHookRunner) {
     const { conf, pwd, compiler } = this;
 
-    enableRegister(pwd, conf);
-
     // mock handler
     this.mockHandler = createMockHandler({ pwd });
     this.addHandler((ctx: ModernServerContext, next: NextFunction) => {
@@ -110,7 +117,7 @@ export class ModernDevServer extends ModernServer {
       this.addHandler(devMiddlewareHandler);
     }
 
-    await super.init();
+    await super.init(runner);
 
     // watch mock/ server/ api/ dir file change
     this.startWatcher();
@@ -125,6 +132,8 @@ export class ModernDevServer extends ModernServer {
 
     // reset static file
     reader.updateFile();
+
+    this.runner.reset();
   }
 
   public onListening(app: Server) {
@@ -141,6 +150,24 @@ export class ModernDevServer extends ModernServer {
     });
   }
 
+  public async createHTTPServer(
+    handler: (
+      req: IncomingMessage,
+      res: ServerResponse,
+      next?: () => void,
+    ) => void,
+  ) {
+    const { dev } = this;
+    const devHttpsOption = typeof dev === 'object' && dev.https;
+    if (devHttpsOption) {
+      const { genHttpsOptions } = require('@/dev-tools/https');
+      const httpsOptions = await genHttpsOptions(devHttpsOption);
+      return createHttpsServer(httpsOptions, handler);
+    } else {
+      return createServer(handler);
+    }
+  }
+
   // set up plugin to each compiler
   // register hooks for each compilation, update socket stats if recompiled
   // start dev middleware
@@ -208,7 +235,7 @@ export class ModernDevServer extends ModernServer {
     const bundles = this.router.getBundles();
 
     bundles.forEach(bundle => {
-      const filepath = path.join(distDir, bundle!);
+      const filepath = path.join(distDir, bundle as string);
       if (require.cache[filepath]) {
         delete require.cache[filepath];
       }
@@ -217,12 +244,12 @@ export class ModernDevServer extends ModernServer {
 
   private startWatcher() {
     const { pwd } = this;
-    const { mock, server, api, shared } = AGGRED_DIR;
+    const { mock } = AGGRED_DIR;
     const defaultWatched = [
       `${pwd}/${mock}/**/*`,
-      `${pwd}/${server}/**/*`,
-      `${pwd}/${api}/**/*`,
-      `${pwd}/${shared}/**/*`,
+      `${pwd}/${SERVER_DIR}/**/*`,
+      `${pwd}/${API_DIR}/!(typings)/**`,
+      `${pwd}/${SHARED_DIR}/**/*`,
     ];
 
     const watcher = new Watcher();
@@ -233,6 +260,8 @@ export class ModernDevServer extends ModernServer {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
 
+      this.runner.reset();
+
       if (filepath.startsWith(`${pwd}/${mock}`)) {
         this.mockHandler = createMockHandler({ pwd });
       } else {

package/src/server/dev-server/index.ts

@@ -0,0 +1,2 @@
+export { ModernAPIDevServer, ModernSSRDevServer } from './dev-server-split';
+export { ModernDevServer } from './dev-server';