@modern-js/prod-server 2.21.0 → 2.22.0

package/dist/cjs/libs/render/cache/util.js

@@ -10,14 +10,30 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  namespaceHash: () => namespaceHash,
-  fname: () => fname,
-  connectFactor: () => connectFactor,
-  valueFactory: () => valueFactory,
-  getTime: () => getTime,
-  cacheAddition: () => cacheAddition,
-  withCoalescedInvoke: () => withCoalescedInvoke,
-  maybeSync: () => maybeSync
+  namespaceHash: function() {
+    return namespaceHash;
+  },
+  fname: function() {
+    return fname;
+  },
+  connectFactor: function() {
+    return connectFactor;
+  },
+  valueFactory: function() {
+    return valueFactory;
+  },
+  getTime: function() {
+    return getTime;
+  },
+  cacheAddition: function() {
+    return cacheAddition;
+  },
+  withCoalescedInvoke: function() {
+    return withCoalescedInvoke;
+  },
+  maybeSync: function() {
+    return maybeSync;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _url = /* @__PURE__ */ _interop_require_default._(require("url"));

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createRenderHandler", {
   enumerable: true,
-  get: () => createRenderHandler
+  get: function() {
+    return createRenderHandler;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
@@ -26,9 +28,6 @@ const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce }) => as
     return result;
   }
   const templatePath = entry;
-  if (!_utils.fs.existsSync(templatePath)) {
-    throw new Error(`Could not find template file: ${templatePath}`);
-  }
   const content = await (0, _reader.readFile)(templatePath);
   if (!content) {
     return null;

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

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  createMetrics: () => createMetrics,
-  createLogger: () => createLogger
+  createMetrics: function() {
+    return createMetrics;
+  },
+  createLogger: function() {
+    return createLogger;
+  }
 });
 const _utils = require("../../utils");
 const createMetrics = (context, metrics) => {

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

@@ -10,11 +10,21 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  LruReader: () => LruReader,
-  readFile: () => readFile,
-  updateFile: () => updateFile,
-  init: () => init,
-  close: () => close
+  LruReader: function() {
+    return LruReader;
+  },
+  readFile: function() {
+    return readFile;
+  },
+  updateFile: function() {
+    return updateFile;
+  },
+  init: function() {
+    return init;
+  },
+  close: function() {
+    return close;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
@@ -24,49 +34,51 @@ const Byte = 1;
 const KB = 1024 * Byte;
 const MB = 1024 * KB;
 const getContentLength = (cache) => cache.content.length;
-const createCacheItem = async (filepath, mtime) => {
-  const content = await _utils.fs.readFile(filepath);
+const createCacheItem = async (content, mtime) => {
   return {
     content,
     mtime
   };
 };
 class LruReader {
-  init() {
+  init(fs) {
+    this.fs = fs || _utils.fs;
   }
   close() {
   }
   async read(filepath) {
+    const { fs } = this;
     if (this.cache.has(filepath)) {
-      const { content } = this.cache.get(filepath);
+      const { content: content2 } = this.cache.get(filepath);
       return {
-        content
+        content: content2
       };
     }
-    if (!_utils.fs.existsSync(filepath)) {
+    if (!fs.existsSync(filepath)) {
       return null;
     }
-    const stat = _utils.fs.statSync(filepath);
+    const stat = fs.statSync(filepath);
     if (stat.isDirectory()) {
       return null;
     }
     if (stat.size > 20 * MB) {
       return null;
     }
-    const item = await createCacheItem(filepath, stat.mtime);
+    const content = await fs.promises.readFile(filepath);
+    const item = await createCacheItem(content, stat.mtime);
     this.cache.set(filepath, item);
     return item;
   }
   update() {
-    const { cache } = this;
+    const { cache, fs } = this;
     const files = cache.keys();
     for (const filepath of files) {
-      if (!_utils.fs.existsSync(filepath)) {
+      if (!fs.existsSync(filepath)) {
         cache.del(filepath);
       }
       try {
         const item = cache.get(filepath);
-        const stat = _utils.fs.statSync(filepath);
+        const stat = fs.statSync(filepath);
         const { mtime } = stat;
         if (item.mtime < mtime) {
           cache.del(filepath);
@@ -76,14 +88,15 @@ class LruReader {
       }
     }
   }
-  // private timer?: NodeJS.Timeout;
   constructor() {
     _define_property._(this, "cache", void 0);
+    _define_property._(this, "fs", void 0);
     this.cache = new _lrucache.default({
       max: 256 * MB,
       length: getContentLength,
       maxAge: 5 * 60 * 5e3
     });
+    this.fs = _utils.fs;
   }
 }
 const reader = new LruReader();
@@ -94,8 +107,8 @@ const readFile = async (filepath) => {
 const updateFile = () => {
   reader.update();
 };
-const init = () => {
-  reader.init();
+const init = (fs) => {
+  reader.init(fs);
 };
 const close = () => {
   reader.close();

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "render", {
   enumerable: true,
-  get: () => render
+  get: function() {
+    return render;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "handleDirectory", {
   enumerable: true,
-  get: () => handleDirectory
+  get: function() {
+    return handleDirectory;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));

package/dist/cjs/libs/render/type.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "RenderLevel", {
   enumerable: true,
-  get: () => RenderLevel
+  get: function() {
+    return RenderLevel;
+  }
 });
 var RenderLevel;
 (function(RenderLevel2) {

package/dist/cjs/libs/render/utils.js

@@ -10,17 +10,22 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  injectServerData: () => injectServerData,
-  injectServerDataStream: () => injectServerDataStream
+  injectServerData: function() {
+    return injectServerData;
+  },
+  injectServerDataStream: function() {
+    return injectServerDataStream;
+  }
 });
 const _template = require("../hook-api/template");
+const _templateForStream = require("../hook-api/templateForStream");
 const injectServerData = (content, context) => {
   const template = new _template.TemplateAPI(content);
   template.prependHead(`<script type="application/json" id="__MODERN_SERVER_DATA__">${JSON.stringify(context.serverData)}</script>`);
   return template.get();
 };
 const injectServerDataStream = (content, context) => {
-  return content.pipe((0, _template.templateInjectableStream)({
+  return content.pipe((0, _templateForStream.templateInjectableStream)({
     prependHead: `<script type="application/json" id="__MODERN_SERVER_DATA__">${JSON.stringify(context.serverData)}</script>`
   }));
 };

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

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  RouteMatchManager: () => RouteMatchManager,
-  RouteMatcher: () => _matcher.RouteMatcher
+  RouteMatchManager: function() {
+    return RouteMatchManager;
+  },
+  RouteMatcher: function() {
+    return _matcher.RouteMatcher;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _matcher = require("./matcher");

package/dist/cjs/libs/route/matcher.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "RouteMatcher", {
   enumerable: true,
-  get: () => RouteMatcher
+  get: function() {
+    return RouteMatcher;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _pathtoregexp = require("path-to-regexp");

package/dist/cjs/libs/route/route.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "ModernRoute", {
   enumerable: true,
-  get: () => ModernRoute
+  get: function() {
+    return ModernRoute;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 class ModernRoute {

package/dist/cjs/libs/serveFile.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  faviconFallbackHandler: () => faviconFallbackHandler,
-  createStaticFileHandler: () => createStaticFileHandler
+  faviconFallbackHandler: function() {
+    return faviconFallbackHandler;
+  },
+  createStaticFileHandler: function() {
+    return createStaticFileHandler;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _servestatic = /* @__PURE__ */ _interop_require_default._(require("serve-static"));

package/dist/cjs/renderHtml.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const _define_property = require("@swc/helpers/_/_define_property");
+const _http = require("http");
+const _stream = require("stream");
+const _net = require("net");
+const _server = require("./server");
+const _utils = require("./utils");
+class IncomingMessageLike extends _stream.Readable {
+  constructor({ method, url, headers }) {
+    super();
+    _define_property._(this, "headers", void 0);
+    _define_property._(this, "method", void 0);
+    _define_property._(this, "url", void 0);
+    _define_property._(this, "socket", void 0);
+    this.socket = new _net.Socket();
+    this.headers = headers || {};
+    this.headers.host = "localhost:8080";
+    this.method = method || "get";
+    this.url = url;
+  }
+}
+class ServerResponseLike extends _http.OutgoingMessage {
+  end(chunk, _encoding, cb) {
+    this.data.push(chunk.toString());
+    cb && cb();
+    this.emit("finish");
+    return this;
+  }
+  constructor() {
+    super();
+    _define_property._(this, "statusCode", void 0);
+    _define_property._(this, "data", void 0);
+    this.statusCode = 200;
+    this.data = [];
+  }
+}
+class CustomServer extends _server.Server {
+  async render(req, res, _url) {
+    const handler = this.getRequestHandler();
+    handler(req, res);
+    return null;
+  }
+}
+async function renderHtml({ url, method, headers, body, serverOptions }) {
+  const req = new IncomingMessageLike({
+    method,
+    url,
+    headers
+  });
+  if (body) {
+    req.push(body);
+    req.push(null);
+  }
+  const res = new ServerResponseLike();
+  const customServer = new CustomServer(serverOptions);
+  await customServer.init({
+    disableHttpServer: true
+  });
+  customServer.render(req, res);
+  return new Promise((resolve) => {
+    res.addListener("finish", () => {
+      resolve({
+        headers: res.getHeaders(),
+        redirected: (0, _utils.isRedirect)(res.statusCode),
+        status: res.statusCode,
+        url,
+        body: res.data.join()
+      });
+    });
+  });
+}
+module.exports = renderHtml;

package/dist/cjs/server/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "Server", {
   enumerable: true,
-  get: () => Server
+  get: function() {
+    return Server;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
@@ -30,7 +32,9 @@ class Server {
   * - 执行 prepare hook
   * - 执行 server init
   */
-  async init() {
+  async init({ disableHttpServer = false } = {
+    disableHttpServer: false
+  }) {
     const { options } = this;
     await this.loadServerEnv(options);
     this.initServerConfig(options);
@@ -40,7 +44,9 @@ class Server {
     await this.injectContext(this.runner, options);
     this.server = this.serverImpl(options);
     await this.runPrepareHook(this.runner);
-    this.app = await this.server.createHTTPServer(this.getRequestHandler());
+    if (!disableHttpServer) {
+      this.app = await this.server.createHTTPServer(this.getRequestHandler());
+    }
     await this.server.onInit(this.runner, this.app);
     return this;
   }

package/dist/cjs/server/modernServer.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "ModernServer", {
   enumerable: true,
-  get: () => ModernServer
+  get: function() {
+    return ModernServer;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
@@ -28,6 +30,7 @@ class ModernServer {
     var _conf_bff, _this_conf_server, _conf_security, _this_conf_output;
     this.runner = runner;
     const { distDir, staticGenerate, conf } = this;
+    this.initReader();
     (0, _utils1.debug)("final server conf", this.conf);
     this.proxyHandler = (0, _proxy.createProxyHandler)((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
     if (this.proxyHandler) {
@@ -35,8 +38,7 @@ class ModernServer {
         this.addHandler(handler);
       });
     }
-    this.reader.init();
-    app.on("close", () => {
+    app === null || app === void 0 ? void 0 : app.on("close", () => {
       this.reader.close();
     });
     const usageRoutes = this.filterRoutes(this.getRoutes());
@@ -61,18 +63,6 @@ class ModernServer {
   // server ready
   onRepack(_) {
   }
-  async onServerChange({ filepath }) {
-    const { pwd } = this;
-    const { api, server } = _constants.AGGRED_DIR;
-    const apiPath = _path.default.normalize(_path.default.join(pwd, api));
-    const serverPath = _path.default.normalize(_path.default.join(pwd, server));
-    const onlyApi = filepath.startsWith(apiPath);
-    const onlyWeb = filepath.startsWith(serverPath);
-    await this.prepareFrameHandler({
-      onlyWeb,
-      onlyApi
-    });
-  }
   // exposed requestHandler
   getRequestHandler() {
     return this.requestHandler.bind(this);
@@ -99,6 +89,21 @@ class ModernServer {
     return (0, _http.createServer)(handler);
   }
   /* —————————————————————— function will be overwrite —————————————————————— */
+  initReader() {
+    this.reader.init();
+  }
+  async onServerChange({ filepath }) {
+    const { pwd } = this;
+    const { api, server } = _constants.AGGRED_DIR;
+    const apiPath = _path.default.normalize(_path.default.join(pwd, api));
+    const serverPath = _path.default.normalize(_path.default.join(pwd, server));
+    const onlyApi = filepath.startsWith(apiPath);
+    const onlyWeb = filepath.startsWith(serverPath);
+    await this.prepareFrameHandler({
+      onlyWeb,
+      onlyApi
+    });
+  }
   // get routes info
   getRoutes() {
     if (this.presetRoutes) {
@@ -462,7 +467,7 @@ class ModernServer {
     _define_property._(this, "staticGenerate", void 0);
     require("ignore-styles");
     this.pwd = pwd;
-    this.distDir = _path.default.join(pwd, config.output.path || "dist");
+    this.distDir = _path.default.resolve(pwd, config.output.path || "dist");
     this.workDir = this.distDir;
     this.conf = config;
     (0, _utils1.debug)("server conf", this.conf);

package/dist/cjs/server/modernServerSplit.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createProdServer", {
   enumerable: true,
-  get: () => createProdServer
+  get: function() {
+    return createProdServer;
+  }
 });
 const _modernServer = require("./modernServer");
 class ModernSSRServer extends _modernServer.ModernServer {

package/dist/cjs/utils.js

@@ -10,15 +10,33 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  debug: () => debug,
-  mergeExtension: () => mergeExtension,
-  noop: () => noop,
-  createErrorDocument: () => createErrorDocument,
-  createMiddlewareCollecter: () => createMiddlewareCollecter,
-  getStaticReg: () => getStaticReg,
-  prepareFavicons: () => prepareFavicons,
-  headersWithoutCookie: () => headersWithoutCookie,
-  isRedirect: () => isRedirect
+  debug: function() {
+    return debug;
+  },
+  mergeExtension: function() {
+    return mergeExtension;
+  },
+  noop: function() {
+    return noop;
+  },
+  createErrorDocument: function() {
+    return createErrorDocument;
+  },
+  createMiddlewareCollecter: function() {
+    return createMiddlewareCollecter;
+  },
+  getStaticReg: function() {
+    return getStaticReg;
+  },
+  prepareFavicons: function() {
+    return prepareFavicons;
+  },
+  headersWithoutCookie: function() {
+    return headersWithoutCookie;
+  },
+  isRedirect: function() {
+    return isRedirect;
+  }
 });
 const _utils = require("@modern-js/utils");
 const debug = (0, _utils.createDebugger)("prod-server");