wrangler 2.20.0 → 2.20.2

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.
@@ -5018,8 +5018,8 @@ var require_util2 = __commonJS({
5018
5018
  function createDeferredPromise() {
5019
5019
  let res;
5020
5020
  let rej;
5021
- const promise = new Promise((resolve16, reject) => {
5022
- res = resolve16;
5021
+ const promise = new Promise((resolve17, reject) => {
5022
+ res = resolve17;
5023
5023
  rej = reject;
5024
5024
  });
5025
5025
  return { promise, resolve: res, reject: rej };
@@ -6475,8 +6475,8 @@ Content-Type: ${value.type || "application/octet-stream"}\r
6475
6475
  });
6476
6476
  }
6477
6477
  });
6478
- const busboyResolve = new Promise((resolve16, reject) => {
6479
- busboy.on("finish", resolve16);
6478
+ const busboyResolve = new Promise((resolve17, reject) => {
6479
+ busboy.on("finish", resolve17);
6480
6480
  busboy.on("error", (err) => reject(new TypeError(err)));
6481
6481
  });
6482
6482
  if (this.body !== null)
@@ -6921,9 +6921,9 @@ var require_dispatcher_base = __commonJS({
6921
6921
  }
6922
6922
  close(callback) {
6923
6923
  if (callback === void 0) {
6924
- return new Promise((resolve16, reject) => {
6924
+ return new Promise((resolve17, reject) => {
6925
6925
  this.close((err, data) => {
6926
- return err ? reject(err) : resolve16(data);
6926
+ return err ? reject(err) : resolve17(data);
6927
6927
  });
6928
6928
  });
6929
6929
  }
@@ -6961,9 +6961,9 @@ var require_dispatcher_base = __commonJS({
6961
6961
  err = null;
6962
6962
  }
6963
6963
  if (callback === void 0) {
6964
- return new Promise((resolve16, reject) => {
6964
+ return new Promise((resolve17, reject) => {
6965
6965
  this.destroy(err, (err2, data) => {
6966
- return err2 ? reject(err2) : resolve16(data);
6966
+ return err2 ? reject(err2) : resolve17(data);
6967
6967
  });
6968
6968
  });
6969
6969
  }
@@ -7968,16 +7968,16 @@ var require_client = __commonJS({
7968
7968
  return this[kNeedDrain] < 2;
7969
7969
  }
7970
7970
  async [kClose]() {
7971
- return new Promise((resolve16) => {
7971
+ return new Promise((resolve17) => {
7972
7972
  if (!this[kSize]) {
7973
- this.destroy(resolve16);
7973
+ this.destroy(resolve17);
7974
7974
  } else {
7975
- this[kClosedResolve] = resolve16;
7975
+ this[kClosedResolve] = resolve17;
7976
7976
  }
7977
7977
  });
7978
7978
  }
7979
7979
  async [kDestroy](err) {
7980
- return new Promise((resolve16) => {
7980
+ return new Promise((resolve17) => {
7981
7981
  const requests = this[kQueue].splice(this[kPendingIdx]);
7982
7982
  for (let i = 0; i < requests.length; i++) {
7983
7983
  const request = requests[i];
@@ -7988,7 +7988,7 @@ var require_client = __commonJS({
7988
7988
  this[kClosedResolve]();
7989
7989
  this[kClosedResolve] = null;
7990
7990
  }
7991
- resolve16();
7991
+ resolve17();
7992
7992
  }, "callback");
7993
7993
  if (!this[kSocket]) {
7994
7994
  queueMicrotask(callback);
@@ -8530,7 +8530,7 @@ var require_client = __commonJS({
8530
8530
  });
8531
8531
  }
8532
8532
  try {
8533
- const socket = await new Promise((resolve16, reject) => {
8533
+ const socket = await new Promise((resolve17, reject) => {
8534
8534
  client[kConnector]({
8535
8535
  host,
8536
8536
  hostname,
@@ -8542,7 +8542,7 @@ var require_client = __commonJS({
8542
8542
  if (err) {
8543
8543
  reject(err);
8544
8544
  } else {
8545
- resolve16(socket2);
8545
+ resolve17(socket2);
8546
8546
  }
8547
8547
  });
8548
8548
  });
@@ -8925,12 +8925,12 @@ upgrade: ${upgrade}\r
8925
8925
  }
8926
8926
  }
8927
8927
  __name(onDrain, "onDrain");
8928
- const waitForDrain = /* @__PURE__ */ __name(() => new Promise((resolve16, reject) => {
8928
+ const waitForDrain = /* @__PURE__ */ __name(() => new Promise((resolve17, reject) => {
8929
8929
  assert15(callback === null);
8930
8930
  if (socket[kError]) {
8931
8931
  reject(socket[kError]);
8932
8932
  } else {
8933
- callback = resolve16;
8933
+ callback = resolve17;
8934
8934
  }
8935
8935
  }), "waitForDrain");
8936
8936
  socket.on("close", onDrain).on("drain", onDrain);
@@ -9259,8 +9259,8 @@ var require_pool_base = __commonJS({
9259
9259
  if (this[kQueue].isEmpty()) {
9260
9260
  return Promise.all(this[kClients].map((c) => c.close()));
9261
9261
  } else {
9262
- return new Promise((resolve16) => {
9263
- this[kClosedResolve] = resolve16;
9262
+ return new Promise((resolve17) => {
9263
+ this[kClosedResolve] = resolve17;
9264
9264
  });
9265
9265
  }
9266
9266
  }
@@ -9828,11 +9828,11 @@ var require_readable = __commonJS({
9828
9828
  throw new TypeError("unusable");
9829
9829
  }
9830
9830
  assert15(!stream2[kConsume]);
9831
- return new Promise((resolve16, reject) => {
9831
+ return new Promise((resolve17, reject) => {
9832
9832
  stream2[kConsume] = {
9833
9833
  type,
9834
9834
  stream: stream2,
9835
- resolve: resolve16,
9835
+ resolve: resolve17,
9836
9836
  reject,
9837
9837
  length: 0,
9838
9838
  body: []
@@ -9869,12 +9869,12 @@ var require_readable = __commonJS({
9869
9869
  }
9870
9870
  __name(consumeStart, "consumeStart");
9871
9871
  function consumeEnd(consume2) {
9872
- const { type, body, resolve: resolve16, stream: stream2, length } = consume2;
9872
+ const { type, body, resolve: resolve17, stream: stream2, length } = consume2;
9873
9873
  try {
9874
9874
  if (type === "text") {
9875
- resolve16(toUSVString(Buffer.concat(body)));
9875
+ resolve17(toUSVString(Buffer.concat(body)));
9876
9876
  } else if (type === "json") {
9877
- resolve16(JSON.parse(Buffer.concat(body)));
9877
+ resolve17(JSON.parse(Buffer.concat(body)));
9878
9878
  } else if (type === "arrayBuffer") {
9879
9879
  const dst = new Uint8Array(length);
9880
9880
  let pos = 0;
@@ -9882,12 +9882,12 @@ var require_readable = __commonJS({
9882
9882
  dst.set(buf, pos);
9883
9883
  pos += buf.byteLength;
9884
9884
  }
9885
- resolve16(dst);
9885
+ resolve17(dst);
9886
9886
  } else if (type === "blob") {
9887
9887
  if (!Blob3) {
9888
9888
  Blob3 = require("buffer").Blob;
9889
9889
  }
9890
- resolve16(new Blob3(body, { type: stream2[kContentType] }));
9890
+ resolve17(new Blob3(body, { type: stream2[kContentType] }));
9891
9891
  }
9892
9892
  consumeFinish(consume2);
9893
9893
  } catch (err) {
@@ -10131,9 +10131,9 @@ var require_api_request = __commonJS({
10131
10131
  __name(getResolveErrorBodyCallback, "getResolveErrorBodyCallback");
10132
10132
  function request(opts, callback) {
10133
10133
  if (callback === void 0) {
10134
- return new Promise((resolve16, reject) => {
10134
+ return new Promise((resolve17, reject) => {
10135
10135
  request.call(this, opts, (err, data) => {
10136
- return err ? reject(err) : resolve16(data);
10136
+ return err ? reject(err) : resolve17(data);
10137
10137
  });
10138
10138
  });
10139
10139
  }
@@ -10288,9 +10288,9 @@ var require_api_stream = __commonJS({
10288
10288
  __name(StreamHandler, "StreamHandler");
10289
10289
  function stream2(opts, factory, callback) {
10290
10290
  if (callback === void 0) {
10291
- return new Promise((resolve16, reject) => {
10291
+ return new Promise((resolve17, reject) => {
10292
10292
  stream2.call(this, opts, factory, (err, data) => {
10293
- return err ? reject(err) : resolve16(data);
10293
+ return err ? reject(err) : resolve17(data);
10294
10294
  });
10295
10295
  });
10296
10296
  }
@@ -10579,9 +10579,9 @@ var require_api_upgrade = __commonJS({
10579
10579
  __name(UpgradeHandler, "UpgradeHandler");
10580
10580
  function upgrade(opts, callback) {
10581
10581
  if (callback === void 0) {
10582
- return new Promise((resolve16, reject) => {
10582
+ return new Promise((resolve17, reject) => {
10583
10583
  upgrade.call(this, opts, (err, data) => {
10584
- return err ? reject(err) : resolve16(data);
10584
+ return err ? reject(err) : resolve17(data);
10585
10585
  });
10586
10586
  });
10587
10587
  }
@@ -10670,9 +10670,9 @@ var require_api_connect = __commonJS({
10670
10670
  __name(ConnectHandler, "ConnectHandler");
10671
10671
  function connect2(opts, callback) {
10672
10672
  if (callback === void 0) {
10673
- return new Promise((resolve16, reject) => {
10673
+ return new Promise((resolve17, reject) => {
10674
10674
  connect2.call(this, opts, (err, data) => {
10675
- return err ? reject(err) : resolve16(data);
10675
+ return err ? reject(err) : resolve17(data);
10676
10676
  });
10677
10677
  });
10678
10678
  }
@@ -13927,7 +13927,7 @@ var require_fetch = __commonJS({
13927
13927
  async function dispatch({ body }) {
13928
13928
  const url3 = requestCurrentURL(request);
13929
13929
  const agent = fetchParams.controller.dispatcher;
13930
- return new Promise((resolve16, reject) => agent.dispatch(
13930
+ return new Promise((resolve17, reject) => agent.dispatch(
13931
13931
  {
13932
13932
  path: url3.pathname + url3.search,
13933
13933
  origin: url3.origin,
@@ -13983,7 +13983,7 @@ var require_fetch = __commonJS({
13983
13983
  }
13984
13984
  }
13985
13985
  }
13986
- resolve16({
13986
+ resolve17({
13987
13987
  status,
13988
13988
  statusText,
13989
13989
  headersList: headers[kHeadersList],
@@ -14026,7 +14026,7 @@ var require_fetch = __commonJS({
14026
14026
  const val = headersList[n + 1].toString("latin1");
14027
14027
  headers.append(key, val);
14028
14028
  }
14029
- resolve16({
14029
+ resolve17({
14030
14030
  status,
14031
14031
  statusText: STATUS_CODES[status],
14032
14032
  headersList: headers[kHeadersList],
@@ -36618,7 +36618,7 @@ var require_websocket2 = __commonJS({
36618
36618
  init_import_meta_url();
36619
36619
  var EventEmitter3 = require("events");
36620
36620
  var https2 = require("https");
36621
- var http3 = require("http");
36621
+ var http2 = require("http");
36622
36622
  var net3 = require("net");
36623
36623
  var tls = require("tls");
36624
36624
  var { randomBytes, createHash } = require("crypto");
@@ -36979,7 +36979,7 @@ var require_websocket2 = __commonJS({
36979
36979
  const isSecure = parsedUrl.protocol === "wss:" || parsedUrl.protocol === "https:";
36980
36980
  const defaultPort = isSecure ? 443 : 80;
36981
36981
  const key = randomBytes(16).toString("base64");
36982
- const get = isSecure ? https2.get : http3.get;
36982
+ const get = isSecure ? https2.get : http2.get;
36983
36983
  let perMessageDeflate;
36984
36984
  opts.createConnection = isSecure ? tlsConnect : netConnect;
36985
36985
  opts.defaultPort = opts.defaultPort || defaultPort;
@@ -37407,7 +37407,7 @@ var require_websocket_server = __commonJS({
37407
37407
  "use strict";
37408
37408
  init_import_meta_url();
37409
37409
  var EventEmitter3 = require("events");
37410
- var http3 = require("http");
37410
+ var http2 = require("http");
37411
37411
  var https2 = require("https");
37412
37412
  var net3 = require("net");
37413
37413
  var tls = require("tls");
@@ -37443,8 +37443,8 @@ var require_websocket_server = __commonJS({
37443
37443
  );
37444
37444
  }
37445
37445
  if (options14.port != null) {
37446
- this._server = http3.createServer((req, res) => {
37447
- const body = http3.STATUS_CODES[426];
37446
+ this._server = http2.createServer((req, res) => {
37447
+ const body = http2.STATUS_CODES[426];
37448
37448
  res.writeHead(426, {
37449
37449
  "Content-Length": body.length,
37450
37450
  "Content-Type": "text/plain"
@@ -37636,7 +37636,7 @@ var require_websocket_server = __commonJS({
37636
37636
  __name(socketOnError, "socketOnError");
37637
37637
  function abortHandshake(socket, code, message, headers) {
37638
37638
  if (socket.writable) {
37639
- message = message || http3.STATUS_CODES[code];
37639
+ message = message || http2.STATUS_CODES[code];
37640
37640
  headers = {
37641
37641
  Connection: "close",
37642
37642
  "Content-Type": "text/html",
@@ -37644,7 +37644,7 @@ var require_websocket_server = __commonJS({
37644
37644
  ...headers
37645
37645
  };
37646
37646
  socket.write(
37647
- `HTTP/1.1 ${code} ${http3.STATUS_CODES[code]}\r
37647
+ `HTTP/1.1 ${code} ${http2.STATUS_CODES[code]}\r
37648
37648
  ` + Object.keys(headers).map((h) => `${h}: ${headers[h]}`).join("\r\n") + "\r\n\r\n" + message
37649
37649
  );
37650
37650
  }
@@ -45202,7 +45202,7 @@ var require_backend = __commonJS({
45202
45202
  __name(bogusSelect, "bogusSelect");
45203
45203
  ;
45204
45204
  return function(data) {
45205
- return new Promise(function(resolve16, reject) {
45205
+ return new Promise(function(resolve17, reject) {
45206
45206
  _intercept = true;
45207
45207
  if (typeof data === "string") {
45208
45208
  _data = {
@@ -45221,7 +45221,7 @@ var require_backend = __commonJS({
45221
45221
  try {
45222
45222
  if (document.execCommand("copy")) {
45223
45223
  cleanup();
45224
- resolve16();
45224
+ resolve17();
45225
45225
  } else {
45226
45226
  if (!tryBogusSelect) {
45227
45227
  bogusSelect();
@@ -45249,15 +45249,15 @@ var require_backend = __commonJS({
45249
45249
  if (_intercept) {
45250
45250
  _intercept = false;
45251
45251
  e2.preventDefault();
45252
- var resolve16 = _resolve2;
45252
+ var resolve17 = _resolve2;
45253
45253
  _resolve2 = null;
45254
- resolve16(e2.clipboardData.getData(_dataType));
45254
+ resolve17(e2.clipboardData.getData(_dataType));
45255
45255
  }
45256
45256
  });
45257
45257
  return function(dataType) {
45258
- return new Promise(function(resolve16, reject) {
45258
+ return new Promise(function(resolve17, reject) {
45259
45259
  _intercept = true;
45260
- _resolve2 = resolve16;
45260
+ _resolve2 = resolve17;
45261
45261
  _dataType = dataType || "text/plain";
45262
45262
  try {
45263
45263
  if (!document.execCommand("paste")) {
@@ -45401,24 +45401,24 @@ var require_backend = __commonJS({
45401
45401
  }, module3.exports ? module3.exports = c : a.Promise || (a.Promise = c);
45402
45402
  })(this);
45403
45403
  clipboard6.copy = function(data) {
45404
- return new Promise(function(resolve16, reject) {
45404
+ return new Promise(function(resolve17, reject) {
45405
45405
  if (typeof data !== "string" && !("text/plain" in data)) {
45406
45406
  throw new Error("You must provide a text/plain type.");
45407
45407
  }
45408
45408
  var strData = typeof data === "string" ? data : data["text/plain"];
45409
45409
  var copySucceeded = window.clipboardData.setData("Text", strData);
45410
45410
  if (copySucceeded) {
45411
- resolve16();
45411
+ resolve17();
45412
45412
  } else {
45413
45413
  reject(new Error("Copying was rejected."));
45414
45414
  }
45415
45415
  });
45416
45416
  };
45417
45417
  clipboard6.paste = function() {
45418
- return new Promise(function(resolve16, reject) {
45418
+ return new Promise(function(resolve17, reject) {
45419
45419
  var strData = window.clipboardData.getData("Text");
45420
45420
  if (strData) {
45421
- resolve16(strData);
45421
+ resolve17(strData);
45422
45422
  } else {
45423
45423
  reject(new Error("Pasting was rejected."));
45424
45424
  }
@@ -55083,8 +55083,8 @@ var require_ink = __commonJS({
55083
55083
  }
55084
55084
  waitUntilExit() {
55085
55085
  if (!this.exitPromise) {
55086
- this.exitPromise = new Promise((resolve16, reject) => {
55087
- this.resolveExitPromise = resolve16;
55086
+ this.exitPromise = new Promise((resolve17, reject) => {
55087
+ this.resolveExitPromise = resolve17;
55088
55088
  this.rejectExitPromise = reject;
55089
55089
  });
55090
55090
  }
@@ -59075,20 +59075,20 @@ var require_parse_async = __commonJS({
59075
59075
  const index = 0;
59076
59076
  const blocksize = opts.blocksize || 40960;
59077
59077
  const parser2 = new TOMLParser();
59078
- return new Promise((resolve16, reject) => {
59079
- setImmediate(parseAsyncNext, index, blocksize, resolve16, reject);
59078
+ return new Promise((resolve17, reject) => {
59079
+ setImmediate(parseAsyncNext, index, blocksize, resolve17, reject);
59080
59080
  });
59081
- function parseAsyncNext(index2, blocksize2, resolve16, reject) {
59081
+ function parseAsyncNext(index2, blocksize2, resolve17, reject) {
59082
59082
  if (index2 >= str.length) {
59083
59083
  try {
59084
- return resolve16(parser2.finish());
59084
+ return resolve17(parser2.finish());
59085
59085
  } catch (err) {
59086
59086
  return reject(prettyError(err, str));
59087
59087
  }
59088
59088
  }
59089
59089
  try {
59090
59090
  parser2.parse(str.slice(index2, index2 + blocksize2));
59091
- setImmediate(parseAsyncNext, index2 + blocksize2, blocksize2, resolve16, reject);
59091
+ setImmediate(parseAsyncNext, index2 + blocksize2, blocksize2, resolve17, reject);
59092
59092
  } catch (err) {
59093
59093
  reject(prettyError(err, str));
59094
59094
  }
@@ -59118,7 +59118,7 @@ var require_parse_stream = __commonJS({
59118
59118
  function parseReadable(stm) {
59119
59119
  const parser2 = new TOMLParser();
59120
59120
  stm.setEncoding("utf8");
59121
- return new Promise((resolve16, reject) => {
59121
+ return new Promise((resolve17, reject) => {
59122
59122
  let readable;
59123
59123
  let ended = false;
59124
59124
  let errored = false;
@@ -59127,7 +59127,7 @@ var require_parse_stream = __commonJS({
59127
59127
  if (readable)
59128
59128
  return;
59129
59129
  try {
59130
- resolve16(parser2.finish());
59130
+ resolve17(parser2.finish());
59131
59131
  } catch (err) {
59132
59132
  reject(err);
59133
59133
  }
@@ -59654,12 +59654,12 @@ var require_isexe = __commonJS({
59654
59654
  if (typeof Promise !== "function") {
59655
59655
  throw new TypeError("callback not provided");
59656
59656
  }
59657
- return new Promise(function(resolve16, reject) {
59657
+ return new Promise(function(resolve17, reject) {
59658
59658
  isexe(path44, options14 || {}, function(er, is2) {
59659
59659
  if (er) {
59660
59660
  reject(er);
59661
59661
  } else {
59662
- resolve16(is2);
59662
+ resolve17(is2);
59663
59663
  }
59664
59664
  });
59665
59665
  });
@@ -59726,27 +59726,27 @@ var require_which = __commonJS({
59726
59726
  opt = {};
59727
59727
  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
59728
59728
  const found = [];
59729
- const step = /* @__PURE__ */ __name((i) => new Promise((resolve16, reject) => {
59729
+ const step = /* @__PURE__ */ __name((i) => new Promise((resolve17, reject) => {
59730
59730
  if (i === pathEnv.length)
59731
- return opt.all && found.length ? resolve16(found) : reject(getNotFoundError(cmd));
59731
+ return opt.all && found.length ? resolve17(found) : reject(getNotFoundError(cmd));
59732
59732
  const ppRaw = pathEnv[i];
59733
59733
  const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
59734
59734
  const pCmd = path44.join(pathPart, cmd);
59735
59735
  const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
59736
- resolve16(subStep(p, i, 0));
59736
+ resolve17(subStep(p, i, 0));
59737
59737
  }), "step");
59738
- const subStep = /* @__PURE__ */ __name((p, i, ii) => new Promise((resolve16, reject) => {
59738
+ const subStep = /* @__PURE__ */ __name((p, i, ii) => new Promise((resolve17, reject) => {
59739
59739
  if (ii === pathExt.length)
59740
- return resolve16(step(i + 1));
59740
+ return resolve17(step(i + 1));
59741
59741
  const ext = pathExt[ii];
59742
59742
  isexe(p + ext, { pathExt: pathExtExe }, (er, is2) => {
59743
59743
  if (!er && is2) {
59744
59744
  if (opt.all)
59745
59745
  found.push(p + ext);
59746
59746
  else
59747
- return resolve16(p + ext);
59747
+ return resolve17(p + ext);
59748
59748
  }
59749
- return resolve16(subStep(p, i, ii + 1));
59749
+ return resolve17(subStep(p, i, ii + 1));
59750
59750
  });
59751
59751
  }), "subStep");
59752
59752
  return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -60775,7 +60775,7 @@ var require_kill = __commonJS({
60775
60775
  return spawnedPromise;
60776
60776
  }
60777
60777
  let timeoutId;
60778
- const timeoutPromise = new Promise((resolve16, reject) => {
60778
+ const timeoutPromise = new Promise((resolve17, reject) => {
60779
60779
  timeoutId = setTimeout(() => {
60780
60780
  timeoutKill2(spawned, killSignal, reject);
60781
60781
  }, timeout);
@@ -60898,7 +60898,7 @@ var require_get_stream = __commonJS({
60898
60898
  };
60899
60899
  const { maxBuffer } = options14;
60900
60900
  const stream3 = bufferStream(options14);
60901
- await new Promise((resolve16, reject) => {
60901
+ await new Promise((resolve17, reject) => {
60902
60902
  const rejectPromise = /* @__PURE__ */ __name((error) => {
60903
60903
  if (error && stream3.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
60904
60904
  error.bufferedData = stream3.getBufferedValue();
@@ -60908,7 +60908,7 @@ var require_get_stream = __commonJS({
60908
60908
  (async () => {
60909
60909
  try {
60910
60910
  await streamPipelinePromisified(inputStream, stream3);
60911
- resolve16();
60911
+ resolve17();
60912
60912
  } catch (error) {
60913
60913
  rejectPromise(error);
60914
60914
  }
@@ -61072,9 +61072,9 @@ var require_promise = __commonJS({
61072
61072
  return spawned;
61073
61073
  }, "mergePromise");
61074
61074
  var getSpawnedPromise2 = /* @__PURE__ */ __name((spawned) => {
61075
- return new Promise((resolve16, reject) => {
61075
+ return new Promise((resolve17, reject) => {
61076
61076
  spawned.on("exit", (exitCode, signal) => {
61077
- resolve16({ exitCode, signal });
61077
+ resolve17({ exitCode, signal });
61078
61078
  });
61079
61079
  spawned.on("error", (error) => {
61080
61080
  reject(error);
@@ -61527,10 +61527,10 @@ var require_command_exists = __commonJS({
61527
61527
  module2.exports = /* @__PURE__ */ __name(function commandExists2(commandName, callback) {
61528
61528
  var cleanedCommandName = cleanInput(commandName);
61529
61529
  if (!callback && typeof Promise !== "undefined") {
61530
- return new Promise(function(resolve16, reject) {
61530
+ return new Promise(function(resolve17, reject) {
61531
61531
  commandExists2(commandName, function(error, output) {
61532
61532
  if (output) {
61533
- resolve16(commandName);
61533
+ resolve17(commandName);
61534
61534
  } else {
61535
61535
  reject(error);
61536
61536
  }
@@ -69664,11 +69664,11 @@ var require_raw_body = __commonJS({
69664
69664
  if (done) {
69665
69665
  return readStream(stream2, encoding, length, limit, wrap2(done));
69666
69666
  }
69667
- return new Promise(/* @__PURE__ */ __name(function executor(resolve16, reject) {
69667
+ return new Promise(/* @__PURE__ */ __name(function executor(resolve17, reject) {
69668
69668
  readStream(stream2, encoding, length, limit, /* @__PURE__ */ __name(function onRead(err, buf) {
69669
69669
  if (err)
69670
69670
  return reject(err);
69671
- resolve16(buf);
69671
+ resolve17(buf);
69672
69672
  }, "onRead"));
69673
69673
  }, "executor"));
69674
69674
  }
@@ -82856,10 +82856,10 @@ var require_methods = __commonJS({
82856
82856
  "../../node_modules/methods/index.js"(exports2, module2) {
82857
82857
  "use strict";
82858
82858
  init_import_meta_url();
82859
- var http3 = require("http");
82859
+ var http2 = require("http");
82860
82860
  module2.exports = getCurrentNodeMethods() || getBasicNodeMethods();
82861
82861
  function getCurrentNodeMethods() {
82862
- return http3.METHODS && http3.METHODS.map(/* @__PURE__ */ __name(function lowerCaseMethod(method) {
82862
+ return http2.METHODS && http2.METHODS.map(/* @__PURE__ */ __name(function lowerCaseMethod(method) {
82863
82863
  return method.toLowerCase();
82864
82864
  }, "lowerCaseMethod"));
82865
82865
  }
@@ -83493,7 +83493,7 @@ var require_view = __commonJS({
83493
83493
  var basename6 = path44.basename;
83494
83494
  var extname4 = path44.extname;
83495
83495
  var join12 = path44.join;
83496
- var resolve16 = path44.resolve;
83496
+ var resolve17 = path44.resolve;
83497
83497
  module2.exports = View;
83498
83498
  function View(name, options14) {
83499
83499
  var opts = options14 || {};
@@ -83528,7 +83528,7 @@ var require_view = __commonJS({
83528
83528
  debug('lookup "%s"', name);
83529
83529
  for (var i = 0; i < roots.length && !path45; i++) {
83530
83530
  var root = roots[i];
83531
- var loc = resolve16(root, name);
83531
+ var loc = resolve17(root, name);
83532
83532
  var dir = dirname10(loc);
83533
83533
  var file = basename6(loc);
83534
83534
  path45 = this.resolve(dir, file);
@@ -83539,7 +83539,7 @@ var require_view = __commonJS({
83539
83539
  debug('render "%s"', this.path);
83540
83540
  this.engine(this.path, options14, callback);
83541
83541
  }, "render");
83542
- View.prototype.resolve = /* @__PURE__ */ __name(function resolve17(dir, file) {
83542
+ View.prototype.resolve = /* @__PURE__ */ __name(function resolve18(dir, file) {
83543
83543
  var ext = this.ext;
83544
83544
  var path45 = join12(dir, file);
83545
83545
  var stat3 = tryStat(path45);
@@ -84741,7 +84741,7 @@ var require_send = __commonJS({
84741
84741
  var extname4 = path44.extname;
84742
84742
  var join12 = path44.join;
84743
84743
  var normalize2 = path44.normalize;
84744
- var resolve16 = path44.resolve;
84744
+ var resolve17 = path44.resolve;
84745
84745
  var sep2 = path44.sep;
84746
84746
  var BYTES_RANGE_REGEXP = /^ *bytes=/;
84747
84747
  var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1e3;
@@ -84779,7 +84779,7 @@ var require_send = __commonJS({
84779
84779
  this._maxage = opts.maxAge || opts.maxage;
84780
84780
  this._maxage = typeof this._maxage === "string" ? ms(this._maxage) : Number(this._maxage);
84781
84781
  this._maxage = !isNaN(this._maxage) ? Math.min(Math.max(0, this._maxage), MAX_MAXAGE) : 0;
84782
- this._root = opts.root ? resolve16(opts.root) : null;
84782
+ this._root = opts.root ? resolve17(opts.root) : null;
84783
84783
  if (!this._root && opts.from) {
84784
84784
  this.from(opts.from);
84785
84785
  }
@@ -84804,7 +84804,7 @@ var require_send = __commonJS({
84804
84804
  return this;
84805
84805
  }, "index"), "send.index: pass index as option");
84806
84806
  SendStream.prototype.root = /* @__PURE__ */ __name(function root(path45) {
84807
- this._root = resolve16(String(path45));
84807
+ this._root = resolve17(String(path45));
84808
84808
  debug("root %s", this._root);
84809
84809
  return this;
84810
84810
  }, "root");
@@ -84968,7 +84968,7 @@ var require_send = __commonJS({
84968
84968
  return res;
84969
84969
  }
84970
84970
  parts = normalize2(path45).split(sep2);
84971
- path45 = resolve16(path45);
84971
+ path45 = resolve17(path45);
84972
84972
  }
84973
84973
  if (containsDotFile(parts)) {
84974
84974
  var access3 = this._dotfiles;
@@ -86297,14 +86297,14 @@ var require_application = __commonJS({
86297
86297
  var query = require_query();
86298
86298
  var debug = require_src4()("express:application");
86299
86299
  var View = require_view();
86300
- var http3 = require("http");
86300
+ var http2 = require("http");
86301
86301
  var compileETag = require_utils5().compileETag;
86302
86302
  var compileQueryParser = require_utils5().compileQueryParser;
86303
86303
  var compileTrust = require_utils5().compileTrust;
86304
86304
  var deprecate = require_depd()("express");
86305
86305
  var flatten = require_array_flatten();
86306
86306
  var merge = require_utils_merge();
86307
- var resolve16 = require("path").resolve;
86307
+ var resolve17 = require("path").resolve;
86308
86308
  var setPrototypeOf = require_setprototypeof();
86309
86309
  var hasOwnProperty2 = Object.prototype.hasOwnProperty;
86310
86310
  var slice = Array.prototype.slice;
@@ -86343,7 +86343,7 @@ var require_application = __commonJS({
86343
86343
  this.mountpath = "/";
86344
86344
  this.locals.settings = this.settings;
86345
86345
  this.set("view", View);
86346
- this.set("views", resolve16("views"));
86346
+ this.set("views", resolve17("views"));
86347
86347
  this.set("jsonp callback name", "callback");
86348
86348
  if (env5 === "production") {
86349
86349
  this.enable("view cache");
@@ -86546,7 +86546,7 @@ var require_application = __commonJS({
86546
86546
  tryRender(view, renderOptions, done);
86547
86547
  }, "render");
86548
86548
  app.listen = /* @__PURE__ */ __name(function listen() {
86549
- var server2 = http3.createServer(this);
86549
+ var server2 = http2.createServer(this);
86550
86550
  return server2.listen.apply(server2, arguments);
86551
86551
  }, "listen");
86552
86552
  function logerror(err) {
@@ -87205,12 +87205,12 @@ var require_request3 = __commonJS({
87205
87205
  var deprecate = require_depd()("express");
87206
87206
  var isIP = require("net").isIP;
87207
87207
  var typeis = require_type_is();
87208
- var http3 = require("http");
87208
+ var http2 = require("http");
87209
87209
  var fresh = require_fresh();
87210
87210
  var parseRange = require_range_parser();
87211
87211
  var parse5 = require_parseurl();
87212
87212
  var proxyaddr = require_proxy_addr();
87213
- var req = Object.create(http3.IncomingMessage.prototype);
87213
+ var req = Object.create(http2.IncomingMessage.prototype);
87214
87214
  module2.exports = req;
87215
87215
  req.get = req.header = /* @__PURE__ */ __name(function header(name) {
87216
87216
  if (!name) {
@@ -87633,7 +87633,7 @@ var require_response2 = __commonJS({
87633
87633
  var deprecate = require_depd()("express");
87634
87634
  var encodeUrl = require_encodeurl();
87635
87635
  var escapeHtml = require_escape_html();
87636
- var http3 = require("http");
87636
+ var http2 = require("http");
87637
87637
  var isAbsolute = require_utils5().isAbsolute;
87638
87638
  var onFinished = require_on_finished();
87639
87639
  var path44 = require("path");
@@ -87647,9 +87647,9 @@ var require_response2 = __commonJS({
87647
87647
  var send = require_send();
87648
87648
  var extname4 = path44.extname;
87649
87649
  var mime = send.mime;
87650
- var resolve16 = path44.resolve;
87650
+ var resolve17 = path44.resolve;
87651
87651
  var vary = require_vary();
87652
- var res = Object.create(http3.ServerResponse.prototype);
87652
+ var res = Object.create(http2.ServerResponse.prototype);
87653
87653
  module2.exports = res;
87654
87654
  var charsetRegExp = /;\s*charset\s*=/;
87655
87655
  res.status = /* @__PURE__ */ __name(function status(code) {
@@ -87911,7 +87911,7 @@ var require_response2 = __commonJS({
87911
87911
  }
87912
87912
  opts = Object.create(opts);
87913
87913
  opts.headers = headers;
87914
- var fullPath = !opts.root ? resolve16(path45) : path45;
87914
+ var fullPath = !opts.root ? resolve17(path45) : path45;
87915
87915
  return this.sendFile(fullPath, opts, done);
87916
87916
  }, "download");
87917
87917
  res.contentType = res.type = /* @__PURE__ */ __name(function contentType(type) {
@@ -88185,7 +88185,7 @@ var require_serve_static = __commonJS({
88185
88185
  var encodeUrl = require_encodeurl();
88186
88186
  var escapeHtml = require_escape_html();
88187
88187
  var parseUrl = require_parseurl();
88188
- var resolve16 = require("path").resolve;
88188
+ var resolve17 = require("path").resolve;
88189
88189
  var send = require_send();
88190
88190
  var url3 = require("url");
88191
88191
  module2.exports = serveStatic2;
@@ -88205,7 +88205,7 @@ var require_serve_static = __commonJS({
88205
88205
  throw new TypeError("option setHeaders must be function");
88206
88206
  }
88207
88207
  opts.maxage = opts.maxage || opts.maxAge || 0;
88208
- opts.root = resolve16(root);
88208
+ opts.root = resolve17(root);
88209
88209
  var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
88210
88210
  return /* @__PURE__ */ __name(function serveStatic3(req, res, next) {
88211
88211
  if (req.method !== "GET" && req.method !== "HEAD") {
@@ -88377,11 +88377,11 @@ var require_p_finally = __commonJS({
88377
88377
  onFinally = onFinally || (() => {
88378
88378
  });
88379
88379
  return promise.then(
88380
- (val) => new Promise((resolve16) => {
88381
- resolve16(onFinally());
88380
+ (val) => new Promise((resolve17) => {
88381
+ resolve17(onFinally());
88382
88382
  }).then(() => val),
88383
- (err) => new Promise((resolve16) => {
88384
- resolve16(onFinally());
88383
+ (err) => new Promise((resolve17) => {
88384
+ resolve17(onFinally());
88385
88385
  }).then(() => {
88386
88386
  throw err;
88387
88387
  })
@@ -88403,18 +88403,18 @@ var require_p_timeout = __commonJS({
88403
88403
  }
88404
88404
  };
88405
88405
  __name(TimeoutError2, "TimeoutError");
88406
- var pTimeout2 = /* @__PURE__ */ __name((promise, milliseconds, fallback) => new Promise((resolve16, reject) => {
88406
+ var pTimeout2 = /* @__PURE__ */ __name((promise, milliseconds, fallback) => new Promise((resolve17, reject) => {
88407
88407
  if (typeof milliseconds !== "number" || milliseconds < 0) {
88408
88408
  throw new TypeError("Expected `milliseconds` to be a positive number");
88409
88409
  }
88410
88410
  if (milliseconds === Infinity) {
88411
- resolve16(promise);
88411
+ resolve17(promise);
88412
88412
  return;
88413
88413
  }
88414
88414
  const timer = setTimeout(() => {
88415
88415
  if (typeof fallback === "function") {
88416
88416
  try {
88417
- resolve16(fallback());
88417
+ resolve17(fallback());
88418
88418
  } catch (error) {
88419
88419
  reject(error);
88420
88420
  }
@@ -88428,7 +88428,7 @@ var require_p_timeout = __commonJS({
88428
88428
  reject(timeoutError2);
88429
88429
  }, milliseconds);
88430
88430
  pFinally(
88431
- promise.then(resolve16, reject),
88431
+ promise.then(resolve17, reject),
88432
88432
  () => {
88433
88433
  clearTimeout(timer);
88434
88434
  }
@@ -88454,7 +88454,7 @@ var require_p_wait_for = __commonJS({
88454
88454
  ...options14
88455
88455
  };
88456
88456
  let retryTimeout;
88457
- const promise = new Promise((resolve16, reject) => {
88457
+ const promise = new Promise((resolve17, reject) => {
88458
88458
  const check = /* @__PURE__ */ __name(async () => {
88459
88459
  try {
88460
88460
  const value = await condition();
@@ -88462,7 +88462,7 @@ var require_p_wait_for = __commonJS({
88462
88462
  throw new TypeError("Expected condition to return a boolean");
88463
88463
  }
88464
88464
  if (value === true) {
88465
- resolve16();
88465
+ resolve17();
88466
88466
  } else {
88467
88467
  retryTimeout = setTimeout(check, options14.interval);
88468
88468
  }
@@ -89325,11 +89325,11 @@ var require_uri_all = __commonJS({
89325
89325
  return target;
89326
89326
  }
89327
89327
  __name(resolveComponents, "resolveComponents");
89328
- function resolve16(baseURI, relativeURI, options14) {
89328
+ function resolve17(baseURI, relativeURI, options14) {
89329
89329
  var schemelessOptions = assign({ scheme: "null" }, options14);
89330
89330
  return serialize(resolveComponents(parse5(baseURI, schemelessOptions), parse5(relativeURI, schemelessOptions), schemelessOptions, true), schemelessOptions);
89331
89331
  }
89332
- __name(resolve16, "resolve");
89332
+ __name(resolve17, "resolve");
89333
89333
  function normalize2(uri, options14) {
89334
89334
  if (typeof uri === "string") {
89335
89335
  uri = serialize(parse5(uri, options14), options14);
@@ -89600,7 +89600,7 @@ var require_uri_all = __commonJS({
89600
89600
  exports3.removeDotSegments = removeDotSegments;
89601
89601
  exports3.serialize = serialize;
89602
89602
  exports3.resolveComponents = resolveComponents;
89603
- exports3.resolve = resolve16;
89603
+ exports3.resolve = resolve17;
89604
89604
  exports3.normalize = normalize2;
89605
89605
  exports3.equal = equal;
89606
89606
  exports3.escapeComponent = escapeComponent;
@@ -90016,20 +90016,20 @@ var require_resolve = __commonJS({
90016
90016
  var util3 = require_util7();
90017
90017
  var SchemaObject = require_schema_obj();
90018
90018
  var traverse = require_json_schema_traverse();
90019
- module2.exports = resolve16;
90020
- resolve16.normalizeId = normalizeId;
90021
- resolve16.fullPath = getFullPath;
90022
- resolve16.url = resolveUrl;
90023
- resolve16.ids = resolveIds;
90024
- resolve16.inlineRef = inlineRef;
90025
- resolve16.schema = resolveSchema;
90026
- function resolve16(compile, root, ref) {
90019
+ module2.exports = resolve17;
90020
+ resolve17.normalizeId = normalizeId;
90021
+ resolve17.fullPath = getFullPath;
90022
+ resolve17.url = resolveUrl;
90023
+ resolve17.ids = resolveIds;
90024
+ resolve17.inlineRef = inlineRef;
90025
+ resolve17.schema = resolveSchema;
90026
+ function resolve17(compile, root, ref) {
90027
90027
  var refVal = this._refs[ref];
90028
90028
  if (typeof refVal == "string") {
90029
90029
  if (this._refs[refVal])
90030
90030
  refVal = this._refs[refVal];
90031
90031
  else
90032
- return resolve16.call(this, compile, root, refVal);
90032
+ return resolve17.call(this, compile, root, refVal);
90033
90033
  }
90034
90034
  refVal = refVal || this._schemas[ref];
90035
90035
  if (refVal instanceof SchemaObject) {
@@ -90049,7 +90049,7 @@ var require_resolve = __commonJS({
90049
90049
  }
90050
90050
  return v;
90051
90051
  }
90052
- __name(resolve16, "resolve");
90052
+ __name(resolve17, "resolve");
90053
90053
  function resolveSchema(root, ref) {
90054
90054
  var p = URI.parse(ref), refPath = _getFullPath(p), baseId = getFullPath(this._getId(root.schema));
90055
90055
  if (Object.keys(root.schema).length === 0 || refPath !== baseId) {
@@ -90268,7 +90268,7 @@ var require_error_classes = __commonJS({
90268
90268
  "../../node_modules/ajv/lib/compile/error_classes.js"(exports2, module2) {
90269
90269
  "use strict";
90270
90270
  init_import_meta_url();
90271
- var resolve16 = require_resolve();
90271
+ var resolve17 = require_resolve();
90272
90272
  module2.exports = {
90273
90273
  Validation: errorSubclass(ValidationError),
90274
90274
  MissingRef: errorSubclass(MissingRefError)
@@ -90284,8 +90284,8 @@ var require_error_classes = __commonJS({
90284
90284
  };
90285
90285
  function MissingRefError(baseId, ref, message) {
90286
90286
  this.message = message || MissingRefError.message(baseId, ref);
90287
- this.missingRef = resolve16.url(baseId, ref);
90288
- this.missingSchema = resolve16.normalizeId(resolve16.fullPath(this.missingRef));
90287
+ this.missingRef = resolve17.url(baseId, ref);
90288
+ this.missingSchema = resolve17.normalizeId(resolve17.fullPath(this.missingRef));
90289
90289
  }
90290
90290
  __name(MissingRefError, "MissingRefError");
90291
90291
  function errorSubclass(Subclass) {
@@ -90844,7 +90844,7 @@ var require_compile = __commonJS({
90844
90844
  "../../node_modules/ajv/lib/compile/index.js"(exports2, module2) {
90845
90845
  "use strict";
90846
90846
  init_import_meta_url();
90847
- var resolve16 = require_resolve();
90847
+ var resolve17 = require_resolve();
90848
90848
  var util3 = require_util7();
90849
90849
  var errorClasses = require_error_classes();
90850
90850
  var stableStringify = require_fast_json_stable_stringify();
@@ -90905,7 +90905,7 @@ var require_compile = __commonJS({
90905
90905
  RULES,
90906
90906
  validate: validateGenerator,
90907
90907
  util: util3,
90908
- resolve: resolve16,
90908
+ resolve: resolve17,
90909
90909
  resolveRef,
90910
90910
  usePattern,
90911
90911
  useDefault,
@@ -90968,7 +90968,7 @@ var require_compile = __commonJS({
90968
90968
  }
90969
90969
  __name(localCompile, "localCompile");
90970
90970
  function resolveRef(baseId2, ref, isRoot) {
90971
- ref = resolve16.url(baseId2, ref);
90971
+ ref = resolve17.url(baseId2, ref);
90972
90972
  var refIndex = refs[ref];
90973
90973
  var _refVal, refCode;
90974
90974
  if (refIndex !== void 0) {
@@ -90985,11 +90985,11 @@ var require_compile = __commonJS({
90985
90985
  }
90986
90986
  }
90987
90987
  refCode = addLocalRef(ref);
90988
- var v2 = resolve16.call(self2, localCompile, root, ref);
90988
+ var v2 = resolve17.call(self2, localCompile, root, ref);
90989
90989
  if (v2 === void 0) {
90990
90990
  var localSchema = localRefs && localRefs[ref];
90991
90991
  if (localSchema) {
90992
- v2 = resolve16.inlineRef(localSchema, opts.inlineRefs) ? localSchema : compile.call(self2, localSchema, root, localRefs, baseId2);
90992
+ v2 = resolve17.inlineRef(localSchema, opts.inlineRefs) ? localSchema : compile.call(self2, localSchema, root, localRefs, baseId2);
90993
90993
  }
90994
90994
  }
90995
90995
  if (v2 === void 0) {
@@ -94681,7 +94681,7 @@ var require_ajv = __commonJS({
94681
94681
  "use strict";
94682
94682
  init_import_meta_url();
94683
94683
  var compileSchema = require_compile();
94684
- var resolve16 = require_resolve();
94684
+ var resolve17 = require_resolve();
94685
94685
  var Cache2 = require_cache();
94686
94686
  var SchemaObject = require_schema_obj();
94687
94687
  var stableStringify = require_fast_json_stable_stringify();
@@ -94776,7 +94776,7 @@ var require_ajv = __commonJS({
94776
94776
  var id = this._getId(schema);
94777
94777
  if (id !== void 0 && typeof id != "string")
94778
94778
  throw new Error("schema id must be string");
94779
- key = resolve16.normalizeId(key || id);
94779
+ key = resolve17.normalizeId(key || id);
94780
94780
  checkUnique(this, key);
94781
94781
  this._schemas[key] = this._addSchema(schema, _skipValidation, _meta, true);
94782
94782
  return this;
@@ -94827,7 +94827,7 @@ var require_ajv = __commonJS({
94827
94827
  }
94828
94828
  __name(getSchema, "getSchema");
94829
94829
  function _getSchemaFragment(self2, ref) {
94830
- var res = resolve16.schema.call(self2, { schema: {} }, ref);
94830
+ var res = resolve17.schema.call(self2, { schema: {} }, ref);
94831
94831
  if (res) {
94832
94832
  var schema = res.schema, root = res.root, baseId = res.baseId;
94833
94833
  var v = compileSchema.call(self2, schema, root, void 0, baseId);
@@ -94844,7 +94844,7 @@ var require_ajv = __commonJS({
94844
94844
  }
94845
94845
  __name(_getSchemaFragment, "_getSchemaFragment");
94846
94846
  function _getSchemaObj(self2, keyRef) {
94847
- keyRef = resolve16.normalizeId(keyRef);
94847
+ keyRef = resolve17.normalizeId(keyRef);
94848
94848
  return self2._schemas[keyRef] || self2._refs[keyRef] || self2._fragments[keyRef];
94849
94849
  }
94850
94850
  __name(_getSchemaObj, "_getSchemaObj");
@@ -94873,7 +94873,7 @@ var require_ajv = __commonJS({
94873
94873
  this._cache.del(cacheKey);
94874
94874
  var id = this._getId(schemaKeyRef);
94875
94875
  if (id) {
94876
- id = resolve16.normalizeId(id);
94876
+ id = resolve17.normalizeId(id);
94877
94877
  delete this._schemas[id];
94878
94878
  delete this._refs[id];
94879
94879
  }
@@ -94900,14 +94900,14 @@ var require_ajv = __commonJS({
94900
94900
  if (cached)
94901
94901
  return cached;
94902
94902
  shouldAddSchema = shouldAddSchema || this._opts.addUsedSchema !== false;
94903
- var id = resolve16.normalizeId(this._getId(schema));
94903
+ var id = resolve17.normalizeId(this._getId(schema));
94904
94904
  if (id && shouldAddSchema)
94905
94905
  checkUnique(this, id);
94906
94906
  var willValidate = this._opts.validateSchema !== false && !skipValidation;
94907
94907
  var recursiveMeta;
94908
- if (willValidate && !(recursiveMeta = id && id == resolve16.normalizeId(schema.$schema)))
94908
+ if (willValidate && !(recursiveMeta = id && id == resolve17.normalizeId(schema.$schema)))
94909
94909
  this.validateSchema(schema, true);
94910
- var localRefs = resolve16.ids.call(this, schema);
94910
+ var localRefs = resolve17.ids.call(this, schema);
94911
94911
  var schemaObj = new SchemaObject({
94912
94912
  id,
94913
94913
  schema,
@@ -99902,8 +99902,8 @@ var require_createInternalHttpTerminator = __commonJS({
99902
99902
  }
99903
99903
  let resolveTerminating;
99904
99904
  let rejectTerminating;
99905
- terminating = new Promise((resolve16, reject) => {
99906
- resolveTerminating = resolve16;
99905
+ terminating = new Promise((resolve17, reject) => {
99906
+ resolveTerminating = resolve17;
99907
99907
  rejectTerminating = reject;
99908
99908
  });
99909
99909
  server2.on("request", (incomingMessage, outgoingMessage) => {
@@ -100269,14 +100269,14 @@ var require_open = __commonJS({
100269
100269
  }
100270
100270
  const subprocess = childProcess2.spawn(command2, cliArguments, childProcessOptions);
100271
100271
  if (options14.wait) {
100272
- return new Promise((resolve16, reject) => {
100272
+ return new Promise((resolve17, reject) => {
100273
100273
  subprocess.once("error", reject);
100274
100274
  subprocess.once("close", (exitCode) => {
100275
100275
  if (options14.allowNonzeroExitCode && exitCode > 0) {
100276
100276
  reject(new Error(`Exited with code ${exitCode}`));
100277
100277
  return;
100278
100278
  }
100279
- resolve16(subprocess);
100279
+ resolve17(subprocess);
100280
100280
  });
100281
100281
  });
100282
100282
  }
@@ -102152,7 +102152,7 @@ var require_websocket3 = __commonJS({
102152
102152
  init_import_meta_url();
102153
102153
  var EventEmitter3 = require("events");
102154
102154
  var https2 = require("https");
102155
- var http3 = require("http");
102155
+ var http2 = require("http");
102156
102156
  var net3 = require("net");
102157
102157
  var tls = require("tls");
102158
102158
  var { randomBytes, createHash } = require("crypto");
@@ -102552,7 +102552,7 @@ var require_websocket3 = __commonJS({
102552
102552
  }
102553
102553
  const defaultPort = isSecure ? 443 : 80;
102554
102554
  const key = randomBytes(16).toString("base64");
102555
- const get = isSecure ? https2.get : http3.get;
102555
+ const get = isSecure ? https2.get : http2.get;
102556
102556
  const protocolSet = /* @__PURE__ */ new Set();
102557
102557
  let perMessageDeflate;
102558
102558
  opts.createConnection = isSecure ? tlsConnect : netConnect;
@@ -102936,7 +102936,7 @@ var require_websocket_server2 = __commonJS({
102936
102936
  "use strict";
102937
102937
  init_import_meta_url();
102938
102938
  var EventEmitter3 = require("events");
102939
- var http3 = require("http");
102939
+ var http2 = require("http");
102940
102940
  var https2 = require("https");
102941
102941
  var net3 = require("net");
102942
102942
  var tls = require("tls");
@@ -102975,8 +102975,8 @@ var require_websocket_server2 = __commonJS({
102975
102975
  );
102976
102976
  }
102977
102977
  if (options14.port != null) {
102978
- this._server = http3.createServer((req, res) => {
102979
- const body = http3.STATUS_CODES[426];
102978
+ this._server = http2.createServer((req, res) => {
102979
+ const body = http2.STATUS_CODES[426];
102980
102980
  res.writeHead(426, {
102981
102981
  "Content-Length": body.length,
102982
102982
  "Content-Type": "text/plain"
@@ -103203,7 +103203,7 @@ var require_websocket_server2 = __commonJS({
103203
103203
  __name(socketOnError, "socketOnError");
103204
103204
  function abortHandshake(socket, code, message, headers) {
103205
103205
  if (socket.writable) {
103206
- message = message || http3.STATUS_CODES[code];
103206
+ message = message || http2.STATUS_CODES[code];
103207
103207
  headers = {
103208
103208
  Connection: "close",
103209
103209
  "Content-Type": "text/html",
@@ -103211,7 +103211,7 @@ var require_websocket_server2 = __commonJS({
103211
103211
  ...headers
103212
103212
  };
103213
103213
  socket.write(
103214
- `HTTP/1.1 ${code} ${http3.STATUS_CODES[code]}\r
103214
+ `HTTP/1.1 ${code} ${http2.STATUS_CODES[code]}\r
103215
103215
  ` + Object.keys(headers).map((h) => `${h}: ${headers[h]}`).join("\r\n") + "\r\n\r\n" + message
103216
103216
  );
103217
103217
  }
@@ -109006,7 +109006,7 @@ var require_text2 = __commonJS({
109006
109006
  "../../node_modules/prompts/dist/elements/text.js"(exports2, module2) {
109007
109007
  "use strict";
109008
109008
  init_import_meta_url();
109009
- function asyncGeneratorStep(gen, resolve16, reject, _next, _throw, key, arg) {
109009
+ function asyncGeneratorStep(gen, resolve17, reject, _next, _throw, key, arg) {
109010
109010
  try {
109011
109011
  var info = gen[key](arg);
109012
109012
  var value = info.value;
@@ -109015,7 +109015,7 @@ var require_text2 = __commonJS({
109015
109015
  return;
109016
109016
  }
109017
109017
  if (info.done) {
109018
- resolve16(value);
109018
+ resolve17(value);
109019
109019
  } else {
109020
109020
  Promise.resolve(value).then(_next, _throw);
109021
109021
  }
@@ -109024,14 +109024,14 @@ var require_text2 = __commonJS({
109024
109024
  function _asyncToGenerator(fn2) {
109025
109025
  return function() {
109026
109026
  var self2 = this, args = arguments;
109027
- return new Promise(function(resolve16, reject) {
109027
+ return new Promise(function(resolve17, reject) {
109028
109028
  var gen = fn2.apply(self2, args);
109029
109029
  function _next(value) {
109030
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "next", value);
109030
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "next", value);
109031
109031
  }
109032
109032
  __name(_next, "_next");
109033
109033
  function _throw(err) {
109034
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "throw", err);
109034
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "throw", err);
109035
109035
  }
109036
109036
  __name(_throw, "_throw");
109037
109037
  _next(void 0);
@@ -109795,7 +109795,7 @@ var require_date = __commonJS({
109795
109795
  "../../node_modules/prompts/dist/elements/date.js"(exports2, module2) {
109796
109796
  "use strict";
109797
109797
  init_import_meta_url();
109798
- function asyncGeneratorStep(gen, resolve16, reject, _next, _throw, key, arg) {
109798
+ function asyncGeneratorStep(gen, resolve17, reject, _next, _throw, key, arg) {
109799
109799
  try {
109800
109800
  var info = gen[key](arg);
109801
109801
  var value = info.value;
@@ -109804,7 +109804,7 @@ var require_date = __commonJS({
109804
109804
  return;
109805
109805
  }
109806
109806
  if (info.done) {
109807
- resolve16(value);
109807
+ resolve17(value);
109808
109808
  } else {
109809
109809
  Promise.resolve(value).then(_next, _throw);
109810
109810
  }
@@ -109813,14 +109813,14 @@ var require_date = __commonJS({
109813
109813
  function _asyncToGenerator(fn2) {
109814
109814
  return function() {
109815
109815
  var self2 = this, args = arguments;
109816
- return new Promise(function(resolve16, reject) {
109816
+ return new Promise(function(resolve17, reject) {
109817
109817
  var gen = fn2.apply(self2, args);
109818
109818
  function _next(value) {
109819
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "next", value);
109819
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "next", value);
109820
109820
  }
109821
109821
  __name(_next, "_next");
109822
109822
  function _throw(err) {
109823
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "throw", err);
109823
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "throw", err);
109824
109824
  }
109825
109825
  __name(_throw, "_throw");
109826
109826
  _next(void 0);
@@ -110027,7 +110027,7 @@ var require_number = __commonJS({
110027
110027
  "../../node_modules/prompts/dist/elements/number.js"(exports2, module2) {
110028
110028
  "use strict";
110029
110029
  init_import_meta_url();
110030
- function asyncGeneratorStep(gen, resolve16, reject, _next, _throw, key, arg) {
110030
+ function asyncGeneratorStep(gen, resolve17, reject, _next, _throw, key, arg) {
110031
110031
  try {
110032
110032
  var info = gen[key](arg);
110033
110033
  var value = info.value;
@@ -110036,7 +110036,7 @@ var require_number = __commonJS({
110036
110036
  return;
110037
110037
  }
110038
110038
  if (info.done) {
110039
- resolve16(value);
110039
+ resolve17(value);
110040
110040
  } else {
110041
110041
  Promise.resolve(value).then(_next, _throw);
110042
110042
  }
@@ -110045,14 +110045,14 @@ var require_number = __commonJS({
110045
110045
  function _asyncToGenerator(fn2) {
110046
110046
  return function() {
110047
110047
  var self2 = this, args = arguments;
110048
- return new Promise(function(resolve16, reject) {
110048
+ return new Promise(function(resolve17, reject) {
110049
110049
  var gen = fn2.apply(self2, args);
110050
110050
  function _next(value) {
110051
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "next", value);
110051
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "next", value);
110052
110052
  }
110053
110053
  __name(_next, "_next");
110054
110054
  function _throw(err) {
110055
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "throw", err);
110055
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "throw", err);
110056
110056
  }
110057
110057
  __name(_throw, "_throw");
110058
110058
  _next(void 0);
@@ -110493,7 +110493,7 @@ var require_autocomplete = __commonJS({
110493
110493
  "../../node_modules/prompts/dist/elements/autocomplete.js"(exports2, module2) {
110494
110494
  "use strict";
110495
110495
  init_import_meta_url();
110496
- function asyncGeneratorStep(gen, resolve16, reject, _next, _throw, key, arg) {
110496
+ function asyncGeneratorStep(gen, resolve17, reject, _next, _throw, key, arg) {
110497
110497
  try {
110498
110498
  var info = gen[key](arg);
110499
110499
  var value = info.value;
@@ -110502,7 +110502,7 @@ var require_autocomplete = __commonJS({
110502
110502
  return;
110503
110503
  }
110504
110504
  if (info.done) {
110505
- resolve16(value);
110505
+ resolve17(value);
110506
110506
  } else {
110507
110507
  Promise.resolve(value).then(_next, _throw);
110508
110508
  }
@@ -110511,14 +110511,14 @@ var require_autocomplete = __commonJS({
110511
110511
  function _asyncToGenerator(fn2) {
110512
110512
  return function() {
110513
110513
  var self2 = this, args = arguments;
110514
- return new Promise(function(resolve16, reject) {
110514
+ return new Promise(function(resolve17, reject) {
110515
110515
  var gen = fn2.apply(self2, args);
110516
110516
  function _next(value) {
110517
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "next", value);
110517
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "next", value);
110518
110518
  }
110519
110519
  __name(_next, "_next");
110520
110520
  function _throw(err) {
110521
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "throw", err);
110521
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "throw", err);
110522
110522
  }
110523
110523
  __name(_throw, "_throw");
110524
110524
  _next(void 0);
@@ -111198,7 +111198,7 @@ var require_dist2 = __commonJS({
111198
111198
  return arr2;
111199
111199
  }
111200
111200
  __name(_arrayLikeToArray4, "_arrayLikeToArray");
111201
- function asyncGeneratorStep(gen, resolve16, reject, _next, _throw, key, arg) {
111201
+ function asyncGeneratorStep(gen, resolve17, reject, _next, _throw, key, arg) {
111202
111202
  try {
111203
111203
  var info = gen[key](arg);
111204
111204
  var value = info.value;
@@ -111207,7 +111207,7 @@ var require_dist2 = __commonJS({
111207
111207
  return;
111208
111208
  }
111209
111209
  if (info.done) {
111210
- resolve16(value);
111210
+ resolve17(value);
111211
111211
  } else {
111212
111212
  Promise.resolve(value).then(_next, _throw);
111213
111213
  }
@@ -111216,14 +111216,14 @@ var require_dist2 = __commonJS({
111216
111216
  function _asyncToGenerator(fn2) {
111217
111217
  return function() {
111218
111218
  var self2 = this, args = arguments;
111219
- return new Promise(function(resolve16, reject) {
111219
+ return new Promise(function(resolve17, reject) {
111220
111220
  var gen = fn2.apply(self2, args);
111221
111221
  function _next(value) {
111222
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "next", value);
111222
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "next", value);
111223
111223
  }
111224
111224
  __name(_next, "_next");
111225
111225
  function _throw(err) {
111226
- asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "throw", err);
111226
+ asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "throw", err);
111227
111227
  }
111228
111228
  __name(_throw, "_throw");
111229
111229
  _next(void 0);
@@ -114968,6 +114968,7 @@ async function generateASSETSBinding(options14) {
114968
114968
  };
114969
114969
  }
114970
114970
  async function generateAssetsFetch(directory, log, tre) {
114971
+ directory = (0, import_node_path16.resolve)(directory);
114971
114972
  const polyfill2 = tre ? (await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports))).default : (await Promise.resolve().then(() => (init_miniflare(), miniflare_exports))).default;
114972
114973
  await polyfill2();
114973
114974
  const miniflare = tre ? await import("@miniflare/tre") : await import("@miniflare/core");
@@ -115024,7 +115025,10 @@ async function generateAssetsFetch(directory, log, tre) {
115024
115025
  xServerEnvHeader: "dev",
115025
115026
  logError: console.error,
115026
115027
  findAssetEntryForPath: async (path44) => {
115027
- const filepath = (0, import_node_path16.join)(directory, path44);
115028
+ const filepath = (0, import_node_path16.resolve)((0, import_node_path16.join)(directory, path44));
115029
+ if (!filepath.startsWith(directory)) {
115030
+ return null;
115031
+ }
115028
115032
  if ((0, import_node_fs7.existsSync)(filepath) && (0, import_node_fs7.lstatSync)(filepath).isFile() && !ignoredFiles.includes(filepath)) {
115029
115033
  const hash = hashFile(filepath);
115030
115034
  assetKeyEntryMap.set(hash, filepath);
@@ -120294,7 +120298,7 @@ var require_update_check = __commonJS({
120294
120298
  });
120295
120299
  await writeFile4(file, content, "utf8");
120296
120300
  }, "updateCache");
120297
- var loadPackage = /* @__PURE__ */ __name((url3, authInfo) => new Promise((resolve16, reject) => {
120301
+ var loadPackage = /* @__PURE__ */ __name((url3, authInfo) => new Promise((resolve17, reject) => {
120298
120302
  const options14 = {
120299
120303
  host: url3.hostname,
120300
120304
  path: url3.pathname,
@@ -120325,7 +120329,7 @@ var require_update_check = __commonJS({
120325
120329
  response.on("end", () => {
120326
120330
  try {
120327
120331
  const parsedData = JSON.parse(rawData);
120328
- resolve16(parsedData);
120332
+ resolve17(parsedData);
120329
120333
  } catch (e2) {
120330
120334
  reject(e2);
120331
120335
  }
@@ -122161,14 +122165,14 @@ var getLocalHosts = /* @__PURE__ */ __name(() => {
122161
122165
  }
122162
122166
  return results;
122163
122167
  }, "getLocalHosts");
122164
- var checkAvailablePort = /* @__PURE__ */ __name((options14) => new Promise((resolve16, reject) => {
122168
+ var checkAvailablePort = /* @__PURE__ */ __name((options14) => new Promise((resolve17, reject) => {
122165
122169
  const server2 = import_node_net.default.createServer();
122166
122170
  server2.unref();
122167
122171
  server2.on("error", reject);
122168
122172
  server2.listen(options14, () => {
122169
122173
  const { port: port2 } = server2.address();
122170
122174
  server2.close(() => {
122171
- resolve16(port2);
122175
+ resolve17(port2);
122172
122176
  });
122173
122177
  });
122174
122178
  }), "checkAvailablePort");
@@ -122345,18 +122349,18 @@ function pLimit(concurrency) {
122345
122349
  queue.dequeue()();
122346
122350
  }
122347
122351
  }, "next");
122348
- const run = /* @__PURE__ */ __name(async (fn2, resolve16, args) => {
122352
+ const run = /* @__PURE__ */ __name(async (fn2, resolve17, args) => {
122349
122353
  activeCount++;
122350
122354
  const result = (async () => fn2(...args))();
122351
- resolve16(result);
122355
+ resolve17(result);
122352
122356
  try {
122353
122357
  await result;
122354
122358
  } catch {
122355
122359
  }
122356
122360
  next();
122357
122361
  }, "run");
122358
- const enqueue = /* @__PURE__ */ __name((fn2, resolve16, args) => {
122359
- queue.enqueue(run.bind(void 0, fn2, resolve16, args));
122362
+ const enqueue = /* @__PURE__ */ __name((fn2, resolve17, args) => {
122363
+ queue.enqueue(run.bind(void 0, fn2, resolve17, args));
122360
122364
  (async () => {
122361
122365
  await Promise.resolve();
122362
122366
  if (activeCount < concurrency && queue.size > 0) {
@@ -122364,8 +122368,8 @@ function pLimit(concurrency) {
122364
122368
  }
122365
122369
  })();
122366
122370
  }, "enqueue");
122367
- const generator = /* @__PURE__ */ __name((fn2, ...args) => new Promise((resolve16) => {
122368
- enqueue(fn2, resolve16, args);
122371
+ const generator = /* @__PURE__ */ __name((fn2, ...args) => new Promise((resolve17) => {
122372
+ enqueue(fn2, resolve17, args);
122369
122373
  }), "generator");
122370
122374
  Object.defineProperties(generator, {
122371
122375
  activeCount: {
@@ -126537,30 +126541,30 @@ var import_undici16 = __toESM(require_undici());
126537
126541
 
126538
126542
  // src/dev-registry.ts
126539
126543
  init_import_meta_url();
126540
- var import_http = __toESM(require("http"));
126541
126544
  var import_net = __toESM(require("net"));
126545
+ var import_node_http = require("node:http");
126542
126546
  var import_body_parser = __toESM(require_body_parser());
126543
126547
  var import_express = __toESM(require_express2());
126544
126548
  var import_http_terminator = __toESM(require_src7());
126545
126549
  var import_undici = __toESM(require_undici());
126546
- var DEV_REGISTRY_PORT = "6284";
126547
- var DEV_REGISTRY_HOST = `http://localhost:${DEV_REGISTRY_PORT}`;
126550
+ var DEV_REGISTRY_PORT = 6284;
126551
+ var DEV_REGISTRY_HOST = `http://127.0.0.1:${DEV_REGISTRY_PORT}`;
126548
126552
  var server;
126549
126553
  var terminator;
126550
126554
  async function isPortAvailable() {
126551
- return new Promise((resolve16, reject) => {
126555
+ return new Promise((resolve17, reject) => {
126552
126556
  const netServer = import_net.default.createServer().once("error", (err) => {
126553
126557
  netServer.close();
126554
126558
  if (err.code === "EADDRINUSE") {
126555
- resolve16(false);
126559
+ resolve17(false);
126556
126560
  } else {
126557
126561
  reject(err);
126558
126562
  }
126559
126563
  }).once("listening", () => {
126560
126564
  netServer.close();
126561
- resolve16(true);
126565
+ resolve17(true);
126562
126566
  });
126563
- netServer.listen(DEV_REGISTRY_PORT);
126567
+ netServer.listen(DEV_REGISTRY_PORT, "127.0.0.1");
126564
126568
  });
126565
126569
  }
126566
126570
  __name(isPortAvailable, "isPortAvailable");
@@ -126581,9 +126585,9 @@ async function startWorkerRegistry() {
126581
126585
  workers = {};
126582
126586
  res.json(null);
126583
126587
  });
126584
- server = import_http.default.createServer(app);
126588
+ server = (0, import_node_http.createServer)(app);
126585
126589
  terminator = (0, import_http_terminator.createHttpTerminator)({ server });
126586
- server.listen(DEV_REGISTRY_PORT);
126590
+ server.listen(DEV_REGISTRY_PORT, "127.0.0.1");
126587
126591
  server.once("error", (err) => {
126588
126592
  if (err.code !== "EADDRINUSE") {
126589
126593
  throw err;
@@ -127335,7 +127339,7 @@ var setupTimeout = /* @__PURE__ */ __name((spawned, { timeout, killSignal = "SIG
127335
127339
  return spawnedPromise;
127336
127340
  }
127337
127341
  let timeoutId;
127338
- const timeoutPromise = new Promise((resolve16, reject) => {
127342
+ const timeoutPromise = new Promise((resolve17, reject) => {
127339
127343
  timeoutId = setTimeout(() => {
127340
127344
  timeoutKill(spawned, killSignal, reject);
127341
127345
  }, timeout);
@@ -127454,9 +127458,9 @@ var mergePromise = /* @__PURE__ */ __name((spawned, promise) => {
127454
127458
  }
127455
127459
  return spawned;
127456
127460
  }, "mergePromise");
127457
- var getSpawnedPromise = /* @__PURE__ */ __name((spawned) => new Promise((resolve16, reject) => {
127461
+ var getSpawnedPromise = /* @__PURE__ */ __name((spawned) => new Promise((resolve17, reject) => {
127458
127462
  spawned.on("exit", (exitCode, signal) => {
127459
- resolve16({ exitCode, signal });
127463
+ resolve17({ exitCode, signal });
127460
127464
  });
127461
127465
  spawned.on("error", (error) => {
127462
127466
  reject(error);
@@ -128784,7 +128788,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
128784
128788
  var wrapper_default = import_websocket.default;
128785
128789
 
128786
128790
  // package.json
128787
- var version = "2.20.0";
128791
+ var version = "2.20.2";
128788
128792
  var package_default = {
128789
128793
  name: "wrangler",
128790
128794
  version,
@@ -128907,7 +128911,7 @@ var package_default = {
128907
128911
  "@cloudflare/workers-types": "^4.20221111.1",
128908
128912
  "@iarna/toml": "^3.0.0",
128909
128913
  "@microsoft/api-extractor": "^7.28.3",
128910
- "@miniflare/tre": "3.0.0-next.13",
128914
+ "@miniflare/tre": "3.0.0-next.14",
128911
128915
  "@types/better-sqlite3": "^7.6.0",
128912
128916
  "@types/busboy": "^1.5.0",
128913
128917
  "@types/command-exists": "^1.2.0",
@@ -128988,8 +128992,8 @@ var package_default = {
128988
128992
 
128989
128993
  // src/proxy.ts
128990
128994
  init_import_meta_url();
128991
- var import_node_http = require("node:http");
128992
- var import_node_http2 = require("node:http2");
128995
+ var import_node_http2 = require("node:http");
128996
+ var import_node_http22 = require("node:http2");
128993
128997
  var import_node_https = require("node:https");
128994
128998
  var import_node_https2 = __toESM(require("node:https"));
128995
128999
  var import_node_os5 = require("node:os");
@@ -129421,7 +129425,7 @@ function configureProxyServer({
129421
129425
  }
129422
129426
  const cleanupListeners = [];
129423
129427
  logger.debug("PREVIEW URL:", `https://${previewToken.host}`);
129424
- const remote = (0, import_node_http2.connect)(`https://${previewToken.host}`);
129428
+ const remote = (0, import_node_http22.connect)(`https://${previewToken.host}`);
129425
129429
  cleanupListeners.push(() => remote.destroy());
129426
129430
  remote.on("close", retryServerSetup);
129427
129431
  cleanupListeners.push(() => remote.off("close", retryServerSetup));
@@ -129554,7 +129558,7 @@ var HTTP1_HEADERS = /* @__PURE__ */ new Set([
129554
129558
  "http2-settings"
129555
129559
  ]);
129556
129560
  async function createProxyServer(localProtocol) {
129557
- const server2 = localProtocol === "https" ? (0, import_node_https.createServer)(await getHttpsOptions()) : (0, import_node_http.createServer)();
129561
+ const server2 = localProtocol === "https" ? (0, import_node_https.createServer)(await getHttpsOptions()) : (0, import_node_http2.createServer)();
129558
129562
  return server2.on("upgrade", (req) => {
129559
129563
  logger.log(
129560
129564
  new Date().toLocaleTimeString(),
@@ -129588,7 +129592,7 @@ function createStreamHandler(previewToken, remote, localPort, localProtocol, acc
129588
129592
  }
129589
129593
  __name(createStreamHandler, "createStreamHandler");
129590
129594
  async function waitForPortToBeAvailable(port2, options14) {
129591
- return new Promise((resolve16, reject) => {
129595
+ return new Promise((resolve17, reject) => {
129592
129596
  options14.abortSignal.addEventListener("abort", () => {
129593
129597
  const abortError = new Error("waitForPortToBeAvailable() aborted");
129594
129598
  abortError.code = "ABORT_ERR";
@@ -129602,7 +129606,7 @@ async function waitForPortToBeAvailable(port2, options14) {
129602
129606
  function doResolve() {
129603
129607
  clearTimeout(timeout);
129604
129608
  clearInterval(interval2);
129605
- resolve16();
129609
+ resolve17();
129606
129610
  }
129607
129611
  __name(doResolve, "doResolve");
129608
129612
  function doReject(err) {
@@ -129616,7 +129620,7 @@ async function waitForPortToBeAvailable(port2, options14) {
129616
129620
  doResolve();
129617
129621
  return;
129618
129622
  }
129619
- const server2 = (0, import_node_http.createServer)();
129623
+ const server2 = (0, import_node_http2.createServer)();
129620
129624
  const terminator2 = (0, import_http_terminator2.createHttpTerminator)({
129621
129625
  server: server2,
129622
129626
  gracefulTerminationTimeout: 0
@@ -129651,6 +129655,48 @@ function getAccessibleHosts2() {
129651
129655
  __name(getAccessibleHosts2, "getAccessibleHosts");
129652
129656
 
129653
129657
  // src/inspect.ts
129658
+ var ALLOWED_HOST_HOSTNAMES = ["127.0.0.1", "[::1]", "localhost"];
129659
+ var ALLOWED_ORIGIN_HOSTNAMES = [
129660
+ "devtools.devprod.cloudflare.dev",
129661
+ "cloudflare-devtools.pages.dev",
129662
+ /^[a-z0-9]+\.cloudflare-devtools\.pages\.dev$/,
129663
+ "127.0.0.1",
129664
+ "[::1]",
129665
+ "localhost"
129666
+ ];
129667
+ function validateWebSocketHandshake(req) {
129668
+ const hostHeader = req.headers.host;
129669
+ if (hostHeader == null)
129670
+ return false;
129671
+ try {
129672
+ const host = new import_node_url6.URL(`http://${hostHeader}`);
129673
+ if (!ALLOWED_HOST_HOSTNAMES.includes(host.hostname))
129674
+ return false;
129675
+ } catch {
129676
+ return false;
129677
+ }
129678
+ let originHeader = req.headers.origin;
129679
+ if (originHeader === null && req.headers["user-agent"] === void 0) {
129680
+ originHeader = "http://localhost";
129681
+ }
129682
+ if (originHeader == null)
129683
+ return false;
129684
+ try {
129685
+ const origin = new import_node_url6.URL(originHeader);
129686
+ const allowed = ALLOWED_ORIGIN_HOSTNAMES.some((rule) => {
129687
+ if (typeof rule === "string")
129688
+ return origin.hostname === rule;
129689
+ else
129690
+ return rule.test(origin.hostname);
129691
+ });
129692
+ if (!allowed)
129693
+ return false;
129694
+ } catch {
129695
+ return false;
129696
+ }
129697
+ return true;
129698
+ }
129699
+ __name(validateWebSocketHandshake, "validateWebSocketHandshake");
129654
129700
  function useInspector(props) {
129655
129701
  const inspectorIdRef = (0, import_react2.useRef)(randomId());
129656
129702
  const [localWebSocket, setLocalWebSocket] = (0, import_react2.useState)();
@@ -129673,7 +129719,7 @@ function useInspector(props) {
129673
129719
  case "/json/list":
129674
129720
  {
129675
129721
  res.setHeader("Content-Type", "application/json");
129676
- const localHost = `localhost:${props.port}/ws`;
129722
+ const localHost = `127.0.0.1:${props.port}/ws`;
129677
129723
  const devtoolsFrontendUrl = `devtools://devtools/bundled/js_app.html?experiments=true&v8only=true&ws=${localHost}`;
129678
129724
  const devtoolsFrontendUrlCompat = `devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${localHost}`;
129679
129725
  res.end(
@@ -129708,7 +129754,11 @@ function useInspector(props) {
129708
129754
  });
129709
129755
  }
129710
129756
  const wsServer = wsServerRef.current;
129711
- wsServer.on("connection", (ws) => {
129757
+ wsServer.on("connection", (ws, req) => {
129758
+ if (!validateWebSocketHandshake(req)) {
129759
+ ws.close(1008, "Unauthorised");
129760
+ return;
129761
+ }
129712
129762
  if (wsServer.clients.size > 1) {
129713
129763
  logger.error(
129714
129764
  "Tried to open a new devtools window when a previous one was already open."
@@ -129735,7 +129785,7 @@ function useInspector(props) {
129735
129785
  timeout: 2e3,
129736
129786
  abortSignal: abortController.signal
129737
129787
  });
129738
- server2.listen(props.port);
129788
+ server2.listen(props.port, "127.0.0.1");
129739
129789
  }
129740
129790
  __name(startInspectorProxy, "startInspectorProxy");
129741
129791
  startInspectorProxy().catch((err) => {
@@ -130158,7 +130208,7 @@ __name(logConsoleMessage, "logConsoleMessage");
130158
130208
  var openInspector = /* @__PURE__ */ __name(async (inspectorPort, worker) => {
130159
130209
  const query = new URLSearchParams();
130160
130210
  query.set("theme", "systemPreferred");
130161
- query.set("ws", `localhost:${inspectorPort}/ws`);
130211
+ query.set("ws", `127.0.0.1:${inspectorPort}/ws`);
130162
130212
  if (worker)
130163
130213
  query.set("domain", worker);
130164
130214
  const url3 = `https://devtools.devprod.cloudflare.dev/js_app?${query.toString()}`;
@@ -131317,17 +131367,17 @@ async function login(props = { browser: true }) {
131317
131367
  const urlToOpen = await getAuthURL(props?.scopes);
131318
131368
  let server2;
131319
131369
  let loginTimeoutHandle;
131320
- const timerPromise = new Promise((resolve16) => {
131370
+ const timerPromise = new Promise((resolve17) => {
131321
131371
  loginTimeoutHandle = setTimeout(() => {
131322
131372
  logger.error(
131323
131373
  "Timed out waiting for authorization code, please try again."
131324
131374
  );
131325
131375
  server2.close();
131326
131376
  clearTimeout(loginTimeoutHandle);
131327
- resolve16(false);
131377
+ resolve17(false);
131328
131378
  }, 12e4);
131329
131379
  });
131330
- const loginPromise = new Promise((resolve16, reject) => {
131380
+ const loginPromise = new Promise((resolve17, reject) => {
131331
131381
  server2 = import_node_http4.default.createServer(async (req, res) => {
131332
131382
  function finish(status, error) {
131333
131383
  clearTimeout(loginTimeoutHandle);
@@ -131335,7 +131385,7 @@ async function login(props = { browser: true }) {
131335
131385
  if (error || closeErr) {
131336
131386
  reject(error || closeErr);
131337
131387
  } else
131338
- resolve16(status);
131388
+ resolve17(status);
131339
131389
  });
131340
131390
  }
131341
131391
  __name(finish, "finish");
@@ -132344,7 +132394,7 @@ async function transformMf2OptionsToMf3Options({
132344
132394
  __name(transformMf2OptionsToMf3Options, "transformMf2OptionsToMf3Options");
132345
132395
  var miniflare3Module;
132346
132396
  async function getMiniflare3() {
132347
- return miniflare3Module ??= await npxImport("@miniflare/tre@3.0.0-next.13");
132397
+ return miniflare3Module ??= await npxImport("@miniflare/tre@3.0.0-next.14");
132348
132398
  }
132349
132399
  __name(getMiniflare3, "getMiniflare3");
132350
132400
 
@@ -135448,12 +135498,12 @@ var YargsInstance = class {
135448
135498
  async getCompletion(args, done) {
135449
135499
  argsert("<array> [function]", [args, done], arguments.length);
135450
135500
  if (!done) {
135451
- return new Promise((resolve16, reject) => {
135501
+ return new Promise((resolve17, reject) => {
135452
135502
  __classPrivateFieldGet(this, _YargsInstance_completion, "f").getCompletion(args, (err, completions) => {
135453
135503
  if (err)
135454
135504
  reject(err);
135455
135505
  else
135456
- resolve16(completions);
135506
+ resolve17(completions);
135457
135507
  });
135458
135508
  });
135459
135509
  } else {
@@ -144590,7 +144640,7 @@ async function promptSelectProject({
144590
144640
  accountId
144591
144641
  }) {
144592
144642
  const projects = await listProjects2({ accountId });
144593
- return new Promise((resolve16) => {
144643
+ return new Promise((resolve17) => {
144594
144644
  const { unmount } = (0, import_ink7.render)(
144595
144645
  /* @__PURE__ */ import_react12.default.createElement(import_react12.default.Fragment, null, /* @__PURE__ */ import_react12.default.createElement(import_ink7.Text, null, "Select a project:"), /* @__PURE__ */ import_react12.default.createElement(
144596
144646
  import_ink_select_input.default,
@@ -144601,7 +144651,7 @@ async function promptSelectProject({
144601
144651
  value: project
144602
144652
  })),
144603
144653
  onSelect: async (selected) => {
144604
- resolve16(selected.value.name);
144654
+ resolve17(selected.value.name);
144605
144655
  unmount();
144606
144656
  }
144607
144657
  }
@@ -145553,12 +145603,12 @@ var TimeoutError = class extends Error {
145553
145603
  __name(TimeoutError, "TimeoutError");
145554
145604
  function pTimeout(promise, milliseconds, fallback, options14) {
145555
145605
  let timer;
145556
- const cancelablePromise = new Promise((resolve16, reject) => {
145606
+ const cancelablePromise = new Promise((resolve17, reject) => {
145557
145607
  if (typeof milliseconds !== "number" || Math.sign(milliseconds) !== 1) {
145558
145608
  throw new TypeError(`Expected \`milliseconds\` to be a positive number, got \`${milliseconds}\``);
145559
145609
  }
145560
145610
  if (milliseconds === Number.POSITIVE_INFINITY) {
145561
- resolve16(promise);
145611
+ resolve17(promise);
145562
145612
  return;
145563
145613
  }
145564
145614
  options14 = {
@@ -145568,7 +145618,7 @@ function pTimeout(promise, milliseconds, fallback, options14) {
145568
145618
  timer = options14.customTimers.setTimeout.call(void 0, () => {
145569
145619
  if (typeof fallback === "function") {
145570
145620
  try {
145571
- resolve16(fallback());
145621
+ resolve17(fallback());
145572
145622
  } catch (error) {
145573
145623
  reject(error);
145574
145624
  }
@@ -145583,7 +145633,7 @@ function pTimeout(promise, milliseconds, fallback, options14) {
145583
145633
  }, milliseconds);
145584
145634
  (async () => {
145585
145635
  try {
145586
- resolve16(await promise);
145636
+ resolve17(await promise);
145587
145637
  } catch (error) {
145588
145638
  reject(error);
145589
145639
  } finally {
@@ -145774,7 +145824,7 @@ var PQueue = class extends import_eventemitter3.default {
145774
145824
  __classPrivateFieldGet3(this, _PQueue_instances, "m", _PQueue_processQueue).call(this);
145775
145825
  }
145776
145826
  async add(fn2, options14 = {}) {
145777
- return new Promise((resolve16, reject) => {
145827
+ return new Promise((resolve17, reject) => {
145778
145828
  const run = /* @__PURE__ */ __name(async () => {
145779
145829
  var _a2;
145780
145830
  var _b2, _c2;
@@ -145792,7 +145842,7 @@ var PQueue = class extends import_eventemitter3.default {
145792
145842
  return void 0;
145793
145843
  });
145794
145844
  const result = await operation;
145795
- resolve16(result);
145845
+ resolve17(result);
145796
145846
  this.emit("completed", result);
145797
145847
  } catch (error) {
145798
145848
  reject(error);
@@ -145826,11 +145876,11 @@ var PQueue = class extends import_eventemitter3.default {
145826
145876
  if (__classPrivateFieldGet3(this, _PQueue_queue, "f").size === 0) {
145827
145877
  return;
145828
145878
  }
145829
- return new Promise((resolve16) => {
145879
+ return new Promise((resolve17) => {
145830
145880
  const existingResolve = __classPrivateFieldGet3(this, _PQueue_resolveEmpty, "f");
145831
145881
  __classPrivateFieldSet2(this, _PQueue_resolveEmpty, () => {
145832
145882
  existingResolve();
145833
- resolve16();
145883
+ resolve17();
145834
145884
  }, "f");
145835
145885
  });
145836
145886
  }
@@ -145838,11 +145888,11 @@ var PQueue = class extends import_eventemitter3.default {
145838
145888
  if (__classPrivateFieldGet3(this, _PQueue_queue, "f").size < limit) {
145839
145889
  return;
145840
145890
  }
145841
- return new Promise((resolve16) => {
145891
+ return new Promise((resolve17) => {
145842
145892
  const listener = /* @__PURE__ */ __name(() => {
145843
145893
  if (__classPrivateFieldGet3(this, _PQueue_queue, "f").size < limit) {
145844
145894
  this.removeListener("next", listener);
145845
- resolve16();
145895
+ resolve17();
145846
145896
  }
145847
145897
  }, "listener");
145848
145898
  this.on("next", listener);
@@ -145852,11 +145902,11 @@ var PQueue = class extends import_eventemitter3.default {
145852
145902
  if (__classPrivateFieldGet3(this, _PQueue_pendingCount, "f") === 0 && __classPrivateFieldGet3(this, _PQueue_queue, "f").size === 0) {
145853
145903
  return;
145854
145904
  }
145855
- return new Promise((resolve16) => {
145905
+ return new Promise((resolve17) => {
145856
145906
  const existingResolve = __classPrivateFieldGet3(this, _PQueue_resolveIdle, "f");
145857
145907
  __classPrivateFieldSet2(this, _PQueue_resolveIdle, () => {
145858
145908
  existingResolve();
145859
- resolve16();
145909
+ resolve17();
145860
145910
  }, "f");
145861
145911
  });
145862
145912
  }
@@ -146597,7 +146647,7 @@ var Handler9 = /* @__PURE__ */ __name(async ({
146597
146647
  );
146598
146648
  let existingOrNew = "new";
146599
146649
  if (projects.length > 0) {
146600
- existingOrNew = await new Promise((resolve16) => {
146650
+ existingOrNew = await new Promise((resolve17) => {
146601
146651
  const { unmount } = (0, import_ink9.render)(
146602
146652
  /* @__PURE__ */ import_react15.default.createElement(import_react15.default.Fragment, null, /* @__PURE__ */ import_react15.default.createElement(import_ink9.Text, null, "No project selected. Would you like to create one or use an existing project?"), /* @__PURE__ */ import_react15.default.createElement(
146603
146653
  import_ink_select_input2.default,
@@ -146615,7 +146665,7 @@ var Handler9 = /* @__PURE__ */ __name(async ({
146615
146665
  }
146616
146666
  ],
146617
146667
  onSelect: async (selected) => {
146618
- resolve16(selected.value);
146668
+ resolve17(selected.value);
146619
146669
  unmount();
146620
146670
  }
146621
146671
  }
@@ -148355,9 +148405,9 @@ function r2(r2Yargs) {
148355
148405
  }
148356
148406
  const input = await getR2Object(accountId, bucket, key);
148357
148407
  const output = file ? fs15.createWriteStream(file) : process.stdout;
148358
- await new Promise((resolve16, reject) => {
148408
+ await new Promise((resolve17, reject) => {
148359
148409
  stream.pipeline(input, output, (err) => {
148360
- err ? reject(err) : resolve16();
148410
+ err ? reject(err) : resolve17();
148361
148411
  });
148362
148412
  });
148363
148413
  if (!pipe)
@@ -148431,11 +148481,11 @@ function r2(r2Yargs) {
148431
148481
  const stats = fs15.statSync(file);
148432
148482
  objectSize = stats.size;
148433
148483
  } else {
148434
- object = await new Promise((resolve16, reject) => {
148484
+ object = await new Promise((resolve17, reject) => {
148435
148485
  const stdin = process.stdin;
148436
148486
  const chunks = Array();
148437
148487
  stdin.on("data", (chunk) => chunks.push(chunk));
148438
- stdin.on("end", () => resolve16(Buffer.concat(chunks)));
148488
+ stdin.on("end", () => resolve17(Buffer.concat(chunks)));
148439
148489
  stdin.on(
148440
148490
  "error",
148441
148491
  (err) => reject(
@@ -148738,7 +148788,7 @@ function trimTrailingWhitespace(str) {
148738
148788
  }
148739
148789
  __name(trimTrailingWhitespace, "trimTrailingWhitespace");
148740
148790
  function readFromStdin() {
148741
- return new Promise((resolve16, reject) => {
148791
+ return new Promise((resolve17, reject) => {
148742
148792
  const stdin = process.stdin;
148743
148793
  const chunks = [];
148744
148794
  stdin.on("readable", () => {
@@ -148748,7 +148798,7 @@ function readFromStdin() {
148748
148798
  }
148749
148799
  });
148750
148800
  stdin.on("end", () => {
148751
- resolve16(chunks.join(""));
148801
+ resolve17(chunks.join(""));
148752
148802
  });
148753
148803
  stdin.on("error", (err) => {
148754
148804
  reject(err);
@@ -151008,7 +151058,7 @@ __name(registerSubdomain, "registerSubdomain");
151008
151058
 
151009
151059
  // src/publish/publish.ts
151010
151060
  function sleep2(ms) {
151011
- return new Promise((resolve16) => setTimeout(resolve16, ms));
151061
+ return new Promise((resolve17) => setTimeout(resolve17, ms));
151012
151062
  }
151013
151063
  __name(sleep2, "sleep");
151014
151064
  var scriptStartupErrorRegex = /startup/i;
@@ -152591,7 +152641,7 @@ function useCustomBuild(expectedEntry, build5) {
152591
152641
  }
152592
152642
  __name(useCustomBuild, "useCustomBuild");
152593
152643
  function sleep3(period) {
152594
- return new Promise((resolve16) => setTimeout(resolve16, period));
152644
+ return new Promise((resolve17) => setTimeout(resolve17, period));
152595
152645
  }
152596
152646
  __name(sleep3, "sleep");
152597
152647
  var SLEEP_DURATION = 2e3;
@@ -153898,7 +153948,7 @@ unstable_dev()'s behaviour will likely change in future releases`
153898
153948
  let readyPort;
153899
153949
  let readyAddress;
153900
153950
  if (testMode) {
153901
- return new Promise((resolve16) => {
153951
+ return new Promise((resolve17) => {
153902
153952
  return new Promise((ready) => {
153903
153953
  const devServer = startApiDev({
153904
153954
  script,
@@ -153960,7 +154010,7 @@ unstable_dev()'s behaviour will likely change in future releases`
153960
154010
  ...options14
153961
154011
  });
153962
154012
  }).then((devServer) => {
153963
- resolve16({
154013
+ resolve17({
153964
154014
  port: readyPort,
153965
154015
  address: readyAddress,
153966
154016
  stop: devServer.stop,
@@ -153982,7 +154032,7 @@ unstable_dev()'s behaviour will likely change in future releases`
153982
154032
  });
153983
154033
  });
153984
154034
  } else {
153985
- return new Promise((resolve16) => {
154035
+ return new Promise((resolve17) => {
153986
154036
  return new Promise((ready) => {
153987
154037
  const devServer = startDev({
153988
154038
  script,
@@ -154044,7 +154094,7 @@ unstable_dev()'s behaviour will likely change in future releases`
154044
154094
  ...options14
154045
154095
  });
154046
154096
  }).then((devServer) => {
154047
- resolve16({
154097
+ resolve17({
154048
154098
  port: readyPort,
154049
154099
  address: readyAddress,
154050
154100
  stop: devServer.stop,