@celljs/serve-static 4.0.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.
@@ -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":"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"}
@@ -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,WAShD,GAAG,OAAO,GAAG,QAAQ,QAAQ,QA0F7C,CAAC;AAEF,eAAO,MAAM,IAAI,uBAAY,CAAC"}
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"}
@@ -13,7 +13,8 @@ const serveStatic = (root, opts) => {
13
13
  createRedirectDirectoryListener :
14
14
  createNotFoundDirectoryListener;
15
15
  opts.root = (0, path_1.resolve)(root);
16
- return (req, res, next) => {
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 url = new URL(`${req.url.replace(baseHref, '/')}`, `http://${req.headers.host}`);
31
- const stream = (0, send_1.default)(req, url.pathname, opts);
32
- stream.on('directory', onDirectory(url));
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":"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"}
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": "4.0.0",
3
+ "version": "4.1.0",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "cell-component"
@@ -29,11 +29,10 @@
29
29
  "watch": "tsc -b -w --preserveWatchOutput"
30
30
  },
31
31
  "dependencies": {
32
- "@celljs/core": "4.0.0",
33
- "@celljs/http": "4.0.0",
34
- "@celljs/web": "4.0.0",
35
- "send": "^0.17.1",
36
- "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"
37
36
  },
38
37
  "devDependencies": {
39
38
  "@types/send": "^0.17.0"
@@ -16,31 +16,37 @@ export interface EmbeddedAsset {
16
16
  export namespace EmbeddedAssets {
17
17
  export const KEY = Symbol.for('@celljs/serve-static/assets');
18
18
 
19
- const decoded = new Map<string, Buffer>();
19
+ /** Decoded bodies, per table of assets: a table that is registered again is decoded again. */
20
+ const decoded = new WeakMap<Map<string, EmbeddedAsset>, Map<string, Buffer>>();
20
21
 
21
22
  export function get(): Map<string, EmbeddedAsset> | undefined {
22
23
  return (globalThis as Record<symbol, Map<string, EmbeddedAsset> | undefined>)[KEY];
23
24
  }
24
25
 
25
- function content(path: string, asset: EmbeddedAsset): Buffer {
26
- let body = decoded.get(path);
26
+ function content(assets: Map<string, EmbeddedAsset>, path: string, asset: EmbeddedAsset): Buffer {
27
+ let bodies = decoded.get(assets);
28
+ if (!bodies) {
29
+ bodies = new Map();
30
+ decoded.set(assets, bodies);
31
+ }
32
+ let body = bodies.get(path);
27
33
  if (!body) {
28
34
  body = Buffer.from(asset.body, 'base64');
29
- decoded.set(path, body);
35
+ bodies.set(path, body);
30
36
  }
31
37
  return body;
32
38
  }
33
39
 
34
40
  /** The counterpart of `serveStatic`: same options, same `next()` when a file is not there. */
35
41
  export function serve(assets: Map<string, EmbeddedAsset>, opts: ServeStaticOption & { maxAge?: number }) {
36
- return (req: any, res: any, next: (err?: unknown) => void) => {
42
+ return (req: any, res: any, next: (err?: unknown) => void, url: string = req.url) => {
37
43
  if (req.method !== 'GET' && req.method !== 'HEAD') {
38
44
  next();
39
45
  return;
40
46
  }
41
47
  let path: string;
42
48
  try {
43
- path = decodeURIComponent(new URL(req.url.replace(opts.baseHref, '/'), 'http://localhost').pathname);
49
+ path = decodeURIComponent(new URL(url.replace(opts.baseHref, '/'), 'http://localhost').pathname);
44
50
  } catch {
45
51
  next();
46
52
  return;
@@ -67,7 +73,7 @@ export namespace EmbeddedAssets {
67
73
  res.end();
68
74
  return;
69
75
  }
70
- const body = content(path, asset);
76
+ const body = content(assets, path, asset);
71
77
  res.statusCode = 200;
72
78
  res.setHeader('Content-Length', body.length);
73
79
  res.end(req.method === 'HEAD' ? undefined : body);