@modern-js/prod-server 2.15.0 → 2.16.0

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

@@ -1,82 +1,37 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import { createServer } from "http";
 import path from "path";
-import {
-  fs,
-  isPromise,
-  isWebOnly,
-  mime,
-  ROUTE_SPEC_FILE
-} from "@modern-js/utils";
-import {
-  RouteMatchManager
-} from "../libs/route";
+import { fs, isPromise, isWebOnly, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
-import {
-  createStaticFileHandler,
-  faviconFallbackHandler
-} from "../libs/serveFile";
-import {
-  createErrorDocument,
-  createMiddlewareCollecter,
-  getStaticReg,
-  mergeExtension,
-  noop,
-  debug,
-  isRedirect
-} from "../utils";
+import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serveFile";
+import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop, debug, isRedirect } from "../utils";
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
-import {
-  AGGRED_DIR,
-  ERROR_DIGEST,
-  ERROR_PAGE_TEXT,
-  RUN_MODE
-} from "../constants";
-import {
-  createAfterMatchContext,
-  createAfterRenderContext,
-  createMiddlewareContext
-} from "../libs/hook-api";
+import { AGGRED_DIR, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE } from "../constants";
+import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "../libs/hook-api";
 const SERVER_DIR = "./server";
-class ModernServer {
-  constructor({
-    pwd,
-    config,
-    routes,
-    staticGenerate,
-    logger,
-    metrics,
-    runMode,
-    proxyTarget
-  }) {
-    this.handlers = [];
-    this.reader = reader;
-    this.loaderHandler = null;
-    this.frameWebHandler = null;
-    this.frameAPIHandler = null;
-    this.proxyHandler = null;
-    require("ignore-styles");
-    this.pwd = pwd;
-    this.distDir = path.join(pwd, config.output.path || "dist");
-    this.workDir = this.distDir;
-    this.conf = config;
-    debug("server conf", this.conf);
-    this.logger = logger;
-    this.metrics = metrics;
-    this.router = new RouteMatchManager();
-    this.presetRoutes = routes;
-    this.proxyTarget = proxyTarget;
-    this.staticGenerate = staticGenerate || false;
-    this.runMode = runMode || RUN_MODE.FULL;
-  }
+export class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _a, _b, _c;
+    var _conf_bff, _this_conf_server, _this_conf_output;
     this.runner = runner;
     const { distDir, staticGenerate, conf } = this;
     debug("final server conf", this.conf);
-    this.proxyHandler = createProxyHandler((_a = conf.bff) == null ? void 0 : _a.proxy);
+    this.proxyHandler = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
     if (this.proxyHandler) {
       this.proxyHandler.forEach((handler) => {
         this.addHandler(handler);
@@ -91,7 +46,7 @@ class ModernServer {
     this.warmupSSRBundle();
     await this.prepareFrameHandler();
     await this.prepareLoaderHandler(usageRoutes, distDir);
-    const ssrConfig = (_b = this.conf.server) == null ? void 0 : _b.ssr;
+    const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
     const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
     this.routeRenderHandler = createRenderHandler({
       distDir,
@@ -99,7 +54,7 @@ class ModernServer {
       forceCSR
     });
     await this.setupBeforeProdMiddleware();
-    this.addHandler(this.setupStaticMiddleware((_c = this.conf.output) == null ? void 0 : _c.assetPrefix));
+    this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));
     this.addHandler(faviconFallbackHandler);
     this.addHandler(this.routeHandler.bind(this));
     this.compose();
@@ -107,14 +62,17 @@ class ModernServer {
   // server ready
   onRepack(_) {
   }
-  onServerChange({ filepath }) {
+  async onServerChange({ filepath }) {
     const { pwd } = this;
     const { api, server } = AGGRED_DIR;
     const apiPath = path.normalize(path.join(pwd, api));
     const serverPath = path.normalize(path.join(pwd, server));
     const onlyApi = filepath.startsWith(apiPath);
     const onlyWeb = filepath.startsWith(serverPath);
-    this.prepareFrameHandler({ onlyWeb, onlyApi });
+    await this.prepareFrameHandler({
+      onlyWeb,
+      onlyApi
+    });
   }
   // exposed requestHandler
   getRequestHandler() {
@@ -166,15 +124,12 @@ class ModernServer {
   }
   async prepareLoaderHandler(specs, distDir) {
     const { runner } = this;
-    const handler = await runner.prepareLoaderHandler(
-      {
-        serverRoutes: specs,
-        distDir
-      },
-      {
-        onLast: () => null
-      }
-    );
+    const handler = await runner.prepareLoaderHandler({
+      serverRoutes: specs,
+      distDir
+    }, {
+      onLast: () => null
+    });
     this.loaderHandler = handler;
   }
   // gather frame extension and get framework handler
@@ -196,19 +151,18 @@ class ModernServer {
   }
   async prepareWebHandler(extension) {
     const { workDir, runner } = this;
-    const handler = await runner.prepareWebServer(
-      {
-        pwd: workDir,
-        config: extension
-      },
-      { onLast: () => null }
-    );
+    const handler = await runner.prepareWebServer({
+      pwd: workDir,
+      config: extension
+    }, {
+      onLast: () => null
+    });
     return handler;
   }
   async prepareAPIHandler(extension) {
     const { workDir, runner, conf } = this;
     const { bff } = conf;
-    const prefix = (bff == null ? void 0 : bff.prefix) || "/api";
+    const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
     const webOnly = await isWebOnly();
     if (webOnly && process.env.NODE_ENV === "development") {
       return (req, res) => {
@@ -216,16 +170,15 @@ class ModernServer {
         res.end(JSON.stringify(""));
       };
     }
-    return runner.prepareApiServer(
-      {
-        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 }
-    );
+    return runner.prepareApiServer({
+      pwd: workDir,
+      config: extension,
+      prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+      httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
+      render: this.render.bind(this)
+    }, {
+      onLast: () => null
+    });
   }
   filterRoutes(routes) {
     return routes;
@@ -238,20 +191,13 @@ class ModernServer {
     });
   }
   setupStaticMiddleware(prefix) {
-    const staticPathRegExp = getStaticReg(
-      this.conf.output,
-      this.conf.html,
-      prefix
-    );
-    return createStaticFileHandler(
-      [
-        {
-          path: staticPathRegExp,
-          target: this.distDir
-        }
-      ],
-      prefix
-    );
+    const staticPathRegExp = getStaticReg(this.conf.output, this.conf.html, prefix);
+    return createStaticFileHandler([
+      {
+        path: staticPathRegExp,
+        target: this.distDir
+      }
+    ], prefix);
   }
   async handleAPI(context) {
     const { req, res } = context;
@@ -291,11 +237,7 @@ class ModernServer {
       return null;
     }
     if (renderResult.redirect) {
-      this.redirect(
-        res,
-        renderResult.content,
-        renderResult.statusCode
-      );
+      this.redirect(res, renderResult.content, renderResult.statusCode);
       return null;
     }
     if (this.isSend(res)) {
@@ -336,12 +278,11 @@ class ModernServer {
       return;
     }
     if (route.entryName) {
-      const afterMatchContext = createAfterMatchContext(
-        context,
-        route.entryName
-      );
+      const afterMatchContext = createAfterMatchContext(context, route.entryName);
       if (this.runMode === RUN_MODE.FULL) {
-        await this.runner.afterMatch(afterMatchContext, { onLast: noop });
+        await this.runner.afterMatch(afterMatchContext, {
+          onLast: noop
+        });
       }
       if (this.isSend(res)) {
         return;
@@ -383,12 +324,11 @@ class ModernServer {
       return;
     }
     if (route.entryName) {
-      const afterRenderContext = createAfterRenderContext(
-        context,
-        response.toString()
-      );
+      const afterRenderContext = createAfterRenderContext(context, response.toString());
       if (this.runMode === RUN_MODE.FULL) {
-        await this.runner.afterRender(afterRenderContext, { onLast: noop });
+        await this.runner.afterRender(afterRenderContext, {
+          onLast: noop
+        });
       }
       if (this.isSend(res)) {
         return;
@@ -500,7 +440,39 @@ class ModernServer {
     const text = ERROR_PAGE_TEXT[status] || ERROR_PAGE_TEXT[500];
     context.res.end(createErrorDocument(status, text));
   }
+  constructor({ pwd, config, routes, staticGenerate, logger, metrics, runMode, proxyTarget }) {
+    _define_property(this, "pwd", void 0);
+    _define_property(this, "distDir", void 0);
+    _define_property(this, "workDir", void 0);
+    _define_property(this, "router", void 0);
+    _define_property(this, "conf", void 0);
+    _define_property(this, "handlers", []);
+    _define_property(this, "presetRoutes", void 0);
+    _define_property(this, "runner", void 0);
+    _define_property(this, "logger", void 0);
+    _define_property(this, "metrics", void 0);
+    _define_property(this, "runMode", void 0);
+    _define_property(this, "reader", reader);
+    _define_property(this, "proxyTarget", void 0);
+    _define_property(this, "routeRenderHandler", void 0);
+    _define_property(this, "loaderHandler", null);
+    _define_property(this, "frameWebHandler", null);
+    _define_property(this, "frameAPIHandler", null);
+    _define_property(this, "proxyHandler", null);
+    _define_property(this, "_handler", void 0);
+    _define_property(this, "staticGenerate", void 0);
+    require("ignore-styles");
+    this.pwd = pwd;
+    this.distDir = path.join(pwd, config.output.path || "dist");
+    this.workDir = this.distDir;
+    this.conf = config;
+    debug("server conf", this.conf);
+    this.logger = logger;
+    this.metrics = metrics;
+    this.router = new RouteMatchManager();
+    this.presetRoutes = routes;
+    this.proxyTarget = proxyTarget;
+    this.staticGenerate = staticGenerate || false;
+    this.runMode = runMode || RUN_MODE.FULL;
+  }
 }
-export {
-  ModernServer
-};

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

@@ -27,7 +27,7 @@ class ModernWebServer extends ModernServer {
     return super.handleWeb(context, route);
   }
 }
-const createProdServer = (options) => {
+export const createProdServer = (options) => {
   if (options.apiOnly) {
     return new ModernAPIServer(options);
   } else if (options.ssrOnly) {
@@ -38,6 +38,3 @@ const createProdServer = (options) => {
     return new ModernServer(options);
   }
 };
-export {
-  createProdServer
-};

package/dist/esm-node/type.js

@@ -0,0 +1 @@
+export {};

package/dist/esm-node/utils.js

@@ -1,12 +1,14 @@
 import { createDebugger } from "@modern-js/utils";
-const debug = createDebugger("prod-server");
-const mergeExtension = (users) => {
+export const debug = createDebugger("prod-server");
+export const mergeExtension = (users) => {
   const output = [];
-  return { middleware: output.concat(users) };
+  return {
+    middleware: output.concat(users)
+  };
 };
-const noop = () => {
+export const noop = () => {
 };
-const createErrorDocument = (status, text) => {
+export const createErrorDocument = (status, text) => {
   const title = `${status}: ${text}`;
   return `<!DOCTYPE html>
   <html lang="en">
@@ -39,7 +41,7 @@ const createErrorDocument = (status, text) => {
   </html>
   `;
 };
-const createMiddlewareCollecter = () => {
+export const createMiddlewareCollecter = () => {
   const webMiddlewares = [];
   const apiMiddlewares = [];
   const addWebMiddleware = (input) => {
@@ -58,20 +60,33 @@ const createMiddlewareCollecter = () => {
     addAPIMiddleware
   };
 };
-const getStaticReg = (output = {}, html = {}, prefix = "/") => {
+export const getStaticReg = (output = {}, html = {}, prefix = "/") => {
   const { distPath: { css: cssPath, js: jsPath, media: mediaPath } = {} } = output;
   const { favicon, faviconByEntries } = html;
   const favicons = prepareFavicons(favicon, faviconByEntries);
-  const staticFiles = [cssPath, jsPath, mediaPath].filter((v) => Boolean(v));
-  const staticReg = ["static/", "upload/", ...staticFiles];
-  const iconReg = ["favicon.ico", "icon.png", ...favicons];
+  const staticFiles = [
+    cssPath,
+    jsPath,
+    mediaPath
+  ].filter((v) => Boolean(v));
+  const staticReg = [
+    "static/",
+    "upload/",
+    ...staticFiles
+  ];
+  const iconReg = [
+    "favicon.ico",
+    "icon.png",
+    ...favicons
+  ];
   const regPrefix = prefix.endsWith("/") ? prefix : `${prefix}/`;
-  const staticPathRegExp = new RegExp(
-    `^${regPrefix}(${[...staticReg, ...iconReg].join("|")})`
-  );
+  const staticPathRegExp = new RegExp(`^${regPrefix}(${[
+    ...staticReg,
+    ...iconReg
+  ].join("|")})`);
   return staticPathRegExp;
 };
-const prepareFavicons = (favicon, faviconByEntries) => {
+export const prepareFavicons = (favicon, faviconByEntries) => {
   const faviconNames = [];
   if (favicon) {
     faviconNames.push(favicon.substring(favicon.lastIndexOf("/") + 1));
@@ -80,33 +95,27 @@ const prepareFavicons = (favicon, faviconByEntries) => {
     Object.keys(faviconByEntries).forEach((f) => {
       const curFavicon = faviconByEntries[f];
       if (curFavicon) {
-        faviconNames.push(
-          curFavicon.substring(curFavicon.lastIndexOf("/") + 1)
-        );
+        faviconNames.push(curFavicon.substring(curFavicon.lastIndexOf("/") + 1));
       }
     });
   }
   return faviconNames;
 };
-const headersWithoutCookie = (headers) => {
+export const headersWithoutCookie = (headers) => {
   if (typeof headers.cookie !== "undefined") {
-    const safeHeaders = { ...headers };
+    const safeHeaders = {
+      ...headers
+    };
     delete safeHeaders.cookie;
     return safeHeaders;
   }
   return headers;
 };
-const isRedirect = (code) => {
-  return [301, 302, 307, 308].includes(code);
-};
-export {
-  createErrorDocument,
-  createMiddlewareCollecter,
-  debug,
-  getStaticReg,
-  headersWithoutCookie,
-  isRedirect,
-  mergeExtension,
-  noop,
-  prepareFavicons
+export const isRedirect = (code) => {
+  return [
+    301,
+    302,
+    307,
+    308
+  ].includes(code);
 };

package/dist/esm-node/workerServer.js

@@ -1,15 +1,15 @@
 import { Logger } from "./libs/logger";
 import { RouteMatchManager } from "./libs/route";
 import { metrics as defaultMetrics } from "./libs/metrics";
-const handleUrl = (url) => {
+export const handleUrl = (url) => {
   return url.replace(/^https?:\/\/.*?\//gi, "/");
 };
-const createHandler = (manifest) => {
+export const createHandler = (manifest) => {
   const routeMgr = new RouteMatchManager();
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
   return async (ctx) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _ctx_request, _ctx_request1, _ctx_request2;
     const pageMatch = routeMgr.match(ctx.url);
     if (!pageMatch) {
       ctx.body = "404: Page not found";
@@ -17,9 +17,12 @@ const createHandler = (manifest) => {
       return;
     }
     const page = pages[pageMatch.spec.urlPath];
-    (_b = (_a = ctx.request).query) != null ? _b : _a.query = ctx.query;
-    (_d = (_c = ctx.request).pathname) != null ? _d : _c.pathname = ctx.pathname;
-    (_f = (_e = ctx.request).params) != null ? _f : _e.params = ctx.params;
+    var _query;
+    (_query = (_ctx_request = ctx.request).query) !== null && _query !== void 0 ? _query : _ctx_request.query = ctx.query;
+    var _pathname;
+    (_pathname = (_ctx_request1 = ctx.request).pathname) !== null && _pathname !== void 0 ? _pathname : _ctx_request1.pathname = ctx.pathname;
+    var _params;
+    (_params = (_ctx_request2 = ctx.request).params) !== null && _params !== void 0 ? _params : _ctx_request2.params = ctx.params;
     const params = pageMatch.parseURLParams(ctx.url);
     if (page.serverRender) {
       try {
@@ -63,7 +66,3 @@ const createHandler = (manifest) => {
     ctx.status = 404;
   };
 };
-export {
-  createHandler,
-  handleUrl
-};

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

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/jADEfFPZVjELU2oh3zo49/src/type" />
+/// <reference types=".dts-temp/vHqeIaScy5kMV0h9s6umT/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';

package/dist/types/server/modernServer.d.ts

@@ -46,7 +46,7 @@ export declare class ModernServer implements ModernServerInterface {
     filepath
   }: {
     filepath: string;
-  }): void;
+  }): Promise<void>;
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
   render(req: IncomingMessage, res: ServerResponse, url?: string): Promise<string | import("stream").Readable | null>;
   createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server<typeof IncomingMessage, typeof ServerResponse>>;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/jADEfFPZVjELU2oh3zo49/src/type" />
+/// <reference types=".dts-temp/vHqeIaScy5kMV0h9s6umT/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/server/prod-server"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.0",
+  "version": "2.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -56,8 +60,8 @@
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.15.0",
-    "@modern-js/server-core": "2.15.0"
+    "@modern-js/utils": "2.16.0",
+    "@modern-js/server-core": "2.16.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -73,10 +77,10 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^4",
-    "@modern-js/types": "2.15.0",
-    "@modern-js/server-core": "2.15.0",
-    "@scripts/jest-config": "2.15.0",
-    "@scripts/build": "2.15.0"
+    "@modern-js/types": "2.16.0",
+    "@modern-js/server-core": "2.16.0",
+    "@scripts/jest-config": "2.16.0",
+    "@scripts/build": "2.16.0"
   },
   "sideEffects": false,
   "publishConfig": {