dx-server 0.12.2 → 0.13.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.
Files changed (106) hide show
  1. package/README.md +47 -55
  2. package/{cjs → lib}/body.d.ts +2 -3
  3. package/lib/body.js +10 -0
  4. package/{esm → lib}/bodyHelpers.d.ts +2 -4
  5. package/lib/bodyHelpers.js +89 -0
  6. package/{esm → lib}/dx.d.ts +5 -8
  7. package/lib/dx.js +127 -0
  8. package/{cjs → lib}/dxHelpers.d.ts +0 -4
  9. package/{esm → lib}/dxHelpers.js +0 -2
  10. package/{cjs → lib}/index.d.ts +0 -1
  11. package/{esm/index.d.ts → lib/index.js} +0 -1
  12. package/lib/logger.js +56 -0
  13. package/lib/router.d.ts +42 -0
  14. package/lib/router.js +43 -0
  15. package/lib/static.js +22 -0
  16. package/{cjs → lib}/staticHelpers.d.ts +0 -2
  17. package/lib/staticHelpers.js +186 -0
  18. package/{cjs → lib}/stream.d.ts +2 -7
  19. package/lib/stream.js +90 -0
  20. package/{esm → lib}/vendors/contentType.js +0 -1
  21. package/{cjs → lib}/vendors/etag.d.ts +0 -3
  22. package/lib/vendors/etag.js +104 -0
  23. package/{cjs → lib}/vendors/fresh.d.ts +2 -2
  24. package/lib/vendors/fresh.js +95 -0
  25. package/lib/vendors/mime.d.ts +1 -0
  26. package/lib/vendors/mime.js +35 -0
  27. package/{esm → lib}/vendors/mimeDb.js +0 -1
  28. package/{cjs → lib}/vendors/mimeScore.d.ts +1 -1
  29. package/lib/vendors/mimeScore.js +45 -0
  30. package/{cjs → lib}/vendors/onFinished.d.ts +1 -1
  31. package/lib/vendors/onFinished.js +231 -0
  32. package/lib/vendors/rangeParser.d.ts +20 -0
  33. package/lib/vendors/rangeParser.js +121 -0
  34. package/package.json +10 -19
  35. package/cjs/body.js +0 -14
  36. package/cjs/bodyHelpers.d.ts +0 -16
  37. package/cjs/bodyHelpers.js +0 -101
  38. package/cjs/connect.d.ts +0 -5
  39. package/cjs/connect.js +0 -44
  40. package/cjs/dx.d.ts +0 -46
  41. package/cjs/dx.js +0 -144
  42. package/cjs/dxHelpers.js +0 -123
  43. package/cjs/express.d.ts +0 -4
  44. package/cjs/express.js +0 -43
  45. package/cjs/helpers.js +0 -14
  46. package/cjs/index.js +0 -38
  47. package/cjs/logger.js +0 -61
  48. package/cjs/package.json +0 -3
  49. package/cjs/polyfillWithResolvers.d.ts +0 -1
  50. package/cjs/polyfillWithResolvers.js +0 -17
  51. package/cjs/router.js +0 -47
  52. package/cjs/static.js +0 -27
  53. package/cjs/staticHelpers.js +0 -195
  54. package/cjs/stream.js +0 -97
  55. package/cjs/vendors/contentType.js +0 -92
  56. package/cjs/vendors/etag.js +0 -136
  57. package/cjs/vendors/fresh.js +0 -102
  58. package/cjs/vendors/mime.d.ts +0 -1
  59. package/cjs/vendors/mime.js +0 -42
  60. package/cjs/vendors/mimeDb.js +0 -9417
  61. package/cjs/vendors/mimeScore.js +0 -50
  62. package/cjs/vendors/onFinished.js +0 -245
  63. package/cjs/vendors/rangeParser.d.ts +0 -10
  64. package/cjs/vendors/rangeParser.js +0 -126
  65. package/esm/body.d.ts +0 -8
  66. package/esm/body.js +0 -11
  67. package/esm/bodyHelpers.js +0 -90
  68. package/esm/connect.d.ts +0 -5
  69. package/esm/connect.js +0 -40
  70. package/esm/dx.js +0 -128
  71. package/esm/dxHelpers.d.ts +0 -49
  72. package/esm/express.d.ts +0 -4
  73. package/esm/express.js +0 -35
  74. package/esm/helpers.js +0 -3
  75. package/esm/index.js +0 -9
  76. package/esm/logger.d.ts +0 -3
  77. package/esm/logger.js +0 -57
  78. package/esm/polyfillWithResolvers.d.ts +0 -1
  79. package/esm/polyfillWithResolvers.js +0 -16
  80. package/esm/router.js +0 -44
  81. package/esm/static.d.ts +0 -5
  82. package/esm/static.js +0 -23
  83. package/esm/staticHelpers.d.ts +0 -18
  84. package/esm/staticHelpers.js +0 -188
  85. package/esm/stream.d.ts +0 -12
  86. package/esm/stream.js +0 -92
  87. package/esm/vendors/contentType.d.ts +0 -4
  88. package/esm/vendors/etag.d.ts +0 -10
  89. package/esm/vendors/etag.js +0 -105
  90. package/esm/vendors/fresh.d.ts +0 -23
  91. package/esm/vendors/fresh.js +0 -96
  92. package/esm/vendors/mime.d.ts +0 -1
  93. package/esm/vendors/mime.js +0 -35
  94. package/esm/vendors/mimeDb.d.ts +0 -9413
  95. package/esm/vendors/mimeScore.d.ts +0 -5
  96. package/esm/vendors/mimeScore.js +0 -46
  97. package/esm/vendors/onFinished.d.ts +0 -14
  98. package/esm/vendors/onFinished.js +0 -241
  99. package/esm/vendors/rangeParser.d.ts +0 -10
  100. package/esm/vendors/rangeParser.js +0 -122
  101. /package/{cjs → lib}/helpers.d.ts +0 -0
  102. /package/{esm/helpers.d.ts → lib/helpers.js} +0 -0
  103. /package/{cjs → lib}/logger.d.ts +0 -0
  104. /package/{cjs → lib}/static.d.ts +0 -0
  105. /package/{cjs → lib}/vendors/contentType.d.ts +0 -0
  106. /package/{cjs → lib}/vendors/mimeDb.d.ts +0 -0
@@ -1,50 +0,0 @@
1
- "use strict";
2
- // 'mime-score' back-ported to CommonJS
3
- Object.defineProperty(exports, "__esModule", { value: true });
4
- exports.mimeScore = void 0;
5
- // Score RFC facets (see https://tools.ietf.org/html/rfc6838#section-3)
6
- const FACET_SCORES = {
7
- 'prs.': 100,
8
- 'x-': 200,
9
- 'x.': 300,
10
- 'vnd.': 400,
11
- default: 900
12
- };
13
- // Score mime source (Logic originally from `jshttp/mime-types` module)
14
- const SOURCE_SCORES = {
15
- nginx: 10,
16
- apache: 20,
17
- iana: 40,
18
- default: 30 // definitions added by `jshttp/mime-db` project?
19
- };
20
- const TYPE_SCORES = {
21
- // prefer application/xml over text/xml
22
- // prefer application/rtf over text/rtf
23
- application: 1,
24
- // prefer font/woff over application/font-woff
25
- font: 2,
26
- // prefer video/mp4 over audio/mp4 over application/mp4
27
- // See https://www.rfc-editor.org/rfc/rfc4337.html#section-2
28
- audio: 2,
29
- video: 3,
30
- default: 0
31
- };
32
- /**
33
- * Get each component of the score for a mime type. The sum of these is the
34
- * total score. The higher the score, the more "official" the type.
35
- */
36
- function mimeScore(mimeType, source = 'default') {
37
- if (mimeType === 'application/octet-stream') {
38
- return 0;
39
- }
40
- const [type, subtype] = mimeType.split('/');
41
- const facet = subtype.replace(/(\.|x-).*/, '$1');
42
- const facetScore = FACET_SCORES[facet] || FACET_SCORES.default;
43
- const sourceScore = SOURCE_SCORES[source] || SOURCE_SCORES.default;
44
- const typeScore = TYPE_SCORES[type] || TYPE_SCORES.default;
45
- // All else being equal prefer shorter types
46
- const lengthScore = 1 - mimeType.length / 100;
47
- return facetScore + sourceScore + typeScore + lengthScore;
48
- }
49
- exports.mimeScore = mimeScore;
50
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWltZVNjb3JlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ZlbmRvcnMvbWltZVNjb3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1Q0FBdUM7OztBQUV2Qyx1RUFBdUU7QUFDdkUsTUFBTSxZQUFZLEdBQUc7SUFDcEIsTUFBTSxFQUFFLEdBQUc7SUFDWCxJQUFJLEVBQUUsR0FBRztJQUNULElBQUksRUFBRSxHQUFHO0lBQ1QsTUFBTSxFQUFFLEdBQUc7SUFDWCxPQUFPLEVBQUUsR0FBRztDQUNaLENBQUE7QUFFRCx1RUFBdUU7QUFDdkUsTUFBTSxhQUFhLEdBQUc7SUFDckIsS0FBSyxFQUFFLEVBQUU7SUFDVCxNQUFNLEVBQUUsRUFBRTtJQUNWLElBQUksRUFBRSxFQUFFO0lBQ1IsT0FBTyxFQUFFLEVBQUUsQ0FBQyxpREFBaUQ7Q0FDN0QsQ0FBQTtBQUVELE1BQU0sV0FBVyxHQUFHO0lBQ25CLHVDQUF1QztJQUN2Qyx1Q0FBdUM7SUFDdkMsV0FBVyxFQUFFLENBQUM7SUFFZCw4Q0FBOEM7SUFDOUMsSUFBSSxFQUFFLENBQUM7SUFFUCx1REFBdUQ7SUFDdkQsNERBQTREO0lBQzVELEtBQUssRUFBRSxDQUFDO0lBQ1IsS0FBSyxFQUFFLENBQUM7SUFFUixPQUFPLEVBQUUsQ0FBQztDQUNWLENBQUE7QUFFRDs7O0dBR0c7QUFDSCxTQUFnQixTQUFTLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTO0lBQ3JELElBQUksUUFBUSxLQUFLLDBCQUEwQixFQUFFLENBQUM7UUFDN0MsT0FBTyxDQUFDLENBQUE7SUFDVCxDQUFDO0lBRUQsTUFBTSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBRTNDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFBO0lBRWhELE1BQU0sVUFBVSxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsSUFBSSxZQUFZLENBQUMsT0FBTyxDQUFBO0lBQzlELE1BQU0sV0FBVyxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxhQUFhLENBQUMsT0FBTyxDQUFBO0lBQ2xFLE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxXQUFXLENBQUMsT0FBTyxDQUFBO0lBRTFELDRDQUE0QztJQUM1QyxNQUFNLFdBQVcsR0FBRyxDQUFDLEdBQUcsUUFBUSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUE7SUFFN0MsT0FBTyxVQUFVLEdBQUcsV0FBVyxHQUFHLFNBQVMsR0FBRyxXQUFXLENBQUE7QUFDMUQsQ0FBQztBQWpCRCw4QkFpQkMifQ==
@@ -1,245 +0,0 @@
1
- "use strict";
2
- /**
3
- * Variables.
4
- * @private
5
- */
6
- Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.onFinished = void 0;
8
- /* istanbul ignore next */
9
- const node_async_hooks_1 = require("node:async_hooks");
10
- const defer = typeof setImmediate === 'function'
11
- ? setImmediate
12
- : function (fn) {
13
- process.nextTick(fn.bind.apply(fn, arguments));
14
- };
15
- /**
16
- * Invoke callback when the response has finished, useful for
17
- * cleaning up resources afterwards.
18
- *
19
- * @param {object} msg
20
- * @param {function} listener
21
- * @return {object}
22
- * @public
23
- */
24
- function onFinished(msg, listener) {
25
- if (isFinished(msg) !== false) {
26
- defer(listener, null, msg);
27
- return msg;
28
- }
29
- // attach the listener to the message
30
- attachListener(msg, wrap(listener));
31
- return msg;
32
- }
33
- exports.onFinished = onFinished;
34
- /**
35
- * Determine if message is already finished.
36
- *
37
- * @param {object} msg
38
- * @return {boolean}
39
- * @public
40
- */
41
- function isFinished(msg) {
42
- const socket = msg.socket;
43
- if (typeof msg.finished === 'boolean') {
44
- // OutgoingMessage
45
- return Boolean(msg.finished || (socket && !socket.writable));
46
- }
47
- if (typeof msg.complete === 'boolean') {
48
- // IncomingMessage
49
- return Boolean(msg.upgrade || !socket || !socket.readable || (msg.complete && !msg.readable));
50
- }
51
- // don't know
52
- return undefined;
53
- }
54
- /**
55
- * Attach a finished listener to the message.
56
- *
57
- * @param {object} msg
58
- * @param {function} callback
59
- * @private
60
- */
61
- function attachFinishedListener(msg, callback) {
62
- let eeMsg;
63
- let eeSocket;
64
- let finished = false;
65
- function onFinish(error) {
66
- eeMsg.cancel();
67
- eeSocket.cancel();
68
- finished = true;
69
- callback(error);
70
- }
71
- // finished on first message event
72
- eeMsg = eeSocket = first([[msg, 'end', 'finish']], onFinish);
73
- function onSocket(socket) {
74
- // remove listener
75
- msg.removeListener('socket', onSocket);
76
- if (finished)
77
- return;
78
- if (eeMsg !== eeSocket)
79
- return;
80
- // finished on first socket event
81
- eeSocket = first([[socket, 'error', 'close']], onFinish);
82
- }
83
- if (msg.socket) {
84
- // socket already assigned
85
- onSocket(msg.socket);
86
- return;
87
- }
88
- // wait for socket to be assigned
89
- msg.on('socket', onSocket);
90
- if (msg.socket === undefined) {
91
- // istanbul ignore next: node.js 0.8 patch
92
- patchAssignSocket(msg, onSocket);
93
- }
94
- }
95
- /**
96
- * Attach the listener to the message.
97
- *
98
- * @param {object} msg
99
- * @return {function}
100
- * @private
101
- */
102
- function attachListener(msg, listener) {
103
- let attached = msg.__onFinished;
104
- // create a private single listener with queue
105
- if (!attached || !attached.queue) {
106
- attached = msg.__onFinished = createListener(msg);
107
- attachFinishedListener(msg, attached);
108
- }
109
- attached.queue.push(listener);
110
- }
111
- /**
112
- * Create listener on message.
113
- *
114
- * @param {object} msg
115
- * @return {function}
116
- * @private
117
- */
118
- function createListener(msg) {
119
- function listener(err) {
120
- if (msg.__onFinished === listener)
121
- msg.__onFinished = null;
122
- if (!listener.queue)
123
- return;
124
- const queue = listener.queue;
125
- listener.queue = null;
126
- for (let i = 0; i < queue.length; i++) {
127
- queue[i](err, msg);
128
- }
129
- }
130
- listener.queue = [];
131
- return listener;
132
- }
133
- /**
134
- * Patch ServerResponse.prototype.assignSocket for node.js 0.8.
135
- *
136
- * @param {ServerResponse} res
137
- * @param {function} callback
138
- * @private
139
- */
140
- // istanbul ignore next: node.js 0.8 patch
141
- function patchAssignSocket(res, callback) {
142
- const assignSocket = res.assignSocket;
143
- if (typeof assignSocket !== 'function')
144
- return;
145
- // res.on('socket', callback) is broken in 0.8
146
- res.assignSocket = function _assignSocket(socket) {
147
- assignSocket.call(this, socket);
148
- callback(socket);
149
- };
150
- }
151
- /**
152
- * Try to require async_hooks
153
- * @private
154
- */
155
- function tryRequireAsyncHooks() {
156
- try {
157
- return require('async_hooks');
158
- }
159
- catch (e) {
160
- return {};
161
- }
162
- }
163
- /**
164
- * Wrap function with async resource, if possible.
165
- * AsyncResource.bind static method backported.
166
- * @private
167
- */
168
- function wrap(fn) {
169
- let res;
170
- // create anonymous resource
171
- res = new node_async_hooks_1.AsyncResource(fn.name || 'bound-anonymous-fn');
172
- // incompatible node.js
173
- if (!res || !res.runInAsyncScope) {
174
- return fn;
175
- }
176
- // return bound function
177
- return res.runInAsyncScope.bind(res, fn, null);
178
- }
179
- /**
180
- * Get the first event in a set of event emitters and event pairs.
181
- *
182
- * @param {array} stuff
183
- * @param {function} done
184
- * @public
185
- */
186
- function first(stuff, done) {
187
- if (!Array.isArray(stuff)) {
188
- throw new TypeError('arg must be an array of [ee, events...] arrays');
189
- }
190
- const cleanups = [];
191
- for (let i = 0; i < stuff.length; i++) {
192
- const arr = stuff[i];
193
- if (!Array.isArray(arr) || arr.length < 2) {
194
- throw new TypeError('each array member must be [ee, events...]');
195
- }
196
- const ee = arr[0];
197
- for (let j = 1; j < arr.length; j++) {
198
- const event = arr[j];
199
- const fn = listener(event, callback);
200
- // listen to the event
201
- ee.on(event, fn);
202
- // push this listener to the list of cleanups
203
- cleanups.push({
204
- ee: ee,
205
- event: event,
206
- fn: fn
207
- });
208
- }
209
- }
210
- function callback() {
211
- cleanup();
212
- done.apply(null, arguments);
213
- }
214
- function cleanup() {
215
- let x;
216
- for (let i = 0; i < cleanups.length; i++) {
217
- x = cleanups[i];
218
- x.ee.removeListener(x.event, x.fn);
219
- }
220
- }
221
- function thunk(fn) {
222
- done = fn;
223
- }
224
- thunk.cancel = cleanup;
225
- return thunk;
226
- }
227
- /**
228
- * Create the event listener.
229
- * @private
230
- */
231
- function listener(event, done) {
232
- return function onevent(arg1) {
233
- const args = new Array(arguments.length);
234
- const ee = this;
235
- const err = event === 'error'
236
- ? arg1
237
- : null;
238
- // copy args to prevent arguments escaping scope
239
- for (let i = 0; i < args.length; i++) {
240
- args[i] = arguments[i];
241
- }
242
- done(err, ee, event, args);
243
- };
244
- }
245
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib25GaW5pc2hlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZW5kb3JzL29uRmluaXNoZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7R0FHRzs7O0FBRUgsMEJBQTBCO0FBQzFCLHVEQUE4QztBQUU5QyxNQUFNLEtBQUssR0FBRyxPQUFPLFlBQVksS0FBSyxVQUFVO0lBQy9DLENBQUMsQ0FBQyxZQUFZO0lBQ2QsQ0FBQyxDQUFDLFVBQVUsRUFBRTtRQUNiLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUE7SUFDL0MsQ0FBQyxDQUFBO0FBRUY7Ozs7Ozs7O0dBUUc7QUFFSCxTQUFnQixVQUFVLENBQUUsR0FBRyxFQUFFLFFBQVE7SUFDeEMsSUFBSSxVQUFVLENBQUMsR0FBRyxDQUFDLEtBQUssS0FBSyxFQUFFLENBQUM7UUFDL0IsS0FBSyxDQUFDLFFBQVEsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7UUFDMUIsT0FBTyxHQUFHLENBQUE7SUFDWCxDQUFDO0lBRUQscUNBQXFDO0lBQ3JDLGNBQWMsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7SUFFbkMsT0FBTyxHQUFHLENBQUE7QUFDWCxDQUFDO0FBVkQsZ0NBVUM7QUFFRDs7Ozs7O0dBTUc7QUFFSCxTQUFTLFVBQVUsQ0FBRSxHQUFHO0lBQ3ZCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUE7SUFFekIsSUFBSSxPQUFPLEdBQUcsQ0FBQyxRQUFRLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDdkMsa0JBQWtCO1FBQ2xCLE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQTtJQUM3RCxDQUFDO0lBRUQsSUFB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
@@ -1,10 +0,0 @@
1
- /**
2
- * Parse "Range" header `str` relative to the given file `size`.
3
- *
4
- * @param {Number} size
5
- * @param {String} str
6
- * @param {Object} [options]
7
- * @return {Array}
8
- * @public
9
- */
10
- export declare function parseRange(size: any, str: any, options: any): any;
@@ -1,126 +0,0 @@
1
- "use strict";
2
- /**
3
- * Parse "Range" header `str` relative to the given file `size`.
4
- *
5
- * @param {Number} size
6
- * @param {String} str
7
- * @param {Object} [options]
8
- * @return {Array}
9
- * @public
10
- */
11
- Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.parseRange = void 0;
13
- function parseRange(size, str, options) {
14
- if (typeof str !== 'string') {
15
- throw new TypeError('argument str must be a string');
16
- }
17
- const index = str.indexOf('=');
18
- if (index === -1) {
19
- return -2;
20
- }
21
- // split the range string
22
- const arr = str.slice(index + 1).split(',');
23
- const ranges = [];
24
- // add ranges type
25
- ranges.type = str.slice(0, index);
26
- // parse all ranges
27
- for (let i = 0; i < arr.length; i++) {
28
- const range = arr[i].split('-');
29
- let start = parseInt(range[0], 10);
30
- let end = parseInt(range[1], 10);
31
- // -nnn
32
- if (isNaN(start)) {
33
- start = size - end;
34
- end = size - 1;
35
- // nnn-
36
- }
37
- else if (isNaN(end)) {
38
- end = size - 1;
39
- }
40
- // limit last-byte-pos to current length
41
- if (end > size - 1) {
42
- end = size - 1;
43
- }
44
- // invalid or unsatisifiable
45
- if (isNaN(start) || isNaN(end) || start > end || start < 0) {
46
- continue;
47
- }
48
- // add range
49
- ranges.push({
50
- start: start,
51
- end: end
52
- });
53
- }
54
- if (ranges.length < 1) {
55
- // unsatisifiable
56
- return -1;
57
- }
58
- return options && options.combine
59
- ? combineRanges(ranges)
60
- : ranges;
61
- }
62
- exports.parseRange = parseRange;
63
- /**
64
- * Combine overlapping & adjacent ranges.
65
- * @private
66
- */
67
- function combineRanges(ranges) {
68
- const ordered = ranges.map(mapWithIndex).sort(sortByRangeStart);
69
- let j = 0;
70
- for (let i = 1; i < ordered.length; i++) {
71
- const range = ordered[i];
72
- const current = ordered[j];
73
- if (range.start > current.end + 1) {
74
- // next range
75
- ordered[++j] = range;
76
- }
77
- else if (range.end > current.end) {
78
- // extend range
79
- current.end = range.end;
80
- current.index = Math.min(current.index, range.index);
81
- }
82
- }
83
- // trim ordered array
84
- ordered.length = j + 1;
85
- // generate combined range
86
- const combined = ordered.sort(sortByRangeIndex).map(mapWithoutIndex);
87
- // copy ranges type
88
- combined.type = ranges.type;
89
- return combined;
90
- }
91
- /**
92
- * Map function to add index value to ranges.
93
- * @private
94
- */
95
- function mapWithIndex(range, index) {
96
- return {
97
- start: range.start,
98
- end: range.end,
99
- index: index
100
- };
101
- }
102
- /**
103
- * Map function to remove index value from ranges.
104
- * @private
105
- */
106
- function mapWithoutIndex(range) {
107
- return {
108
- start: range.start,
109
- end: range.end
110
- };
111
- }
112
- /**
113
- * Sort function to sort ranges by index.
114
- * @private
115
- */
116
- function sortByRangeIndex(a, b) {
117
- return a.index - b.index;
118
- }
119
- /**
120
- * Sort function to sort ranges by start position.
121
- * @private
122
- */
123
- function sortByRangeStart(a, b) {
124
- return a.start - b.start;
125
- }
126
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmFuZ2VQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmVuZG9ycy9yYW5nZVBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7O0dBUUc7OztBQUVILFNBQWdCLFVBQVUsQ0FBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLE9BQU87SUFDN0MsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM3QixNQUFNLElBQUksU0FBUyxDQUFDLCtCQUErQixDQUFDLENBQUE7SUFDckQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUE7SUFFOUIsSUFBSSxLQUFLLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNsQixPQUFPLENBQUMsQ0FBQyxDQUFBO0lBQ1YsQ0FBQztJQUVELHlCQUF5QjtJQUN6QixNQUFNLEdBQUcsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0MsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFBO0lBRWpCLGtCQUFrQjtJQUNsQixNQUFNLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBRWpDLG1CQUFtQjtJQUNuQixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ3JDLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDL0IsSUFBSSxLQUFLLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUNsQyxJQUFJLEdBQUcsR0FBRyxRQUFR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
package/esm/body.d.ts DELETED
@@ -1,8 +0,0 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- import { type BufferBodyOptions } from './bodyHelpers.js';
3
- export declare const getBuffer: import("./dx.js").Context<Buffer | undefined, [options?: Partial<BufferBodyOptions> | undefined], any, (...np: any[]) => any>;
4
- export declare const getJson: import("./dx.js").Context<any, [options?: Partial<BufferBodyOptions> | undefined], any, (...np: any[]) => any>;
5
- export declare const getRaw: import("./dx.js").Context<Buffer | undefined, [options?: Partial<BufferBodyOptions> | undefined], any, (...np: any[]) => any>;
6
- export declare const getText: import("./dx.js").Context<string | undefined, [options?: Partial<BufferBodyOptions> | undefined], any, (...np: any[]) => any>;
7
- export declare const getUrlEncoded: import("./dx.js").Context<any, [options?: Partial<BufferBodyOptions> | undefined], any, (...np: any[]) => any>;
8
- export declare const getQuery: import("./dx.js").Context<any, [options?: Partial<BufferBodyOptions> | undefined], any, (...np: any[]) => any>;
package/esm/body.js DELETED
@@ -1,11 +0,0 @@
1
- import { getReq, makeDxContext } from './dx.js';
2
- import { bufferFromReq, jsonFromReq, queryFromReq, rawFromReq, textFromReq, urlEncodedFromReq } from './bodyHelpers.js';
3
- export const getBuffer = makeDxContext((options) => bufferFromReq(getReq(), options));
4
- export const getJson = makeDxContext((options) => jsonFromReq(getReq(), options));
5
- export const getRaw = makeDxContext((options) => rawFromReq(getReq(), options));
6
- export const getText = makeDxContext((options) => textFromReq(getReq(), options));
7
- export const getUrlEncoded = makeDxContext((options) => urlEncodedFromReq(getReq(), options));
8
- export const getQuery = makeDxContext((options) => queryFromReq(getReq(), options));
9
- // to getFile use busboy
10
- // https://github.com/mscdex/busboy
11
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9keS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ib2R5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBQyxNQUFNLEVBQUUsYUFBYSxFQUFDLE1BQU0sU0FBUyxDQUFBO0FBQzdDLE9BQU8sRUFFTixhQUFhLEVBQ2IsV0FBVyxFQUNYLFlBQVksRUFDWixVQUFVLEVBQ1YsV0FBVyxFQUNYLGlCQUFpQixFQUNqQixNQUFNLGtCQUFrQixDQUFBO0FBRXpCLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxhQUFhLENBQUMsQ0FBQyxPQUFvQyxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQTtBQUNsSCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsT0FBb0MsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUE7QUFDOUcsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLGFBQWEsQ0FBQyxDQUFDLE9BQW9DLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFBO0FBQzVHLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxPQUFvQyxFQUFFLEVBQUUsQ0FBQyxXQUFXLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQTtBQUM5RyxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsYUFBYSxDQUFDLENBQUMsT0FBb0MsRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQTtBQUMxSCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsYUFBYSxDQUFDLENBQUMsT0FBb0MsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUE7QUFFaEgsd0JBQXdCO0FBQ3hCLG1DQUFtQyJ9
@@ -1,90 +0,0 @@
1
- import { getContentStream, readStream } from './stream.js';
2
- import { parseContentType } from './vendors/contentType.js';
3
- function defaultQueryParser(search) {
4
- return Object.fromEntries(new URLSearchParams(search)); // support both leading ? and not
5
- }
6
- let bodyDefaultOptions = { bodyLimit: 100 << 10 }; // 100kb
7
- export function setBufferBodyDefaultOptions(options) {
8
- bodyDefaultOptions = { ...bodyDefaultOptions, ...options };
9
- }
10
- export async function bufferFromReq(req, options) {
11
- const { bodyLimit } = { ...bodyDefaultOptions, ...options };
12
- /**
13
- * Check if a request has a request body.
14
- * A request with a body __must__ either have `transfer-encoding`
15
- * or `content-length` headers set.
16
- * http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.3
17
- */
18
- // https://github.com/jshttp/type-is/blob/cdcfe23e9833872e425b0aaf71ca0311373b6116/index.js#L92
19
- const contentLengthParsed = parseInt(req.headers['content-length'] ?? '', 10);
20
- if (req.headers['transfer-encoding'] === undefined
21
- && isNaN(contentLengthParsed))
22
- return;
23
- const contentLength = isNaN(contentLengthParsed) ? undefined : contentLengthParsed;
24
- // read
25
- const encoding = (req.headers['content-encoding'] ?? 'identity').toLowerCase();
26
- const stream = getContentStream(req, encoding);
27
- return await readStream(stream, {
28
- length: encoding === 'identity' ? contentLength : undefined,
29
- limit: bodyLimit,
30
- });
31
- }
32
- // if content-type is not as expected, return undefined
33
- function forceGetContentTypeParams(req, expected) {
34
- const contentTypeRaw = req.headers['content-type'];
35
- if (!contentTypeRaw)
36
- return;
37
- const { mediaType, parameters } = parseContentType(contentTypeRaw);
38
- if (mediaType !== expected)
39
- return;
40
- return parameters;
41
- }
42
- function forceGetCharset(req, expected) {
43
- const parameters = forceGetContentTypeParams(req, expected);
44
- if (!parameters)
45
- return;
46
- // assert charset per RFC 7159 sec 8.1
47
- const charset = parameters.charset?.toLowerCase() || 'utf-8';
48
- if (!charset.startsWith('utf-'))
49
- throw new Error(`unsupported charset "${charset.toUpperCase()}"`);
50
- return charset;
51
- }
52
- export async function jsonFromReq(req, options) {
53
- const charset = forceGetCharset(req, 'application/json');
54
- if (!charset)
55
- return;
56
- const buffer = await bufferFromReq(req, options);
57
- if (buffer) {
58
- const str = buffer.toString(charset);
59
- return str ? JSON.parse(str) : undefined;
60
- }
61
- }
62
- export async function rawFromReq(req, options) {
63
- if (!forceGetContentTypeParams(req, 'application/octet-stream'))
64
- return;
65
- return await bufferFromReq(req, options);
66
- }
67
- export async function textFromReq(req, options) {
68
- const charset = forceGetCharset(req, 'text/plain');
69
- if (!charset)
70
- return;
71
- const buffer = await bufferFromReq(req, options);
72
- if (buffer)
73
- return buffer.toString(charset);
74
- }
75
- export async function urlEncodedFromReq(req, options) {
76
- const charset = forceGetCharset(req, 'application/x-www-form-urlencoded');
77
- if (!charset)
78
- return;
79
- const buffer = await bufferFromReq(req, options);
80
- if (buffer) {
81
- return (bodyDefaultOptions.urlEncodedParser ?? options?.urlEncodedParser ?? defaultQueryParser)(buffer.toString(charset));
82
- }
83
- }
84
- export function urlFromReq(req) {
85
- return new URL(req.url ?? '', 'https://example.com');
86
- }
87
- export function queryFromReq(req, options) {
88
- return (bodyDefaultOptions.queryParser ?? options?.queryParser ?? defaultQueryParser)(urlFromReq(req).searchParams.toString());
89
- }
90
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9keUhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvYm9keUhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFDLGdCQUFnQixFQUFFLFVBQVUsRUFBQyxNQUFNLGFBQWEsQ0FBQTtBQUN4RCxPQUFPLEVBQUMsZ0JBQWdCLEVBQUMsTUFBTSwwQkFBMEIsQ0FBQTtBQVF6RCxTQUFTLGtCQUFrQixDQUFDLE1BQWM7SUFDekMsT0FBTyxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUEsQ0FBQyxpQ0FBaUM7QUFDekYsQ0FBQztBQUVELElBQUksa0JBQWtCLEdBQXNCLEVBQUMsU0FBUyxFQUFFLEdBQUcsSUFBSSxFQUFFLEVBQUMsQ0FBQSxDQUFDLFFBQVE7QUFDM0UsTUFBTSxVQUFVLDJCQUEyQixDQUFDLE9BQW1DO0lBQzlFLGtCQUFrQixHQUFHLEVBQUMsR0FBRyxrQkFBa0IsRUFBRSxHQUFHLE9BQU8sRUFBQyxDQUFBO0FBQ3pELENBQUM7QUFFRCxNQUFNLENBQUMsS0FBSyxVQUFVLGFBQWEsQ0FBQyxHQUFvQixFQUFFLE9BQW9DO0lBQzdGLE1BQU0sRUFBQyxTQUFTLEVBQUMsR0FBRyxFQUFDLEdBQUcsa0JBQWtCLEVBQUUsR0FBRyxPQUFPLEVBQUMsQ0FBQTtJQUN2RDs7Ozs7T0FLRztJQUNGLCtGQUErRjtJQUNoRyxNQUFNLG1CQUFtQixHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLGdCQUFnQixDQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0lBQzdFLElBQ0MsR0FBRyxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLFNBQVM7V0FDM0MsS0FBSyxDQUFDLG1CQUFtQixDQUFDO1FBQzVCLE9BQU07SUFDUixNQUFNLGFBQWEsR0FBRyxLQUFLLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLENBQUMs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
package/esm/connect.d.ts DELETED
@@ -1,5 +0,0 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- import type { IncomingMessage, ServerResponse } from 'node:http';
3
- import { type Chainable } from './dx.js';
4
- import './polyfillWithResolvers.js';
5
- export declare function connectMiddlewares(...middlewares: Array<(req: IncomingMessage, res: ServerResponse, next: () => any) => any>): Chainable;
package/esm/connect.js DELETED
@@ -1,40 +0,0 @@
1
- import { getReq, getRes } from './dx.js';
2
- import './polyfillWithResolvers.js';
3
- // support async middleware
4
- // do not support error middleware (the one with 4 arguments)
5
- export function connectMiddlewares(...middlewares) {
6
- return next => {
7
- const req = getReq();
8
- const res = getRes();
9
- const defer = Promise.withResolvers();
10
- // because middleware usually not return next() or await to next(),
11
- // the next passed to the middleware must be resilient to error (never throw or reject)
12
- middlewares.reduceRight((connectNext, middleware) => async (error) => {
13
- // this function must not throw or reject
14
- if (error !== undefined && error !== null)
15
- return defer.reject(error);
16
- try {
17
- return await middleware(req, res, connectNext);
18
- }
19
- catch (err) {
20
- return defer.reject(err);
21
- }
22
- }, async () => {
23
- // next might throw error synchronously and be swallowed by some async middleware unless we wrap it here
24
- try {
25
- return defer.resolve(await next());
26
- }
27
- catch (err) {
28
- return defer.reject(err);
29
- }
30
- })(); // no need to await result from this call because it will never reject
31
- return defer.promise;
32
- // let i = 0
33
- // const run = async () => {
34
- // if (i === middlewares.length) return next()
35
- // await middlewares[i++](req, res, run)
36
- // }
37
- // await run()
38
- };
39
- }
40
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25uZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBaUIsTUFBTSxFQUFFLE1BQU0sRUFBQyxNQUFNLFNBQVMsQ0FBQTtBQUN0RCxPQUFPLDRCQUE0QixDQUFBO0FBRW5DLDJCQUEyQjtBQUMzQiw2REFBNkQ7QUFDN0QsTUFBTSxVQUFVLGtCQUFrQixDQUNqQyxHQUFHLFdBQXVGO0lBRTFGLE9BQU8sSUFBSSxDQUFDLEVBQUU7UUFDYixNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQTtRQUNwQixNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQTtRQUNwQixNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUE7UUFDckMsbUVBQW1FO1FBQ25FLHVGQUF1RjtRQUN2RixXQUFXLENBQUMsV0FBVyxDQUN0QixDQUFDLFdBQVcsRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDLEtBQUssRUFBRSxLQUFXLEVBQUUsRUFBRTtZQUNsRCx5Q0FBeUM7WUFDekMsSUFBSSxLQUFLLEtBQUssU0FBUyxJQUFJLEtBQUssS0FBSyxJQUFJO2dCQUFFLE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUNyRSxJQUFJLENBQUM7Z0JBQUEsT0FBTyxNQUFNLFVBQVUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLFdBQVcsQ0FBQyxDQUFBO1lBQUEsQ0FBQztZQUNwRCxPQUFPLEdBQUcsRUFBRSxDQUFDO2dCQUFBLE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUFBLENBQUM7UUFDdkMsQ0FBQyxFQUNELEtBQUssSUFBSSxFQUFFO1lBQ1Ysd0dBQXdHO1lBQ3hHLElBQUksQ0FBQztnQkFDSixPQUFPLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFBO1lBQ25DLENBQUM7WUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO2dCQUNkLE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUN6QixDQUFDO1FBQ0YsQ0FBQyxDQUNELEVBQUUsQ0FBQSxDQUFDLHNFQUFzRTtRQUMxRSxPQUFPLEtBQUssQ0FBQyxPQUFPLENBQUE7UUFDcEIsWUFBWTtRQUNaLDRCQUE0QjtRQUM1QiwrQ0FBK0M7UUFDL0MseUNBQXlDO1FBQ3pDLElBQUk7UUFDSixjQUFjO0lBQ2YsQ0FBQyxDQUFBO0FBQ0YsQ0FBQyJ9