dx-server 0.11.0 → 0.11.1
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/cjs/dx.d.ts +2 -2
- package/cjs/dx.js +1 -1
- package/cjs/dxHelpers.d.ts +2 -2
- package/cjs/dxHelpers.js +20 -21
- package/cjs/index.d.ts +1 -0
- package/cjs/index.js +8 -2
- package/cjs/logger.d.ts +3 -0
- package/cjs/logger.js +61 -0
- package/cjs/static.d.ts +2 -2
- package/cjs/static.js +50 -2
- package/cjs/staticHelpers.d.ts +4 -9
- package/cjs/staticHelpers.js +42 -100
- package/cjs/vendors/etag.d.ts +2 -1
- package/cjs/vendors/etag.js +41 -5
- package/esm/dx.d.ts +2 -2
- package/esm/dx.js +1 -1
- package/esm/dxHelpers.d.ts +2 -2
- package/esm/dxHelpers.js +20 -21
- package/esm/index.d.ts +1 -0
- package/esm/index.js +2 -1
- package/esm/logger.d.ts +3 -0
- package/esm/logger.js +57 -0
- package/esm/static.d.ts +2 -2
- package/esm/static.js +48 -3
- package/esm/staticHelpers.d.ts +4 -9
- package/esm/staticHelpers.js +43 -100
- package/esm/vendors/etag.d.ts +2 -1
- package/esm/vendors/etag.js +17 -2
- package/package.json +1 -1
package/cjs/staticHelpers.js
CHANGED
|
@@ -3,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.sendFileTrusted =
|
|
6
|
+
exports.sendFileTrusted = void 0;
|
|
7
7
|
require("./polyfillWithResolvers.js");
|
|
8
|
-
const dx_js_1 = require("./dx.js");
|
|
9
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
10
9
|
const promises_1 = require("node:fs/promises");
|
|
11
10
|
const etag_js_1 = require("./vendors/etag.js");
|
|
@@ -14,56 +13,11 @@ const fresh_js_1 = require("./vendors/fresh.js");
|
|
|
14
13
|
const rangeParser_js_1 = require("./vendors/rangeParser.js");
|
|
15
14
|
const node_fs_1 = require("node:fs");
|
|
16
15
|
const onFinished_js_1 = require("./vendors/onFinished.js");
|
|
17
|
-
const
|
|
16
|
+
const node_util_1 = require("node:util");
|
|
18
17
|
const BYTES_RANGE_REGEXP = /^ *bytes=/;
|
|
19
|
-
async function sendFile(req, res, pathname, // plain path, not URI-encoded
|
|
20
|
-
options) {
|
|
21
|
-
const { root, dotfiles, start = 0, end, disableAcceptRanges, disableLastModified, disableEtag, disableCacheControl, maxAge = 60 * 60 * 24 * 365 * 1000, // 1 year
|
|
22
|
-
immutable, } = options ?? {};
|
|
23
|
-
// null byte(s)
|
|
24
|
-
if (pathname.includes('\0'))
|
|
25
|
-
return (0, dx_js_1.setHtml)('Invalid request', { status: 400 });
|
|
26
|
-
let parts;
|
|
27
|
-
if (root) {
|
|
28
|
-
// normalize
|
|
29
|
-
pathname = node_path_1.default.normalize(`.${node_path_1.default.sep}${pathname}`);
|
|
30
|
-
// malicious path
|
|
31
|
-
if (UP_PATH_REGEXP.test(pathname))
|
|
32
|
-
return (0, dx_js_1.setHtml)('Forbidden', { status: 403 });
|
|
33
|
-
// explode path parts
|
|
34
|
-
parts = pathname.split(node_path_1.default.sep);
|
|
35
|
-
// join / normalize from optional root dir
|
|
36
|
-
pathname = node_path_1.default.normalize(node_path_1.default.join(root, pathname));
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
// malicious path
|
|
40
|
-
if (UP_PATH_REGEXP.test(pathname))
|
|
41
|
-
return (0, dx_js_1.setHtml)('Forbidden', { status: 403 });
|
|
42
|
-
// explode path parts
|
|
43
|
-
parts = node_path_1.default.normalize(pathname).split(node_path_1.default.sep);
|
|
44
|
-
// join / normalize from optional root dir
|
|
45
|
-
pathname = node_path_1.default.resolve(pathname);
|
|
46
|
-
}
|
|
47
|
-
// dotfile handling
|
|
48
|
-
if (parts.some(part => part.length > 1 && part[0] === '.'))
|
|
49
|
-
switch (dotfiles) {
|
|
50
|
-
case 'allow':
|
|
51
|
-
break;
|
|
52
|
-
case 'deny':
|
|
53
|
-
return (0, dx_js_1.setHtml)('Forbidden', { status: 403 });
|
|
54
|
-
case 'ignore':
|
|
55
|
-
default:
|
|
56
|
-
throw new Error('Forbidden: dotfiles are not allowed');
|
|
57
|
-
}
|
|
58
|
-
// pathEndsWithSep
|
|
59
|
-
if (pathname[pathname.length - 1] === node_path_1.default.sep)
|
|
60
|
-
return (0, dx_js_1.setHtml)('Forbidden: directory access is not allowed', { status: 403 });
|
|
61
|
-
return sendFileTrusted(req, res, pathname, options);
|
|
62
|
-
}
|
|
63
|
-
exports.sendFile = sendFile;
|
|
64
18
|
async function sendFileTrusted(req, res, pathname, // plain path, not URI-encoded
|
|
65
|
-
{
|
|
66
|
-
immutable,
|
|
19
|
+
{ start = 0, end, disableAcceptRanges, disableLastModified, etag = 'strong', disableCacheControl, maxAge = 60 * 60 * 24 * 365 * 1000, // 1 year
|
|
20
|
+
immutable, } = {}) {
|
|
67
21
|
const fileStat = await (0, promises_1.stat)(pathname);
|
|
68
22
|
// not found, check extensions
|
|
69
23
|
// if (err.code === 'ENOENT' && !path.extname(pathname) && !pathEndsWithSep) throw err
|
|
@@ -77,21 +31,18 @@ immutable, weakEtag, } = {}) {
|
|
|
77
31
|
throw new Error('Forbidden: directory access is not allowed');
|
|
78
32
|
if (res.headersSent)
|
|
79
33
|
return;
|
|
80
|
-
// Load file into buffer for strong ETag calculation
|
|
81
|
-
let fileBuffer;
|
|
82
|
-
if (!weakEtag)
|
|
83
|
-
fileBuffer = await (0, promises_1.readFile)(pathname);
|
|
84
34
|
//region set header fields
|
|
85
|
-
if (!disableAcceptRanges &&
|
|
35
|
+
if (!disableAcceptRanges && !res.getHeader('Accept-Ranges'))
|
|
86
36
|
res.setHeader('Accept-Ranges', 'bytes');
|
|
87
37
|
if (!disableCacheControl && !res.getHeader('Cache-Control'))
|
|
88
|
-
res.setHeader('Cache-Control', [
|
|
38
|
+
res.setHeader('Cache-Control', [
|
|
39
|
+
`public, max-age=${Math.floor(maxAge / 1000)}`,
|
|
89
40
|
immutable && 'immutable',
|
|
90
41
|
].filter(Boolean).join(', '));
|
|
91
42
|
if (!disableLastModified && !res.getHeader('Last-Modified'))
|
|
92
43
|
res.setHeader('Last-Modified', fileStat.mtime.toUTCString());
|
|
93
|
-
if (
|
|
94
|
-
res.setHeader('ETag',
|
|
44
|
+
if (etag !== 'disabled' && !res.getHeader('ETag'))
|
|
45
|
+
res.setHeader('ETag', etag === 'weak' ? (0, etag_js_1.statTag)(fileStat) : await (0, etag_js_1.entityTagPath)(fileStat, pathname, false));
|
|
95
46
|
//endregion set header fields
|
|
96
47
|
// content-type
|
|
97
48
|
if (!res.getHeader('Content-Type'))
|
|
@@ -109,7 +60,7 @@ immutable, weakEtag, } = {}) {
|
|
|
109
60
|
throw new Error('Precondition Failed: request headers do not match the response');
|
|
110
61
|
}
|
|
111
62
|
// if-unmodified-since (ignore when using strong etag since mtime may be unreliable)
|
|
112
|
-
if (
|
|
63
|
+
if (etag === 'weak') {
|
|
113
64
|
const unmodifiedSince = (0, fresh_js_1.parseHttpDate)(req.headers['if-unmodified-since']);
|
|
114
65
|
if (!isNaN(unmodifiedSince)) {
|
|
115
66
|
const lastModified = (0, fresh_js_1.parseHttpDate)(res.getHeader('Last-Modified'));
|
|
@@ -119,12 +70,11 @@ immutable, weakEtag, } = {}) {
|
|
|
119
70
|
}
|
|
120
71
|
//endregion isPreconditionFailure
|
|
121
72
|
// isCachable
|
|
122
|
-
if ((
|
|
123
|
-
res.statusCode === 304)
|
|
73
|
+
if ((res.statusCode >= 200 && res.statusCode < 300 || res.statusCode === 304)
|
|
124
74
|
&& (0, fresh_js_1.fresh)(req.headers, {
|
|
125
75
|
etag: res.getHeader('ETag'),
|
|
126
|
-
// Only use last-modified for freshness check when using
|
|
127
|
-
'last-modified':
|
|
76
|
+
// Only use last-modified for freshness check when using weak Etag
|
|
77
|
+
'last-modified': etag === 'weak' ? res.getHeader('Last-Modified') : undefined
|
|
128
78
|
})) {
|
|
129
79
|
// removeContentHeaderFields
|
|
130
80
|
res.removeHeader('Content-Encoding');
|
|
@@ -133,7 +83,7 @@ immutable, weakEtag, } = {}) {
|
|
|
133
83
|
res.removeHeader('Content-Range');
|
|
134
84
|
res.removeHeader('Content-Type');
|
|
135
85
|
res.statusCode = 304;
|
|
136
|
-
res.end();
|
|
86
|
+
return void await (0, node_util_1.promisify)(res.end.bind(res))();
|
|
137
87
|
}
|
|
138
88
|
}
|
|
139
89
|
// adjust len to start/end options
|
|
@@ -144,34 +94,32 @@ immutable, weakEtag, } = {}) {
|
|
|
144
94
|
if (len > bytes)
|
|
145
95
|
len = bytes;
|
|
146
96
|
}
|
|
147
|
-
// Range support
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
len = ranges[0].end - ranges[0].start + 1;
|
|
174
|
-
}
|
|
97
|
+
// Range support
|
|
98
|
+
let ranges = req.headers.range;
|
|
99
|
+
if (!disableAcceptRanges && BYTES_RANGE_REGEXP.test(ranges ?? '')) {
|
|
100
|
+
// parse
|
|
101
|
+
let rangesNum = (0, rangeParser_js_1.parseRange)(len, ranges, { combine: true });
|
|
102
|
+
// If-Range support
|
|
103
|
+
if (!isRangeFresh(req, res))
|
|
104
|
+
rangesNum = -2;
|
|
105
|
+
// unsatisfiable
|
|
106
|
+
if (rangesNum === -1) {
|
|
107
|
+
// Content-Range
|
|
108
|
+
res.setHeader('Content-Range', contentRange('bytes', len));
|
|
109
|
+
// 416 Requested Range Not Satisfiable
|
|
110
|
+
throw new Error('Requested Range Not Satisfiable: requested range is not satisfiable');
|
|
111
|
+
// return this.error(416, {
|
|
112
|
+
// headers: {'Content-Range': res.getHeader('Content-Range')}
|
|
113
|
+
// })
|
|
114
|
+
}
|
|
115
|
+
// valid (syntactically invalid/multiple ranges are treated as a regular response)
|
|
116
|
+
if (rangesNum !== -2 && rangesNum.length === 1) {
|
|
117
|
+
// Content-Range
|
|
118
|
+
res.statusCode = 206;
|
|
119
|
+
res.setHeader('Content-Range', contentRange('bytes', len, rangesNum[0]));
|
|
120
|
+
// adjust for requested range
|
|
121
|
+
start += rangesNum[0].start;
|
|
122
|
+
len = rangesNum[0].end - rangesNum[0].start + 1;
|
|
175
123
|
}
|
|
176
124
|
}
|
|
177
125
|
// set read options
|
|
@@ -180,13 +128,7 @@ immutable, weakEtag, } = {}) {
|
|
|
180
128
|
res.setHeader('Content-Length', len);
|
|
181
129
|
// HEAD support
|
|
182
130
|
if (req.method === 'HEAD')
|
|
183
|
-
return (0,
|
|
184
|
-
// Strong ETag path (default): send buffer directly
|
|
185
|
-
if (!weakEtag && fileBuffer) {
|
|
186
|
-
res.write(fileBuffer);
|
|
187
|
-
res.end();
|
|
188
|
-
return;
|
|
189
|
-
}
|
|
131
|
+
return void await (0, node_util_1.promisify)(res.end.bind(res))();
|
|
190
132
|
// Weak ETag path: stream file
|
|
191
133
|
const stream = (0, node_fs_1.createReadStream)(pathname, { start, end });
|
|
192
134
|
stream.pipe(res);
|
|
@@ -219,4 +161,4 @@ function isRangeFresh(req, res) {
|
|
|
219
161
|
function contentRange(type, size, range) {
|
|
220
162
|
return `${type} ${range ? range.start + '-' + range.end : '*'}/${size}`;
|
|
221
163
|
}
|
|
222
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"staticHelpers.js","sourceRoot":"","sources":["../src/staticHelpers.ts"],"names":[],"mappings":"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"}
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"staticHelpers.js","sourceRoot":"","sources":["../src/staticHelpers.ts"],"names":[],"mappings":"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"}
|
package/cjs/vendors/etag.d.ts
CHANGED
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
3
|
/// <reference types="node" resolution-mode="require"/>
|
|
4
4
|
import type { IncomingMessage } from 'node:http';
|
|
5
|
-
import type
|
|
5
|
+
import { type Stats } from 'node:fs';
|
|
6
6
|
export declare function entityTag(buf: Buffer, weak?: boolean): string;
|
|
7
|
+
export declare function entityTagPath(fileStat: Stats, filePath: string, weak?: boolean): Promise<string>;
|
|
7
8
|
export declare function statTag(stat: Stats): string;
|
|
8
9
|
export declare function isFreshETag(req: IncomingMessage, etag: string): true | undefined;
|
|
9
10
|
export declare function isFreshModifiedSince(req: IncomingMessage, lastModified: string): boolean | undefined;
|
package/cjs/vendors/etag.js
CHANGED
|
@@ -1,11 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.isFreshModifiedSince = exports.isFreshETag = exports.statTag = exports.entityTag = void 0;
|
|
26
|
+
exports.isFreshModifiedSince = exports.isFreshETag = exports.statTag = exports.entityTagPath = exports.entityTag = void 0;
|
|
7
27
|
// etag: https://github.com/jshttp/etag/blob/b9f0642256e63654287299d205bc6ced71b1a228/index.js#L39
|
|
8
|
-
const node_crypto_1 =
|
|
28
|
+
const node_crypto_1 = __importStar(require("node:crypto"));
|
|
29
|
+
const node_fs_1 = require("node:fs");
|
|
9
30
|
function entityTag(buf, weak) {
|
|
10
31
|
// pre-computed empty
|
|
11
32
|
return buf.length
|
|
@@ -20,6 +41,21 @@ function entityTag(buf, weak) {
|
|
|
20
41
|
// same weak eTag: 2 resources might be semantically equivalent, but not byte-for-byte identical
|
|
21
42
|
}
|
|
22
43
|
exports.entityTag = entityTag;
|
|
44
|
+
async function entityTagPath(fileStat, filePath, weak) {
|
|
45
|
+
const hash = (0, node_crypto_1.createHash)('sha1');
|
|
46
|
+
const defer = Promise.withResolvers();
|
|
47
|
+
(0, node_fs_1.createReadStream)(filePath).pipe(hash)
|
|
48
|
+
.on('finish', defer.resolve)
|
|
49
|
+
.on('error', defer.reject);
|
|
50
|
+
await defer.promise;
|
|
51
|
+
return `${fileStat.size.toString(16)}-${hash
|
|
52
|
+
.digest('base64')
|
|
53
|
+
.substring(0, 27)}`;
|
|
54
|
+
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag#directives
|
|
55
|
+
// weak W/ vs strong eTag
|
|
56
|
+
// same weak eTag: 2 resources might be semantically equivalent, but not byte-for-byte identical
|
|
57
|
+
}
|
|
58
|
+
exports.entityTagPath = entityTagPath;
|
|
23
59
|
const CACHE_CONTROL_NO_CACHE_REGEXP = /(?:^|,)\s*?no-cache\s*?(?:,|$)/;
|
|
24
60
|
function statTag(stat) {
|
|
25
61
|
const mtime = stat.mtime.getTime().toString(16);
|
|
@@ -97,4 +133,4 @@ function parseTokenList(str) {
|
|
|
97
133
|
list.push(str.substring(start, end));
|
|
98
134
|
return list;
|
|
99
135
|
}
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXRhZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZW5kb3JzL2V0YWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxrR0FBa0c7QUFDbEcsMkRBQThDO0FBRTlDLHFDQUFvRDtBQUVwRCxTQUFnQixTQUFTLENBQUMsR0FBVyxFQUFFLElBQWM7SUFDcEQscUJBQXFCO0lBQ3JCLE9BQU8sR0FBRyxDQUFDLE1BQU07UUFDaEIsQ0FBQyxDQUFDLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLElBQUkscUJBQU07YUFDcEMsVUFBVSxDQUFDLE1BQU0sQ0FBQzthQUNsQixNQUFNLENBQUMsR0FBRyxDQUFDO2FBQ1gsTUFBTSxDQUFDLFFBQVEsQ0FBQzthQUNoQixTQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHO1FBQ3JCLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLGlDQUFpQyxDQUFBO0lBQ3ZELDRFQUE0RTtJQUM1RSx5QkFBeUI7SUFDekIsZ0dBQWdHO0FBQ2pHLENBQUM7QUFaRCw4QkFZQztBQUVNLEtBQUssVUFBVSxhQUFhLENBQUMsUUFBZSxFQUFFLFFBQWdCLEVBQUUsSUFBYztJQUNwRixNQUFNLElBQUksR0FBRyxJQUFBLHdCQUFVLEVBQUMsTUFBTSxDQUFDLENBQUE7SUFDL0IsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLGFBQWEsRUFBVSxDQUFBO0lBQzdDLElBQUEsMEJBQWdCLEVBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztTQUNuQyxFQUFFLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxPQUFPLENBQUM7U0FDM0IsRUFBRSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDM0IsTUFBTSxLQUFLLENB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
|
package/esm/dx.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
/// <reference types="node" resolution-mode="require"/>
|
|
4
4
|
import { Readable } from 'node:stream';
|
|
5
5
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
6
|
-
import type {
|
|
6
|
+
import type { TrustedSendOptions } from './staticHelpers.js';
|
|
7
7
|
export interface Chainable<P extends any[] = any[], R = any, Next = (...np: any[]) => any> {
|
|
8
8
|
(next: Next, ...p: P): R;
|
|
9
9
|
}
|
|
@@ -30,7 +30,7 @@ export declare function setEmpty({ status }?: {
|
|
|
30
30
|
export declare function setHtml(html: string, opts?: {
|
|
31
31
|
status?: number;
|
|
32
32
|
}): void;
|
|
33
|
-
export declare function setFile(filePath: string, options?:
|
|
33
|
+
export declare function setFile(filePath: string, options?: TrustedSendOptions): void;
|
|
34
34
|
export declare function setBuffer(buffer: Buffer, { status }?: {
|
|
35
35
|
status?: number;
|
|
36
36
|
}): void;
|
package/esm/dx.js
CHANGED
|
@@ -125,4 +125,4 @@ export function setRedirect(url, status) {
|
|
|
125
125
|
// https://github.com/jshttp/content-disposition/blob/1037e24e4790273da96645ad250061f39e77968c/index.js#L186
|
|
126
126
|
// because in most applications, users can specify a simple filename which usually doesn't need to be validated.
|
|
127
127
|
// we leave setDownload() implementation for users, for now.
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZHgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFDLGlCQUFpQixFQUFDLE1BQU0sa0JBQWtCLENBQUE7QUFDbEQsT0FBTyxFQUFpQixRQUFRLEVBQUMsTUFBTSxnQkFBZ0IsQ0FBQTtBQXVCdkQsTUFBTSxVQUFVLGFBQWEsQ0FLM0IsS0FBNEM7SUFDN0MsTUFBTSxVQUFVLEdBQUcsSUFBSSxPQUFPLEVBQStCLENBQUE7SUFDN0QsTUFBTSxRQUFRLEdBQUcsSUFBSSxPQUFPLEVBQXNCLENBQUE7SUFDbEQsTUFBTSxPQUFPLEdBQWdDLENBQUMsR0FBRyxNQUFjLEVBQUUsRUFBRTtRQUNsRSxNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQTtRQUNwQixJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUM7WUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssSUFBSSxFQUFFO2dCQUN6RCxNQUFNLEtBQUssR0FBRyxNQUFNLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFBO2dCQUNwQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQTtnQkFDeEIsT0FBTyxLQUFLLENBQUE7WUFDYixDQUFDLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDTCxPQUFPLFVBQVUsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0IsQ0FBQyxDQUFBO0lBQ0QsTUFBTSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFO1FBQ3ZDLEdBQUcsS0FBSSxPQUFPLFFBQVEsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQSxDQUFBLENBQUM7UUFDckMsR0FBRyxDQUFDLEtBQUs7WUFDUixNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQTtZQUNwQixVQUFVLENBQUMsR0FBRyxD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
|
package/esm/dxHelpers.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
/// <reference types="node" resolution-mode="require"/>
|
|
4
4
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
5
5
|
import { Readable } from 'node:stream';
|
|
6
|
-
import { type
|
|
6
|
+
import { type TrustedSendOptions } from './staticHelpers.js';
|
|
7
7
|
import './polyfillWithResolvers.js';
|
|
8
8
|
export type DxContext = {
|
|
9
9
|
charset?: BufferEncoding;
|
|
@@ -44,6 +44,6 @@ export type DxContext = {
|
|
|
44
44
|
} | {
|
|
45
45
|
type: 'file';
|
|
46
46
|
data: string;
|
|
47
|
-
options?:
|
|
47
|
+
options?: TrustedSendOptions;
|
|
48
48
|
});
|
|
49
49
|
export declare function writeRes(req: IncomingMessage, res: ServerResponse, { type, data, charset, jsonBeautify, disableEtag, options }: DxContext): Promise<void>;
|
package/esm/dxHelpers.js
CHANGED
|
@@ -51,6 +51,7 @@ export async function writeRes(req, res, { type, data, charset, jsonBeautify, di
|
|
|
51
51
|
// skip response. Some middleware may handle it outside the chain. For example, express middleware
|
|
52
52
|
return;
|
|
53
53
|
case 'empty':
|
|
54
|
+
bufferOrStream = Buffer.from('', charset);
|
|
54
55
|
break;
|
|
55
56
|
default:
|
|
56
57
|
if (!res.getHeader('content-type'))
|
|
@@ -63,37 +64,35 @@ export async function writeRes(req, res, { type, data, charset, jsonBeautify, di
|
|
|
63
64
|
// skipped: response is already finished
|
|
64
65
|
}
|
|
65
66
|
else if (res.writableEnded) {
|
|
66
|
-
const defer = Promise.withResolvers()
|
|
67
|
-
res.addListener('finish', defer.resolve)
|
|
68
|
-
|
|
67
|
+
// const defer = Promise.withResolvers()
|
|
68
|
+
// res.addListener('finish', defer.resolve)
|
|
69
|
+
// res.addListener('error', defer.reject)
|
|
70
|
+
// await defer.promise
|
|
69
71
|
// skipped: response is already ended
|
|
70
72
|
// chunk is not fully flushed yet
|
|
71
73
|
}
|
|
72
74
|
else
|
|
73
|
-
await promisify(res.end.bind(res))(
|
|
75
|
+
await promisify(res.end.bind(res))();
|
|
74
76
|
}
|
|
75
77
|
else {
|
|
76
78
|
// https://github.com/expressjs/express/blob/980d881e3b023db079de60477a2588a91f046ca5/lib/response.js#L210
|
|
77
|
-
if (res.statusCode === 204) { // No Content
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
83
|
-
if (res.statusCode === 205) { // reset content. Tell client to clear the form, etc.
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
// write nothing
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
79
|
+
// if (res.statusCode === 204) { // No Content
|
|
80
|
+
// res.removeHeader('content-type')
|
|
81
|
+
// res.removeHeader('content-length')
|
|
82
|
+
// res.removeHeader('transfer-encoding')
|
|
83
|
+
// // write nothing
|
|
84
|
+
// }
|
|
85
|
+
// if (res.statusCode === 205) { // reset content. Tell client to clear the form, etc.
|
|
86
|
+
// res.setHeader('content-length', 0)
|
|
87
|
+
// res.removeHeader('transfer-encoding')
|
|
88
|
+
// } else
|
|
89
|
+
if (req.method !== 'HEAD') {
|
|
91
90
|
if (Buffer.isBuffer(bufferOrStream)) {
|
|
92
91
|
// support: 304 (etag), zipping, file etag and last modified
|
|
93
92
|
res.setHeader('content-length', bufferOrStream.length);
|
|
94
93
|
if (!disableEtag) {
|
|
95
94
|
const etag = entityTag(bufferOrStream);
|
|
96
|
-
const lastModified = res.getHeader('last-modified')
|
|
95
|
+
// const lastModified = res.getHeader('last-modified')
|
|
97
96
|
res.setHeader('ETag', etag);
|
|
98
97
|
if (isFreshETag(req, etag)) {
|
|
99
98
|
res.removeHeader('content-type');
|
|
@@ -114,7 +113,7 @@ export async function writeRes(req, res, { type, data, charset, jsonBeautify, di
|
|
|
114
113
|
}
|
|
115
114
|
// we do not support content-encoding (gzip, deflate, br) and leave it to reverse proxy or CDN
|
|
116
115
|
}
|
|
117
|
-
await promisify(res.end.bind(res))(
|
|
116
|
+
await promisify(res.end.bind(res))();
|
|
118
117
|
}
|
|
119
118
|
}
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHhIZWxwZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2R4SGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sYUFBYSxDQUFBO0FBQ3BDLE9BQU8sRUFBQyxTQUFTLEVBQUMsTUFBTSxXQUFXLENBQUE7QUFDbkMsT0FBTyxFQUFDLFNBQVMsRUFBRSxXQUFXLEVBQUMsTUFBTSxtQkFBbUIsQ0FBQTtBQUN4RCxPQUFPLEVBQUMsZUFBZSxFQUEwQixNQUFNLG9CQUFvQixDQUFBO0FBRTNFLE9BQU8sNEJBQTRCLENBQUE7QUFvRG5DLE1BQU0sQ0FBQyxLQUFLLFVBQVUsUUFBUSxDQUFDLEdBQW9CLEVBQUUsR0FBbUIsRUFBRSxFQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFZO0lBQzdJLE1BQU0sY0FBYyxHQUFHLENBQUMsV0FBbUIsRUFBRSxFQUFFO1FBQzlDLElBQUksR0FBRyxDQUFDLFdBQVcsSUFBSSxHQUFHLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQztZQUFFLE9BQU07UUFDNUQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxjQUFjLEVBQUUsR0FBRyxXQUFXLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxhQUFhLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFBO0lBQ3hGLENBQUMsQ0FBQTtJQUNELElBQUksY0FBYyxDQUFBO0lBRWxCLFFBQVEsSUFBSSxFQUFFLENBQUM7UUFDZCxLQUFLLE1BQU07WUFDVixjQUFjLENBQUMsWUFBWSxDQUFDLENBQUE7UUFDN0IsS0FBSyxNQUFNO1lBQ1YsY0FBYyxDQUFDLFdBQVcsQ0FBQyxDQUFBO1lBQzNCLG1CQUFtQjtZQUNuQixjQUFjLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLElBQUksRUFBRSxFQUFFLE9BQU8sQ0FBQyxD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
|
package/esm/index.d.ts
CHANGED
|
@@ -4,4 +4,5 @@ export { getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery, } from '.
|
|
|
4
4
|
export { router } from './router.js';
|
|
5
5
|
export { connectMiddlewares } from './connect.js';
|
|
6
6
|
export { chainStatic } from './static.js';
|
|
7
|
+
export { logJson, default as logger } from './logger.js';
|
|
7
8
|
export default dxServer;
|
package/esm/index.js
CHANGED
|
@@ -4,5 +4,6 @@ export { getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery, } from '.
|
|
|
4
4
|
export { router } from './router.js';
|
|
5
5
|
export { connectMiddlewares } from './connect.js';
|
|
6
6
|
export { chainStatic } from './static.js';
|
|
7
|
+
export { logJson, default as logger } from './logger.js';
|
|
7
8
|
export default dxServer;
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNOLE1BQU0sRUFDTixNQUFNLEVBQ04sT0FBTyxFQUNQLGFBQWEsRUFDYixZQUFZLEVBQ1osT0FBTyxFQUNQLFNBQVMsRUFDVCxXQUFXLEVBQ1gsT0FBTyxFQUNQLFFBQVEsRUFDUixPQUFPLEVBQ1AsYUFBYSxHQUNiLE1BQU0sU0FBUyxDQUFBO0FBQ2hCLE9BQU8sRUFBQyxRQUFRLEVBQUMsTUFBTSxTQUFTLENBQUE7QUFDaEMsT0FBTyxFQUNOLFNBQVMsRUFDVCxPQUFPLEVBQ1AsTUFBTSxFQUNOLE9BQU8sRUFDUCxhQUFhLEVBQ2IsUUFBUSxHQUNSLE1BQU0sV0FBVyxDQUFBO0FBQ2xCLE9BQU8sRUFBQyxNQUFNLEVBQUMsTUFBTSxhQUFhLENBQUE7QUFDbEMsT0FBTyxFQUFDLGtCQUFrQixFQUFDLE1BQU0sY0FBYyxDQUFBO0FBQy9DLE9BQU8sRUFBQyxXQUFXLEVBQUMsTUFBTSxhQUFhLENBQUE7QUFDdkMsT0FBTyxFQUFDLE9BQU8sRUFBRSxPQUFPLElBQUksTUFBTSxFQUFDLE1BQU0sYUFBYSxDQUFBO0FBRXRELGVBQWUsUUFBUSxDQUFBIn0=
|
package/esm/logger.d.ts
ADDED
package/esm/logger.js
ADDED
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { getReq, getRes } from './dx.js';
|
|
2
|
+
import { hrtime } from 'node:process';
|
|
3
|
+
export function logJson(json) {
|
|
4
|
+
console.log(process.env.NODE_ENV === 'production' ? JSON.stringify(json) : JSON.stringify(json, null, 2));
|
|
5
|
+
}
|
|
6
|
+
let requestCount = 0;
|
|
7
|
+
export default (log = logJson) => function logger(next) {
|
|
8
|
+
const res = getRes();
|
|
9
|
+
const req = getReq();
|
|
10
|
+
const logId = requestCount++;
|
|
11
|
+
const start = hrtime.bigint();
|
|
12
|
+
const now = new Date(Date.now() + 9 * 60 * 60 * 1000); // jst
|
|
13
|
+
log({
|
|
14
|
+
level: 'info',
|
|
15
|
+
id: logId,
|
|
16
|
+
timestamp: [
|
|
17
|
+
[
|
|
18
|
+
now.getUTCFullYear(),
|
|
19
|
+
String(now.getUTCMonth() + 1).padStart(2, '0'),
|
|
20
|
+
String(now.getUTCDate()).padStart(2, '0'),
|
|
21
|
+
].join('-'),
|
|
22
|
+
[
|
|
23
|
+
String(now.getUTCHours()).padStart(2, '0'),
|
|
24
|
+
String(now.getUTCMinutes()).padStart(2, '0'),
|
|
25
|
+
[String(now.getUTCSeconds()).padStart(2, '0'), String(now.getUTCMilliseconds()).padStart(3, '0')].join('.'),
|
|
26
|
+
].join(':'),
|
|
27
|
+
].join('T'),
|
|
28
|
+
remoteAddress: req.socket.remoteAddress,
|
|
29
|
+
method: req.method,
|
|
30
|
+
url: req.url,
|
|
31
|
+
httpVersion: `HTTP/${req.httpVersion}`,
|
|
32
|
+
headers: process.env.NODE_ENV === 'production'
|
|
33
|
+
? req.headers
|
|
34
|
+
: Object.fromEntries(Object.entries(req.headers).filter(([k]) => [
|
|
35
|
+
'host',
|
|
36
|
+
'referer',
|
|
37
|
+
'referrer',
|
|
38
|
+
'user-agent',
|
|
39
|
+
'x-forwarded-proto',
|
|
40
|
+
'x-forwarded-host',
|
|
41
|
+
'x-forwarded-for',
|
|
42
|
+
].includes(k))),
|
|
43
|
+
});
|
|
44
|
+
res.once('finish', end).once('close', end).once('error', end);
|
|
45
|
+
return next();
|
|
46
|
+
function end() {
|
|
47
|
+
res.off('finish', end).off('close', end).off('error', end);
|
|
48
|
+
const durationNs = hrtime.bigint() - start;
|
|
49
|
+
log({
|
|
50
|
+
level: 'info',
|
|
51
|
+
id: logId,
|
|
52
|
+
duration: Number(durationNs) / 1e6, // ms
|
|
53
|
+
headers: res.getHeaders(),
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsTUFBTSxFQUFFLE1BQU0sRUFBQyxNQUFNLFNBQVMsQ0FBQTtBQUN0QyxPQUFPLEVBQUMsTUFBTSxFQUFDLE1BQU0sY0FBYyxDQUFBO0FBRW5DLE1BQU0sVUFBVSxPQUFPLENBQUMsSUFBUztJQUNoQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLFlBQVksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDMUcsQ0FBQztBQUVELElBQUksWUFBWSxHQUFHLENBQUMsQ0FBQTtBQUNwQixlQUFlLENBQUMsR0FBRyxHQUFHLE9BQU8sRUFBRSxFQUFFLENBQUMsU0FBUyxNQUFNLENBQUMsSUFBZTtJQUNoRSxNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQTtJQUNwQixNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQTtJQUNwQixNQUFNLEtBQUssR0FBRyxZQUFZLEVBQUUsQ0FBQTtJQUU1QixNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDN0IsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFBLENBQUMsTUFBTTtJQUU1RCxHQUFHLENBQUM7UUFDSCxLQUFLLEVBQUUsTUFBTTtRQUNiLEVBQUUsRUFBRSxLQUFLO1FBQ1QsU0FBUyxFQUFFO1lBQ1Y7Z0JBQ0MsR0FBRyxDQUFDLGNBQWMsRUFBRTtnQkFDcEIsTUFBTSxDQUFD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
|
package/esm/static.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Chainable } from './dx.js';
|
|
2
|
-
import type
|
|
3
|
-
export declare function chainStatic(pattern: string, { getPathname, ...options }:
|
|
2
|
+
import { type TrustedSendOptions } from './staticHelpers.js';
|
|
3
|
+
export declare function chainStatic(pattern: string, { getPathname, ...options }: TrustedSendOptions & {
|
|
4
4
|
getPathname?(matched: any): string;
|
|
5
5
|
}): Chainable;
|