wrangler 4.21.2 → 4.23.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/package.json +5 -5
- package/wrangler-dist/cli.js +298 -211
- package/wrangler-dist/metafile-cjs.json +1 -1
package/wrangler-dist/cli.js
CHANGED
@@ -2301,7 +2301,7 @@ var require_util = __commonJS({
|
|
2301
2301
|
"../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/core/util.js"(exports2, module3) {
|
2302
2302
|
"use strict";
|
2303
2303
|
init_import_meta_url();
|
2304
|
-
var
|
2304
|
+
var assert39 = require("assert");
|
2305
2305
|
var { kDestroyed, kBodyUsed } = require_symbols();
|
2306
2306
|
var { IncomingMessage } = require("http");
|
2307
2307
|
var stream2 = require("stream");
|
@@ -2389,7 +2389,7 @@ var require_util = __commonJS({
|
|
2389
2389
|
function getHostname(host) {
|
2390
2390
|
if (host[0] === "[") {
|
2391
2391
|
const idx2 = host.indexOf("]");
|
2392
|
-
|
2392
|
+
assert39(idx2 !== -1);
|
2393
2393
|
return host.substring(1, idx2);
|
2394
2394
|
}
|
2395
2395
|
const idx = host.indexOf(":");
|
@@ -2401,7 +2401,7 @@ var require_util = __commonJS({
|
|
2401
2401
|
if (!host) {
|
2402
2402
|
return null;
|
2403
2403
|
}
|
2404
|
-
|
2404
|
+
assert39.strictEqual(typeof host, "string");
|
2405
2405
|
const servername = getHostname(host);
|
2406
2406
|
if (net2.isIP(servername)) {
|
2407
2407
|
return "";
|
@@ -5067,7 +5067,7 @@ var require_util2 = __commonJS({
|
|
5067
5067
|
var { getGlobalOrigin } = require_global();
|
5068
5068
|
var { performance: performance2 } = require("perf_hooks");
|
5069
5069
|
var { isBlobLike, toUSVString, ReadableStreamFrom } = require_util();
|
5070
|
-
var
|
5070
|
+
var assert39 = require("assert");
|
5071
5071
|
var { isUint8Array } = require("util/types");
|
5072
5072
|
var supportedHashes = [];
|
5073
5073
|
var crypto8;
|
@@ -5277,7 +5277,7 @@ var require_util2 = __commonJS({
|
|
5277
5277
|
__name(clonePolicyContainer, "clonePolicyContainer");
|
5278
5278
|
function determineRequestsReferrer(request4) {
|
5279
5279
|
const policy = request4.referrerPolicy;
|
5280
|
-
|
5280
|
+
assert39(policy);
|
5281
5281
|
let referrerSource = null;
|
5282
5282
|
if (request4.referrer === "client") {
|
5283
5283
|
const globalOrigin = getGlobalOrigin();
|
@@ -5336,7 +5336,7 @@ var require_util2 = __commonJS({
|
|
5336
5336
|
}
|
5337
5337
|
__name(determineRequestsReferrer, "determineRequestsReferrer");
|
5338
5338
|
function stripURLForReferrer(url4, originOnly) {
|
5339
|
-
|
5339
|
+
assert39(url4 instanceof URL);
|
5340
5340
|
if (url4.protocol === "file:" || url4.protocol === "about:" || url4.protocol === "blank:") {
|
5341
5341
|
return "no-referrer";
|
5342
5342
|
}
|
@@ -5529,7 +5529,7 @@ var require_util2 = __commonJS({
|
|
5529
5529
|
if (result === void 0) {
|
5530
5530
|
throw new TypeError("Value is not JSON serializable");
|
5531
5531
|
}
|
5532
|
-
|
5532
|
+
assert39(typeof result === "string");
|
5533
5533
|
return result;
|
5534
5534
|
}
|
5535
5535
|
__name(serializeJavascriptValueToJSONString, "serializeJavascriptValueToJSONString");
|
@@ -5630,7 +5630,7 @@ var require_util2 = __commonJS({
|
|
5630
5630
|
__name(readableStreamClose, "readableStreamClose");
|
5631
5631
|
function isomorphicEncode(input) {
|
5632
5632
|
for (let i5 = 0; i5 < input.length; i5++) {
|
5633
|
-
|
5633
|
+
assert39(input.charCodeAt(i5) <= 255);
|
5634
5634
|
}
|
5635
5635
|
return input;
|
5636
5636
|
}
|
@@ -5652,7 +5652,7 @@ var require_util2 = __commonJS({
|
|
5652
5652
|
}
|
5653
5653
|
__name(readAllBytes, "readAllBytes");
|
5654
5654
|
function urlIsLocal(url4) {
|
5655
|
-
|
5655
|
+
assert39("protocol" in url4);
|
5656
5656
|
const protocol = url4.protocol;
|
5657
5657
|
return protocol === "about:" || protocol === "blob:" || protocol === "data:";
|
5658
5658
|
}
|
@@ -5665,7 +5665,7 @@ var require_util2 = __commonJS({
|
|
5665
5665
|
}
|
5666
5666
|
__name(urlHasHttpsScheme, "urlHasHttpsScheme");
|
5667
5667
|
function urlIsHttpHttpsScheme(url4) {
|
5668
|
-
|
5668
|
+
assert39("protocol" in url4);
|
5669
5669
|
const protocol = url4.protocol;
|
5670
5670
|
return protocol === "http:" || protocol === "https:";
|
5671
5671
|
}
|
@@ -6111,7 +6111,7 @@ var require_webidl = __commonJS({
|
|
6111
6111
|
var require_dataURL = __commonJS({
|
6112
6112
|
"../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/fetch/dataURL.js"(exports2, module3) {
|
6113
6113
|
init_import_meta_url();
|
6114
|
-
var
|
6114
|
+
var assert39 = require("assert");
|
6115
6115
|
var { atob: atob2 } = require("buffer");
|
6116
6116
|
var { isomorphicDecode } = require_util2();
|
6117
6117
|
var encoder = new TextEncoder();
|
@@ -6119,7 +6119,7 @@ var require_dataURL = __commonJS({
|
|
6119
6119
|
var HTTP_WHITESPACE_REGEX = /(\u000A|\u000D|\u0009|\u0020)/;
|
6120
6120
|
var HTTP_QUOTED_STRING_TOKENS = /[\u0009|\u0020-\u007E|\u0080-\u00FF]/;
|
6121
6121
|
function dataURLProcessor(dataURL) {
|
6122
|
-
|
6122
|
+
assert39(dataURL.protocol === "data:");
|
6123
6123
|
let input = URLSerializer(dataURL, true);
|
6124
6124
|
input = input.slice(5);
|
6125
6125
|
const position = { position: 0 };
|
@@ -6313,7 +6313,7 @@ var require_dataURL = __commonJS({
|
|
6313
6313
|
function collectAnHTTPQuotedString(input, position, extractValue) {
|
6314
6314
|
const positionStart = position.position;
|
6315
6315
|
let value = "";
|
6316
|
-
|
6316
|
+
assert39(input[position.position] === '"');
|
6317
6317
|
position.position++;
|
6318
6318
|
while (true) {
|
6319
6319
|
value += collectASequenceOfCodePoints(
|
@@ -6334,7 +6334,7 @@ var require_dataURL = __commonJS({
|
|
6334
6334
|
value += input[position.position];
|
6335
6335
|
position.position++;
|
6336
6336
|
} else {
|
6337
|
-
|
6337
|
+
assert39(quoteOrBackslash === '"');
|
6338
6338
|
break;
|
6339
6339
|
}
|
6340
6340
|
}
|
@@ -6345,7 +6345,7 @@ var require_dataURL = __commonJS({
|
|
6345
6345
|
}
|
6346
6346
|
__name(collectAnHTTPQuotedString, "collectAnHTTPQuotedString");
|
6347
6347
|
function serializeAMimeType(mimeType) {
|
6348
|
-
|
6348
|
+
assert39(mimeType !== "failure");
|
6349
6349
|
const { parameters, essence } = mimeType;
|
6350
6350
|
let serialization = essence;
|
6351
6351
|
for (let [name2, value] of parameters.entries()) {
|
@@ -6785,7 +6785,7 @@ var require_body = __commonJS({
|
|
6785
6785
|
var { DOMException: DOMException2, structuredClone } = require_constants2();
|
6786
6786
|
var { Blob: Blob6, File: NativeFile } = require("buffer");
|
6787
6787
|
var { kBodyUsed } = require_symbols();
|
6788
|
-
var
|
6788
|
+
var assert39 = require("assert");
|
6789
6789
|
var { isErrored } = require_util();
|
6790
6790
|
var { isUint8Array, isArrayBuffer: isArrayBuffer3 } = require("util/types");
|
6791
6791
|
var { File: UndiciFile } = require_file();
|
@@ -6823,7 +6823,7 @@ var require_body = __commonJS({
|
|
6823
6823
|
type: void 0
|
6824
6824
|
});
|
6825
6825
|
}
|
6826
|
-
|
6826
|
+
assert39(isReadableStreamLike(stream2));
|
6827
6827
|
let action = null;
|
6828
6828
|
let source = null;
|
6829
6829
|
let length = null;
|
@@ -6940,8 +6940,8 @@ Content-Type: ${value.type || "application/octet-stream"}\r
|
|
6940
6940
|
ReadableStream3 = require("stream/web").ReadableStream;
|
6941
6941
|
}
|
6942
6942
|
if (object instanceof ReadableStream3) {
|
6943
|
-
|
6944
|
-
|
6943
|
+
assert39(!util5.isDisturbed(object), "The body has already been consumed.");
|
6944
|
+
assert39(!object.locked, "The stream is locked.");
|
6945
6945
|
}
|
6946
6946
|
return extractBody(object, keepalive);
|
6947
6947
|
}
|
@@ -7164,7 +7164,7 @@ var require_request = __commonJS({
|
|
7164
7164
|
InvalidArgumentError,
|
7165
7165
|
NotSupportedError
|
7166
7166
|
} = require_errors();
|
7167
|
-
var
|
7167
|
+
var assert39 = require("assert");
|
7168
7168
|
var { kHTTP2BuildRequest, kHTTP2CopyHeaders, kHTTP1BuildRequest } = require_symbols();
|
7169
7169
|
var util5 = require_util();
|
7170
7170
|
var tokenRegExp = /^[\^_`a-zA-Z\-0-9!#$%&'*+.|~]+$/;
|
@@ -7348,8 +7348,8 @@ var require_request = __commonJS({
|
|
7348
7348
|
}
|
7349
7349
|
}
|
7350
7350
|
onConnect(abort) {
|
7351
|
-
|
7352
|
-
|
7351
|
+
assert39(!this.aborted);
|
7352
|
+
assert39(!this.completed);
|
7353
7353
|
if (this.error) {
|
7354
7354
|
abort(this.error);
|
7355
7355
|
} else {
|
@@ -7358,8 +7358,8 @@ var require_request = __commonJS({
|
|
7358
7358
|
}
|
7359
7359
|
}
|
7360
7360
|
onHeaders(statusCode, headers, resume, statusText) {
|
7361
|
-
|
7362
|
-
|
7361
|
+
assert39(!this.aborted);
|
7362
|
+
assert39(!this.completed);
|
7363
7363
|
if (channels.headers.hasSubscribers) {
|
7364
7364
|
channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
|
7365
7365
|
}
|
@@ -7370,8 +7370,8 @@ var require_request = __commonJS({
|
|
7370
7370
|
}
|
7371
7371
|
}
|
7372
7372
|
onData(chunk) {
|
7373
|
-
|
7374
|
-
|
7373
|
+
assert39(!this.aborted);
|
7374
|
+
assert39(!this.completed);
|
7375
7375
|
try {
|
7376
7376
|
return this[kHandler].onData(chunk);
|
7377
7377
|
} catch (err) {
|
@@ -7380,13 +7380,13 @@ var require_request = __commonJS({
|
|
7380
7380
|
}
|
7381
7381
|
}
|
7382
7382
|
onUpgrade(statusCode, headers, socket) {
|
7383
|
-
|
7384
|
-
|
7383
|
+
assert39(!this.aborted);
|
7384
|
+
assert39(!this.completed);
|
7385
7385
|
return this[kHandler].onUpgrade(statusCode, headers, socket);
|
7386
7386
|
}
|
7387
7387
|
onComplete(trailers) {
|
7388
7388
|
this.onFinally();
|
7389
|
-
|
7389
|
+
assert39(!this.aborted);
|
7390
7390
|
this.completed = true;
|
7391
7391
|
if (channels.trailers.hasSubscribers) {
|
7392
7392
|
channels.trailers.publish({ request: this, trailers });
|
@@ -7728,7 +7728,7 @@ var require_connect = __commonJS({
|
|
7728
7728
|
"use strict";
|
7729
7729
|
init_import_meta_url();
|
7730
7730
|
var net2 = require("net");
|
7731
|
-
var
|
7731
|
+
var assert39 = require("assert");
|
7732
7732
|
var util5 = require_util();
|
7733
7733
|
var { InvalidArgumentError, ConnectTimeoutError } = require_errors();
|
7734
7734
|
var tls;
|
@@ -7804,7 +7804,7 @@ var require_connect = __commonJS({
|
|
7804
7804
|
servername = servername || options.servername || util5.getServerName(host) || null;
|
7805
7805
|
const sessionKey = servername || hostname2;
|
7806
7806
|
const session = sessionCache.get(sessionKey) || null;
|
7807
|
-
|
7807
|
+
assert39(sessionKey);
|
7808
7808
|
socket = tls.connect({
|
7809
7809
|
highWaterMark: 16384,
|
7810
7810
|
// TLS in node can't have bigger HWM anyway...
|
@@ -7823,7 +7823,7 @@ var require_connect = __commonJS({
|
|
7823
7823
|
sessionCache.set(sessionKey, session2);
|
7824
7824
|
});
|
7825
7825
|
} else {
|
7826
|
-
|
7826
|
+
assert39(!httpSocket, "httpSocket can only be sent on TLS update");
|
7827
7827
|
socket = net2.connect({
|
7828
7828
|
highWaterMark: 64 * 1024,
|
7829
7829
|
// Same as nodejs fs streams.
|
@@ -8239,7 +8239,7 @@ var require_RedirectHandler = __commonJS({
|
|
8239
8239
|
init_import_meta_url();
|
8240
8240
|
var util5 = require_util();
|
8241
8241
|
var { kBodyUsed } = require_symbols();
|
8242
|
-
var
|
8242
|
+
var assert39 = require("assert");
|
8243
8243
|
var { InvalidArgumentError } = require_errors();
|
8244
8244
|
var EE = require("events");
|
8245
8245
|
var redirectableStatusCodes = [300, 301, 302, 303, 307, 308];
|
@@ -8253,7 +8253,7 @@ var require_RedirectHandler = __commonJS({
|
|
8253
8253
|
this[kBodyUsed] = false;
|
8254
8254
|
}
|
8255
8255
|
async *[Symbol.asyncIterator]() {
|
8256
|
-
|
8256
|
+
assert39(!this[kBodyUsed], "disturbed");
|
8257
8257
|
this[kBodyUsed] = true;
|
8258
8258
|
yield* this[kBody];
|
8259
8259
|
}
|
@@ -8277,7 +8277,7 @@ var require_RedirectHandler = __commonJS({
|
|
8277
8277
|
if (util5.isStream(this.opts.body)) {
|
8278
8278
|
if (util5.bodyLength(this.opts.body) === 0) {
|
8279
8279
|
this.opts.body.on("data", function() {
|
8280
|
-
|
8280
|
+
assert39(false);
|
8281
8281
|
});
|
8282
8282
|
}
|
8283
8283
|
if (typeof this.opts.body.readableDidRead !== "boolean") {
|
@@ -8383,7 +8383,7 @@ var require_RedirectHandler = __commonJS({
|
|
8383
8383
|
}
|
8384
8384
|
}
|
8385
8385
|
} else {
|
8386
|
-
|
8386
|
+
assert39(headers == null, "headers must be an object or an array");
|
8387
8387
|
}
|
8388
8388
|
return ret;
|
8389
8389
|
}
|
@@ -8437,7 +8437,7 @@ var require_client = __commonJS({
|
|
8437
8437
|
"../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/client.js"(exports2, module3) {
|
8438
8438
|
"use strict";
|
8439
8439
|
init_import_meta_url();
|
8440
|
-
var
|
8440
|
+
var assert39 = require("assert");
|
8441
8441
|
var net2 = require("net");
|
8442
8442
|
var http5 = require("http");
|
8443
8443
|
var { pipeline } = require("stream");
|
@@ -8778,7 +8778,7 @@ var require_client = __commonJS({
|
|
8778
8778
|
}
|
8779
8779
|
};
|
8780
8780
|
function onHttp2SessionError(err) {
|
8781
|
-
|
8781
|
+
assert39(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
|
8782
8782
|
this[kSocket][kError] = err;
|
8783
8783
|
onError(this[kClient], err);
|
8784
8784
|
}
|
@@ -8802,7 +8802,7 @@ var require_client = __commonJS({
|
|
8802
8802
|
client[kSocket] = null;
|
8803
8803
|
client[kHTTP2Session] = null;
|
8804
8804
|
if (client.destroyed) {
|
8805
|
-
|
8805
|
+
assert39(this[kPending] === 0);
|
8806
8806
|
const requests = client[kQueue].splice(client[kRunningIdx]);
|
8807
8807
|
for (let i5 = 0; i5 < requests.length; i5++) {
|
8808
8808
|
const request4 = requests[i5];
|
@@ -8814,7 +8814,7 @@ var require_client = __commonJS({
|
|
8814
8814
|
errorRequest(client, request4, err);
|
8815
8815
|
}
|
8816
8816
|
client[kPendingIdx] = client[kRunningIdx];
|
8817
|
-
|
8817
|
+
assert39(client[kRunning] === 0);
|
8818
8818
|
client.emit(
|
8819
8819
|
"disconnect",
|
8820
8820
|
client[kUrl],
|
@@ -8842,35 +8842,35 @@ var require_client = __commonJS({
|
|
8842
8842
|
return 0;
|
8843
8843
|
}, "wasm_on_url"),
|
8844
8844
|
wasm_on_status: /* @__PURE__ */ __name((p6, at2, len) => {
|
8845
|
-
|
8845
|
+
assert39.strictEqual(currentParser.ptr, p6);
|
8846
8846
|
const start = at2 - currentBufferPtr + currentBufferRef.byteOffset;
|
8847
8847
|
return currentParser.onStatus(new FastBuffer(currentBufferRef.buffer, start, len)) || 0;
|
8848
8848
|
}, "wasm_on_status"),
|
8849
8849
|
wasm_on_message_begin: /* @__PURE__ */ __name((p6) => {
|
8850
|
-
|
8850
|
+
assert39.strictEqual(currentParser.ptr, p6);
|
8851
8851
|
return currentParser.onMessageBegin() || 0;
|
8852
8852
|
}, "wasm_on_message_begin"),
|
8853
8853
|
wasm_on_header_field: /* @__PURE__ */ __name((p6, at2, len) => {
|
8854
|
-
|
8854
|
+
assert39.strictEqual(currentParser.ptr, p6);
|
8855
8855
|
const start = at2 - currentBufferPtr + currentBufferRef.byteOffset;
|
8856
8856
|
return currentParser.onHeaderField(new FastBuffer(currentBufferRef.buffer, start, len)) || 0;
|
8857
8857
|
}, "wasm_on_header_field"),
|
8858
8858
|
wasm_on_header_value: /* @__PURE__ */ __name((p6, at2, len) => {
|
8859
|
-
|
8859
|
+
assert39.strictEqual(currentParser.ptr, p6);
|
8860
8860
|
const start = at2 - currentBufferPtr + currentBufferRef.byteOffset;
|
8861
8861
|
return currentParser.onHeaderValue(new FastBuffer(currentBufferRef.buffer, start, len)) || 0;
|
8862
8862
|
}, "wasm_on_header_value"),
|
8863
8863
|
wasm_on_headers_complete: /* @__PURE__ */ __name((p6, statusCode, upgrade, shouldKeepAlive) => {
|
8864
|
-
|
8864
|
+
assert39.strictEqual(currentParser.ptr, p6);
|
8865
8865
|
return currentParser.onHeadersComplete(statusCode, Boolean(upgrade), Boolean(shouldKeepAlive)) || 0;
|
8866
8866
|
}, "wasm_on_headers_complete"),
|
8867
8867
|
wasm_on_body: /* @__PURE__ */ __name((p6, at2, len) => {
|
8868
|
-
|
8868
|
+
assert39.strictEqual(currentParser.ptr, p6);
|
8869
8869
|
const start = at2 - currentBufferPtr + currentBufferRef.byteOffset;
|
8870
8870
|
return currentParser.onBody(new FastBuffer(currentBufferRef.buffer, start, len)) || 0;
|
8871
8871
|
}, "wasm_on_body"),
|
8872
8872
|
wasm_on_message_complete: /* @__PURE__ */ __name((p6) => {
|
8873
|
-
|
8873
|
+
assert39.strictEqual(currentParser.ptr, p6);
|
8874
8874
|
return currentParser.onMessageComplete() || 0;
|
8875
8875
|
}, "wasm_on_message_complete")
|
8876
8876
|
/* eslint-enable camelcase */
|
@@ -8893,7 +8893,7 @@ var require_client = __commonJS({
|
|
8893
8893
|
__name(this, "Parser");
|
8894
8894
|
}
|
8895
8895
|
constructor(client, socket, { exports: exports3 }) {
|
8896
|
-
|
8896
|
+
assert39(Number.isFinite(client[kMaxHeadersSize]) && client[kMaxHeadersSize] > 0);
|
8897
8897
|
this.llhttp = exports3;
|
8898
8898
|
this.ptr = this.llhttp.llhttp_alloc(constants4.TYPE.RESPONSE);
|
8899
8899
|
this.client = client;
|
@@ -8939,10 +8939,10 @@ var require_client = __commonJS({
|
|
8939
8939
|
if (this.socket.destroyed || !this.paused) {
|
8940
8940
|
return;
|
8941
8941
|
}
|
8942
|
-
|
8943
|
-
|
8942
|
+
assert39(this.ptr != null);
|
8943
|
+
assert39(currentParser == null);
|
8944
8944
|
this.llhttp.llhttp_resume(this.ptr);
|
8945
|
-
|
8945
|
+
assert39(this.timeoutType === TIMEOUT_BODY);
|
8946
8946
|
if (this.timeout) {
|
8947
8947
|
if (this.timeout.refresh) {
|
8948
8948
|
this.timeout.refresh();
|
@@ -8962,9 +8962,9 @@ var require_client = __commonJS({
|
|
8962
8962
|
}
|
8963
8963
|
}
|
8964
8964
|
execute(data) {
|
8965
|
-
|
8966
|
-
|
8967
|
-
|
8965
|
+
assert39(this.ptr != null);
|
8966
|
+
assert39(currentParser == null);
|
8967
|
+
assert39(!this.paused);
|
8968
8968
|
const { socket, llhttp } = this;
|
8969
8969
|
if (data.length > currentBufferSize) {
|
8970
8970
|
if (currentBufferPtr) {
|
@@ -9006,8 +9006,8 @@ var require_client = __commonJS({
|
|
9006
9006
|
}
|
9007
9007
|
}
|
9008
9008
|
destroy() {
|
9009
|
-
|
9010
|
-
|
9009
|
+
assert39(this.ptr != null);
|
9010
|
+
assert39(currentParser == null);
|
9011
9011
|
this.llhttp.llhttp_free(this.ptr);
|
9012
9012
|
this.ptr = null;
|
9013
9013
|
timers.clearTimeout(this.timeout);
|
@@ -9064,17 +9064,17 @@ var require_client = __commonJS({
|
|
9064
9064
|
}
|
9065
9065
|
onUpgrade(head) {
|
9066
9066
|
const { upgrade, client, socket, headers, statusCode } = this;
|
9067
|
-
|
9067
|
+
assert39(upgrade);
|
9068
9068
|
const request4 = client[kQueue][client[kRunningIdx]];
|
9069
|
-
|
9070
|
-
|
9071
|
-
|
9072
|
-
|
9073
|
-
|
9069
|
+
assert39(request4);
|
9070
|
+
assert39(!socket.destroyed);
|
9071
|
+
assert39(socket === client[kSocket]);
|
9072
|
+
assert39(!this.paused);
|
9073
|
+
assert39(request4.upgrade || request4.method === "CONNECT");
|
9074
9074
|
this.statusCode = null;
|
9075
9075
|
this.statusText = "";
|
9076
9076
|
this.shouldKeepAlive = null;
|
9077
|
-
|
9077
|
+
assert39(this.headers.length % 2 === 0);
|
9078
9078
|
this.headers = [];
|
9079
9079
|
this.headersSize = 0;
|
9080
9080
|
socket.unshift(head);
|
@@ -9102,8 +9102,8 @@ var require_client = __commonJS({
|
|
9102
9102
|
if (!request4) {
|
9103
9103
|
return -1;
|
9104
9104
|
}
|
9105
|
-
|
9106
|
-
|
9105
|
+
assert39(!this.upgrade);
|
9106
|
+
assert39(this.statusCode < 200);
|
9107
9107
|
if (statusCode === 100) {
|
9108
9108
|
util5.destroy(socket, new SocketError("bad response", util5.getSocketInfo(socket)));
|
9109
9109
|
return -1;
|
@@ -9112,7 +9112,7 @@ var require_client = __commonJS({
|
|
9112
9112
|
util5.destroy(socket, new SocketError("bad upgrade", util5.getSocketInfo(socket)));
|
9113
9113
|
return -1;
|
9114
9114
|
}
|
9115
|
-
|
9115
|
+
assert39.strictEqual(this.timeoutType, TIMEOUT_HEADERS);
|
9116
9116
|
this.statusCode = statusCode;
|
9117
9117
|
this.shouldKeepAlive = shouldKeepAlive || // Override llhttp value which does not allow keepAlive for HEAD.
|
9118
9118
|
request4.method === "HEAD" && !socket[kReset2] && this.connection.toLowerCase() === "keep-alive";
|
@@ -9125,16 +9125,16 @@ var require_client = __commonJS({
|
|
9125
9125
|
}
|
9126
9126
|
}
|
9127
9127
|
if (request4.method === "CONNECT") {
|
9128
|
-
|
9128
|
+
assert39(client[kRunning] === 1);
|
9129
9129
|
this.upgrade = true;
|
9130
9130
|
return 2;
|
9131
9131
|
}
|
9132
9132
|
if (upgrade) {
|
9133
|
-
|
9133
|
+
assert39(client[kRunning] === 1);
|
9134
9134
|
this.upgrade = true;
|
9135
9135
|
return 2;
|
9136
9136
|
}
|
9137
|
-
|
9137
|
+
assert39(this.headers.length % 2 === 0);
|
9138
9138
|
this.headers = [];
|
9139
9139
|
this.headersSize = 0;
|
9140
9140
|
if (this.shouldKeepAlive && client[kPipelining]) {
|
@@ -9177,14 +9177,14 @@ var require_client = __commonJS({
|
|
9177
9177
|
return -1;
|
9178
9178
|
}
|
9179
9179
|
const request4 = client[kQueue][client[kRunningIdx]];
|
9180
|
-
|
9181
|
-
|
9180
|
+
assert39(request4);
|
9181
|
+
assert39.strictEqual(this.timeoutType, TIMEOUT_BODY);
|
9182
9182
|
if (this.timeout) {
|
9183
9183
|
if (this.timeout.refresh) {
|
9184
9184
|
this.timeout.refresh();
|
9185
9185
|
}
|
9186
9186
|
}
|
9187
|
-
|
9187
|
+
assert39(statusCode >= 200);
|
9188
9188
|
if (maxResponseSize > -1 && this.bytesRead + buf.length > maxResponseSize) {
|
9189
9189
|
util5.destroy(socket, new ResponseExceededMaxSizeError());
|
9190
9190
|
return -1;
|
@@ -9203,15 +9203,15 @@ var require_client = __commonJS({
|
|
9203
9203
|
return;
|
9204
9204
|
}
|
9205
9205
|
const request4 = client[kQueue][client[kRunningIdx]];
|
9206
|
-
|
9207
|
-
|
9206
|
+
assert39(request4);
|
9207
|
+
assert39(statusCode >= 100);
|
9208
9208
|
this.statusCode = null;
|
9209
9209
|
this.statusText = "";
|
9210
9210
|
this.bytesRead = 0;
|
9211
9211
|
this.contentLength = "";
|
9212
9212
|
this.keepAlive = "";
|
9213
9213
|
this.connection = "";
|
9214
|
-
|
9214
|
+
assert39(this.headers.length % 2 === 0);
|
9215
9215
|
this.headers = [];
|
9216
9216
|
this.headersSize = 0;
|
9217
9217
|
if (statusCode < 200) {
|
@@ -9224,7 +9224,7 @@ var require_client = __commonJS({
|
|
9224
9224
|
request4.onComplete(headers);
|
9225
9225
|
client[kQueue][client[kRunningIdx]++] = null;
|
9226
9226
|
if (socket[kWriting]) {
|
9227
|
-
|
9227
|
+
assert39.strictEqual(client[kRunning], 0);
|
9228
9228
|
util5.destroy(socket, new InformationalError("reset"));
|
9229
9229
|
return constants4.ERROR.PAUSED;
|
9230
9230
|
} else if (!shouldKeepAlive) {
|
@@ -9244,7 +9244,7 @@ var require_client = __commonJS({
|
|
9244
9244
|
const { socket, timeoutType, client } = parser2;
|
9245
9245
|
if (timeoutType === TIMEOUT_HEADERS) {
|
9246
9246
|
if (!socket[kWriting] || socket.writableNeedDrain || client[kRunning] > 1) {
|
9247
|
-
|
9247
|
+
assert39(!parser2.paused, "cannot be paused while waiting for headers");
|
9248
9248
|
util5.destroy(socket, new HeadersTimeoutError());
|
9249
9249
|
}
|
9250
9250
|
} else if (timeoutType === TIMEOUT_BODY) {
|
@@ -9252,7 +9252,7 @@ var require_client = __commonJS({
|
|
9252
9252
|
util5.destroy(socket, new BodyTimeoutError());
|
9253
9253
|
}
|
9254
9254
|
} else if (timeoutType === TIMEOUT_IDLE) {
|
9255
|
-
|
9255
|
+
assert39(client[kRunning] === 0 && client[kKeepAliveTimeoutValue]);
|
9256
9256
|
util5.destroy(socket, new InformationalError("socket idle timeout"));
|
9257
9257
|
}
|
9258
9258
|
}
|
@@ -9266,7 +9266,7 @@ var require_client = __commonJS({
|
|
9266
9266
|
__name(onSocketReadable, "onSocketReadable");
|
9267
9267
|
function onSocketError(err) {
|
9268
9268
|
const { [kClient]: client, [kParser]: parser2 } = this;
|
9269
|
-
|
9269
|
+
assert39(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
|
9270
9270
|
if (client[kHTTPConnVersion] !== "h2") {
|
9271
9271
|
if (err.code === "ECONNRESET" && parser2.statusCode && !parser2.shouldKeepAlive) {
|
9272
9272
|
parser2.onMessageComplete();
|
@@ -9279,13 +9279,13 @@ var require_client = __commonJS({
|
|
9279
9279
|
__name(onSocketError, "onSocketError");
|
9280
9280
|
function onError(client, err) {
|
9281
9281
|
if (client[kRunning] === 0 && err.code !== "UND_ERR_INFO" && err.code !== "UND_ERR_SOCKET") {
|
9282
|
-
|
9282
|
+
assert39(client[kPendingIdx] === client[kRunningIdx]);
|
9283
9283
|
const requests = client[kQueue].splice(client[kRunningIdx]);
|
9284
9284
|
for (let i5 = 0; i5 < requests.length; i5++) {
|
9285
9285
|
const request4 = requests[i5];
|
9286
9286
|
errorRequest(client, request4, err);
|
9287
9287
|
}
|
9288
|
-
|
9288
|
+
assert39(client[kSize] === 0);
|
9289
9289
|
}
|
9290
9290
|
}
|
9291
9291
|
__name(onError, "onError");
|
@@ -9312,7 +9312,7 @@ var require_client = __commonJS({
|
|
9312
9312
|
const err = this[kError] || new SocketError("closed", util5.getSocketInfo(this));
|
9313
9313
|
client[kSocket] = null;
|
9314
9314
|
if (client.destroyed) {
|
9315
|
-
|
9315
|
+
assert39(client[kPending] === 0);
|
9316
9316
|
const requests = client[kQueue].splice(client[kRunningIdx]);
|
9317
9317
|
for (let i5 = 0; i5 < requests.length; i5++) {
|
9318
9318
|
const request4 = requests[i5];
|
@@ -9324,20 +9324,20 @@ var require_client = __commonJS({
|
|
9324
9324
|
errorRequest(client, request4, err);
|
9325
9325
|
}
|
9326
9326
|
client[kPendingIdx] = client[kRunningIdx];
|
9327
|
-
|
9327
|
+
assert39(client[kRunning] === 0);
|
9328
9328
|
client.emit("disconnect", client[kUrl], [client], err);
|
9329
9329
|
resume(client);
|
9330
9330
|
}
|
9331
9331
|
__name(onSocketClose, "onSocketClose");
|
9332
9332
|
async function connect(client) {
|
9333
|
-
|
9334
|
-
|
9333
|
+
assert39(!client[kConnecting]);
|
9334
|
+
assert39(!client[kSocket]);
|
9335
9335
|
let { host, hostname: hostname2, protocol, port } = client[kUrl];
|
9336
9336
|
if (hostname2[0] === "[") {
|
9337
9337
|
const idx = hostname2.indexOf("]");
|
9338
|
-
|
9338
|
+
assert39(idx !== -1);
|
9339
9339
|
const ip = hostname2.substring(1, idx);
|
9340
|
-
|
9340
|
+
assert39(net2.isIP(ip));
|
9341
9341
|
hostname2 = ip;
|
9342
9342
|
}
|
9343
9343
|
client[kConnecting] = true;
|
@@ -9377,7 +9377,7 @@ var require_client = __commonJS({
|
|
9377
9377
|
return;
|
9378
9378
|
}
|
9379
9379
|
client[kConnecting] = false;
|
9380
|
-
|
9380
|
+
assert39(socket);
|
9381
9381
|
const isH22 = socket.alpnProtocol === "h2";
|
9382
9382
|
if (isH22) {
|
9383
9383
|
if (!h2ExperimentalWarned) {
|
@@ -9453,7 +9453,7 @@ var require_client = __commonJS({
|
|
9453
9453
|
});
|
9454
9454
|
}
|
9455
9455
|
if (err.code === "ERR_TLS_CERT_ALTNAME_INVALID") {
|
9456
|
-
|
9456
|
+
assert39(client[kRunning] === 0);
|
9457
9457
|
while (client[kPending] > 0 && client[kQueue][client[kPendingIdx]].servername === client[kServerName]) {
|
9458
9458
|
const request4 = client[kQueue][client[kPendingIdx]++];
|
9459
9459
|
errorRequest(client, request4, err);
|
@@ -9488,7 +9488,7 @@ var require_client = __commonJS({
|
|
9488
9488
|
function _resume(client, sync) {
|
9489
9489
|
while (true) {
|
9490
9490
|
if (client.destroyed) {
|
9491
|
-
|
9491
|
+
assert39(client[kPending] === 0);
|
9492
9492
|
return;
|
9493
9493
|
}
|
9494
9494
|
if (client[kClosedResolve] && !client[kSize]) {
|
@@ -9662,13 +9662,13 @@ upgrade: ${upgrade}\r
|
|
9662
9662
|
\r
|
9663
9663
|
`, "latin1");
|
9664
9664
|
} else {
|
9665
|
-
|
9665
|
+
assert39(contentLength === null, "no body must not have content length");
|
9666
9666
|
socket.write(`${header}\r
|
9667
9667
|
`, "latin1");
|
9668
9668
|
}
|
9669
9669
|
request4.onRequestSent();
|
9670
9670
|
} else if (util5.isBuffer(body)) {
|
9671
|
-
|
9671
|
+
assert39(contentLength === body.byteLength, "buffer body must have content length");
|
9672
9672
|
socket.cork();
|
9673
9673
|
socket.write(`${header}content-length: ${contentLength}\r
|
9674
9674
|
\r
|
@@ -9691,7 +9691,7 @@ upgrade: ${upgrade}\r
|
|
9691
9691
|
} else if (util5.isIterable(body)) {
|
9692
9692
|
writeIterable({ body, client, request: request4, socket, contentLength, header, expectsPayload });
|
9693
9693
|
} else {
|
9694
|
-
|
9694
|
+
assert39(false);
|
9695
9695
|
}
|
9696
9696
|
return true;
|
9697
9697
|
}
|
@@ -9761,7 +9761,7 @@ upgrade: ${upgrade}\r
|
|
9761
9761
|
process.emitWarning(new RequestContentLengthMismatchError());
|
9762
9762
|
}
|
9763
9763
|
if (contentLength != null) {
|
9764
|
-
|
9764
|
+
assert39(body, "no body must not have content length");
|
9765
9765
|
headers[HTTP2_HEADER_CONTENT_LENGTH] = `${contentLength}`;
|
9766
9766
|
}
|
9767
9767
|
session.ref();
|
@@ -9817,7 +9817,7 @@ upgrade: ${upgrade}\r
|
|
9817
9817
|
if (!body) {
|
9818
9818
|
request4.onRequestSent();
|
9819
9819
|
} else if (util5.isBuffer(body)) {
|
9820
|
-
|
9820
|
+
assert39(contentLength === body.byteLength, "buffer body must have content length");
|
9821
9821
|
stream2.cork();
|
9822
9822
|
stream2.write(body);
|
9823
9823
|
stream2.uncork();
|
@@ -9871,14 +9871,14 @@ upgrade: ${upgrade}\r
|
|
9871
9871
|
socket: client[kSocket]
|
9872
9872
|
});
|
9873
9873
|
} else {
|
9874
|
-
|
9874
|
+
assert39(false);
|
9875
9875
|
}
|
9876
9876
|
}
|
9877
9877
|
__name(writeBodyH2, "writeBodyH2");
|
9878
9878
|
}
|
9879
9879
|
__name(writeH2, "writeH2");
|
9880
9880
|
function writeStream({ h2stream, body, client, request: request4, socket, contentLength, header, expectsPayload }) {
|
9881
|
-
|
9881
|
+
assert39(contentLength !== 0 || client[kRunning] === 0, "stream body cannot be pipelined");
|
9882
9882
|
if (client[kHTTPConnVersion] === "h2") {
|
9883
9883
|
let onPipeData = function(chunk) {
|
9884
9884
|
request4.onBodySent(chunk);
|
@@ -9937,7 +9937,7 @@ upgrade: ${upgrade}\r
|
|
9937
9937
|
return;
|
9938
9938
|
}
|
9939
9939
|
finished = true;
|
9940
|
-
|
9940
|
+
assert39(socket.destroyed || socket[kWriting] && client[kRunning] <= 1);
|
9941
9941
|
socket.off("drain", onDrain).off("error", onFinished);
|
9942
9942
|
body.removeListener("data", onData).removeListener("end", onFinished).removeListener("error", onFinished).removeListener("close", onAbort);
|
9943
9943
|
if (!err) {
|
@@ -9962,7 +9962,7 @@ upgrade: ${upgrade}\r
|
|
9962
9962
|
}
|
9963
9963
|
__name(writeStream, "writeStream");
|
9964
9964
|
async function writeBlob({ h2stream, body, client, request: request4, socket, contentLength, header, expectsPayload }) {
|
9965
|
-
|
9965
|
+
assert39(contentLength === body.size, "blob body must have content length");
|
9966
9966
|
const isH22 = client[kHTTPConnVersion] === "h2";
|
9967
9967
|
try {
|
9968
9968
|
if (contentLength != null && contentLength !== body.size) {
|
@@ -9993,7 +9993,7 @@ upgrade: ${upgrade}\r
|
|
9993
9993
|
}
|
9994
9994
|
__name(writeBlob, "writeBlob");
|
9995
9995
|
async function writeIterable({ h2stream, body, client, request: request4, socket, contentLength, header, expectsPayload }) {
|
9996
|
-
|
9996
|
+
assert39(contentLength !== 0 || client[kRunning] === 0, "iterator body cannot be pipelined");
|
9997
9997
|
let callback = null;
|
9998
9998
|
function onDrain() {
|
9999
9999
|
if (callback) {
|
@@ -10004,7 +10004,7 @@ upgrade: ${upgrade}\r
|
|
10004
10004
|
}
|
10005
10005
|
__name(onDrain, "onDrain");
|
10006
10006
|
const waitForDrain = /* @__PURE__ */ __name(() => new Promise((resolve24, reject) => {
|
10007
|
-
|
10007
|
+
assert39(callback === null);
|
10008
10008
|
if (socket[kError]) {
|
10009
10009
|
reject(socket[kError]);
|
10010
10010
|
} else {
|
@@ -10156,7 +10156,7 @@ ${len.toString(16)}\r
|
|
10156
10156
|
const { socket, client } = this;
|
10157
10157
|
socket[kWriting] = false;
|
10158
10158
|
if (err) {
|
10159
|
-
|
10159
|
+
assert39(client[kRunning] <= 1, "pipeline should only contain this request");
|
10160
10160
|
util5.destroy(socket, err);
|
10161
10161
|
}
|
10162
10162
|
}
|
@@ -10164,7 +10164,7 @@ ${len.toString(16)}\r
|
|
10164
10164
|
function errorRequest(client, request4, err) {
|
10165
10165
|
try {
|
10166
10166
|
request4.onError(err);
|
10167
|
-
|
10167
|
+
assert39(request4.aborted);
|
10168
10168
|
} catch (err2) {
|
10169
10169
|
client.emit("error", err2);
|
10170
10170
|
}
|
@@ -10838,7 +10838,7 @@ var require_readable = __commonJS({
|
|
10838
10838
|
"../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/api/readable.js"(exports2, module3) {
|
10839
10839
|
"use strict";
|
10840
10840
|
init_import_meta_url();
|
10841
|
-
var
|
10841
|
+
var assert39 = require("assert");
|
10842
10842
|
var { Readable: Readable8 } = require("stream");
|
10843
10843
|
var { RequestAbortedError, NotSupportedError, InvalidArgumentError } = require_errors();
|
10844
10844
|
var util5 = require_util();
|
@@ -10950,7 +10950,7 @@ var require_readable = __commonJS({
|
|
10950
10950
|
this[kBody] = ReadableStreamFrom(this);
|
10951
10951
|
if (this[kConsume]) {
|
10952
10952
|
this[kBody].getReader();
|
10953
|
-
|
10953
|
+
assert39(this[kBody].locked);
|
10954
10954
|
}
|
10955
10955
|
}
|
10956
10956
|
return this[kBody];
|
@@ -11003,7 +11003,7 @@ var require_readable = __commonJS({
|
|
11003
11003
|
if (isUnusable(stream2)) {
|
11004
11004
|
throw new TypeError("unusable");
|
11005
11005
|
}
|
11006
|
-
|
11006
|
+
assert39(!stream2[kConsume]);
|
11007
11007
|
return new Promise((resolve24, reject) => {
|
11008
11008
|
stream2[kConsume] = {
|
11009
11009
|
type,
|
@@ -11100,13 +11100,13 @@ var require_readable = __commonJS({
|
|
11100
11100
|
var require_util3 = __commonJS({
|
11101
11101
|
"../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/api/util.js"(exports2, module3) {
|
11102
11102
|
init_import_meta_url();
|
11103
|
-
var
|
11103
|
+
var assert39 = require("assert");
|
11104
11104
|
var {
|
11105
11105
|
ResponseStatusCodeError
|
11106
11106
|
} = require_errors();
|
11107
11107
|
var { toUSVString } = require_util();
|
11108
11108
|
async function getResolveErrorBodyCallback({ callback, body, contentType, statusCode, statusMessage, headers }) {
|
11109
|
-
|
11109
|
+
assert39(body);
|
11110
11110
|
let chunks = [];
|
11111
11111
|
let limit = 0;
|
11112
11112
|
for await (const chunk of body) {
|
@@ -11550,7 +11550,7 @@ var require_api_pipeline = __commonJS({
|
|
11550
11550
|
var util5 = require_util();
|
11551
11551
|
var { AsyncResource } = require("async_hooks");
|
11552
11552
|
var { addSignal, removeSignal } = require_abort_signal();
|
11553
|
-
var
|
11553
|
+
var assert39 = require("assert");
|
11554
11554
|
var kResume = Symbol("resume");
|
11555
11555
|
var PipelineRequest = class extends Readable8 {
|
11556
11556
|
static {
|
@@ -11659,7 +11659,7 @@ var require_api_pipeline = __commonJS({
|
|
11659
11659
|
}
|
11660
11660
|
onConnect(abort, context2) {
|
11661
11661
|
const { ret, res } = this;
|
11662
|
-
|
11662
|
+
assert39(!res, "pipeline cannot be retried");
|
11663
11663
|
if (ret.destroyed) {
|
11664
11664
|
throw new RequestAbortedError();
|
11665
11665
|
}
|
@@ -11750,7 +11750,7 @@ var require_api_upgrade = __commonJS({
|
|
11750
11750
|
var { AsyncResource } = require("async_hooks");
|
11751
11751
|
var util5 = require_util();
|
11752
11752
|
var { addSignal, removeSignal } = require_abort_signal();
|
11753
|
-
var
|
11753
|
+
var assert39 = require("assert");
|
11754
11754
|
var UpgradeHandler = class extends AsyncResource {
|
11755
11755
|
static {
|
11756
11756
|
__name(this, "UpgradeHandler");
|
@@ -11786,7 +11786,7 @@ var require_api_upgrade = __commonJS({
|
|
11786
11786
|
}
|
11787
11787
|
onUpgrade(statusCode, rawHeaders, socket) {
|
11788
11788
|
const { callback, opaque, context: context2 } = this;
|
11789
|
-
|
11789
|
+
assert39.strictEqual(statusCode, 101);
|
11790
11790
|
removeSignal(this);
|
11791
11791
|
this.callback = null;
|
11792
11792
|
const headers = this.responseHeaders === "raw" ? util5.parseRawHeaders(rawHeaders) : util5.parseHeaders(rawHeaders);
|
@@ -12967,7 +12967,7 @@ var require_proxy_agent = __commonJS({
|
|
12967
12967
|
var require_RetryHandler = __commonJS({
|
12968
12968
|
"../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/handler/RetryHandler.js"(exports2, module3) {
|
12969
12969
|
init_import_meta_url();
|
12970
|
-
var
|
12970
|
+
var assert39 = require("assert");
|
12971
12971
|
var { kRetryHandlerDefaultRetry } = require_symbols();
|
12972
12972
|
var { RequestRetryError } = require_errors();
|
12973
12973
|
var { isDisturbed, parseHeaders: parseHeaders2, parseRangeHeader } = require_util();
|
@@ -13136,8 +13136,8 @@ var require_RetryHandler = __commonJS({
|
|
13136
13136
|
return false;
|
13137
13137
|
}
|
13138
13138
|
const { start, size, end = size } = contentRange;
|
13139
|
-
|
13140
|
-
|
13139
|
+
assert39(this.start === start, "content-range mismatch");
|
13140
|
+
assert39(this.end == null || this.end === end, "content-range mismatch");
|
13141
13141
|
this.resume = resume;
|
13142
13142
|
return true;
|
13143
13143
|
}
|
@@ -13153,12 +13153,12 @@ var require_RetryHandler = __commonJS({
|
|
13153
13153
|
);
|
13154
13154
|
}
|
13155
13155
|
const { start, size, end = size } = range;
|
13156
|
-
|
13156
|
+
assert39(
|
13157
13157
|
start != null && Number.isFinite(start) && this.start !== start,
|
13158
13158
|
"content-range mismatch"
|
13159
13159
|
);
|
13160
|
-
|
13161
|
-
|
13160
|
+
assert39(Number.isFinite(start));
|
13161
|
+
assert39(
|
13162
13162
|
end != null && Number.isFinite(end) && this.end !== end,
|
13163
13163
|
"invalid content-length"
|
13164
13164
|
);
|
@@ -13169,8 +13169,8 @@ var require_RetryHandler = __commonJS({
|
|
13169
13169
|
const contentLength = headers["content-length"];
|
13170
13170
|
this.end = contentLength != null ? Number(contentLength) : null;
|
13171
13171
|
}
|
13172
|
-
|
13173
|
-
|
13172
|
+
assert39(Number.isFinite(this.start));
|
13173
|
+
assert39(
|
13174
13174
|
this.end == null || Number.isFinite(this.end),
|
13175
13175
|
"invalid content-length"
|
13176
13176
|
);
|
@@ -13321,7 +13321,7 @@ var require_headers = __commonJS({
|
|
13321
13321
|
isValidHeaderValue
|
13322
13322
|
} = require_util2();
|
13323
13323
|
var { webidl } = require_webidl();
|
13324
|
-
var
|
13324
|
+
var assert39 = require("assert");
|
13325
13325
|
var kHeadersMap = Symbol("headers map");
|
13326
13326
|
var kHeadersSortedMap = Symbol("headers map sorted");
|
13327
13327
|
function isHTTPWhiteSpaceCharCode(code) {
|
@@ -13589,7 +13589,7 @@ var require_headers = __commonJS({
|
|
13589
13589
|
headers.push([name2, cookies[j6]]);
|
13590
13590
|
}
|
13591
13591
|
} else {
|
13592
|
-
|
13592
|
+
assert39(value !== null);
|
13593
13593
|
headers.push([name2, value]);
|
13594
13594
|
}
|
13595
13595
|
}
|
@@ -13733,7 +13733,7 @@ var require_response = __commonJS({
|
|
13733
13733
|
var { getGlobalOrigin } = require_global();
|
13734
13734
|
var { URLSerializer } = require_dataURL();
|
13735
13735
|
var { kHeadersList, kConstruct } = require_symbols();
|
13736
|
-
var
|
13736
|
+
var assert39 = require("assert");
|
13737
13737
|
var { types } = require("util");
|
13738
13738
|
var ReadableStream3 = globalThis.ReadableStream || require("stream/web").ReadableStream;
|
13739
13739
|
var textEncoder = new TextEncoder("utf-8");
|
@@ -13955,7 +13955,7 @@ var require_response = __commonJS({
|
|
13955
13955
|
return p6 in state2 ? state2[p6] : target[p6];
|
13956
13956
|
},
|
13957
13957
|
set(target, p6, value) {
|
13958
|
-
|
13958
|
+
assert39(!(p6 in state2));
|
13959
13959
|
target[p6] = value;
|
13960
13960
|
return true;
|
13961
13961
|
}
|
@@ -13990,12 +13990,12 @@ var require_response = __commonJS({
|
|
13990
13990
|
body: null
|
13991
13991
|
});
|
13992
13992
|
} else {
|
13993
|
-
|
13993
|
+
assert39(false);
|
13994
13994
|
}
|
13995
13995
|
}
|
13996
13996
|
__name(filterResponse, "filterResponse");
|
13997
13997
|
function makeAppropriateNetworkError(fetchParams, err = null) {
|
13998
|
-
|
13998
|
+
assert39(isCancelled(fetchParams));
|
13999
13999
|
return isAborted2(fetchParams) ? makeNetworkError(Object.assign(new DOMException2("The operation was aborted.", "AbortError"), { cause: err })) : makeNetworkError(Object.assign(new DOMException2("Request was cancelled."), { cause: err }));
|
14000
14000
|
}
|
14001
14001
|
__name(makeAppropriateNetworkError, "makeAppropriateNetworkError");
|
@@ -14126,7 +14126,7 @@ var require_request2 = __commonJS({
|
|
14126
14126
|
var { getGlobalOrigin } = require_global();
|
14127
14127
|
var { URLSerializer } = require_dataURL();
|
14128
14128
|
var { kHeadersList, kConstruct } = require_symbols();
|
14129
|
-
var
|
14129
|
+
var assert39 = require("assert");
|
14130
14130
|
var { getMaxListeners, setMaxListeners, getEventListeners, defaultMaxListeners } = require("events");
|
14131
14131
|
var TransformStream3 = globalThis.TransformStream;
|
14132
14132
|
var kAbortController = Symbol("abortController");
|
@@ -14173,7 +14173,7 @@ var require_request2 = __commonJS({
|
|
14173
14173
|
request4 = makeRequest({ urlList: [parsedURL] });
|
14174
14174
|
fallbackMode = "cors";
|
14175
14175
|
} else {
|
14176
|
-
|
14176
|
+
assert39(input instanceof _Request);
|
14177
14177
|
request4 = input[kState];
|
14178
14178
|
signal = input[kSignal];
|
14179
14179
|
}
|
@@ -14785,7 +14785,7 @@ var require_fetch = __commonJS({
|
|
14785
14785
|
urlHasHttpsScheme
|
14786
14786
|
} = require_util2();
|
14787
14787
|
var { kState, kHeaders, kGuard, kRealm } = require_symbols2();
|
14788
|
-
var
|
14788
|
+
var assert39 = require("assert");
|
14789
14789
|
var { safelyExtractBody } = require_body();
|
14790
14790
|
var {
|
14791
14791
|
redirectStatusSet,
|
@@ -14868,7 +14868,7 @@ var require_fetch = __commonJS({
|
|
14868
14868
|
requestObject.signal,
|
14869
14869
|
() => {
|
14870
14870
|
locallyAborted = true;
|
14871
|
-
|
14871
|
+
assert39(controller != null);
|
14872
14872
|
controller.abort(requestObject.signal.reason);
|
14873
14873
|
abortFetch(p6, request4, responseObject, requestObject.signal.reason);
|
14874
14874
|
}
|
@@ -15005,7 +15005,7 @@ var require_fetch = __commonJS({
|
|
15005
15005
|
taskDestination,
|
15006
15006
|
crossOriginIsolatedCapability
|
15007
15007
|
};
|
15008
|
-
|
15008
|
+
assert39(!request4.body || request4.body.stream);
|
15009
15009
|
if (request4.window === "client") {
|
15010
15010
|
request4.window = request4.client?.globalObject?.constructor?.name === "Window" ? request4.client : "no-window";
|
15011
15011
|
}
|
@@ -15099,7 +15099,7 @@ var require_fetch = __commonJS({
|
|
15099
15099
|
} else if (request4.responseTainting === "opaque") {
|
15100
15100
|
response = filterResponse(response, "opaque");
|
15101
15101
|
} else {
|
15102
|
-
|
15102
|
+
assert39(false);
|
15103
15103
|
}
|
15104
15104
|
}
|
15105
15105
|
let internalResponse = response.status === 0 ? response : response.internalResponse;
|
@@ -15295,7 +15295,7 @@ var require_fetch = __commonJS({
|
|
15295
15295
|
} else if (request4.redirect === "follow") {
|
15296
15296
|
response = await httpRedirectFetch(fetchParams, response);
|
15297
15297
|
} else {
|
15298
|
-
|
15298
|
+
assert39(false);
|
15299
15299
|
}
|
15300
15300
|
}
|
15301
15301
|
response.timingInfo = timingInfo;
|
@@ -15349,7 +15349,7 @@ var require_fetch = __commonJS({
|
|
15349
15349
|
request4.headersList.delete("host");
|
15350
15350
|
}
|
15351
15351
|
if (request4.body != null) {
|
15352
|
-
|
15352
|
+
assert39(request4.body.source != null);
|
15353
15353
|
request4.body = safelyExtractBody(request4.body.source)[0];
|
15354
15354
|
}
|
15355
15355
|
const timingInfo = fetchParams.timingInfo;
|
@@ -15484,7 +15484,7 @@ var require_fetch = __commonJS({
|
|
15484
15484
|
}
|
15485
15485
|
__name(httpNetworkOrCacheFetch, "httpNetworkOrCacheFetch");
|
15486
15486
|
async function httpNetworkFetch(fetchParams, includeCredentials = false, forceNewConnection = false) {
|
15487
|
-
|
15487
|
+
assert39(!fetchParams.controller.connection || fetchParams.controller.connection.destroyed);
|
15488
15488
|
fetchParams.controller.connection = {
|
15489
15489
|
abort: null,
|
15490
15490
|
destroyed: false,
|
@@ -16642,7 +16642,7 @@ var require_util5 = __commonJS({
|
|
16642
16642
|
"../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/cache/util.js"(exports2, module3) {
|
16643
16643
|
"use strict";
|
16644
16644
|
init_import_meta_url();
|
16645
|
-
var
|
16645
|
+
var assert39 = require("assert");
|
16646
16646
|
var { URLSerializer } = require_dataURL();
|
16647
16647
|
var { isValidHeaderName } = require_util2();
|
16648
16648
|
function urlEquals(A3, B3, excludeFragment = false) {
|
@@ -16652,7 +16652,7 @@ var require_util5 = __commonJS({
|
|
16652
16652
|
}
|
16653
16653
|
__name(urlEquals, "urlEquals");
|
16654
16654
|
function fieldValues(header) {
|
16655
|
-
|
16655
|
+
assert39(header !== null);
|
16656
16656
|
const values = [];
|
16657
16657
|
for (let value of header.split(",")) {
|
16658
16658
|
value = value.trim();
|
@@ -16688,7 +16688,7 @@ var require_cache = __commonJS({
|
|
16688
16688
|
var { kState, kHeaders, kGuard, kRealm } = require_symbols2();
|
16689
16689
|
var { fetching } = require_fetch();
|
16690
16690
|
var { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require_util2();
|
16691
|
-
var
|
16691
|
+
var assert39 = require("assert");
|
16692
16692
|
var { getGlobalDispatcher: getGlobalDispatcher2 } = require_global2();
|
16693
16693
|
var Cache2 = class _Cache {
|
16694
16694
|
static {
|
@@ -16952,7 +16952,7 @@ var require_cache = __commonJS({
|
|
16952
16952
|
return false;
|
16953
16953
|
}
|
16954
16954
|
} else {
|
16955
|
-
|
16955
|
+
assert39(typeof request4 === "string");
|
16956
16956
|
r7 = new Request4(request4)[kState];
|
16957
16957
|
}
|
16958
16958
|
const operations = [];
|
@@ -17061,7 +17061,7 @@ var require_cache = __commonJS({
|
|
17061
17061
|
}
|
17062
17062
|
for (const requestResponse of requestResponses) {
|
17063
17063
|
const idx = cache6.indexOf(requestResponse);
|
17064
|
-
|
17064
|
+
assert39(idx !== -1);
|
17065
17065
|
cache6.splice(idx, 1);
|
17066
17066
|
}
|
17067
17067
|
} else if (operation.type === "put") {
|
@@ -17093,7 +17093,7 @@ var require_cache = __commonJS({
|
|
17093
17093
|
requestResponses = this.#queryCache(operation.request);
|
17094
17094
|
for (const requestResponse of requestResponses) {
|
17095
17095
|
const idx = cache6.indexOf(requestResponse);
|
17096
|
-
|
17096
|
+
assert39(idx !== -1);
|
17097
17097
|
cache6.splice(idx, 1);
|
17098
17098
|
}
|
17099
17099
|
cache6.push([operation.request, operation.response]);
|
@@ -17338,7 +17338,7 @@ var require_util6 = __commonJS({
|
|
17338
17338
|
"../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/cookies/util.js"(exports2, module3) {
|
17339
17339
|
"use strict";
|
17340
17340
|
init_import_meta_url();
|
17341
|
-
var
|
17341
|
+
var assert39 = require("assert");
|
17342
17342
|
var { kHeadersList } = require_symbols();
|
17343
17343
|
function isCTLExcludingHtab(value) {
|
17344
17344
|
if (value.length === 0) {
|
@@ -17487,10 +17487,10 @@ var require_util6 = __commonJS({
|
|
17487
17487
|
kHeadersListNode = Object.getOwnPropertySymbols(headers).find(
|
17488
17488
|
(symbol) => symbol.description === "headers list"
|
17489
17489
|
);
|
17490
|
-
|
17490
|
+
assert39(kHeadersListNode, "Headers cannot be parsed");
|
17491
17491
|
}
|
17492
17492
|
const headersList = headers[kHeadersListNode];
|
17493
|
-
|
17493
|
+
assert39(headersList);
|
17494
17494
|
return headersList;
|
17495
17495
|
}
|
17496
17496
|
__name(getHeadersList, "getHeadersList");
|
@@ -17510,7 +17510,7 @@ var require_parse = __commonJS({
|
|
17510
17510
|
var { maxNameValuePairSize, maxAttributeValueSize } = require_constants4();
|
17511
17511
|
var { isCTLExcludingHtab } = require_util6();
|
17512
17512
|
var { collectASequenceOfCodePointsFast } = require_dataURL();
|
17513
|
-
var
|
17513
|
+
var assert39 = require("assert");
|
17514
17514
|
function parseSetCookie(header) {
|
17515
17515
|
if (isCTLExcludingHtab(header)) {
|
17516
17516
|
return null;
|
@@ -17553,7 +17553,7 @@ var require_parse = __commonJS({
|
|
17553
17553
|
if (unparsedAttributes.length === 0) {
|
17554
17554
|
return cookieAttributeList;
|
17555
17555
|
}
|
17556
|
-
|
17556
|
+
assert39(unparsedAttributes[0] === ";");
|
17557
17557
|
unparsedAttributes = unparsedAttributes.slice(1);
|
17558
17558
|
let cookieAv = "";
|
17559
17559
|
if (unparsedAttributes.includes(";")) {
|
@@ -28596,7 +28596,7 @@ function getComplianceRegionSubdomain(complianceConfig) {
|
|
28596
28596
|
function getStagingSubdomain() {
|
28597
28597
|
return getCloudflareApiEnvironmentFromEnv() === "staging" ? ".staging" : "";
|
28598
28598
|
}
|
28599
|
-
var import_node_path2, getC3CommandFromEnv, getWranglerSendMetricsFromEnv, getCloudflareApiEnvironmentFromEnv, COMPLIANCE_REGION_CONFIG_PUBLIC, COMPLIANCE_REGION_CONFIG_UNKNOWN, getCloudflareComplianceRegionFromEnv, getCloudflareComplianceRegion, getCloudflareApiBaseUrlFromEnv, getCloudflareApiBaseUrl, getSanitizeLogs, getOutputFileDirectoryFromEnv, getOutputFilePathFromEnv, getCIMatchTag, getCIOverrideName, getCIOverrideNetworkModeHost, getCIGeneratePreviewAlias, getBuildConditionsFromEnv, getBuildPlatformFromEnv, getRegistryPath, getDockerPath, getDockerHost;
|
28599
|
+
var import_node_path2, getC3CommandFromEnv, getWranglerSendMetricsFromEnv, getCloudflareApiEnvironmentFromEnv, COMPLIANCE_REGION_CONFIG_PUBLIC, COMPLIANCE_REGION_CONFIG_UNKNOWN, getCloudflareComplianceRegionFromEnv, getCloudflareComplianceRegion, getCloudflareApiBaseUrlFromEnv, getCloudflareApiBaseUrl, getSanitizeLogs, getOutputFileDirectoryFromEnv, getOutputFilePathFromEnv, getCIMatchTag, getCIOverrideName, getCIOverrideNetworkModeHost, getCIGeneratePreviewAlias, getWorkersCIBranchName, getBuildConditionsFromEnv, getBuildPlatformFromEnv, getRegistryPath, getDockerPath, getDockerHost;
|
28600
28600
|
var init_misc_variables = __esm({
|
28601
28601
|
"src/environment-variables/misc-variables.ts"() {
|
28602
28602
|
init_import_meta_url();
|
@@ -28673,6 +28673,9 @@ var init_misc_variables = __esm({
|
|
28673
28673
|
defaultValue: /* @__PURE__ */ __name(() => "false", "defaultValue"),
|
28674
28674
|
choices: ["true", "false"]
|
28675
28675
|
});
|
28676
|
+
getWorkersCIBranchName = getEnvironmentVariableFactory({
|
28677
|
+
variableName: "WORKERS_CI_BRANCH"
|
28678
|
+
});
|
28676
28679
|
getBuildConditionsFromEnv = getEnvironmentVariableFactory({
|
28677
28680
|
variableName: "WRANGLER_BUILD_CONDITIONS"
|
28678
28681
|
});
|
@@ -28752,7 +28755,7 @@ var require_signal_exit = __commonJS({
|
|
28752
28755
|
};
|
28753
28756
|
};
|
28754
28757
|
} else {
|
28755
|
-
|
28758
|
+
assert39 = require("assert");
|
28756
28759
|
signals = require_signals();
|
28757
28760
|
isWin = /^win/i.test(process11.platform);
|
28758
28761
|
EE = require("events");
|
@@ -28775,7 +28778,7 @@ var require_signal_exit = __commonJS({
|
|
28775
28778
|
return function() {
|
28776
28779
|
};
|
28777
28780
|
}
|
28778
|
-
|
28781
|
+
assert39.equal(typeof cb2, "function", "a callback must be provided for exit handler");
|
28779
28782
|
if (loaded === false) {
|
28780
28783
|
load();
|
28781
28784
|
}
|
@@ -28881,7 +28884,7 @@ var require_signal_exit = __commonJS({
|
|
28881
28884
|
}
|
28882
28885
|
}, "processEmit");
|
28883
28886
|
}
|
28884
|
-
var
|
28887
|
+
var assert39;
|
28885
28888
|
var signals;
|
28886
28889
|
var isWin;
|
28887
28890
|
var EE;
|
@@ -29486,7 +29489,7 @@ var name, version;
|
|
29486
29489
|
var init_package = __esm({
|
29487
29490
|
"package.json"() {
|
29488
29491
|
name = "wrangler";
|
29489
|
-
version = "4.
|
29492
|
+
version = "4.23.0";
|
29490
29493
|
}
|
29491
29494
|
});
|
29492
29495
|
|
@@ -62914,7 +62917,7 @@ async function handleDeleteImageCommand(args, _config) {
|
|
62914
62917
|
`Failed to delete image ${args.image}: ${gcResponse.status} ${gcResponse.statusText}`
|
62915
62918
|
);
|
62916
62919
|
}
|
62917
|
-
|
62920
|
+
logger.log(`Deleted tag: ${args.image}`);
|
62918
62921
|
}),
|
62919
62922
|
{ message: "Deleting", json: args.json }
|
62920
62923
|
);
|
@@ -62922,21 +62925,24 @@ async function handleDeleteImageCommand(args, _config) {
|
|
62922
62925
|
logger.log(`Error when removing image: ${error2}`);
|
62923
62926
|
}
|
62924
62927
|
}
|
62925
|
-
async function handleListImagesCommand(args,
|
62928
|
+
async function handleListImagesCommand(args, config) {
|
62926
62929
|
try {
|
62927
62930
|
return await promiseSpinner(
|
62928
62931
|
getCreds().then(async (creds) => {
|
62929
62932
|
const repos = await listRepos(creds);
|
62930
|
-
const
|
62933
|
+
const responses = [];
|
62934
|
+
const accountId = config.account_id || await getAccountId(config);
|
62935
|
+
const accountIdPrefix = new RegExp(`^${accountId}/`);
|
62936
|
+
const filter = new RegExp(args.filter ?? "");
|
62931
62937
|
for (const repo of repos) {
|
62932
62938
|
const stripped = repo.replace(/^\/+/, "");
|
62933
|
-
|
62934
|
-
|
62935
|
-
const
|
62936
|
-
|
62939
|
+
if (filter.test(stripped)) {
|
62940
|
+
const tags = await listTags(stripped, creds);
|
62941
|
+
const name2 = stripped.replace(accountIdPrefix, "");
|
62942
|
+
responses.push({ name: name2, tags });
|
62937
62943
|
}
|
62938
62944
|
}
|
62939
|
-
await ListTags(
|
62945
|
+
await ListTags(responses, false, args.json);
|
62940
62946
|
}),
|
62941
62947
|
{ message: "Listing", json: args.json }
|
62942
62948
|
);
|
@@ -62959,13 +62965,16 @@ async function ListTags(responses, digests = false, json = false) {
|
|
62959
62965
|
if (json) {
|
62960
62966
|
logger.log(JSON.stringify(responses, null, 2));
|
62961
62967
|
} else {
|
62962
|
-
const rows = responses.map((
|
62963
|
-
|
62964
|
-
|
62965
|
-
|
62966
|
-
|
62967
|
-
}
|
62968
|
-
logger.
|
62968
|
+
const rows = responses.flatMap((r7) => r7.tags.map((t7) => [r7.name, t7]));
|
62969
|
+
const headers = ["REPOSITORY", "TAG"];
|
62970
|
+
const widths = new Array(headers.length).fill(0);
|
62971
|
+
for (let i5 = 0; i5 < widths.length - 1; i5++) {
|
62972
|
+
widths[i5] = rows.map((r7) => r7[i5].length).reduce((a5, b6) => Math.max(a5, b6), headers[i5].length);
|
62973
|
+
}
|
62974
|
+
logger.log(headers.map((h6, i5) => h6.padEnd(widths[i5], " ")).join(" "));
|
62975
|
+
for (const row of rows) {
|
62976
|
+
logger.log(row.map((v7, i5) => v7.padEnd(widths[i5], " ")).join(" "));
|
62977
|
+
}
|
62969
62978
|
}
|
62970
62979
|
}
|
62971
62980
|
async function listTags(repo, creds) {
|
@@ -63049,6 +63058,7 @@ var init_list = __esm({
|
|
63049
63058
|
init_import_meta_url();
|
63050
63059
|
init_containers_shared();
|
63051
63060
|
init_logger();
|
63061
|
+
init_user2();
|
63052
63062
|
init_common();
|
63053
63063
|
imagesCommand = /* @__PURE__ */ __name((yargs, scope) => {
|
63054
63064
|
return yargs.command(
|
@@ -63802,18 +63812,26 @@ function observabilityToConfiguration(observability, existingObservabilityConfig
|
|
63802
63812
|
}
|
63803
63813
|
}
|
63804
63814
|
}
|
63815
|
+
function containerAppToInstanceType(containerApp) {
|
63816
|
+
if (containerApp.instance_type !== void 0) {
|
63817
|
+
return containerApp.instance_type;
|
63818
|
+
}
|
63819
|
+
const configuration = containerApp.configuration;
|
63820
|
+
if (configuration.disk === void 0 && configuration.vcpu === void 0 && configuration.memory === void 0 && configuration.memory_mib === void 0) {
|
63821
|
+
return "dev" /* DEV */;
|
63822
|
+
}
|
63823
|
+
}
|
63805
63824
|
function containerAppToCreateApplication(containerApp, observability, existingApp, skipDefaults = false) {
|
63806
63825
|
const observabilityConfiguration = observabilityToConfiguration(
|
63807
63826
|
observability,
|
63808
63827
|
existingApp?.configuration.observability
|
63809
63828
|
);
|
63829
|
+
const instanceType = containerAppToInstanceType(containerApp);
|
63810
63830
|
const configuration = {
|
63811
63831
|
...containerApp.configuration,
|
63812
|
-
observability: observabilityConfiguration
|
63832
|
+
observability: observabilityConfiguration,
|
63833
|
+
instance_type: instanceType
|
63813
63834
|
};
|
63814
|
-
if (containerApp.instance_type !== void 0) {
|
63815
|
-
configuration.instance_type = containerApp.instance_type;
|
63816
|
-
}
|
63817
63835
|
if (containerApp.name === void 0) {
|
63818
63836
|
throw new FatalError("Container application name failed to be set", 1, {
|
63819
63837
|
telemetryMessage: true
|
@@ -64327,6 +64345,7 @@ var init_apply = __esm({
|
|
64327
64345
|
__name(applicationToCreateApplication, "applicationToCreateApplication");
|
64328
64346
|
__name(cleanupObservability, "cleanupObservability");
|
64329
64347
|
__name(observabilityToConfiguration, "observabilityToConfiguration");
|
64348
|
+
__name(containerAppToInstanceType, "containerAppToInstanceType");
|
64330
64349
|
__name(containerAppToCreateApplication, "containerAppToCreateApplication");
|
64331
64350
|
__name(isNumber, "isNumber");
|
64332
64351
|
__name(createLine, "createLine");
|
@@ -64956,7 +64975,7 @@ async function usingLocalNamespace(persistTo, config, namespaceId, closure) {
|
|
64956
64975
|
await mf.dispose();
|
64957
64976
|
}
|
64958
64977
|
}
|
64959
|
-
var import_node_buffer2, import_node_url8, import_miniflare9, import_undici5, API_MAX, BATCH_KEY_MAX, KeyValueKeys, formatNumber;
|
64978
|
+
var import_node_buffer2, import_node_url8, import_miniflare9, import_undici5, API_MAX, BATCH_KEY_MAX, BATCH_MAX_ERRORS_WARNINGS, KeyValueKeys, formatNumber;
|
64960
64979
|
var init_helpers4 = __esm({
|
64961
64980
|
"src/kv/helpers.ts"() {
|
64962
64981
|
init_import_meta_url();
|
@@ -64971,6 +64990,7 @@ var init_helpers4 = __esm({
|
|
64971
64990
|
init_logger();
|
64972
64991
|
API_MAX = 1e4;
|
64973
64992
|
BATCH_KEY_MAX = API_MAX / 10;
|
64993
|
+
BATCH_MAX_ERRORS_WARNINGS = 12;
|
64974
64994
|
__name(createKVNamespace, "createKVNamespace");
|
64975
64995
|
__name(listKVNamespaces, "listKVNamespaces");
|
64976
64996
|
__name(listKVNamespaceKeys, "listKVNamespaceKeys");
|
@@ -83528,20 +83548,32 @@ Expected an array of strings or objects with a "name" key.
|
|
83528
83548
|
Expected an array of key-value objects but got type "${typeof content}".`
|
83529
83549
|
);
|
83530
83550
|
}
|
83551
|
+
let maxNumberOfErrorsReached = false;
|
83531
83552
|
const errors = [];
|
83553
|
+
let maxNumberOfWarningsReached = false;
|
83532
83554
|
const warnings = [];
|
83533
83555
|
for (let i5 = 0; i5 < content.length; i5++) {
|
83534
83556
|
const keyValue = content[i5];
|
83535
|
-
if (!isKVKeyValue(keyValue)) {
|
83536
|
-
errors.
|
83557
|
+
if (!isKVKeyValue(keyValue) && !maxNumberOfErrorsReached) {
|
83558
|
+
if (errors.length === BATCH_MAX_ERRORS_WARNINGS) {
|
83559
|
+
maxNumberOfErrorsReached = true;
|
83560
|
+
errors.push("...");
|
83561
|
+
} else {
|
83562
|
+
errors.push(`The item at index ${i5} is ${JSON.stringify(keyValue)}`);
|
83563
|
+
}
|
83537
83564
|
} else {
|
83538
83565
|
const props = unexpectedKVKeyValueProps(keyValue);
|
83539
|
-
if (props.length > 0) {
|
83540
|
-
warnings.
|
83541
|
-
|
83542
|
-
|
83543
|
-
|
83544
|
-
|
83566
|
+
if (props.length > 0 && !maxNumberOfWarningsReached) {
|
83567
|
+
if (warnings.length === BATCH_MAX_ERRORS_WARNINGS) {
|
83568
|
+
maxNumberOfWarningsReached = true;
|
83569
|
+
warnings.push("...");
|
83570
|
+
} else {
|
83571
|
+
warnings.push(
|
83572
|
+
`The item at index ${i5} contains unexpected properties: ${JSON.stringify(
|
83573
|
+
props
|
83574
|
+
)}.`
|
83575
|
+
);
|
83576
|
+
}
|
83545
83577
|
}
|
83546
83578
|
}
|
83547
83579
|
}
|
@@ -89666,7 +89698,7 @@ var init_deployment_tails = __esm({
|
|
89666
89698
|
new URLSearchParams({ env: environment })
|
89667
89699
|
);
|
89668
89700
|
const envDeployments = deployments.filter(
|
89669
|
-
(d6) => d6.environment === environment
|
89701
|
+
(d6) => d6.environment === environment && d6.latest_stage.name === "deploy" && d6.latest_stage.status === "success"
|
89670
89702
|
);
|
89671
89703
|
if (isUrl(deployment)) {
|
89672
89704
|
const { hostname: deploymentHostname } = new URL(deployment);
|
@@ -142772,9 +142804,9 @@ async function whoami(complianceConfig, accountFilter) {
|
|
142772
142804
|
return;
|
142773
142805
|
}
|
142774
142806
|
printUserEmail(user);
|
142775
|
-
if (user.authType === "API Token") {
|
142807
|
+
if (user.authType === "User API Token" || user.authType === "Account API Token") {
|
142776
142808
|
logger.log(
|
142777
|
-
"\u2139\uFE0F The API Token is read from the CLOUDFLARE_API_TOKEN
|
142809
|
+
"\u2139\uFE0F The API Token is read from the CLOUDFLARE_API_TOKEN environment variable."
|
142778
142810
|
);
|
142779
142811
|
}
|
142780
142812
|
printComplianceRegion(complianceConfig);
|
@@ -142792,6 +142824,12 @@ function printComplianceRegion(complianceConfig) {
|
|
142792
142824
|
}
|
142793
142825
|
}
|
142794
142826
|
function printUserEmail(user) {
|
142827
|
+
if (user.authType === "Account API Token") {
|
142828
|
+
const accountName = user.accounts[0].name;
|
142829
|
+
return void logger.log(
|
142830
|
+
`\u{1F44B} You are logged in with an ${user.authType}, associated with the account ${source_default.blue(accountName)}.`
|
142831
|
+
);
|
142832
|
+
}
|
142795
142833
|
if (!user.email) {
|
142796
142834
|
return void logger.log(
|
142797
142835
|
`\u{1F44B} You are logged in with an ${user.authType}. Unable to retrieve email for this user. Are you missing the \`User->User Details->Read\` permission?`
|
@@ -142813,7 +142851,7 @@ function printTokenPermissions(user) {
|
|
142813
142851
|
const permissions = user.tokenPermissions?.map((scope) => scope.split(":")) ?? [];
|
142814
142852
|
if (user.authType !== "OAuth Token") {
|
142815
142853
|
return void logger.log(
|
142816
|
-
`\u{1F513} To see token permissions visit https://dash.cloudflare.com
|
142854
|
+
`\u{1F513} To see token permissions visit https://dash.cloudflare.com/${user.authType === "User API Token" ? "profile" : user.accounts[0].id}/api-tokens.`
|
142817
142855
|
);
|
142818
142856
|
}
|
142819
142857
|
logger.log(
|
@@ -142865,17 +142903,42 @@ async function getUserInfo(complianceConfig) {
|
|
142865
142903
|
if (!apiToken) {
|
142866
142904
|
return;
|
142867
142905
|
}
|
142906
|
+
const authType = await getAuthType(complianceConfig, apiToken);
|
142868
142907
|
const tokenPermissions = await getTokenPermissions();
|
142869
|
-
const usingEnvAuth = !!getAuthFromEnv();
|
142870
|
-
const usingGlobalAuthKey = "authKey" in apiToken;
|
142871
142908
|
return {
|
142872
|
-
apiToken:
|
142873
|
-
authType
|
142909
|
+
apiToken: "authKey" in apiToken ? apiToken.authKey : apiToken.apiToken,
|
142910
|
+
authType,
|
142874
142911
|
email: "authEmail" in apiToken ? apiToken.authEmail : await getEmail(complianceConfig),
|
142875
142912
|
accounts: await getAccounts(complianceConfig),
|
142876
142913
|
tokenPermissions
|
142877
142914
|
};
|
142878
142915
|
}
|
142916
|
+
async function getAuthType(complianceConfig, credentials) {
|
142917
|
+
if ("authKey" in credentials) {
|
142918
|
+
return "Global API Key";
|
142919
|
+
}
|
142920
|
+
const usingEnvAuth = !!getAuthFromEnv();
|
142921
|
+
if (!usingEnvAuth) {
|
142922
|
+
return "OAuth Token";
|
142923
|
+
}
|
142924
|
+
const tokenType = await getTokenType(complianceConfig);
|
142925
|
+
if (tokenType === "account") {
|
142926
|
+
return "Account API Token";
|
142927
|
+
} else {
|
142928
|
+
return "User API Token";
|
142929
|
+
}
|
142930
|
+
}
|
142931
|
+
async function getTokenType(complianceConfig) {
|
142932
|
+
try {
|
142933
|
+
await fetchResult(complianceConfig, "/user/tokens/verify");
|
142934
|
+
return "user";
|
142935
|
+
} catch (e7) {
|
142936
|
+
if (e7.code === 1e3) {
|
142937
|
+
return "account";
|
142938
|
+
}
|
142939
|
+
throw e7;
|
142940
|
+
}
|
142941
|
+
}
|
142879
142942
|
async function getEmail(complianceConfig) {
|
142880
142943
|
try {
|
142881
142944
|
const { email } = await fetchResult(
|
@@ -142915,6 +142978,8 @@ var init_whoami = __esm({
|
|
142915
142978
|
__name(printTokenPermissions, "printTokenPermissions");
|
142916
142979
|
__name(printMembershipInfo, "printMembershipInfo");
|
142917
142980
|
__name(getUserInfo, "getUserInfo");
|
142981
|
+
__name(getAuthType, "getAuthType");
|
142982
|
+
__name(getTokenType, "getTokenType");
|
142918
142983
|
__name(getEmail, "getEmail");
|
142919
142984
|
__name(getAccounts, "getAccounts");
|
142920
142985
|
__name(getTokenPermissions, "getTokenPermissions");
|
@@ -146436,18 +146501,19 @@ function formatTime3(duration) {
|
|
146436
146501
|
return `(${(duration / 1e3).toFixed(2)} sec)`;
|
146437
146502
|
}
|
146438
146503
|
function generatePreviewAlias(scriptName) {
|
146439
|
-
|
146440
|
-
|
146441
|
-
|
146442
|
-
|
146443
|
-
|
146444
|
-
)
|
146445
|
-
|
146504
|
+
let branchName = getWorkersCIBranchName();
|
146505
|
+
if (!branchName) {
|
146506
|
+
try {
|
146507
|
+
(0, import_node_child_process7.execSync)(`git rev-parse --is-inside-work-tree`, { stdio: "ignore" });
|
146508
|
+
branchName = (0, import_node_child_process7.execSync)(`git rev-parse --abbrev-ref HEAD`).toString().trim();
|
146509
|
+
} catch (err) {
|
146510
|
+
logger.warn(
|
146511
|
+
`Preview alias generation requested, but could not be autogenerated.`
|
146512
|
+
);
|
146513
|
+
return void 0;
|
146514
|
+
}
|
146446
146515
|
}
|
146447
|
-
|
146448
|
-
try {
|
146449
|
-
branchName = (0, import_node_child_process7.execSync)(`git rev-parse --abbrev-ref HEAD`).toString().trim();
|
146450
|
-
} catch (err) {
|
146516
|
+
if (!branchName) {
|
146451
146517
|
logger.warn(
|
146452
146518
|
`Preview alias generation requested, but could not be autogenerated.`
|
146453
146519
|
);
|
@@ -153271,7 +153337,7 @@ function getAssetsOptions(args, config, overrides) {
|
|
153271
153337
|
const directory = path59.resolve(assetsBasePath, assets.directory);
|
153272
153338
|
if (!(0, import_node_fs32.existsSync)(directory)) {
|
153273
153339
|
const sourceOfTruthMessage = args.assets ? '"--assets" command line argument' : '"assets.directory" field in your configuration file';
|
153274
|
-
throw new
|
153340
|
+
throw new NonExistentAssetsDirError(
|
153275
153341
|
`The directory specified by the ${sourceOfTruthMessage} does not exist:
|
153276
153342
|
${directory}`,
|
153277
153343
|
{
|
@@ -153357,7 +153423,7 @@ function errorOnLegacyPagesWorkerJSAsset(file, hasAssetsIgnoreFile) {
|
|
153357
153423
|
}
|
153358
153424
|
}
|
153359
153425
|
}
|
153360
|
-
var import_node_assert22, import_node_fs32, import_promises35, path59, import_undici22, BULK_UPLOAD_CONCURRENCY2, MAX_UPLOAD_ATTEMPTS2, MAX_UPLOAD_GATEWAY_ERRORS2, MAX_DIFF_LINES2, syncAssets, buildAssetManifest, WORKER_JS_FILENAME;
|
153426
|
+
var import_node_assert22, import_node_fs32, import_promises35, path59, import_undici22, BULK_UPLOAD_CONCURRENCY2, MAX_UPLOAD_ATTEMPTS2, MAX_UPLOAD_GATEWAY_ERRORS2, MAX_DIFF_LINES2, syncAssets, buildAssetManifest, NonExistentAssetsDirError, WORKER_JS_FILENAME;
|
153361
153427
|
var init_assets = __esm({
|
153362
153428
|
"src/assets.ts"() {
|
153363
153429
|
init_import_meta_url();
|
@@ -153610,6 +153676,11 @@ Ensure all assets in your assets directory "${dir}" conform with the Workers max
|
|
153610
153676
|
__name(logAssetsUploadStatus, "logAssetsUploadStatus");
|
153611
153677
|
__name(logReadFilesFromDirectory, "logReadFilesFromDirectory");
|
153612
153678
|
__name(getAssetsBasePath, "getAssetsBasePath");
|
153679
|
+
NonExistentAssetsDirError = class extends UserError {
|
153680
|
+
static {
|
153681
|
+
__name(this, "NonExistentAssetsDirError");
|
153682
|
+
}
|
153683
|
+
};
|
153613
153684
|
__name(getAssetsOptions, "getAssetsOptions");
|
153614
153685
|
__name(validateAssetsArgsAndConfig, "validateAssetsArgsAndConfig");
|
153615
153686
|
WORKER_JS_FILENAME = "_worker.js";
|
@@ -172828,6 +172899,7 @@ var init_ProxyController = __esm({
|
|
172828
172899
|
return;
|
172829
172900
|
}
|
172830
172901
|
(0, import_node_assert25.default)(this.latestConfig !== void 0);
|
172902
|
+
const inVscodeJsDebugTerminal = !!process.env.VSCODE_INSPECTOR_OPTIONS;
|
172831
172903
|
const cert = this.latestConfig.dev?.server?.secure || this.latestConfig.dev.inspector !== false && this.latestConfig.dev?.inspector?.secure ? getHttpsOptions(
|
172832
172904
|
this.latestConfig.dev.server?.httpsKeyPath,
|
172833
172905
|
this.latestConfig.dev.server?.httpsCertPath
|
@@ -172880,7 +172952,7 @@ var init_ProxyController = __esm({
|
|
172880
172952
|
handleRuntimeStdio,
|
172881
172953
|
liveReload: false
|
172882
172954
|
};
|
172883
|
-
if (this.latestConfig.dev.inspector !== false) {
|
172955
|
+
if (this.latestConfig.dev.inspector !== false && !inVscodeJsDebugTerminal) {
|
172884
172956
|
proxyWorkerOptions.workers.push({
|
172885
172957
|
name: "InspectorProxyWorker",
|
172886
172958
|
compatibilityDate: "2023-12-18",
|
@@ -172934,9 +173006,9 @@ var init_ProxyController = __esm({
|
|
172934
173006
|
if (willInstantiateMiniflareInstance) {
|
172935
173007
|
void Promise.all([
|
172936
173008
|
proxyWorker.ready,
|
172937
|
-
this.latestConfig.dev.inspector === false ? Promise.resolve(void 0) : proxyWorker.unsafeGetDirectURL("InspectorProxyWorker")
|
173009
|
+
this.latestConfig.dev.inspector === false || inVscodeJsDebugTerminal ? Promise.resolve(void 0) : proxyWorker.unsafeGetDirectURL("InspectorProxyWorker")
|
172938
173010
|
]).then(([url4, inspectorUrl]) => {
|
172939
|
-
if (!inspectorUrl) {
|
173011
|
+
if (!inspectorUrl || inVscodeJsDebugTerminal) {
|
172940
173012
|
return [url4, void 0];
|
172941
173013
|
}
|
172942
173014
|
return this.reconnectInspectorProxyWorker().then(() => [
|
@@ -175120,13 +175192,18 @@ function registerDevHotKeys(devEnv, args) {
|
|
175120
175192
|
{
|
175121
175193
|
keys: ["d"],
|
175122
175194
|
label: "open devtools",
|
175195
|
+
// Don't display this hotkey if we're in a VSCode debug session
|
175196
|
+
disabled: !!process.env.VSCODE_INSPECTOR_OPTIONS,
|
175123
175197
|
handler: /* @__PURE__ */ __name(async () => {
|
175124
175198
|
const { inspectorUrl } = await devEnv.proxy.ready.promise;
|
175125
|
-
|
175126
|
-
|
175127
|
-
|
175128
|
-
|
175129
|
-
|
175199
|
+
if (!inspectorUrl) {
|
175200
|
+
logger.warn("DevTools is not available while in a debug terminal");
|
175201
|
+
} else {
|
175202
|
+
await openInspector(
|
175203
|
+
parseInt(inspectorUrl.port),
|
175204
|
+
devEnv.config.latestConfig?.name
|
175205
|
+
);
|
175206
|
+
}
|
175130
175207
|
}, "handler")
|
175131
175208
|
},
|
175132
175209
|
{
|
@@ -175176,11 +175253,10 @@ function registerDevHotKeys(devEnv, args) {
|
|
175176
175253
|
]);
|
175177
175254
|
return unregisterHotKeys;
|
175178
175255
|
}
|
175179
|
-
var
|
175256
|
+
var import_crypto7;
|
175180
175257
|
var init_hotkeys = __esm({
|
175181
175258
|
"src/dev/hotkeys.ts"() {
|
175182
175259
|
init_import_meta_url();
|
175183
|
-
import_assert7 = __toESM(require("assert"));
|
175184
175260
|
import_crypto7 = require("crypto");
|
175185
175261
|
init_LocalRuntimeController();
|
175186
175262
|
init_cli_hotkeys();
|
@@ -178750,6 +178826,16 @@ async function getMiniflareOptionsFromConfig(args) {
|
|
178750
178826
|
remoteProxyConnectionString,
|
178751
178827
|
remoteBindingsEnabled
|
178752
178828
|
);
|
178829
|
+
let processedAssetOptions;
|
178830
|
+
try {
|
178831
|
+
processedAssetOptions = getAssetsOptions({ assets: void 0 }, config);
|
178832
|
+
} catch (e7) {
|
178833
|
+
const isNonExistentError = e7 instanceof NonExistentAssetsDirError;
|
178834
|
+
if (!isNonExistentError) {
|
178835
|
+
throw e7;
|
178836
|
+
}
|
178837
|
+
}
|
178838
|
+
const assetOptions = processedAssetOptions ? buildAssetOptions({ assets: processedAssetOptions }) : {};
|
178753
178839
|
const defaultPersistRoot = getMiniflarePersistRoot(options.persist);
|
178754
178840
|
const serviceBindings = await getServiceBindings(bindings.services);
|
178755
178841
|
const miniflareOptions = {
|
@@ -178762,7 +178848,8 @@ async function getMiniflareOptionsFromConfig(args) {
|
|
178762
178848
|
serviceBindings: {
|
178763
178849
|
...serviceBindings,
|
178764
178850
|
...bindingOptions.serviceBindings
|
178765
|
-
}
|
178851
|
+
},
|
178852
|
+
...assetOptions
|
178766
178853
|
},
|
178767
178854
|
...externalWorkers
|
178768
178855
|
],
|