wrangler 3.102.0 → 3.103.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 +6 -5
- package/wrangler-dist/cli.js +521 -419
- package/wrangler-dist/cli.js.map +4 -4
package/wrangler-dist/cli.js
CHANGED
@@ -492,7 +492,7 @@ var require_util = __commonJS({
|
|
492
492
|
"../../node_modules/.pnpm/undici@5.28.4/node_modules/undici/lib/core/util.js"(exports2, module3) {
|
493
493
|
"use strict";
|
494
494
|
init_import_meta_url();
|
495
|
-
var
|
495
|
+
var assert37 = require("assert");
|
496
496
|
var { kDestroyed, kBodyUsed } = require_symbols();
|
497
497
|
var { IncomingMessage } = require("http");
|
498
498
|
var stream2 = require("stream");
|
@@ -580,7 +580,7 @@ var require_util = __commonJS({
|
|
580
580
|
function getHostname(host) {
|
581
581
|
if (host[0] === "[") {
|
582
582
|
const idx2 = host.indexOf("]");
|
583
|
-
|
583
|
+
assert37(idx2 !== -1);
|
584
584
|
return host.substring(1, idx2);
|
585
585
|
}
|
586
586
|
const idx = host.indexOf(":");
|
@@ -593,7 +593,7 @@ var require_util = __commonJS({
|
|
593
593
|
if (!host) {
|
594
594
|
return null;
|
595
595
|
}
|
596
|
-
|
596
|
+
assert37.strictEqual(typeof host, "string");
|
597
597
|
const servername = getHostname(host);
|
598
598
|
if (net2.isIP(servername)) {
|
599
599
|
return "";
|
@@ -3257,7 +3257,7 @@ var require_util2 = __commonJS({
|
|
3257
3257
|
var { getGlobalOrigin } = require_global();
|
3258
3258
|
var { performance: performance2 } = require("perf_hooks");
|
3259
3259
|
var { isBlobLike, toUSVString, ReadableStreamFrom } = require_util();
|
3260
|
-
var
|
3260
|
+
var assert37 = require("assert");
|
3261
3261
|
var { isUint8Array } = require("util/types");
|
3262
3262
|
var supportedHashes = [];
|
3263
3263
|
var crypto7;
|
@@ -3467,7 +3467,7 @@ var require_util2 = __commonJS({
|
|
3467
3467
|
__name(clonePolicyContainer, "clonePolicyContainer");
|
3468
3468
|
function determineRequestsReferrer(request4) {
|
3469
3469
|
const policy = request4.referrerPolicy;
|
3470
|
-
|
3470
|
+
assert37(policy);
|
3471
3471
|
let referrerSource = null;
|
3472
3472
|
if (request4.referrer === "client") {
|
3473
3473
|
const globalOrigin = getGlobalOrigin();
|
@@ -3512,7 +3512,7 @@ var require_util2 = __commonJS({
|
|
3512
3512
|
}
|
3513
3513
|
__name(determineRequestsReferrer, "determineRequestsReferrer");
|
3514
3514
|
function stripURLForReferrer(url4, originOnly) {
|
3515
|
-
|
3515
|
+
assert37(url4 instanceof URL);
|
3516
3516
|
if (url4.protocol === "file:" || url4.protocol === "about:" || url4.protocol === "blank:") {
|
3517
3517
|
return "no-referrer";
|
3518
3518
|
}
|
@@ -3708,7 +3708,7 @@ var require_util2 = __commonJS({
|
|
3708
3708
|
if (result === void 0) {
|
3709
3709
|
throw new TypeError("Value is not JSON serializable");
|
3710
3710
|
}
|
3711
|
-
|
3711
|
+
assert37(typeof result === "string");
|
3712
3712
|
return result;
|
3713
3713
|
}
|
3714
3714
|
__name(serializeJavascriptValueToJSONString, "serializeJavascriptValueToJSONString");
|
@@ -3809,7 +3809,7 @@ var require_util2 = __commonJS({
|
|
3809
3809
|
__name(readableStreamClose, "readableStreamClose");
|
3810
3810
|
function isomorphicEncode(input) {
|
3811
3811
|
for (let i5 = 0; i5 < input.length; i5++) {
|
3812
|
-
|
3812
|
+
assert37(input.charCodeAt(i5) <= 255);
|
3813
3813
|
}
|
3814
3814
|
return input;
|
3815
3815
|
}
|
@@ -3831,7 +3831,7 @@ var require_util2 = __commonJS({
|
|
3831
3831
|
}
|
3832
3832
|
__name(readAllBytes, "readAllBytes");
|
3833
3833
|
function urlIsLocal(url4) {
|
3834
|
-
|
3834
|
+
assert37("protocol" in url4);
|
3835
3835
|
const protocol = url4.protocol;
|
3836
3836
|
return protocol === "about:" || protocol === "blob:" || protocol === "data:";
|
3837
3837
|
}
|
@@ -3844,7 +3844,7 @@ var require_util2 = __commonJS({
|
|
3844
3844
|
}
|
3845
3845
|
__name(urlHasHttpsScheme, "urlHasHttpsScheme");
|
3846
3846
|
function urlIsHttpHttpsScheme(url4) {
|
3847
|
-
|
3847
|
+
assert37("protocol" in url4);
|
3848
3848
|
const protocol = url4.protocol;
|
3849
3849
|
return protocol === "http:" || protocol === "https:";
|
3850
3850
|
}
|
@@ -4290,7 +4290,7 @@ var require_webidl = __commonJS({
|
|
4290
4290
|
var require_dataURL = __commonJS({
|
4291
4291
|
"../../node_modules/.pnpm/undici@5.28.4/node_modules/undici/lib/fetch/dataURL.js"(exports2, module3) {
|
4292
4292
|
init_import_meta_url();
|
4293
|
-
var
|
4293
|
+
var assert37 = require("assert");
|
4294
4294
|
var { atob: atob2 } = require("buffer");
|
4295
4295
|
var { isomorphicDecode } = require_util2();
|
4296
4296
|
var encoder = new TextEncoder();
|
@@ -4298,7 +4298,7 @@ var require_dataURL = __commonJS({
|
|
4298
4298
|
var HTTP_WHITESPACE_REGEX = /(\u000A|\u000D|\u0009|\u0020)/;
|
4299
4299
|
var HTTP_QUOTED_STRING_TOKENS = /[\u0009|\u0020-\u007E|\u0080-\u00FF]/;
|
4300
4300
|
function dataURLProcessor(dataURL) {
|
4301
|
-
|
4301
|
+
assert37(dataURL.protocol === "data:");
|
4302
4302
|
let input = URLSerializer(dataURL, true);
|
4303
4303
|
input = input.slice(5);
|
4304
4304
|
const position = { position: 0 };
|
@@ -4492,7 +4492,7 @@ var require_dataURL = __commonJS({
|
|
4492
4492
|
function collectAnHTTPQuotedString(input, position, extractValue) {
|
4493
4493
|
const positionStart = position.position;
|
4494
4494
|
let value = "";
|
4495
|
-
|
4495
|
+
assert37(input[position.position] === '"');
|
4496
4496
|
position.position++;
|
4497
4497
|
while (true) {
|
4498
4498
|
value += collectASequenceOfCodePoints(
|
@@ -4513,7 +4513,7 @@ var require_dataURL = __commonJS({
|
|
4513
4513
|
value += input[position.position];
|
4514
4514
|
position.position++;
|
4515
4515
|
} else {
|
4516
|
-
|
4516
|
+
assert37(quoteOrBackslash === '"');
|
4517
4517
|
break;
|
4518
4518
|
}
|
4519
4519
|
}
|
@@ -4524,7 +4524,7 @@ var require_dataURL = __commonJS({
|
|
4524
4524
|
}
|
4525
4525
|
__name(collectAnHTTPQuotedString, "collectAnHTTPQuotedString");
|
4526
4526
|
function serializeAMimeType(mimeType) {
|
4527
|
-
|
4527
|
+
assert37(mimeType !== "failure");
|
4528
4528
|
const { parameters, essence } = mimeType;
|
4529
4529
|
let serialization = essence;
|
4530
4530
|
for (let [name2, value] of parameters.entries()) {
|
@@ -4962,7 +4962,7 @@ var require_body = __commonJS({
|
|
4962
4962
|
var { DOMException: DOMException2, structuredClone } = require_constants2();
|
4963
4963
|
var { Blob: Blob6, File: NativeFile } = require("buffer");
|
4964
4964
|
var { kBodyUsed } = require_symbols();
|
4965
|
-
var
|
4965
|
+
var assert37 = require("assert");
|
4966
4966
|
var { isErrored } = require_util();
|
4967
4967
|
var { isUint8Array, isArrayBuffer: isArrayBuffer3 } = require("util/types");
|
4968
4968
|
var { File: UndiciFile } = require_file();
|
@@ -4993,7 +4993,7 @@ var require_body = __commonJS({
|
|
4993
4993
|
type: void 0
|
4994
4994
|
});
|
4995
4995
|
}
|
4996
|
-
|
4996
|
+
assert37(isReadableStreamLike(stream2));
|
4997
4997
|
let action = null;
|
4998
4998
|
let source = null;
|
4999
4999
|
let length = null;
|
@@ -5110,8 +5110,8 @@ Content-Type: ${value.type || "application/octet-stream"}\r
|
|
5110
5110
|
ReadableStream3 = require("stream/web").ReadableStream;
|
5111
5111
|
}
|
5112
5112
|
if (object instanceof ReadableStream3) {
|
5113
|
-
|
5114
|
-
|
5113
|
+
assert37(!util5.isDisturbed(object), "The body has already been consumed.");
|
5114
|
+
assert37(!object.locked, "The stream is locked.");
|
5115
5115
|
}
|
5116
5116
|
return extractBody(object, keepalive);
|
5117
5117
|
}
|
@@ -5337,7 +5337,7 @@ var require_request = __commonJS({
|
|
5337
5337
|
InvalidArgumentError,
|
5338
5338
|
NotSupportedError
|
5339
5339
|
} = require_errors();
|
5340
|
-
var
|
5340
|
+
var assert37 = require("assert");
|
5341
5341
|
var { kHTTP2BuildRequest, kHTTP2CopyHeaders, kHTTP1BuildRequest } = require_symbols();
|
5342
5342
|
var util5 = require_util();
|
5343
5343
|
var tokenRegExp = /^[\^_`a-zA-Z\-0-9!#$%&'*+.|~]+$/;
|
@@ -5518,8 +5518,8 @@ var require_request = __commonJS({
|
|
5518
5518
|
}
|
5519
5519
|
}
|
5520
5520
|
onConnect(abort) {
|
5521
|
-
|
5522
|
-
|
5521
|
+
assert37(!this.aborted);
|
5522
|
+
assert37(!this.completed);
|
5523
5523
|
if (this.error) {
|
5524
5524
|
abort(this.error);
|
5525
5525
|
} else {
|
@@ -5528,8 +5528,8 @@ var require_request = __commonJS({
|
|
5528
5528
|
}
|
5529
5529
|
}
|
5530
5530
|
onHeaders(statusCode, headers, resume, statusText) {
|
5531
|
-
|
5532
|
-
|
5531
|
+
assert37(!this.aborted);
|
5532
|
+
assert37(!this.completed);
|
5533
5533
|
if (channels.headers.hasSubscribers) {
|
5534
5534
|
channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
|
5535
5535
|
}
|
@@ -5540,8 +5540,8 @@ var require_request = __commonJS({
|
|
5540
5540
|
}
|
5541
5541
|
}
|
5542
5542
|
onData(chunk) {
|
5543
|
-
|
5544
|
-
|
5543
|
+
assert37(!this.aborted);
|
5544
|
+
assert37(!this.completed);
|
5545
5545
|
try {
|
5546
5546
|
return this[kHandler].onData(chunk);
|
5547
5547
|
} catch (err) {
|
@@ -5550,13 +5550,13 @@ var require_request = __commonJS({
|
|
5550
5550
|
}
|
5551
5551
|
}
|
5552
5552
|
onUpgrade(statusCode, headers, socket) {
|
5553
|
-
|
5554
|
-
|
5553
|
+
assert37(!this.aborted);
|
5554
|
+
assert37(!this.completed);
|
5555
5555
|
return this[kHandler].onUpgrade(statusCode, headers, socket);
|
5556
5556
|
}
|
5557
5557
|
onComplete(trailers) {
|
5558
5558
|
this.onFinally();
|
5559
|
-
|
5559
|
+
assert37(!this.aborted);
|
5560
5560
|
this.completed = true;
|
5561
5561
|
if (channels.trailers.hasSubscribers) {
|
5562
5562
|
channels.trailers.publish({ request: this, trailers });
|
@@ -5904,7 +5904,7 @@ var require_connect = __commonJS({
|
|
5904
5904
|
"use strict";
|
5905
5905
|
init_import_meta_url();
|
5906
5906
|
var net2 = require("net");
|
5907
|
-
var
|
5907
|
+
var assert37 = require("assert");
|
5908
5908
|
var util5 = require_util();
|
5909
5909
|
var { InvalidArgumentError, ConnectTimeoutError } = require_errors();
|
5910
5910
|
var tls;
|
@@ -5974,7 +5974,7 @@ var require_connect = __commonJS({
|
|
5974
5974
|
servername = servername || options30.servername || util5.getServerName(host) || null;
|
5975
5975
|
const sessionKey = servername || hostname2;
|
5976
5976
|
const session = sessionCache.get(sessionKey) || null;
|
5977
|
-
|
5977
|
+
assert37(sessionKey);
|
5978
5978
|
socket = tls.connect({
|
5979
5979
|
highWaterMark: 16384,
|
5980
5980
|
// TLS in node can't have bigger HWM anyway...
|
@@ -5993,7 +5993,7 @@ var require_connect = __commonJS({
|
|
5993
5993
|
sessionCache.set(sessionKey, session2);
|
5994
5994
|
});
|
5995
5995
|
} else {
|
5996
|
-
|
5996
|
+
assert37(!httpSocket, "httpSocket can only be sent on TLS update");
|
5997
5997
|
socket = net2.connect({
|
5998
5998
|
highWaterMark: 64 * 1024,
|
5999
5999
|
// Same as nodejs fs streams.
|
@@ -6409,7 +6409,7 @@ var require_RedirectHandler = __commonJS({
|
|
6409
6409
|
init_import_meta_url();
|
6410
6410
|
var util5 = require_util();
|
6411
6411
|
var { kBodyUsed } = require_symbols();
|
6412
|
-
var
|
6412
|
+
var assert37 = require("assert");
|
6413
6413
|
var { InvalidArgumentError } = require_errors();
|
6414
6414
|
var EE = require("events");
|
6415
6415
|
var redirectableStatusCodes = [300, 301, 302, 303, 307, 308];
|
@@ -6420,7 +6420,7 @@ var require_RedirectHandler = __commonJS({
|
|
6420
6420
|
this[kBodyUsed] = false;
|
6421
6421
|
}
|
6422
6422
|
async *[Symbol.asyncIterator]() {
|
6423
|
-
|
6423
|
+
assert37(!this[kBodyUsed], "disturbed");
|
6424
6424
|
this[kBodyUsed] = true;
|
6425
6425
|
yield* this[kBody];
|
6426
6426
|
}
|
@@ -6442,7 +6442,7 @@ var require_RedirectHandler = __commonJS({
|
|
6442
6442
|
if (util5.isStream(this.opts.body)) {
|
6443
6443
|
if (util5.bodyLength(this.opts.body) === 0) {
|
6444
6444
|
this.opts.body.on("data", function() {
|
6445
|
-
|
6445
|
+
assert37(false);
|
6446
6446
|
});
|
6447
6447
|
}
|
6448
6448
|
if (typeof this.opts.body.readableDidRead !== "boolean") {
|
@@ -6549,7 +6549,7 @@ var require_RedirectHandler = __commonJS({
|
|
6549
6549
|
}
|
6550
6550
|
}
|
6551
6551
|
} else {
|
6552
|
-
|
6552
|
+
assert37(headers == null, "headers must be an object or an array");
|
6553
6553
|
}
|
6554
6554
|
return ret;
|
6555
6555
|
}
|
@@ -6603,7 +6603,7 @@ var require_client = __commonJS({
|
|
6603
6603
|
"../../node_modules/.pnpm/undici@5.28.4/node_modules/undici/lib/client.js"(exports2, module3) {
|
6604
6604
|
"use strict";
|
6605
6605
|
init_import_meta_url();
|
6606
|
-
var
|
6606
|
+
var assert37 = require("assert");
|
6607
6607
|
var net2 = require("net");
|
6608
6608
|
var http5 = require("http");
|
6609
6609
|
var { pipeline } = require("stream");
|
@@ -6942,7 +6942,7 @@ var require_client = __commonJS({
|
|
6942
6942
|
};
|
6943
6943
|
__name(Client2, "Client");
|
6944
6944
|
function onHttp2SessionError(err) {
|
6945
|
-
|
6945
|
+
assert37(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
|
6946
6946
|
this[kSocket][kError] = err;
|
6947
6947
|
onError(this[kClient], err);
|
6948
6948
|
}
|
@@ -6966,7 +6966,7 @@ var require_client = __commonJS({
|
|
6966
6966
|
client[kSocket] = null;
|
6967
6967
|
client[kHTTP2Session] = null;
|
6968
6968
|
if (client.destroyed) {
|
6969
|
-
|
6969
|
+
assert37(this[kPending] === 0);
|
6970
6970
|
const requests = client[kQueue].splice(client[kRunningIdx]);
|
6971
6971
|
for (let i5 = 0; i5 < requests.length; i5++) {
|
6972
6972
|
const request4 = requests[i5];
|
@@ -6978,7 +6978,7 @@ var require_client = __commonJS({
|
|
6978
6978
|
errorRequest(client, request4, err);
|
6979
6979
|
}
|
6980
6980
|
client[kPendingIdx] = client[kRunningIdx];
|
6981
|
-
|
6981
|
+
assert37(client[kRunning] === 0);
|
6982
6982
|
client.emit(
|
6983
6983
|
"disconnect",
|
6984
6984
|
client[kUrl],
|
@@ -7006,35 +7006,35 @@ var require_client = __commonJS({
|
|
7006
7006
|
return 0;
|
7007
7007
|
},
|
7008
7008
|
wasm_on_status: (p6, at2, len) => {
|
7009
|
-
|
7009
|
+
assert37.strictEqual(currentParser.ptr, p6);
|
7010
7010
|
const start = at2 - currentBufferPtr + currentBufferRef.byteOffset;
|
7011
7011
|
return currentParser.onStatus(new FastBuffer(currentBufferRef.buffer, start, len)) || 0;
|
7012
7012
|
},
|
7013
7013
|
wasm_on_message_begin: (p6) => {
|
7014
|
-
|
7014
|
+
assert37.strictEqual(currentParser.ptr, p6);
|
7015
7015
|
return currentParser.onMessageBegin() || 0;
|
7016
7016
|
},
|
7017
7017
|
wasm_on_header_field: (p6, at2, len) => {
|
7018
|
-
|
7018
|
+
assert37.strictEqual(currentParser.ptr, p6);
|
7019
7019
|
const start = at2 - currentBufferPtr + currentBufferRef.byteOffset;
|
7020
7020
|
return currentParser.onHeaderField(new FastBuffer(currentBufferRef.buffer, start, len)) || 0;
|
7021
7021
|
},
|
7022
7022
|
wasm_on_header_value: (p6, at2, len) => {
|
7023
|
-
|
7023
|
+
assert37.strictEqual(currentParser.ptr, p6);
|
7024
7024
|
const start = at2 - currentBufferPtr + currentBufferRef.byteOffset;
|
7025
7025
|
return currentParser.onHeaderValue(new FastBuffer(currentBufferRef.buffer, start, len)) || 0;
|
7026
7026
|
},
|
7027
7027
|
wasm_on_headers_complete: (p6, statusCode, upgrade, shouldKeepAlive) => {
|
7028
|
-
|
7028
|
+
assert37.strictEqual(currentParser.ptr, p6);
|
7029
7029
|
return currentParser.onHeadersComplete(statusCode, Boolean(upgrade), Boolean(shouldKeepAlive)) || 0;
|
7030
7030
|
},
|
7031
7031
|
wasm_on_body: (p6, at2, len) => {
|
7032
|
-
|
7032
|
+
assert37.strictEqual(currentParser.ptr, p6);
|
7033
7033
|
const start = at2 - currentBufferPtr + currentBufferRef.byteOffset;
|
7034
7034
|
return currentParser.onBody(new FastBuffer(currentBufferRef.buffer, start, len)) || 0;
|
7035
7035
|
},
|
7036
7036
|
wasm_on_message_complete: (p6) => {
|
7037
|
-
|
7037
|
+
assert37.strictEqual(currentParser.ptr, p6);
|
7038
7038
|
return currentParser.onMessageComplete() || 0;
|
7039
7039
|
}
|
7040
7040
|
/* eslint-enable camelcase */
|
@@ -7054,7 +7054,7 @@ var require_client = __commonJS({
|
|
7054
7054
|
var TIMEOUT_IDLE = 3;
|
7055
7055
|
var Parser2 = class {
|
7056
7056
|
constructor(client, socket, { exports: exports3 }) {
|
7057
|
-
|
7057
|
+
assert37(Number.isFinite(client[kMaxHeadersSize]) && client[kMaxHeadersSize] > 0);
|
7058
7058
|
this.llhttp = exports3;
|
7059
7059
|
this.ptr = this.llhttp.llhttp_alloc(constants3.TYPE.RESPONSE);
|
7060
7060
|
this.client = client;
|
@@ -7100,10 +7100,10 @@ var require_client = __commonJS({
|
|
7100
7100
|
if (this.socket.destroyed || !this.paused) {
|
7101
7101
|
return;
|
7102
7102
|
}
|
7103
|
-
|
7104
|
-
|
7103
|
+
assert37(this.ptr != null);
|
7104
|
+
assert37(currentParser == null);
|
7105
7105
|
this.llhttp.llhttp_resume(this.ptr);
|
7106
|
-
|
7106
|
+
assert37(this.timeoutType === TIMEOUT_BODY);
|
7107
7107
|
if (this.timeout) {
|
7108
7108
|
if (this.timeout.refresh) {
|
7109
7109
|
this.timeout.refresh();
|
@@ -7123,9 +7123,9 @@ var require_client = __commonJS({
|
|
7123
7123
|
}
|
7124
7124
|
}
|
7125
7125
|
execute(data) {
|
7126
|
-
|
7127
|
-
|
7128
|
-
|
7126
|
+
assert37(this.ptr != null);
|
7127
|
+
assert37(currentParser == null);
|
7128
|
+
assert37(!this.paused);
|
7129
7129
|
const { socket, llhttp } = this;
|
7130
7130
|
if (data.length > currentBufferSize) {
|
7131
7131
|
if (currentBufferPtr) {
|
@@ -7167,8 +7167,8 @@ var require_client = __commonJS({
|
|
7167
7167
|
}
|
7168
7168
|
}
|
7169
7169
|
destroy() {
|
7170
|
-
|
7171
|
-
|
7170
|
+
assert37(this.ptr != null);
|
7171
|
+
assert37(currentParser == null);
|
7172
7172
|
this.llhttp.llhttp_free(this.ptr);
|
7173
7173
|
this.ptr = null;
|
7174
7174
|
timers.clearTimeout(this.timeout);
|
@@ -7225,17 +7225,17 @@ var require_client = __commonJS({
|
|
7225
7225
|
}
|
7226
7226
|
onUpgrade(head) {
|
7227
7227
|
const { upgrade, client, socket, headers, statusCode } = this;
|
7228
|
-
|
7228
|
+
assert37(upgrade);
|
7229
7229
|
const request4 = client[kQueue][client[kRunningIdx]];
|
7230
|
-
|
7231
|
-
|
7232
|
-
|
7233
|
-
|
7234
|
-
|
7230
|
+
assert37(request4);
|
7231
|
+
assert37(!socket.destroyed);
|
7232
|
+
assert37(socket === client[kSocket]);
|
7233
|
+
assert37(!this.paused);
|
7234
|
+
assert37(request4.upgrade || request4.method === "CONNECT");
|
7235
7235
|
this.statusCode = null;
|
7236
7236
|
this.statusText = "";
|
7237
7237
|
this.shouldKeepAlive = null;
|
7238
|
-
|
7238
|
+
assert37(this.headers.length % 2 === 0);
|
7239
7239
|
this.headers = [];
|
7240
7240
|
this.headersSize = 0;
|
7241
7241
|
socket.unshift(head);
|
@@ -7263,8 +7263,8 @@ var require_client = __commonJS({
|
|
7263
7263
|
if (!request4) {
|
7264
7264
|
return -1;
|
7265
7265
|
}
|
7266
|
-
|
7267
|
-
|
7266
|
+
assert37(!this.upgrade);
|
7267
|
+
assert37(this.statusCode < 200);
|
7268
7268
|
if (statusCode === 100) {
|
7269
7269
|
util5.destroy(socket, new SocketError("bad response", util5.getSocketInfo(socket)));
|
7270
7270
|
return -1;
|
@@ -7273,7 +7273,7 @@ var require_client = __commonJS({
|
|
7273
7273
|
util5.destroy(socket, new SocketError("bad upgrade", util5.getSocketInfo(socket)));
|
7274
7274
|
return -1;
|
7275
7275
|
}
|
7276
|
-
|
7276
|
+
assert37.strictEqual(this.timeoutType, TIMEOUT_HEADERS);
|
7277
7277
|
this.statusCode = statusCode;
|
7278
7278
|
this.shouldKeepAlive = shouldKeepAlive || // Override llhttp value which does not allow keepAlive for HEAD.
|
7279
7279
|
request4.method === "HEAD" && !socket[kReset2] && this.connection.toLowerCase() === "keep-alive";
|
@@ -7286,16 +7286,16 @@ var require_client = __commonJS({
|
|
7286
7286
|
}
|
7287
7287
|
}
|
7288
7288
|
if (request4.method === "CONNECT") {
|
7289
|
-
|
7289
|
+
assert37(client[kRunning] === 1);
|
7290
7290
|
this.upgrade = true;
|
7291
7291
|
return 2;
|
7292
7292
|
}
|
7293
7293
|
if (upgrade) {
|
7294
|
-
|
7294
|
+
assert37(client[kRunning] === 1);
|
7295
7295
|
this.upgrade = true;
|
7296
7296
|
return 2;
|
7297
7297
|
}
|
7298
|
-
|
7298
|
+
assert37(this.headers.length % 2 === 0);
|
7299
7299
|
this.headers = [];
|
7300
7300
|
this.headersSize = 0;
|
7301
7301
|
if (this.shouldKeepAlive && client[kPipelining]) {
|
@@ -7338,14 +7338,14 @@ var require_client = __commonJS({
|
|
7338
7338
|
return -1;
|
7339
7339
|
}
|
7340
7340
|
const request4 = client[kQueue][client[kRunningIdx]];
|
7341
|
-
|
7342
|
-
|
7341
|
+
assert37(request4);
|
7342
|
+
assert37.strictEqual(this.timeoutType, TIMEOUT_BODY);
|
7343
7343
|
if (this.timeout) {
|
7344
7344
|
if (this.timeout.refresh) {
|
7345
7345
|
this.timeout.refresh();
|
7346
7346
|
}
|
7347
7347
|
}
|
7348
|
-
|
7348
|
+
assert37(statusCode >= 200);
|
7349
7349
|
if (maxResponseSize > -1 && this.bytesRead + buf.length > maxResponseSize) {
|
7350
7350
|
util5.destroy(socket, new ResponseExceededMaxSizeError());
|
7351
7351
|
return -1;
|
@@ -7364,15 +7364,15 @@ var require_client = __commonJS({
|
|
7364
7364
|
return;
|
7365
7365
|
}
|
7366
7366
|
const request4 = client[kQueue][client[kRunningIdx]];
|
7367
|
-
|
7368
|
-
|
7367
|
+
assert37(request4);
|
7368
|
+
assert37(statusCode >= 100);
|
7369
7369
|
this.statusCode = null;
|
7370
7370
|
this.statusText = "";
|
7371
7371
|
this.bytesRead = 0;
|
7372
7372
|
this.contentLength = "";
|
7373
7373
|
this.keepAlive = "";
|
7374
7374
|
this.connection = "";
|
7375
|
-
|
7375
|
+
assert37(this.headers.length % 2 === 0);
|
7376
7376
|
this.headers = [];
|
7377
7377
|
this.headersSize = 0;
|
7378
7378
|
if (statusCode < 200) {
|
@@ -7385,7 +7385,7 @@ var require_client = __commonJS({
|
|
7385
7385
|
request4.onComplete(headers);
|
7386
7386
|
client[kQueue][client[kRunningIdx]++] = null;
|
7387
7387
|
if (socket[kWriting]) {
|
7388
|
-
|
7388
|
+
assert37.strictEqual(client[kRunning], 0);
|
7389
7389
|
util5.destroy(socket, new InformationalError("reset"));
|
7390
7390
|
return constants3.ERROR.PAUSED;
|
7391
7391
|
} else if (!shouldKeepAlive) {
|
@@ -7406,7 +7406,7 @@ var require_client = __commonJS({
|
|
7406
7406
|
const { socket, timeoutType, client } = parser2;
|
7407
7407
|
if (timeoutType === TIMEOUT_HEADERS) {
|
7408
7408
|
if (!socket[kWriting] || socket.writableNeedDrain || client[kRunning] > 1) {
|
7409
|
-
|
7409
|
+
assert37(!parser2.paused, "cannot be paused while waiting for headers");
|
7410
7410
|
util5.destroy(socket, new HeadersTimeoutError());
|
7411
7411
|
}
|
7412
7412
|
} else if (timeoutType === TIMEOUT_BODY) {
|
@@ -7414,7 +7414,7 @@ var require_client = __commonJS({
|
|
7414
7414
|
util5.destroy(socket, new BodyTimeoutError());
|
7415
7415
|
}
|
7416
7416
|
} else if (timeoutType === TIMEOUT_IDLE) {
|
7417
|
-
|
7417
|
+
assert37(client[kRunning] === 0 && client[kKeepAliveTimeoutValue]);
|
7418
7418
|
util5.destroy(socket, new InformationalError("socket idle timeout"));
|
7419
7419
|
}
|
7420
7420
|
}
|
@@ -7428,7 +7428,7 @@ var require_client = __commonJS({
|
|
7428
7428
|
__name(onSocketReadable, "onSocketReadable");
|
7429
7429
|
function onSocketError(err) {
|
7430
7430
|
const { [kClient]: client, [kParser]: parser2 } = this;
|
7431
|
-
|
7431
|
+
assert37(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
|
7432
7432
|
if (client[kHTTPConnVersion] !== "h2") {
|
7433
7433
|
if (err.code === "ECONNRESET" && parser2.statusCode && !parser2.shouldKeepAlive) {
|
7434
7434
|
parser2.onMessageComplete();
|
@@ -7441,13 +7441,13 @@ var require_client = __commonJS({
|
|
7441
7441
|
__name(onSocketError, "onSocketError");
|
7442
7442
|
function onError(client, err) {
|
7443
7443
|
if (client[kRunning] === 0 && err.code !== "UND_ERR_INFO" && err.code !== "UND_ERR_SOCKET") {
|
7444
|
-
|
7444
|
+
assert37(client[kPendingIdx] === client[kRunningIdx]);
|
7445
7445
|
const requests = client[kQueue].splice(client[kRunningIdx]);
|
7446
7446
|
for (let i5 = 0; i5 < requests.length; i5++) {
|
7447
7447
|
const request4 = requests[i5];
|
7448
7448
|
errorRequest(client, request4, err);
|
7449
7449
|
}
|
7450
|
-
|
7450
|
+
assert37(client[kSize] === 0);
|
7451
7451
|
}
|
7452
7452
|
}
|
7453
7453
|
__name(onError, "onError");
|
@@ -7474,7 +7474,7 @@ var require_client = __commonJS({
|
|
7474
7474
|
const err = this[kError] || new SocketError("closed", util5.getSocketInfo(this));
|
7475
7475
|
client[kSocket] = null;
|
7476
7476
|
if (client.destroyed) {
|
7477
|
-
|
7477
|
+
assert37(client[kPending] === 0);
|
7478
7478
|
const requests = client[kQueue].splice(client[kRunningIdx]);
|
7479
7479
|
for (let i5 = 0; i5 < requests.length; i5++) {
|
7480
7480
|
const request4 = requests[i5];
|
@@ -7486,20 +7486,20 @@ var require_client = __commonJS({
|
|
7486
7486
|
errorRequest(client, request4, err);
|
7487
7487
|
}
|
7488
7488
|
client[kPendingIdx] = client[kRunningIdx];
|
7489
|
-
|
7489
|
+
assert37(client[kRunning] === 0);
|
7490
7490
|
client.emit("disconnect", client[kUrl], [client], err);
|
7491
7491
|
resume(client);
|
7492
7492
|
}
|
7493
7493
|
__name(onSocketClose, "onSocketClose");
|
7494
7494
|
async function connect(client) {
|
7495
|
-
|
7496
|
-
|
7495
|
+
assert37(!client[kConnecting]);
|
7496
|
+
assert37(!client[kSocket]);
|
7497
7497
|
let { host, hostname: hostname2, protocol, port } = client[kUrl];
|
7498
7498
|
if (hostname2[0] === "[") {
|
7499
7499
|
const idx = hostname2.indexOf("]");
|
7500
|
-
|
7500
|
+
assert37(idx !== -1);
|
7501
7501
|
const ip = hostname2.substring(1, idx);
|
7502
|
-
|
7502
|
+
assert37(net2.isIP(ip));
|
7503
7503
|
hostname2 = ip;
|
7504
7504
|
}
|
7505
7505
|
client[kConnecting] = true;
|
@@ -7539,7 +7539,7 @@ var require_client = __commonJS({
|
|
7539
7539
|
return;
|
7540
7540
|
}
|
7541
7541
|
client[kConnecting] = false;
|
7542
|
-
|
7542
|
+
assert37(socket);
|
7543
7543
|
const isH22 = socket.alpnProtocol === "h2";
|
7544
7544
|
if (isH22) {
|
7545
7545
|
if (!h2ExperimentalWarned) {
|
@@ -7615,7 +7615,7 @@ var require_client = __commonJS({
|
|
7615
7615
|
});
|
7616
7616
|
}
|
7617
7617
|
if (err.code === "ERR_TLS_CERT_ALTNAME_INVALID") {
|
7618
|
-
|
7618
|
+
assert37(client[kRunning] === 0);
|
7619
7619
|
while (client[kPending] > 0 && client[kQueue][client[kPendingIdx]].servername === client[kServerName]) {
|
7620
7620
|
const request4 = client[kQueue][client[kPendingIdx]++];
|
7621
7621
|
errorRequest(client, request4, err);
|
@@ -7650,7 +7650,7 @@ var require_client = __commonJS({
|
|
7650
7650
|
function _resume(client, sync) {
|
7651
7651
|
while (true) {
|
7652
7652
|
if (client.destroyed) {
|
7653
|
-
|
7653
|
+
assert37(client[kPending] === 0);
|
7654
7654
|
return;
|
7655
7655
|
}
|
7656
7656
|
if (client[kClosedResolve] && !client[kSize]) {
|
@@ -7824,13 +7824,13 @@ upgrade: ${upgrade}\r
|
|
7824
7824
|
\r
|
7825
7825
|
`, "latin1");
|
7826
7826
|
} else {
|
7827
|
-
|
7827
|
+
assert37(contentLength === null, "no body must not have content length");
|
7828
7828
|
socket.write(`${header}\r
|
7829
7829
|
`, "latin1");
|
7830
7830
|
}
|
7831
7831
|
request4.onRequestSent();
|
7832
7832
|
} else if (util5.isBuffer(body)) {
|
7833
|
-
|
7833
|
+
assert37(contentLength === body.byteLength, "buffer body must have content length");
|
7834
7834
|
socket.cork();
|
7835
7835
|
socket.write(`${header}content-length: ${contentLength}\r
|
7836
7836
|
\r
|
@@ -7853,7 +7853,7 @@ upgrade: ${upgrade}\r
|
|
7853
7853
|
} else if (util5.isIterable(body)) {
|
7854
7854
|
writeIterable({ body, client, request: request4, socket, contentLength, header, expectsPayload });
|
7855
7855
|
} else {
|
7856
|
-
|
7856
|
+
assert37(false);
|
7857
7857
|
}
|
7858
7858
|
return true;
|
7859
7859
|
}
|
@@ -7926,7 +7926,7 @@ upgrade: ${upgrade}\r
|
|
7926
7926
|
process.emitWarning(new RequestContentLengthMismatchError());
|
7927
7927
|
}
|
7928
7928
|
if (contentLength != null) {
|
7929
|
-
|
7929
|
+
assert37(body, "no body must not have content length");
|
7930
7930
|
headers[HTTP2_HEADER_CONTENT_LENGTH] = `${contentLength}`;
|
7931
7931
|
}
|
7932
7932
|
session.ref();
|
@@ -7982,7 +7982,7 @@ upgrade: ${upgrade}\r
|
|
7982
7982
|
if (!body) {
|
7983
7983
|
request4.onRequestSent();
|
7984
7984
|
} else if (util5.isBuffer(body)) {
|
7985
|
-
|
7985
|
+
assert37(contentLength === body.byteLength, "buffer body must have content length");
|
7986
7986
|
stream2.cork();
|
7987
7987
|
stream2.write(body);
|
7988
7988
|
stream2.uncork();
|
@@ -8036,14 +8036,14 @@ upgrade: ${upgrade}\r
|
|
8036
8036
|
socket: client[kSocket]
|
8037
8037
|
});
|
8038
8038
|
} else {
|
8039
|
-
|
8039
|
+
assert37(false);
|
8040
8040
|
}
|
8041
8041
|
}
|
8042
8042
|
__name(writeBodyH2, "writeBodyH2");
|
8043
8043
|
}
|
8044
8044
|
__name(writeH2, "writeH2");
|
8045
8045
|
function writeStream({ h2stream, body, client, request: request4, socket, contentLength, header, expectsPayload }) {
|
8046
|
-
|
8046
|
+
assert37(contentLength !== 0 || client[kRunning] === 0, "stream body cannot be pipelined");
|
8047
8047
|
if (client[kHTTPConnVersion] === "h2") {
|
8048
8048
|
let onPipeData = function(chunk) {
|
8049
8049
|
request4.onBodySent(chunk);
|
@@ -8102,7 +8102,7 @@ upgrade: ${upgrade}\r
|
|
8102
8102
|
return;
|
8103
8103
|
}
|
8104
8104
|
finished = true;
|
8105
|
-
|
8105
|
+
assert37(socket.destroyed || socket[kWriting] && client[kRunning] <= 1);
|
8106
8106
|
socket.off("drain", onDrain).off("error", onFinished);
|
8107
8107
|
body.removeListener("data", onData).removeListener("end", onFinished).removeListener("error", onFinished).removeListener("close", onAbort);
|
8108
8108
|
if (!err) {
|
@@ -8127,7 +8127,7 @@ upgrade: ${upgrade}\r
|
|
8127
8127
|
}
|
8128
8128
|
__name(writeStream, "writeStream");
|
8129
8129
|
async function writeBlob({ h2stream, body, client, request: request4, socket, contentLength, header, expectsPayload }) {
|
8130
|
-
|
8130
|
+
assert37(contentLength === body.size, "blob body must have content length");
|
8131
8131
|
const isH22 = client[kHTTPConnVersion] === "h2";
|
8132
8132
|
try {
|
8133
8133
|
if (contentLength != null && contentLength !== body.size) {
|
@@ -8158,7 +8158,7 @@ upgrade: ${upgrade}\r
|
|
8158
8158
|
}
|
8159
8159
|
__name(writeBlob, "writeBlob");
|
8160
8160
|
async function writeIterable({ h2stream, body, client, request: request4, socket, contentLength, header, expectsPayload }) {
|
8161
|
-
|
8161
|
+
assert37(contentLength !== 0 || client[kRunning] === 0, "iterator body cannot be pipelined");
|
8162
8162
|
let callback = null;
|
8163
8163
|
function onDrain() {
|
8164
8164
|
if (callback) {
|
@@ -8169,7 +8169,7 @@ upgrade: ${upgrade}\r
|
|
8169
8169
|
}
|
8170
8170
|
__name(onDrain, "onDrain");
|
8171
8171
|
const waitForDrain = /* @__PURE__ */ __name(() => new Promise((resolve24, reject) => {
|
8172
|
-
|
8172
|
+
assert37(callback === null);
|
8173
8173
|
if (socket[kError]) {
|
8174
8174
|
reject(socket[kError]);
|
8175
8175
|
} else {
|
@@ -8318,7 +8318,7 @@ ${len.toString(16)}\r
|
|
8318
8318
|
const { socket, client } = this;
|
8319
8319
|
socket[kWriting] = false;
|
8320
8320
|
if (err) {
|
8321
|
-
|
8321
|
+
assert37(client[kRunning] <= 1, "pipeline should only contain this request");
|
8322
8322
|
util5.destroy(socket, err);
|
8323
8323
|
}
|
8324
8324
|
}
|
@@ -8327,7 +8327,7 @@ ${len.toString(16)}\r
|
|
8327
8327
|
function errorRequest(client, request4, err) {
|
8328
8328
|
try {
|
8329
8329
|
request4.onError(err);
|
8330
|
-
|
8330
|
+
assert37(request4.aborted);
|
8331
8331
|
} catch (err2) {
|
8332
8332
|
client.emit("error", err2);
|
8333
8333
|
}
|
@@ -8983,7 +8983,7 @@ var require_readable = __commonJS({
|
|
8983
8983
|
"../../node_modules/.pnpm/undici@5.28.4/node_modules/undici/lib/api/readable.js"(exports2, module3) {
|
8984
8984
|
"use strict";
|
8985
8985
|
init_import_meta_url();
|
8986
|
-
var
|
8986
|
+
var assert37 = require("assert");
|
8987
8987
|
var { Readable: Readable8 } = require("stream");
|
8988
8988
|
var { RequestAbortedError, NotSupportedError, InvalidArgumentError } = require_errors();
|
8989
8989
|
var util5 = require_util();
|
@@ -9092,7 +9092,7 @@ var require_readable = __commonJS({
|
|
9092
9092
|
this[kBody] = ReadableStreamFrom(this);
|
9093
9093
|
if (this[kConsume]) {
|
9094
9094
|
this[kBody].getReader();
|
9095
|
-
|
9095
|
+
assert37(this[kBody].locked);
|
9096
9096
|
}
|
9097
9097
|
}
|
9098
9098
|
return this[kBody];
|
@@ -9145,7 +9145,7 @@ var require_readable = __commonJS({
|
|
9145
9145
|
if (isUnusable(stream2)) {
|
9146
9146
|
throw new TypeError("unusable");
|
9147
9147
|
}
|
9148
|
-
|
9148
|
+
assert37(!stream2[kConsume]);
|
9149
9149
|
return new Promise((resolve24, reject) => {
|
9150
9150
|
stream2[kConsume] = {
|
9151
9151
|
type,
|
@@ -9242,13 +9242,13 @@ var require_readable = __commonJS({
|
|
9242
9242
|
var require_util3 = __commonJS({
|
9243
9243
|
"../../node_modules/.pnpm/undici@5.28.4/node_modules/undici/lib/api/util.js"(exports2, module3) {
|
9244
9244
|
init_import_meta_url();
|
9245
|
-
var
|
9245
|
+
var assert37 = require("assert");
|
9246
9246
|
var {
|
9247
9247
|
ResponseStatusCodeError
|
9248
9248
|
} = require_errors();
|
9249
9249
|
var { toUSVString } = require_util();
|
9250
9250
|
async function getResolveErrorBodyCallback({ callback, body, contentType, statusCode, statusMessage, headers }) {
|
9251
|
-
|
9251
|
+
assert37(body);
|
9252
9252
|
let chunks = [];
|
9253
9253
|
let limit = 0;
|
9254
9254
|
for await (const chunk of body) {
|
@@ -9688,7 +9688,7 @@ var require_api_pipeline = __commonJS({
|
|
9688
9688
|
var util5 = require_util();
|
9689
9689
|
var { AsyncResource } = require("async_hooks");
|
9690
9690
|
var { addSignal, removeSignal } = require_abort_signal();
|
9691
|
-
var
|
9691
|
+
var assert37 = require("assert");
|
9692
9692
|
var kResume = Symbol("resume");
|
9693
9693
|
var PipelineRequest = class extends Readable8 {
|
9694
9694
|
constructor() {
|
@@ -9790,7 +9790,7 @@ var require_api_pipeline = __commonJS({
|
|
9790
9790
|
}
|
9791
9791
|
onConnect(abort, context2) {
|
9792
9792
|
const { ret, res } = this;
|
9793
|
-
|
9793
|
+
assert37(!res, "pipeline cannot be retried");
|
9794
9794
|
if (ret.destroyed) {
|
9795
9795
|
throw new RequestAbortedError();
|
9796
9796
|
}
|
@@ -9882,7 +9882,7 @@ var require_api_upgrade = __commonJS({
|
|
9882
9882
|
var { AsyncResource } = require("async_hooks");
|
9883
9883
|
var util5 = require_util();
|
9884
9884
|
var { addSignal, removeSignal } = require_abort_signal();
|
9885
|
-
var
|
9885
|
+
var assert37 = require("assert");
|
9886
9886
|
var UpgradeHandler = class extends AsyncResource {
|
9887
9887
|
constructor(opts, callback) {
|
9888
9888
|
if (!opts || typeof opts !== "object") {
|
@@ -9915,7 +9915,7 @@ var require_api_upgrade = __commonJS({
|
|
9915
9915
|
}
|
9916
9916
|
onUpgrade(statusCode, rawHeaders, socket) {
|
9917
9917
|
const { callback, opaque, context: context2 } = this;
|
9918
|
-
|
9918
|
+
assert37.strictEqual(statusCode, 101);
|
9919
9919
|
removeSignal(this);
|
9920
9920
|
this.callback = null;
|
9921
9921
|
const headers = this.responseHeaders === "raw" ? util5.parseRawHeaders(rawHeaders) : util5.parseHeaders(rawHeaders);
|
@@ -11073,7 +11073,7 @@ var require_proxy_agent = __commonJS({
|
|
11073
11073
|
var require_RetryHandler = __commonJS({
|
11074
11074
|
"../../node_modules/.pnpm/undici@5.28.4/node_modules/undici/lib/handler/RetryHandler.js"(exports2, module3) {
|
11075
11075
|
init_import_meta_url();
|
11076
|
-
var
|
11076
|
+
var assert37 = require("assert");
|
11077
11077
|
var { kRetryHandlerDefaultRetry } = require_symbols();
|
11078
11078
|
var { RequestRetryError } = require_errors();
|
11079
11079
|
var { isDisturbed, parseHeaders: parseHeaders2, parseRangeHeader } = require_util();
|
@@ -11240,8 +11240,8 @@ var require_RetryHandler = __commonJS({
|
|
11240
11240
|
return false;
|
11241
11241
|
}
|
11242
11242
|
const { start, size, end = size } = contentRange;
|
11243
|
-
|
11244
|
-
|
11243
|
+
assert37(this.start === start, "content-range mismatch");
|
11244
|
+
assert37(this.end == null || this.end === end, "content-range mismatch");
|
11245
11245
|
this.resume = resume;
|
11246
11246
|
return true;
|
11247
11247
|
}
|
@@ -11257,12 +11257,12 @@ var require_RetryHandler = __commonJS({
|
|
11257
11257
|
);
|
11258
11258
|
}
|
11259
11259
|
const { start, size, end = size } = range;
|
11260
|
-
|
11260
|
+
assert37(
|
11261
11261
|
start != null && Number.isFinite(start) && this.start !== start,
|
11262
11262
|
"content-range mismatch"
|
11263
11263
|
);
|
11264
|
-
|
11265
|
-
|
11264
|
+
assert37(Number.isFinite(start));
|
11265
|
+
assert37(
|
11266
11266
|
end != null && Number.isFinite(end) && this.end !== end,
|
11267
11267
|
"invalid content-length"
|
11268
11268
|
);
|
@@ -11273,8 +11273,8 @@ var require_RetryHandler = __commonJS({
|
|
11273
11273
|
const contentLength = headers["content-length"];
|
11274
11274
|
this.end = contentLength != null ? Number(contentLength) : null;
|
11275
11275
|
}
|
11276
|
-
|
11277
|
-
|
11276
|
+
assert37(Number.isFinite(this.start));
|
11277
|
+
assert37(
|
11278
11278
|
this.end == null || Number.isFinite(this.end),
|
11279
11279
|
"invalid content-length"
|
11280
11280
|
);
|
@@ -11423,7 +11423,7 @@ var require_headers = __commonJS({
|
|
11423
11423
|
isValidHeaderValue
|
11424
11424
|
} = require_util2();
|
11425
11425
|
var { webidl } = require_webidl();
|
11426
|
-
var
|
11426
|
+
var assert37 = require("assert");
|
11427
11427
|
var kHeadersMap = Symbol("headers map");
|
11428
11428
|
var kHeadersSortedMap = Symbol("headers map sorted");
|
11429
11429
|
function isHTTPWhiteSpaceCharCode(code) {
|
@@ -11688,7 +11688,7 @@ var require_headers = __commonJS({
|
|
11688
11688
|
headers.push([name2, cookies[j6]]);
|
11689
11689
|
}
|
11690
11690
|
} else {
|
11691
|
-
|
11691
|
+
assert37(value !== null);
|
11692
11692
|
headers.push([name2, value]);
|
11693
11693
|
}
|
11694
11694
|
}
|
@@ -11833,7 +11833,7 @@ var require_response = __commonJS({
|
|
11833
11833
|
var { getGlobalOrigin } = require_global();
|
11834
11834
|
var { URLSerializer } = require_dataURL();
|
11835
11835
|
var { kHeadersList, kConstruct } = require_symbols();
|
11836
|
-
var
|
11836
|
+
var assert37 = require("assert");
|
11837
11837
|
var { types } = require("util");
|
11838
11838
|
var ReadableStream3 = globalThis.ReadableStream || require("stream/web").ReadableStream;
|
11839
11839
|
var textEncoder = new TextEncoder("utf-8");
|
@@ -12053,7 +12053,7 @@ var require_response = __commonJS({
|
|
12053
12053
|
return p6 in state2 ? state2[p6] : target[p6];
|
12054
12054
|
},
|
12055
12055
|
set(target, p6, value) {
|
12056
|
-
|
12056
|
+
assert37(!(p6 in state2));
|
12057
12057
|
target[p6] = value;
|
12058
12058
|
return true;
|
12059
12059
|
}
|
@@ -12088,12 +12088,12 @@ var require_response = __commonJS({
|
|
12088
12088
|
body: null
|
12089
12089
|
});
|
12090
12090
|
} else {
|
12091
|
-
|
12091
|
+
assert37(false);
|
12092
12092
|
}
|
12093
12093
|
}
|
12094
12094
|
__name(filterResponse, "filterResponse");
|
12095
12095
|
function makeAppropriateNetworkError(fetchParams, err = null) {
|
12096
|
-
|
12096
|
+
assert37(isCancelled(fetchParams));
|
12097
12097
|
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 }));
|
12098
12098
|
}
|
12099
12099
|
__name(makeAppropriateNetworkError, "makeAppropriateNetworkError");
|
@@ -12224,7 +12224,7 @@ var require_request2 = __commonJS({
|
|
12224
12224
|
var { getGlobalOrigin } = require_global();
|
12225
12225
|
var { URLSerializer } = require_dataURL();
|
12226
12226
|
var { kHeadersList, kConstruct } = require_symbols();
|
12227
|
-
var
|
12227
|
+
var assert37 = require("assert");
|
12228
12228
|
var { getMaxListeners, setMaxListeners, getEventListeners, defaultMaxListeners } = require("events");
|
12229
12229
|
var TransformStream2 = globalThis.TransformStream;
|
12230
12230
|
var kAbortController = Symbol("abortController");
|
@@ -12268,7 +12268,7 @@ var require_request2 = __commonJS({
|
|
12268
12268
|
request4 = makeRequest({ urlList: [parsedURL] });
|
12269
12269
|
fallbackMode = "cors";
|
12270
12270
|
} else {
|
12271
|
-
|
12271
|
+
assert37(input instanceof Request4);
|
12272
12272
|
request4 = input[kState];
|
12273
12273
|
signal = input[kSignal];
|
12274
12274
|
}
|
@@ -12881,7 +12881,7 @@ var require_fetch = __commonJS({
|
|
12881
12881
|
urlHasHttpsScheme
|
12882
12882
|
} = require_util2();
|
12883
12883
|
var { kState, kHeaders, kGuard, kRealm } = require_symbols2();
|
12884
|
-
var
|
12884
|
+
var assert37 = require("assert");
|
12885
12885
|
var { safelyExtractBody } = require_body();
|
12886
12886
|
var {
|
12887
12887
|
redirectStatusSet,
|
@@ -12962,7 +12962,7 @@ var require_fetch = __commonJS({
|
|
12962
12962
|
requestObject.signal,
|
12963
12963
|
() => {
|
12964
12964
|
locallyAborted = true;
|
12965
|
-
|
12965
|
+
assert37(controller != null);
|
12966
12966
|
controller.abort(requestObject.signal.reason);
|
12967
12967
|
abortFetch(p6, request4, responseObject, requestObject.signal.reason);
|
12968
12968
|
}
|
@@ -13099,7 +13099,7 @@ var require_fetch = __commonJS({
|
|
13099
13099
|
taskDestination,
|
13100
13100
|
crossOriginIsolatedCapability
|
13101
13101
|
};
|
13102
|
-
|
13102
|
+
assert37(!request4.body || request4.body.stream);
|
13103
13103
|
if (request4.window === "client") {
|
13104
13104
|
request4.window = request4.client?.globalObject?.constructor?.name === "Window" ? request4.client : "no-window";
|
13105
13105
|
}
|
@@ -13193,7 +13193,7 @@ var require_fetch = __commonJS({
|
|
13193
13193
|
} else if (request4.responseTainting === "opaque") {
|
13194
13194
|
response = filterResponse(response, "opaque");
|
13195
13195
|
} else {
|
13196
|
-
|
13196
|
+
assert37(false);
|
13197
13197
|
}
|
13198
13198
|
}
|
13199
13199
|
let internalResponse = response.status === 0 ? response : response.internalResponse;
|
@@ -13389,7 +13389,7 @@ var require_fetch = __commonJS({
|
|
13389
13389
|
} else if (request4.redirect === "follow") {
|
13390
13390
|
response = await httpRedirectFetch(fetchParams, response);
|
13391
13391
|
} else {
|
13392
|
-
|
13392
|
+
assert37(false);
|
13393
13393
|
}
|
13394
13394
|
}
|
13395
13395
|
response.timingInfo = timingInfo;
|
@@ -13443,7 +13443,7 @@ var require_fetch = __commonJS({
|
|
13443
13443
|
request4.headersList.delete("host");
|
13444
13444
|
}
|
13445
13445
|
if (request4.body != null) {
|
13446
|
-
|
13446
|
+
assert37(request4.body.source != null);
|
13447
13447
|
request4.body = safelyExtractBody(request4.body.source)[0];
|
13448
13448
|
}
|
13449
13449
|
const timingInfo = fetchParams.timingInfo;
|
@@ -13578,7 +13578,7 @@ var require_fetch = __commonJS({
|
|
13578
13578
|
}
|
13579
13579
|
__name(httpNetworkOrCacheFetch, "httpNetworkOrCacheFetch");
|
13580
13580
|
async function httpNetworkFetch(fetchParams, includeCredentials = false, forceNewConnection = false) {
|
13581
|
-
|
13581
|
+
assert37(!fetchParams.controller.connection || fetchParams.controller.connection.destroyed);
|
13582
13582
|
fetchParams.controller.connection = {
|
13583
13583
|
abort: null,
|
13584
13584
|
destroyed: false,
|
@@ -14732,7 +14732,7 @@ var require_util5 = __commonJS({
|
|
14732
14732
|
"../../node_modules/.pnpm/undici@5.28.4/node_modules/undici/lib/cache/util.js"(exports2, module3) {
|
14733
14733
|
"use strict";
|
14734
14734
|
init_import_meta_url();
|
14735
|
-
var
|
14735
|
+
var assert37 = require("assert");
|
14736
14736
|
var { URLSerializer } = require_dataURL();
|
14737
14737
|
var { isValidHeaderName } = require_util2();
|
14738
14738
|
function urlEquals(A3, B3, excludeFragment = false) {
|
@@ -14742,7 +14742,7 @@ var require_util5 = __commonJS({
|
|
14742
14742
|
}
|
14743
14743
|
__name(urlEquals, "urlEquals");
|
14744
14744
|
function fieldValues(header) {
|
14745
|
-
|
14745
|
+
assert37(header !== null);
|
14746
14746
|
const values = [];
|
14747
14747
|
for (let value of header.split(",")) {
|
14748
14748
|
value = value.trim();
|
@@ -14778,7 +14778,7 @@ var require_cache = __commonJS({
|
|
14778
14778
|
var { kState, kHeaders, kGuard, kRealm } = require_symbols2();
|
14779
14779
|
var { fetching } = require_fetch();
|
14780
14780
|
var { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require_util2();
|
14781
|
-
var
|
14781
|
+
var assert37 = require("assert");
|
14782
14782
|
var { getGlobalDispatcher: getGlobalDispatcher2 } = require_global2();
|
14783
14783
|
var Cache3 = class {
|
14784
14784
|
/**
|
@@ -15040,7 +15040,7 @@ var require_cache = __commonJS({
|
|
15040
15040
|
return false;
|
15041
15041
|
}
|
15042
15042
|
} else {
|
15043
|
-
|
15043
|
+
assert37(typeof request4 === "string");
|
15044
15044
|
r7 = new Request4(request4)[kState];
|
15045
15045
|
}
|
15046
15046
|
const operations = [];
|
@@ -15150,7 +15150,7 @@ var require_cache = __commonJS({
|
|
15150
15150
|
}
|
15151
15151
|
for (const requestResponse of requestResponses) {
|
15152
15152
|
const idx = cache6.indexOf(requestResponse);
|
15153
|
-
|
15153
|
+
assert37(idx !== -1);
|
15154
15154
|
cache6.splice(idx, 1);
|
15155
15155
|
}
|
15156
15156
|
} else if (operation.type === "put") {
|
@@ -15182,7 +15182,7 @@ var require_cache = __commonJS({
|
|
15182
15182
|
requestResponses = this.#queryCache(operation.request);
|
15183
15183
|
for (const requestResponse of requestResponses) {
|
15184
15184
|
const idx = cache6.indexOf(requestResponse);
|
15185
|
-
|
15185
|
+
assert37(idx !== -1);
|
15186
15186
|
cache6.splice(idx, 1);
|
15187
15187
|
}
|
15188
15188
|
cache6.push([operation.request, operation.response]);
|
@@ -15426,7 +15426,7 @@ var require_util6 = __commonJS({
|
|
15426
15426
|
"../../node_modules/.pnpm/undici@5.28.4/node_modules/undici/lib/cookies/util.js"(exports2, module3) {
|
15427
15427
|
"use strict";
|
15428
15428
|
init_import_meta_url();
|
15429
|
-
var
|
15429
|
+
var assert37 = require("assert");
|
15430
15430
|
var { kHeadersList } = require_symbols();
|
15431
15431
|
function isCTLExcludingHtab(value) {
|
15432
15432
|
if (value.length === 0) {
|
@@ -15575,10 +15575,10 @@ var require_util6 = __commonJS({
|
|
15575
15575
|
kHeadersListNode = Object.getOwnPropertySymbols(headers).find(
|
15576
15576
|
(symbol) => symbol.description === "headers list"
|
15577
15577
|
);
|
15578
|
-
|
15578
|
+
assert37(kHeadersListNode, "Headers cannot be parsed");
|
15579
15579
|
}
|
15580
15580
|
const headersList = headers[kHeadersListNode];
|
15581
|
-
|
15581
|
+
assert37(headersList);
|
15582
15582
|
return headersList;
|
15583
15583
|
}
|
15584
15584
|
__name(getHeadersList, "getHeadersList");
|
@@ -15598,7 +15598,7 @@ var require_parse = __commonJS({
|
|
15598
15598
|
var { maxNameValuePairSize, maxAttributeValueSize } = require_constants4();
|
15599
15599
|
var { isCTLExcludingHtab } = require_util6();
|
15600
15600
|
var { collectASequenceOfCodePointsFast } = require_dataURL();
|
15601
|
-
var
|
15601
|
+
var assert37 = require("assert");
|
15602
15602
|
function parseSetCookie(header) {
|
15603
15603
|
if (isCTLExcludingHtab(header)) {
|
15604
15604
|
return null;
|
@@ -15641,7 +15641,7 @@ var require_parse = __commonJS({
|
|
15641
15641
|
if (unparsedAttributes.length === 0) {
|
15642
15642
|
return cookieAttributeList;
|
15643
15643
|
}
|
15644
|
-
|
15644
|
+
assert37(unparsedAttributes[0] === ";");
|
15645
15645
|
unparsedAttributes = unparsedAttributes.slice(1);
|
15646
15646
|
let cookieAv = "";
|
15647
15647
|
if (unparsedAttributes.includes(";")) {
|
@@ -19890,7 +19890,7 @@ var require_signal_exit = __commonJS({
|
|
19890
19890
|
};
|
19891
19891
|
};
|
19892
19892
|
} else {
|
19893
|
-
|
19893
|
+
assert37 = require("assert");
|
19894
19894
|
signals = require_signals();
|
19895
19895
|
isWin = /^win/i.test(process11.platform);
|
19896
19896
|
EE = require("events");
|
@@ -19913,7 +19913,7 @@ var require_signal_exit = __commonJS({
|
|
19913
19913
|
return function() {
|
19914
19914
|
};
|
19915
19915
|
}
|
19916
|
-
|
19916
|
+
assert37.equal(typeof cb2, "function", "a callback must be provided for exit handler");
|
19917
19917
|
if (loaded === false) {
|
19918
19918
|
load();
|
19919
19919
|
}
|
@@ -20019,7 +20019,7 @@ var require_signal_exit = __commonJS({
|
|
20019
20019
|
}
|
20020
20020
|
}, "processEmit");
|
20021
20021
|
}
|
20022
|
-
var
|
20022
|
+
var assert37;
|
20023
20023
|
var signals;
|
20024
20024
|
var isWin;
|
20025
20025
|
var EE;
|
@@ -73582,27 +73582,27 @@ Make sure "${service}" is mounted so Miniflare knows where to find it.`);
|
|
73582
73582
|
strictEqual: () => strictEqual2,
|
73583
73583
|
throws: () => throws
|
73584
73584
|
});
|
73585
|
-
var
|
73586
|
-
var assert_default =
|
73587
|
-
var AssertionError =
|
73588
|
-
var deepEqual =
|
73589
|
-
var deepStrictEqual =
|
73590
|
-
var doesNotMatch =
|
73591
|
-
var doesNotReject =
|
73592
|
-
var doesNotThrow =
|
73593
|
-
var equal =
|
73594
|
-
var fail =
|
73595
|
-
var ifError =
|
73596
|
-
var match2 =
|
73597
|
-
var notDeepEqual =
|
73598
|
-
var notDeepStrictEqual =
|
73599
|
-
var notEqual =
|
73600
|
-
var notStrictEqual2 =
|
73601
|
-
var ok =
|
73602
|
-
var rejects =
|
73603
|
-
var strict =
|
73604
|
-
var strictEqual2 =
|
73605
|
-
var throws =
|
73585
|
+
var import_node_assert31 = __toModule(require("node:assert"));
|
73586
|
+
var assert_default = import_node_assert31.default;
|
73587
|
+
var AssertionError = import_node_assert31.default.AssertionError;
|
73588
|
+
var deepEqual = import_node_assert31.default.deepEqual;
|
73589
|
+
var deepStrictEqual = import_node_assert31.default.deepStrictEqual;
|
73590
|
+
var doesNotMatch = import_node_assert31.default.doesNotMatch;
|
73591
|
+
var doesNotReject = import_node_assert31.default.doesNotReject;
|
73592
|
+
var doesNotThrow = import_node_assert31.default.doesNotThrow;
|
73593
|
+
var equal = import_node_assert31.default.equal;
|
73594
|
+
var fail = import_node_assert31.default.fail;
|
73595
|
+
var ifError = import_node_assert31.default.ifError;
|
73596
|
+
var match2 = import_node_assert31.default.match;
|
73597
|
+
var notDeepEqual = import_node_assert31.default.notDeepEqual;
|
73598
|
+
var notDeepStrictEqual = import_node_assert31.default.notDeepStrictEqual;
|
73599
|
+
var notEqual = import_node_assert31.default.notEqual;
|
73600
|
+
var notStrictEqual2 = import_node_assert31.default.notStrictEqual;
|
73601
|
+
var ok = import_node_assert31.default.ok;
|
73602
|
+
var rejects = import_node_assert31.default.rejects;
|
73603
|
+
var strict = import_node_assert31.default.strict;
|
73604
|
+
var strictEqual2 = import_node_assert31.default.strictEqual;
|
73605
|
+
var throws = import_node_assert31.default.throws;
|
73606
73606
|
var async_hooks_exports = {};
|
73607
73607
|
__export2(async_hooks_exports, {
|
73608
73608
|
AsyncLocalStorage: () => import_node_async_hooks.AsyncLocalStorage,
|
@@ -76970,11 +76970,11 @@ async function generateAssetsFetch(directory, log2) {
|
|
76970
76970
|
return await generateResponse(request4);
|
76971
76971
|
};
|
76972
76972
|
}
|
76973
|
-
var
|
76973
|
+
var import_node_assert18, import_node_fs20, import_node_path37, import_mime3, import_miniflare17, import_undici8, ProxyDispatcher, invalidAssetsFetch;
|
76974
76974
|
var init_assets = __esm({
|
76975
76975
|
"src/miniflare-cli/assets.ts"() {
|
76976
76976
|
init_import_meta_url();
|
76977
|
-
|
76977
|
+
import_node_assert18 = __toESM(require("node:assert"));
|
76978
76978
|
import_node_fs20 = require("node:fs");
|
76979
76979
|
import_node_path37 = require("node:path");
|
76980
76980
|
init_createMetadataObject();
|
@@ -77009,12 +77009,12 @@ var init_assets = __esm({
|
|
77009
77009
|
* by the `fetch()` function before calling `dispatcher.dispatch()`.
|
77010
77010
|
*/
|
77011
77011
|
static reinstateHostHeader(headers, host) {
|
77012
|
-
(0,
|
77013
|
-
(0,
|
77012
|
+
(0, import_node_assert18.default)(headers, "Expected all proxy requests to contain headers.");
|
77013
|
+
(0, import_node_assert18.default)(
|
77014
77014
|
!Array.isArray(headers),
|
77015
77015
|
"Expected proxy request headers to be a hash object"
|
77016
77016
|
);
|
77017
|
-
(0,
|
77017
|
+
(0, import_node_assert18.default)(
|
77018
77018
|
Object.keys(headers).every((h6) => h6.toLowerCase() !== "host"),
|
77019
77019
|
"Expected Host header to have been deleted."
|
77020
77020
|
);
|
@@ -97561,7 +97561,7 @@ var import_undici9 = __toESM(require_undici());
|
|
97561
97561
|
|
97562
97562
|
// src/dev.ts
|
97563
97563
|
init_import_meta_url();
|
97564
|
-
var
|
97564
|
+
var import_node_assert19 = __toESM(require("node:assert"));
|
97565
97565
|
var import_node_events3 = __toESM(require("node:events"));
|
97566
97566
|
var import_node_path38 = __toESM(require("node:path"));
|
97567
97567
|
var import_node_util3 = __toESM(require("node:util"));
|
@@ -98097,7 +98097,7 @@ var import_undici3 = __toESM(require_undici());
|
|
98097
98097
|
|
98098
98098
|
// package.json
|
98099
98099
|
var name = "wrangler";
|
98100
|
-
var version = "3.
|
98100
|
+
var version = "3.103.0";
|
98101
98101
|
|
98102
98102
|
// src/environment-variables/misc-variables.ts
|
98103
98103
|
init_import_meta_url();
|
@@ -111555,7 +111555,7 @@ __name(NoOpProxyController, "NoOpProxyController");
|
|
111555
111555
|
|
111556
111556
|
// src/assets.ts
|
111557
111557
|
init_import_meta_url();
|
111558
|
-
var
|
111558
|
+
var import_node_assert17 = __toESM(require("node:assert"));
|
111559
111559
|
var import_node_fs18 = require("node:fs");
|
111560
111560
|
var import_promises11 = require("node:fs/promises");
|
111561
111561
|
var path32 = __toESM(require("node:path"));
|
@@ -115961,13 +115961,14 @@ var import_undici7 = __toESM(require_undici());
|
|
115961
115961
|
|
115962
115962
|
// src/deploy/deploy.ts
|
115963
115963
|
init_import_meta_url();
|
115964
|
-
var
|
115964
|
+
var import_node_assert16 = __toESM(require("node:assert"));
|
115965
115965
|
var import_node_fs16 = require("node:fs");
|
115966
115966
|
var import_node_path30 = __toESM(require("node:path"));
|
115967
115967
|
var import_node_url11 = require("node:url");
|
115968
115968
|
|
115969
115969
|
// src/deployment-bundle/bindings.ts
|
115970
115970
|
init_import_meta_url();
|
115971
|
+
var import_node_assert10 = __toESM(require("node:assert"));
|
115971
115972
|
|
115972
115973
|
// src/d1/create.ts
|
115973
115974
|
init_import_meta_url();
|
@@ -116115,7 +116116,7 @@ var listDatabases = /* @__PURE__ */ __name(async (accountId, limitCalls = false)
|
|
116115
116116
|
);
|
116116
116117
|
page++;
|
116117
116118
|
results.push(...json);
|
116118
|
-
if (limitCalls) {
|
116119
|
+
if (limitCalls && page > 3) {
|
116119
116120
|
break;
|
116120
116121
|
}
|
116121
116122
|
if (json.length < pageSize) {
|
@@ -116125,6 +116126,53 @@ var listDatabases = /* @__PURE__ */ __name(async (accountId, limitCalls = false)
|
|
116125
116126
|
return results;
|
116126
116127
|
}, "listDatabases");
|
116127
116128
|
|
116129
|
+
// src/d1/utils.ts
|
116130
|
+
init_import_meta_url();
|
116131
|
+
function getDatabaseInfoFromConfig(config, name2) {
|
116132
|
+
for (const d1Database of config.d1_databases) {
|
116133
|
+
if (d1Database.database_id && (name2 === d1Database.database_name || name2 === d1Database.binding)) {
|
116134
|
+
if (!d1Database.database_name) {
|
116135
|
+
throw new UserError(
|
116136
|
+
`${name2} bindings must have a "database_name" field`
|
116137
|
+
);
|
116138
|
+
}
|
116139
|
+
return {
|
116140
|
+
uuid: d1Database.database_id,
|
116141
|
+
previewDatabaseUuid: d1Database.preview_database_id,
|
116142
|
+
binding: d1Database.binding,
|
116143
|
+
name: d1Database.database_name,
|
116144
|
+
migrationsTableName: d1Database.migrations_table || DEFAULT_MIGRATION_TABLE,
|
116145
|
+
migrationsFolderPath: d1Database.migrations_dir || DEFAULT_MIGRATION_PATH,
|
116146
|
+
internal_env: d1Database.database_internal_env
|
116147
|
+
};
|
116148
|
+
}
|
116149
|
+
}
|
116150
|
+
return null;
|
116151
|
+
}
|
116152
|
+
__name(getDatabaseInfoFromConfig, "getDatabaseInfoFromConfig");
|
116153
|
+
var getDatabaseByNameOrBinding = /* @__PURE__ */ __name(async (config, accountId, name2) => {
|
116154
|
+
const dbFromConfig = getDatabaseInfoFromConfig(config, name2);
|
116155
|
+
if (dbFromConfig) {
|
116156
|
+
return dbFromConfig;
|
116157
|
+
}
|
116158
|
+
const allDBs = await listDatabases(accountId);
|
116159
|
+
const matchingDB = allDBs.find((db) => db.name === name2);
|
116160
|
+
if (!matchingDB) {
|
116161
|
+
throw new UserError(`Couldn't find DB with name '${name2}'`);
|
116162
|
+
}
|
116163
|
+
return matchingDB;
|
116164
|
+
}, "getDatabaseByNameOrBinding");
|
116165
|
+
var getDatabaseInfoFromId = /* @__PURE__ */ __name(async (accountId, databaseId) => {
|
116166
|
+
return await fetchResult(
|
116167
|
+
`/accounts/${accountId}/d1/database/${databaseId}`,
|
116168
|
+
{
|
116169
|
+
headers: {
|
116170
|
+
"Content-Type": "application/json"
|
116171
|
+
}
|
116172
|
+
}
|
116173
|
+
);
|
116174
|
+
}, "getDatabaseInfoFromId");
|
116175
|
+
|
116128
116176
|
// src/kv/helpers.ts
|
116129
116177
|
init_import_meta_url();
|
116130
116178
|
var import_node_buffer = require("node:buffer");
|
@@ -117445,7 +117493,6 @@ async function provisionBindings(bindings, accountId, scriptName, autoCreate, co
|
|
117445
117493
|
binding: kv.binding,
|
117446
117494
|
async create(title) {
|
117447
117495
|
const id = await createKVNamespace(accountId, title);
|
117448
|
-
kv.id = id;
|
117449
117496
|
return id;
|
117450
117497
|
},
|
117451
117498
|
updateId(id) {
|
@@ -117456,41 +117503,70 @@ async function provisionBindings(bindings, accountId, scriptName, autoCreate, co
|
|
117456
117503
|
}
|
117457
117504
|
}
|
117458
117505
|
for (const r22 of bindings.r2_buckets ?? []) {
|
117459
|
-
|
117460
|
-
|
117461
|
-
|
117462
|
-
|
117463
|
-
|
117464
|
-
|
117465
|
-
|
117466
|
-
|
117467
|
-
|
117468
|
-
|
117469
|
-
|
117470
|
-
|
117471
|
-
|
117506
|
+
(0, import_node_assert10.default)(typeof r22.bucket_name !== "symbol");
|
117507
|
+
if (inBindingSettings(settings, "r2_bucket", r22.binding, {
|
117508
|
+
bucket_name: r22.bucket_name
|
117509
|
+
})) {
|
117510
|
+
r22.bucket_name = INHERIT_SYMBOL;
|
117511
|
+
} else {
|
117512
|
+
if (r22.bucket_name) {
|
117513
|
+
try {
|
117514
|
+
await getR2Bucket(accountId, r22.bucket_name);
|
117515
|
+
continue;
|
117516
|
+
} catch (e7) {
|
117517
|
+
if (!(e7 instanceof APIError && e7.code === 10006)) {
|
117518
|
+
throw e7;
|
117472
117519
|
}
|
117473
|
-
}
|
117520
|
+
}
|
117474
117521
|
}
|
117522
|
+
pendingResources.r2_buckets?.push({
|
117523
|
+
binding: r22.binding,
|
117524
|
+
name: r22.bucket_name,
|
117525
|
+
async create(bucketName) {
|
117526
|
+
await createR2Bucket(
|
117527
|
+
accountId,
|
117528
|
+
bucketName,
|
117529
|
+
void 0,
|
117530
|
+
// respect jurisdiction if it has been specified in the config, but don't prompt
|
117531
|
+
r22.jurisdiction
|
117532
|
+
);
|
117533
|
+
return bucketName;
|
117534
|
+
},
|
117535
|
+
updateId(bucketName) {
|
117536
|
+
r22.bucket_name = bucketName;
|
117537
|
+
}
|
117538
|
+
});
|
117475
117539
|
}
|
117476
117540
|
}
|
117477
117541
|
for (const d12 of bindings.d1_databases ?? []) {
|
117478
117542
|
if (!d12.database_id) {
|
117479
|
-
|
117480
|
-
|
117481
|
-
|
117482
|
-
|
117483
|
-
|
117484
|
-
|
117485
|
-
|
117486
|
-
|
117487
|
-
|
117488
|
-
|
117489
|
-
|
117490
|
-
d12.database_id =
|
117543
|
+
const maybeInherited = inBindingSettings(settings, "d1", d12.binding);
|
117544
|
+
if (maybeInherited) {
|
117545
|
+
if (!d12.database_name) {
|
117546
|
+
d12.database_id = INHERIT_SYMBOL;
|
117547
|
+
continue;
|
117548
|
+
} else {
|
117549
|
+
const dbFromId = await getDatabaseInfoFromId(
|
117550
|
+
accountId,
|
117551
|
+
maybeInherited.id
|
117552
|
+
);
|
117553
|
+
if (d12.database_name === dbFromId.name) {
|
117554
|
+
d12.database_id = INHERIT_SYMBOL;
|
117555
|
+
continue;
|
117491
117556
|
}
|
117492
|
-
}
|
117557
|
+
}
|
117493
117558
|
}
|
117559
|
+
pendingResources.d1_databases?.push({
|
117560
|
+
binding: d12.binding,
|
117561
|
+
name: d12.database_name,
|
117562
|
+
async create(name2) {
|
117563
|
+
const db = await createD1Database(accountId, name2);
|
117564
|
+
return db.uuid;
|
117565
|
+
},
|
117566
|
+
updateId(id) {
|
117567
|
+
d12.database_id = id;
|
117568
|
+
}
|
117569
|
+
});
|
117494
117570
|
}
|
117495
117571
|
}
|
117496
117572
|
if (Object.values(pendingResources).some((v7) => v7 && v7.length > 0)) {
|
@@ -117543,9 +117619,18 @@ async function provisionBindings(bindings, accountId, scriptName, autoCreate, co
|
|
117543
117619
|
}
|
117544
117620
|
}
|
117545
117621
|
__name(provisionBindings, "provisionBindings");
|
117546
|
-
function inBindingSettings(settings, type, bindingName) {
|
117622
|
+
function inBindingSettings(settings, type, bindingName, other) {
|
117547
117623
|
return settings?.bindings.find(
|
117548
|
-
(binding) =>
|
117624
|
+
(binding) => {
|
117625
|
+
if (other) {
|
117626
|
+
for (const [k6, v7] of Object.entries(other)) {
|
117627
|
+
if (other[k6] !== v7) {
|
117628
|
+
return false;
|
117629
|
+
}
|
117630
|
+
}
|
117631
|
+
}
|
117632
|
+
return binding.type === type && binding.name === bindingName;
|
117633
|
+
}
|
117549
117634
|
);
|
117550
117635
|
}
|
117551
117636
|
__name(inBindingSettings, "inBindingSettings");
|
@@ -117575,61 +117660,79 @@ async function runProvisioningFlow(pending, preExisting, friendlyBindingName, re
|
|
117575
117660
|
}
|
117576
117661
|
for (const item of pending) {
|
117577
117662
|
logger.log("Provisioning", item.binding, `(${friendlyBindingName})...`);
|
117578
|
-
let name2 =
|
117663
|
+
let name2 = item.name;
|
117579
117664
|
let selected;
|
117580
|
-
if (
|
117581
|
-
|
117582
|
-
|
117583
|
-
|
117584
|
-
|
117585
|
-
|
117586
|
-
|
117587
|
-
|
117588
|
-
|
117589
|
-
|
117590
|
-
|
117591
|
-
|
117592
|
-
const defaultValue = `${scriptName}-${item.binding.toLowerCase().replace("_", "-")}`;
|
117593
|
-
name2 = autoCreate ? defaultValue : await prompt(`Enter a name for your new ${friendlyBindingName}`, {
|
117594
|
-
defaultValue
|
117595
|
-
});
|
117596
|
-
logger.log(`\u{1F300} Creating new ${friendlyBindingName} "${name2}"...`);
|
117597
|
-
await item.create(name2);
|
117598
|
-
} else if (selected === SEARCH_OPTION_VALUE) {
|
117599
|
-
let searchedResource;
|
117600
|
-
while (searchedResource === void 0) {
|
117601
|
-
const input = await prompt(
|
117602
|
-
`Enter the ${resourceKeyDescriptor} for an existing ${friendlyBindingName}`
|
117665
|
+
if (name2) {
|
117666
|
+
logger.log("Resource name found in config:", name2);
|
117667
|
+
const foundResourceId = preExisting.find(
|
117668
|
+
(r7) => r7.title === name2
|
117669
|
+
)?.value;
|
117670
|
+
if (foundResourceId) {
|
117671
|
+
logger.log("Existing resource found with that name.");
|
117672
|
+
item.updateId(foundResourceId);
|
117673
|
+
} else {
|
117674
|
+
logger.log("No pre-existing resource found with that name");
|
117675
|
+
logger.debug(
|
117676
|
+
"If you have many resources, we may not have searched through them all. Please provide the id in that case. This is a temporary limitation."
|
117603
117677
|
);
|
117604
|
-
|
117605
|
-
|
117606
|
-
|
117607
|
-
|
117608
|
-
|
117609
|
-
|
117610
|
-
|
117678
|
+
const proceed = autoCreate ? true : await confirm(
|
117679
|
+
`Would you like to create a new ${friendlyBindingName} named "${name2}"?`
|
117680
|
+
);
|
117681
|
+
if (!proceed) {
|
117682
|
+
throw new UserError("Resource provisioning cancelled.");
|
117683
|
+
}
|
117684
|
+
logger.log(`\u{1F300} Creating new ${friendlyBindingName} "${name2}"...`);
|
117685
|
+
const id = await item.create(name2);
|
117686
|
+
item.updateId(id);
|
117687
|
+
}
|
117688
|
+
} else {
|
117689
|
+
if (options30.length === 0 || autoCreate) {
|
117690
|
+
selected = NEW_OPTION_VALUE;
|
117691
|
+
} else {
|
117692
|
+
selected = await select(
|
117693
|
+
`Would you like to connect an existing ${friendlyBindingName} or create a new one?`,
|
117694
|
+
{
|
117695
|
+
choices: options30.concat([
|
117696
|
+
{ title: "Create new", value: NEW_OPTION_VALUE }
|
117697
|
+
]),
|
117698
|
+
defaultOption: options30.length
|
117611
117699
|
}
|
117700
|
+
);
|
117701
|
+
}
|
117702
|
+
if (selected === NEW_OPTION_VALUE) {
|
117703
|
+
const defaultValue = `${scriptName}-${item.binding.toLowerCase().replace("_", "-")}`;
|
117704
|
+
name2 = autoCreate ? defaultValue : await prompt(`Enter a name for your new ${friendlyBindingName}`, {
|
117705
|
+
defaultValue
|
117612
117706
|
});
|
117613
|
-
|
117614
|
-
|
117615
|
-
|
117707
|
+
logger.log(`\u{1F300} Creating new ${friendlyBindingName} "${name2}"...`);
|
117708
|
+
const id = await item.create(name2);
|
117709
|
+
item.updateId(id);
|
117710
|
+
} else if (selected === SEARCH_OPTION_VALUE) {
|
117711
|
+
let foundResource;
|
117712
|
+
while (foundResource === void 0) {
|
117713
|
+
const input = await prompt(
|
117714
|
+
`Enter the ${resourceKeyDescriptor} for an existing ${friendlyBindingName}`
|
117616
117715
|
);
|
117716
|
+
foundResource = preExisting.find(
|
117717
|
+
(r7) => r7.title === input || r7.value === input
|
117718
|
+
);
|
117719
|
+
if (foundResource) {
|
117720
|
+
name2 = foundResource.title;
|
117721
|
+
item.updateId(foundResource.value);
|
117722
|
+
} else {
|
117723
|
+
logger.log(
|
117724
|
+
`No ${friendlyBindingName} with that ${resourceKeyDescriptor} "${input}" found. Please try again.`
|
117725
|
+
);
|
117726
|
+
}
|
117617
117727
|
}
|
117618
|
-
}
|
117619
|
-
|
117620
|
-
|
117621
|
-
|
117622
|
-
|
117728
|
+
} else {
|
117729
|
+
const selectedResource = preExisting.find(
|
117730
|
+
(r7) => r7.value === selected
|
117731
|
+
);
|
117732
|
+
if (selectedResource) {
|
117733
|
+
name2 = selectedResource.title;
|
117623
117734
|
item.updateId(selected);
|
117624
|
-
return true;
|
117625
|
-
} else {
|
117626
|
-
return false;
|
117627
117735
|
}
|
117628
|
-
});
|
117629
|
-
if (!selectedResource) {
|
117630
|
-
throw new FatalError(
|
117631
|
-
`${friendlyBindingName} with id ${selected} not found`
|
117632
|
-
);
|
117633
117736
|
}
|
117634
117737
|
}
|
117635
117738
|
logger.log(`\u2728 ${item.binding} provisioned with ${name2}`);
|
@@ -117706,11 +117809,11 @@ var path24 = __toESM(require("node:path"));
|
|
117706
117809
|
|
117707
117810
|
// src/utils/dedent.ts
|
117708
117811
|
init_import_meta_url();
|
117709
|
-
var
|
117812
|
+
var import_node_assert11 = __toESM(require("node:assert"));
|
117710
117813
|
function dedent2(strings, ...values) {
|
117711
117814
|
const raw = String.raw({ raw: strings }, ...values);
|
117712
117815
|
let lines = raw.split("\n");
|
117713
|
-
(0,
|
117816
|
+
(0, import_node_assert11.default)(lines.length > 0);
|
117714
117817
|
if (lines[lines.length - 1].trim() === "") {
|
117715
117818
|
lines = lines.slice(0, lines.length - 1);
|
117716
117819
|
}
|
@@ -117874,19 +117977,19 @@ __name(dedupeModulesByName, "dedupeModulesByName");
|
|
117874
117977
|
|
117875
117978
|
// src/deployment-bundle/entry-point-from-metafile.ts
|
117876
117979
|
init_import_meta_url();
|
117877
|
-
var
|
117980
|
+
var import_node_assert12 = __toESM(require("node:assert"));
|
117878
117981
|
function getEntryPointFromMetafile(entryFile, metafile) {
|
117879
117982
|
const entryPoints = Object.entries(metafile.outputs).filter(
|
117880
117983
|
([_path, output]) => output.entryPoint !== void 0
|
117881
117984
|
);
|
117882
117985
|
if (entryPoints.length !== 1) {
|
117883
117986
|
const entryPointList = entryPoints.map(([_input, output]) => output.entryPoint).join("\n");
|
117884
|
-
(0,
|
117987
|
+
(0, import_node_assert12.default)(
|
117885
117988
|
entryPoints.length > 0,
|
117886
117989
|
`Cannot find entry-point "${entryFile}" in generated bundle.
|
117887
117990
|
${entryPointList}`
|
117888
117991
|
);
|
117889
|
-
(0,
|
117992
|
+
(0, import_node_assert12.default)(
|
117890
117993
|
entryPoints.length < 2,
|
117891
117994
|
`More than one entry-point found for generated bundle.
|
117892
117995
|
${entryPointList}`
|
@@ -117983,13 +118086,14 @@ var asyncLocalStoragePlugin = {
|
|
117983
118086
|
init_import_meta_url();
|
117984
118087
|
var import_node_module2 = require("node:module");
|
117985
118088
|
var import_node_path22 = __toESM(require("node:path"));
|
118089
|
+
var import_unenv_preset = require("@cloudflare/unenv-preset");
|
117986
118090
|
var import_unenv = require("unenv");
|
117987
118091
|
var REQUIRED_NODE_BUILT_IN_NAMESPACE = "node-built-in-modules";
|
117988
118092
|
var REQUIRED_UNENV_ALIAS_NAMESPACE = "required-unenv-alias";
|
117989
118093
|
function nodejsHybridPlugin(unenvResolvePaths) {
|
117990
118094
|
const { env: env6 } = (0, import_unenv.defineEnv)({
|
117991
118095
|
nodeCompat: true,
|
117992
|
-
presets: [
|
118096
|
+
presets: [import_unenv_preset.cloudflare],
|
117993
118097
|
resolve: {
|
117994
118098
|
paths: unenvResolvePaths
|
117995
118099
|
}
|
@@ -117997,7 +118101,7 @@ function nodejsHybridPlugin(unenvResolvePaths) {
|
|
117997
118101
|
const { alias, inject, external } = env6;
|
117998
118102
|
const unresolvedAlias = (0, import_unenv.defineEnv)({
|
117999
118103
|
nodeCompat: true,
|
118000
|
-
presets: [
|
118104
|
+
presets: [import_unenv_preset.cloudflare],
|
118001
118105
|
resolve: false
|
118002
118106
|
}).env.alias;
|
118003
118107
|
return {
|
@@ -118679,7 +118783,7 @@ __name(printOffendingDependencies, "printOffendingDependencies");
|
|
118679
118783
|
|
118680
118784
|
// src/deployment-bundle/create-worker-upload-form.ts
|
118681
118785
|
init_import_meta_url();
|
118682
|
-
var
|
118786
|
+
var import_node_assert13 = __toESM(require("node:assert"));
|
118683
118787
|
var import_node_fs12 = require("node:fs");
|
118684
118788
|
var import_node_path24 = __toESM(require("node:path"));
|
118685
118789
|
var import_undici5 = __toESM(require_undici());
|
@@ -119042,7 +119146,7 @@ function createWorkerUploadForm(worker) {
|
|
119042
119146
|
const manifestModuleName = "__STATIC_CONTENT_MANIFEST";
|
119043
119147
|
const hasManifest = modules?.some(({ name: name2 }) => name2 === manifestModuleName);
|
119044
119148
|
if (hasManifest && main2.type === "esm") {
|
119045
|
-
(0,
|
119149
|
+
(0, import_node_assert13.default)(modules !== void 0);
|
119046
119150
|
const subDirs = new Set(
|
119047
119151
|
modules.map((module3) => import_node_path24.default.posix.dirname(module3.name))
|
119048
119152
|
);
|
@@ -119257,10 +119361,10 @@ __name(validateNodeCompatMode, "validateNodeCompatMode");
|
|
119257
119361
|
|
119258
119362
|
// src/durable.ts
|
119259
119363
|
init_import_meta_url();
|
119260
|
-
var
|
119364
|
+
var import_node_assert14 = __toESM(require("node:assert"));
|
119261
119365
|
async function getMigrationsToUpload(scriptName, props) {
|
119262
119366
|
const { config, accountId } = props;
|
119263
|
-
(0,
|
119367
|
+
(0, import_node_assert14.default)(accountId, "Missing accountId");
|
119264
119368
|
let migrations;
|
119265
119369
|
if (config.migrations.length > 0) {
|
119266
119370
|
let script;
|
@@ -119898,7 +120002,7 @@ __name(isNavigatorDefined, "isNavigatorDefined");
|
|
119898
120002
|
|
119899
120003
|
// src/sites.ts
|
119900
120004
|
init_import_meta_url();
|
119901
|
-
var
|
120005
|
+
var import_node_assert15 = __toESM(require("node:assert"));
|
119902
120006
|
var import_promises7 = require("node:fs/promises");
|
119903
120007
|
var path30 = __toESM(require("node:path"));
|
119904
120008
|
|
@@ -120027,7 +120131,7 @@ async function syncLegacyAssets(accountId, scriptName, siteAssets, preview, dryR
|
|
120027
120131
|
logger.log("(Note: doing a dry run, not uploading or deleting anything.)");
|
120028
120132
|
return { manifest: void 0, namespace: void 0 };
|
120029
120133
|
}
|
120030
|
-
(0,
|
120134
|
+
(0, import_node_assert15.default)(accountId, "Missing accountId");
|
120031
120135
|
const title = `__${scriptName}-workers_sites_assets${preview ? "_preview" : ""}`;
|
120032
120136
|
const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(
|
120033
120137
|
title,
|
@@ -121671,7 +121775,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
|
|
121671
121775
|
);
|
121672
121776
|
}
|
121673
121777
|
const scriptName = props.name;
|
121674
|
-
(0,
|
121778
|
+
(0, import_node_assert16.default)(
|
121675
121779
|
!config.site || config.site.bucket,
|
121676
121780
|
"A [site] definition requires a `bucket` field with a path to the site's assets directory."
|
121677
121781
|
);
|
@@ -121900,14 +122004,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
|
|
121900
122004
|
if (props.dryRun) {
|
121901
122005
|
printBindings({ ...withoutStaticAssets, vars: maskedVars });
|
121902
122006
|
} else {
|
121903
|
-
(0,
|
121904
|
-
await provisionBindings(
|
122007
|
+
(0, import_node_assert16.default)(accountId, "Missing accountId");
|
122008
|
+
getFlag("RESOURCES_PROVISION") ? await provisionBindings(
|
121905
122009
|
bindings,
|
121906
122010
|
accountId,
|
121907
122011
|
scriptName,
|
121908
122012
|
props.experimentalAutoCreate,
|
121909
122013
|
props.config
|
121910
|
-
);
|
122014
|
+
) : null;
|
121911
122015
|
await ensureQueuesExistByConfig(config);
|
121912
122016
|
let bindingsPrinted = false;
|
121913
122017
|
try {
|
@@ -122674,7 +122778,7 @@ var BULK_UPLOAD_CONCURRENCY2 = 3;
|
|
122674
122778
|
var MAX_UPLOAD_ATTEMPTS2 = 5;
|
122675
122779
|
var MAX_UPLOAD_GATEWAY_ERRORS2 = 5;
|
122676
122780
|
var syncAssets = /* @__PURE__ */ __name(async (accountId, assetDirectory, scriptName, dispatchNamespace) => {
|
122677
|
-
(0,
|
122781
|
+
(0, import_node_assert17.default)(accountId, "Missing accountId");
|
122678
122782
|
logger.info("\u{1F300} Building list of assets...");
|
122679
122783
|
const manifest = await buildAssetManifest(assetDirectory);
|
122680
122784
|
const url4 = dispatchNamespace ? `/accounts/${accountId}/workers/dispatch/namespaces/${dispatchNamespace}/scripts/${scriptName}/assets-upload-session` : `/accounts/${accountId}/workers/scripts/${scriptName}/assets-upload-session`;
|
@@ -123717,7 +123821,7 @@ To learn more about Workers with assets, visit our documentation at https://deve
|
|
123717
123821
|
},
|
123718
123822
|
async handler(args) {
|
123719
123823
|
const devInstance = await startDev(args);
|
123720
|
-
(0,
|
123824
|
+
(0, import_node_assert19.default)(devInstance.devEnv !== void 0);
|
123721
123825
|
await import_node_events3.default.once(devInstance.devEnv, "teardown");
|
123722
123826
|
await Promise.all(devInstance.secondary.map((d6) => d6.teardown()));
|
123723
123827
|
if (devInstance.teardownRegistryPromise) {
|
@@ -123936,7 +124040,7 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
|
|
123936
124040
|
unregisterHotKeys?.();
|
123937
124041
|
accountId = await requireAuth(config);
|
123938
124042
|
if (hotkeysDisplayed) {
|
123939
|
-
(0,
|
124043
|
+
(0, import_node_assert19.default)(devEnv !== void 0);
|
123940
124044
|
unregisterHotKeys = registerDevHotKeys(
|
123941
124045
|
Array.isArray(devEnv) ? devEnv[0] : devEnv,
|
123942
124046
|
args
|
@@ -123997,7 +124101,7 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
|
|
123997
124101
|
});
|
123998
124102
|
if (!args.disableDevRegistry) {
|
123999
124103
|
teardownRegistryPromise = devRegistry2((registry) => {
|
124000
|
-
(0,
|
124104
|
+
(0, import_node_assert19.default)(devEnv !== void 0 && !Array.isArray(devEnv));
|
124001
124105
|
void updateDevEnvRegistry(devEnv, registry);
|
124002
124106
|
});
|
124003
124107
|
devEnv.runtimes.forEach((runtime) => {
|
@@ -124005,7 +124109,7 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
|
|
124005
124109
|
"reloadComplete",
|
124006
124110
|
async (reloadEvent) => {
|
124007
124111
|
if (!reloadEvent.config.dev?.remote) {
|
124008
|
-
(0,
|
124112
|
+
(0, import_node_assert19.default)(devEnv !== void 0 && !Array.isArray(devEnv));
|
124009
124113
|
const { url: url4 } = await devEnv.proxy.ready.promise;
|
124010
124114
|
await maybeRegisterLocalWorker(
|
124011
124115
|
url4,
|
@@ -124036,7 +124140,7 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
|
|
124036
124140
|
...Array.isArray(devEnv) ? devEnv.map((d6) => d6.teardown()) : [devEnv?.teardown()],
|
124037
124141
|
(async () => {
|
124038
124142
|
if (teardownRegistryPromise) {
|
124039
|
-
(0,
|
124143
|
+
(0, import_node_assert19.default)(devEnv === void 0 || !Array.isArray(devEnv));
|
124040
124144
|
const teardownRegistry = await teardownRegistryPromise;
|
124041
124145
|
await teardownRegistry(devEnv?.config.latestConfig?.name);
|
124042
124146
|
}
|
@@ -125915,7 +126019,7 @@ init_import_meta_url();
|
|
125915
126019
|
|
125916
126020
|
// src/api/startDevWorker/DevEnv.ts
|
125917
126021
|
init_import_meta_url();
|
125918
|
-
var
|
126022
|
+
var import_node_assert23 = __toESM(require("node:assert"));
|
125919
126023
|
var import_node_events5 = require("node:events");
|
125920
126024
|
|
125921
126025
|
// src/api/startDevWorker/BundlerController.ts
|
@@ -126024,7 +126128,7 @@ __name(fileExists, "fileExists");
|
|
126024
126128
|
|
126025
126129
|
// src/dev/use-esbuild.ts
|
126026
126130
|
init_import_meta_url();
|
126027
|
-
var
|
126131
|
+
var import_node_assert20 = __toESM(require("node:assert"));
|
126028
126132
|
var import_node_fs25 = require("node:fs");
|
126029
126133
|
var import_node_path49 = __toESM(require("node:path"));
|
126030
126134
|
init_esm2();
|
@@ -126077,7 +126181,7 @@ function runBuild({
|
|
126077
126181
|
async function updateBundle() {
|
126078
126182
|
const newAdditionalModules = await getAdditionalModules();
|
126079
126183
|
setBundle((previousBundle) => {
|
126080
|
-
(0,
|
126184
|
+
(0, import_node_assert20.default)(
|
126081
126185
|
previousBundle,
|
126082
126186
|
"Rebuild triggered with no previous build available"
|
126083
126187
|
);
|
@@ -126466,7 +126570,7 @@ __name(BundlerController, "BundlerController");
|
|
126466
126570
|
|
126467
126571
|
// src/api/startDevWorker/ConfigController.ts
|
126468
126572
|
init_import_meta_url();
|
126469
|
-
var
|
126573
|
+
var import_node_assert21 = __toESM(require("node:assert"));
|
126470
126574
|
var import_node_path52 = __toESM(require("node:path"));
|
126471
126575
|
init_esm2();
|
126472
126576
|
|
@@ -126894,7 +126998,7 @@ async function resolveDevConfig(config, input) {
|
|
126894
126998
|
);
|
126895
126999
|
if (input.dev?.remote) {
|
126896
127000
|
const { accountId } = await unwrapHook(auth, config);
|
126897
|
-
(0,
|
127001
|
+
(0, import_node_assert21.default)(accountId, "Account ID must be provided for remote dev");
|
126898
127002
|
await getZoneIdForPreview({ host, routes, accountId });
|
126899
127003
|
}
|
126900
127004
|
const initialIp = input.dev?.server?.hostname ?? config.dev.ip;
|
@@ -127120,7 +127224,7 @@ var ConfigController = class extends Controller {
|
|
127120
127224
|
ignoreInitial: true
|
127121
127225
|
}).on("change", async (_event) => {
|
127122
127226
|
logger.log(`${import_node_path52.default.basename(configPath)} changed...`);
|
127123
|
-
(0,
|
127227
|
+
(0, import_node_assert21.default)(
|
127124
127228
|
this.latestInput,
|
127125
127229
|
"Cannot be watching config without having first set an input"
|
127126
127230
|
);
|
@@ -127132,7 +127236,7 @@ var ConfigController = class extends Controller {
|
|
127132
127236
|
return this.#updateConfig(input, throwErrors);
|
127133
127237
|
}
|
127134
127238
|
patch(input) {
|
127135
|
-
(0,
|
127239
|
+
(0, import_node_assert21.default)(
|
127136
127240
|
this.latestInput,
|
127137
127241
|
"Cannot call updateConfig without previously calling setConfig"
|
127138
127242
|
);
|
@@ -127365,10 +127469,10 @@ __name(createWorkerPreview, "createWorkerPreview");
|
|
127365
127469
|
|
127366
127470
|
// src/dev/remote.ts
|
127367
127471
|
init_import_meta_url();
|
127368
|
-
var
|
127472
|
+
var import_node_assert22 = __toESM(require("node:assert"));
|
127369
127473
|
var import_node_path53 = __toESM(require("node:path"));
|
127370
127474
|
function handlePreviewSessionUploadError(err, accountId) {
|
127371
|
-
(0,
|
127475
|
+
(0, import_node_assert22.default)(err && typeof err === "object");
|
127372
127476
|
if (isAbortError(err)) {
|
127373
127477
|
if ("code" in err && err.code === 10049) {
|
127374
127478
|
logger.log("Preview token expired, fetching a new one");
|
@@ -127381,7 +127485,7 @@ function handlePreviewSessionUploadError(err, accountId) {
|
|
127381
127485
|
}
|
127382
127486
|
__name(handlePreviewSessionUploadError, "handlePreviewSessionUploadError");
|
127383
127487
|
function handlePreviewSessionCreationError(err, accountId) {
|
127384
|
-
(0,
|
127488
|
+
(0, import_node_assert22.default)(err && typeof err === "object");
|
127385
127489
|
if ("code" in err && err.code === 10063) {
|
127386
127490
|
const errorMessage = "Error: You need to register a workers.dev subdomain before running the dev command in remote mode";
|
127387
127491
|
const solutionMessage = "You can either enable local mode by pressing l, or register a workers.dev subdomain here:";
|
@@ -127897,7 +128001,7 @@ function createWorkerObject(devEnv) {
|
|
127897
128001
|
return devEnv.proxy.ready.promise.then((ev) => ev.inspectorUrl);
|
127898
128002
|
},
|
127899
128003
|
get config() {
|
127900
|
-
(0,
|
128004
|
+
(0, import_node_assert23.default)(devEnv.config.latestConfig);
|
127901
128005
|
return devEnv.config.latestConfig;
|
127902
128006
|
},
|
127903
128007
|
setConfig(config) {
|
@@ -127912,7 +128016,7 @@ function createWorkerObject(devEnv) {
|
|
127912
128016
|
return proxyWorker.dispatchFetch(...args);
|
127913
128017
|
},
|
127914
128018
|
async queue(...args) {
|
127915
|
-
(0,
|
128019
|
+
(0, import_node_assert23.default)(
|
127916
128020
|
this.config.name,
|
127917
128021
|
"Worker name must be defined to use `Worker.queue()`"
|
127918
128022
|
);
|
@@ -127921,7 +128025,7 @@ function createWorkerObject(devEnv) {
|
|
127921
128025
|
return w6.queue(...args);
|
127922
128026
|
},
|
127923
128027
|
async scheduled(...args) {
|
127924
|
-
(0,
|
128028
|
+
(0, import_node_assert23.default)(
|
127925
128029
|
this.config.name,
|
127926
128030
|
"Worker name must be defined to use `Worker.scheduled()`"
|
127927
128031
|
);
|
@@ -136211,7 +136315,7 @@ __name(isNamespaceDefinition, "isNamespaceDefinition");
|
|
136211
136315
|
|
136212
136316
|
// src/core/CommandRegistry.ts
|
136213
136317
|
init_import_meta_url();
|
136214
|
-
var
|
136318
|
+
var import_node_assert24 = __toESM(require("node:assert"));
|
136215
136319
|
var BETA_CMD_COLOR = "#BD5B08";
|
136216
136320
|
var CommandRegistry = class {
|
136217
136321
|
/**
|
@@ -136465,10 +136569,10 @@ var CommandRegistry = class {
|
|
136465
136569
|
* console.log(subtree); // Output: empty Map if 'wrangler hello' has no further subcommands
|
136466
136570
|
*/
|
136467
136571
|
#resolveDefinitionNode(node2) {
|
136468
|
-
(0,
|
136572
|
+
(0, import_node_assert24.default)(node2.definition);
|
136469
136573
|
const chain2 = this.#resolveDefinitionChain(node2.definition);
|
136470
136574
|
const resolvedDef = chain2.find((def) => def.type !== "alias");
|
136471
|
-
(0,
|
136575
|
+
(0, import_node_assert24.default)(resolvedDef);
|
136472
136576
|
const { subtree } = node2.definition.type !== "alias" ? node2 : this.#findNodeFor(resolvedDef.command) ?? node2;
|
136473
136577
|
const definition = {
|
136474
136578
|
// take all properties from the resolved alias
|
@@ -139496,53 +139600,6 @@ function Database(yargs) {
|
|
139496
139600
|
}
|
139497
139601
|
__name(Database, "Database");
|
139498
139602
|
|
139499
|
-
// src/d1/utils.ts
|
139500
|
-
init_import_meta_url();
|
139501
|
-
function getDatabaseInfoFromConfig(config, name2) {
|
139502
|
-
for (const d1Database of config.d1_databases) {
|
139503
|
-
if (d1Database.database_id && (name2 === d1Database.database_name || name2 === d1Database.binding)) {
|
139504
|
-
if (!d1Database.database_name) {
|
139505
|
-
throw new UserError(
|
139506
|
-
`${name2} bindings must have a "database_name" field`
|
139507
|
-
);
|
139508
|
-
}
|
139509
|
-
return {
|
139510
|
-
uuid: d1Database.database_id,
|
139511
|
-
previewDatabaseUuid: d1Database.preview_database_id,
|
139512
|
-
binding: d1Database.binding,
|
139513
|
-
name: d1Database.database_name,
|
139514
|
-
migrationsTableName: d1Database.migrations_table || DEFAULT_MIGRATION_TABLE,
|
139515
|
-
migrationsFolderPath: d1Database.migrations_dir || DEFAULT_MIGRATION_PATH,
|
139516
|
-
internal_env: d1Database.database_internal_env
|
139517
|
-
};
|
139518
|
-
}
|
139519
|
-
}
|
139520
|
-
return null;
|
139521
|
-
}
|
139522
|
-
__name(getDatabaseInfoFromConfig, "getDatabaseInfoFromConfig");
|
139523
|
-
var getDatabaseByNameOrBinding = /* @__PURE__ */ __name(async (config, accountId, name2) => {
|
139524
|
-
const dbFromConfig = getDatabaseInfoFromConfig(config, name2);
|
139525
|
-
if (dbFromConfig) {
|
139526
|
-
return dbFromConfig;
|
139527
|
-
}
|
139528
|
-
const allDBs = await listDatabases(accountId);
|
139529
|
-
const matchingDB = allDBs.find((db) => db.name === name2);
|
139530
|
-
if (!matchingDB) {
|
139531
|
-
throw new UserError(`Couldn't find DB with name '${name2}'`);
|
139532
|
-
}
|
139533
|
-
return matchingDB;
|
139534
|
-
}, "getDatabaseByNameOrBinding");
|
139535
|
-
var getDatabaseInfoFromId = /* @__PURE__ */ __name(async (accountId, databaseId) => {
|
139536
|
-
return await fetchResult(
|
139537
|
-
`/accounts/${accountId}/d1/database/${databaseId}`,
|
139538
|
-
{
|
139539
|
-
headers: {
|
139540
|
-
"Content-Type": "application/json"
|
139541
|
-
}
|
139542
|
-
}
|
139543
|
-
);
|
139544
|
-
}, "getDatabaseInfoFromId");
|
139545
|
-
|
139546
139603
|
// src/d1/backups.ts
|
139547
139604
|
function ListOptions(yargs) {
|
139548
139605
|
return Name(yargs);
|
@@ -139733,7 +139790,7 @@ var Handler5 = withConfig(
|
|
139733
139790
|
// src/d1/execute.ts
|
139734
139791
|
init_import_meta_url();
|
139735
139792
|
var import_fs13 = require("fs");
|
139736
|
-
var
|
139793
|
+
var import_node_assert25 = __toESM(require("node:assert"));
|
139737
139794
|
var import_node_path54 = __toESM(require("node:path"));
|
139738
139795
|
var import_md5_file = __toESM(require_md5_file());
|
139739
139796
|
var import_miniflare22 = require("miniflare");
|
@@ -140087,7 +140144,7 @@ async function executeLocally({
|
|
140087
140144
|
} finally {
|
140088
140145
|
await mf.dispose();
|
140089
140146
|
}
|
140090
|
-
(0,
|
140147
|
+
(0, import_node_assert25.default)(Array.isArray(results));
|
140091
140148
|
const allResults = results.map((result) => ({
|
140092
140149
|
results: (result.results ?? []).map(
|
140093
140150
|
(row) => Object.fromEntries(
|
@@ -140803,7 +140860,7 @@ init_import_meta_url();
|
|
140803
140860
|
|
140804
140861
|
// src/d1/migrations/apply.ts
|
140805
140862
|
init_import_meta_url();
|
140806
|
-
var
|
140863
|
+
var import_node_assert26 = __toESM(require("node:assert"));
|
140807
140864
|
var import_node_fs27 = __toESM(require("node:fs"));
|
140808
140865
|
var import_path13 = __toESM(require("path"));
|
140809
140866
|
|
@@ -141043,7 +141100,7 @@ Your database may not be available to serve requests during the migration, conti
|
|
141043
141100
|
return;
|
141044
141101
|
}
|
141045
141102
|
if (!(local || preview)) {
|
141046
|
-
(0,
|
141103
|
+
(0, import_node_assert26.default)(
|
141047
141104
|
databaseInfo,
|
141048
141105
|
"In non-local mode `databaseInfo` should be defined."
|
141049
141106
|
);
|
@@ -141686,7 +141743,7 @@ __name(checkAndConfirmForceDeleteIfNecessary, "checkAndConfirmForceDeleteIfNeces
|
|
141686
141743
|
|
141687
141744
|
// src/deploy/index.ts
|
141688
141745
|
init_import_meta_url();
|
141689
|
-
var
|
141746
|
+
var import_node_assert27 = __toESM(require("node:assert"));
|
141690
141747
|
var import_node_path56 = __toESM(require("node:path"));
|
141691
141748
|
|
141692
141749
|
// src/match-tag.ts
|
@@ -141977,12 +142034,12 @@ To learn more about Workers with assets, visit our documentation at https://deve
|
|
141977
142034
|
}
|
141978
142035
|
const beforeUpload = Date.now();
|
141979
142036
|
const name2 = getScriptName(args, config);
|
141980
|
-
(0,
|
142037
|
+
(0, import_node_assert27.default)(
|
141981
142038
|
name2,
|
141982
142039
|
'You need to provide a name when publishing a worker. Either pass it as a cli arg with `--name <name>` or in your config file as `name = "<name>"`'
|
141983
142040
|
);
|
141984
142041
|
if (!args.dryRun) {
|
141985
|
-
(0,
|
142042
|
+
(0, import_node_assert27.default)(accountId, "Missing account ID");
|
141986
142043
|
await verifyWorkerMatchesCITag(accountId, name2, config.configPath);
|
141987
142044
|
}
|
141988
142045
|
const { sourceMapSize, versionId, workerTag, targets } = await deploy({
|
@@ -142326,7 +142383,7 @@ init_import_meta_url();
|
|
142326
142383
|
|
142327
142384
|
// src/docs/helpers.ts
|
142328
142385
|
init_import_meta_url();
|
142329
|
-
var
|
142386
|
+
var import_node_assert28 = __toESM(require("node:assert"));
|
142330
142387
|
var import_undici18 = __toESM(require_undici());
|
142331
142388
|
async function runSearch(searchTerm) {
|
142332
142389
|
const id = "8MU1G3QO9P";
|
@@ -142337,8 +142394,8 @@ async function runSearch(searchTerm) {
|
|
142337
142394
|
hitsPerPage: "1",
|
142338
142395
|
getRankingInfo: "0"
|
142339
142396
|
});
|
142340
|
-
(0,
|
142341
|
-
(0,
|
142397
|
+
(0, import_node_assert28.default)(id, "Missing Algolia App ID");
|
142398
|
+
(0, import_node_assert28.default)(key, "Missing Algolia Key");
|
142342
142399
|
const searchResp = await (0, import_undici18.fetch)(
|
142343
142400
|
`https://${id}-dsn.algolia.net/1/indexes/${index}/query`,
|
142344
142401
|
{
|
@@ -152398,7 +152455,7 @@ __name(HeadBucketCommand, "HeadBucketCommand");
|
|
152398
152455
|
|
152399
152456
|
// src/pipelines/client.ts
|
152400
152457
|
init_import_meta_url();
|
152401
|
-
var
|
152458
|
+
var import_node_assert29 = __toESM(require("node:assert"));
|
152402
152459
|
var import_node_http2 = __toESM(require("node:http"));
|
152403
152460
|
var import_promises30 = require("node:timers/promises");
|
152404
152461
|
var API_HEADERS = {
|
@@ -152410,7 +152467,7 @@ async function generateR2ServiceToken(accountId, bucketName, pipelineName) {
|
|
152410
152467
|
const timeoutPromise = (0, import_promises30.setTimeout)(12e4, "timeout", { signal });
|
152411
152468
|
const serverPromise = new Promise((resolve24, reject) => {
|
152412
152469
|
const server = import_node_http2.default.createServer(async (request4, response) => {
|
152413
|
-
(0,
|
152470
|
+
(0, import_node_assert29.default)(request4.url, "This request doesn't have a URL");
|
152414
152471
|
if (request4.method !== "GET") {
|
152415
152472
|
response.writeHead(405);
|
152416
152473
|
response.end("Method not allowed.");
|
@@ -165518,6 +165575,10 @@ function typesOptions(yargs) {
|
|
165518
165575
|
type: "string",
|
165519
165576
|
describe: "The path of the generated runtime types file",
|
165520
165577
|
demandOption: false
|
165578
|
+
}).option("strict-vars", {
|
165579
|
+
type: "boolean",
|
165580
|
+
default: true,
|
165581
|
+
describe: "Generate literal and union types for variables"
|
165521
165582
|
});
|
165522
165583
|
}
|
165523
165584
|
__name(typesOptions, "typesOptions");
|
@@ -165574,7 +165635,7 @@ async function typesHandler(args) {
|
|
165574
165635
|
);
|
165575
165636
|
const configBindingsWithSecrets = {
|
165576
165637
|
kv_namespaces: config.kv_namespaces ?? [],
|
165577
|
-
vars:
|
165638
|
+
vars: collectAllVars(args),
|
165578
165639
|
wasm_modules: config.wasm_modules,
|
165579
165640
|
text_blobs: {
|
165580
165641
|
...config.text_blobs
|
@@ -165642,20 +165703,6 @@ function generateImportSpecifier(from, to) {
|
|
165642
165703
|
}
|
165643
165704
|
}
|
165644
165705
|
__name(generateImportSpecifier, "generateImportSpecifier");
|
165645
|
-
function constructType(key, value, useRawVal = true) {
|
165646
|
-
const typeKey = constructTypeKey(key);
|
165647
|
-
if (typeof value === "string") {
|
165648
|
-
if (useRawVal) {
|
165649
|
-
return `${typeKey}: ${value};`;
|
165650
|
-
}
|
165651
|
-
return `${typeKey}: ${JSON.stringify(value)};`;
|
165652
|
-
}
|
165653
|
-
if (typeof value === "number" || typeof value === "boolean") {
|
165654
|
-
return `${typeKey}: ${value};`;
|
165655
|
-
}
|
165656
|
-
return `${typeKey}: unknown;`;
|
165657
|
-
}
|
165658
|
-
__name(constructType, "constructType");
|
165659
165706
|
async function generateTypes(configToDTS, config, envInterface, outputPath) {
|
165660
165707
|
const configContainsEntrypoint = config.main !== void 0 || !!config.site?.["entry-point"];
|
165661
165708
|
let entrypoint;
|
@@ -165677,26 +165724,25 @@ async function generateTypes(configToDTS, config, envInterface, outputPath) {
|
|
165677
165724
|
const envTypeStructure = [];
|
165678
165725
|
if (configToDTS.kv_namespaces) {
|
165679
165726
|
for (const kvNamespace2 of configToDTS.kv_namespaces) {
|
165680
|
-
envTypeStructure.push(
|
165727
|
+
envTypeStructure.push([
|
165728
|
+
constructTypeKey(kvNamespace2.binding),
|
165729
|
+
"KVNamespace"
|
165730
|
+
]);
|
165681
165731
|
}
|
165682
165732
|
}
|
165683
165733
|
if (configToDTS.vars) {
|
165684
165734
|
const vars = Object.entries(configToDTS.vars).filter(
|
165685
165735
|
([key]) => !(key in configToDTS.secrets)
|
165686
165736
|
);
|
165687
|
-
for (const [varName,
|
165688
|
-
|
165689
|
-
|
165690
|
-
|
165691
|
-
|
165692
|
-
envTypeStructure.push(
|
165693
|
-
constructType(varName, JSON.stringify(varValue), true)
|
165694
|
-
);
|
165695
|
-
}
|
165737
|
+
for (const [varName, varValues] of vars) {
|
165738
|
+
envTypeStructure.push([
|
165739
|
+
constructTypeKey(varName),
|
165740
|
+
varValues.length === 1 ? varValues[0] : varValues.join(" | ")
|
165741
|
+
]);
|
165696
165742
|
}
|
165697
165743
|
}
|
165698
165744
|
for (const secretName in configToDTS.secrets) {
|
165699
|
-
envTypeStructure.push(
|
165745
|
+
envTypeStructure.push([constructTypeKey(secretName), "string"]);
|
165700
165746
|
}
|
165701
165747
|
if (configToDTS.durable_objects?.bindings) {
|
165702
165748
|
const importPath = entrypoint ? generateImportSpecifier(fullOutputPath, entrypoint.file) : void 0;
|
@@ -165712,106 +165758,122 @@ async function generateTypes(configToDTS, config, envInterface, outputPath) {
|
|
165712
165758
|
} else {
|
165713
165759
|
typeName = `DurableObjectNamespace /* ${durableObject.class_name} */`;
|
165714
165760
|
}
|
165715
|
-
envTypeStructure.push(
|
165761
|
+
envTypeStructure.push([constructTypeKey(durableObject.name), typeName]);
|
165716
165762
|
}
|
165717
165763
|
}
|
165718
165764
|
if (configToDTS.r2_buckets) {
|
165719
165765
|
for (const R2Bucket of configToDTS.r2_buckets) {
|
165720
|
-
envTypeStructure.push(
|
165766
|
+
envTypeStructure.push([constructTypeKey(R2Bucket.binding), "R2Bucket"]);
|
165721
165767
|
}
|
165722
165768
|
}
|
165723
165769
|
if (configToDTS.d1_databases) {
|
165724
165770
|
for (const d12 of configToDTS.d1_databases) {
|
165725
|
-
envTypeStructure.push(
|
165771
|
+
envTypeStructure.push([constructTypeKey(d12.binding), "D1Database"]);
|
165726
165772
|
}
|
165727
165773
|
}
|
165728
165774
|
if (configToDTS.services) {
|
165729
165775
|
for (const service of configToDTS.services) {
|
165730
|
-
envTypeStructure.push(
|
165776
|
+
envTypeStructure.push([constructTypeKey(service.binding), "Fetcher"]);
|
165731
165777
|
}
|
165732
165778
|
}
|
165733
165779
|
if (configToDTS.analytics_engine_datasets) {
|
165734
165780
|
for (const analyticsEngine of configToDTS.analytics_engine_datasets) {
|
165735
|
-
envTypeStructure.push(
|
165736
|
-
|
165737
|
-
|
165781
|
+
envTypeStructure.push([
|
165782
|
+
constructTypeKey(analyticsEngine.binding),
|
165783
|
+
"AnalyticsEngineDataset"
|
165784
|
+
]);
|
165738
165785
|
}
|
165739
165786
|
}
|
165740
165787
|
if (configToDTS.dispatch_namespaces) {
|
165741
165788
|
for (const namespace of configToDTS.dispatch_namespaces) {
|
165742
|
-
envTypeStructure.push(
|
165743
|
-
|
165744
|
-
|
165789
|
+
envTypeStructure.push([
|
165790
|
+
constructTypeKey(namespace.binding),
|
165791
|
+
"DispatchNamespace"
|
165792
|
+
]);
|
165745
165793
|
}
|
165746
165794
|
}
|
165747
165795
|
if (configToDTS.logfwdr?.bindings?.length) {
|
165748
|
-
envTypeStructure.push(
|
165796
|
+
envTypeStructure.push([constructTypeKey("LOGFWDR_SCHEMA"), "any"]);
|
165749
165797
|
}
|
165750
165798
|
if (configToDTS.data_blobs) {
|
165751
165799
|
for (const dataBlobs in configToDTS.data_blobs) {
|
165752
|
-
envTypeStructure.push(
|
165800
|
+
envTypeStructure.push([constructTypeKey(dataBlobs), "ArrayBuffer"]);
|
165753
165801
|
}
|
165754
165802
|
}
|
165755
165803
|
if (configToDTS.text_blobs) {
|
165756
165804
|
for (const textBlobs in configToDTS.text_blobs) {
|
165757
|
-
envTypeStructure.push(
|
165805
|
+
envTypeStructure.push([constructTypeKey(textBlobs), "string"]);
|
165758
165806
|
}
|
165759
165807
|
}
|
165760
165808
|
if (configToDTS.unsafe?.bindings) {
|
165761
165809
|
for (const unsafe of configToDTS.unsafe.bindings) {
|
165762
165810
|
if (unsafe.type === "ratelimit") {
|
165763
|
-
envTypeStructure.push(
|
165811
|
+
envTypeStructure.push([constructTypeKey(unsafe.name), "RateLimit"]);
|
165764
165812
|
} else {
|
165765
|
-
envTypeStructure.push(
|
165813
|
+
envTypeStructure.push([constructTypeKey(unsafe.name), "any"]);
|
165766
165814
|
}
|
165767
165815
|
}
|
165768
165816
|
}
|
165769
165817
|
if (configToDTS.queues) {
|
165770
165818
|
if (configToDTS.queues.producers) {
|
165771
165819
|
for (const queue of configToDTS.queues.producers) {
|
165772
|
-
envTypeStructure.push(
|
165820
|
+
envTypeStructure.push([constructTypeKey(queue.binding), "Queue"]);
|
165773
165821
|
}
|
165774
165822
|
}
|
165775
165823
|
}
|
165776
165824
|
if (configToDTS.send_email) {
|
165777
165825
|
for (const sendEmail of configToDTS.send_email) {
|
165778
|
-
envTypeStructure.push(
|
165826
|
+
envTypeStructure.push([constructTypeKey(sendEmail.name), "SendEmail"]);
|
165779
165827
|
}
|
165780
165828
|
}
|
165781
165829
|
if (configToDTS.vectorize) {
|
165782
165830
|
for (const vectorize2 of configToDTS.vectorize) {
|
165783
|
-
envTypeStructure.push(
|
165831
|
+
envTypeStructure.push([
|
165832
|
+
constructTypeKey(vectorize2.binding),
|
165833
|
+
"VectorizeIndex"
|
165834
|
+
]);
|
165784
165835
|
}
|
165785
165836
|
}
|
165786
165837
|
if (configToDTS.hyperdrive) {
|
165787
165838
|
for (const hyperdrive2 of configToDTS.hyperdrive) {
|
165788
|
-
envTypeStructure.push(
|
165839
|
+
envTypeStructure.push([
|
165840
|
+
constructTypeKey(hyperdrive2.binding),
|
165841
|
+
"Hyperdrive"
|
165842
|
+
]);
|
165789
165843
|
}
|
165790
165844
|
}
|
165791
165845
|
if (configToDTS.mtls_certificates) {
|
165792
165846
|
for (const mtlsCertificate of configToDTS.mtls_certificates) {
|
165793
|
-
envTypeStructure.push(
|
165847
|
+
envTypeStructure.push([
|
165848
|
+
constructTypeKey(mtlsCertificate.binding),
|
165849
|
+
"Fetcher"
|
165850
|
+
]);
|
165794
165851
|
}
|
165795
165852
|
}
|
165796
165853
|
if (configToDTS.browser) {
|
165797
|
-
envTypeStructure.push(
|
165798
|
-
|
165799
|
-
|
165854
|
+
envTypeStructure.push([
|
165855
|
+
constructTypeKey(configToDTS.browser.binding),
|
165856
|
+
"Fetcher"
|
165857
|
+
]);
|
165800
165858
|
}
|
165801
165859
|
if (configToDTS.ai) {
|
165802
|
-
envTypeStructure.push(
|
165860
|
+
envTypeStructure.push([constructTypeKey(configToDTS.ai.binding), "Ai"]);
|
165803
165861
|
}
|
165804
165862
|
if (configToDTS.version_metadata) {
|
165805
|
-
envTypeStructure.push(
|
165806
|
-
|
165807
|
-
|
165863
|
+
envTypeStructure.push([
|
165864
|
+
configToDTS.version_metadata.binding,
|
165865
|
+
"{ id: string; tag: string }"
|
165866
|
+
]);
|
165808
165867
|
}
|
165809
165868
|
if (configToDTS.assets?.binding) {
|
165810
|
-
envTypeStructure.push(
|
165869
|
+
envTypeStructure.push([
|
165870
|
+
constructTypeKey(configToDTS.assets.binding),
|
165871
|
+
"Fetcher"
|
165872
|
+
]);
|
165811
165873
|
}
|
165812
165874
|
if (configToDTS.workflows) {
|
165813
165875
|
for (const workflow of configToDTS.workflows) {
|
165814
|
-
envTypeStructure.push(
|
165876
|
+
envTypeStructure.push([constructTypeKey(workflow.binding), "Workflow"]);
|
165815
165877
|
}
|
165816
165878
|
}
|
165817
165879
|
const modulesTypeStructure = [];
|
@@ -165867,7 +165929,7 @@ function writeDTSFile({
|
|
165867
165929
|
const { fileContent, consoleOutput } = generateTypeStrings(
|
165868
165930
|
formatType,
|
165869
165931
|
envInterface,
|
165870
|
-
envTypeStructure,
|
165932
|
+
envTypeStructure.map(([key, value]) => `${key}: ${value};`),
|
165871
165933
|
modulesTypeStructure
|
165872
165934
|
);
|
165873
165935
|
fs28.writeFileSync(
|
@@ -165923,6 +165985,47 @@ function readTsconfigTypes(tsconfigPath) {
|
|
165923
165985
|
}
|
165924
165986
|
}
|
165925
165987
|
__name(readTsconfigTypes, "readTsconfigTypes");
|
165988
|
+
function collectAllVars(args) {
|
165989
|
+
const varsInfo = {};
|
165990
|
+
function collectEnvironmentVars(vars) {
|
165991
|
+
Object.entries(vars ?? {}).forEach(([key, value]) => {
|
165992
|
+
varsInfo[key] ??= /* @__PURE__ */ new Set();
|
165993
|
+
if (!args.strictVars) {
|
165994
|
+
varsInfo[key].add(
|
165995
|
+
Array.isArray(value) ? typeofArray(value) : typeof value
|
165996
|
+
);
|
165997
|
+
return;
|
165998
|
+
}
|
165999
|
+
if (typeof value === "number" || typeof value === "boolean") {
|
166000
|
+
varsInfo[key].add(`${value}`);
|
166001
|
+
return;
|
166002
|
+
}
|
166003
|
+
if (typeof value === "string" || typeof value === "object") {
|
166004
|
+
varsInfo[key].add(JSON.stringify(value));
|
166005
|
+
return;
|
166006
|
+
}
|
166007
|
+
varsInfo[key].add("unknown");
|
166008
|
+
});
|
166009
|
+
}
|
166010
|
+
__name(collectEnvironmentVars, "collectEnvironmentVars");
|
166011
|
+
const { rawConfig } = experimental_readRawConfig(args);
|
166012
|
+
collectEnvironmentVars(rawConfig.vars);
|
166013
|
+
Object.entries(rawConfig.env ?? {}).forEach(([_envName, env6]) => {
|
166014
|
+
collectEnvironmentVars(env6.vars);
|
166015
|
+
});
|
166016
|
+
return Object.fromEntries(
|
166017
|
+
Object.entries(varsInfo).map(([key, value]) => [key, [...value]])
|
166018
|
+
);
|
166019
|
+
}
|
166020
|
+
__name(collectAllVars, "collectAllVars");
|
166021
|
+
function typeofArray(array) {
|
166022
|
+
const typesInArray = [...new Set(array.map((item) => typeof item))].sort();
|
166023
|
+
if (typesInArray.length === 1) {
|
166024
|
+
return `${typesInArray[0]}[]`;
|
166025
|
+
}
|
166026
|
+
return `(${typesInArray.join("|")})[]`;
|
166027
|
+
}
|
166028
|
+
__name(typeofArray, "typeofArray");
|
165926
166029
|
|
165927
166030
|
// src/user/commands.ts
|
165928
166031
|
init_import_meta_url();
|
@@ -168211,7 +168314,7 @@ var versionsSecretPutCommand = createCommand({
|
|
168211
168314
|
|
168212
168315
|
// src/versions/upload.ts
|
168213
168316
|
init_import_meta_url();
|
168214
|
-
var
|
168317
|
+
var import_node_assert30 = __toESM(require("node:assert"));
|
168215
168318
|
var import_node_fs37 = require("node:fs");
|
168216
168319
|
var import_node_path67 = __toESM(require("node:path"));
|
168217
168320
|
var scriptStartupErrorRegex2 = /startup/i;
|
@@ -168436,12 +168539,12 @@ var versionsUploadCommand = createCommand({
|
|
168436
168539
|
const cliAlias = collectKeyValues(args.alias);
|
168437
168540
|
const accountId = args.dryRun ? void 0 : await requireAuth(config);
|
168438
168541
|
const name2 = getScriptName(args, config);
|
168439
|
-
(0,
|
168542
|
+
(0, import_node_assert30.default)(
|
168440
168543
|
name2,
|
168441
168544
|
'You need to provide a name when publishing a worker. Either pass it as a cli arg with `--name <name>` or in your config file as `name = "<name>"`'
|
168442
168545
|
);
|
168443
168546
|
if (!args.dryRun) {
|
168444
|
-
(0,
|
168547
|
+
(0, import_node_assert30.default)(accountId, "Missing account ID");
|
168445
168548
|
await verifyWorkerMatchesCITag(accountId, name2, config.configPath);
|
168446
168549
|
}
|
168447
168550
|
if (!args.dryRun) {
|
@@ -171144,6 +171247,7 @@ async function main(argv) {
|
|
171144
171247
|
cliHandlerThrew = true;
|
171145
171248
|
let mayReport = true;
|
171146
171249
|
let errorType;
|
171250
|
+
let loggableException = e7;
|
171147
171251
|
logger.log("");
|
171148
171252
|
if (e7 instanceof CommandLineArgsError) {
|
171149
171253
|
logger.error(e7.message);
|
@@ -171187,7 +171291,6 @@ ${tryRunningItIn}${oneOfThese}`
|
|
171187
171291
|
errorType = "BuildFailure";
|
171188
171292
|
logBuildFailure(e7.cause.errors, e7.cause.warnings);
|
171189
171293
|
} else {
|
171190
|
-
let loggableException = e7;
|
171191
171294
|
if (
|
171192
171295
|
// Is this a StartDevEnv error event? If so, unwrap the cause, which is usually the user-recognisable error
|
171193
171296
|
e7 && typeof e7 === "object" && "type" in e7 && e7.type === "error" && "cause" in e7 && e7.cause instanceof Error
|
@@ -171207,10 +171310,10 @@ ${tryRunningItIn}${oneOfThese}`
|
|
171207
171310
|
if (
|
171208
171311
|
// Only report the error if we didn't just handle it
|
171209
171312
|
mayReport && // ...and it's not a user error
|
171210
|
-
!(
|
171211
|
-
!(
|
171313
|
+
!(loggableException instanceof UserError) && // ...and it's not an un-reportable API error
|
171314
|
+
!(loggableException instanceof APIError && !loggableException.reportable)
|
171212
171315
|
) {
|
171213
|
-
await captureGlobalException(
|
171316
|
+
await captureGlobalException(loggableException);
|
171214
171317
|
}
|
171215
171318
|
const durationMs = Date.now() - startTime;
|
171216
171319
|
dispatcher?.sendCommandEvent(
|
@@ -171451,4 +171554,3 @@ yargs-parser/build/lib/index.js:
|
|
171451
171554
|
* SPDX-License-Identifier: ISC
|
171452
171555
|
*)
|
171453
171556
|
*/
|
171454
|
-
//# sourceMappingURL=cli.js.map
|