@modern-js/prod-server 1.2.0 → 1.15.0

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @modern-js/prod-server
 
+## 1.15.0
+
+### Patch Changes
+
+- c087148: chore: remove cookie in error log
+  chore: 删除错误日志中的 cookie 信息
+- Updated dependencies [8658a78]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [ad05af9]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [37cd159]
+  - @modern-js/utils@1.15.0
+  - @modern-js/server-core@1.15.0
+
+## 1.2.2
+
+### Patch Changes
+
+- 0e28456: fix assets prefix bug in prod env
+- 44e3bb1: feat: support response headers
+  feat: 支持设置响应头
+  - @modern-js/server-core@1.4.1
+  - @modern-js/utils@1.8.0
+
+## 1.2.1
+
+### Patch Changes
+
+- 2ed8f7d: fix: the \_SERVER_DATA injection twice causes the prod-server route error.
+  fix: \_SERVER_DATA 二次注入，导致服务器路由错误
+- Updated dependencies [4fc801f]
+- Updated dependencies [c8614b8]
+  - @modern-js/utils@1.8.0
+  - @modern-js/server-core@1.4.1
+
 ## 1.2.0
 
 ### Minor Changes

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

@@ -2,6 +2,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { URL } from 'url';
 import qs from 'querystring';
+import { headersWithoutCookie } from "../../utils";
 export class ModernServerContext {
   /**
    * http request
@@ -173,7 +174,7 @@ export class ModernServerContext {
   }
 
   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);
+    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, headersWithoutCookie(this.headers));
   }
 
 }

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

@@ -4,6 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 { headersWithoutCookie } from "../../utils";
 export const createMetrics = (context, metrics) => {
   const {
     entryName: entry,
@@ -48,7 +49,7 @@ export const createLogger = (serverContext, logger) => {
   };
 
   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);
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headersWithoutCookie(headers));
   };
 
   return {

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

@@ -22,6 +22,8 @@ export class ModernRoute {
 
     _defineProperty(this, "params", {});
 
+    _defineProperty(this, "responseHeaders", void 0);
+
     this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
@@ -30,6 +32,7 @@ export class ModernRoute {
     this.isApi = routeSpec.isApi || false;
     this.bundle = routeSpec.bundle || '';
     this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
+    this.responseHeaders = routeSpec.responseHeaders;
   }
 
 }

package/dist/js/modern/libs/serve-file.js

@@ -1,13 +1,30 @@
 // Todo 看看是不是能 fork 一份，即使命中也返回
 import serve from 'serve-static';
 import { isString, isRegExp } from '@modern-js/utils';
-export const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
+import { useLocalPrefix } from "../utils";
+
+const removedPrefix = (req, prefix) => {
+  if (useLocalPrefix(prefix)) {
+    req.url = req.url.slice(prefix.length);
+    return () => {
+      req.url = prefix + req.url;
+    };
+  } else {
+    return () => {// emptyy
+    };
+  }
+};
+
+export const createStaticFileHandler = (rules, output = {}) => // eslint-disable-next-line consistent-return
 async (context, next) => {
   const {
     url: requestUrl,
     req,
     res
   } = context;
+  const {
+    assetPrefix = '/'
+  } = output;
   const hitRule = rules.find(item => {
     if (isString(item.path) && requestUrl.startsWith(item.path)) {
       return true;
@@ -19,7 +36,9 @@ async (context, next) => {
   });
 
   if (hitRule) {
+    const resume = removedPrefix(req, assetPrefix);
     serve(hitRule.target)(req, res, () => {
+      resume();
       next();
     });
   } else {

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

@@ -136,7 +136,7 @@ export class ModernServer {
     this.staticFileHandler = createStaticFileHandler([{
       path: staticPathRegExp,
       target: distDir
-    }]);
+    }], this.conf.output);
     this.routeRenderHandler = createRenderHandler({
       distDir,
       staticGenerate
@@ -415,6 +415,16 @@ export class ModernServer {
       return;
     }
 
+    if (route.responseHeaders) {
+      Object.keys(route.responseHeaders).forEach(key => {
+        const value = route.responseHeaders[key];
+
+        if (value) {
+          context.res.setHeader(key, value);
+        }
+      });
+    }
+
     if (route.entryName) {
       await this.emitRouteHook('beforeRender', {
         context
@@ -443,8 +453,12 @@ export class ModernServer {
         context,
         templateAPI
       });
-      await this.injectMicroFE(context, templateAPI);
-      templateAPI.appendHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
+      await this.injectMicroFE(context, templateAPI); // It will inject _SERVER_DATA twice, when SSG mode.
+      // The first time was in ssg html created, the seoncd time was in prod-server start.
+      // but the second wound causes route error.
+      // To ensure that the second injection fails, the _SERVER_DATA inject at the front of head,
+
+      templateAPI.prependHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
       response = templateAPI.get();
     }
 
@@ -537,7 +551,11 @@ export class ModernServer {
     this._handler = (context, next) => {
       let i = 0;
 
-      const dispatch = () => {
+      const dispatch = error => {
+        if (error) {
+          return this.onError(context, error);
+        }
+
         const handler = handlers[i++];
 
         if (!handler) {

package/dist/js/modern/utils.js

@@ -1,5 +1,11 @@
+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 { compile } from 'path-to-regexp';
-import { createDebugger } from '@modern-js/utils';
+import { createDebugger, isProd } from '@modern-js/utils';
 export const debug = createDebugger('prod-server');
 export const mergeExtension = users => {
   const output = [];
@@ -71,17 +77,25 @@ export const toPath = (reg, params) => {
   });
   return fn(params);
 };
+export const useLocalPrefix = url => {
+  return isProd() && !url.includes('.');
+};
 export const getStaticReg = (output = {}) => {
   const {
     favicon,
     faviconByEntries,
     cssPath,
     jsPath,
-    mediaPath
+    mediaPath,
+    assetPrefix = '/'
   } = output;
+  const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter(v => Boolean(v));
-  const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''}${staticFiles.length > 0 ? `|${staticFiles.join('|')}` : ''})`);
+  const staticReg = ['static/', 'upload/', ...staticFiles];
+  const iconReg = ['favicon.ico', 'icon.png', ...favicons];
+  const regPrefix = prefix === '/' ? '' : prefix;
+  const staticPathRegExp = new RegExp(`^${regPrefix}/(${[...staticReg, ...iconReg].join('|')})`);
   return staticPathRegExp;
 };
 export const prepareFavicons = (favicon, faviconByEntries) => {
@@ -102,4 +116,14 @@ export const prepareFavicons = (favicon, faviconByEntries) => {
   }
 
   return faviconNames;
+};
+export const headersWithoutCookie = headers => {
+  if (typeof headers.cookie !== 'undefined') {
+    const safeHeaders = _objectSpread({}, headers);
+
+    delete safeHeaders.cookie;
+    return safeHeaders;
+  }
+
+  return headers;
 };

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

@@ -9,6 +9,8 @@ var _url = require("url");
 
 var _querystring = _interopRequireDefault(require("querystring"));
 
+var _utils = require("../../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -184,7 +186,7 @@ class ModernServerContext {
   }
 
   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);
+    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, (0, _utils.headersWithoutCookie)(this.headers));
   }
 
 }

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createMetrics = exports.createLogger = void 0;
 
+var _utils = require("../../utils");
+
 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; }
@@ -58,7 +60,7 @@ const createLogger = (serverContext, logger) => {
   };
 
   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);
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, (0, _utils.headersWithoutCookie)(headers));
   };
 
   return {

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

@@ -29,6 +29,8 @@ class ModernRoute {
 
     _defineProperty(this, "params", {});
 
+    _defineProperty(this, "responseHeaders", void 0);
+
     this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
@@ -37,6 +39,7 @@ class ModernRoute {
     this.isApi = routeSpec.isApi || false;
     this.bundle = routeSpec.bundle || '';
     this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
+    this.responseHeaders = routeSpec.responseHeaders;
   }
 
 }

package/dist/js/node/libs/serve-file.js

@@ -9,16 +9,33 @@ var _serveStatic = _interopRequireDefault(require("serve-static"));
 
 var _utils = require("@modern-js/utils");
 
+var _utils2 = require("../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Todo 看看是不是能 fork 一份，即使命中也返回
-const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
+const removedPrefix = (req, prefix) => {
+  if ((0, _utils2.useLocalPrefix)(prefix)) {
+    req.url = req.url.slice(prefix.length);
+    return () => {
+      req.url = prefix + req.url;
+    };
+  } else {
+    return () => {// emptyy
+    };
+  }
+};
+
+const createStaticFileHandler = (rules, output = {}) => // eslint-disable-next-line consistent-return
 async (context, next) => {
   const {
     url: requestUrl,
     req,
     res
   } = context;
+  const {
+    assetPrefix = '/'
+  } = output;
   const hitRule = rules.find(item => {
     if ((0, _utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
       return true;
@@ -30,7 +47,9 @@ async (context, next) => {
   });
 
   if (hitRule) {
+    const resume = removedPrefix(req, assetPrefix);
     (0, _serveStatic.default)(hitRule.target)(req, res, () => {
+      resume();
       next();
     });
   } else {

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

@@ -165,7 +165,7 @@ class ModernServer {
     this.staticFileHandler = (0, _serveFile.createStaticFileHandler)([{
       path: staticPathRegExp,
       target: distDir
-    }]);
+    }], this.conf.output);
     this.routeRenderHandler = (0, _render.createRenderHandler)({
       distDir,
       staticGenerate
@@ -452,6 +452,16 @@ class ModernServer {
       return;
     }
 
+    if (route.responseHeaders) {
+      Object.keys(route.responseHeaders).forEach(key => {
+        const value = route.responseHeaders[key];
+
+        if (value) {
+          context.res.setHeader(key, value);
+        }
+      });
+    }
+
     if (route.entryName) {
       await this.emitRouteHook('beforeRender', {
         context
@@ -480,8 +490,12 @@ class ModernServer {
         context,
         templateAPI
       });
-      await this.injectMicroFE(context, templateAPI);
-      templateAPI.appendHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
+      await this.injectMicroFE(context, templateAPI); // It will inject _SERVER_DATA twice, when SSG mode.
+      // The first time was in ssg html created, the seoncd time was in prod-server start.
+      // but the second wound causes route error.
+      // To ensure that the second injection fails, the _SERVER_DATA inject at the front of head,
+
+      templateAPI.prependHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
       response = templateAPI.get();
     }
 
@@ -574,7 +588,11 @@ class ModernServer {
     this._handler = (context, next) => {
       let i = 0;
 
-      const dispatch = () => {
+      const dispatch = error => {
+        if (error) {
+          return this.onError(context, error);
+        }
+
         const handler = handlers[i++];
 
         if (!handler) {

package/dist/js/node/utils.js

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toPath = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.getStaticReg = exports.debug = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
+exports.useLocalPrefix = exports.toPath = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.headersWithoutCookie = exports.getStaticReg = exports.debug = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
 
 var _pathToRegexp = require("path-to-regexp");
 
 var _utils = require("@modern-js/utils");
 
+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 debug = (0, _utils.createDebugger)('prod-server');
 exports.debug = debug;
 
@@ -97,17 +103,28 @@ const toPath = (reg, params) => {
 
 exports.toPath = toPath;
 
+const useLocalPrefix = url => {
+  return (0, _utils.isProd)() && !url.includes('.');
+};
+
+exports.useLocalPrefix = useLocalPrefix;
+
 const getStaticReg = (output = {}) => {
   const {
     favicon,
     faviconByEntries,
     cssPath,
     jsPath,
-    mediaPath
+    mediaPath,
+    assetPrefix = '/'
   } = output;
+  const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter(v => Boolean(v));
-  const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''}${staticFiles.length > 0 ? `|${staticFiles.join('|')}` : ''})`);
+  const staticReg = ['static/', 'upload/', ...staticFiles];
+  const iconReg = ['favicon.ico', 'icon.png', ...favicons];
+  const regPrefix = prefix === '/' ? '' : prefix;
+  const staticPathRegExp = new RegExp(`^${regPrefix}/(${[...staticReg, ...iconReg].join('|')})`);
   return staticPathRegExp;
 };
 
@@ -133,4 +150,17 @@ const prepareFavicons = (favicon, faviconByEntries) => {
   return faviconNames;
 };
 
-exports.prepareFavicons = prepareFavicons;
+exports.prepareFavicons = prepareFavicons;
+
+const headersWithoutCookie = headers => {
+  if (typeof headers.cookie !== 'undefined') {
+    const safeHeaders = _objectSpread({}, headers);
+
+    delete safeHeaders.cookie;
+    return safeHeaders;
+  }
+
+  return headers;
+};
+
+exports.headersWithoutCookie = headersWithoutCookie;

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

@@ -10,5 +10,6 @@ export declare class ModernRoute implements ModernRouteInterface {
   isSPA: boolean;
   enableModernMode?: boolean;
   params: Record<string, any>;
+  responseHeaders?: Record<string, any>;
   constructor(routeSpec: ModernRouteInterface);
 }

package/dist/types/libs/serve-file.d.ts

@@ -1,8 +1,9 @@
+import { NormalizedConfig } from '@modern-js/core';
 import { NextFunction } from '../type';
 import { ModernServerContext } from './context';
 declare type Rule = {
   path: string | RegExp;
   target: string;
 };
-export declare const createStaticFileHandler: (rules: Rule[]) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
+export declare const createStaticFileHandler: (rules: Rule[], output?: NormalizedConfig['output']) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export {};

package/dist/types/utils.d.ts

@@ -1,3 +1,7 @@
+/// <reference path="type.d.ts" />
+/// <reference types="node" />
+/// <reference types="node/http" />
+import { IncomingMessage } from 'http';
 import type { NormalizedConfig } from '@modern-js/core';
 export declare const debug: any;
 export declare const mergeExtension: (users: any[]) => {
@@ -15,5 +19,7 @@ export declare const createMiddlewareCollecter: () => {
   addAPIMiddleware: (input: any) => void;
 };
 export declare const toPath: (reg: string, params: Record<string, any>) => string;
+export declare const useLocalPrefix: (url: string) => boolean;
 export declare const getStaticReg: (output?: NormalizedConfig['output']) => RegExp;
-export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];
+export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];
+export declare const headersWithoutCookie: (headers: IncomingMessage['headers']) => import("http").IncomingHttpHeaders;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.0",
+  "version": "1.15.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,9 +28,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "^1.7.12",
+    "@modern-js/utils": "1.15.0",
     "@babel/compat-data": "^7.17.10",
-    "@modern-js/server-core": "^1.4.1",
+    "@modern-js/server-core": "1.15.0",
     "axios": "^0.24.0",
     "compare-versions": "^3.6.0",
     "cookie": "^0.4.2",
@@ -43,10 +43,10 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.6.0",
-    "@modern-js/core": "1.13.0",
-    "@scripts/jest-config": "0.0.0",
-    "@scripts/build": "0.0.0",
+    "@modern-js/types": "1.15.0",
+    "@modern-js/core": "1.15.0",
+    "@scripts/jest-config": "1.15.0",
+    "@scripts/build": "1.15.0",
     "@types/cookie": "^0.4.1",
     "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",