@modern-js/server 1.1.4 → 1.2.1-beta.0

package/dist/js/node/libs/render/reader.js

@@ -26,9 +26,9 @@ const createCacheItem = async (filepath, mtime) => {
 };
 
 class LruReader {
+  // private timer?: NodeJS.Timeout;
   constructor() {
     this.cache = void 0;
-    this.timer = void 0;
     this.cache = new _lruCache.default({
       max: 256 * MB,
       length: getContentLength,
@@ -37,14 +37,12 @@ class LruReader {
     });
   }
 
-  init() {
-    this.timeTask();
+  init() {// this.timeTask();
   }
 
-  close() {
-    if (this.timer) {
-      clearInterval(this.timer);
-    }
+  close() {// if (this.timer) {
+    //   clearInterval(this.timer);
+    // }
   }
 
   async read(filepath) {
@@ -105,11 +103,10 @@ class LruReader {
         cache.del(filepath);
       }
     }
-  }
+  } // private timeTask() {
+  // this.timer = setInterval(() => this.update, 5 * 60 * 1000).unref();
+  // }
 
-  timeTask() {
-    this.timer = setInterval(() => this.update, 5 * 60 * 1000).unref();
-  }
 
 }
 

package/dist/js/node/libs/render/ssr.js

@@ -15,7 +15,7 @@ var _cache = _interopRequireDefault(require("./cache"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const render = async (ctx, renderOptions) => {
+const render = async (ctx, renderOptions, runner) => {
   const {
     bundle,
     distDir,
@@ -40,8 +40,9 @@ const render = async (ctx, renderOptions) => {
     distDir,
     staticGenerate,
     logger: ctx.logger,
-    measure: ctx.measure
+    metrics: ctx.metrics
   };
+  runner.extendSSRContext(context);
 
   const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];
 

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

@@ -4,6 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RouteMatchManager = void 0;
+Object.defineProperty(exports, "RouteMatcher", {
+  enumerable: true,
+  get: function () {
+    return _matcher.RouteMatcher;
+  }
+});
 
 var _matcher = require("./matcher");
 

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

@@ -17,7 +17,7 @@ class ModernRoute {
     this.isSSR = void 0;
     this.isSPA = void 0;
     this.enableModernMode = void 0;
-    this.entryName = routeSpec.entryName;
+    this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
     this.isSSR = routeSpec.isSSR || false;

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

@@ -41,6 +41,12 @@ 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); 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 = 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; }
+
 const DEFAULT_DEV_OPTIONS = {
   client: {
     port: '8080',
@@ -53,6 +59,7 @@ const DEFAULT_DEV_OPTIONS = {
   dev: {
     writeToDisk: true
   },
+  watch: true,
   hot: true,
   liveReload: true
 };
@@ -70,7 +77,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     this.devMiddleware = void 0;
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
-    this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : options.dev;
+    this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS), options.dev);
     (0, _register.enableRegister)(this.pwd, this.conf);
   } // Complete the preparation of services
 
@@ -119,7 +126,9 @@ class ModernDevServer extends _modernServer.ModernServer {
 
     await super.init(runner); // watch mock/ server/ api/ dir file change
 
-    this.startWatcher();
+    if (this.dev.watch) {
+      this.startWatcher();
+    }
   }
 
   ready(options = {}) {

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

@@ -17,7 +17,7 @@ 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 }; }
 
@@ -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();
@@ -137,10 +137,12 @@ class Server {
     const appContext = await this.initAppContext();
 
     _serverPlugin.serverManager.run(() => {
+      var _options$config$outpu;
+
       _core.ConfigContext.set(this.options.config);
 
       _core.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-        distDirectory: _path.default.join(options.pwd, options.config.output.path || 'dist')
+        distDirectory: _path.default.join(options.pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist')
       }));
     });
 

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

@@ -71,9 +71,11 @@ class ModernServer {
     routes,
     staticGenerate,
     logger,
-    measure,
+    metrics,
     proxyTarget
   }) {
+    var _config$output;
+
     this.pwd = void 0;
     this.distDir = void 0;
     this.workDir = void 0;
@@ -83,26 +85,26 @@ 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;
     this.frameWebHandler = null;
     this.frameAPIHandler = null;
+    this.proxyHandler = null;
     this._handler = void 0;
     this.staticGenerate = false;
-    this.proxyHandler = null;
 
     require('ignore-styles');
 
     this.isDev = Boolean(dev);
     this.pwd = pwd;
-    this.distDir = _path.default.join(pwd, config.output.path || 'dist');
+    this.distDir = _path.default.join(pwd, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _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;
@@ -158,7 +160,7 @@ class ModernServer {
     const {
       favicon,
       faviconByEntries
-    } = this.conf.output;
+    } = 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.
 
@@ -348,7 +350,11 @@ class ModernServer {
   }
 
   async handleWeb(context, route) {
-    return this.routeRenderHandler(context, route);
+    return this.routeRenderHandler({
+      ctx: context,
+      route,
+      runner: this.runner
+    });
   }
 
   verifyMatch(_c, _m) {// empty
@@ -367,7 +373,7 @@ class ModernServer {
       context
     }); // match routes in the route spec
 
-    const matched = this.router.match(context.url);
+    const matched = this.router.match(context.path);
 
     if (!matched) {
       this.render404(context);
@@ -555,10 +561,9 @@ class ModernServer {
   requestHandler(req, res, next = () => {// empty
   }) {
     res.statusCode = 200;
-    const context = (0, _context.createContext)(req, res, {
-      logger: this.logger,
-      measure: this.measure
-    });
+    req.logger = req.logger || this.logger;
+    req.metrics = req.metrics || this.metrics;
+    const context = (0, _context.createContext)(req, res);
 
     try {
       this._handler(context, next);
@@ -590,7 +595,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);

package/dist/js/node/utils.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.applyMixins = applyMixins;
 exports.toMessage = exports.noop = exports.mergeExtension = exports.createErrorDocument = void 0;
 
 const mergeExtension = users => {
@@ -64,15 +63,6 @@ const createErrorDocument = (status, text) => {
   </body>
   </html>
   `;
-}; // This can live anywhere in your codebase:
-
-
-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));
-    });
-  });
-}
+exports.createErrorDocument = createErrorDocument;

package/dist/types/index.d.ts

@@ -1,10 +1,8 @@
 import { ModernServerOptions } from './type';
 import { Server } from './server';
-export * from './type';
-export * from './libs/context';
-export * from './libs/route';
 export type { SSRServerContext } from './libs/render/type';
 export { Server };
+export type { ModernServerOptions };
 
 declare const _default: (options: ModernServerOptions) => Promise<Server>;
 

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

@@ -1,8 +1,14 @@
+/// <reference path="../../type.d.ts" />
 /// <reference types="node" />
+/// <reference types="node/http" />
 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 type ContextOptions = {
+  logger?: Logger;
+  metrics?: Metrics;
+};
 export declare class ModernServerContext implements ModernServerContextInterface {
   /**
    * http request
@@ -19,18 +25,12 @@ export declare class ModernServerContext implements ModernServerContextInterface
 
   params: Record<string, string>;
   logger: Logger;
-  measure?: Measure;
-  constructor(req: IncomingMessage, res: ServerResponse, {
-    logger,
-    measure
-  }: {
-    logger: Logger;
-    measure: Measure;
-  });
+  metrics?: Metrics;
+  constructor(req: IncomingMessage, res: ServerResponse);
+  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,4 @@
 import { IncomingMessage, ServerResponse } from 'http';
-import { Measure, Logger } from '../../type';
 import { ModernServerContext } from './context';
-export declare const createContext: (req: IncomingMessage, res: ServerResponse, {
-  logger,
-  measure
-}: {
-  logger: Logger;
-  measure: Measure;
-}) => ModernServerContext;
+export declare const createContext: (req: IncomingMessage, res: ServerResponse) => 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/index.d.ts

@@ -11,4 +11,5 @@ export declare class RouteMatchManager {
   matchEntry(entryname: string): RouteMatcher | undefined;
   getBundles(): (string | undefined)[];
 }
-export type { ModernRouteInterface, RouteMatcher, ModernRoute };
+export type { ModernRouteInterface, ModernRoute };
+export { RouteMatcher };

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/modern-server.d.ts

@@ -2,7 +2,7 @@
 import { IncomingMessage, ServerResponse, Server } from 'http';
 import { Adapter, APIServerStartInput } from '@modern-js/server-plugin';
 import type { NormalizedConfig } from '@modern-js/core';
-import { ModernServerOptions, NextFunction, ServerHookRunner, Measure, Logger, ReadyOptions } from "../type.d";
+import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ReadyOptions } from "../type.d";
 import { RouteMatchManager, ModernRouteInterface, ModernRoute, RouteMatcher } from "../libs/route";
 import { mergeExtension } from "../utils.d";
 import { ModernServerContext } from "../libs/context";
@@ -19,16 +19,16 @@ export declare class ModernServer {
   protected presetRoutes?: ModernRouteInterface[];
   protected runner: ServerHookRunner;
   protected readonly logger: Logger;
-  protected readonly measure: Measure;
+  protected readonly metrics: Metrics;
   protected readonly proxyTarget: ModernServerOptions['proxyTarget'];
   private readonly isDev;
   private staticFileHandler;
   private routeRenderHandler;
   private frameWebHandler;
   private frameAPIHandler;
+  private proxyHandler;
   private _handler;
   private readonly staticGenerate;
-  private proxyHandler;
   constructor({
     pwd,
     config,
@@ -36,7 +36,7 @@ export declare class ModernServer {
     routes,
     staticGenerate,
     logger,
-    measure,
+    metrics,
     proxyTarget
   }: ModernServerOptions);
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;

package/dist/types/type.d.ts

@@ -2,8 +2,14 @@
 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 'http' {
+  interface IncomingMessage {
+    logger: Logger;
+    metrics: Metrics;
+  }
+}
 declare module '@modern-js/core' {
   interface UserConfig {
     bff: {
@@ -23,6 +29,7 @@ export declare type DevServerOptions = {
   dev: {
     writeToDisk: boolean | ((filename: string) => boolean);
   };
+  watch: boolean;
   hot: boolean | string;
   liveReload: boolean;
   https?: boolean | {
@@ -35,15 +42,15 @@ export declare type ModernServerOptions = {
   pwd: string;
   config: NormalizedConfig;
   plugins?: any[];
-  dev?: boolean | DevServerOptions;
+  dev?: boolean | Partial<DevServerOptions>;
   compiler?: Webpack.MultiCompiler | Webpack.Compiler;
   routes?: ModernRouteInterface[];
   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;
@@ -68,4 +75,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

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

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.4",
+  "version": "1.2.1-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -33,12 +33,12 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.1.4",
+    "@modern-js/core": "^1.2.0",
     "@modern-js/hmr-client": "^1.1.1",
-    "@modern-js/server-plugin": "^1.1.2",
+    "@modern-js/server-plugin": "^1.1.3",
     "@modern-js/server-utils": "^1.1.2",
     "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/utils": "^1.1.4",
+    "@modern-js/utils": "^1.1.5",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -61,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.3",
+    "@modern-js/module-tools": "^1.1.3",
+    "@modern-js/plugin-testing": "^1.2.0",
+    "@modern-js/types": "^1.1.4",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",
@@ -78,7 +78,9 @@
     "@types/webpack-dev-middleware": "^5.0.2",
     "@types/ws": "^7.4.7",
     "typescript": "^4",
-    "webpack": "^5.54.0"
+    "webpack": "^5.54.0",
+    "node-mocks-http": "^1.11.0",
+    "portfinder": "^1.0.28"
   },
   "peerDependencies": {
     "webpack": "^5.54.0"
@@ -97,7 +99,7 @@
     "new": "modern new",
     "build": "modern build",
     "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
+    "test": "modern test"
   },
   "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/src/index.ts

@@ -1,19 +1,13 @@
 import { ModernServerOptions } from './type';
-
 import { Server } from './server';
 
-export * from './type';
-export * from './libs/context';
-export * from './libs/route';
 export type { SSRServerContext } from './libs/render/type';
 export { Server };
+export type { ModernServerOptions };
 
 export default (options: ModernServerOptions): Promise<Server> => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const allowEnvs = ['production', 'development', 'test'];
-
   if (options == null) {
-    throw new Error();
+    throw new Error('can not start mserver without options');
   }
 
   const server = new Server(options);