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

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/server
 
+## 1.2.0
+
+### Minor Changes
+
+- 5a4c557e: feat: support bff test
+
+### Patch Changes
+
+- e04914ce: add route types, fix metrics types
+- e04914ce: add route types, fix metrics types
+- Updated dependencies [90eeb72c]
+- Updated dependencies [e04914ce]
+- Updated dependencies [5a4c557e]
+- Updated dependencies [e04914ce]
+- Updated dependencies [ca7dcb32]
+- Updated dependencies [ecb344dc]
+  - @modern-js/core@1.2.0
+  - @modern-js/server-plugin@1.1.3
+  - @modern-js/utils@1.1.5
+
 ## 1.1.4
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -1,14 +1,8 @@
 import { Server } from "./server";
-export * from "./type";
-export * from "./libs/context";
-export * from "./libs/route";
 export { Server };
 export default (options => {
-  // 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);

package/dist/js/modern/libs/context/context.js

@@ -13,19 +13,28 @@ export class ModernServerContext {
   /**
    * url params
    */
-  constructor(req, res, {
-    logger,
-    measure
-  }) {
+  constructor(req, res) {
     this.req = void 0;
     this.res = void 0;
     this.params = {};
     this.logger = void 0;
-    this.measure = void 0;
+    this.metrics = void 0;
     this.req = req;
     this.res = res;
-    this.logger = logger;
-    this.measure = measure;
+    this.logger = req.logger;
+    this.metrics = req.metrics;
+    this.bind();
+  }
+
+  bind() {
+    const {
+      req,
+      res
+    } = this;
+
+    req.get = key => this.getReqHeader(key);
+
+    res.set = (key, value) => this.res.setHeader(key, value);
   }
 
   setParams(params) {
@@ -54,10 +63,6 @@ export class ModernServerContext {
     return this.req.headers;
   }
 
-  set headers(val) {
-    this.req.headers = val;
-  }
-
   get method() {
     return this.req.method;
   }

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

@@ -1,9 +1,3 @@
 import { ModernServerContext } from "./context";
-export const createContext = (req, res, {
-  logger,
-  measure
-}) => new ModernServerContext(req, res, {
-  logger,
-  measure
-});
+export const createContext = (req, res) => new ModernServerContext(req, res);
 export { ModernServerContext };

package/dist/js/modern/libs/{measure.js → metrics.js}

@@ -1,4 +1,4 @@
-const measure = {
+const metrics = {
   gauges() {// no impl
   },
 
@@ -9,4 +9,4 @@ const measure = {
   }
 
 };
-export { measure };
+export { metrics };

package/dist/js/modern/libs/proxy.js

@@ -31,7 +31,7 @@ export const createProxyHandler = proxyOptions => {
       }, []));
     }
   } else {
-    formatedProxy.concat(proxyOptions);
+    formatedProxy.push(...proxyOptions);
   }
 
   const middlewares = formatedProxy.map(option => {

package/dist/js/modern/libs/render/cache/__tests__/cache.test.js

@@ -19,6 +19,7 @@ const createCacheConfig = (config = {}) => _objectSpread({
   matches: null
 }, config);
 
+jest.setTimeout(60000);
 describe('cache', () => {
   it('should cache correctly', async () => {
     destroyCache();
@@ -178,7 +179,6 @@ describe('cache', () => {
       }
     }
   });
-  jest.setTimeout(1000 * 10);
   it('should stale cache correctly', async () => {
     destroyCache();
     const cache = createCache();
@@ -204,7 +204,6 @@ describe('cache', () => {
     const staleResult = await cache.get(context);
     expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isStale).toBe(true);
   });
-  jest.setTimeout(1000 * 15);
   it('should garbage cache correctly', async () => {
     destroyCache();
     const cache = createCache();

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

@@ -9,7 +9,11 @@ import { ERROR_DIGEST } from "../../constants";
 export const createRenderHandler = ({
   distDir,
   staticGenerate
-}) => async function render(ctx, route) {
+}) => async function render({
+  ctx,
+  route,
+  runner
+}) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -39,7 +43,7 @@ export const createRenderHandler = ({
         bundle: route.bundle,
         template: templateHTML,
         staticGenerate
-      });
+      }, runner);
       return result;
     } catch (err) {
       ctx.error(ERROR_DIGEST.ERENDER, err.stack);

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

@@ -15,9 +15,9 @@ const createCacheItem = async (filepath, mtime) => {
 };
 
 class LruReader {
+  // private timer?: NodeJS.Timeout;
   constructor() {
     this.cache = void 0;
-    this.timer = void 0;
     this.cache = new LRU({
       max: 256 * MB,
       length: getContentLength,
@@ -26,14 +26,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) {
@@ -92,11 +90,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/modern/libs/render/ssr.js

@@ -2,7 +2,7 @@ import path from 'path';
 import { SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
 import mime from 'mime-types';
 import cache from "./cache";
-export const render = async (ctx, renderOptions) => {
+export const render = async (ctx, renderOptions, runner) => {
   const {
     bundle,
     distDir,
@@ -25,8 +25,9 @@ export const render = async (ctx, renderOptions) => {
     distDir,
     staticGenerate,
     logger: ctx.logger,
-    measure: ctx.measure
+    metrics: ctx.metrics
   };
+  runner.extendSSRContext(context);
 
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
 

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

@@ -65,4 +65,5 @@ export class RouteMatchManager {
     return bundles;
   }
 
-}
+}
+export { RouteMatcher };

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

@@ -10,7 +10,7 @@ export 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/modern/server/dev-server/dev-server.js

@@ -1,3 +1,9 @@
+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; }
+
 import { createServer } from 'http';
 import path from 'path';
 import { createServer as createHttpsServer } from 'https';
@@ -25,6 +31,7 @@ const DEFAULT_DEV_OPTIONS = {
   dev: {
     writeToDisk: true
   },
+  watch: true,
   hot: true,
   liveReload: true
 };
@@ -41,7 +48,7 @@ export class ModernDevServer extends 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);
     enableRegister(this.pwd, this.conf);
   } // Complete the preparation of services
 
@@ -90,7 +97,9 @@ export class ModernDevServer extends 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/modern/server/index.js

@@ -10,7 +10,7 @@ import { logger as defaultLogger } from '@modern-js/utils';
 import { AppContext, initAppContext, initAppDir, loadUserConfig, ConfigContext } from '@modern-js/core';
 import { ModernServer } from "./modern-server";
 import { ModernAPIServer, ModernSSRServer, ModernWebServer } from "./modern-server-split";
-import { measure as defaultMeasure } from "../libs/measure";
+import { metrics as defaultMetrics } from "../libs/metrics";
 export class Server {
   constructor(options) {
     this.options = void 0;
@@ -36,7 +36,7 @@ export class Server {
       options
     } = this;
     options.logger = options.logger || defaultLogger;
-    options.measure = options.measure || defaultMeasure; // initialize server
+    options.metrics = options.metrics || defaultMetrics; // initialize server
 
     if (options.dev) {
       this.server = this.createDevServer();
@@ -120,9 +120,11 @@ export class Server {
     });
     const appContext = await this.initAppContext();
     serverManager.run(() => {
+      var _options$config$outpu;
+
       ConfigContext.set(this.options.config);
       AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-        distDirectory: path.join(options.pwd, options.config.output.path || 'dist')
+        distDirectory: path.join(options.pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist')
       }));
     });
     return serverManager.init({});

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

@@ -41,9 +41,11 @@ export class ModernServer {
     routes,
     staticGenerate,
     logger,
-    measure,
+    metrics,
     proxyTarget
   }) {
+    var _config$output;
+
     this.pwd = void 0;
     this.distDir = void 0;
     this.workDir = void 0;
@@ -53,26 +55,26 @@ export 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.join(pwd, config.output.path || 'dist');
+    this.distDir = path.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 RouteMatchManager();
     this.presetRoutes = routes;
     this.proxyTarget = proxyTarget;
@@ -128,7 +130,7 @@ export 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.
 
@@ -313,7 +315,11 @@ export class ModernServer {
   }
 
   async handleWeb(context, route) {
-    return this.routeRenderHandler(context, route);
+    return this.routeRenderHandler({
+      ctx: context,
+      route,
+      runner: this.runner
+    });
   }
 
   verifyMatch(_c, _m) {// empty
@@ -332,7 +338,7 @@ export 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);
@@ -520,10 +526,9 @@ export class ModernServer {
   requestHandler(req, res, next = () => {// empty
   }) {
     res.statusCode = 200;
-    const context = createContext(req, res, {
-      logger: this.logger,
-      measure: this.measure
-    });
+    req.logger = req.logger || this.logger;
+    req.metrics = req.metrics || this.metrics;
+    const context = createContext(req, res);
 
     try {
       this._handler(context, next);
@@ -555,7 +560,11 @@ export 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/modern/utils.js

@@ -47,12 +47,4 @@ export const createErrorDocument = (status, text) => {
   </body>
   </html>
   `;
-}; // This can live anywhere in your codebase:
-
-export 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/js/node/index.js

@@ -3,9 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  Server: true
-};
 Object.defineProperty(exports, "Server", {
   enumerable: true,
   get: function () {
@@ -16,54 +13,9 @@ exports.default = void 0;
 
 var _server = require("./server");
 
-var _type = require("./type");
-
-Object.keys(_type).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _type[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _type[key];
-    }
-  });
-});
-
-var _context = require("./libs/context");
-
-Object.keys(_context).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _context[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _context[key];
-    }
-  });
-});
-
-var _route = require("./libs/route");
-
-Object.keys(_route).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _route[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _route[key];
-    }
-  });
-});
-
 var _default = options => {
-  // 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.Server(options);

package/dist/js/node/libs/context/context.js

@@ -25,19 +25,28 @@ class ModernServerContext {
   /**
    * url params
    */
-  constructor(req, res, {
-    logger,
-    measure
-  }) {
+  constructor(req, res) {
     this.req = void 0;
     this.res = void 0;
     this.params = {};
     this.logger = void 0;
-    this.measure = void 0;
+    this.metrics = void 0;
     this.req = req;
     this.res = res;
-    this.logger = logger;
-    this.measure = measure;
+    this.logger = req.logger;
+    this.metrics = req.metrics;
+    this.bind();
+  }
+
+  bind() {
+    const {
+      req,
+      res
+    } = this;
+
+    req.get = key => this.getReqHeader(key);
+
+    res.set = (key, value) => this.res.setHeader(key, value);
   }
 
   setParams(params) {
@@ -66,10 +75,6 @@ class ModernServerContext {
     return this.req.headers;
   }
 
-  set headers(val) {
-    this.req.headers = val;
-  }
-
   get method() {
     return this.req.method;
   }

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

@@ -13,12 +13,6 @@ exports.createContext = void 0;
 
 var _context = require("./context");
 
-const createContext = (req, res, {
-  logger,
-  measure
-}) => new _context.ModernServerContext(req, res, {
-  logger,
-  measure
-});
+const createContext = (req, res) => new _context.ModernServerContext(req, res);
 
 exports.createContext = createContext;

package/dist/js/node/libs/{measure.js → metrics.js}

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.measure = void 0;
-const measure = {
+exports.metrics = void 0;
+const metrics = {
   gauges() {// no impl
   },
 
@@ -15,4 +15,4 @@ const measure = {
   }
 
 };
-exports.measure = measure;
+exports.metrics = metrics;

package/dist/js/node/libs/proxy.js

@@ -39,7 +39,7 @@ const createProxyHandler = proxyOptions => {
       }, []));
     }
   } else {
-    formatedProxy.concat(proxyOptions);
+    formatedProxy.push(...proxyOptions);
   }
 
   const middlewares = formatedProxy.map(option => {

package/dist/js/node/libs/render/cache/__tests__/cache.test.js

@@ -24,6 +24,7 @@ const createCacheConfig = (config = {}) => _objectSpread({
   matches: null
 }, config);
 
+jest.setTimeout(60000);
 describe('cache', () => {
   it('should cache correctly', async () => {
     (0, _spr.destroyCache)();
@@ -183,7 +184,6 @@ describe('cache', () => {
       }
     }
   });
-  jest.setTimeout(1000 * 10);
   it('should stale cache correctly', async () => {
     (0, _spr.destroyCache)();
     const cache = (0, _spr.createCache)();
@@ -209,7 +209,6 @@ describe('cache', () => {
     const staleResult = await cache.get(context);
     expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isStale).toBe(true);
   });
-  jest.setTimeout(1000 * 15);
   it('should garbage cache correctly', async () => {
     (0, _spr.destroyCache)();
     const cache = (0, _spr.createCache)();

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

@@ -30,7 +30,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const createRenderHandler = ({
   distDir,
   staticGenerate
-}) => async function render(ctx, route) {
+}) => async function render({
+  ctx,
+  route,
+  runner
+}) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -63,7 +67,7 @@ const createRenderHandler = ({
         bundle: route.bundle,
         template: templateHTML,
         staticGenerate
-      });
+      }, runner);
       return result;
     } catch (err) {
       ctx.error(_constants.ERROR_DIGEST.ERENDER, err.stack);