@celljs/serve-static 3.9.0 → 4.0.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 +70 -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 +5 -0
- package/esm/node/serve-static-middleware.js +8 -2
- package/esm/node/serve-static-middleware.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 +76 -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 +5 -0
- package/lib/node/serve-static-middleware.d.ts.map +1 -1
- package/lib/node/serve-static-middleware.js +8 -2
- package/lib/node/serve-static-middleware.js.map +1 -1
- package/package.json +12 -13
- package/src/node/embedded-assets.spec.ts +67 -0
- package/src/node/embedded-assets.ts +76 -0
- package/src/node/index.ts +1 -0
- package/src/node/serve-static-middleware.ts +14 -3
- 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
package/cell.yml
CHANGED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { ServeStaticOption } from './type.js';
|
|
2
|
+
/** A frontend file inside a server bundle built with `cell build --single`. */
|
|
3
|
+
export interface EmbeddedAsset {
|
|
4
|
+
/** Base64 of the content. */
|
|
5
|
+
body: string;
|
|
6
|
+
etag: string;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Frontend files that a `cell build --single` bundle registers before the application starts, by URL
|
|
10
|
+
* path (`/index.html`, `/assets/index-abc.js`). When they are there, they are served from memory
|
|
11
|
+
* instead of `cell.serve-static.root`.
|
|
12
|
+
*/
|
|
13
|
+
export declare namespace EmbeddedAssets {
|
|
14
|
+
const KEY: unique symbol;
|
|
15
|
+
function get(): Map<string, EmbeddedAsset> | undefined;
|
|
16
|
+
/** The counterpart of `serveStatic`: same options, same `next()` when a file is not there. */
|
|
17
|
+
function serve(assets: Map<string, EmbeddedAsset>, opts: ServeStaticOption & {
|
|
18
|
+
maxAge?: number;
|
|
19
|
+
}): (req: any, res: any, next: (err?: unknown) => void) => void;
|
|
20
|
+
}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import send from 'send';
|
|
2
|
+
/**
|
|
3
|
+
* Frontend files that a `cell build --single` bundle registers before the application starts, by URL
|
|
4
|
+
* path (`/index.html`, `/assets/index-abc.js`). When they are there, they are served from memory
|
|
5
|
+
* instead of `cell.serve-static.root`.
|
|
6
|
+
*/
|
|
7
|
+
export var EmbeddedAssets;
|
|
8
|
+
(function (EmbeddedAssets) {
|
|
9
|
+
EmbeddedAssets.KEY = Symbol.for('@celljs/serve-static/assets');
|
|
10
|
+
const decoded = new Map();
|
|
11
|
+
function get() {
|
|
12
|
+
return globalThis[EmbeddedAssets.KEY];
|
|
13
|
+
}
|
|
14
|
+
EmbeddedAssets.get = get;
|
|
15
|
+
function content(path, asset) {
|
|
16
|
+
let body = decoded.get(path);
|
|
17
|
+
if (!body) {
|
|
18
|
+
body = Buffer.from(asset.body, 'base64');
|
|
19
|
+
decoded.set(path, body);
|
|
20
|
+
}
|
|
21
|
+
return body;
|
|
22
|
+
}
|
|
23
|
+
/** The counterpart of `serveStatic`: same options, same `next()` when a file is not there. */
|
|
24
|
+
function serve(assets, opts) {
|
|
25
|
+
return (req, res, next) => {
|
|
26
|
+
var _a;
|
|
27
|
+
var _b, _c;
|
|
28
|
+
if (req.method !== 'GET' && req.method !== 'HEAD') {
|
|
29
|
+
next();
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
let path;
|
|
33
|
+
try {
|
|
34
|
+
path = decodeURIComponent(new URL(req.url.replace(opts.baseHref, '/'), 'http://localhost').pathname);
|
|
35
|
+
}
|
|
36
|
+
catch (_d) {
|
|
37
|
+
next();
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
if (path.endsWith('/')) {
|
|
41
|
+
path += 'index.html';
|
|
42
|
+
}
|
|
43
|
+
const asset = assets.get(path);
|
|
44
|
+
if (!asset) {
|
|
45
|
+
next();
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
const type = send.mime.lookup(path);
|
|
49
|
+
const charset = send.mime.charsets.lookup(type);
|
|
50
|
+
res.setHeader('Content-Type', charset ? `${type}; charset=${charset}` : type);
|
|
51
|
+
res.setHeader('ETag', asset.etag);
|
|
52
|
+
if (opts.cacheControl !== false) {
|
|
53
|
+
const maxAge = Math.floor(Math.min(Math.max(0, Number((_c = (_b = opts.maxAge) !== null && _b !== void 0 ? _b : opts.maxage) !== null && _c !== void 0 ? _c : 0)), 31536000000) / 1000);
|
|
54
|
+
res.setHeader('Cache-Control', `public, max-age=${maxAge}${opts.immutable ? ', immutable' : ''}`);
|
|
55
|
+
}
|
|
56
|
+
(_a = opts.setHeaders) === null || _a === void 0 ? void 0 : _a.call(opts, res, path, undefined);
|
|
57
|
+
if (req.headers['if-none-match'] === asset.etag) {
|
|
58
|
+
res.statusCode = 304;
|
|
59
|
+
res.end();
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const body = content(path, asset);
|
|
63
|
+
res.statusCode = 200;
|
|
64
|
+
res.setHeader('Content-Length', body.length);
|
|
65
|
+
res.end(req.method === 'HEAD' ? undefined : body);
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
EmbeddedAssets.serve = serve;
|
|
69
|
+
})(EmbeddedAssets || (EmbeddedAssets = {}));
|
|
70
|
+
//# sourceMappingURL=embedded-assets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"embedded-assets.js","sourceRoot":"","sources":["../../src/node/embedded-assets.ts"],"names":[],"mappings":"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"}
|
package/esm/node/index.d.ts
CHANGED
package/esm/node/index.js
CHANGED
package/esm/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AACA,cAAc,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AACA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC"}
|
|
@@ -9,6 +9,11 @@ export declare class ServeStaticMiddleware implements Middleware {
|
|
|
9
9
|
};
|
|
10
10
|
protected path: string;
|
|
11
11
|
protected readonly requestMatcher: RequestMatcher;
|
|
12
|
+
/**
|
|
13
|
+
* Whether there is a frontend to serve: embedded in the bundle (`--single`) or on disk. On
|
|
14
|
+
* Cloudflare Workers the platform serves the frontend and the worker has no copy.
|
|
15
|
+
*/
|
|
16
|
+
protected hasFrontend?: boolean;
|
|
12
17
|
handle(ctx: Context, next: () => Promise<void>): Promise<void>;
|
|
13
18
|
priority: number;
|
|
14
19
|
}
|
|
@@ -9,17 +9,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
};
|
|
10
10
|
import { Middleware, RequestMatcher, HTTP_MIDDLEWARE_PRIORITY } from '@celljs/web/lib/node';
|
|
11
11
|
import { serveStatic, mime } from './serve-static.js';
|
|
12
|
+
import { EmbeddedAssets } from './embedded-assets.js';
|
|
12
13
|
import { Value, Component, Autowired } from '@celljs/core';
|
|
13
14
|
import { HttpMethod, MediaType, HttpHeaders } from '@celljs/http';
|
|
14
15
|
import { SERVER_PATH } from '@celljs/web';
|
|
16
|
+
import { existsSync } from 'fs';
|
|
15
17
|
let ServeStaticMiddleware = class ServeStaticMiddleware {
|
|
16
18
|
constructor() {
|
|
17
19
|
this.priority = HTTP_MIDDLEWARE_PRIORITY + 500;
|
|
18
20
|
}
|
|
19
21
|
async handle(ctx, next) {
|
|
22
|
+
var _a;
|
|
20
23
|
this.config.options.baseHref = this.path;
|
|
21
24
|
const method = ctx.request.method;
|
|
22
|
-
|
|
25
|
+
(_a = this.hasFrontend) !== null && _a !== void 0 ? _a : (this.hasFrontend = !!EmbeddedAssets.get() || existsSync(this.config.root));
|
|
26
|
+
if (!this.hasFrontend || !(method === HttpMethod.GET || method === HttpMethod.HEAD) || ctx.request.query['static'] === 'skip') {
|
|
23
27
|
await next();
|
|
24
28
|
return;
|
|
25
29
|
}
|
|
@@ -44,7 +48,9 @@ let ServeStaticMiddleware = class ServeStaticMiddleware {
|
|
|
44
48
|
}
|
|
45
49
|
};
|
|
46
50
|
}
|
|
47
|
-
|
|
51
|
+
const embedded = EmbeddedAssets.get();
|
|
52
|
+
const serve = embedded ? EmbeddedAssets.serve(embedded, this.config.options) : serveStatic(this.config.root, this.config.options);
|
|
53
|
+
serve(ctx.request, ctx.response, ((err) => {
|
|
48
54
|
const url = ctx.request.url;
|
|
49
55
|
if (url !== '/index.html') {
|
|
50
56
|
if (!this.config.spa) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-static-middleware.js","sourceRoot":"","sources":["../../src/node/serve-static-middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAW,cAAc,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACrG,OAAO,EAAC,WAAW,EAAE,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
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,21 @@
|
|
|
1
|
+
import type { ServeStaticOption } from './type';
|
|
2
|
+
/** A frontend file inside a server bundle built with `cell build --single`. */
|
|
3
|
+
export interface EmbeddedAsset {
|
|
4
|
+
/** Base64 of the content. */
|
|
5
|
+
body: string;
|
|
6
|
+
etag: string;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Frontend files that a `cell build --single` bundle registers before the application starts, by URL
|
|
10
|
+
* path (`/index.html`, `/assets/index-abc.js`). When they are there, they are served from memory
|
|
11
|
+
* instead of `cell.serve-static.root`.
|
|
12
|
+
*/
|
|
13
|
+
export declare namespace EmbeddedAssets {
|
|
14
|
+
const KEY: unique symbol;
|
|
15
|
+
function get(): Map<string, EmbeddedAsset> | undefined;
|
|
16
|
+
/** The counterpart of `serveStatic`: same options, same `next()` when a file is not there. */
|
|
17
|
+
function serve(assets: Map<string, EmbeddedAsset>, opts: ServeStaticOption & {
|
|
18
|
+
maxAge?: number;
|
|
19
|
+
}): (req: any, res: any, next: (err?: unknown) => void) => void;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=embedded-assets.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"embedded-assets.d.ts","sourceRoot":"","sources":["../../src/node/embedded-assets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAEhD,+EAA+E;AAC/E,MAAM,WAAW,aAAa;IAC1B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,yBAAiB,cAAc,CAAC;IACrB,MAAM,GAAG,eAA4C,CAAC;IAI7D,SAAgB,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAE5D;IAWD,8FAA8F;IAC9F,SAAgB,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,IAAI,EAAE,iBAAiB,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,SACtF,GAAG,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,IAAI,UAuC5D;CACJ"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.EmbeddedAssets = void 0;
|
|
7
|
+
const send_1 = __importDefault(require("send"));
|
|
8
|
+
/**
|
|
9
|
+
* Frontend files that a `cell build --single` bundle registers before the application starts, by URL
|
|
10
|
+
* path (`/index.html`, `/assets/index-abc.js`). When they are there, they are served from memory
|
|
11
|
+
* instead of `cell.serve-static.root`.
|
|
12
|
+
*/
|
|
13
|
+
var EmbeddedAssets;
|
|
14
|
+
(function (EmbeddedAssets) {
|
|
15
|
+
EmbeddedAssets.KEY = Symbol.for('@celljs/serve-static/assets');
|
|
16
|
+
const decoded = new Map();
|
|
17
|
+
function get() {
|
|
18
|
+
return globalThis[EmbeddedAssets.KEY];
|
|
19
|
+
}
|
|
20
|
+
EmbeddedAssets.get = get;
|
|
21
|
+
function content(path, asset) {
|
|
22
|
+
let body = decoded.get(path);
|
|
23
|
+
if (!body) {
|
|
24
|
+
body = Buffer.from(asset.body, 'base64');
|
|
25
|
+
decoded.set(path, body);
|
|
26
|
+
}
|
|
27
|
+
return body;
|
|
28
|
+
}
|
|
29
|
+
/** The counterpart of `serveStatic`: same options, same `next()` when a file is not there. */
|
|
30
|
+
function serve(assets, opts) {
|
|
31
|
+
return (req, res, next) => {
|
|
32
|
+
var _a;
|
|
33
|
+
var _b, _c;
|
|
34
|
+
if (req.method !== 'GET' && req.method !== 'HEAD') {
|
|
35
|
+
next();
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
let path;
|
|
39
|
+
try {
|
|
40
|
+
path = decodeURIComponent(new URL(req.url.replace(opts.baseHref, '/'), 'http://localhost').pathname);
|
|
41
|
+
}
|
|
42
|
+
catch (_d) {
|
|
43
|
+
next();
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
if (path.endsWith('/')) {
|
|
47
|
+
path += 'index.html';
|
|
48
|
+
}
|
|
49
|
+
const asset = assets.get(path);
|
|
50
|
+
if (!asset) {
|
|
51
|
+
next();
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
const type = send_1.default.mime.lookup(path);
|
|
55
|
+
const charset = send_1.default.mime.charsets.lookup(type);
|
|
56
|
+
res.setHeader('Content-Type', charset ? `${type}; charset=${charset}` : type);
|
|
57
|
+
res.setHeader('ETag', asset.etag);
|
|
58
|
+
if (opts.cacheControl !== false) {
|
|
59
|
+
const maxAge = Math.floor(Math.min(Math.max(0, Number((_c = (_b = opts.maxAge) !== null && _b !== void 0 ? _b : opts.maxage) !== null && _c !== void 0 ? _c : 0)), 31536000000) / 1000);
|
|
60
|
+
res.setHeader('Cache-Control', `public, max-age=${maxAge}${opts.immutable ? ', immutable' : ''}`);
|
|
61
|
+
}
|
|
62
|
+
(_a = opts.setHeaders) === null || _a === void 0 ? void 0 : _a.call(opts, res, path, undefined);
|
|
63
|
+
if (req.headers['if-none-match'] === asset.etag) {
|
|
64
|
+
res.statusCode = 304;
|
|
65
|
+
res.end();
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const body = content(path, asset);
|
|
69
|
+
res.statusCode = 200;
|
|
70
|
+
res.setHeader('Content-Length', body.length);
|
|
71
|
+
res.end(req.method === 'HEAD' ? undefined : body);
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
EmbeddedAssets.serve = serve;
|
|
75
|
+
})(EmbeddedAssets || (exports.EmbeddedAssets = EmbeddedAssets = {}));
|
|
76
|
+
//# sourceMappingURL=embedded-assets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"embedded-assets.js","sourceRoot":"","sources":["../../src/node/embedded-assets.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAUxB;;;;GAIG;AACH,IAAiB,cAAc,CA4D9B;AA5DD,WAAiB,cAAc;IACd,kBAAG,GAAG,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAE7D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE1C,SAAgB,GAAG;QACf,OAAQ,UAAqE,CAAC,kBAAG,CAAC,CAAC;IACvF,CAAC;IAFe,eAAA,GAAG,MAElB,CAAA;IAED,SAAS,OAAO,CAAC,IAAY,EAAE,KAAoB;QAC/C,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,8FAA8F;IAC9F,SAAgB,KAAK,CAAC,MAAkC,EAAE,IAA6C;QACnG,OAAO,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAA6B,EAAE,EAAE;;;YACzD,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBAChD,IAAI,EAAE,CAAC;gBACP,OAAO;YACX,CAAC;YACD,IAAI,IAAY,CAAC;YACjB,IAAI,CAAC;gBACD,IAAI,GAAG,kBAAkB,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,CAAC;YACzG,CAAC;uBAAO,CAAC;gBACL,IAAI,EAAE,CAAC;gBACP,OAAO;YACX,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,IAAI,IAAI,YAAY,CAAC;YACzB,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,IAAI,EAAE,CAAC;gBACP,OAAO;YACX,CAAC;YACD,MAAM,IAAI,GAAI,cAAI,CAAC,IAAY,CAAC,MAAM,CAAC,IAAI,CAAW,CAAC;YACvD,MAAM,OAAO,GAAI,cAAI,CAAC,IAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAuB,CAAC;YAC/E,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,aAAa,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9E,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,IAAI,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,aAAC,IAAI,CAAC,MAAM,mCAAI,IAAI,CAAC,MAAM,mCAAI,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC9G,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,mBAAmB,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACtG,CAAC;YACD,MAAA,IAAI,CAAC,UAAU,+CAAf,IAAI,EAAc,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YACxC,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC9C,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBACrB,GAAG,CAAC,GAAG,EAAE,CAAC;gBACV,OAAO;YACX,CAAC;YACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAClC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC7C,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtD,CAAC,CAAC;IACN,CAAC;IAxCe,eAAA,KAAK,QAwCpB,CAAA;AACL,CAAC,EA5DgB,cAAc,aAAd,cAAc,GAAd,cAAc,QA4D9B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"embedded-assets.spec.d.ts","sourceRoot":"","sources":["../../src/node/embedded-assets.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,60 @@
|
|
|
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 embedded_assets_1 = require("./embedded-assets");
|
|
6
|
+
function request(url, opts = {}, method = 'GET', headers = {}) {
|
|
7
|
+
const assets = new Map([
|
|
8
|
+
['/index.html', { body: Buffer.from('<html></html>').toString('base64'), etag: '"a"' }],
|
|
9
|
+
['/assets/app.js', { body: Buffer.from('run()').toString('base64'), etag: '"b"' }],
|
|
10
|
+
]);
|
|
11
|
+
const sent = { headers: {}, next: false };
|
|
12
|
+
const res = {
|
|
13
|
+
statusCode: 0,
|
|
14
|
+
setHeader: (name, value) => {
|
|
15
|
+
sent.headers[name.toLowerCase()] = value;
|
|
16
|
+
},
|
|
17
|
+
end: (body) => {
|
|
18
|
+
sent.status = res.statusCode;
|
|
19
|
+
sent.body = body;
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
embedded_assets_1.EmbeddedAssets.serve(assets, { baseHref: '/', root: '', ...opts })({ url, method, headers }, res, () => {
|
|
23
|
+
sent.next = true;
|
|
24
|
+
});
|
|
25
|
+
return sent;
|
|
26
|
+
}
|
|
27
|
+
(0, bun_test_1.describe)('EmbeddedAssets', () => {
|
|
28
|
+
(0, bun_test_1.it)('serves files from memory with type, length, ETag and cache headers', () => {
|
|
29
|
+
var _a, _b;
|
|
30
|
+
const js = request('/assets/app.js', { maxAge: 31536000000, immutable: true });
|
|
31
|
+
(0, chai_1.expect)(js.status).to.equal(200);
|
|
32
|
+
(0, chai_1.expect)((_a = js.body) === null || _a === void 0 ? void 0 : _a.toString()).to.equal('run()');
|
|
33
|
+
(0, chai_1.expect)(js.headers).to.include({
|
|
34
|
+
'content-type': 'application/javascript; charset=UTF-8',
|
|
35
|
+
'content-length': 5,
|
|
36
|
+
etag: '"b"',
|
|
37
|
+
'cache-control': 'public, max-age=31536000, immutable',
|
|
38
|
+
});
|
|
39
|
+
(0, chai_1.expect)((_b = request('/').body) === null || _b === void 0 ? void 0 : _b.toString()).to.equal('<html></html>');
|
|
40
|
+
(0, chai_1.expect)(request('/index.html').headers['content-type']).to.equal('text/html; charset=UTF-8');
|
|
41
|
+
});
|
|
42
|
+
(0, bun_test_1.it)('answers HEAD without a body and If-None-Match with 304', () => {
|
|
43
|
+
const head = request('/assets/app.js', {}, 'HEAD');
|
|
44
|
+
(0, chai_1.expect)(head.status).to.equal(200);
|
|
45
|
+
(0, chai_1.expect)(head.body).to.equal(undefined);
|
|
46
|
+
(0, chai_1.expect)(request('/assets/app.js', {}, 'GET', { 'if-none-match': '"b"' }).status).to.equal(304);
|
|
47
|
+
});
|
|
48
|
+
(0, bun_test_1.it)('passes on what it does not have, other methods and the base href', () => {
|
|
49
|
+
var _a;
|
|
50
|
+
(0, chai_1.expect)(request('/missing.js').next).to.equal(true);
|
|
51
|
+
(0, chai_1.expect)(request('/assets/app.js', {}, 'POST').next).to.equal(true);
|
|
52
|
+
(0, chai_1.expect)((_a = request('/app/assets/app.js', { baseHref: '/app/' }).body) === null || _a === void 0 ? void 0 : _a.toString()).to.equal('run()');
|
|
53
|
+
(0, chai_1.expect)(request('/%E0%A4%A').next).to.equal(true);
|
|
54
|
+
});
|
|
55
|
+
(0, bun_test_1.it)('is found under a global symbol shared with the build', () => {
|
|
56
|
+
(0, chai_1.expect)(embedded_assets_1.EmbeddedAssets.KEY).to.equal(Symbol.for('@celljs/serve-static/assets'));
|
|
57
|
+
(0, chai_1.expect)(embedded_assets_1.EmbeddedAssets.get()).to.equal(undefined);
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
//# sourceMappingURL=embedded-assets.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"embedded-assets.spec.js","sourceRoot":"","sources":["../../src/node/embedded-assets.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/node/index.d.ts
CHANGED
package/lib/node/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AACA,cAAc,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AACA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC"}
|
package/lib/node/index.js
CHANGED
|
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./serve-static-middleware"), exports);
|
|
18
|
+
__exportStar(require("./embedded-assets"), exports);
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
package/lib/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,4DAA0C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,4DAA0C;AAC1C,oDAAkC"}
|
|
@@ -9,6 +9,11 @@ export declare class ServeStaticMiddleware implements Middleware {
|
|
|
9
9
|
};
|
|
10
10
|
protected path: string;
|
|
11
11
|
protected readonly requestMatcher: RequestMatcher;
|
|
12
|
+
/**
|
|
13
|
+
* Whether there is a frontend to serve: embedded in the bundle (`--single`) or on disk. On
|
|
14
|
+
* Cloudflare Workers the platform serves the frontend and the worker has no copy.
|
|
15
|
+
*/
|
|
16
|
+
protected hasFrontend?: boolean;
|
|
12
17
|
handle(ctx: Context, next: () => Promise<void>): Promise<void>;
|
|
13
18
|
priority: number;
|
|
14
19
|
}
|
|
@@ -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;
|
|
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;AAQrG,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,CAAC,EAAE,OAAO,CAAC;IAE1B,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,21 @@ 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");
|
|
18
20
|
let ServeStaticMiddleware = class ServeStaticMiddleware {
|
|
19
21
|
constructor() {
|
|
20
22
|
this.priority = node_1.HTTP_MIDDLEWARE_PRIORITY + 500;
|
|
21
23
|
}
|
|
22
24
|
async handle(ctx, next) {
|
|
25
|
+
var _a;
|
|
23
26
|
this.config.options.baseHref = this.path;
|
|
24
27
|
const method = ctx.request.method;
|
|
25
|
-
|
|
28
|
+
(_a = this.hasFrontend) !== null && _a !== void 0 ? _a : (this.hasFrontend = !!embedded_assets_1.EmbeddedAssets.get() || (0, fs_1.existsSync)(this.config.root));
|
|
29
|
+
if (!this.hasFrontend || !(method === http_1.HttpMethod.GET || method === http_1.HttpMethod.HEAD) || ctx.request.query['static'] === 'skip') {
|
|
26
30
|
await next();
|
|
27
31
|
return;
|
|
28
32
|
}
|
|
@@ -47,7 +51,9 @@ let ServeStaticMiddleware = class ServeStaticMiddleware {
|
|
|
47
51
|
}
|
|
48
52
|
};
|
|
49
53
|
}
|
|
50
|
-
|
|
54
|
+
const embedded = embedded_assets_1.EmbeddedAssets.get();
|
|
55
|
+
const serve = embedded ? embedded_assets_1.EmbeddedAssets.serve(embedded, this.config.options) : (0, serve_static_1.serveStatic)(this.config.root, this.config.options);
|
|
56
|
+
serve(ctx.request, ctx.response, ((err) => {
|
|
51
57
|
const url = ctx.request.url;
|
|
52
58
|
if (url !== '/index.html') {
|
|
53
59
|
if (!this.config.spa) {
|
|
@@ -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,uCAA2D;AAC3D,uCAAkE;AAClE,qCAA0C;
|
|
1
|
+
{"version":3,"file":"serve-static-middleware.js","sourceRoot":"","sources":["../../src/node/serve-static-middleware.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.0.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,13 @@
|
|
|
30
29
|
"watch": "tsc -b -w --preserveWatchOutput"
|
|
31
30
|
},
|
|
32
31
|
"dependencies": {
|
|
33
|
-
"@celljs/core": "
|
|
34
|
-
"@celljs/http": "
|
|
35
|
-
"@celljs/web": "
|
|
32
|
+
"@celljs/core": "4.0.0",
|
|
33
|
+
"@celljs/http": "4.0.0",
|
|
34
|
+
"@celljs/web": "4.0.0",
|
|
36
35
|
"send": "^0.17.1",
|
|
37
36
|
"tslib": "^2.8.0"
|
|
38
37
|
},
|
|
39
38
|
"devDependencies": {
|
|
40
|
-
"@celljs/cli-service": "3.9.0",
|
|
41
39
|
"@types/send": "^0.17.0"
|
|
42
40
|
},
|
|
43
41
|
"publishConfig": {
|
|
@@ -45,28 +43,29 @@
|
|
|
45
43
|
},
|
|
46
44
|
"exports": {
|
|
47
45
|
".": {
|
|
48
|
-
"webpack": "./lib/node/index.js",
|
|
49
46
|
"import": "./esm/node/index.js",
|
|
50
47
|
"default": "./lib/node/index.js"
|
|
51
48
|
},
|
|
52
49
|
"./package.json": "./package.json",
|
|
53
|
-
"./lib/hooks/*.js": "./lib/hooks/*.js",
|
|
54
|
-
"./lib/hooks/*": "./lib/hooks/*.js",
|
|
55
50
|
"./lib/node": {
|
|
56
|
-
"webpack": "./lib/node/index.js",
|
|
57
51
|
"import": "./esm/node/index.js",
|
|
58
52
|
"default": "./lib/node/index.js"
|
|
59
53
|
},
|
|
60
54
|
"./lib/*.js": {
|
|
61
|
-
"webpack": "./lib/*.js",
|
|
62
55
|
"import": "./esm/*.js",
|
|
63
56
|
"default": "./lib/*.js"
|
|
64
57
|
},
|
|
65
58
|
"./lib/*": {
|
|
66
|
-
"webpack": "./lib/*.js",
|
|
67
59
|
"import": "./esm/*.js",
|
|
68
60
|
"default": "./lib/*.js"
|
|
69
61
|
},
|
|
70
62
|
"./*": "./*"
|
|
63
|
+
},
|
|
64
|
+
"cell": {
|
|
65
|
+
"modules": {
|
|
66
|
+
"backend": [
|
|
67
|
+
"lib/node/module"
|
|
68
|
+
]
|
|
69
|
+
}
|
|
71
70
|
}
|
|
72
71
|
}
|
|
@@ -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
|
+
});
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import send from 'send';
|
|
2
|
+
import type { ServeStaticOption } from './type';
|
|
3
|
+
|
|
4
|
+
/** A frontend file inside a server bundle built with `cell build --single`. */
|
|
5
|
+
export interface EmbeddedAsset {
|
|
6
|
+
/** Base64 of the content. */
|
|
7
|
+
body: string;
|
|
8
|
+
etag: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Frontend files that a `cell build --single` bundle registers before the application starts, by URL
|
|
13
|
+
* path (`/index.html`, `/assets/index-abc.js`). When they are there, they are served from memory
|
|
14
|
+
* instead of `cell.serve-static.root`.
|
|
15
|
+
*/
|
|
16
|
+
export namespace EmbeddedAssets {
|
|
17
|
+
export const KEY = Symbol.for('@celljs/serve-static/assets');
|
|
18
|
+
|
|
19
|
+
const decoded = new Map<string, Buffer>();
|
|
20
|
+
|
|
21
|
+
export function get(): Map<string, EmbeddedAsset> | undefined {
|
|
22
|
+
return (globalThis as Record<symbol, Map<string, EmbeddedAsset> | undefined>)[KEY];
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
function content(path: string, asset: EmbeddedAsset): Buffer {
|
|
26
|
+
let body = decoded.get(path);
|
|
27
|
+
if (!body) {
|
|
28
|
+
body = Buffer.from(asset.body, 'base64');
|
|
29
|
+
decoded.set(path, body);
|
|
30
|
+
}
|
|
31
|
+
return body;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** The counterpart of `serveStatic`: same options, same `next()` when a file is not there. */
|
|
35
|
+
export function serve(assets: Map<string, EmbeddedAsset>, opts: ServeStaticOption & { maxAge?: number }) {
|
|
36
|
+
return (req: any, res: any, next: (err?: unknown) => void) => {
|
|
37
|
+
if (req.method !== 'GET' && req.method !== 'HEAD') {
|
|
38
|
+
next();
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
let path: string;
|
|
42
|
+
try {
|
|
43
|
+
path = decodeURIComponent(new URL(req.url.replace(opts.baseHref, '/'), 'http://localhost').pathname);
|
|
44
|
+
} catch {
|
|
45
|
+
next();
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
if (path.endsWith('/')) {
|
|
49
|
+
path += 'index.html';
|
|
50
|
+
}
|
|
51
|
+
const asset = assets.get(path);
|
|
52
|
+
if (!asset) {
|
|
53
|
+
next();
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const type = (send.mime as any).lookup(path) as string;
|
|
57
|
+
const charset = (send.mime as any).charsets.lookup(type) as string | undefined;
|
|
58
|
+
res.setHeader('Content-Type', charset ? `${type}; charset=${charset}` : type);
|
|
59
|
+
res.setHeader('ETag', asset.etag);
|
|
60
|
+
if (opts.cacheControl !== false) {
|
|
61
|
+
const maxAge = Math.floor(Math.min(Math.max(0, Number(opts.maxAge ?? opts.maxage ?? 0)), 31536000000) / 1000);
|
|
62
|
+
res.setHeader('Cache-Control', `public, max-age=${maxAge}${opts.immutable ? ', immutable' : ''}`);
|
|
63
|
+
}
|
|
64
|
+
opts.setHeaders?.(res, path, undefined);
|
|
65
|
+
if (req.headers['if-none-match'] === asset.etag) {
|
|
66
|
+
res.statusCode = 304;
|
|
67
|
+
res.end();
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
const body = content(path, asset);
|
|
71
|
+
res.statusCode = 200;
|
|
72
|
+
res.setHeader('Content-Length', body.length);
|
|
73
|
+
res.end(req.method === 'HEAD' ? undefined : body);
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
}
|
package/src/node/index.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { Middleware, Context, RequestMatcher, HTTP_MIDDLEWARE_PRIORITY } from '@celljs/web/lib/node';
|
|
2
2
|
import {serveStatic, mime} from './serve-static';
|
|
3
|
+
import { EmbeddedAssets } from './embedded-assets';
|
|
3
4
|
import { Value, Component, Autowired } from '@celljs/core';
|
|
4
5
|
import { HttpMethod, MediaType, HttpHeaders } from '@celljs/http';
|
|
5
6
|
import { SERVER_PATH } from '@celljs/web';
|
|
6
7
|
import { OutgoingMessage } from 'http';
|
|
8
|
+
import { existsSync } from 'fs';
|
|
7
9
|
@Component(Middleware)
|
|
8
10
|
export class ServeStaticMiddleware implements Middleware {
|
|
9
11
|
|
|
@@ -16,11 +18,18 @@ export class ServeStaticMiddleware implements Middleware {
|
|
|
16
18
|
@Autowired(RequestMatcher)
|
|
17
19
|
protected readonly requestMatcher: RequestMatcher;
|
|
18
20
|
|
|
21
|
+
/**
|
|
22
|
+
* Whether there is a frontend to serve: embedded in the bundle (`--single`) or on disk. On
|
|
23
|
+
* Cloudflare Workers the platform serves the frontend and the worker has no copy.
|
|
24
|
+
*/
|
|
25
|
+
protected hasFrontend?: boolean;
|
|
26
|
+
|
|
19
27
|
async handle(ctx: Context, next: () => Promise<void>): Promise<void> {
|
|
20
28
|
this.config.options.baseHref = this.path;
|
|
21
29
|
const method = ctx.request.method;
|
|
30
|
+
this.hasFrontend ??= !!EmbeddedAssets.get() || existsSync(this.config.root);
|
|
22
31
|
|
|
23
|
-
if (!(method === HttpMethod.GET || method === HttpMethod.HEAD) || ctx.request.query['static'] === 'skip') {
|
|
32
|
+
if (!this.hasFrontend || !(method === HttpMethod.GET || method === HttpMethod.HEAD) || ctx.request.query['static'] === 'skip') {
|
|
24
33
|
await next();
|
|
25
34
|
return;
|
|
26
35
|
}
|
|
@@ -49,7 +58,9 @@ export class ServeStaticMiddleware implements Middleware {
|
|
|
49
58
|
};
|
|
50
59
|
}
|
|
51
60
|
|
|
52
|
-
|
|
61
|
+
const embedded = EmbeddedAssets.get();
|
|
62
|
+
const serve = embedded ? EmbeddedAssets.serve(embedded, this.config.options) : serveStatic(this.config.root, this.config.options);
|
|
63
|
+
serve(ctx.request as any, ctx.response as any, ((err: any) => {
|
|
53
64
|
const url = ctx.request.url;
|
|
54
65
|
if (url !== '/index.html') {
|
|
55
66
|
if (!this.config.spa) {
|
|
@@ -70,4 +81,4 @@ export class ServeStaticMiddleware implements Middleware {
|
|
|
70
81
|
}
|
|
71
82
|
priority = HTTP_MIDDLEWARE_PRIORITY + 500;
|
|
72
83
|
|
|
73
|
-
}
|
|
84
|
+
}
|
package/cell-remote.yml
DELETED
package/lib/hooks/webpack.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../src/hooks/webpack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAwB,MAAM,qBAAqB,CAAC;;0BAErD,OAAO,EAAE,cAAc"}
|
package/lib/hooks/webpack.js
DELETED
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const cli_service_1 = require("@celljs/cli-service");
|
|
4
|
-
exports.default = async (context) => {
|
|
5
|
-
const { dev, configurations } = context;
|
|
6
|
-
const config = cli_service_1.ConfigurationContext.getFrontendConfiguration(configurations);
|
|
7
|
-
if (dev && config) {
|
|
8
|
-
config
|
|
9
|
-
.devServer
|
|
10
|
-
.merge({
|
|
11
|
-
devMiddleware: {
|
|
12
|
-
writeToDisk: true
|
|
13
|
-
}
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
};
|
|
17
|
-
//# sourceMappingURL=webpack.js.map
|
package/lib/hooks/webpack.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../src/hooks/webpack.ts"],"names":[],"mappings":";;AAAA,qDAA2E;kBAE5D,KAAK,EAAE,OAAuB,EAAE,EAAE;IAC7C,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,MAAM,GAAG,kCAAoB,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAC7E,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;QAChB,MAAM;aACD,SAAS;aACT,KAAK,CAAC;YACH,aAAa,EAAE;gBACX,WAAW,EAAE,IAAI;aACpB;SACJ,CAAC,CAAC;IACX,CAAC;AACL,CAAC"}
|
package/src/hooks/webpack.ts
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { WebpackContext, ConfigurationContext } from '@celljs/cli-service';
|
|
2
|
-
|
|
3
|
-
export default async (context: WebpackContext) => {
|
|
4
|
-
const { dev, configurations } = context;
|
|
5
|
-
const config = ConfigurationContext.getFrontendConfiguration(configurations);
|
|
6
|
-
if (dev && config) {
|
|
7
|
-
config
|
|
8
|
-
.devServer
|
|
9
|
-
.merge({
|
|
10
|
-
devMiddleware: {
|
|
11
|
-
writeToDisk: true
|
|
12
|
-
}
|
|
13
|
-
});
|
|
14
|
-
}
|
|
15
|
-
};
|