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

package/dist/js/modern/libs/hook-api/route.js

@@ -0,0 +1,37 @@
+class RouteAPI {
+  constructor(matched, router) {
+    this.router = void 0;
+    this.current = void 0;
+    this.current = matched;
+    this.router = router;
+  }
+
+  cur() {
+    return this.current.generate();
+  }
+
+  get(entryName) {
+    const {
+      router
+    } = this;
+    const matched = router.matchEntry(entryName);
+    return matched ? matched.generate() : null;
+  }
+
+  use(entryName) {
+    const {
+      router
+    } = this;
+    const matched = router.matchEntry(entryName);
+
+    if (matched) {
+      this.current = matched;
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+}
+
+export const createRouteAPI = (matched, router) => new RouteAPI(matched, router);

package/dist/js/modern/libs/route/index.js

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

package/dist/js/modern/libs/route/matcher.js

@@ -57,6 +57,10 @@ export class RouteMatcher {
 
       return false;
     }
+  }
+
+  matchEntry(entryName) {
+    return this.spec.entryName === entryName;
   } // compiler urlPath to regexp if necessary
 
 

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

@@ -1,6 +1,5 @@
 import { ModernDevServer } from "./dev-server";
-import { ModernServer } from "./modern-server";
-export class WebModernServer extends ModernServer {
+export class WebModernDevServer extends ModernDevServer {
   prepareAPIHandler(_m, _) {
     return null;
   }
@@ -14,17 +13,20 @@ export class WebModernServer extends ModernServer {
   }
 
 }
-export class WebModernDevServer extends ModernDevServer {
-  prepareAPIHandler(_m, _) {
+export class APIModernDevServer extends ModernDevServer {
+  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
   }
 
 }

package/dist/js/modern/server/{dev-server.js → dev-server/dev-server.js}

@@ -1,16 +1,18 @@
+import { createServer } 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 webpackDevMiddleware from 'webpack-dev-middleware';
-import { createMockHandler } from "../dev-tools/mock";
-import { createProxyHandler } from "../libs/proxy";
-import SocketServer from "../dev-tools/socket-server";
-import DevServerPlugin from "../dev-tools/dev-server-plugin";
-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";
-import { AGGRED_DIR } from "../constants";
+import { ModernServer } from "../modern-server";
+import { createMockHandler } from "../../dev-tools/mock";
+import { createProxyHandler } from "../../libs/proxy";
+import SocketServer from "../../dev-tools/socket-server";
+import DevServerPlugin from "../../dev-tools/dev-server-plugin";
+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 = {
   client: {
     port: '8080',
@@ -27,8 +29,8 @@ const DEFAULT_DEV_OPTIONS = {
   liveReload: true
 };
 export class ModernDevServer extends ModernServer {
-  constructor(options, runner) {
-    super(options, runner); // set webpack compiler
+  constructor(options) {
+    super(options); // set webpack compiler
 
     this.devProxyHandler = null;
     this.mockHandler = null;
@@ -40,18 +42,18 @@ export class ModernDevServer extends ModernServer {
     this.compiler = options.compiler; // 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
 
 
-  async init() {
+  async init(runner) {
     var _conf$tools, _conf$tools$devServer;
 
     const {
       conf,
       pwd,
       compiler
-    } = this;
-    enableRegister(pwd, conf); // mock handler
+    } = this; // mock handler
 
     this.mockHandler = createMockHandler({
       pwd
@@ -86,7 +88,7 @@ export class ModernDevServer extends ModernServer {
       this.addHandler(devMiddlewareHandler);
     }
 
-    await super.init(); // watch mock/ server/ api/ dir file change
+    await super.init(runner); // watch mock/ server/ api/ dir file change
 
     this.startWatcher();
   }
@@ -97,6 +99,7 @@ export class ModernDevServer extends ModernServer {
     this.cleanSSRCache(); // reset static file
 
     reader.updateFile();
+    this.runner.reset();
   }
 
   onListening(app) {
@@ -113,6 +116,24 @@ export class ModernDevServer extends ModernServer {
         resolve();
       });
     });
+  }
+
+  async createHTTPServer(handler) {
+    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
@@ -207,18 +228,16 @@ export class ModernDevServer extends ModernServer {
       pwd
     } = this;
     const {
-      mock,
-      server,
-      api,
-      shared
+      mock
     } = AGGRED_DIR;
-    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${server}/**/*`, `${pwd}/${api}/**/*`, `${pwd}/${shared}/**/*`];
+    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${SERVER_DIR}/**/*`, `${pwd}/${API_DIR}/**/*`, `${pwd}/${SHARED_DIR}/**/*`];
     const watcher = new Watcher();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 
     watcher.listen(defaultWatched, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
+      this.runner.reset();
 
       if (filepath.startsWith(`${pwd}/${mock}`)) {
         this.mockHandler = createMockHandler({

package/dist/js/modern/server/dev-server/index.js

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

package/dist/js/modern/server/index.js

@@ -1,21 +1,23 @@
-import { createServer } from 'http';
-import { createServer as createHttpsServer } from 'https';
+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; }
+
+import path from 'path';
 import { serverManager } from '@modern-js/server-plugin';
 import { logger as defaultLogger } from '@modern-js/utils';
+import { AppContext, initAppContext, initAppDir, loadUserConfig } from '@modern-js/core';
 import { ModernServer } from "./modern-server";
+import { APIModernServer, WebModernServer } from "./modern-server-split";
 import { measure as defaultMeasure } from "../libs/measure";
 export 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 => {
-      serverManager.usePlugin(p);
-    });
   }
 
   getRequestHandler() {
@@ -33,40 +35,20 @@ export class Server {
     const {
       options
     } = this;
-    this.runner = await serverManager.init({});
-    const {
-      logger,
-      measure
-    } = await this.runner.create({
-      loggerOptions: options.logger,
-      measureOptions: options.measure
-    }, {
-      onLast: () => ({})
-    });
-    options.logger = options.logger || logger || defaultLogger;
-    options.measure = options.measure || measure || defaultMeasure;
+    options.logger = options.logger || defaultLogger;
+    options.measure = options.measure || defaultMeasure; // 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 = createHttpsServer(httpsOptions, this.getRequestHandler());
-      } else {
-        this.app = createServer(this.getRequestHandler());
-      }
+      this.server = this.createDevServer();
     } else {
       this.server = this.createProdServer();
-      this.app = createServer(this.getRequestHandler());
-    }
+    } // check if https is configured when start dev server
 
-    await this.server.init();
+
+    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(this.runner);
     return this;
   }
 
@@ -97,19 +79,11 @@ export class Server {
     } = this;
 
     if (options.apiOnly) {
-      const {
-        APIModernServer
-      } = require("./api-server");
-
-      return new APIModernServer(options, this.runner);
+      return new APIModernServer(options);
     } else if (options.webOnly) {
-      const {
-        WebModernServer
-      } = require("./web-server");
-
-      return new WebModernServer(options, this.runner);
+      return new WebModernServer(options);
     } else {
-      return new ModernServer(options, this.runner);
+      return new ModernServer(options);
     }
   }
 
@@ -118,25 +92,50 @@ export 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();
+    serverManager.run(() => {
+      AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+        distDirectory: path.join(options.pwd, options.config.output.path || 'dist')
+      }));
+    });
+    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
+      serverManager.usePlugin(p);
+    });
+    return serverManager.init({});
+  }
+
+  async initAppContext() {
+    var _this$options$plugins;
+
+    const appDirectory = await initAppDir();
+    const loaded = await 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 = initAppContext(appDirectory, plugins || [], loaded.filePath);
+    return appContext;
+  }
+
 }

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

@@ -1,23 +1,19 @@
-import { ModernDevServer } from "./dev-server";
 import { ModernServer } from "./modern-server";
-export class APIModernServer extends ModernServer {
-  prepareWebHandler(_) {
+export class WebModernServer extends ModernServer {
+  prepareAPIHandler(_m, _) {
     return null;
   }
 
-  async prepareAPIHandler(mode, extension) {
-    return super.prepareAPIHandler(mode, extension);
+  async prepareWebHandler(extension) {
+    return super.prepareWebHandler(extension);
   }
 
   filterRoutes(routes) {
-    return routes.filter(route => route.isApi);
-  }
-
-  async preServerInit() {// noop
+    return routes.filter(route => route.entryName);
   }
 
 }
-export class APIModernDevServer extends ModernDevServer {
+export class APIModernServer extends ModernServer {
   prepareWebHandler(_) {
     return null;
   }

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

@@ -11,10 +11,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 /* eslint-disable max-lines */
+import { createServer } from 'http';
 import util from 'util';
 import path from 'path';
 import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
-import { gather, createMiddlewareCollecter } from '@modern-js/server-utils';
+import { createMiddlewareCollecter } from '@modern-js/server-utils';
 import mime from 'mime-types';
 import axios from 'axios';
 import { RouteMatchManager } from "../libs/route";
@@ -25,7 +26,8 @@ import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
 import { AGGRED_DIR, ApiServerMode, ERROR_DIGEST, ERROR_PAGE_TEXT } from "../constants";
-import { createTemplateAPI } from "../libs/hook-api";
+import { createTemplateAPI } from "../libs/hook-api/template";
+import { createRouteAPI } from "../libs/hook-api/route";
 const API_DIR = './api';
 const SERVER_DIR = './server';
 export class ModernServer {
@@ -40,7 +42,7 @@ export class ModernServer {
     staticGenerate,
     logger,
     measure
-  }, runner) {
+  }) {
     this.pwd = void 0;
     this.distDir = void 0;
     this.workDir = void 0;
@@ -48,9 +50,9 @@ export 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;
@@ -67,7 +69,6 @@ export class ModernServer {
     this.distDir = path.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 RouteMatchManager();
@@ -86,9 +87,10 @@ export class ModernServer {
   } // server prepare
 
 
-  async init() {
+  async init(runner) {
     var _conf$bff;
 
+    this.runner = runner;
     const {
       distDir,
       isDev,
@@ -153,6 +155,10 @@ export class ModernServer {
 
   close() {
     reader.close();
+  }
+
+  async createHTTPServer(handler) {
+    return createServer(handler);
   } // warmup ssr function
 
 
@@ -200,12 +206,7 @@ export class ModernServer {
     const {
       workDir,
       runner
-    } = this; // inner tool, gather user inject
-
-    const {
-      api: userAPIExt,
-      web: userWebExt
-    } = gather(workDir); // server hook, gather plugin inject
+    } = this; // server hook, gather plugin inject
 
     const _createMiddlewareColl = createMiddlewareCollecter(),
           {
@@ -222,15 +223,17 @@ export class ModernServer {
     const serverDir = path.join(workDir, SERVER_DIR); // get api or web server handler from server-framework plugin
 
     if (await fs.pathExists(path.join(serverDir))) {
-      const webExtension = mergeExtension(pluginWebExt, userWebExt);
+      const webExtension = mergeExtension(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
 
     if (fs.existsSync(apiDir)) {
       const mode = fs.existsSync(path.join(apiDir, AGGRED_DIR.lambda)) ? ApiServerMode.frame : ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
 
-      const apiExtension = mergeExtension(pluginAPIExt, mode === ApiServerMode.frame ? [] : userAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
+      const apiExtension = mergeExtension(pluginAPIExt);
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, _objectSpread(_objectSpread({}, apiExtension), {}, {
+        modernJsConfig: this.conf
+      }));
     }
   }
   /* —————————————————————— function will be overwrite —————————————————————— */
@@ -263,7 +266,7 @@ export class ModernServer {
       pwd: workDir,
       mode,
       config: extension,
-      prefix
+      prefix: Array.isArray(prefix) ? prefix[0] : prefix
     }, {
       onLast: () => null
     });
@@ -278,7 +281,7 @@ export class ModernServer {
       conf
     } = this;
     const preMiddleware = await this.runner.preServerInit(conf);
-    preMiddleware.forEach(mid => {
+    preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
     });
   }
@@ -311,7 +314,12 @@ export class ModernServer {
     const {
       req,
       res
-    } = context; // match routes in the route spec
+    } = context;
+    await this.runner.beforeMatch({
+      context
+    }, {
+      onLast: noop
+    }); // match routes in the route spec
 
     const matched = this.router.match(context.url);
 
@@ -320,8 +328,23 @@ export class ModernServer {
       return;
     }
 
-    const route = matched.generate();
-    const params = matched.parseURLParams(context.url);
+    const routeAPI = createRouteAPI(matched, this.router);
+    await this.runner.afterMatch({
+      context,
+      routeAPI
+    }, {
+      onLast: 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) {
@@ -342,6 +365,11 @@ export class ModernServer {
       return;
     }
 
+    await this.runner.beforeRender({
+      context
+    }, {
+      onLast: noop
+    });
     const file = await this.routeRenderHandler(context, route);
 
     if (!file) {

package/dist/js/modern/utils.js

@@ -1,7 +1,7 @@
-export const mergeExtension = (users, plugins) => {
+export const mergeExtension = users => {
   const output = [];
   return {
-    middleware: output.concat(users).concat(plugins)
+    middleware: output.concat(users)
   };
 };
 export const toMessage = (dig, e) => {

package/dist/js/node/libs/hook-api/route.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createRouteAPI = void 0;
+
+class RouteAPI {
+  constructor(matched, router) {
+    this.router = void 0;
+    this.current = void 0;
+    this.current = matched;
+    this.router = router;
+  }
+
+  cur() {
+    return this.current.generate();
+  }
+
+  get(entryName) {
+    const {
+      router
+    } = this;
+    const matched = router.matchEntry(entryName);
+    return matched ? matched.generate() : null;
+  }
+
+  use(entryName) {
+    const {
+      router
+    } = this;
+    const matched = router.matchEntry(entryName);
+
+    if (matched) {
+      this.current = matched;
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+}
+
+const createRouteAPI = (matched, router) => new RouteAPI(matched, router);
+
+exports.createRouteAPI = createRouteAPI;

package/dist/js/node/libs/route/index.js

@@ -64,6 +64,10 @@ class RouteMatchManager {
     return best;
   }
 
+  matchEntry(entryname) {
+    return this.matchers.find(matcher => matcher.matchEntry(entryname));
+  }
+
   getBundles() {
     const bundles = this.specs.filter(route => route.isSSR).map(route => route.bundle);
     return bundles;