@modern-js/prod-server 1.1.1 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @modern-js/prod-server
 
+## 1.1.4
+
+### Patch Changes
+
+- 69a728375: fix: remove exports.jsnext:source after publish
+- Updated dependencies [cd7346b0d]
+- Updated dependencies [69a728375]
+  - @modern-js/utils@1.7.2
+  - @modern-js/server-core@1.3.4
+
+## 1.1.3
+
+### Patch Changes
+
+- a4c5fe78: fix test case
+- 6fa74d5f: add internal metrics and logger
+- Updated dependencies [0ee4bb4e]
+- Updated dependencies [6fa74d5f]
+  - @modern-js/utils@1.7.0
+  - @modern-js/server-core@1.3.3
+
+## 1.1.2
+
+### Patch Changes
+
+- a0499e4f: fix: throw error in server config
+- 592edabc: feat: prebundle url-join,mime-types,json5,fast-glob,globby,ora,inquirer
+- 895fa0ff: chore: using "workspace:\*" in devDependencies
+- Updated dependencies [2d155c4c]
+- Updated dependencies [123e432d]
+- Updated dependencies [e5a9b26d]
+- Updated dependencies [0b26b93b]
+- Updated dependencies [123e432d]
+- Updated dependencies [f9f66ef9]
+- Updated dependencies [592edabc]
+- Updated dependencies [895fa0ff]
+- Updated dependencies [3578913e]
+- Updated dependencies [1c3beab3]
+  - @modern-js/utils@1.6.0
+  - @modern-js/server-core@1.3.2
+
 ## 1.1.1
 
 ### Patch Changes

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

@@ -1,6 +1,5 @@
 import { URL } from 'url';
 import qs from 'querystring';
-import { toMessage } from "../../utils";
 export class ModernServerContext {
   /**
    * http request
@@ -13,17 +12,21 @@ export class ModernServerContext {
   /**
    * url params
    */
+  get logger() {
+    return this.req.logger;
+  }
+
+  get metrics() {
+    return this.req.metrics;
+  }
+
   constructor(req, res) {
     this.req = void 0;
     this.res = void 0;
     this.params = {};
-    this.logger = void 0;
-    this.metrics = void 0;
     this.serverData = void 0;
     this.req = req;
     this.res = res;
-    this.logger = req.logger;
-    this.metrics = req.metrics;
     this.serverData = {};
     this.bind();
   }
@@ -118,7 +121,7 @@ export class ModernServerContext {
   }
 
   set path(p) {
-    const url = new URL(this.req.url, this.origin); // this should never happend
+    const url = new URL(this.req.url, this.origin); // this should never happened
 
     if (!url || !p) {
       return;
@@ -163,18 +166,8 @@ export class ModernServerContext {
     return this.res.writableEnded;
   }
 
-  logInfo() {
-    return {
-      headers: this.headers,
-      href: this.href,
-      url: this.url
-    };
-  }
-
-  error(dig, err = '') {
-    const message = toMessage(dig, err);
-    const reqInfo = this.logInfo();
-    this.logger.error(`${reqInfo.url} - ${message}`, reqInfo);
+  error(dig, e = '') {
+    this.logger.error(`Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, this.path, this.headers);
   }
 
 }

package/dist/js/modern/libs/loadConfig.js

@@ -7,19 +7,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import * as path from 'path';
 import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
 import mergeDeep from 'merge-deep';
-import { debug } from "../utils";
 export const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
   const serverConfigPath = path.join(distDirectory, serverConfigFile);
   return `${serverConfigPath}.js`;
 };
 export const requireConfig = serverConfigPath => {
   if (fs.pathExistsSync(serverConfigPath)) {
-    try {
-      return compatRequire(serverConfigPath);
-    } catch (error) {
-      debug(error);
-      return {};
-    }
+    return compatRequire(serverConfigPath);
   }
 
   return {};

package/dist/js/modern/libs/metrics.js

@@ -2,10 +2,10 @@ const metrics = {
   gauges() {// no impl
   },
 
-  counter() {// no impl
+  emitCounter() {// no impl
   },
 
-  timer() {// no impl
+  emitTimer() {// no impl
   }
 
 };

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

@@ -10,8 +10,8 @@ export const createProxyHandler = proxyOptions => {
   // or an object in the form of { source: ProxyDetail }
 
 
-  const formatedProxy = formatProxyOptions(proxyOptions);
-  const middlewares = formatedProxy.map(option => {
+  const formattedProxy = formatProxyOptions(proxyOptions);
+  const middlewares = formattedProxy.map(option => {
     const middleware = createProxyMiddleware(option.context, option); // eslint-disable-next-line consistent-return
 
     return async (ctx, next) => {

package/dist/js/modern/libs/render/cache/spr.js

@@ -3,7 +3,7 @@
 /* eslint-disable no-lone-blocks */
 import crypto from 'crypto';
 import LRUCache from 'lru-cache';
-import mime from 'mime-types';
+import { mime } from '@modern-js/utils';
 import { cacheAddition, connectFactor, fname, maybeSync, namespaceHash, valueFactory, withCoalescedInvoke } from "./util";
 import { createPageCaches } from "./page-caches";
 const MAX_CACHE_EACH_REQ = Number(process.env.ROUTE_CACHE_LIMIT) || 10;

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

@@ -1,6 +1,5 @@
 import path from 'path';
-import { fs } from '@modern-js/utils';
-import mime from 'mime-types';
+import { fs, mime } from '@modern-js/utils';
 import { ERROR_DIGEST } from "../../constants";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";

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

@@ -0,0 +1,59 @@
+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; }
+
+export const createMetrics = (context, metrics) => {
+  const {
+    entryName: entry,
+    request
+  } = context;
+  const {
+    pathname = ''
+  } = request || {};
+
+  const emitTimer = (name, cost, tags = {}) => {
+    metrics.emitTimer(name, cost, _objectSpread(_objectSpread({}, tags), {}, {
+      pathname,
+      entry
+    }));
+  };
+
+  const emitCounter = (name, counter, tags = {}) => {
+    metrics.emitCounter(name, counter, _objectSpread(_objectSpread({}, tags), {}, {
+      pathname,
+      entry
+    }));
+  };
+
+  return {
+    emitTimer,
+    emitCounter
+  };
+};
+export const createLogger = (serverContext, logger) => {
+  const request = serverContext.request || {};
+  const {
+    headers = {},
+    pathname = ''
+  } = request;
+
+  const debug = (message, ...args) => {
+    logger.debug(`SSR Debug - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const info = (message, ...args) => {
+    logger.info(`SSR Info - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const error = (message, e) => {
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headers);
+  };
+
+  return {
+    error,
+    info,
+    debug
+  };
+};

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

@@ -1,8 +1,8 @@
 import path from 'path';
-import { SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
-import mime from 'mime-types';
+import { mime, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
 import cookie from 'cookie';
 import cache from "./cache";
+import { createLogger, createMetrics } from "./measure";
 export const render = async (ctx, renderOptions, runner) => {
   const {
     urlPath,
@@ -29,9 +29,11 @@ export const render = async (ctx, renderOptions, runner) => {
     entryName,
     distDir,
     staticGenerate,
-    logger: ctx.logger,
-    metrics: ctx.metrics
+    logger: undefined,
+    metrics: undefined
   };
+  context.logger = createLogger(context, ctx.logger);
+  context.metrics = createMetrics(context, ctx.metrics);
   runner.extendSSRContext(context);
 
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];

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

@@ -1,5 +1,5 @@
 import path from 'path';
-import mime from 'mime-types';
+import { mime } from '@modern-js/utils';
 import { readFile } from "./reader";
 export async function handleDirectory(ctx, entryPath, urlPath) {
   const {

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

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import path from 'path';
 import { serverManager, AppContext, ConfigContext, loadPlugins } from '@modern-js/server-core';
-import { logger as defaultLogger, SHARED_DIR, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
+import { Logger, SHARED_DIR, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
 import { debug } from "../utils";
@@ -19,7 +19,9 @@ export class Server {
     this.app = void 0;
     this.runner = void 0;
     this.serverConfig = void 0;
-    options.logger = options.logger || defaultLogger;
+    options.logger = options.logger || new Logger({
+      level: 'warn'
+    });
     options.metrics = options.metrics || defaultMetrics;
     this.options = options;
     this.serverConfig = {};

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

@@ -10,9 +10,9 @@ class ModernSSRServer extends ModernServer {
     return routes.filter(route => route.isSSR);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 
@@ -33,9 +33,9 @@ class ModernAPIServer extends ModernServer {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 

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

@@ -14,10 +14,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { createServer } from 'http';
 import util from 'util';
 import path from 'path';
-import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
-import mime from 'mime-types';
+import { fs, mime, ROUTE_SPEC_FILE } from '@modern-js/utils';
 import axios from 'axios';
-import clone from 'lodash.clone';
+import { clone } from '@modern-js/utils/lodash';
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler } from "../libs/serve-file";
@@ -129,7 +128,7 @@ export class ModernServer {
       distDir,
       staticGenerate
     });
-    await this.preServerInit();
+    await this.setupBeforeProdMiddleware();
     this.addHandler(this.staticFileHandler);
     this.addHandler(this.routeHandler.bind(this)); // compose middlewares to http handler
 
@@ -194,7 +193,7 @@ export class ModernServer {
 
 
   render404(context) {
-    context.error(ERROR_DIGEST.ENOTF);
+    context.error(ERROR_DIGEST.ENOTF, '404 Not Found');
     this.renderErrorPage(context, 404);
   } // gather frame extension and get framework handler
 
@@ -277,12 +276,12 @@ export class ModernServer {
     });
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     const {
       conf,
       runner
     } = this;
-    const preMiddleware = await runner.preServerInit(conf);
+    const preMiddleware = await runner.beforeProdServer(conf);
     preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
     });
@@ -295,7 +294,7 @@ export class ModernServer {
     } = context;
 
     if (!this.frameAPIHandler) {
-      throw new Error('can not found api hanlder');
+      throw new Error('can not found api handler');
     }
 
     await this.frameAPIHandler(req, res);
@@ -526,8 +525,8 @@ export class ModernServer {
   requestHandler(req, res, next = () => {// empty
   }) {
     res.statusCode = 200;
-    req.logger = req.logger || this.logger;
-    req.metrics = req.metrics || this.metrics;
+    req.logger = this.logger;
+    req.metrics = this.metrics;
     const context = createContext(req, res);
 
     try {
@@ -556,7 +555,7 @@ export class ModernServer {
       const route = matched.generate(context.url);
       const {
         entryName
-      } = route; // check entryName, aviod matched '/' route
+      } = route; // check entryName, avoid matched '/' route
 
       if (entryName === status.toString() || entryName === '_error') {
         try {

package/dist/js/modern/utils.js

@@ -7,15 +7,6 @@ export const mergeExtension = users => {
     middleware: output.concat(users)
   };
 };
-export const toMessage = (dig, e) => {
-  const message = e instanceof Error ? e.message : e;
-
-  if (message) {
-    return `${dig}: ${message}`;
-  } else {
-    return dig;
-  }
-};
 export const noop = () => {// noop
 };
 export const createErrorDocument = (status, text) => {

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

@@ -9,8 +9,6 @@ var _url = require("url");
 
 var _querystring = _interopRequireDefault(require("querystring"));
 
-var _utils = require("../../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class ModernServerContext {
@@ -25,17 +23,21 @@ class ModernServerContext {
   /**
    * url params
    */
+  get logger() {
+    return this.req.logger;
+  }
+
+  get metrics() {
+    return this.req.metrics;
+  }
+
   constructor(req, res) {
     this.req = void 0;
     this.res = void 0;
     this.params = {};
-    this.logger = void 0;
-    this.metrics = void 0;
     this.serverData = void 0;
     this.req = req;
     this.res = res;
-    this.logger = req.logger;
-    this.metrics = req.metrics;
     this.serverData = {};
     this.bind();
   }
@@ -130,7 +132,7 @@ class ModernServerContext {
   }
 
   set path(p) {
-    const url = new _url.URL(this.req.url, this.origin); // this should never happend
+    const url = new _url.URL(this.req.url, this.origin); // this should never happened
 
     if (!url || !p) {
       return;
@@ -175,18 +177,8 @@ class ModernServerContext {
     return this.res.writableEnded;
   }
 
-  logInfo() {
-    return {
-      headers: this.headers,
-      href: this.href,
-      url: this.url
-    };
-  }
-
-  error(dig, err = '') {
-    const message = (0, _utils.toMessage)(dig, err);
-    const reqInfo = this.logInfo();
-    this.logger.error(`${reqInfo.url} - ${message}`, reqInfo);
+  error(dig, e = '') {
+    this.logger.error(`Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, this.path, this.headers);
   }
 
 }

package/dist/js/node/libs/loadConfig.js

@@ -11,8 +11,6 @@ var _utils = require("@modern-js/utils");
 
 var _mergeDeep = _interopRequireDefault(require("merge-deep"));
 
-var _utils2 = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -34,12 +32,7 @@ exports.getServerConfigPath = getServerConfigPath;
 
 const requireConfig = serverConfigPath => {
   if (_utils.fs.pathExistsSync(serverConfigPath)) {
-    try {
-      return (0, _utils.compatRequire)(serverConfigPath);
-    } catch (error) {
-      (0, _utils2.debug)(error);
-      return {};
-    }
+    return (0, _utils.compatRequire)(serverConfigPath);
   }
 
   return {};

package/dist/js/node/libs/metrics.js

@@ -8,10 +8,10 @@ const metrics = {
   gauges() {// no impl
   },
 
-  counter() {// no impl
+  emitCounter() {// no impl
   },
 
-  timer() {// no impl
+  emitTimer() {// no impl
   }
 
 };

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

@@ -20,8 +20,8 @@ const createProxyHandler = proxyOptions => {
   // or an object in the form of { source: ProxyDetail }
 
 
-  const formatedProxy = (0, _utils.formatProxyOptions)(proxyOptions);
-  const middlewares = formatedProxy.map(option => {
+  const formattedProxy = (0, _utils.formatProxyOptions)(proxyOptions);
+  const middlewares = formattedProxy.map(option => {
     const middleware = (0, _httpProxyMiddleware.createProxyMiddleware)(option.context, option); // eslint-disable-next-line consistent-return
 
     return async (ctx, next) => {

package/dist/js/node/libs/render/cache/spr.js

@@ -10,7 +10,7 @@ var _crypto = _interopRequireDefault(require("crypto"));
 
 var _lruCache = _interopRequireDefault(require("lru-cache"));
 
-var _mimeTypes = _interopRequireDefault(require("mime-types"));
+var _utils = require("@modern-js/utils");
 
 var _util = require("./util");
 
@@ -220,7 +220,7 @@ class CacheManager {
     const isGarbage = limitTime ? Date.now() - limitTime > 0 : false;
     return {
       content: html || '',
-      contentType: _mimeTypes.default.contentType('html'),
+      contentType: _utils.mime.contentType('html'),
       isStale,
       isGarbage,
       hash: cacheHash

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

@@ -9,8 +9,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _mimeTypes = _interopRequireDefault(require("mime-types"));
-
 var _constants = require("../../constants");
 
 var _static = require("./static");
@@ -84,7 +82,7 @@ const createRenderHandler = ({
 
   return {
     content,
-    contentType: _mimeTypes.default.contentType(_path.default.extname(templateHTML))
+    contentType: _utils.mime.contentType(_path.default.extname(templateHTML))
   };
 };
 

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

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createMetrics = exports.createLogger = void 0;
+
+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 createMetrics = (context, metrics) => {
+  const {
+    entryName: entry,
+    request
+  } = context;
+  const {
+    pathname = ''
+  } = request || {};
+
+  const emitTimer = (name, cost, tags = {}) => {
+    metrics.emitTimer(name, cost, _objectSpread(_objectSpread({}, tags), {}, {
+      pathname,
+      entry
+    }));
+  };
+
+  const emitCounter = (name, counter, tags = {}) => {
+    metrics.emitCounter(name, counter, _objectSpread(_objectSpread({}, tags), {}, {
+      pathname,
+      entry
+    }));
+  };
+
+  return {
+    emitTimer,
+    emitCounter
+  };
+};
+
+exports.createMetrics = createMetrics;
+
+const createLogger = (serverContext, logger) => {
+  const request = serverContext.request || {};
+  const {
+    headers = {},
+    pathname = ''
+  } = request;
+
+  const debug = (message, ...args) => {
+    logger.debug(`SSR Debug - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const info = (message, ...args) => {
+    logger.info(`SSR Info - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const error = (message, e) => {
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headers);
+  };
+
+  return {
+    error,
+    info,
+    debug
+  };
+};
+
+exports.createLogger = createLogger;

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

@@ -9,12 +9,12 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _mimeTypes = _interopRequireDefault(require("mime-types"));
-
 var _cookie = _interopRequireDefault(require("cookie"));
 
 var _cache = _interopRequireDefault(require("./cache"));
 
+var _measure = require("./measure");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const render = async (ctx, renderOptions, runner) => {
@@ -45,9 +45,11 @@ const render = async (ctx, renderOptions, runner) => {
     entryName,
     distDir,
     staticGenerate,
-    logger: ctx.logger,
-    metrics: ctx.metrics
+    logger: undefined,
+    metrics: undefined
   };
+  context.logger = (0, _measure.createLogger)(context, ctx.logger);
+  context.metrics = (0, _measure.createMetrics)(context, ctx.metrics);
   runner.extendSSRContext(context);
 
   const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];
@@ -69,7 +71,7 @@ const render = async (ctx, renderOptions, runner) => {
 
   return {
     content: html,
-    contentType: _mimeTypes.default.contentType('html')
+    contentType: _utils.mime.contentType('html')
   };
 };