@modern-js/server 1.1.2-beta.0 → 1.1.3

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

@@ -5,30 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Server = void 0;
 
-var _http = require("http");
-
-var _https = require("https");
+var _path = _interopRequireDefault(require("path"));
 
 var _serverPlugin = require("@modern-js/server-plugin");
 
 var _utils = require("@modern-js/utils");
 
+var _core = require("@modern-js/core");
+
 var _modernServer = require("./modern-server");
 
+var _modernServerSplit = require("./modern-server-split");
+
 var _measure = require("../libs/measure");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 class Server {
   constructor(options) {
-    var _options$plugins;
-
     this.options = void 0;
     this.server = void 0;
     this.app = void 0;
     this.runner = void 0;
     this.options = options;
-    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
-      _serverPlugin.serverManager.usePlugin(p);
-    });
   }
 
   getRequestHandler() {
@@ -46,40 +51,20 @@ class Server {
     const {
       options
     } = this;
-    this.runner = await _serverPlugin.serverManager.init({});
-    const {
-      logger,
-      measure
-    } = await this.runner.create({
-      loggerOptions: options.logger,
-      measureOptions: options.measure
-    }, {
-      onLast: () => ({})
-    });
-    options.logger = options.logger || logger || _utils.logger;
-    options.measure = options.measure || measure || _measure.measure;
+    options.logger = options.logger || _utils.logger;
+    options.measure = options.measure || _measure.measure; // initialize server
 
     if (options.dev) {
-      this.server = this.createDevServer(); // check if https is configured when start dev server
-
-      const devHttpsOption = typeof options.dev === 'object' && options.dev.https;
-
-      if (devHttpsOption) {
-        const {
-          genHttpsOptions
-        } = require("../dev-tools/https");
-
-        const httpsOptions = await genHttpsOptions(devHttpsOption);
-        this.app = (0, _https.createServer)(httpsOptions, this.getRequestHandler());
-      } else {
-        this.app = (0, _http.createServer)(this.getRequestHandler());
-      }
+      this.server = this.createDevServer();
     } else {
       this.server = this.createProdServer();
-      this.app = (0, _http.createServer)(this.getRequestHandler());
-    }
+    } // check if https is configured when start dev server
+
+
+    this.app = await this.server.createHTTPServer(this.getRequestHandler());
+    this.runner = await this.createHookRunner(); // runner can only be used after server init
 
-    await this.server.init();
+    await this.server.init(this.runner);
     return this;
   }
 
@@ -110,19 +95,11 @@ class Server {
     } = this;
 
     if (options.apiOnly) {
-      const {
-        APIModernServer
-      } = require("./api-server");
-
-      return new APIModernServer(options, this.runner);
+      return new _modernServerSplit.APIModernServer(options);
     } else if (options.webOnly) {
-      const {
-        WebModernServer
-      } = require("./web-server");
-
-      return new WebModernServer(options, this.runner);
+      return new _modernServerSplit.WebModernServer(options);
     } else {
-      return new _modernServer.ModernServer(options, this.runner);
+      return new _modernServer.ModernServer(options);
     }
   }
 
@@ -131,27 +108,56 @@ class Server {
       options
     } = this;
 
-    if (options.apiOnly) {
-      const {
-        APIModernDevServer
-      } = require("./api-server");
+    const {
+      APIModernDevServer,
+      WebModernDevServer,
+      ModernDevServer
+    } = require("./dev-server");
 
-      return new APIModernDevServer(options, this.runner);
+    if (options.apiOnly) {
+      return new APIModernDevServer(options);
     } else if (options.webOnly) {
-      const {
-        WebModernDevServer
-      } = require("./web-server");
-
-      return new WebModernDevServer(options, this.runner);
+      return new WebModernDevServer(options);
     } else {
-      const {
-        ModernDevServer
-      } = require("./dev-server");
-
-      return new ModernDevServer(options, this.runner);
+      return new ModernDevServer(options);
     }
   }
 
+  async createHookRunner() {
+    var _options$plugins;
+
+    const {
+      options
+    } = this;
+    const appContext = await this.initAppContext();
+
+    _serverPlugin.serverManager.run(() => {
+      _core.ConfigContext.set(this.options.config);
+
+      _core.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+        distDirectory: _path.default.join(options.pwd, options.config.output.path || 'dist')
+      }));
+    });
+
+    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
+      _serverPlugin.serverManager.usePlugin(p);
+    });
+    return _serverPlugin.serverManager.init({});
+  }
+
+  async initAppContext() {
+    var _this$options$plugins;
+
+    const appDirectory = await (0, _core.initAppDir)();
+    const loaded = await (0, _core.loadUserConfig)(appDirectory);
+    const plugins = (_this$options$plugins = this.options.plugins) === null || _this$options$plugins === void 0 ? void 0 : _this$options$plugins.map(p => ({
+      server: p,
+      cli: undefined
+    }));
+    const appContext = (0, _core.initAppContext)(appDirectory, plugins || [], loaded.filePath);
+    return appContext;
+  }
+
 }
 
 exports.Server = Server;

package/dist/js/node/server/{web-server.js → modern-server-split.js}

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WebModernServer = exports.WebModernDevServer = void 0;
-
-var _devServer = require("./dev-server");
+exports.WebModernServer = exports.APIModernServer = void 0;
 
 var _modernServer = require("./modern-server");
 
@@ -26,19 +24,22 @@ class WebModernServer extends _modernServer.ModernServer {
 
 exports.WebModernServer = WebModernServer;
 
-class WebModernDevServer extends _devServer.ModernDevServer {
-  prepareAPIHandler(_m, _) {
+class APIModernServer extends _modernServer.ModernServer {
+  prepareWebHandler(_) {
     return null;
   }
 
-  async prepareWebHandler(extension) {
-    return super.prepareWebHandler(extension);
+  async prepareAPIHandler(mode, extension) {
+    return super.prepareAPIHandler(mode, extension);
   }
 
   filterRoutes(routes) {
-    return routes.filter(route => route.entryName);
+    return routes.filter(route => route.isApi);
+  }
+
+  async preServerInit() {// noop
   }
 
 }
 
-exports.WebModernDevServer = WebModernDevServer;
+exports.APIModernServer = APIModernServer;

package/dist/js/node/server/modern-server.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ModernServer = void 0;
 
+var _http = require("http");
+
 var _util = _interopRequireDefault(require("util"));
 
 var _path = _interopRequireDefault(require("path"));
@@ -33,7 +35,9 @@ var _context = require("../libs/context");
 
 var _constants = require("../constants");
 
-var _hookApi = require("../libs/hook-api");
+var _template = require("../libs/hook-api/template");
+
+var _route2 = require("../libs/hook-api/route");
 
 const _excluded = ["getMiddlewares"];
 
@@ -68,7 +72,7 @@ class ModernServer {
     staticGenerate,
     logger,
     measure
-  }, runner) {
+  }) {
     this.pwd = void 0;
     this.distDir = void 0;
     this.workDir = void 0;
@@ -76,9 +80,9 @@ class ModernServer {
     this.conf = void 0;
     this.handlers = [];
     this.presetRoutes = void 0;
+    this.runner = void 0;
     this.logger = void 0;
     this.measure = void 0;
-    this.runner = void 0;
     this.isDev = false;
     this.staticFileHandler = void 0;
     this.routeRenderHandler = void 0;
@@ -95,7 +99,6 @@ class ModernServer {
     this.distDir = _path.default.join(pwd, config.output.path || '');
     this.workDir = this.isDev ? pwd : this.distDir;
     this.conf = config;
-    this.runner = runner;
     this.logger = logger;
     this.measure = measure;
     this.router = new _route.RouteMatchManager();
@@ -114,9 +117,10 @@ class ModernServer {
   } // server prepare
 
 
-  async init() {
+  async init(runner) {
     var _conf$bff;
 
+    this.runner = runner;
     const {
       distDir,
       isDev,
@@ -148,12 +152,17 @@ class ModernServer {
     }
 
     await this.prepareFrameHandler();
+    const {
+      favicon,
+      faviconByEntries
+    } = this.conf.output;
+    const favicons = this.prepareFavicons(favicon, faviconByEntries); // Only work when without setting `assetPrefix`.
+    // Setting `assetPrefix` means these resources should be uploaded to CDN.
+
+    const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''})`);
     this.staticFileHandler = (0, _serveFile.createStaticFileHandler)([{
-      path: '/static/',
-      target: _path.default.join(distDir, 'static')
-    }, {
-      path: '/upload/',
-      target: _path.default.join(distDir, 'upload')
+      path: staticPathRegExp,
+      target: distDir
     }]);
     this.routeRenderHandler = (0, _render.createRenderHandler)({
       distDir,
@@ -176,6 +185,10 @@ class ModernServer {
 
   close() {
     reader.close();
+  }
+
+  async createHTTPServer(handler) {
+    return (0, _http.createServer)(handler);
   } // warmup ssr function
 
 
@@ -225,12 +238,7 @@ class ModernServer {
     const {
       workDir,
       runner
-    } = this; // inner tool, gather user inject
-
-    const {
-      api: userAPIExt,
-      web: userWebExt
-    } = (0, _serverUtils.gather)(workDir); // server hook, gather plugin inject
+    } = this; // server hook, gather plugin inject
 
     const _createMiddlewareColl = (0, _serverUtils.createMiddlewareCollecter)(),
           {
@@ -250,17 +258,15 @@ class ModernServer {
 
 
     if (await _utils.fs.pathExists(_path.default.join(serverDir))) {
-      const webExtension = (0, _utils2.mergeExtension)(pluginWebExt, userWebExt);
+      const webExtension = (0, _utils2.mergeExtension)(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
 
     if (_utils.fs.existsSync(apiDir)) {
       const mode = _utils.fs.existsSync(_path.default.join(apiDir, _constants.AGGRED_DIR.lambda)) ? _constants.ApiServerMode.frame : _constants.ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
 
-      const apiExtension = (0, _utils2.mergeExtension)(pluginAPIExt, mode === _constants.ApiServerMode.frame ? [] : userAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, _objectSpread(_objectSpread({}, apiExtension), {}, {
-        modernJsConfig: this.conf
-      }));
+      const apiExtension = (0, _utils2.mergeExtension)(pluginAPIExt);
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
     }
   }
   /* —————————————————————— function will be overwrite —————————————————————— */
@@ -293,7 +299,7 @@ class ModernServer {
       pwd: workDir,
       mode,
       config: extension,
-      prefix
+      prefix: Array.isArray(prefix) ? prefix[0] : prefix
     }, {
       onLast: () => null
     });
@@ -308,10 +314,30 @@ class ModernServer {
       conf
     } = this;
     const preMiddleware = await this.runner.preServerInit(conf);
-    preMiddleware.forEach(mid => {
+    preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
     });
   }
+
+  prepareFavicons(favicon, faviconByEntries) {
+    const faviconNames = [];
+
+    if (favicon) {
+      faviconNames.push(favicon.substring(favicon.lastIndexOf('/') + 1));
+    }
+
+    if (faviconByEntries) {
+      Object.keys(faviconByEntries).forEach(f => {
+        const curFavicon = faviconByEntries[f];
+
+        if (curFavicon) {
+          faviconNames.push(curFavicon.substring(curFavicon.lastIndexOf('/') + 1));
+        }
+      });
+    }
+
+    return faviconNames;
+  }
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   // eslint-disable-next-line max-statements
@@ -321,7 +347,12 @@ class ModernServer {
     const {
       req,
       res
-    } = context; // match routes in the route spec
+    } = context;
+    await this.runner.beforeMatch({
+      context
+    }, {
+      onLast: _utils2.noop
+    }); // match routes in the route spec
 
     const matched = this.router.match(context.url);
 
@@ -330,8 +361,23 @@ class ModernServer {
       return;
     }
 
-    const route = matched.generate();
-    const params = matched.parseURLParams(context.url);
+    const routeAPI = (0, _route2.createRouteAPI)(matched, this.router);
+    await this.runner.afterMatch({
+      context,
+      routeAPI
+    }, {
+      onLast: _utils2.noop
+    });
+
+    if (res.headersSent) {
+      return;
+    }
+
+    const {
+      current
+    } = routeAPI;
+    const route = current.generate();
+    const params = current.parseURLParams(context.url);
     context.setParams(params); // route is api service
 
     if (route.isApi) {
@@ -352,6 +398,11 @@ class ModernServer {
       return;
     }
 
+    await this.runner.beforeRender({
+      context
+    }, {
+      onLast: _utils2.noop
+    });
     const file = await this.routeRenderHandler(context, route);
 
     if (!file) {
@@ -369,7 +420,7 @@ class ModernServer {
     let response = file.content;
 
     if (route.entryName) {
-      const templateAPI = (0, _hookApi.createTemplateAPI)(file.content.toString());
+      const templateAPI = (0, _template.createTemplateAPI)(file.content.toString());
       await this.runner.afterRender({
         context,
         templateAPI

package/dist/js/node/utils.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toMessage = exports.noop = exports.mergeExtension = exports.createErrorDocument = void 0;
 
-const mergeExtension = (users, plugins) => {
+const mergeExtension = users => {
   const output = [];
   return {
-    middleware: output.concat(users).concat(plugins)
+    middleware: output.concat(users)
   };
 };
 

package/dist/types/libs/hook-api/route.d.ts

@@ -0,0 +1,13 @@
+import { RouteMatchManager, RouteMatcher } from '../route';
+
+declare class RouteAPI {
+  private readonly router;
+  private current;
+  constructor(matched: RouteMatcher, router: RouteMatchManager);
+  cur(): import("../route").ModernRoute;
+  get(entryName: string): import("../route").ModernRoute | null;
+  use(entryName: string): boolean;
+}
+
+export declare const createRouteAPI: (matched: RouteMatcher, router: RouteMatchManager) => RouteAPI;
+export {};

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

@@ -8,6 +8,7 @@ export declare class RouteMatchManager {
   private best;
   reset(specs: ModernRouteInterface[]): void;
   match(pathname: string): RouteMatcher | undefined;
+  matchEntry(entryname: string): RouteMatcher | undefined;
   getBundles(): (string | undefined)[];
 }
 export type { ModernRouteInterface, RouteMatcher, ModernRoute };

package/dist/types/libs/route/matcher.d.ts

@@ -10,5 +10,6 @@ export declare class RouteMatcher {
   parseURLParams(pathname: string): Record<string, string>;
   matchLength(pathname: string): number | null;
   matchUrlPath(requestUrl: string): boolean;
+  matchEntry(entryName: string): boolean;
   private setupUrlPath;
 }

package/dist/types/libs/serve-file.d.ts

@@ -1,7 +1,7 @@
 import { NextFunction } from '../type';
 import { ModernServerContext } from './context';
 declare type Rule = {
-  path: string;
+  path: string | RegExp;
   target: string;
 };
 export declare const createStaticFileHandler: (rules: Rule[]) => (context: ModernServerContext, next: NextFunction) => Promise<void>;

package/dist/types/server/{web-server.d.ts → dev-server/dev-server-split.d.ts}

@@ -1,16 +1,16 @@
 import type { APIServerStartInput } from '@modern-js/server-plugin';
 import { ModernDevServer } from './dev-server';
-import { ModernServer } from './modern-server';
-import { mergeExtension } from "../utils.d";
-import { ModernRouteInterface } from "../libs/route";
-import { ApiServerMode } from "../constants.d";
-export declare class WebModernServer extends ModernServer {
+import { mergeExtension } from "../../utils.d";
+import { ModernRouteInterface } from "../../libs/route";
+import { ApiServerMode } from "../../constants.d";
+export declare class WebModernDevServer extends ModernDevServer {
   protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
   protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
 }
-export declare class WebModernDevServer extends ModernDevServer {
-  protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
-  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
+export declare class APIModernDevServer extends ModernDevServer {
+  protected prepareWebHandler(_: ReturnType<typeof mergeExtension>): any;
+  protected prepareAPIHandler(mode: ApiServerMode, extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
+  protected preServerInit(): Promise<void>;
 }

package/dist/types/server/{dev-server.d.ts → dev-server/dev-server.d.ts}

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { Server } from 'http';
-import { ModernServerOptions, ServerHookRunner, ReadyOptions } from '../type';
-import { ModernServer } from './modern-server';
+import http, { Server, IncomingMessage, ServerResponse } from 'http';
+import { ModernServer } from '../modern-server';
+import { ModernServerOptions, ServerHookRunner, ReadyOptions } from "../../type.d";
 export declare class ModernDevServer extends ModernServer {
   private devProxyHandler;
   private mockHandler;
@@ -10,11 +10,12 @@ export declare class ModernDevServer extends ModernServer {
   private socketServer;
   private watcher;
   private devMiddleware;
-  constructor(options: ModernServerOptions, runner: ServerHookRunner);
-  init(): Promise<void>;
+  constructor(options: ModernServerOptions);
+  init(runner: ServerHookRunner): Promise<void>;
   ready(options?: ReadyOptions): void;
   onListening(app: Server): void;
   close(): Promise<void>;
+  createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<http.Server | import("https").Server>;
   private setupCompiler;
   private setupDevServerPlugin;
   private setupHooks;

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

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

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse, Server as httpServer } from 'http';
-import { ModernServerOptions, ReadyOptions } from '../type';
+import { ModernServerOptions, ReadyOptions } from "../type.d";
 export declare class Server {
   options: ModernServerOptions;
   private server;
@@ -15,4 +15,6 @@ export declare class Server {
   close(): Promise<void>;
   private createProdServer;
   private createDevServer;
+  private createHookRunner;
+  private initAppContext;
 }

package/dist/types/server/{api-server.d.ts → modern-server-split.d.ts}

@@ -1,16 +1,14 @@
 import { APIServerStartInput } from '@modern-js/server-plugin';
-import { ModernDevServer } from './dev-server';
 import { ModernServer } from './modern-server';
 import { mergeExtension } from "../utils.d";
 import { ModernRouteInterface } from "../libs/route";
 import { ApiServerMode } from "../constants.d";
-export declare class APIModernServer extends ModernServer {
-  protected prepareWebHandler(_: ReturnType<typeof mergeExtension>): any;
-  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-plugin").Adapter>;
+export declare class WebModernServer extends ModernServer {
+  protected prepareAPIHandler(_m: ApiServerMode, _: ReturnType<typeof mergeExtension>): any;
+  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected preServerInit(): Promise<void>;
 }
-export declare class APIModernDevServer extends ModernDevServer {
+export declare class APIModernServer extends ModernServer {
   protected prepareWebHandler(_: ReturnType<typeof mergeExtension>): any;
   protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];

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

@@ -17,9 +17,9 @@ export declare class ModernServer {
   protected conf: NormalizedConfig;
   protected handlers: ModernServerAsyncHandler[];
   protected presetRoutes?: ModernRouteInterface[];
+  protected runner: ServerHookRunner;
   protected readonly logger: Logger;
   protected readonly measure: Measure;
-  private readonly runner;
   private readonly isDev;
   private staticFileHandler;
   private routeRenderHandler;
@@ -36,12 +36,13 @@ export declare class ModernServer {
     staticGenerate,
     logger,
     measure
-  }: ModernServerOptions, runner: ServerHookRunner);
+  }: ModernServerOptions);
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;
-  init(): Promise<void>;
+  init(runner: ServerHookRunner): Promise<void>;
   ready(_: ReadyOptions): void;
   onListening(_: Server): void;
   close(): void;
+  createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server>;
   protected warmupSSRBundle(): void;
   protected readRouteSpec(): ModernRouteInterface[];
   protected addHandler(handler: ModernServerHandler): void;
@@ -51,6 +52,7 @@ export declare class ModernServer {
   protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected preServerInit(): Promise<void>;
+  private prepareFavicons;
   private routeHandler;
   private injectMicroFE;
   private compose;

package/dist/types/utils.d.ts

@@ -1,4 +1,4 @@
-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;