@modern-js/prod-server 2.6.0 → 2.6.1-alpha.0

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

@@ -21,7 +21,7 @@ import {
   requireConfig
 } from "../libs/loadConfig";
 import { debug } from "../utils";
-import { createProdServer } from "./modern-server-split";
+import { createProdServer } from "./modernServerSplit";
 class Server {
   constructor(options) {
     this.serverImpl = createProdServer;
@@ -156,14 +156,16 @@ class Server {
   }
   initAppContext() {
     const { options } = this;
-    const { pwd: appDirectory, plugins = [], config } = options;
+    const { pwd: appDirectory, plugins = [], config, appContext } = options;
     const serverPlugins = plugins.map((p) => ({
       server: p
     }));
     return {
       appDirectory,
+      apiDirectory: appContext == null ? void 0 : appContext.apiDirectory,
+      lambdaDirectory: appContext == null ? void 0 : appContext.lambdaDirectory,
+      sharedDirectory: (appContext == null ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
       distDirectory: path.join(appDirectory, config.output.path || "dist"),
-      sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
       plugins: serverPlugins
     };
   }

package/dist/esm-node/server/{modern-server.js → modernServer.js}

@@ -8,7 +8,7 @@ import { createRenderHandler } from "../libs/render";
 import {
   createStaticFileHandler,
   faviconFallbackHandler
-} from "../libs/serve-file";
+} from "../libs/serveFile";
 import {
   createErrorDocument,
   createMiddlewareCollecter,
@@ -33,7 +33,6 @@ import {
   createAfterRenderContext,
   createMiddlewareContext
 } from "../libs/hook-api";
-const API_DIR = "./api";
 const SERVER_DIR = "./server";
 class ModernServer {
   constructor({
@@ -202,13 +201,12 @@ class ModernServer {
     const { getMiddlewares, ...collector } = createMiddlewareCollecter();
     await runner.gather(collector);
     const { api: pluginAPIExt, web: pluginWebExt } = getMiddlewares();
-    const apiDir = path.join(workDir, API_DIR);
     const serverDir = path.join(workDir, SERVER_DIR);
     if (await fs.pathExists(path.join(serverDir)) && !onlyApi) {
       const webExtension = mergeExtension(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
-    if (fs.existsSync(apiDir) && !onlyWeb) {
+    if (!onlyWeb) {
       const apiExtension = mergeExtension(pluginAPIExt);
       this.frameAPIHandler = await this.prepareAPIHandler(apiExtension);
     }
@@ -233,6 +231,7 @@ class ModernServer {
         pwd: workDir,
         config: extension,
         prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+        httpMethodDecider: bff == null ? void 0 : bff.httpMethodDecider,
         render: this.render.bind(this)
       },
       { onLast: () => null }

package/dist/esm-node/server/{modern-server-split.js → modernServerSplit.js}

@@ -1,4 +1,4 @@
-import { ModernServer } from "./modern-server";
+import { ModernServer } from "./modernServer";
 class ModernSSRServer extends ModernServer {
   prepareAPIHandler(_) {
     return null;

package/dist/js/modern/constants.js

@@ -0,0 +1,35 @@
+const AGGRED_DIR = {
+  mock: "config/mock",
+  server: "server",
+  api: "api",
+  shared: "shared",
+  lambda: "lambda"
+};
+var ApiServerMode = /* @__PURE__ */ ((ApiServerMode2) => {
+  ApiServerMode2["func"] = "function";
+  ApiServerMode2["frame"] = "framework";
+  return ApiServerMode2;
+})(ApiServerMode || {});
+const ERROR_DIGEST = {
+  INIT: "Server init error",
+  ENOTF: "Page could not be found",
+  WARMUP: "SSR warmup failed",
+  EINTER: "Internal server error",
+  ERENDER: "SSR render failed",
+  EMICROINJ: "Get micro-frontend info failed"
+};
+const ERROR_PAGE_TEXT = {
+  404: "This page could not be found.",
+  500: "Internal Server Error."
+};
+const RUN_MODE = {
+  FULL: "full",
+  TYPE: "type"
+};
+export {
+  AGGRED_DIR,
+  ApiServerMode,
+  ERROR_DIGEST,
+  ERROR_PAGE_TEXT,
+  RUN_MODE
+};

package/dist/js/modern/index.js

@@ -0,0 +1,18 @@
+import { Server } from "./server";
+import { ModernServer } from "./server/modern-server";
+import { createProxyHandler } from "./libs/proxy";
+export * from "./type";
+export * from "./constants";
+var src_default = (options) => {
+  if (options == null) {
+    throw new Error("can not start mserver without options");
+  }
+  const server = new Server(options);
+  return server.init();
+};
+export {
+  ModernServer,
+  Server,
+  createProxyHandler,
+  src_default as default
+};

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

@@ -0,0 +1,160 @@
+import { URL } from "url";
+import qs from "querystring";
+import { Buffer } from "buffer";
+import createEtag from "etag";
+import fresh from "fresh";
+import { headersWithoutCookie } from "../../utils";
+class ModernServerContext {
+  constructor(req, res, options) {
+    this.params = {};
+    this.options = {};
+    this.req = req;
+    this.res = res;
+    this.options = options || {};
+    this.serverData = {};
+    this.bind();
+  }
+  get logger() {
+    return this.req.logger;
+  }
+  get metrics() {
+    return this.req.metrics;
+  }
+  bind() {
+    const { req, res } = this;
+    req.get = (key) => this.getReqHeader(key);
+    res.set = (key, value) => this.res.setHeader(key, value);
+    res.send = (body) => {
+      this.send(body);
+    };
+  }
+  send(body) {
+    try {
+      const generateETag = !this.res.getHeader("ETag") && this.options.etag;
+      if (body !== void 0 && generateETag) {
+        const encoding = typeof body === "string" ? "utf-8" : void 0;
+        const buf = !Buffer.isBuffer(body) ? Buffer.from(body, encoding) : body;
+        const etag = createEtag(buf, { weak: true });
+        if (etag) {
+          this.res.setHeader("ETag", etag);
+        }
+      }
+      if (this.fresh) {
+        this.status = 304;
+      }
+    } catch (e) {
+      this.logger.error(e.message);
+    }
+    this.res.end(body);
+  }
+  setParams(params) {
+    this.params = params;
+  }
+  setServerData(key, value) {
+    this.serverData[key] = value;
+  }
+  getReqHeader(key) {
+    const { req } = this;
+    const field = key.toLowerCase();
+    switch (field) {
+      case "referer":
+      case "referrer":
+        return req.headers.referrer || req.headers.referer || "";
+      default:
+        return req.headers[field] || "";
+    }
+  }
+  get fresh() {
+    const { status, res, method } = this;
+    if ("GET" !== method && "HEAD" !== method) {
+      return false;
+    }
+    if (status >= 200 && status < 300 || 304 === status) {
+      return fresh(this.headers, {
+        etag: res.getHeader("ETag"),
+        "last-modified": res.getHeader("Last-Modified")
+      });
+    }
+    return false;
+  }
+  get headers() {
+    return this.req.headers;
+  }
+  get method() {
+    return this.req.method;
+  }
+  get url() {
+    return this.req.url || "";
+  }
+  set url(val) {
+    this.req.url = val;
+  }
+  get host() {
+    let host = this.getReqHeader("X-Forwarded-Host");
+    if (!host) {
+      host = this.getReqHeader("Host");
+    }
+    return host.split(/\s*,\s*/, 1)[0] || "";
+  }
+  get protocol() {
+    if (this.req.socket.encrypted) {
+      return "https";
+    }
+    const proto = this.getReqHeader("X-Forwarded-Proto");
+    return proto ? proto.split(/\s*,\s*/, 1)[0] : "http";
+  }
+  get origin() {
+    return `${this.protocol}://${this.host}`;
+  }
+  get href() {
+    return this.origin + this.url;
+  }
+  get parsedURL() {
+    const url = new URL(this.req.url, this.origin);
+    return url;
+  }
+  get path() {
+    return this.parsedURL.pathname;
+  }
+  set path(p) {
+    const url = new URL(this.req.url, this.origin);
+    if (!url || !p) {
+      return;
+    }
+    if (url.pathname === p) {
+      return;
+    }
+    url.pathname = p;
+    this.url = url.toString();
+  }
+  get querystring() {
+    if (!this.req) {
+      return "";
+    }
+    return this.parsedURL.search.replace(/^\?/, "") || "";
+  }
+  get query() {
+    const str = this.querystring;
+    return qs.parse(str);
+  }
+  get status() {
+    return this.res.statusCode;
+  }
+  set status(statusCode) {
+    this.res.statusCode = statusCode;
+  }
+  resHasHandled() {
+    return this.res.writableEnded;
+  }
+  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,
+      headersWithoutCookie(this.headers)
+    );
+  }
+}
+export {
+  ModernServerContext
+};

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

@@ -0,0 +1,6 @@
+import { ModernServerContext } from "./context";
+const createContext = (req, res, options) => new ModernServerContext(req, res, options);
+export {
+  ModernServerContext,
+  createContext
+};

package/dist/js/modern/libs/hook-api/index.js

@@ -0,0 +1,134 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import cookie from "cookie";
+import { RouteAPI } from "./route";
+import { TemplateAPI } from "./template";
+class Response {
+  constructor(res) {
+    this.res = res;
+    this._cookie = cookie.parse(res.getHeader("set-cookie") || "");
+    this.cookies = {
+      get: this.getCookie.bind(this),
+      set: this.setCookie.bind(this),
+      delete: this.deleteCookie.bind(this),
+      clear: this.clearCookie.bind(this),
+      apply: this.applyCookie.bind(this)
+    };
+  }
+  get(key) {
+    return this.res.getHeader(key);
+  }
+  set(key, value) {
+    return this.res.setHeader(key, value);
+  }
+  status(code) {
+    this.res.statusCode = code;
+  }
+  getCookie(key) {
+    return this._cookie[key];
+  }
+  setCookie(key, value) {
+    this._cookie[key] = value;
+  }
+  deleteCookie(key) {
+    if (this._cookie[key]) {
+      delete this._cookie[key];
+    }
+  }
+  clearCookie() {
+    this._cookie = {};
+  }
+  applyCookie() {
+    const str = Object.entries(this._cookie).map(([key, value]) => {
+      return cookie.serialize(key, value);
+    }).join("; ");
+    if (str) {
+      this.res.setHeader("set-cookie", str);
+    } else {
+      this.res.removeHeader("set-cookie");
+    }
+  }
+  raw(body, options) {
+    const { status, headers = {} } = options || {};
+    Object.entries(headers).forEach(([key, value]) => {
+      this.res.setHeader(key, value);
+    });
+    if (status) {
+      this.res.statusCode = status;
+    }
+    this.res.end(body);
+  }
+}
+class Request {
+  constructor(ctx) {
+    this.url = ctx.url;
+    this.host = ctx.host;
+    this.pathname = ctx.path;
+    this.query = ctx.query;
+    this.headers = ctx.headers;
+    this.cookie = ctx.headers.cookie || "";
+    this._cookie = cookie.parse(this.cookie);
+    this.cookies = {
+      get: this.getCookie.bind(this)
+    };
+  }
+  getCookie(key) {
+    return this._cookie[key];
+  }
+}
+const base = (context) => {
+  const { res } = context;
+  return {
+    response: new Response(res),
+    request: new Request(context),
+    logger: context.logger,
+    metrics: context.metrics
+  };
+};
+const createAfterMatchContext = (context, entryName) => {
+  const baseContext = base(context);
+  return __spreadProps(__spreadValues({}, baseContext), {
+    router: new RouteAPI(entryName)
+  });
+};
+const createAfterRenderContext = (context, content) => {
+  const baseContext = base(context);
+  return __spreadProps(__spreadValues({}, baseContext), {
+    template: new TemplateAPI(content)
+  });
+};
+const createMiddlewareContext = (context) => {
+  const baseContext = base(context);
+  return __spreadProps(__spreadValues({}, baseContext), {
+    response: __spreadProps(__spreadValues({}, baseContext.response), {
+      locals: context.res.locals || {}
+    }),
+    source: {
+      req: context.req,
+      res: context.res
+    }
+  });
+};
+export {
+  base,
+  createAfterMatchContext,
+  createAfterRenderContext,
+  createMiddlewareContext
+};

package/dist/js/modern/libs/hook-api/route.js

@@ -0,0 +1,20 @@
+class RouteAPI {
+  constructor(entryName) {
+    this.current = entryName;
+    this.status = 200;
+    this.url = "";
+  }
+  redirect(url, status = 302) {
+    this.url = url;
+    this.status = status;
+  }
+  rewrite(entryName) {
+    this.current = entryName;
+  }
+  use(entryName) {
+    this.rewrite(entryName);
+  }
+}
+export {
+  RouteAPI
+};

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

@@ -0,0 +1,73 @@
+import { Transform } from "stream";
+const RegList = {
+  before: {
+    head: "<head>",
+    body: "<body>"
+  },
+  after: {
+    head: "</head>",
+    body: "</body>"
+  }
+};
+class TemplateAPI {
+  constructor(content) {
+    this.content = content;
+  }
+  get() {
+    return this.content;
+  }
+  set(content) {
+    this.content = content;
+  }
+  prependHead(fragment) {
+    const { head } = RegList.before;
+    return this.replace(head, `${head}${fragment}`);
+  }
+  appendHead(fragment) {
+    const { head } = RegList.after;
+    return this.replace(head, `${fragment}${head}`);
+  }
+  prependBody(fragment) {
+    const { body } = RegList.before;
+    return this.replace(body, `${body}${fragment}`);
+  }
+  appendBody(fragment) {
+    const { body } = RegList.after;
+    return this.replace(body, `${fragment}${body}`);
+  }
+  replace(reg, text) {
+    this.content = this.content.replace(reg, text);
+  }
+}
+const templateInjectableStream = ({
+  prependHead,
+  appendHead,
+  prependBody,
+  appendBody
+}) => new 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();
+  }
+});
+export {
+  TemplateAPI,
+  templateInjectableStream
+};

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

@@ -0,0 +1,62 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import * as path from "path";
+import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import mergeDeep from "merge-deep";
+const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
+  const serverConfigPath = path.join(distDirectory, serverConfigFile);
+  return `${serverConfigPath}.js`;
+};
+const requireConfig = (serverConfigPath) => {
+  if (fs.pathExistsSync(serverConfigPath)) {
+    return compatRequire(serverConfigPath);
+  }
+  return {};
+};
+const loadConfig = ({
+  cliConfig,
+  serverConfig,
+  resolvedConfigPath
+}) => {
+  let config = null;
+  if (process.env.NODE_ENV === "production") {
+    const resolvedConfig = requireConfig(resolvedConfigPath);
+    config = mergeDeep(
+      __spreadProps(__spreadValues({}, resolvedConfig), {
+        plugins: []
+      }),
+      serverConfig,
+      cliConfig
+    );
+  } else {
+    config = mergeDeep(
+      __spreadProps(__spreadValues({}, cliConfig), {
+        plugins: []
+      }),
+      serverConfig
+    );
+  }
+  return config;
+};
+export {
+  getServerConfigPath,
+  loadConfig,
+  requireConfig
+};

package/dist/js/modern/libs/logger.js

@@ -0,0 +1,111 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+const LOG_LEVEL = {
+  error: 0,
+  warn: 1,
+  info: 2,
+  debug: 3,
+  log: 4
+};
+const LOG_TYPES = {
+  error: {
+    color: "red",
+    label: "error",
+    level: "error"
+  },
+  info: {
+    color: "cyan",
+    label: "info",
+    level: "info"
+  },
+  success: {
+    color: "green",
+    label: "Success",
+    level: "info"
+  },
+  warn: {
+    color: "yellow",
+    label: "warn",
+    level: "warn"
+  },
+  debug: {
+    color: "red",
+    label: "debug",
+    level: "debug"
+  },
+  log: { level: "log" }
+};
+const DEFAULT_CONFIG = {
+  displayLabel: true,
+  uppercaseLabel: false
+};
+class Logger {
+  constructor(options = {}) {
+    this.level = options.level || LOG_TYPES.log.level;
+    this.config = __spreadValues(__spreadValues({}, DEFAULT_CONFIG), options.config || {});
+    this.types = __spreadValues(__spreadValues({}, LOG_TYPES), options.types || {});
+    this.longestLabel = this.getLongestLabel();
+    Object.keys(this.types).forEach((type) => {
+      this[type] = this._log.bind(this, type);
+    });
+  }
+  _log(type, message, ...args) {
+    if (message === void 0 || message === null) {
+      console.log();
+      return;
+    }
+    if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
+      return;
+    }
+    let label = "";
+    let text = "";
+    const logType = this.types[type];
+    if (this.config.displayLabel && logType.label) {
+      label = this.config.uppercaseLabel ? logType.label.toUpperCase() : logType.label;
+      label = label.padEnd(this.longestLabel.length);
+    }
+    if (message instanceof Error) {
+      if (message.stack) {
+        const [name, ...rest] = message.stack.split("\n");
+        text = `${name}
+${rest.join("\n")}`;
+      } else {
+        text = message.message;
+      }
+    } else {
+      text = `${message}`;
+    }
+    const log = label.length > 0 ? `${label} ${text}` : text;
+    console.log(log, ...args);
+  }
+  getLongestLabel() {
+    let longestLabel = "";
+    Object.keys(this.types).forEach((type) => {
+      const { label = "" } = this.types[type];
+      if (label.length > longestLabel.length) {
+        longestLabel = label;
+      }
+    });
+    return longestLabel;
+  }
+}
+const logger = new Logger();
+logger.Logger = Logger;
+export {
+  Logger,
+  logger
+};