@modern-js/prod-server 2.4.1-beta.0 → 2.5.1-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (125) hide show
  1. package/CHANGELOG.md +18 -3
  2. package/dist/cjs/constants.js +62 -0
  3. package/dist/cjs/index.js +44 -0
  4. package/dist/cjs/libs/context/context.js +189 -0
  5. package/dist/cjs/libs/context/index.js +30 -0
  6. package/dist/cjs/libs/hook-api/index.js +151 -0
  7. package/dist/cjs/libs/hook-api/route.js +43 -0
  8. package/dist/cjs/libs/hook-api/template.js +97 -0
  9. package/dist/cjs/libs/loadConfig.js +76 -0
  10. package/dist/cjs/libs/logger.js +122 -0
  11. package/dist/cjs/libs/metrics.js +34 -0
  12. package/dist/cjs/libs/proxy.js +81 -0
  13. package/dist/cjs/libs/render/cache/__tests__/cache.fun.test.js +93 -0
  14. package/dist/cjs/libs/render/cache/__tests__/cache.test.js +210 -0
  15. package/dist/cjs/libs/render/cache/__tests__/cacheable.js +70 -0
  16. package/dist/cjs/libs/render/cache/__tests__/error-configuration.js +60 -0
  17. package/dist/cjs/libs/render/cache/__tests__/matched-cache.js +114 -0
  18. package/dist/cjs/libs/render/cache/index.js +97 -0
  19. package/dist/cjs/libs/render/cache/page-caches/index.js +33 -0
  20. package/dist/cjs/libs/render/cache/page-caches/lru.js +58 -0
  21. package/dist/cjs/libs/render/cache/spr.js +242 -0
  22. package/dist/cjs/libs/render/cache/type.js +15 -0
  23. package/dist/cjs/libs/render/cache/util.js +116 -0
  24. package/dist/cjs/libs/render/index.js +93 -0
  25. package/dist/cjs/libs/render/measure.js +75 -0
  26. package/dist/cjs/libs/render/reader.js +118 -0
  27. package/dist/cjs/libs/render/ssr.js +103 -0
  28. package/dist/cjs/libs/render/static.js +67 -0
  29. package/dist/cjs/libs/render/type.js +32 -0
  30. package/dist/cjs/libs/route/index.js +78 -0
  31. package/dist/cjs/libs/route/matcher.js +106 -0
  32. package/dist/cjs/libs/route/route.js +39 -0
  33. package/dist/cjs/libs/serve-file.js +77 -0
  34. package/dist/cjs/server/index.js +169 -0
  35. package/dist/cjs/server/modern-server-split.js +66 -0
  36. package/dist/cjs/server/modern-server.js +491 -0
  37. package/dist/cjs/type.js +15 -0
  38. package/dist/cjs/utils.js +152 -0
  39. package/dist/cjs/worker-server.js +93 -0
  40. package/dist/esm/constants.js +29 -0
  41. package/dist/esm/index.js +13 -0
  42. package/dist/esm/libs/context/context.js +274 -0
  43. package/dist/esm/libs/context/index.js +5 -0
  44. package/dist/esm/libs/hook-api/index.js +281 -0
  45. package/dist/esm/libs/hook-api/route.js +68 -0
  46. package/dist/esm/libs/hook-api/template.js +127 -0
  47. package/dist/esm/libs/loadConfig.js +82 -0
  48. package/dist/esm/libs/logger.js +205 -0
  49. package/dist/esm/libs/metrics.js +6 -0
  50. package/dist/esm/libs/proxy.js +244 -0
  51. package/dist/esm/libs/render/cache/__tests__/cache.fun.test.js +291 -0
  52. package/dist/esm/libs/render/cache/__tests__/cache.test.js +781 -0
  53. package/dist/esm/libs/render/cache/__tests__/cacheable.js +67 -0
  54. package/dist/esm/libs/render/cache/__tests__/error-configuration.js +45 -0
  55. package/dist/esm/libs/render/cache/__tests__/matched-cache.js +147 -0
  56. package/dist/esm/libs/render/cache/index.js +346 -0
  57. package/dist/esm/libs/render/cache/page-caches/index.js +154 -0
  58. package/dist/esm/libs/render/cache/page-caches/lru.js +84 -0
  59. package/dist/esm/libs/render/cache/spr.js +492 -0
  60. package/dist/esm/libs/render/cache/type.js +1 -0
  61. package/dist/esm/libs/render/cache/util.js +280 -0
  62. package/dist/esm/libs/render/index.js +234 -0
  63. package/dist/esm/libs/render/measure.js +146 -0
  64. package/dist/esm/libs/render/reader.js +339 -0
  65. package/dist/esm/libs/render/ssr.js +223 -0
  66. package/dist/esm/libs/render/static.js +216 -0
  67. package/dist/esm/libs/render/type.js +7 -0
  68. package/dist/esm/libs/route/index.js +130 -0
  69. package/dist/esm/libs/route/matcher.js +143 -0
  70. package/dist/esm/libs/route/route.js +40 -0
  71. package/dist/esm/libs/serve-file.js +184 -0
  72. package/dist/esm/server/index.js +505 -0
  73. package/dist/esm/server/modern-server-split.js +360 -0
  74. package/dist/esm/server/modern-server.js +1090 -0
  75. package/dist/esm/type.js +1 -0
  76. package/dist/esm/utils.js +147 -0
  77. package/dist/esm/worker-server.js +233 -0
  78. package/dist/esm-node/constants.js +35 -0
  79. package/dist/esm-node/index.js +18 -0
  80. package/dist/esm-node/libs/context/context.js +160 -0
  81. package/dist/esm-node/libs/context/index.js +6 -0
  82. package/dist/esm-node/libs/hook-api/index.js +119 -0
  83. package/dist/esm-node/libs/hook-api/route.js +20 -0
  84. package/dist/esm-node/libs/hook-api/template.js +73 -0
  85. package/dist/esm-node/libs/loadConfig.js +45 -0
  86. package/dist/esm-node/libs/logger.js +98 -0
  87. package/dist/esm-node/libs/metrics.js +11 -0
  88. package/dist/esm-node/libs/proxy.js +57 -0
  89. package/dist/esm-node/libs/render/cache/__tests__/cache.fun.test.js +83 -0
  90. package/dist/esm-node/libs/render/cache/__tests__/cache.test.js +210 -0
  91. package/dist/esm-node/libs/render/cache/__tests__/cacheable.js +47 -0
  92. package/dist/esm-node/libs/render/cache/__tests__/error-configuration.js +37 -0
  93. package/dist/esm-node/libs/render/cache/__tests__/matched-cache.js +91 -0
  94. package/dist/esm-node/libs/render/cache/index.js +76 -0
  95. package/dist/esm-node/libs/render/cache/page-caches/index.js +10 -0
  96. package/dist/esm-node/libs/render/cache/page-caches/lru.js +29 -0
  97. package/dist/esm-node/libs/render/cache/spr.js +220 -0
  98. package/dist/esm-node/libs/render/cache/type.js +0 -0
  99. package/dist/esm-node/libs/render/cache/util.js +80 -0
  100. package/dist/esm-node/libs/render/index.js +64 -0
  101. package/dist/esm-node/libs/render/measure.js +51 -0
  102. package/dist/esm-node/libs/render/reader.js +85 -0
  103. package/dist/esm-node/libs/render/ssr.js +80 -0
  104. package/dist/esm-node/libs/render/static.js +38 -0
  105. package/dist/esm-node/libs/render/type.js +9 -0
  106. package/dist/esm-node/libs/route/index.js +54 -0
  107. package/dist/esm-node/libs/route/matcher.js +87 -0
  108. package/dist/esm-node/libs/route/route.js +16 -0
  109. package/dist/esm-node/libs/serve-file.js +47 -0
  110. package/dist/esm-node/server/index.js +156 -0
  111. package/dist/esm-node/server/modern-server-split.js +43 -0
  112. package/dist/esm-node/server/modern-server.js +484 -0
  113. package/dist/esm-node/type.js +0 -0
  114. package/dist/esm-node/utils.js +120 -0
  115. package/dist/esm-node/worker-server.js +69 -0
  116. package/dist/js/modern/libs/render/index.js +4 -2
  117. package/dist/js/modern/server/modern-server.js +14 -8
  118. package/dist/js/node/libs/render/index.js +4 -2
  119. package/dist/js/node/server/modern-server.js +14 -8
  120. package/dist/js/treeshaking/libs/render/index.js +4 -3
  121. package/dist/js/treeshaking/server/modern-server.js +14 -8
  122. package/dist/types/libs/context/context.d.ts +1 -1
  123. package/dist/types/libs/render/index.d.ts +3 -1
  124. package/dist/types/utils.d.ts +1 -1
  125. package/package.json +17 -18
@@ -0,0 +1,87 @@
1
+ import {
2
+ match,
3
+ pathToRegexp,
4
+ compile
5
+ } from "path-to-regexp";
6
+ import { ModernRoute } from "./route";
7
+ const removeTailSlash = (s) => s.replace(/\/+$/, "");
8
+ const removeHtmlSuffix = (url) => {
9
+ if (url.endsWith(".html")) {
10
+ return url.slice(0, -5);
11
+ }
12
+ return url;
13
+ };
14
+ const toPath = (reg, params) => {
15
+ const fn = compile(reg, { encode: encodeURIComponent });
16
+ return fn(params);
17
+ };
18
+ const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
19
+ class RouteMatcher {
20
+ constructor(spec) {
21
+ this.urlPath = "";
22
+ this.spec = spec;
23
+ this.setupUrlPath();
24
+ }
25
+ generate(url) {
26
+ const route = new ModernRoute(this.spec);
27
+ if (this.urlPath) {
28
+ const params = this.parseURLParams(url);
29
+ route.urlPath = toPath(route.urlPath, params);
30
+ route.params = params;
31
+ }
32
+ return route;
33
+ }
34
+ parseURLParams(pathname) {
35
+ if (!this.urlMatcher) {
36
+ return {};
37
+ } else {
38
+ const matchResult = this.urlMatcher(pathname);
39
+ return matchResult.params;
40
+ }
41
+ }
42
+ matchLength(pathname) {
43
+ var _a;
44
+ if (!this.urlReg) {
45
+ return this.urlPath.length;
46
+ } else {
47
+ const result = this.urlReg.exec(pathname);
48
+ return ((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.length) || null;
49
+ }
50
+ }
51
+ matchUrlPath(requestUrl) {
52
+ let urlWithoutSlash = requestUrl.endsWith("/") && requestUrl !== "/" ? requestUrl.slice(0, -1) : requestUrl;
53
+ urlWithoutSlash = removeHtmlSuffix(urlWithoutSlash);
54
+ if (this.urlMatcher) {
55
+ return Boolean(this.urlMatcher(urlWithoutSlash));
56
+ } else {
57
+ const urlPath = removeHtmlSuffix(this.urlPath);
58
+ if (urlWithoutSlash.startsWith(urlPath)) {
59
+ if (urlPath !== "/" && urlWithoutSlash.length > urlPath.length && !urlWithoutSlash.startsWith(`${urlPath}/`)) {
60
+ return false;
61
+ }
62
+ return true;
63
+ }
64
+ return false;
65
+ }
66
+ }
67
+ matchEntry(entryName) {
68
+ return this.spec.entryName === entryName;
69
+ }
70
+ setupUrlPath() {
71
+ const { urlPath } = this.spec;
72
+ this.urlPath = urlPath === "/" ? urlPath : removeTailSlash(urlPath);
73
+ const useReg = regCharsDetector.test(urlPath);
74
+ if (useReg) {
75
+ this.urlMatcher = match(urlPath, {
76
+ end: false,
77
+ decode: decodeURIComponent
78
+ });
79
+ this.urlReg = pathToRegexp(urlPath, [], {
80
+ end: false
81
+ });
82
+ }
83
+ }
84
+ }
85
+ export {
86
+ RouteMatcher
87
+ };
@@ -0,0 +1,16 @@
1
+ class ModernRoute {
2
+ constructor(routeSpec) {
3
+ this.params = {};
4
+ this.entryName = routeSpec.entryName || "";
5
+ this.urlPath = routeSpec.urlPath;
6
+ this.entryPath = routeSpec.entryPath || "";
7
+ this.isSSR = routeSpec.isSSR || false;
8
+ this.isSPA = routeSpec.isSPA || false;
9
+ this.isApi = routeSpec.isApi || false;
10
+ this.bundle = routeSpec.bundle || "";
11
+ this.responseHeaders = routeSpec.responseHeaders;
12
+ }
13
+ }
14
+ export {
15
+ ModernRoute
16
+ };
@@ -0,0 +1,47 @@
1
+ import serve from "serve-static";
2
+ import { isString, isRegExp } from "@modern-js/utils";
3
+ import { useLocalPrefix } from "../utils";
4
+ const removedPrefix = (req, prefix) => {
5
+ if (useLocalPrefix(prefix)) {
6
+ req.url = req.url.slice(prefix.length);
7
+ return () => {
8
+ req.url = prefix + req.url;
9
+ };
10
+ } else {
11
+ return () => {
12
+ };
13
+ }
14
+ };
15
+ const faviconFallbackHandler = (context, next) => {
16
+ if (context.url === "/favicon.ico") {
17
+ context.res.statusCode = 204;
18
+ context.res.end();
19
+ } else {
20
+ next();
21
+ }
22
+ };
23
+ const createStaticFileHandler = (rules, output = {}) => async (context, next) => {
24
+ const { url: requestUrl, req, res } = context;
25
+ const { assetPrefix = "/" } = output;
26
+ const hitRule = rules.find((item) => {
27
+ if (isString(item.path) && requestUrl.startsWith(item.path)) {
28
+ return true;
29
+ } else if (isRegExp(item.path) && item.path.test(requestUrl)) {
30
+ return true;
31
+ }
32
+ return false;
33
+ });
34
+ if (hitRule) {
35
+ const resume = removedPrefix(req, assetPrefix);
36
+ serve(hitRule.target)(req, res, () => {
37
+ resume();
38
+ next();
39
+ });
40
+ } else {
41
+ return next();
42
+ }
43
+ };
44
+ export {
45
+ createStaticFileHandler,
46
+ faviconFallbackHandler
47
+ };
@@ -0,0 +1,156 @@
1
+ import path from "path";
2
+ import fs from "fs";
3
+ import {
4
+ Logger,
5
+ SHARED_DIR,
6
+ OUTPUT_CONFIG_FILE,
7
+ dotenv,
8
+ dotenvExpand,
9
+ INTERNAL_SERVER_PLUGINS
10
+ } from "@modern-js/utils";
11
+ import {
12
+ serverManager,
13
+ AppContext,
14
+ ConfigContext,
15
+ loadPlugins
16
+ } from "@modern-js/server-core";
17
+ import { metrics as defaultMetrics } from "../libs/metrics";
18
+ import {
19
+ loadConfig,
20
+ getServerConfigPath,
21
+ requireConfig
22
+ } from "../libs/loadConfig";
23
+ import { debug } from "../utils";
24
+ import { createProdServer } from "./modern-server-split";
25
+ class Server {
26
+ constructor(options) {
27
+ this.serverImpl = createProdServer;
28
+ options.logger = options.logger || new Logger({
29
+ level: "warn"
30
+ });
31
+ options.metrics = options.metrics || defaultMetrics;
32
+ this.options = options;
33
+ this.serverConfig = {};
34
+ }
35
+ async init() {
36
+ const { options } = this;
37
+ this.loadServerEnv(options);
38
+ this.initServerConfig(options);
39
+ await this.injectContext(this.runner, options);
40
+ this.runner = await this.createHookRunner();
41
+ await this.initConfig(this.runner, options);
42
+ await this.injectContext(this.runner, options);
43
+ this.server = this.serverImpl(options);
44
+ await this.runPrepareHook(this.runner);
45
+ this.app = await this.server.createHTTPServer(this.getRequestHandler());
46
+ await this.server.onInit(this.runner, this.app);
47
+ return this;
48
+ }
49
+ runConfigHook(runner, serverConfig) {
50
+ const newServerConfig = runner.config(serverConfig || {});
51
+ return newServerConfig;
52
+ }
53
+ async runPrepareHook(runner) {
54
+ runner.prepare();
55
+ }
56
+ initServerConfig(options) {
57
+ const { pwd, serverConfigFile } = options;
58
+ const distDirectory = path.join(pwd, options.config.output.path || "dist");
59
+ const serverConfigPath = getServerConfigPath(
60
+ distDirectory,
61
+ serverConfigFile
62
+ );
63
+ const serverConfig = requireConfig(serverConfigPath);
64
+ this.serverConfig = serverConfig;
65
+ }
66
+ async initConfig(runner, options) {
67
+ const { pwd, config } = options;
68
+ const { serverConfig } = this;
69
+ const finalServerConfig = this.runConfigHook(runner, serverConfig);
70
+ const resolvedConfigPath = path.join(
71
+ pwd,
72
+ config.output.path || "dist",
73
+ OUTPUT_CONFIG_FILE
74
+ );
75
+ options.config = loadConfig({
76
+ cliConfig: config,
77
+ serverConfig: finalServerConfig,
78
+ resolvedConfigPath
79
+ });
80
+ }
81
+ async close() {
82
+ this.app.close();
83
+ }
84
+ listen(options, listener) {
85
+ const callback = () => {
86
+ listener == null ? void 0 : listener();
87
+ };
88
+ if (typeof options === "object") {
89
+ this.app.listen(options, callback);
90
+ } else {
91
+ this.app.listen(process.env.PORT || options || 8080, callback);
92
+ }
93
+ }
94
+ getRequestHandler() {
95
+ return (req, res, next) => {
96
+ const requestHandler = this.server.getRequestHandler();
97
+ return requestHandler(req, res, next);
98
+ };
99
+ }
100
+ async render(req, res, url) {
101
+ return this.server.render(req, res, url);
102
+ }
103
+ async createHookRunner() {
104
+ serverManager.clear();
105
+ const { options } = this;
106
+ const {
107
+ internalPlugins = INTERNAL_SERVER_PLUGINS,
108
+ pwd,
109
+ plugins = []
110
+ } = options;
111
+ const serverPlugins = this.serverConfig.plugins || [];
112
+ const loadedPlugins = loadPlugins(pwd, [...serverPlugins, ...plugins], {
113
+ internalPlugins
114
+ });
115
+ debug("plugins", loadedPlugins);
116
+ loadedPlugins.forEach((p) => {
117
+ serverManager.usePlugin(p);
118
+ });
119
+ const hooksRunner = await serverManager.init();
120
+ return hooksRunner;
121
+ }
122
+ async injectContext(runner, options) {
123
+ const appContext = this.initAppContext();
124
+ const { config, pwd } = options;
125
+ ConfigContext.set(config);
126
+ AppContext.set({
127
+ ...appContext,
128
+ distDirectory: path.join(pwd, config.output.path || "dist")
129
+ });
130
+ }
131
+ initAppContext() {
132
+ const { options } = this;
133
+ const { pwd: appDirectory, plugins = [], config } = options;
134
+ const serverPlugins = plugins.map((p) => ({
135
+ server: p
136
+ }));
137
+ return {
138
+ appDirectory,
139
+ distDirectory: path.join(appDirectory, config.output.path || "dist"),
140
+ sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
141
+ plugins: serverPlugins
142
+ };
143
+ }
144
+ loadServerEnv(options) {
145
+ const { pwd: appDirectory } = options;
146
+ const serverEnv = process.env.MODERN_ENV;
147
+ const serverEnvPath = path.resolve(appDirectory, `.env.${serverEnv}`);
148
+ if (serverEnv && fs.existsSync(serverEnvPath) && !fs.statSync(serverEnvPath).isDirectory()) {
149
+ const envConfig = dotenv.config({ path: serverEnvPath });
150
+ dotenvExpand(envConfig);
151
+ }
152
+ }
153
+ }
154
+ export {
155
+ Server
156
+ };
@@ -0,0 +1,43 @@
1
+ import { ModernServer } from "./modern-server";
2
+ class ModernSSRServer extends ModernServer {
3
+ prepareAPIHandler(_) {
4
+ return null;
5
+ }
6
+ async handleAPI(context) {
7
+ return this.render404(context);
8
+ }
9
+ }
10
+ class ModernAPIServer extends ModernServer {
11
+ prepareWebHandler(_) {
12
+ return null;
13
+ }
14
+ filterRoutes(routes) {
15
+ return routes.filter((route) => route.isApi);
16
+ }
17
+ }
18
+ class ModernWebServer extends ModernServer {
19
+ async warmupSSRBundle() {
20
+ return null;
21
+ }
22
+ async handleAPI(context) {
23
+ return this.render404(context);
24
+ }
25
+ async handleWeb(context, route) {
26
+ route.isSSR = false;
27
+ return super.handleWeb(context, route);
28
+ }
29
+ }
30
+ const createProdServer = (options) => {
31
+ if (options.apiOnly) {
32
+ return new ModernAPIServer(options);
33
+ } else if (options.ssrOnly) {
34
+ return new ModernSSRServer(options);
35
+ } else if (options.webOnly) {
36
+ return new ModernWebServer(options);
37
+ } else {
38
+ return new ModernServer(options);
39
+ }
40
+ };
41
+ export {
42
+ createProdServer
43
+ };