@jonathanleelx/meddle 0.5.0-beta.6 → 0.5.0-beta.8
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h2-pool.d.ts","sourceRoot":"","sources":["../../core/h2-pool.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"h2-pool.d.ts","sourceRoot":"","sources":["../../core/h2-pool.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAyB5C,eAAO,MAAM,qBAAqB,qBAAqB,CAAA;AA2BvD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CASnF;AAKD,wBAAgB,4BAA4B,CACxC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,0BAA0B,KAAK,KAAK,CAAC,kBAAkB,CAAC,GAAG,IAAI,GACvG,IAAI,CAEN;AAwJD,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAU5I"}
|
package/dist/core/h2-pool.js
CHANGED
|
@@ -48,10 +48,19 @@ const proxyDebug = (0, debug_1.default)('proxy');
|
|
|
48
48
|
const h2SessionPool = new Map();
|
|
49
49
|
const MAX_H2_SESSIONS = process.env.MEDDLE_MAX_H2_SESSIONS ? parseInt(process.env.MEDDLE_MAX_H2_SESSIONS) : 32;
|
|
50
50
|
const DEFAULT_UPSTREAM_REQUEST_TIMEOUT_MS = 60000;
|
|
51
|
+
// Shorter than H1: deno's http2 client can hang on empty-body responses; fallback
|
|
52
|
+
// to H1 should happen before a CORS / browser request looks "stuck" (#72).
|
|
53
|
+
const DEFAULT_H2_REQUEST_TIMEOUT_MS = 8000;
|
|
54
|
+
function parsePositiveMs(raw, fallback) {
|
|
55
|
+
const parsed = raw ? parseInt(raw, 10) : NaN;
|
|
56
|
+
return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
|
|
57
|
+
}
|
|
51
58
|
function upstreamTimeoutMs() {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
59
|
+
return parsePositiveMs(process.env.MEDDLE_UPSTREAM_TIMEOUT_MS, DEFAULT_UPSTREAM_REQUEST_TIMEOUT_MS);
|
|
60
|
+
}
|
|
61
|
+
function h2RequestTimeoutMs() {
|
|
62
|
+
const h2 = parsePositiveMs(process.env.MEDDLE_H2_REQUEST_TIMEOUT_MS, DEFAULT_H2_REQUEST_TIMEOUT_MS);
|
|
63
|
+
return Math.min(h2, upstreamTimeoutMs());
|
|
55
64
|
}
|
|
56
65
|
exports.UPSTREAM_TIMEOUT_CODE = 'UPSTREAM_TIMEOUT';
|
|
57
66
|
function upstreamTimeoutError(target, timeoutMs) {
|
|
@@ -151,6 +160,13 @@ function getOrCreateH2Session(origin, servername) {
|
|
|
151
160
|
});
|
|
152
161
|
});
|
|
153
162
|
}
|
|
163
|
+
/** CORS preflight (OPTIONS) and HEAD typically have empty bodies. Deno's
|
|
164
|
+
* node:http2 client never emits `response`/`end` for those, so they must
|
|
165
|
+
* not go through proxyViaH2 (#72). */
|
|
166
|
+
function shouldSkipHttp2(method) {
|
|
167
|
+
const m = String(method || '').toUpperCase();
|
|
168
|
+
return m === 'OPTIONS' || m === 'HEAD';
|
|
169
|
+
}
|
|
154
170
|
function proxyViaH2(target, method, headers, reqBody) {
|
|
155
171
|
const url = new URL(target);
|
|
156
172
|
const origin = url.origin;
|
|
@@ -159,30 +175,54 @@ function proxyViaH2(target, method, headers, reqBody) {
|
|
|
159
175
|
const servername = (url.hostname !== originalHostname) ? originalHostname : undefined;
|
|
160
176
|
return getOrCreateH2Session(origin, servername).then(session => {
|
|
161
177
|
return new Promise((resolve, reject) => {
|
|
178
|
+
const h2Headers = cleanHeadersForH2(headers);
|
|
179
|
+
h2Headers[':method'] = method;
|
|
180
|
+
h2Headers[':path'] = url.pathname + url.search;
|
|
181
|
+
h2Headers[':authority'] = originalHost;
|
|
182
|
+
h2Headers[':scheme'] = url.protocol.replace(':', '');
|
|
183
|
+
let h2Stream;
|
|
162
184
|
try {
|
|
163
|
-
|
|
164
|
-
h2Headers[':method'] = method;
|
|
165
|
-
h2Headers[':path'] = url.pathname + url.search;
|
|
166
|
-
h2Headers[':authority'] = originalHost;
|
|
167
|
-
h2Headers[':scheme'] = url.protocol.replace(':', '');
|
|
168
|
-
const h2Stream = session.request(h2Headers);
|
|
169
|
-
h2Stream.on('response', (resHeaders) => {
|
|
170
|
-
const statusCode = Number(resHeaders[':status']);
|
|
171
|
-
const clean = {};
|
|
172
|
-
for (const [k, v] of Object.entries(resHeaders)) {
|
|
173
|
-
if (!k.startsWith(':'))
|
|
174
|
-
clean[k] = v;
|
|
175
|
-
}
|
|
176
|
-
resolve({ statusCode, statusMessage: '', headers: clean, stream: h2Stream, protocol: 'h2' });
|
|
177
|
-
});
|
|
178
|
-
h2Stream.on('error', reject);
|
|
179
|
-
if (reqBody && reqBody.length > 0)
|
|
180
|
-
h2Stream.write(reqBody);
|
|
181
|
-
h2Stream.end();
|
|
185
|
+
h2Stream = session.request(h2Headers);
|
|
182
186
|
}
|
|
183
187
|
catch (err) {
|
|
184
188
|
reject(err);
|
|
189
|
+
return;
|
|
185
190
|
}
|
|
191
|
+
const timeoutMs = h2RequestTimeoutMs();
|
|
192
|
+
let settled = false;
|
|
193
|
+
const settle = (fn) => {
|
|
194
|
+
if (settled)
|
|
195
|
+
return;
|
|
196
|
+
settled = true;
|
|
197
|
+
clearTimeout(timer);
|
|
198
|
+
fn();
|
|
199
|
+
};
|
|
200
|
+
const timer = setTimeout(() => {
|
|
201
|
+
settle(() => {
|
|
202
|
+
try {
|
|
203
|
+
h2Stream.close();
|
|
204
|
+
}
|
|
205
|
+
catch (_) { /* ignore */ }
|
|
206
|
+
try {
|
|
207
|
+
h2Stream.destroy();
|
|
208
|
+
}
|
|
209
|
+
catch (_) { /* ignore */ }
|
|
210
|
+
reject(upstreamTimeoutError(target, timeoutMs));
|
|
211
|
+
});
|
|
212
|
+
}, timeoutMs);
|
|
213
|
+
h2Stream.on('response', (resHeaders) => {
|
|
214
|
+
const statusCode = Number(resHeaders[':status']);
|
|
215
|
+
const clean = {};
|
|
216
|
+
for (const [k, v] of Object.entries(resHeaders)) {
|
|
217
|
+
if (!k.startsWith(':'))
|
|
218
|
+
clean[k] = v;
|
|
219
|
+
}
|
|
220
|
+
settle(() => resolve({ statusCode, statusMessage: '', headers: clean, stream: h2Stream, protocol: 'h2' }));
|
|
221
|
+
});
|
|
222
|
+
h2Stream.on('error', (err) => settle(() => reject(err)));
|
|
223
|
+
if (reqBody && reqBody.length > 0)
|
|
224
|
+
h2Stream.write(reqBody);
|
|
225
|
+
h2Stream.end();
|
|
186
226
|
});
|
|
187
227
|
});
|
|
188
228
|
}
|
|
@@ -219,7 +259,7 @@ function proxyViaH1(target, method, headers, reqBody) {
|
|
|
219
259
|
});
|
|
220
260
|
}
|
|
221
261
|
async function makeProxyRequest(target, method, headers, reqBody) {
|
|
222
|
-
if (target.startsWith('https')) {
|
|
262
|
+
if (target.startsWith('https') && !shouldSkipHttp2(method)) {
|
|
223
263
|
try {
|
|
224
264
|
return await proxyViaH2(target, method, headers, reqBody);
|
|
225
265
|
}
|
package/dist/core/h2-pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h2-pool.js","sourceRoot":"","sources":["../../core/h2-pool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"h2-pool.js","sourceRoot":"","sources":["../../core/h2-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-intercept.d.ts","sourceRoot":"","sources":["../../core/plugin-intercept.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAM7D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY;mCAaf,OAAO;yCAIO,gBAAgB,KAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin-intercept.d.ts","sourceRoot":"","sources":["../../core/plugin-intercept.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAM7D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY;mCAaf,OAAO;yCAIO,gBAAgB,KAAG,OAAO,CAAC,OAAO,CAAC;2CAwDvC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,KAAG,IAAI;sCAetF,MAAM,SAAS,GAAG,KAAG,IAAI;oCAI3B,MAAM,UAAU,MAAM,cAAc,MAAM,kBAAkB,MAAM,KAAG,IAAI;6CAehE,MAAM,KAAG,OAAO;6CAIhB,MAAM,KAAG,OAAO;4CAIjB,MAAM,QAAQ,GAAG,KAAG,OAAO;EAc7E"}
|
|
@@ -68,6 +68,7 @@ function createPluginIntercept(ctx) {
|
|
|
68
68
|
: { ...headers };
|
|
69
69
|
if (shouldApplyPluginResponse) {
|
|
70
70
|
delete finalHeaders['content-encoding'];
|
|
71
|
+
delete finalHeaders['transfer-encoding'];
|
|
71
72
|
finalHeaders['content-length'] = String(finalBody.length);
|
|
72
73
|
}
|
|
73
74
|
const finalWriteHeaders = cleanHeaders ? cleanHeaders(finalHeaders) : finalHeaders;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-intercept.js","sourceRoot":"","sources":["../../core/plugin-intercept.ts"],"names":[],"mappings":";;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"plugin-intercept.js","sourceRoot":"","sources":["../../core/plugin-intercept.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jonathanleelx/meddle",
|
|
3
|
-
"version": "0.5.0-beta.
|
|
3
|
+
"version": "0.5.0-beta.8",
|
|
4
4
|
"description": "A simple development proxy server with custom routing rules, mock responses, HTTPS interception, and a plugin system",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "index.js",
|