@modern-js/prod-server 1.21.2 → 2.0.0-beta.0

package/dist/js/node/libs/hook-api/template.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createTemplateAPI = void 0;
+exports.templateInjectableStream = exports.TemplateAPI = void 0;
+
+var _stream = require("stream");
 
 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; }
 
@@ -63,11 +65,53 @@ class TemplateAPI {
 
   replace(reg, text) {
     this.content = this.content.replace(reg, text);
-    return this;
   }
 
 }
 
-const createTemplateAPI = content => new TemplateAPI(content);
+exports.TemplateAPI = TemplateAPI;
+
+const templateInjectableStream = ({
+  prependHead,
+  appendHead,
+  prependBody,
+  appendBody
+}) => new _stream.Transform({
+  write(chunk, _, callback) {
+    let chunk_str = chunk.toString();
+
+    if (prependHead) {
+      const {
+        head
+      } = RegList.before;
+      chunk_str = chunk_str.replace(head, `${head}${prependHead}`);
+    }
+
+    if (appendHead) {
+      const {
+        head
+      } = RegList.after;
+      chunk_str = chunk_str.replace(head, `${appendHead}${head}`);
+    }
+
+    if (prependBody) {
+      const {
+        body
+      } = RegList.before;
+      chunk_str = chunk_str.replace(body, `${body}${prependBody}`);
+    }
+
+    if (appendBody) {
+      const {
+        body
+      } = RegList.after;
+      chunk_str = chunk_str.replace(body, `${appendBody}${body}`);
+    }
+
+    this.push(chunk_str);
+    callback();
+  }
+
+});
 
-exports.createTemplateAPI = createTemplateAPI;
+exports.templateInjectableStream = templateInjectableStream;

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _stream = require("stream");
+
 var _constants = require("../../../constants");
 
 var _spr = require("./spr");
@@ -25,10 +27,28 @@ var _default = (renderFn, ctx) => {
       entry: context.entryName
     }, context.request);
 
-    const cacheFile = await sprCache.get(cacheContext); // no cache, render sync
+    const cacheFile = await sprCache.get(cacheContext);
+
+    async function afterRender(source, onAfterRender) {
+      if (typeof source === 'string') {
+        await onAfterRender(source);
+        return source;
+      } else {
+        let htmlForStream = '';
+        const cacheStream = new _stream.Transform({
+          write(chunk, _, callback) {
+            htmlForStream += chunk.toString();
+            this.push(chunk);
+            callback();
+          }
 
-    if (!cacheFile) {
-      const html = await renderFn(context);
+        });
+        cacheStream.on('close', () => onAfterRender(htmlForStream));
+        return source(cacheStream);
+      }
+    }
+
+    async function saveHtmlIntoCache(html) {
       const {
         cacheConfig
       } = context;
@@ -36,34 +56,32 @@ var _default = (renderFn, ctx) => {
       if (html && cacheConfig) {
         await sprCache.set(cacheContext, html, cacheConfig);
       }
+    } // no cache, render sync
 
-      return html;
+
+    if (!cacheFile) {
+      const renderResult = await renderFn(context);
+      return afterRender(renderResult, saveHtmlIntoCache);
     }
 
     const cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash; // completely expired
 
     if (cacheFile.isGarbage) {
-      const html = await renderFn(context);
-      const {
-        cacheConfig
-      } = context;
-
-      if (html && cacheConfig) {
-        await sprCache.set(cacheContext, html, cacheConfig);
-      }
-
-      return html;
+      const renderResult = await renderFn(context);
+      return afterRender(renderResult, saveHtmlIntoCache);
     } else if (cacheFile.isStale) {
       // if file is stale, request async
       const render = (0, _util.withCoalescedInvoke)(() => renderFn(context)).bind(null, (0, _util.namespaceHash)('render', cacheFile.hash), []);
-      render().then(res => {
+      render().then(async res => {
         if (res.value && res.isOrigin) {
           const {
             cacheConfig
           } = context;
 
           if (cacheConfig) {
-            sprCache.set(cacheContext, res.value, cacheConfig);
+            afterRender(res.value, async html => {
+              sprCache.set(cacheContext, html, cacheConfig);
+            });
           } else {
             sprCache.del(cacheContext, cacheHash);
           }

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

@@ -60,6 +60,11 @@ const createLogger = (serverContext, logger) => {
   };
 
   const error = (message, e) => {
+    if (!e) {
+      e = message;
+      message = '';
+    }
+
     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));
   };
 
@@ -69,5 +74,7 @@ const createLogger = (serverContext, logger) => {
     debug
   };
 };
+/* eslint-enable no-param-reassign */
+
 
 exports.createLogger = createLogger;

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

@@ -18,6 +18,8 @@ var _measure = require("./measure");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const render = async (ctx, renderOptions, runner) => {
+  var _ctx$res;
+
   const {
     urlPath,
     bundle,
@@ -49,7 +51,8 @@ const render = async (ctx, renderOptions, runner) => {
       },
       status: code => {
         ctx.res.statusCode = code;
-      }
+      },
+      locals: ((_ctx$res = ctx.res) === null || _ctx$res === void 0 ? void 0 : _ctx$res.locals) || {}
     },
     redirection: {},
     template,
@@ -57,7 +60,9 @@ const render = async (ctx, renderOptions, runner) => {
     entryName,
     staticGenerate,
     logger: undefined,
-    metrics: undefined
+    metrics: undefined,
+    req: ctx.req,
+    res: ctx.res
   };
   context.logger = (0, _measure.createLogger)(context, ctx.logger);
   context.metrics = (0, _measure.createMetrics)(context, ctx.metrics);
@@ -65,7 +70,7 @@ const render = async (ctx, renderOptions, runner) => {
 
   const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];
 
-  const html = await (0, _cache.default)(serverRender, ctx)(context);
+  const content = await (0, _cache.default)(serverRender, ctx)(context);
   const {
     url,
     status = 302
@@ -80,10 +85,18 @@ const render = async (ctx, renderOptions, runner) => {
     };
   }
 
-  return {
-    content: html,
-    contentType: _utils.mime.contentType('html')
-  };
+  if (typeof content === 'string') {
+    return {
+      content,
+      contentType: _utils.mime.contentType('html')
+    };
+  } else {
+    return {
+      content: '',
+      contentStream: content,
+      contentType: _utils.mime.contentType('html')
+    };
+  }
 };
 
 exports.render = render;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createStaticFileHandler = void 0;
+exports.faviconFallbackHandler = exports.createStaticFileHandler = void 0;
 
 var _serveStatic = _interopRequireDefault(require("serve-static"));
 
@@ -26,6 +26,17 @@ const removedPrefix = (req, prefix) => {
   }
 };
 
+const faviconFallbackHandler = (context, next) => {
+  if (context.url === '/favicon.ico') {
+    context.res.statusCode = 204;
+    context.res.end();
+  } else {
+    next();
+  }
+};
+
+exports.faviconFallbackHandler = faviconFallbackHandler;
+
 const createStaticFileHandler = (rules, output = {}) => // eslint-disable-next-line consistent-return
 async (context, next) => {
   const {

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

@@ -167,6 +167,10 @@ class Server {
     };
   }
 
+  async render(req, res, url) {
+    return this.server.render(req, res, url);
+  }
+
   async createHookRunner() {
     // clear server manager every create time
     _serverCore.serverManager.clear();
@@ -176,13 +180,15 @@ class Server {
     } = this; // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
 
     const {
-      plugins = [],
+      internalPlugins = _utils.INTERNAL_SERVER_PLUGINS,
       pwd,
       config
     } = options;
     const serverPlugins = this.serverConfig.plugins || []; // server app context for serve plugin
 
-    const loadedPlugins = (0, _serverCore.loadPlugins)(plugins.concat(serverPlugins), pwd);
+    const loadedPlugins = (0, _serverCore.loadPlugins)(pwd, serverPlugins, {
+      internalPlugins
+    });
     (0, _utils2.debug)('plugins', config.plugins, loadedPlugins);
     loadedPlugins.forEach(p => {
       _serverCore.serverManager.usePlugin(p);

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createProdServer = void 0;
 
-var _constants = require("../constants");
-
 var _modernServer = require("./modern-server");
 
 class ModernSSRServer extends _modernServer.ModernServer {
@@ -14,20 +12,8 @@ class ModernSSRServer extends _modernServer.ModernServer {
     return null;
   }
 
-  filterRoutes(routes) {
-    return routes.filter(route => !route.isApi);
-  }
-
-  async setupBeforeProdMiddleware() {
-    if (this.runMode === _constants.RUN_MODE.FULL) {
-      await super.setupBeforeProdMiddleware();
-    }
-  }
-
-  async emitRouteHook(_, _input) {
-    if (this.runMode === _constants.RUN_MODE.FULL) {
-      await super.emitRouteHook(_, _input);
-    }
+  async handleAPI(context) {
+    return this.render404(context);
   }
 
 }
@@ -41,15 +27,6 @@ class ModernAPIServer extends _modernServer.ModernServer {
     return routes.filter(route => route.isApi);
   }
 
-  async setupBeforeProdMiddleware() {
-    if (this.runMode === _constants.RUN_MODE.FULL) {
-      await super.setupBeforeProdMiddleware();
-    }
-  }
-
-  async emitRouteHook(_, _input) {// empty
-  }
-
 }
 
 class ModernWebServer extends _modernServer.ModernServer {
@@ -58,29 +35,12 @@ class ModernWebServer extends _modernServer.ModernServer {
   }
 
   async handleAPI(context) {
-    const {
-      proxyTarget
-    } = this;
-
-    if (proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.api) {
-      return this.proxy();
-    } else {
-      return this.render404(context);
-    }
+    return 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);
-    }
+    route.isSSR = false;
+    return super.handleWeb(context, route);
   }
 
 }