@modern-js/prod-server 2.42.2-alpha.0 → 2.43.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.
- package/dist/cjs/libs/render/index.js +3 -11
- package/dist/cjs/libs/render/ssr.js +2 -2
- package/dist/cjs/libs/render/{cache/page-caches/lru.js → ssrCache/cacheMod.js} +21 -31
- package/dist/cjs/libs/render/ssrCache/index.js +81 -0
- package/dist/cjs/libs/render/ssrCache/manager.js +104 -0
- package/dist/cjs/libs/render/static.js +5 -5
- package/dist/cjs/server/index.js +2 -0
- package/dist/cjs/server/modernServer.js +2 -9
- package/dist/esm/libs/render/index.js +3 -11
- package/dist/esm/libs/render/ssr.js +2 -2
- package/dist/esm/libs/render/ssrCache/cacheMod.js +33 -0
- package/dist/esm/libs/render/ssrCache/index.js +146 -0
- package/dist/esm/libs/render/ssrCache/manager.js +159 -0
- package/dist/esm/libs/render/static.js +5 -5
- package/dist/esm/server/index.js +14 -4
- package/dist/esm/server/modernServer.js +32 -42
- package/dist/esm-node/libs/render/index.js +3 -11
- package/dist/esm-node/libs/render/ssr.js +2 -2
- package/dist/esm-node/libs/render/ssrCache/cacheMod.js +22 -0
- package/dist/esm-node/libs/render/ssrCache/index.js +57 -0
- package/dist/esm-node/libs/render/ssrCache/manager.js +80 -0
- package/dist/esm-node/libs/render/static.js +5 -5
- package/dist/esm-node/server/index.js +2 -0
- package/dist/esm-node/server/modernServer.js +2 -9
- package/dist/types/libs/context/index.d.ts +2 -0
- package/dist/types/libs/preload/flushServerHeader.d.ts +2 -0
- package/dist/types/libs/proxy.d.ts +2 -0
- package/dist/types/libs/render/ssrCache/cacheMod.d.ts +8 -0
- package/dist/types/libs/render/ssrCache/index.d.ts +7 -0
- package/dist/types/libs/render/ssrCache/manager.d.ts +14 -0
- package/dist/types/renderHtml.d.ts +2 -0
- package/dist/types/server/index.d.ts +2 -0
- package/dist/types/server/modernServer.d.ts +2 -3
- package/dist/types/type.d.ts +2 -0
- package/package.json +8 -11
- package/dist/cjs/libs/render/cache/__tests__/cache.fun.test.js +0 -95
- package/dist/cjs/libs/render/cache/__tests__/cache.test.js +0 -223
- package/dist/cjs/libs/render/cache/__tests__/cacheable.js +0 -93
- package/dist/cjs/libs/render/cache/__tests__/error-configuration.js +0 -71
- package/dist/cjs/libs/render/cache/__tests__/matched-cache.js +0 -173
- package/dist/cjs/libs/render/cache/index.js +0 -92
- package/dist/cjs/libs/render/cache/page-caches/index.js +0 -36
- package/dist/cjs/libs/render/cache/spr.js +0 -247
- package/dist/cjs/libs/render/cache/type.js +0 -16
- package/dist/cjs/libs/render/cache/util.js +0 -121
- package/dist/cjs/libs/render/reader.js +0 -131
- package/dist/esm/libs/render/cache/__tests__/cache.fun.test.js +0 -124
- package/dist/esm/libs/render/cache/__tests__/cache.test.js +0 -612
- package/dist/esm/libs/render/cache/__tests__/cacheable.js +0 -69
- package/dist/esm/libs/render/cache/__tests__/error-configuration.js +0 -47
- package/dist/esm/libs/render/cache/__tests__/matched-cache.js +0 -149
- package/dist/esm/libs/render/cache/index.js +0 -204
- package/dist/esm/libs/render/cache/page-caches/index.js +0 -34
- package/dist/esm/libs/render/cache/page-caches/lru.js +0 -57
- package/dist/esm/libs/render/cache/spr.js +0 -345
- package/dist/esm/libs/render/cache/type.js +0 -0
- package/dist/esm/libs/render/cache/util.js +0 -105
- package/dist/esm/libs/render/reader.js +0 -196
- package/dist/esm-node/libs/render/cache/__tests__/cache.fun.test.js +0 -72
- package/dist/esm-node/libs/render/cache/__tests__/cache.test.js +0 -222
- package/dist/esm-node/libs/render/cache/__tests__/cacheable.js +0 -69
- package/dist/esm-node/libs/render/cache/__tests__/error-configuration.js +0 -47
- package/dist/esm-node/libs/render/cache/__tests__/matched-cache.js +0 -149
- package/dist/esm-node/libs/render/cache/index.js +0 -72
- package/dist/esm-node/libs/render/cache/page-caches/index.js +0 -12
- package/dist/esm-node/libs/render/cache/page-caches/lru.js +0 -32
- package/dist/esm-node/libs/render/cache/spr.js +0 -212
- package/dist/esm-node/libs/render/cache/type.js +0 -0
- package/dist/esm-node/libs/render/cache/util.js +0 -80
- package/dist/esm-node/libs/render/reader.js +0 -93
- package/dist/types/libs/render/cache/__tests__/cache.fun.test.d.ts +0 -1
- package/dist/types/libs/render/cache/__tests__/cache.test.d.ts +0 -1
- package/dist/types/libs/render/cache/__tests__/cacheable.d.ts +0 -62
- package/dist/types/libs/render/cache/__tests__/error-configuration.d.ts +0 -28
- package/dist/types/libs/render/cache/__tests__/matched-cache.d.ts +0 -124
- package/dist/types/libs/render/cache/index.d.ts +0 -6
- package/dist/types/libs/render/cache/page-caches/index.d.ts +0 -2
- package/dist/types/libs/render/cache/page-caches/lru.d.ts +0 -15
- package/dist/types/libs/render/cache/spr.d.ts +0 -22
- package/dist/types/libs/render/cache/type.d.ts +0 -48
- package/dist/types/libs/render/cache/util.d.ts +0 -18
- package/dist/types/libs/render/reader.d.ts +0 -20
|
@@ -33,10 +33,10 @@ __export(render_exports, {
|
|
|
33
33
|
module.exports = __toCommonJS(render_exports);
|
|
34
34
|
var import_path = __toESM(require("path"));
|
|
35
35
|
var import_utils = require("@modern-js/utils");
|
|
36
|
+
var import_fileReader = require("@modern-js/runtime-utils/fileReader");
|
|
36
37
|
var import_constants = require("../../constants");
|
|
37
38
|
var import_shouldFlushServerHeader = require("../preload/shouldFlushServerHeader");
|
|
38
39
|
var import_static = require("./static");
|
|
39
|
-
var import_reader = require("./reader");
|
|
40
40
|
var ssr = __toESM(require("./ssr"));
|
|
41
41
|
var import_utils2 = require("./utils");
|
|
42
42
|
const calcFallback = (metaName) => `x-${(0, import_utils.cutNameByHyphen)(metaName)}-ssr-fallback`;
|
|
@@ -51,7 +51,7 @@ const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, s
|
|
|
51
51
|
return result;
|
|
52
52
|
}
|
|
53
53
|
const templatePath = entry;
|
|
54
|
-
const content = await
|
|
54
|
+
const content = await import_fileReader.fileReader.readFile(templatePath);
|
|
55
55
|
if (!content) {
|
|
56
56
|
return null;
|
|
57
57
|
}
|
|
@@ -81,15 +81,7 @@ const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, s
|
|
|
81
81
|
staticGenerate,
|
|
82
82
|
nonce
|
|
83
83
|
};
|
|
84
|
-
const result = await (ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) : ssr.render(ctx,
|
|
85
|
-
distDir,
|
|
86
|
-
entryName: route.entryName,
|
|
87
|
-
urlPath: route.urlPath,
|
|
88
|
-
bundle: route.bundle,
|
|
89
|
-
template: content.toString(),
|
|
90
|
-
staticGenerate,
|
|
91
|
-
nonce
|
|
92
|
-
}, runner));
|
|
84
|
+
const result = await (ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) : ssr.render(ctx, ssrRenderOptions, runner));
|
|
93
85
|
return result;
|
|
94
86
|
} catch (err) {
|
|
95
87
|
ctx.error(import_constants.ERROR_DIGEST.ERENDER, err.stack || err.message);
|
|
@@ -33,9 +33,9 @@ __export(ssr_exports, {
|
|
|
33
33
|
module.exports = __toCommonJS(ssr_exports);
|
|
34
34
|
var import_path = __toESM(require("path"));
|
|
35
35
|
var import_utils = require("@modern-js/utils");
|
|
36
|
-
var import_cache = __toESM(require("./cache"));
|
|
37
36
|
var import_measure = require("./measure");
|
|
38
37
|
var import_utils2 = require("./utils");
|
|
38
|
+
var import_ssrCache = require("./ssrCache");
|
|
39
39
|
const render = async (ctx, renderOptions, runner) => {
|
|
40
40
|
var _ctx_res;
|
|
41
41
|
const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false, nonce } = renderOptions;
|
|
@@ -83,7 +83,7 @@ const render = async (ctx, renderOptions, runner) => {
|
|
|
83
83
|
runner.extendSSRContext(context);
|
|
84
84
|
const bundleJSContent = await Promise.resolve(require(bundleJS));
|
|
85
85
|
const serverRender = bundleJSContent[import_utils.SERVER_RENDER_FUNCTION_NAME];
|
|
86
|
-
const content = await (0,
|
|
86
|
+
const content = await (0, import_ssrCache.ssrCache)(ctx.req, serverRender, context);
|
|
87
87
|
const { url, status = 302 } = context.redirection;
|
|
88
88
|
if (url) {
|
|
89
89
|
return {
|
|
@@ -26,41 +26,31 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
26
26
|
mod
|
|
27
27
|
));
|
|
28
28
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
-
var
|
|
30
|
-
__export(
|
|
31
|
-
|
|
29
|
+
var cacheMod_exports = {};
|
|
30
|
+
__export(cacheMod_exports, {
|
|
31
|
+
cacheMod: () => cacheMod
|
|
32
32
|
});
|
|
33
|
-
module.exports = __toCommonJS(
|
|
33
|
+
module.exports = __toCommonJS(cacheMod_exports);
|
|
34
34
|
var import_define_property = require("@swc/helpers/_/_define_property");
|
|
35
|
-
var
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
this.caches.set(key, cache);
|
|
51
|
-
return Promise.resolve();
|
|
52
|
-
}
|
|
53
|
-
del(key) {
|
|
54
|
-
this.caches.del(key);
|
|
55
|
-
}
|
|
56
|
-
constructor(options) {
|
|
57
|
-
(0, import_define_property._)(this, "caches", void 0);
|
|
58
|
-
(0, import_define_property._)(this, "max", void 0);
|
|
59
|
-
this.max = options.max;
|
|
60
|
-
this.caches = new import_lru_cache.default(this.max);
|
|
35
|
+
var import_path = __toESM(require("path"));
|
|
36
|
+
var import_utils = require("@modern-js/utils");
|
|
37
|
+
const CACHE_FILENAME = "cache";
|
|
38
|
+
class ServerCacheMod {
|
|
39
|
+
loadServerCacheMod(pwd = process.cwd()) {
|
|
40
|
+
const serverCacheFilepath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, CACHE_FILENAME);
|
|
41
|
+
const mod = (0, import_utils.requireExistModule)(serverCacheFilepath, {
|
|
42
|
+
interop: false
|
|
43
|
+
});
|
|
44
|
+
this.customContainer = mod === null || mod === void 0 ? void 0 : mod.customContainer;
|
|
45
|
+
this.cacheOption = mod === null || mod === void 0 ? void 0 : mod.cacheOption;
|
|
46
|
+
}
|
|
47
|
+
constructor() {
|
|
48
|
+
(0, import_define_property._)(this, "customContainer", void 0);
|
|
49
|
+
(0, import_define_property._)(this, "cacheOption", void 0);
|
|
61
50
|
}
|
|
62
51
|
}
|
|
52
|
+
const cacheMod = new ServerCacheMod();
|
|
63
53
|
// Annotate the CommonJS export names for ESM import in node:
|
|
64
54
|
0 && (module.exports = {
|
|
65
|
-
|
|
55
|
+
cacheMod
|
|
66
56
|
});
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var ssrCache_exports = {};
|
|
20
|
+
__export(ssrCache_exports, {
|
|
21
|
+
ssrCache: () => ssrCache
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(ssrCache_exports);
|
|
24
|
+
var import_stream = require("stream");
|
|
25
|
+
var import_storer = require("@modern-js/runtime-utils/storer");
|
|
26
|
+
var import_cacheMod = require("./cacheMod");
|
|
27
|
+
var import_manager = require("./manager");
|
|
28
|
+
const cacheStorage = (0, import_storer.createMemoryStorage)("__ssr__cache");
|
|
29
|
+
async function ssrCache(req, render, ssrContext) {
|
|
30
|
+
const { customContainer, cacheOption } = import_cacheMod.cacheMod;
|
|
31
|
+
const cacheControl = await matchCacheControl(req, cacheOption);
|
|
32
|
+
const cacheManager = new import_manager.CacheManager(customContainer ? customContainer : cacheStorage);
|
|
33
|
+
if (cacheControl) {
|
|
34
|
+
return cacheManager.getCacheResult(req, cacheControl, render, ssrContext);
|
|
35
|
+
} else {
|
|
36
|
+
const renderResult = await render(ssrContext);
|
|
37
|
+
if (typeof renderResult === "string") {
|
|
38
|
+
return renderResult;
|
|
39
|
+
} else {
|
|
40
|
+
const stream = new import_stream.Transform({
|
|
41
|
+
write(chunk, _, callback) {
|
|
42
|
+
this.push(chunk);
|
|
43
|
+
callback();
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
return renderResult(stream);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
async function matchCacheControl(req, cacheOption) {
|
|
51
|
+
if (!cacheOption) {
|
|
52
|
+
return void 0;
|
|
53
|
+
} else if (isCacheControl(cacheOption)) {
|
|
54
|
+
return cacheOption;
|
|
55
|
+
} else if (isCacheOptionProvider(cacheOption)) {
|
|
56
|
+
return cacheOption(req);
|
|
57
|
+
} else {
|
|
58
|
+
const url = req.url;
|
|
59
|
+
const options = Object.entries(cacheOption);
|
|
60
|
+
for (const [key, option] of options) {
|
|
61
|
+
if (key === "*" || new RegExp(key).test(url)) {
|
|
62
|
+
if (typeof option === "function") {
|
|
63
|
+
return option(req);
|
|
64
|
+
} else {
|
|
65
|
+
return option;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return void 0;
|
|
70
|
+
}
|
|
71
|
+
function isCacheOptionProvider(option) {
|
|
72
|
+
return typeof option === "function";
|
|
73
|
+
}
|
|
74
|
+
function isCacheControl(option) {
|
|
75
|
+
return typeof option === "object" && option !== null && "maxAge" in option;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
79
|
+
0 && (module.exports = {
|
|
80
|
+
ssrCache
|
|
81
|
+
});
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var manager_exports = {};
|
|
20
|
+
__export(manager_exports, {
|
|
21
|
+
CacheManager: () => CacheManager
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(manager_exports);
|
|
24
|
+
var import_define_property = require("@swc/helpers/_/_define_property");
|
|
25
|
+
var import_stream = require("stream");
|
|
26
|
+
class CacheManager {
|
|
27
|
+
async getCacheResult(req, cacheControl, render, ssrContext) {
|
|
28
|
+
const key = this.computedKey(req, cacheControl);
|
|
29
|
+
const value = await this.containter.get(key);
|
|
30
|
+
const { maxAge, staleWhileRevalidate } = cacheControl;
|
|
31
|
+
const ttl = maxAge + staleWhileRevalidate;
|
|
32
|
+
if (value) {
|
|
33
|
+
const cache = JSON.parse(value);
|
|
34
|
+
const interval = Date.now() - cache.cursor;
|
|
35
|
+
if (interval <= maxAge) {
|
|
36
|
+
return cache.val;
|
|
37
|
+
} else if (interval <= staleWhileRevalidate + maxAge) {
|
|
38
|
+
this.processCache(key, render, ssrContext, ttl);
|
|
39
|
+
return cache.val;
|
|
40
|
+
} else {
|
|
41
|
+
return this.processCache(key, render, ssrContext, ttl);
|
|
42
|
+
}
|
|
43
|
+
} else {
|
|
44
|
+
return this.processCache(key, render, ssrContext, ttl);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
async processCache(key, render, ssrContext, ttl) {
|
|
48
|
+
const renderResult = await render(ssrContext);
|
|
49
|
+
if (typeof renderResult === "string") {
|
|
50
|
+
const current = Date.now();
|
|
51
|
+
const cache = {
|
|
52
|
+
val: renderResult,
|
|
53
|
+
cursor: current
|
|
54
|
+
};
|
|
55
|
+
await this.containter.set(key, JSON.stringify(cache), {
|
|
56
|
+
ttl
|
|
57
|
+
});
|
|
58
|
+
return renderResult;
|
|
59
|
+
} else {
|
|
60
|
+
let html;
|
|
61
|
+
const stream = new import_stream.Transform({
|
|
62
|
+
write(chunk, _, callback) {
|
|
63
|
+
html += chunk.toString();
|
|
64
|
+
this.push(chunk);
|
|
65
|
+
callback();
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
stream.on("close", () => {
|
|
69
|
+
const current = Date.now();
|
|
70
|
+
const cache = {
|
|
71
|
+
val: html,
|
|
72
|
+
cursor: current
|
|
73
|
+
};
|
|
74
|
+
this.containter.set(key, JSON.stringify(cache), {
|
|
75
|
+
ttl
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
return renderResult(stream);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
computedKey(req, cacheControl) {
|
|
82
|
+
const { url } = req;
|
|
83
|
+
const [pathname] = url.split("?");
|
|
84
|
+
const { customKey } = cacheControl;
|
|
85
|
+
const defaultKey = pathname.replace(/.+\/+$/, "");
|
|
86
|
+
if (customKey) {
|
|
87
|
+
if (typeof customKey === "string") {
|
|
88
|
+
return customKey;
|
|
89
|
+
} else {
|
|
90
|
+
return customKey(defaultKey);
|
|
91
|
+
}
|
|
92
|
+
} else {
|
|
93
|
+
return defaultKey;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
constructor(containter) {
|
|
97
|
+
(0, import_define_property._)(this, "containter", void 0);
|
|
98
|
+
this.containter = containter;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
102
|
+
0 && (module.exports = {
|
|
103
|
+
CacheManager
|
|
104
|
+
});
|
|
@@ -33,19 +33,19 @@ __export(static_exports, {
|
|
|
33
33
|
module.exports = __toCommonJS(static_exports);
|
|
34
34
|
var import_path = __toESM(require("path"));
|
|
35
35
|
var import_utils = require("@modern-js/utils");
|
|
36
|
-
var
|
|
36
|
+
var import_fileReader = require("@modern-js/runtime-utils/fileReader");
|
|
37
37
|
async function handleDirectory(ctx, entryPath, urlPath) {
|
|
38
38
|
const { path: pathname } = ctx;
|
|
39
39
|
const filepath = import_path.default.join(entryPath, trimLeft(pathname, urlPath));
|
|
40
|
-
let content = await
|
|
40
|
+
let content = await import_fileReader.fileReader.readFile(filepath);
|
|
41
41
|
let contentType = import_utils.mime.contentType(import_path.default.extname(filepath) || "");
|
|
42
42
|
if (!content) {
|
|
43
43
|
if (pathname.endsWith("/")) {
|
|
44
|
-
content = await
|
|
44
|
+
content = await import_fileReader.fileReader.readFile(`${filepath}index.html`);
|
|
45
45
|
} else if (!pathname.includes(".")) {
|
|
46
|
-
content = await
|
|
46
|
+
content = await import_fileReader.fileReader.readFile(`${filepath}.html`);
|
|
47
47
|
if (!content) {
|
|
48
|
-
content = await
|
|
48
|
+
content = await import_fileReader.fileReader.readFile(`${filepath}/index.html`);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
if (content) {
|
package/dist/cjs/server/index.js
CHANGED
|
@@ -121,6 +121,8 @@ class Server {
|
|
|
121
121
|
});
|
|
122
122
|
}
|
|
123
123
|
async close() {
|
|
124
|
+
var _this_server_close, _this_server;
|
|
125
|
+
await ((_this_server_close = (_this_server = this.server).close) === null || _this_server_close === void 0 ? void 0 : _this_server_close.call(_this_server));
|
|
124
126
|
this.app.close();
|
|
125
127
|
}
|
|
126
128
|
listen(options, listener) {
|
|
@@ -40,11 +40,11 @@ var import_route = require("../libs/route");
|
|
|
40
40
|
var import_render = require("../libs/render");
|
|
41
41
|
var import_serveFile = require("../libs/serveFile");
|
|
42
42
|
var import_utils2 = require("../utils");
|
|
43
|
-
var reader = __toESM(require("../libs/render/reader"));
|
|
44
43
|
var import_proxy = require("../libs/proxy");
|
|
45
44
|
var import_context = require("../libs/context");
|
|
46
45
|
var import_constants = require("../constants");
|
|
47
46
|
var import_hook_api = require("../libs/hook-api");
|
|
47
|
+
var import_cacheMod = require("../libs/render/ssrCache/cacheMod");
|
|
48
48
|
const SERVER_DIR = "./server";
|
|
49
49
|
class ModernServer {
|
|
50
50
|
// server prepare
|
|
@@ -52,7 +52,6 @@ class ModernServer {
|
|
|
52
52
|
var _conf_bff, _this_conf_output;
|
|
53
53
|
this.runner = runner;
|
|
54
54
|
const { distDir, conf } = this;
|
|
55
|
-
this.initReader();
|
|
56
55
|
(0, import_utils2.debug)("final server conf", this.conf);
|
|
57
56
|
if ((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy) {
|
|
58
57
|
const { handlers, handleUpgrade } = (0, import_proxy.createProxyHandler)(conf.bff.proxy);
|
|
@@ -61,12 +60,10 @@ class ModernServer {
|
|
|
61
60
|
this.addHandler(handler);
|
|
62
61
|
});
|
|
63
62
|
}
|
|
64
|
-
app === null || app === void 0 ? void 0 : app.on("close", () => {
|
|
65
|
-
this.reader.close();
|
|
66
|
-
});
|
|
67
63
|
const usageRoutes = this.filterRoutes(this.getRoutes());
|
|
68
64
|
this.router.reset(usageRoutes);
|
|
69
65
|
this.warmupSSRBundle();
|
|
66
|
+
import_cacheMod.cacheMod.loadServerCacheMod(this.pwd);
|
|
70
67
|
await this.prepareFrameHandler();
|
|
71
68
|
await this.prepareLoaderHandler(usageRoutes, distDir);
|
|
72
69
|
this.routeRenderHandler = this.getRenderHandler();
|
|
@@ -122,9 +119,6 @@ class ModernServer {
|
|
|
122
119
|
return (0, import_http.createServer)(handler);
|
|
123
120
|
}
|
|
124
121
|
/* —————————————————————— function will be overwrite —————————————————————— */
|
|
125
|
-
initReader() {
|
|
126
|
-
this.reader.init();
|
|
127
|
-
}
|
|
128
122
|
async onServerChange({ filepath }) {
|
|
129
123
|
const { pwd } = this;
|
|
130
124
|
const { api, server } = import_constants.AGGRED_DIR;
|
|
@@ -508,7 +502,6 @@ class ModernServer {
|
|
|
508
502
|
(0, import_define_property._)(this, "logger", void 0);
|
|
509
503
|
(0, import_define_property._)(this, "metrics", void 0);
|
|
510
504
|
(0, import_define_property._)(this, "runMode", void 0);
|
|
511
|
-
(0, import_define_property._)(this, "reader", reader);
|
|
512
505
|
(0, import_define_property._)(this, "proxyTarget", void 0);
|
|
513
506
|
(0, import_define_property._)(this, "routeRenderHandler", void 0);
|
|
514
507
|
(0, import_define_property._)(this, "staticGenerate", void 0);
|
|
@@ -2,10 +2,10 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
|
2
2
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
3
|
import path from "path";
|
|
4
4
|
import { cutNameByHyphen, mime } from "@modern-js/utils";
|
|
5
|
+
import { fileReader } from "@modern-js/runtime-utils/fileReader";
|
|
5
6
|
import { ERROR_DIGEST } from "../../constants";
|
|
6
7
|
import { shouldFlushServerHeader } from "../preload/shouldFlushServerHeader";
|
|
7
8
|
import { handleDirectory } from "./static";
|
|
8
|
-
import { readFile } from "./reader";
|
|
9
9
|
import * as ssr from "./ssr";
|
|
10
10
|
import { injectServerData } from "./utils";
|
|
11
11
|
var calcFallback = function(metaName) {
|
|
@@ -47,7 +47,7 @@ var createRenderHandler = function(param) {
|
|
|
47
47
|
templatePath = entry;
|
|
48
48
|
return [
|
|
49
49
|
4,
|
|
50
|
-
readFile(templatePath)
|
|
50
|
+
fileReader.readFile(templatePath)
|
|
51
51
|
];
|
|
52
52
|
case 3:
|
|
53
53
|
content = _state.sent();
|
|
@@ -106,15 +106,7 @@ var createRenderHandler = function(param) {
|
|
|
106
106
|
};
|
|
107
107
|
return [
|
|
108
108
|
4,
|
|
109
|
-
ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) : ssr.render(ctx,
|
|
110
|
-
distDir,
|
|
111
|
-
entryName: route.entryName,
|
|
112
|
-
urlPath: route.urlPath,
|
|
113
|
-
bundle: route.bundle,
|
|
114
|
-
template: content.toString(),
|
|
115
|
-
staticGenerate,
|
|
116
|
-
nonce
|
|
117
|
-
}, runner)
|
|
109
|
+
ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) : ssr.render(ctx, ssrRenderOptions, runner)
|
|
118
110
|
];
|
|
119
111
|
case 7:
|
|
120
112
|
result1 = _state.sent();
|
|
@@ -2,9 +2,9 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
|
2
2
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
3
|
import path from "path";
|
|
4
4
|
import { fs, mime, LOADABLE_STATS_FILE, ROUTE_MANIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
|
|
5
|
-
import cache from "./cache";
|
|
6
5
|
import { createLogger, createMetrics } from "./measure";
|
|
7
6
|
import { injectServerDataStream, injectServerData } from "./utils";
|
|
7
|
+
import { ssrCache } from "./ssrCache";
|
|
8
8
|
var render = function() {
|
|
9
9
|
var _ref = _async_to_generator(function(ctx, renderOptions, runner) {
|
|
10
10
|
var _ctx_res, urlPath, bundle, distDir, template, entryName, staticGenerate, _renderOptions_enableUnsafeCtx, enableUnsafeCtx, nonce, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, bundleJSContent, serverRender, content, _context_redirection, url, _context_redirection_status, status;
|
|
@@ -63,7 +63,7 @@ var render = function() {
|
|
|
63
63
|
serverRender = bundleJSContent[SERVER_RENDER_FUNCTION_NAME];
|
|
64
64
|
return [
|
|
65
65
|
4,
|
|
66
|
-
|
|
66
|
+
ssrCache(ctx.req, serverRender, context)
|
|
67
67
|
];
|
|
68
68
|
case 2:
|
|
69
69
|
content = _state.sent();
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
|
|
2
|
+
import { _ as _create_class } from "@swc/helpers/_/_create_class";
|
|
3
|
+
import { _ as _define_property } from "@swc/helpers/_/_define_property";
|
|
4
|
+
import path from "path";
|
|
5
|
+
import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
|
|
6
|
+
var CACHE_FILENAME = "cache";
|
|
7
|
+
var ServerCacheMod = /* @__PURE__ */ function() {
|
|
8
|
+
"use strict";
|
|
9
|
+
function ServerCacheMod2() {
|
|
10
|
+
_class_call_check(this, ServerCacheMod2);
|
|
11
|
+
_define_property(this, "customContainer", void 0);
|
|
12
|
+
_define_property(this, "cacheOption", void 0);
|
|
13
|
+
}
|
|
14
|
+
_create_class(ServerCacheMod2, [
|
|
15
|
+
{
|
|
16
|
+
key: "loadServerCacheMod",
|
|
17
|
+
value: function loadServerCacheMod() {
|
|
18
|
+
var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.cwd();
|
|
19
|
+
var serverCacheFilepath = path.resolve(pwd, SERVER_DIR, CACHE_FILENAME);
|
|
20
|
+
var mod = requireExistModule(serverCacheFilepath, {
|
|
21
|
+
interop: false
|
|
22
|
+
});
|
|
23
|
+
this.customContainer = mod === null || mod === void 0 ? void 0 : mod.customContainer;
|
|
24
|
+
this.cacheOption = mod === null || mod === void 0 ? void 0 : mod.cacheOption;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
]);
|
|
28
|
+
return ServerCacheMod2;
|
|
29
|
+
}();
|
|
30
|
+
var cacheMod = new ServerCacheMod();
|
|
31
|
+
export {
|
|
32
|
+
cacheMod
|
|
33
|
+
};
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
|
+
import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
3
|
+
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
4
|
+
import { Transform } from "stream";
|
|
5
|
+
import { createMemoryStorage } from "@modern-js/runtime-utils/storer";
|
|
6
|
+
import { cacheMod } from "./cacheMod";
|
|
7
|
+
import { CacheManager } from "./manager";
|
|
8
|
+
var cacheStorage = createMemoryStorage("__ssr__cache");
|
|
9
|
+
function ssrCache(req, render, ssrContext) {
|
|
10
|
+
return _ssrCache.apply(this, arguments);
|
|
11
|
+
}
|
|
12
|
+
function _ssrCache() {
|
|
13
|
+
_ssrCache = _async_to_generator(function(req, render, ssrContext) {
|
|
14
|
+
var customContainer, cacheOption, cacheControl, cacheManager, renderResult, stream;
|
|
15
|
+
return _ts_generator(this, function(_state) {
|
|
16
|
+
switch (_state.label) {
|
|
17
|
+
case 0:
|
|
18
|
+
customContainer = cacheMod.customContainer, cacheOption = cacheMod.cacheOption;
|
|
19
|
+
return [
|
|
20
|
+
4,
|
|
21
|
+
matchCacheControl(req, cacheOption)
|
|
22
|
+
];
|
|
23
|
+
case 1:
|
|
24
|
+
cacheControl = _state.sent();
|
|
25
|
+
cacheManager = new CacheManager(customContainer ? customContainer : cacheStorage);
|
|
26
|
+
if (!cacheControl)
|
|
27
|
+
return [
|
|
28
|
+
3,
|
|
29
|
+
2
|
|
30
|
+
];
|
|
31
|
+
return [
|
|
32
|
+
2,
|
|
33
|
+
cacheManager.getCacheResult(req, cacheControl, render, ssrContext)
|
|
34
|
+
];
|
|
35
|
+
case 2:
|
|
36
|
+
return [
|
|
37
|
+
4,
|
|
38
|
+
render(ssrContext)
|
|
39
|
+
];
|
|
40
|
+
case 3:
|
|
41
|
+
renderResult = _state.sent();
|
|
42
|
+
if (typeof renderResult === "string") {
|
|
43
|
+
return [
|
|
44
|
+
2,
|
|
45
|
+
renderResult
|
|
46
|
+
];
|
|
47
|
+
} else {
|
|
48
|
+
stream = new Transform({
|
|
49
|
+
write: function write(chunk, _, callback) {
|
|
50
|
+
this.push(chunk);
|
|
51
|
+
callback();
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
return [
|
|
55
|
+
2,
|
|
56
|
+
renderResult(stream)
|
|
57
|
+
];
|
|
58
|
+
}
|
|
59
|
+
_state.label = 4;
|
|
60
|
+
case 4:
|
|
61
|
+
return [
|
|
62
|
+
2
|
|
63
|
+
];
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
return _ssrCache.apply(this, arguments);
|
|
68
|
+
}
|
|
69
|
+
function matchCacheControl(req, cacheOption) {
|
|
70
|
+
return _matchCacheControl.apply(this, arguments);
|
|
71
|
+
}
|
|
72
|
+
function _matchCacheControl() {
|
|
73
|
+
_matchCacheControl = _async_to_generator(function(req, cacheOption) {
|
|
74
|
+
var url, options, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, key, option;
|
|
75
|
+
function isCacheOptionProvider(option2) {
|
|
76
|
+
return typeof option2 === "function";
|
|
77
|
+
}
|
|
78
|
+
function isCacheControl(option2) {
|
|
79
|
+
return typeof option2 === "object" && option2 !== null && "maxAge" in option2;
|
|
80
|
+
}
|
|
81
|
+
return _ts_generator(this, function(_state) {
|
|
82
|
+
if (!cacheOption) {
|
|
83
|
+
return [
|
|
84
|
+
2,
|
|
85
|
+
void 0
|
|
86
|
+
];
|
|
87
|
+
} else if (isCacheControl(cacheOption)) {
|
|
88
|
+
return [
|
|
89
|
+
2,
|
|
90
|
+
cacheOption
|
|
91
|
+
];
|
|
92
|
+
} else if (isCacheOptionProvider(cacheOption)) {
|
|
93
|
+
return [
|
|
94
|
+
2,
|
|
95
|
+
cacheOption(req)
|
|
96
|
+
];
|
|
97
|
+
} else {
|
|
98
|
+
url = req.url;
|
|
99
|
+
options = Object.entries(cacheOption);
|
|
100
|
+
_iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
|
|
101
|
+
try {
|
|
102
|
+
for (_iterator = options[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
|
|
103
|
+
_step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], option = _step_value[1];
|
|
104
|
+
if (key === "*" || new RegExp(key).test(url)) {
|
|
105
|
+
if (typeof option === "function") {
|
|
106
|
+
return [
|
|
107
|
+
2,
|
|
108
|
+
option(req)
|
|
109
|
+
];
|
|
110
|
+
} else {
|
|
111
|
+
return [
|
|
112
|
+
2,
|
|
113
|
+
option
|
|
114
|
+
];
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
} catch (err) {
|
|
119
|
+
_didIteratorError = true;
|
|
120
|
+
_iteratorError = err;
|
|
121
|
+
} finally {
|
|
122
|
+
try {
|
|
123
|
+
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
124
|
+
_iterator.return();
|
|
125
|
+
}
|
|
126
|
+
} finally {
|
|
127
|
+
if (_didIteratorError) {
|
|
128
|
+
throw _iteratorError;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return [
|
|
133
|
+
2,
|
|
134
|
+
void 0
|
|
135
|
+
];
|
|
136
|
+
}
|
|
137
|
+
return [
|
|
138
|
+
2
|
|
139
|
+
];
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
return _matchCacheControl.apply(this, arguments);
|
|
143
|
+
}
|
|
144
|
+
export {
|
|
145
|
+
ssrCache
|
|
146
|
+
};
|