@mswjs/interceptors 0.19.4 → 0.19.5
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/lib/BatchInterceptor.d.ts +5 -5
- package/lib/BatchInterceptor.js +14 -59
- package/lib/BatchInterceptor.js.map +1 -1
- package/lib/Interceptor.d.ts +7 -6
- package/lib/Interceptor.js +39 -64
- package/lib/Interceptor.js.map +1 -1
- package/lib/RemoteHttpInterceptor.js +115 -209
- package/lib/RemoteHttpInterceptor.js.map +1 -1
- package/lib/glossary.d.ts +2 -2
- package/lib/interceptors/ClientRequest/NodeClientRequest.js +141 -278
- package/lib/interceptors/ClientRequest/NodeClientRequest.js.map +1 -1
- package/lib/interceptors/ClientRequest/http.get.js +5 -34
- package/lib/interceptors/ClientRequest/http.get.js.map +1 -1
- package/lib/interceptors/ClientRequest/http.request.js +6 -35
- package/lib/interceptors/ClientRequest/http.request.js.map +1 -1
- package/lib/interceptors/ClientRequest/index.js +22 -82
- package/lib/interceptors/ClientRequest/index.js.map +1 -1
- package/lib/interceptors/ClientRequest/utils/cloneIncomingMessage.js +18 -62
- package/lib/interceptors/ClientRequest/utils/cloneIncomingMessage.js.map +1 -1
- package/lib/interceptors/ClientRequest/utils/createRequest.js +10 -32
- package/lib/interceptors/ClientRequest/utils/createRequest.js.map +1 -1
- package/lib/interceptors/ClientRequest/utils/createResponse.js +6 -6
- package/lib/interceptors/ClientRequest/utils/createResponse.js.map +1 -1
- package/lib/interceptors/ClientRequest/utils/getIncomingMessageBody.js +12 -12
- package/lib/interceptors/ClientRequest/utils/getIncomingMessageBody.js.map +1 -1
- package/lib/interceptors/ClientRequest/utils/normalizeClientRequestArgs.js +21 -52
- package/lib/interceptors/ClientRequest/utils/normalizeClientRequestArgs.js.map +1 -1
- package/lib/interceptors/ClientRequest/utils/normalizeClientRequestEndArgs.js +5 -9
- package/lib/interceptors/ClientRequest/utils/normalizeClientRequestEndArgs.js.map +1 -1
- package/lib/interceptors/ClientRequest/utils/normalizeClientRequestWriteArgs.js +6 -6
- package/lib/interceptors/ClientRequest/utils/normalizeClientRequestWriteArgs.js.map +1 -1
- package/lib/interceptors/XMLHttpRequest/XMLHttpRequestOverride.js +213 -338
- package/lib/interceptors/XMLHttpRequest/XMLHttpRequestOverride.js.map +1 -1
- package/lib/interceptors/XMLHttpRequest/index.js +16 -33
- package/lib/interceptors/XMLHttpRequest/index.js.map +1 -1
- package/lib/interceptors/XMLHttpRequest/polyfills/EventPolyfill.js +11 -12
- package/lib/interceptors/XMLHttpRequest/polyfills/EventPolyfill.js.map +1 -1
- package/lib/interceptors/XMLHttpRequest/polyfills/ProgressEventPolyfill.js +9 -27
- package/lib/interceptors/XMLHttpRequest/polyfills/ProgressEventPolyfill.js.map +1 -1
- package/lib/interceptors/XMLHttpRequest/utils/concatArrayBuffer.js +1 -1
- package/lib/interceptors/XMLHttpRequest/utils/concatArrayBuffer.js.map +1 -1
- package/lib/interceptors/XMLHttpRequest/utils/createEvent.js +7 -7
- package/lib/interceptors/XMLHttpRequest/utils/createEvent.js.map +1 -1
- package/lib/interceptors/XMLHttpRequest/utils/createResponse.js +2 -2
- package/lib/interceptors/XMLHttpRequest/utils/createResponse.js.map +1 -1
- package/lib/interceptors/XMLHttpRequest/utils/isDomParserSupportedType.js +2 -2
- package/lib/interceptors/XMLHttpRequest/utils/isDomParserSupportedType.js.map +1 -1
- package/lib/interceptors/fetch/index.js +52 -125
- package/lib/interceptors/fetch/index.js.map +1 -1
- package/lib/presets/browser.js +2 -2
- package/lib/presets/browser.js.map +1 -1
- package/lib/presets/node.js +2 -2
- package/lib/presets/node.js.map +1 -1
- package/lib/utils/AsyncEventEmitter.d.ts +9 -8
- package/lib/utils/AsyncEventEmitter.js +84 -190
- package/lib/utils/AsyncEventEmitter.js.map +1 -1
- package/lib/utils/bufferUtils.js +3 -3
- package/lib/utils/bufferUtils.js.map +1 -1
- package/lib/utils/cloneObject.js +2 -19
- package/lib/utils/cloneObject.js.map +1 -1
- package/lib/utils/createLazyCallback.js +14 -49
- package/lib/utils/createLazyCallback.js.map +1 -1
- package/lib/utils/getCleanUrl.js +1 -2
- package/lib/utils/getCleanUrl.js.map +1 -1
- package/lib/utils/getRequestOptionsByUrl.js +3 -3
- package/lib/utils/getRequestOptionsByUrl.js.map +1 -1
- package/lib/utils/getUrlByRequestOptions.js +23 -39
- package/lib/utils/getUrlByRequestOptions.js.map +1 -1
- package/lib/utils/nextTick.js +2 -2
- package/lib/utils/nextTick.js.map +1 -1
- package/lib/utils/parseJson.js +1 -1
- package/lib/utils/parseJson.js.map +1 -1
- package/lib/utils/toInteractiveRequest.js +3 -3
- package/lib/utils/toInteractiveRequest.js.map +1 -1
- package/lib/utils/uuid.js +2 -2
- package/lib/utils/uuid.js.map +1 -1
- package/package.json +2 -2
- package/src/BatchInterceptor.test.ts +2 -2
- package/src/BatchInterceptor.ts +14 -13
- package/src/Interceptor.ts +12 -11
- package/src/glossary.ts +2 -6
- package/src/utils/AsyncEventEmitter.test.ts +6 -6
- package/src/utils/AsyncEventEmitter.ts +60 -50
|
@@ -1,41 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
14
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
15
|
-
if (!m) return o;
|
|
16
|
-
var i = m.call(o), r, ar = [], e;
|
|
17
|
-
try {
|
|
18
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
19
|
-
}
|
|
20
|
-
catch (error) { e = { error: error }; }
|
|
21
|
-
finally {
|
|
22
|
-
try {
|
|
23
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
24
|
-
}
|
|
25
|
-
finally { if (e) throw e.error; }
|
|
26
|
-
}
|
|
27
|
-
return ar;
|
|
28
|
-
};
|
|
29
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
3
|
exports.normalizeClientRequestArgs = void 0;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
4
|
+
const debug_1 = require("debug");
|
|
5
|
+
const http_1 = require("http");
|
|
6
|
+
const https_1 = require("https");
|
|
7
|
+
const getRequestOptionsByUrl_1 = require("../../../utils/getRequestOptionsByUrl");
|
|
8
|
+
const getUrlByRequestOptions_1 = require("../../../utils/getUrlByRequestOptions");
|
|
9
|
+
const cloneObject_1 = require("../../../utils/cloneObject");
|
|
10
|
+
const isObject_1 = require("../../../utils/isObject");
|
|
11
|
+
const log = (0, debug_1.debug)('http normalizeClientRequestArgs');
|
|
39
12
|
function resolveRequestOptions(args, url) {
|
|
40
13
|
// Calling `fetch` provides only URL to `ClientRequest`
|
|
41
14
|
// without any `RequestOptions` or callback.
|
|
@@ -45,7 +18,7 @@ function resolveRequestOptions(args, url) {
|
|
|
45
18
|
}
|
|
46
19
|
if (args[1]) {
|
|
47
20
|
log('has custom RequestOptions!', args[1]);
|
|
48
|
-
|
|
21
|
+
const requestOptionsFromUrl = (0, getRequestOptionsByUrl_1.getRequestOptionsByUrl)(url);
|
|
49
22
|
log('derived RequestOptions from the URL:', requestOptionsFromUrl);
|
|
50
23
|
/**
|
|
51
24
|
* Clone the request options to lock their state
|
|
@@ -53,9 +26,9 @@ function resolveRequestOptions(args, url) {
|
|
|
53
26
|
* @see https://github.com/mswjs/interceptors/issues/86
|
|
54
27
|
*/
|
|
55
28
|
log('cloning RequestOptions...');
|
|
56
|
-
|
|
29
|
+
const clonedRequestOptions = (0, cloneObject_1.cloneObject)(args[1]);
|
|
57
30
|
log('successfully cloned RequestOptions!', clonedRequestOptions);
|
|
58
|
-
return
|
|
31
|
+
return Object.assign(Object.assign({}, requestOptionsFromUrl), clonedRequestOptions);
|
|
59
32
|
}
|
|
60
33
|
log('using an empty object as request options');
|
|
61
34
|
return {};
|
|
@@ -67,14 +40,10 @@ function resolveCallback(args) {
|
|
|
67
40
|
* Normalizes parameters given to a `http.request` call
|
|
68
41
|
* so it always has a `URL` and `RequestOptions`.
|
|
69
42
|
*/
|
|
70
|
-
function normalizeClientRequestArgs(defaultProtocol) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
}
|
|
75
|
-
var url;
|
|
76
|
-
var options;
|
|
77
|
-
var callback;
|
|
43
|
+
function normalizeClientRequestArgs(defaultProtocol, ...args) {
|
|
44
|
+
let url;
|
|
45
|
+
let options;
|
|
46
|
+
let callback;
|
|
78
47
|
log('arguments', args);
|
|
79
48
|
log('using default protocol:', defaultProtocol);
|
|
80
49
|
// Convert a url string into a URL instance
|
|
@@ -83,7 +52,7 @@ function normalizeClientRequestArgs(defaultProtocol) {
|
|
|
83
52
|
log('first argument is a location string:', args[0]);
|
|
84
53
|
url = new URL(args[0]);
|
|
85
54
|
log('created a url:', url);
|
|
86
|
-
|
|
55
|
+
const requestOptionsFromUrl = (0, getRequestOptionsByUrl_1.getRequestOptionsByUrl)(url);
|
|
87
56
|
log('request options from url:', requestOptionsFromUrl);
|
|
88
57
|
options = resolveRequestOptions(args, url);
|
|
89
58
|
log('resolved request options:', options);
|
|
@@ -101,7 +70,7 @@ function normalizeClientRequestArgs(defaultProtocol) {
|
|
|
101
70
|
// Handle a legacy URL instance and re-normalize from either a RequestOptions object
|
|
102
71
|
// or a WHATWG URL.
|
|
103
72
|
else if ('hash' in args[0] && !('method' in args[0])) {
|
|
104
|
-
|
|
73
|
+
const [legacyUrl] = args;
|
|
105
74
|
log('first argument is a legacy URL:', legacyUrl);
|
|
106
75
|
if (legacyUrl.hostname === null) {
|
|
107
76
|
/**
|
|
@@ -113,12 +82,12 @@ function normalizeClientRequestArgs(defaultProtocol) {
|
|
|
113
82
|
*/
|
|
114
83
|
log('given legacy URL is relative (no hostname)');
|
|
115
84
|
return (0, isObject_1.isObject)(args[1])
|
|
116
|
-
? normalizeClientRequestArgs(defaultProtocol,
|
|
85
|
+
? normalizeClientRequestArgs(defaultProtocol, Object.assign({ path: legacyUrl.path }, args[1]), args[2])
|
|
117
86
|
: normalizeClientRequestArgs(defaultProtocol, { path: legacyUrl.path }, args[1]);
|
|
118
87
|
}
|
|
119
88
|
log('given legacy url is absolute');
|
|
120
89
|
// We are dealing with an absolute URL, so convert to WHATWG and try again.
|
|
121
|
-
|
|
90
|
+
const resolvedUrl = new URL(legacyUrl.href);
|
|
122
91
|
return args[1] === undefined
|
|
123
92
|
? normalizeClientRequestArgs(defaultProtocol, resolvedUrl)
|
|
124
93
|
: typeof args[1] === 'function'
|
|
@@ -139,7 +108,7 @@ function normalizeClientRequestArgs(defaultProtocol) {
|
|
|
139
108
|
callback = resolveCallback(args);
|
|
140
109
|
}
|
|
141
110
|
else {
|
|
142
|
-
throw new Error(
|
|
111
|
+
throw new Error(`Failed to construct ClientRequest with these parameters: ${args}`);
|
|
143
112
|
}
|
|
144
113
|
options.protocol = options.protocol || url.protocol;
|
|
145
114
|
options.method = options.method || 'GET';
|
|
@@ -152,7 +121,7 @@ function normalizeClientRequestArgs(defaultProtocol) {
|
|
|
152
121
|
* @note Respect the "agent: false" value.
|
|
153
122
|
*/
|
|
154
123
|
if (typeof options.agent === 'undefined') {
|
|
155
|
-
|
|
124
|
+
const agent = options.protocol === 'https:'
|
|
156
125
|
? new https_1.Agent({
|
|
157
126
|
rejectUnauthorized: options.rejectUnauthorized,
|
|
158
127
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeClientRequestArgs.js","sourceRoot":"","sources":["../../../../src/interceptors/ClientRequest/utils/normalizeClientRequestArgs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalizeClientRequestArgs.js","sourceRoot":"","sources":["../../../../src/interceptors/ClientRequest/utils/normalizeClientRequestArgs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeClientRequestEndArgs = void 0;
|
|
4
|
-
|
|
4
|
+
const debug = require('debug')('http normalizeClientRequestEndArgs');
|
|
5
5
|
/**
|
|
6
6
|
* Normalizes a list of arguments given to the `ClientRequest.end()`
|
|
7
7
|
* method to always include `chunk`, `encoding`, and `callback`.
|
|
8
8
|
*/
|
|
9
|
-
function normalizeClientRequestEndArgs() {
|
|
10
|
-
var args = [];
|
|
11
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
12
|
-
args[_i] = arguments[_i];
|
|
13
|
-
}
|
|
9
|
+
function normalizeClientRequestEndArgs(...args) {
|
|
14
10
|
debug('arguments', args);
|
|
15
|
-
|
|
11
|
+
const normalizedArgs = new Array(3)
|
|
16
12
|
.fill(null)
|
|
17
|
-
.map(
|
|
18
|
-
normalizedArgs.sort(
|
|
13
|
+
.map((value, index) => args[index] || value);
|
|
14
|
+
normalizedArgs.sort((a, b) => {
|
|
19
15
|
// If first element is a function, move it rightwards.
|
|
20
16
|
if (typeof a === 'function') {
|
|
21
17
|
return 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeClientRequestEndArgs.js","sourceRoot":"","sources":["../../../../src/interceptors/ClientRequest/utils/normalizeClientRequestEndArgs.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalizeClientRequestEndArgs.js","sourceRoot":"","sources":["../../../../src/interceptors/ClientRequest/utils/normalizeClientRequestEndArgs.ts"],"names":[],"mappings":";;;AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,oCAAoC,CAAC,CAAA;AAiBpE;;;GAGG;AACH,SAAgB,6BAA6B,CAC3C,GAAG,IAAwB;IAE3B,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;IACxB,MAAM,cAAc,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC;SAChC,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,CAAA;IAE9C,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3B,sDAAsD;QACtD,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE;YAC3B,OAAO,CAAC,CAAA;SACT;QAED,6DAA6D;QAC7D,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE;YAC3B,OAAO,CAAC,CAAC,CAAA;SACV;QAED,+DAA+D;QAC/D,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;YAClD,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;SAC7D;QAED,OAAO,CAAC,CAAA;IACV,CAAC,CAAC,CAAA;IAEF,KAAK,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAA;IACxC,OAAO,cAAgD,CAAA;AACzD,CAAC;AA7BD,sEA6BC"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeClientRequestWriteArgs = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
const debug_1 = require("debug");
|
|
5
|
+
const log = (0, debug_1.debug)('http normalizeWriteArgs');
|
|
6
6
|
function normalizeClientRequestWriteArgs(args) {
|
|
7
7
|
log('normalizing ClientRequest.write arguments...', args);
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
const chunk = args[0];
|
|
9
|
+
const encoding = typeof args[1] === 'string' ? args[1] : undefined;
|
|
10
|
+
const callback = typeof args[1] === 'function' ? args[1] : args[2];
|
|
11
|
+
const writeArgs = [
|
|
12
12
|
chunk,
|
|
13
13
|
encoding,
|
|
14
14
|
callback,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeClientRequestWriteArgs.js","sourceRoot":"","sources":["../../../../src/interceptors/ClientRequest/utils/normalizeClientRequestWriteArgs.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"normalizeClientRequestWriteArgs.js","sourceRoot":"","sources":["../../../../src/interceptors/ClientRequest/utils/normalizeClientRequestWriteArgs.ts"],"names":[],"mappings":";;;AAAA,iCAA6B;AAE7B,MAAM,GAAG,GAAG,IAAA,aAAK,EAAC,yBAAyB,CAAC,CAAA;AAe5C,SAAgB,+BAA+B,CAC7C,IAA4B;IAE5B,GAAG,CAAC,8CAA8C,EAAE,IAAI,CAAC,CAAA;IAEzD,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACrB,MAAM,QAAQ,GACZ,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,IAAI,CAAC,CAAC,CAAoB,CAAC,CAAC,CAAC,SAAS,CAAA;IACvE,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAElE,MAAM,SAAS,GAAqC;QAClD,KAAK;QACL,QAAQ;QACR,QAAQ;KACT,CAAA;IACD,GAAG,CAAC,wDAAwD,EAAE,SAAS,CAAC,CAAA;IAExE,OAAO,SAAS,CAAA;AAClB,CAAC;AAlBD,0EAkBC"}
|