@modern-js/server 1.1.3 → 1.1.5-beta.1

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

@@ -17,13 +17,13 @@ var _modernServer = require("./modern-server");
 
 var _modernServerSplit = require("./modern-server-split");
 
-var _measure = require("../libs/measure");
+var _metrics = require("../libs/metrics");
 
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
 
@@ -52,7 +52,7 @@ class Server {
       options
     } = this;
     options.logger = options.logger || _utils.logger;
-    options.measure = options.measure || _measure.measure; // initialize server
+    options.metrics = options.metrics || _metrics.metrics; // initialize server
 
     if (options.dev) {
       this.server = this.createDevServer();
@@ -95,9 +95,11 @@ class Server {
     } = this;
 
     if (options.apiOnly) {
-      return new _modernServerSplit.APIModernServer(options);
+      return new _modernServerSplit.ModernAPIServer(options);
+    } else if (options.ssrOnly) {
+      return new _modernServerSplit.ModernSSRServer(options);
     } else if (options.webOnly) {
-      return new _modernServerSplit.WebModernServer(options);
+      return new _modernServerSplit.ModernWebServer(options);
     } else {
       return new _modernServer.ModernServer(options);
     }
@@ -109,15 +111,15 @@ class Server {
     } = this;
 
     const {
-      APIModernDevServer,
-      WebModernDevServer,
+      ModernAPIDevServer,
+      ModernSSRDevServer,
       ModernDevServer
     } = require("./dev-server");
 
     if (options.apiOnly) {
-      return new APIModernDevServer(options);
-    } else if (options.webOnly) {
-      return new WebModernDevServer(options);
+      return new ModernAPIDevServer(options);
+    } else if (options.ssrOnly) {
+      return new ModernSSRDevServer(options);
     } else {
       return new ModernDevServer(options);
     }
@@ -129,6 +131,9 @@ class Server {
     const {
       options
     } = this;
+    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
+      _serverPlugin.serverManager.usePlugin(p);
+    });
     const appContext = await this.initAppContext();
 
     _serverPlugin.serverManager.run(() => {
@@ -139,9 +144,6 @@ class Server {
       }));
     });
 
-    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
-      _serverPlugin.serverManager.usePlugin(p);
-    });
     return _serverPlugin.serverManager.init({});
   }
 

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

@@ -3,28 +3,46 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WebModernServer = exports.APIModernServer = void 0;
+exports.ModernWebServer = exports.ModernSSRServer = exports.ModernAPIServer = void 0;
 
 var _modernServer = require("./modern-server");
 
-class WebModernServer extends _modernServer.ModernServer {
+class ModernSSRServer extends _modernServer.ModernServer {
+  // Todo should not invoke any route hook in modernSSRServer
+  async warmupSSRBundle() {// empty
+  }
+
+  verifyMatch(context, matched) {
+    if (matched.generate().isApi) {
+      this.render404(context);
+    }
+  }
+
   prepareAPIHandler(_m, _) {
     return null;
   }
 
   async prepareWebHandler(extension) {
     return super.prepareWebHandler(extension);
-  }
+  } // protected filterRoutes(routes: ModernRouteInterface[]) {
+  //   return routes.filter(route => route.entryName);
+  // }
 
-  filterRoutes(routes) {
-    return routes.filter(route => route.entryName);
+
+  async preServerInit() {// empty
   }
 
 }
 
-exports.WebModernServer = WebModernServer;
+exports.ModernSSRServer = ModernSSRServer;
+
+class ModernAPIServer extends _modernServer.ModernServer {
+  async emitRouteHook(_, _input) {// empty
+  }
+
+  async warmupSSRBundle() {// empty
+  }
 
-class APIModernServer extends _modernServer.ModernServer {
   prepareWebHandler(_) {
     return null;
   }
@@ -37,9 +55,43 @@ class APIModernServer extends _modernServer.ModernServer {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {// noop
+  async preServerInit() {// empty
+  }
+
+}
+
+exports.ModernAPIServer = ModernAPIServer;
+
+class ModernWebServer extends _modernServer.ModernServer {
+  async warmupSSRBundle() {// empty
+  }
+
+  async handleAPI(context) {
+    const {
+      proxyTarget
+    } = this;
+
+    if (!(proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.api)) {
+      this.proxy();
+    } else {
+      this.render404(context);
+    }
+  }
+
+  async handleWeb(context, route) {
+    const {
+      proxyTarget
+    } = this;
+
+    if (route.isSSR && proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.ssr) {
+      return this.proxy();
+    } else {
+      // if no proxyTarget but access web server, degradation to csr
+      route.isSSR = false;
+      return super.handleWeb(context, route);
+    }
   }
 
 }
 
-exports.APIModernServer = APIModernServer;
+exports.ModernWebServer = ModernWebServer;

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

@@ -47,9 +47,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
 
@@ -71,7 +71,8 @@ class ModernServer {
     routes,
     staticGenerate,
     logger,
-    measure
+    metrics,
+    proxyTarget
   }) {
     this.pwd = void 0;
     this.distDir = void 0;
@@ -82,7 +83,8 @@ class ModernServer {
     this.presetRoutes = void 0;
     this.runner = void 0;
     this.logger = void 0;
-    this.measure = void 0;
+    this.metrics = void 0;
+    this.proxyTarget = void 0;
     this.isDev = false;
     this.staticFileHandler = void 0;
     this.routeRenderHandler = void 0;
@@ -96,13 +98,14 @@ class ModernServer {
 
     this.isDev = Boolean(dev);
     this.pwd = pwd;
-    this.distDir = _path.default.join(pwd, config.output.path || '');
+    this.distDir = _path.default.join(pwd, config.output.path || 'dist');
     this.workDir = this.isDev ? pwd : this.distDir;
     this.conf = config;
     this.logger = logger;
-    this.measure = measure;
+    this.metrics = metrics;
     this.router = new _route.RouteMatchManager();
     this.presetRoutes = routes;
+    this.proxyTarget = proxyTarget;
 
     if (staticGenerate) {
       this.staticGenerate = staticGenerate;
@@ -189,20 +192,6 @@ class ModernServer {
 
   async createHTTPServer(handler) {
     return (0, _http.createServer)(handler);
-  } // warmup ssr function
-
-
-  warmupSSRBundle() {
-    const {
-      distDir
-    } = this;
-    const bundles = this.router.getBundles();
-    bundles.forEach(bundle => {
-      const filepath = _path.default.join(distDir, bundle); // if error, just throw and let process die
-
-
-      require(filepath);
-    });
   } // read route spec from route.json
 
 
@@ -268,6 +257,11 @@ class ModernServer {
       const apiExtension = (0, _utils2.mergeExtension)(pluginAPIExt);
       this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
     }
+  } // Todo
+
+
+  async proxy() {
+    return null;
   }
   /* —————————————————————— function will be overwrite —————————————————————— */
 
@@ -309,34 +303,59 @@ class ModernServer {
     return routes;
   }
 
+  async emitRouteHook(eventName, input) {
+    return this.runner[eventName](input, {
+      onLast: _utils2.noop
+    });
+  } // warmup ssr function
+
+
+  warmupSSRBundle() {
+    const {
+      distDir
+    } = this;
+    const bundles = this.router.getBundles();
+    bundles.forEach(bundle => {
+      const filepath = _path.default.join(distDir, bundle); // if error, just throw and let process die
+
+
+      require(filepath);
+    });
+  }
+
   async preServerInit() {
     const {
-      conf
+      conf,
+      runner
     } = this;
-    const preMiddleware = await this.runner.preServerInit(conf);
+    const preMiddleware = await runner.preServerInit(conf);
     preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
     });
   }
 
-  prepareFavicons(favicon, faviconByEntries) {
-    const faviconNames = [];
+  async handleAPI(context) {
+    const {
+      req,
+      res
+    } = context;
 
-    if (favicon) {
-      faviconNames.push(favicon.substring(favicon.lastIndexOf('/') + 1));
+    if (!this.frameAPIHandler) {
+      throw new Error('can not found api hanlder');
     }
 
-    if (faviconByEntries) {
-      Object.keys(faviconByEntries).forEach(f => {
-        const curFavicon = faviconByEntries[f];
+    await this.frameAPIHandler(req, res);
+  }
 
-        if (curFavicon) {
-          faviconNames.push(curFavicon.substring(curFavicon.lastIndexOf('/') + 1));
-        }
-      });
-    }
+  async handleWeb(context, route) {
+    return this.routeRenderHandler({
+      ctx: context,
+      route,
+      runner: this.runner
+    });
+  }
 
-    return faviconNames;
+  verifyMatch(_c, _m) {// empty
   }
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
@@ -348,10 +367,8 @@ class ModernServer {
       req,
       res
     } = context;
-    await this.runner.beforeMatch({
+    await this.emitRouteHook('beforeMatch', {
       context
-    }, {
-      onLast: _utils2.noop
     }); // match routes in the route spec
 
     const matched = this.router.match(context.url);
@@ -359,14 +376,18 @@ class ModernServer {
     if (!matched) {
       this.render404(context);
       return;
+    } else {
+      this.verifyMatch(context, matched);
+    }
+
+    if (res.headersSent) {
+      return;
     }
 
     const routeAPI = (0, _route2.createRouteAPI)(matched, this.router);
-    await this.runner.afterMatch({
+    await this.emitRouteHook('afterMatch', {
       context,
       routeAPI
-    }, {
-      onLast: _utils2.noop
     });
 
     if (res.headersSent) {
@@ -381,11 +402,7 @@ class ModernServer {
     context.setParams(params); // route is api service
 
     if (route.isApi) {
-      if (!this.frameAPIHandler) {
-        throw new Error('can not found api hanlder');
-      }
-
-      await this.frameAPIHandler(req, res);
+      this.handleAPI(context);
       return;
     }
 
@@ -398,12 +415,13 @@ class ModernServer {
       return;
     }
 
-    await this.runner.beforeRender({
-      context
-    }, {
-      onLast: _utils2.noop
-    });
-    const file = await this.routeRenderHandler(context, route);
+    if (route.entryName) {
+      await this.emitRouteHook('beforeRender', {
+        context
+      });
+    }
+
+    const file = await this.handleWeb(context, route);
 
     if (!file) {
       this.render404(context);
@@ -421,11 +439,9 @@ class ModernServer {
 
     if (route.entryName) {
       const templateAPI = (0, _template.createTemplateAPI)(file.content.toString());
-      await this.runner.afterRender({
+      await this.emitRouteHook('afterRender', {
         context,
         templateAPI
-      }, {
-        onLast: _utils2.noop
       });
       await this.injectMicroFE(context, templateAPI);
       response = templateAPI.get();
@@ -545,7 +561,7 @@ class ModernServer {
     res.statusCode = 200;
     const context = (0, _context.createContext)(req, res, {
       logger: this.logger,
-      measure: this.measure
+      metrics: this.metrics
     });
 
     try {
@@ -578,7 +594,11 @@ class ModernServer {
 
       if (entryName === status.toString() || entryName === '_error') {
         try {
-          const file = await this.routeRenderHandler(context, route);
+          const file = await this.routeRenderHandler({
+            route,
+            ctx: context,
+            runner: this.runner
+          });
 
           if (file) {
             context.res.end(file.content);
@@ -593,6 +613,26 @@ class ModernServer {
     res.end((0, _utils2.createErrorDocument)(status, text));
   }
 
+  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;
+  }
+
 }
 /* eslint-enable max-lines */
 

package/dist/js/node/utils.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.applyMixins = applyMixins;
 exports.toMessage = exports.noop = exports.mergeExtension = exports.createErrorDocument = void 0;
 
 const mergeExtension = users => {
@@ -63,6 +64,15 @@ const createErrorDocument = (status, text) => {
   </body>
   </html>
   `;
-};
+}; // This can live anywhere in your codebase:
+
+
+exports.createErrorDocument = createErrorDocument;
 
-exports.createErrorDocument = createErrorDocument;
+function applyMixins(derivedCtor, constructors) {
+  constructors.forEach(baseCtor => {
+    Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
+      Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) || Object.create(null));
+    });
+  });
+}

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

@@ -2,7 +2,7 @@
 import { IncomingMessage, ServerResponse } from 'http';
 import { URL } from 'url';
 import qs from 'querystring';
-import type { ModernServerContext as ModernServerContextInterface, Measure, Logger } from '@modern-js/types/server';
+import type { ModernServerContext as ModernServerContextInterface, Metrics, Logger } from '@modern-js/types/server';
 export declare class ModernServerContext implements ModernServerContextInterface {
   /**
    * http request
@@ -19,18 +19,18 @@ export declare class ModernServerContext implements ModernServerContextInterface
 
   params: Record<string, string>;
   logger: Logger;
-  measure?: Measure;
+  metrics?: Metrics;
   constructor(req: IncomingMessage, res: ServerResponse, {
     logger,
-    measure
+    metrics
   }: {
     logger: Logger;
-    measure: Measure;
+    metrics: Metrics;
   });
+  private bind;
   setParams(params: Record<string, string>): void;
   getReqHeader(key: string): string | string[];
   get headers(): import("http").IncomingHttpHeaders;
-  set headers(val: import("http").IncomingHttpHeaders);
   get method(): string;
   get url(): string;
   set url(val: string);

package/dist/types/libs/context/index.d.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 declare const createContext: (req: IncomingMessage, res: ServerResponse, {
   logger,
-  measure
+  metrics
 }: {
   logger: Logger;
-  measure: Measure;
+  metrics: Metrics;
 }) => ModernServerContext;
 export { ModernServerContext };

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

@@ -0,0 +1,3 @@
+import { Metrics } from "../type.d";
+declare const metrics: Metrics;
+export { metrics };

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

@@ -1,10 +1,19 @@
 import { RenderResult } from '../../type';
 import { ModernRoute } from '../route';
 import { ModernServerContext } from '../context';
+import { ServerHookRunner } from "../../type.d";
 export declare const createRenderHandler: ({
   distDir,
   staticGenerate
 }: {
   distDir: string;
   staticGenerate: boolean;
-}) => (ctx: ModernServerContext, route: ModernRoute) => Promise<RenderResult | null>;
+}) => ({
+  ctx,
+  route,
+  runner
+}: {
+  ctx: ModernServerContext;
+  route: ModernRoute;
+  runner: ServerHookRunner;
+}) => Promise<RenderResult | null>;

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

@@ -1,9 +1,10 @@
 import { ModernServerContext } from '../context';
 import { RenderResult } from '../../type';
+import { ServerHookRunner } from "../../type.d";
 export declare const render: (ctx: ModernServerContext, renderOptions: {
   distDir: string;
   bundle: string;
   template: string;
   entryName: string;
   staticGenerate: boolean;
-}) => Promise<RenderResult>;
+}, runner: ServerHookRunner) => Promise<RenderResult>;

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

@@ -1,7 +1,5 @@
-/// <reference types="node" />
 /// <reference types="react" />
-import { IncomingHttpHeaders } from 'http';
-import { Measure, Logger } from '../../type';
+import { BaseSSRServerContext } from '@modern-js/types/server';
 declare type MetaKeyMap = {
   header?: string[];
   query?: string[];
@@ -24,24 +22,7 @@ export declare enum RenderLevel {
   SERVER_PREFETCH = 1,
   SERVER_RENDER = 2,
 }
-export declare type SSRServerContext = {
-  request: {
-    params: Record<string, string>;
-    pathname: string;
-    query: Record<string, string>;
-    headers: IncomingHttpHeaders;
-    cookie?: string;
-  };
-  redirection: {
-    url?: string;
-    status?: number;
-  };
-  distDir: string;
-  template: string;
-  entryName: string;
-  logger: Logger;
-  measure?: Measure;
-  loadableManifest?: string;
+export declare type SSRServerContext = BaseSSRServerContext & {
   cacheConfig?: CacheConfig;
   staticGenerate?: boolean;
 };

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

@@ -1,13 +1,5 @@
-export interface ModernRouteInterface {
-  entryName: string;
-  urlPath: string;
-  entryPath?: string;
-  isSPA?: boolean;
-  isSSR?: boolean;
-  isApi?: boolean;
-  bundle?: string;
-  enableModernMode?: boolean;
-}
+import { ServerRoute as ModernRouteInterface } from '@modern-js/types';
+export type { ModernRouteInterface };
 export declare class ModernRoute implements ModernRouteInterface {
   entryName: string;
   urlPath: string;

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

@@ -3,14 +3,13 @@ import { ModernDevServer } from './dev-server';
 import { mergeExtension } from "../../utils.d";
 import { ModernRouteInterface } from "../../libs/route";
 import { ApiServerMode } from "../../constants.d";
-export declare class WebModernDevServer extends ModernDevServer {
+export declare class ModernSSRDevServer 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 APIModernDevServer extends ModernDevServer {
-  protected prepareWebHandler(_: ReturnType<typeof mergeExtension>): any;
-  protected prepareAPIHandler(mode: ApiServerMode, extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
+export declare class ModernAPIDevServer extends ModernDevServer {
+  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected preServerInit(): Promise<void>;
 }

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

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