@celljs/serve-static 3.9.0 → 4.1.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/cell.yml +2 -2
- package/esm/node/embedded-assets.d.ts +20 -0
- package/esm/node/embedded-assets.js +76 -0
- package/esm/node/embedded-assets.js.map +1 -0
- package/esm/node/index.d.ts +1 -0
- package/esm/node/index.js +1 -0
- package/esm/node/index.js.map +1 -1
- package/esm/node/serve-static-middleware.d.ts +22 -0
- package/esm/node/serve-static-middleware.js +75 -26
- package/esm/node/serve-static-middleware.js.map +1 -1
- package/esm/node/serve-static.d.ts +1 -1
- package/esm/node/serve-static.js +5 -4
- package/esm/node/serve-static.js.map +1 -1
- package/lib/node/embedded-assets.d.ts +21 -0
- package/lib/node/embedded-assets.d.ts.map +1 -0
- package/lib/node/embedded-assets.js +82 -0
- package/lib/node/embedded-assets.js.map +1 -0
- package/lib/node/embedded-assets.spec.d.ts +2 -0
- package/lib/node/embedded-assets.spec.d.ts.map +1 -0
- package/lib/node/embedded-assets.spec.js +60 -0
- package/lib/node/embedded-assets.spec.js.map +1 -0
- package/lib/node/index.d.ts +1 -0
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +1 -0
- package/lib/node/index.js.map +1 -1
- package/lib/node/serve-static-middleware.d.ts +22 -0
- package/lib/node/serve-static-middleware.d.ts.map +1 -1
- package/lib/node/serve-static-middleware.js +74 -25
- package/lib/node/serve-static-middleware.js.map +1 -1
- package/lib/node/serve-static-middleware.spec.d.ts +2 -0
- package/lib/node/serve-static-middleware.spec.d.ts.map +1 -0
- package/lib/node/serve-static-middleware.spec.js +232 -0
- package/lib/node/serve-static-middleware.spec.js.map +1 -0
- package/lib/node/serve-static.d.ts +1 -1
- package/lib/node/serve-static.d.ts.map +1 -1
- package/lib/node/serve-static.js +5 -4
- package/lib/node/serve-static.js.map +1 -1
- package/package.json +13 -15
- package/src/node/embedded-assets.spec.ts +67 -0
- package/src/node/embedded-assets.ts +82 -0
- package/src/node/index.ts +1 -0
- package/src/node/serve-static-middleware.spec.ts +284 -0
- package/src/node/serve-static-middleware.ts +85 -27
- package/src/node/serve-static.ts +5 -4
- package/cell-remote.yml +0 -3
- package/lib/hooks/webpack.d.ts +0 -4
- package/lib/hooks/webpack.d.ts.map +0 -1
- package/lib/hooks/webpack.js +0 -17
- package/lib/hooks/webpack.js.map +0 -1
- package/src/hooks/webpack.ts +0 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-static-middleware.d.ts","sourceRoot":"","sources":["../../src/node/serve-static-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAA4B,MAAM,sBAAsB,CAAC;AAMrG,qBACa,qBAAsB,YAAW,UAAU;IAGpD,SAAS,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAC,CAAC;IAG7F,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;IAGvB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"serve-static-middleware.d.ts","sourceRoot":"","sources":["../../src/node/serve-static-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAA4B,MAAM,sBAAsB,CAAC;AAMrG,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAEvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAEhD,KAAK,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAInF,qBACa,qBAAsB,YAAW,UAAU;IAGpD,SAAS,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAC,CAAC;IAG7F,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;IAGvB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD;;;OAGG;IACH,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,gGAAgG;IAChG,SAAS,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE3D,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IAEvB;;;OAGG;IAEH,SAAS,CAAC,IAAI,IAAI,IAAI,CAarB;IAED;;;OAGG;IACH,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAUzI;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDnE;IACD,QAAQ,SAAkC;CAE7C"}
|
|
@@ -12,17 +12,55 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.ServeStaticMiddleware = void 0;
|
|
13
13
|
const node_1 = require("@celljs/web/lib/node");
|
|
14
14
|
const serve_static_1 = require("./serve-static");
|
|
15
|
+
const embedded_assets_1 = require("./embedded-assets");
|
|
15
16
|
const core_1 = require("@celljs/core");
|
|
16
17
|
const http_1 = require("@celljs/http");
|
|
17
18
|
const web_1 = require("@celljs/web");
|
|
19
|
+
const fs_1 = require("fs");
|
|
20
|
+
const SPA_INDEX = '/index.html';
|
|
18
21
|
let ServeStaticMiddleware = class ServeStaticMiddleware {
|
|
19
22
|
constructor() {
|
|
20
23
|
this.priority = node_1.HTTP_MIDDLEWARE_PRIORITY + 500;
|
|
21
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* Sets up the file server once. Cloudflare Workers allow I/O (`existsSync`) only while a request is
|
|
27
|
+
* handled; the application, and with it this component, starts on the first request there.
|
|
28
|
+
*/
|
|
29
|
+
init() {
|
|
30
|
+
var _a, _b;
|
|
31
|
+
var _c;
|
|
32
|
+
const { headers, htmlMaxAge, ...options } = (_a = this.config.options) !== null && _a !== void 0 ? _a : {};
|
|
33
|
+
this.options = { ...options, baseHref: this.path };
|
|
34
|
+
(_b = (_c = this.options).setHeaders) !== null && _b !== void 0 ? _b : (_c.setHeaders = this.createSetHeaders(headers, htmlMaxAge));
|
|
35
|
+
const embedded = embedded_assets_1.EmbeddedAssets.get();
|
|
36
|
+
const root = this.config.root;
|
|
37
|
+
// No frontend (no `paths.public`, or nothing built there): every request goes on to the chain.
|
|
38
|
+
this.hasFrontend = !!embedded || (typeof root === 'string' && (0, fs_1.existsSync)(root));
|
|
39
|
+
if (embedded) {
|
|
40
|
+
this.serve = embedded_assets_1.EmbeddedAssets.serve(embedded, this.options);
|
|
41
|
+
}
|
|
42
|
+
else if (this.hasFrontend) {
|
|
43
|
+
this.serve = (0, serve_static_1.serveStatic)(root, this.options);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Adds the configured `headers` to every file, and gives HTML files their own Cache-Control
|
|
48
|
+
* (`htmlMaxAge` in milliseconds, default 0) so that a new build of the page is picked up.
|
|
49
|
+
*/
|
|
50
|
+
createSetHeaders(headers, htmlMaxAge) {
|
|
51
|
+
const htmlCacheControl = `public, max-age=${Math.floor(Math.max(0, Number(htmlMaxAge !== null && htmlMaxAge !== void 0 ? htmlMaxAge : 0) || 0) / 1000)}`;
|
|
52
|
+
return (res, path) => {
|
|
53
|
+
if (headers) {
|
|
54
|
+
Object.keys(headers).forEach(key => res.setHeader(key, headers[key]));
|
|
55
|
+
}
|
|
56
|
+
if (serve_static_1.mime.lookup(path) === http_1.MediaType.TEXT_HTML) {
|
|
57
|
+
res.setHeader(http_1.HttpHeaders.CACHE_CONTROL, htmlCacheControl);
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
}
|
|
22
61
|
async handle(ctx, next) {
|
|
23
|
-
this.config.options.baseHref = this.path;
|
|
24
62
|
const method = ctx.request.method;
|
|
25
|
-
if (!(method === http_1.HttpMethod.GET || method === http_1.HttpMethod.HEAD) || ctx.request.query['static'] === 'skip') {
|
|
63
|
+
if (!this.hasFrontend || !(method === http_1.HttpMethod.GET || method === http_1.HttpMethod.HEAD) || ctx.request.query['static'] === 'skip') {
|
|
26
64
|
await next();
|
|
27
65
|
return;
|
|
28
66
|
}
|
|
@@ -34,38 +72,43 @@ let ServeStaticMiddleware = class ServeStaticMiddleware {
|
|
|
34
72
|
await next();
|
|
35
73
|
return;
|
|
36
74
|
}
|
|
37
|
-
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
75
|
+
return new Promise((resolve, reject) => {
|
|
76
|
+
const response = ctx.response;
|
|
77
|
+
// A file that is sent ends the response without calling back: the request is done then.
|
|
78
|
+
const done = () => {
|
|
79
|
+
stopWaiting();
|
|
80
|
+
resolve();
|
|
81
|
+
};
|
|
82
|
+
const stopWaiting = () => {
|
|
83
|
+
response.off('finish', done);
|
|
84
|
+
response.off('close', done);
|
|
85
|
+
};
|
|
86
|
+
// The rest of the chain answers instead: its outcome is this middleware's outcome.
|
|
87
|
+
const passOn = () => {
|
|
88
|
+
stopWaiting();
|
|
89
|
+
next().then(resolve, reject);
|
|
90
|
+
};
|
|
91
|
+
response.once('finish', done);
|
|
92
|
+
response.once('close', done);
|
|
93
|
+
// The SPA fallback serves /index.html for the request without changing request.url.
|
|
94
|
+
const attempt = (url) => this.serve(ctx.request, response, (err) => {
|
|
95
|
+
if (url !== SPA_INDEX) {
|
|
53
96
|
if (!this.config.spa) {
|
|
54
|
-
|
|
97
|
+
passOn();
|
|
55
98
|
return;
|
|
56
99
|
}
|
|
57
|
-
|
|
58
|
-
executor(resolve, reject);
|
|
100
|
+
attempt(SPA_INDEX);
|
|
59
101
|
}
|
|
60
102
|
else if (err) {
|
|
103
|
+
stopWaiting();
|
|
61
104
|
reject(err);
|
|
62
105
|
}
|
|
63
106
|
else {
|
|
64
|
-
|
|
107
|
+
passOn();
|
|
65
108
|
}
|
|
66
|
-
})
|
|
67
|
-
|
|
68
|
-
|
|
109
|
+
}, url);
|
|
110
|
+
attempt(ctx.request.url);
|
|
111
|
+
});
|
|
69
112
|
}
|
|
70
113
|
};
|
|
71
114
|
exports.ServeStaticMiddleware = ServeStaticMiddleware;
|
|
@@ -81,6 +124,12 @@ __decorate([
|
|
|
81
124
|
(0, core_1.Autowired)(node_1.RequestMatcher),
|
|
82
125
|
__metadata("design:type", Object)
|
|
83
126
|
], ServeStaticMiddleware.prototype, "requestMatcher", void 0);
|
|
127
|
+
__decorate([
|
|
128
|
+
(0, core_1.PostConstruct)(),
|
|
129
|
+
__metadata("design:type", Function),
|
|
130
|
+
__metadata("design:paramtypes", []),
|
|
131
|
+
__metadata("design:returntype", void 0)
|
|
132
|
+
], ServeStaticMiddleware.prototype, "init", null);
|
|
84
133
|
exports.ServeStaticMiddleware = ServeStaticMiddleware = __decorate([
|
|
85
134
|
(0, core_1.Component)(node_1.Middleware)
|
|
86
135
|
], ServeStaticMiddleware);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-static-middleware.js","sourceRoot":"","sources":["../../src/node/serve-static-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAqG;AACrG,iDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"serve-static-middleware.js","sourceRoot":"","sources":["../../src/node/serve-static-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serve-static-middleware.spec.d.ts","sourceRoot":"","sources":["../../src/node/serve-static-middleware.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,232 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bun_test_1 = require("bun:test");
|
|
4
|
+
const chai_1 = require("chai");
|
|
5
|
+
const node_fs_1 = require("node:fs");
|
|
6
|
+
const node_http_1 = require("node:http");
|
|
7
|
+
const node_os_1 = require("node:os");
|
|
8
|
+
const node_path_1 = require("node:path");
|
|
9
|
+
const embedded_assets_1 = require("./embedded-assets");
|
|
10
|
+
const serve_static_middleware_1 = require("./serve-static-middleware");
|
|
11
|
+
const SETTLE_GRACE_MS = 100;
|
|
12
|
+
const ASSETS = {
|
|
13
|
+
'/index.html': '<html>spa</html>',
|
|
14
|
+
'/app.js': 'run()',
|
|
15
|
+
};
|
|
16
|
+
let root;
|
|
17
|
+
let rootWithoutIndex;
|
|
18
|
+
(0, bun_test_1.beforeAll)(() => {
|
|
19
|
+
root = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'cell-serve-static-'));
|
|
20
|
+
for (const [path, content] of Object.entries(ASSETS)) {
|
|
21
|
+
(0, node_fs_1.writeFileSync)((0, node_path_1.join)(root, path), content);
|
|
22
|
+
}
|
|
23
|
+
rootWithoutIndex = (0, node_path_1.join)(root, 'no-index');
|
|
24
|
+
(0, node_fs_1.mkdirSync)(rootWithoutIndex);
|
|
25
|
+
(0, node_fs_1.writeFileSync)((0, node_path_1.join)(rootWithoutIndex, 'app.js'), ASSETS['/app.js']);
|
|
26
|
+
});
|
|
27
|
+
(0, bun_test_1.afterAll)(() => (0, node_fs_1.rmSync)(root, { recursive: true, force: true }));
|
|
28
|
+
(0, bun_test_1.afterEach)(() => {
|
|
29
|
+
globalThis[embedded_assets_1.EmbeddedAssets.KEY] = undefined;
|
|
30
|
+
});
|
|
31
|
+
/** serve-static 自带 cell.yml 的默认值;每次都新建,因为中间件会改写 options。 */
|
|
32
|
+
function config(dir, spa = true, options = {}) {
|
|
33
|
+
return { spa, root: dir, options: { maxAge: 31536000000, immutable: true, ...options } };
|
|
34
|
+
}
|
|
35
|
+
/** 像容器那样创建中间件:注入属性,再调用 @PostConstruct。 */
|
|
36
|
+
function createMiddleware(cfg) {
|
|
37
|
+
const middleware = new serve_static_middleware_1.ServeStaticMiddleware();
|
|
38
|
+
Object.assign(middleware, { config: cfg, path: '/', requestMatcher: { match: async () => true } });
|
|
39
|
+
middleware.init();
|
|
40
|
+
return middleware;
|
|
41
|
+
}
|
|
42
|
+
async function request(target, url, method = 'GET') {
|
|
43
|
+
const middleware = target instanceof serve_static_middleware_1.ServeStaticMiddleware ? target : createMiddleware(target);
|
|
44
|
+
let nextCalls = 0;
|
|
45
|
+
let settled = 'pending';
|
|
46
|
+
let finalUrl;
|
|
47
|
+
const server = (0, node_http_1.createServer)((req, res) => {
|
|
48
|
+
var _a;
|
|
49
|
+
const query = Object.fromEntries(new URL((_a = req.url) !== null && _a !== void 0 ? _a : '/', 'http://localhost').searchParams);
|
|
50
|
+
Object.assign(req, { query });
|
|
51
|
+
const next = async () => {
|
|
52
|
+
nextCalls++;
|
|
53
|
+
res.statusCode = 404;
|
|
54
|
+
res.end('next');
|
|
55
|
+
};
|
|
56
|
+
middleware.handle({ request: req, response: res }, next).then(() => {
|
|
57
|
+
settled = 'resolved';
|
|
58
|
+
}, () => {
|
|
59
|
+
settled = 'rejected';
|
|
60
|
+
});
|
|
61
|
+
res.on('finish', () => {
|
|
62
|
+
finalUrl = req.url;
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
await new Promise(resolve => server.listen(0, '127.0.0.1', resolve));
|
|
66
|
+
try {
|
|
67
|
+
const { port } = server.address();
|
|
68
|
+
const response = await fetch(`http://127.0.0.1:${port}${url}`, { method });
|
|
69
|
+
const body = await response.text();
|
|
70
|
+
await new Promise(resolve => setTimeout(resolve, SETTLE_GRACE_MS));
|
|
71
|
+
return { status: response.status, headers: response.headers, body, nextCalls, settled, finalUrl };
|
|
72
|
+
}
|
|
73
|
+
finally {
|
|
74
|
+
server.closeAllConnections();
|
|
75
|
+
await new Promise(resolve => server.close(resolve));
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
/** 和 embedded-assets.spec.ts 用同一路径、不同内容:解码缓存按资产表区分,不会串。 */
|
|
79
|
+
const EMBEDDED_INDEX = '<html>embedded</html>';
|
|
80
|
+
function embed(files) {
|
|
81
|
+
const assets = new Map(Object.entries(files).map(([path, content], i) => [path, { body: Buffer.from(content).toString('base64'), etag: `"${i}"` }]));
|
|
82
|
+
globalThis[embedded_assets_1.EmbeddedAssets.KEY] = assets;
|
|
83
|
+
}
|
|
84
|
+
(0, bun_test_1.describe)('ServeStaticMiddleware', () => {
|
|
85
|
+
(0, bun_test_1.describe)('磁盘上的文件', () => {
|
|
86
|
+
(0, bun_test_1.it)('成功:返回文件内容和缓存头,不调用 next', async () => {
|
|
87
|
+
const result = await request(config(root), '/app.js');
|
|
88
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
89
|
+
(0, chai_1.expect)(result.body).to.equal('run()');
|
|
90
|
+
(0, chai_1.expect)(result.headers.get('cache-control')).to.equal('public, max-age=31536000, immutable');
|
|
91
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(0);
|
|
92
|
+
});
|
|
93
|
+
(0, bun_test_1.it)('成功:handle() 在响应结束后 settle(send 成功时不回调 next)', async () => {
|
|
94
|
+
const result = await request(config(root), '/app.js');
|
|
95
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
96
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
97
|
+
});
|
|
98
|
+
(0, bun_test_1.it)('HEAD:200、没有响应体,不调用 next', async () => {
|
|
99
|
+
const result = await request(config(root), '/app.js', 'HEAD');
|
|
100
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
101
|
+
(0, chai_1.expect)(result.body).to.equal('');
|
|
102
|
+
(0, chai_1.expect)(result.headers.get('content-length')).to.equal(String(ASSETS['/app.js'].length));
|
|
103
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(0);
|
|
104
|
+
});
|
|
105
|
+
(0, bun_test_1.it)('HEAD:handle() 在响应结束后 settle', async () => {
|
|
106
|
+
const result = await request(config(root), '/app.js', 'HEAD');
|
|
107
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
108
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
109
|
+
});
|
|
110
|
+
(0, bun_test_1.it)('404(spa 关闭):文件不存在时交给 next,handle() settle', async () => {
|
|
111
|
+
const result = await request(config(root, false), '/missing.js');
|
|
112
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(1);
|
|
113
|
+
(0, chai_1.expect)(result.status).to.equal(404);
|
|
114
|
+
(0, chai_1.expect)(result.body).to.equal('next');
|
|
115
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
116
|
+
});
|
|
117
|
+
(0, bun_test_1.it)('spa 回退:未知路径返回 index.html,不调用 next,也不改写 request.url', async () => {
|
|
118
|
+
const result = await request(config(root), '/users/42');
|
|
119
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
120
|
+
(0, chai_1.expect)(result.body).to.equal('<html>spa</html>');
|
|
121
|
+
(0, chai_1.expect)(result.finalUrl).to.equal('/users/42');
|
|
122
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(0);
|
|
123
|
+
});
|
|
124
|
+
(0, bun_test_1.it)('spa 回退:handle() 在响应结束后 settle', async () => {
|
|
125
|
+
const result = await request(config(root), '/users/42');
|
|
126
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
127
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
128
|
+
});
|
|
129
|
+
(0, bun_test_1.it)('spa 回退且 index.html 缺失:只调用一次 next,handle() settle', async () => {
|
|
130
|
+
const result = await request(config(rootWithoutIndex), '/users/42');
|
|
131
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(1);
|
|
132
|
+
(0, chai_1.expect)(result.status).to.equal(404);
|
|
133
|
+
(0, chai_1.expect)(result.finalUrl).to.equal('/users/42');
|
|
134
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
135
|
+
});
|
|
136
|
+
(0, bun_test_1.it)('index.html 的 Cache-Control:没有配置 htmlMaxAge 时是 max-age=0,不是 NaN', async () => {
|
|
137
|
+
const result = await request(config(root), '/index.html');
|
|
138
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
139
|
+
(0, chai_1.expect)(result.headers.get('cache-control')).to.equal('public, max-age=0');
|
|
140
|
+
});
|
|
141
|
+
(0, bun_test_1.it)('index.html 的 Cache-Control:htmlMaxAge(毫秒)换算成秒;其他文件不受影响', async () => {
|
|
142
|
+
const cfg = config(root, true, { htmlMaxAge: 60000 });
|
|
143
|
+
(0, chai_1.expect)((await request(cfg, '/index.html')).headers.get('cache-control')).to.equal('public, max-age=60');
|
|
144
|
+
(0, chai_1.expect)((await request(cfg, '/app.js')).headers.get('cache-control')).to.equal('public, max-age=31536000, immutable');
|
|
145
|
+
});
|
|
146
|
+
(0, bun_test_1.it)('options.headers 加到每个文件上', async () => {
|
|
147
|
+
const result = await request(config(root, true, { headers: { 'x-frame-options': 'DENY' } }), '/app.js');
|
|
148
|
+
(0, chai_1.expect)(result.headers.get('x-frame-options')).to.equal('DENY');
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
(0, bun_test_1.describe)('直接交给 next 的请求', () => {
|
|
152
|
+
(0, bun_test_1.it)('非 GET/HEAD 交给 next,handle() settle', async () => {
|
|
153
|
+
const result = await request(config(root), '/app.js', 'POST');
|
|
154
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(1);
|
|
155
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
156
|
+
});
|
|
157
|
+
(0, bun_test_1.it)('?static=skip 交给 next,handle() settle', async () => {
|
|
158
|
+
const result = await request(config(root), '/app.js?static=skip');
|
|
159
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(1);
|
|
160
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
161
|
+
});
|
|
162
|
+
(0, bun_test_1.it)('root 没有配置(paths.public 缺失)时不报错,交给 next', async () => {
|
|
163
|
+
const cfg = { ...config(root), root: undefined };
|
|
164
|
+
const result = await request(cfg, '/app.js');
|
|
165
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(1);
|
|
166
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
167
|
+
});
|
|
168
|
+
(0, bun_test_1.it)('没有前端(root 不存在且没有内嵌资源)时交给 next', async () => {
|
|
169
|
+
const result = await request(config((0, node_path_1.join)(root, 'absent')), '/app.js');
|
|
170
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(1);
|
|
171
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
172
|
+
});
|
|
173
|
+
});
|
|
174
|
+
(0, bun_test_1.describe)('只初始化一次', () => {
|
|
175
|
+
(0, bun_test_1.it)('多次请求不改写共享的 cell.serve-static.options,文件服务只创建一次', async () => {
|
|
176
|
+
const cfg = config(root, true, { headers: { 'x-a': '1' } });
|
|
177
|
+
const original = structuredClone(cfg.options);
|
|
178
|
+
const middleware = createMiddleware(cfg);
|
|
179
|
+
const serve = middleware.serve;
|
|
180
|
+
for (const url of ['/app.js', '/index.html', '/users/42', '/missing.js']) {
|
|
181
|
+
(0, chai_1.expect)((await request(middleware, url)).settled).to.equal('resolved');
|
|
182
|
+
}
|
|
183
|
+
(0, chai_1.expect)(cfg.options).to.deep.equal(original);
|
|
184
|
+
(0, chai_1.expect)(middleware.serve).to.equal(serve);
|
|
185
|
+
});
|
|
186
|
+
(0, bun_test_1.it)('同一个实例上并发的请求都 settle', async () => {
|
|
187
|
+
const middleware = createMiddleware(config(root));
|
|
188
|
+
const results = await Promise.all(['/app.js', '/index.html', '/users/1', '/users/2'].map(url => request(middleware, url)));
|
|
189
|
+
(0, chai_1.expect)(results.map(r => [r.status, r.settled])).to.deep.equal([
|
|
190
|
+
[200, 'resolved'],
|
|
191
|
+
[200, 'resolved'],
|
|
192
|
+
[200, 'resolved'],
|
|
193
|
+
[200, 'resolved'],
|
|
194
|
+
]);
|
|
195
|
+
});
|
|
196
|
+
});
|
|
197
|
+
(0, bun_test_1.describe)('内嵌资源(cell build --single)', () => {
|
|
198
|
+
(0, bun_test_1.it)('成功:从内存返回文件,root 不存在也可以,不调用 next', async () => {
|
|
199
|
+
embed({ '/index.html': EMBEDDED_INDEX, '/assets/embedded-only.js': 'embedded()' });
|
|
200
|
+
const result = await request(config((0, node_path_1.join)(root, 'absent')), '/assets/embedded-only.js');
|
|
201
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
202
|
+
(0, chai_1.expect)(result.body).to.equal('embedded()');
|
|
203
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(0);
|
|
204
|
+
});
|
|
205
|
+
(0, bun_test_1.it)('成功:handle() 在响应结束后 settle(EmbeddedAssets.serve 用 res.end() 发送,不回调)', async () => {
|
|
206
|
+
embed({ '/index.html': EMBEDDED_INDEX, '/assets/embedded-only.js': 'embedded()' });
|
|
207
|
+
const result = await request(config((0, node_path_1.join)(root, 'absent')), '/assets/embedded-only.js');
|
|
208
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
209
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
210
|
+
});
|
|
211
|
+
(0, bun_test_1.it)('文件不存在(spa 关闭)时交给 next,handle() settle', async () => {
|
|
212
|
+
embed({ '/index.html': EMBEDDED_INDEX });
|
|
213
|
+
const result = await request(config((0, node_path_1.join)(root, 'absent'), false), '/missing.js');
|
|
214
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(1);
|
|
215
|
+
(0, chai_1.expect)(result.settled).to.equal('resolved');
|
|
216
|
+
});
|
|
217
|
+
(0, bun_test_1.it)('重新注册的资产表不会拿到旧表的缓存内容', async () => {
|
|
218
|
+
embed({ '/index.html': '<html>first</html>' });
|
|
219
|
+
(0, chai_1.expect)((await request(config((0, node_path_1.join)(root, 'absent')), '/index.html')).body).to.equal('<html>first</html>');
|
|
220
|
+
embed({ '/index.html': '<html>second</html>' });
|
|
221
|
+
(0, chai_1.expect)((await request(config((0, node_path_1.join)(root, 'absent')), '/index.html')).body).to.equal('<html>second</html>');
|
|
222
|
+
});
|
|
223
|
+
(0, bun_test_1.it)('spa 回退到内嵌的 index.html', async () => {
|
|
224
|
+
embed({ '/index.html': EMBEDDED_INDEX });
|
|
225
|
+
const result = await request(config((0, node_path_1.join)(root, 'absent')), '/users/42');
|
|
226
|
+
(0, chai_1.expect)(result.status).to.equal(200);
|
|
227
|
+
(0, chai_1.expect)(result.body).to.equal(EMBEDDED_INDEX);
|
|
228
|
+
(0, chai_1.expect)(result.nextCalls).to.equal(0);
|
|
229
|
+
});
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
//# sourceMappingURL=serve-static-middleware.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serve-static-middleware.spec.js","sourceRoot":"","sources":["../../src/node/serve-static-middleware.spec.ts"],"names":[],"mappings":";;AAAA,uCAAwE;AACxE,+BAA8B;AAC9B,qCAAwE;AACxE,yCAAyC;AAEzC,qCAAiC;AACjC,yCAAiC;AACjC,uDAAmD;AACnD,uEAAkE;AAqBlE,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,MAAM,MAAM,GAAG;IACX,aAAa,EAAE,kBAAkB;IACjC,SAAS,EAAE,OAAO;CACrB,CAAC;AAEF,IAAI,IAAY,CAAC;AACjB,IAAI,gBAAwB,CAAC;AAE7B,IAAA,oBAAS,EAAC,GAAG,EAAE;IACX,IAAI,GAAG,IAAA,qBAAW,EAAC,IAAA,gBAAI,EAAC,IAAA,gBAAM,GAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACzD,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,IAAA,uBAAa,EAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IACD,gBAAgB,GAAG,IAAA,gBAAI,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC1C,IAAA,mBAAS,EAAC,gBAAgB,CAAC,CAAC;IAC5B,IAAA,uBAAa,EAAC,IAAA,gBAAI,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,IAAA,mBAAQ,EAAC,GAAG,EAAE,CAAC,IAAA,gBAAM,EAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAE/D,IAAA,oBAAS,EAAC,GAAG,EAAE;IACV,UAAsC,CAAC,gCAAc,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;AAC5E,CAAC,CAAC,CAAC;AAEH,4DAA4D;AAC5D,SAAS,MAAM,CAAC,GAAW,EAAE,GAAG,GAAG,IAAI,EAAE,OAAO,GAA4B,EAAE;IAC1E,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,EAAE,CAAC;AAC7F,CAAC;AAED,0CAA0C;AAC1C,SAAS,gBAAgB,CAAC,GAA8B;IACpD,MAAM,UAAU,GAAG,IAAI,+CAAqB,EAAE,CAAC;IAC/C,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAClG,UAA0C,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,MAAyD,EAAE,GAAW,EAAE,MAAM,GAAG,KAAK;IACzG,MAAM,UAAU,GAAG,MAAM,YAAY,+CAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE/F,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,OAAO,GAAuB,SAAS,CAAC;IAC5C,IAAI,QAA4B,CAAC;IACjC,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,OAAC,GAAG,CAAC,GAAG,mCAAI,GAAG,EAAE,kBAAkB,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3F,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;YACpB,SAAS,EAAE,CAAC;YACZ,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC,CAAC;QACF,UAAU,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAS,EAAE,IAAI,CAAC,CAAC,IAAI,CAChE,GAAG,EAAE;YACD,OAAO,GAAG,UAAU,CAAC;QACzB,CAAC,EACD,GAAG,EAAE;YACD,OAAO,GAAG,UAAU,CAAC;QACzB,CAAC,CACJ,CAAC;QACF,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YAClB,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC;QACvB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3E,IAAI,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,EAAiB,CAAC;QACjD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,GAAG,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3E,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;QACnE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtG,CAAC;YAAS,CAAC;QACP,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC7B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC;AACL,CAAC;AAED,2DAA2D;AAC3D,MAAM,cAAc,GAAG,uBAAuB,CAAC;AAE/C,SAAS,KAAK,CAAC,KAA6B;IACxC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IACpJ,UAAsC,CAAC,gCAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;AACzE,CAAC;AAED,IAAA,mBAAQ,EAAC,uBAAuB,EAAE,GAAG,EAAE;IACnC,IAAA,mBAAQ,EAAC,QAAQ,EAAE,GAAG,EAAE;QACpB,IAAA,aAAE,EAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;YACpC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;YACtD,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACtC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YAC5F,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YACzD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;YACtD,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACrC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;YAC9D,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACjC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACxF,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;YAC9D,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;YACjE,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACrC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAChE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC;YACxD,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACjD,IAAA,aAAM,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC3C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC;YACxD,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAC9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,CAAC;YACpE,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;YAC5E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC;YAC1D,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACpE,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;YACtD,IAAA,aAAM,EAAC,CAAC,MAAM,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACxG,IAAA,aAAM,EAAC,CAAC,MAAM,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzH,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACrC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,iBAAiB,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;YACxG,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAA,mBAAQ,EAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,IAAA,aAAE,EAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;YAChD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;YAC9D,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YAClD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,qBAAqB,CAAC,CAAC;YAClE,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,GAAG,GAAG,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAA8B,EAAE,CAAC;YACtE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC7C,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC3C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;YACtE,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAA,mBAAQ,EAAC,QAAQ,EAAE,GAAG,EAAE;QACpB,IAAA,aAAE,EAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC5D,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;YACzC,MAAM,KAAK,GAAI,UAA4C,CAAC,KAAK,CAAC;YAClE,KAAK,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,CAAC,EAAE,CAAC;gBACvE,IAAA,aAAM,EAAC,CAAC,MAAM,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1E,CAAC;YACD,IAAA,aAAM,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAA,aAAM,EAAE,UAA4C,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;YACjC,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;YAC3H,IAAA,aAAM,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC1D,CAAC,GAAG,EAAE,UAAU,CAAC;gBACjB,CAAC,GAAG,EAAE,UAAU,CAAC;gBACjB,CAAC,GAAG,EAAE,UAAU,CAAC;gBACjB,CAAC,GAAG,EAAE,UAAU,CAAC;aACpB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAA,mBAAQ,EAAC,2BAA2B,EAAE,GAAG,EAAE;QACvC,IAAA,aAAE,EAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC7C,KAAK,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,0BAA0B,EAAE,YAAY,EAAE,CAAC,CAAC;YACnF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,0BAA0B,CAAC,CAAC;YACvF,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC3C,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;YAChF,KAAK,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,0BAA0B,EAAE,YAAY,EAAE,CAAC,CAAC;YACnF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,0BAA0B,CAAC,CAAC;YACvF,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACnD,KAAK,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;YACjF,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,aAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;YACjC,KAAK,CAAC,EAAE,aAAa,EAAE,oBAAoB,EAAE,CAAC,CAAC;YAC/C,IAAA,aAAM,EAAC,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACzG,KAAK,CAAC,EAAE,aAAa,EAAE,qBAAqB,EAAE,CAAC,CAAC;YAChD,IAAA,aAAM,EAAC,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC9G,CAAC,CAAC,CAAC;QAEH,IAAA,aAAE,EAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;YACnC,KAAK,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;YACxE,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC7C,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { ServeStaticOption } from './type';
|
|
2
|
-
export declare const serveStatic: (root: string, opts: ServeStaticOption) => (req: any, res: any, next: Function) => any;
|
|
2
|
+
export declare const serveStatic: (root: string, opts: ServeStaticOption) => (req: any, res: any, next: Function, url?: string) => any;
|
|
3
3
|
export declare const mime: typeof import("mime");
|
|
4
4
|
//# sourceMappingURL=serve-static.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-static.d.ts","sourceRoot":"","sources":["../../src/node/serve-static.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAKhD,eAAO,MAAM,WAAW,SAAU,MAAM,QAAQ,iBAAiB,
|
|
1
|
+
{"version":3,"file":"serve-static.d.ts","sourceRoot":"","sources":["../../src/node/serve-static.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAKhD,eAAO,MAAM,WAAW,SAAU,MAAM,QAAQ,iBAAiB,WAUhD,GAAG,OAAO,GAAG,QAAQ,QAAQ,QAAO,MAAM,QA0F1D,CAAC;AAEF,eAAO,MAAM,IAAI,uBAAY,CAAC"}
|
package/lib/node/serve-static.js
CHANGED
|
@@ -13,7 +13,8 @@ const serveStatic = (root, opts) => {
|
|
|
13
13
|
createRedirectDirectoryListener :
|
|
14
14
|
createNotFoundDirectoryListener;
|
|
15
15
|
opts.root = (0, path_1.resolve)(root);
|
|
16
|
-
|
|
16
|
+
/** `url` (default `req.url`) is what to serve; the SPA fallback passes `/index.html` without changing the request. */
|
|
17
|
+
return (req, res, next, url = req.url) => {
|
|
17
18
|
if (req.method !== 'GET' && req.method !== 'HEAD') {
|
|
18
19
|
if (fallthrough) {
|
|
19
20
|
return next();
|
|
@@ -27,9 +28,9 @@ const serveStatic = (root, opts) => {
|
|
|
27
28
|
return;
|
|
28
29
|
}
|
|
29
30
|
let forwardError = !fallthrough;
|
|
30
|
-
const
|
|
31
|
-
const stream = (0, send_1.default)(req,
|
|
32
|
-
stream.on('directory', onDirectory(
|
|
31
|
+
const target = new URL(`${url.replace(baseHref, '/')}`, `http://${req.headers.host}`);
|
|
32
|
+
const stream = (0, send_1.default)(req, target.pathname, opts);
|
|
33
|
+
stream.on('directory', onDirectory(target));
|
|
33
34
|
if (setHeaders) {
|
|
34
35
|
stream.on('headers', setHeaders);
|
|
35
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-static.js","sourceRoot":"","sources":["../../src/node/serve-static.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,+BAA+B;AAC/B,sDAAsD;AAE/C,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,IAAuB,EAAE,EAAE;IAEjE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACpE,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC;QAC1B,+BAA+B,CAAC,CAAC;QACjC,+BAA+B,CAAC;IAEpC,IAAI,CAAC,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAE1B,OAAO,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAc,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"serve-static.js","sourceRoot":"","sources":["../../src/node/serve-static.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/serve-static",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.1.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cell-component"
|
|
@@ -20,8 +20,7 @@
|
|
|
20
20
|
"lib",
|
|
21
21
|
"esm",
|
|
22
22
|
"src",
|
|
23
|
-
"cell.yml"
|
|
24
|
-
"cell-remote.yml"
|
|
23
|
+
"cell.yml"
|
|
25
24
|
],
|
|
26
25
|
"scripts": {
|
|
27
26
|
"build": "tsc -b && bun ../../scripts/build-esm.ts",
|
|
@@ -30,14 +29,12 @@
|
|
|
30
29
|
"watch": "tsc -b -w --preserveWatchOutput"
|
|
31
30
|
},
|
|
32
31
|
"dependencies": {
|
|
33
|
-
"@celljs/core": "
|
|
34
|
-
"@celljs/http": "
|
|
35
|
-
"@celljs/web": "
|
|
36
|
-
"send": "^0.
|
|
37
|
-
"tslib": "^2.8.0"
|
|
32
|
+
"@celljs/core": "4.1.0",
|
|
33
|
+
"@celljs/http": "4.1.0",
|
|
34
|
+
"@celljs/web": "4.1.0",
|
|
35
|
+
"send": "^0.19.2"
|
|
38
36
|
},
|
|
39
37
|
"devDependencies": {
|
|
40
|
-
"@celljs/cli-service": "3.9.0",
|
|
41
38
|
"@types/send": "^0.17.0"
|
|
42
39
|
},
|
|
43
40
|
"publishConfig": {
|
|
@@ -45,28 +42,29 @@
|
|
|
45
42
|
},
|
|
46
43
|
"exports": {
|
|
47
44
|
".": {
|
|
48
|
-
"webpack": "./lib/node/index.js",
|
|
49
45
|
"import": "./esm/node/index.js",
|
|
50
46
|
"default": "./lib/node/index.js"
|
|
51
47
|
},
|
|
52
48
|
"./package.json": "./package.json",
|
|
53
|
-
"./lib/hooks/*.js": "./lib/hooks/*.js",
|
|
54
|
-
"./lib/hooks/*": "./lib/hooks/*.js",
|
|
55
49
|
"./lib/node": {
|
|
56
|
-
"webpack": "./lib/node/index.js",
|
|
57
50
|
"import": "./esm/node/index.js",
|
|
58
51
|
"default": "./lib/node/index.js"
|
|
59
52
|
},
|
|
60
53
|
"./lib/*.js": {
|
|
61
|
-
"webpack": "./lib/*.js",
|
|
62
54
|
"import": "./esm/*.js",
|
|
63
55
|
"default": "./lib/*.js"
|
|
64
56
|
},
|
|
65
57
|
"./lib/*": {
|
|
66
|
-
"webpack": "./lib/*.js",
|
|
67
58
|
"import": "./esm/*.js",
|
|
68
59
|
"default": "./lib/*.js"
|
|
69
60
|
},
|
|
70
61
|
"./*": "./*"
|
|
62
|
+
},
|
|
63
|
+
"cell": {
|
|
64
|
+
"modules": {
|
|
65
|
+
"backend": [
|
|
66
|
+
"lib/node/module"
|
|
67
|
+
]
|
|
68
|
+
}
|
|
71
69
|
}
|
|
72
70
|
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { describe, it } from 'bun:test';
|
|
2
|
+
import { expect } from 'chai';
|
|
3
|
+
import { EmbeddedAssets } from './embedded-assets';
|
|
4
|
+
|
|
5
|
+
interface Sent {
|
|
6
|
+
status?: number;
|
|
7
|
+
headers: Record<string, unknown>;
|
|
8
|
+
body?: Buffer;
|
|
9
|
+
next: boolean;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
function request(url: string, opts: Record<string, unknown> = {}, method = 'GET', headers: Record<string, string> = {}): Sent {
|
|
13
|
+
const assets = new Map([
|
|
14
|
+
['/index.html', { body: Buffer.from('<html></html>').toString('base64'), etag: '"a"' }],
|
|
15
|
+
['/assets/app.js', { body: Buffer.from('run()').toString('base64'), etag: '"b"' }],
|
|
16
|
+
]);
|
|
17
|
+
const sent: Sent = { headers: {}, next: false };
|
|
18
|
+
const res = {
|
|
19
|
+
statusCode: 0,
|
|
20
|
+
setHeader: (name: string, value: unknown) => {
|
|
21
|
+
sent.headers[name.toLowerCase()] = value;
|
|
22
|
+
},
|
|
23
|
+
end: (body?: Buffer) => {
|
|
24
|
+
sent.status = res.statusCode;
|
|
25
|
+
sent.body = body;
|
|
26
|
+
},
|
|
27
|
+
};
|
|
28
|
+
EmbeddedAssets.serve(assets, { baseHref: '/', root: '', ...opts })({ url, method, headers }, res, () => {
|
|
29
|
+
sent.next = true;
|
|
30
|
+
});
|
|
31
|
+
return sent;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
describe('EmbeddedAssets', () => {
|
|
35
|
+
it('serves files from memory with type, length, ETag and cache headers', () => {
|
|
36
|
+
const js = request('/assets/app.js', { maxAge: 31536000000, immutable: true });
|
|
37
|
+
expect(js.status).to.equal(200);
|
|
38
|
+
expect(js.body?.toString()).to.equal('run()');
|
|
39
|
+
expect(js.headers).to.include({
|
|
40
|
+
'content-type': 'application/javascript; charset=UTF-8',
|
|
41
|
+
'content-length': 5,
|
|
42
|
+
etag: '"b"',
|
|
43
|
+
'cache-control': 'public, max-age=31536000, immutable',
|
|
44
|
+
});
|
|
45
|
+
expect(request('/').body?.toString()).to.equal('<html></html>');
|
|
46
|
+
expect(request('/index.html').headers['content-type']).to.equal('text/html; charset=UTF-8');
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it('answers HEAD without a body and If-None-Match with 304', () => {
|
|
50
|
+
const head = request('/assets/app.js', {}, 'HEAD');
|
|
51
|
+
expect(head.status).to.equal(200);
|
|
52
|
+
expect(head.body).to.equal(undefined);
|
|
53
|
+
expect(request('/assets/app.js', {}, 'GET', { 'if-none-match': '"b"' }).status).to.equal(304);
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it('passes on what it does not have, other methods and the base href', () => {
|
|
57
|
+
expect(request('/missing.js').next).to.equal(true);
|
|
58
|
+
expect(request('/assets/app.js', {}, 'POST').next).to.equal(true);
|
|
59
|
+
expect(request('/app/assets/app.js', { baseHref: '/app/' }).body?.toString()).to.equal('run()');
|
|
60
|
+
expect(request('/%E0%A4%A').next).to.equal(true);
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
it('is found under a global symbol shared with the build', () => {
|
|
64
|
+
expect(EmbeddedAssets.KEY).to.equal(Symbol.for('@celljs/serve-static/assets'));
|
|
65
|
+
expect(EmbeddedAssets.get()).to.equal(undefined);
|
|
66
|
+
});
|
|
67
|
+
});
|