wrangler 2.4.4 → 2.5.0

package/wrangler-dist/cli.js

@@ -353,8 +353,8 @@ var require_util = __commonJS({
         throw new InvalidArgumentError("invalid protocol");
       }
       if (!(url3 instanceof URL)) {
-        const port = url3.port != null ? url3.port : url3.protocol === "https:" ? 443 : 80;
-        let origin = url3.origin != null ? url3.origin : `${url3.protocol}//${url3.hostname}:${port}`;
+        const port2 = url3.port != null ? url3.port : url3.protocol === "https:" ? 443 : 80;
+        let origin = url3.origin != null ? url3.origin : `${url3.protocol}//${url3.hostname}:${port2}`;
         let path41 = url3.path != null ? url3.path : `${url3.pathname || ""}${url3.search || ""}`;
         if (origin.endsWith("/")) {
           origin = origin.substring(0, origin.length - 1);
@@ -6439,7 +6439,7 @@ var require_connect = __commonJS({
       const sessionCache = /* @__PURE__ */ new Map();
       timeout = timeout == null ? 1e4 : timeout;
       maxCachedSessions = maxCachedSessions == null ? 100 : maxCachedSessions;
-      return function connect2({ hostname, host, protocol, port, servername, httpSocket }, callback) {
+      return function connect2({ hostname, host, protocol, port: port2, servername, httpSocket }, callback) {
         let socket;
         if (protocol === "https:") {
           if (!tls) {
@@ -6455,7 +6455,7 @@ var require_connect = __commonJS({
             servername,
             session,
             socket: httpSocket,
-            port: port || 443,
+            port: port2 || 443,
             host: hostname
           });
           socket.on("session", function(session2) {
@@ -6477,7 +6477,7 @@ var require_connect = __commonJS({
           socket = net3.connect({
             highWaterMark: 64 * 1024,
             ...options6,
-            port: port || 80,
+            port: port2 || 80,
             host: hostname
           });
         }
@@ -7813,13 +7813,13 @@ var require_client = __commonJS({
     async function connect2(client) {
       assert14(!client[kConnecting]);
       assert14(!client[kSocket]);
-      let { host, hostname, protocol, port } = client[kUrl];
+      let { host, hostname, protocol, port: port2 } = client[kUrl];
       if (hostname[0] === "[") {
         const idx = hostname.indexOf("]");
         assert14(idx !== -1);
-        const ip = hostname.substr(1, idx - 1);
-        assert14(net3.isIP(ip));
-        hostname = ip;
+        const ip2 = hostname.substr(1, idx - 1);
+        assert14(net3.isIP(ip2));
+        hostname = ip2;
       }
       client[kConnecting] = true;
       if (channels.beforeConnect.hasSubscribers) {
@@ -7828,7 +7828,7 @@ var require_client = __commonJS({
             host,
             hostname,
             protocol,
-            port,
+            port: port2,
             servername: client[kServerName]
           },
           connector: client[kConnector]
@@ -7840,7 +7840,7 @@ var require_client = __commonJS({
             host,
             hostname,
             protocol,
-            port,
+            port: port2,
             servername: client[kServerName]
           }, (err2, socket2) => {
             if (err2) {
@@ -7873,7 +7873,7 @@ var require_client = __commonJS({
               host,
               hostname,
               protocol,
-              port,
+              port: port2,
               servername: client[kServerName]
             },
             connector: client[kConnector],
@@ -7889,7 +7889,7 @@ var require_client = __commonJS({
               host,
               hostname,
               protocol,
-              port,
+              port: port2,
               servername: client[kServerName]
             },
             connector: client[kConnector],
@@ -10776,7 +10776,7 @@ var require_proxy_agent = __commonJS({
           this[kProxyHeaders]["proxy-authorization"] = `Basic ${opts.auth}`;
         }
         const resolvedUrl = new URL4(opts.uri);
-        const { origin, port, host } = resolvedUrl;
+        const { origin, port: port2, host } = resolvedUrl;
         const connect2 = buildConnector({ ...opts.proxyTls });
         this[kConnectEndpoint] = buildConnector({ ...opts.requestTls });
         this[kClient] = new Client(resolvedUrl, { connect: connect2 });
@@ -10790,7 +10790,7 @@ var require_proxy_agent = __commonJS({
             try {
               const { socket, statusCode } = await this[kClient].connect({
                 origin,
-                port,
+                port: port2,
                 path: requestedHost,
                 signal: opts2.signal,
                 headers: {
@@ -42209,7 +42209,7 @@ var require_nbind = __commonJS({
           kp(a2);
           return;
         }
-        function ip(a2) {
+        function ip2(a2) {
           a2 = a2 | 0;
           jp(a2 + 24 | 0);
           return;
@@ -54334,7 +54334,7 @@ var require_nbind = __commonJS({
         var kb = [iD, of];
         var lb = [jD, Of, Pf, Qf, Rf, Sf, Tf, Uf, Wf, Xf, Zf, _f, $f, ag, bg, cg, dg, eg, fg, jD, jD, jD, jD, jD, jD, jD, jD, jD, jD, jD, jD, jD];
         var mb = [kD];
-        var nb = [lD, kC, Ki, Li, Mi, rn, sn, tn, Pu, Qu, Ru, Cw, Dw, Ew, DA, EA, FA, Rb, tf, yf, Vf, Yf, hh, ih, ri, Ui, kj, Jj, bk, zk, Wk, nl, Hl, bm, um, Nm, en, Nn, fo, yo, Ro, ip, Bp, Xp, nq, Eq, Zq, lf, Hr, _r, us, Ps, ft, Ct, Ot, Rt, ju, mu, Eu, Uu, Xu, pv, Kv, Vi, $x, Ky, az, sz, Rz, hA, tA, wA, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD];
+        var nb = [lD, kC, Ki, Li, Mi, rn, sn, tn, Pu, Qu, Ru, Cw, Dw, Ew, DA, EA, FA, Rb, tf, yf, Vf, Yf, hh, ih, ri, Ui, kj, Jj, bk, zk, Wk, nl, Hl, bm, um, Nm, en, Nn, fo, yo, Ro, ip2, Bp, Xp, nq, Eq, Zq, lf, Hr, _r, us, Ps, ft, Ct, Ot, Rt, ju, mu, Eu, Uu, Xu, pv, Kv, Vi, $x, Ky, az, sz, Rz, hA, tA, wA, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD, lD];
         var ob = [mD, zf, Af, Df, Ef, Ff, Gf, Hf, If, Lf, Mf, Nf, wg, zg, Ag, Bg, Cg, Dg, Eg, Jg, Ng, rh, $p, qq, Ts, cy2, Sv, xy, mD, mD, mD, mD];
         var pb = [nD, rB, sf, jg, ng, og, pg, qg, rg, sg, ug, vg, Kg, Lg, jh, ar2, jt, sv, hy, jy, nD, nD, nD, nD, nD, nD, nD, nD, nD, nD, nD, nD];
         var qb = [oD, kh];
@@ -73521,7 +73521,7 @@ var require_backend = __commonJS({
             if (backend_hook == null) {
               return;
             }
-            var _ref = options6 || {}, _ref$host = _ref.host, host = _ref$host === void 0 ? "localhost" : _ref$host, nativeStyleEditorValidAttributes = _ref.nativeStyleEditorValidAttributes, _ref$useHttps = _ref.useHttps, useHttps = _ref$useHttps === void 0 ? false : _ref$useHttps, _ref$port = _ref.port, port = _ref$port === void 0 ? 8097 : _ref$port, websocket = _ref.websocket, _ref$resolveRNStyle = _ref.resolveRNStyle, resolveRNStyle = _ref$resolveRNStyle === void 0 ? null : _ref$resolveRNStyle, _ref$retryConnectionD = _ref.retryConnectionDelay, retryConnectionDelay = _ref$retryConnectionD === void 0 ? 2e3 : _ref$retryConnectionD, _ref$isAppActive = _ref.isAppActive, isAppActive = _ref$isAppActive === void 0 ? function() {
+            var _ref = options6 || {}, _ref$host = _ref.host, host = _ref$host === void 0 ? "localhost" : _ref$host, nativeStyleEditorValidAttributes = _ref.nativeStyleEditorValidAttributes, _ref$useHttps = _ref.useHttps, useHttps = _ref$useHttps === void 0 ? false : _ref$useHttps, _ref$port = _ref.port, port2 = _ref$port === void 0 ? 8097 : _ref$port, websocket = _ref.websocket, _ref$resolveRNStyle = _ref.resolveRNStyle, resolveRNStyle = _ref$resolveRNStyle === void 0 ? null : _ref$resolveRNStyle, _ref$retryConnectionD = _ref.retryConnectionDelay, retryConnectionDelay = _ref$retryConnectionD === void 0 ? 2e3 : _ref$retryConnectionD, _ref$isAppActive = _ref.isAppActive, isAppActive = _ref$isAppActive === void 0 ? function() {
               return true;
             } : _ref$isAppActive;
             var protocol = useHttps ? "wss" : "ws";
@@ -73539,7 +73539,7 @@ var require_backend = __commonJS({
             }
             var bridge = null;
             var messageListeners = [];
-            var uri = protocol + "://" + host + ":" + port;
+            var uri = protocol + "://" + host + ":" + port2;
             var ws = websocket ? websocket : new window.WebSocket(uri);
             ws.onclose = handleClose;
             ws.onerror = handleFailed;
@@ -105860,17 +105860,17 @@ var require_proxy_addr = __commonJS({
       if (!isip(str)) {
         throw new TypeError("invalid IP address: " + str);
       }
-      var ip = parseip(str);
-      if (pos === -1 && ip.kind() === "ipv6" && ip.isIPv4MappedAddress()) {
-        ip = ip.toIPv4Address();
+      var ip2 = parseip(str);
+      if (pos === -1 && ip2.kind() === "ipv6" && ip2.isIPv4MappedAddress()) {
+        ip2 = ip2.toIPv4Address();
       }
-      var max = ip.kind() === "ipv6" ? 128 : 32;
+      var max = ip2.kind() === "ipv6" ? 128 : 32;
       var range = pos !== -1 ? note.substring(pos + 1, note.length) : null;
       if (range === null) {
         range = max;
       } else if (DIGIT_REGEXP.test(range)) {
         range = parseInt(range, 10);
-      } else if (ip.kind() === "ipv4" && isip(range)) {
+      } else if (ip2.kind() === "ipv4" && isip(range)) {
         range = parseNetmask(range);
       } else {
         range = null;
@@ -105878,12 +105878,12 @@ var require_proxy_addr = __commonJS({
       if (range <= 0 || range > max) {
         throw new TypeError("invalid range on address: " + note);
       }
-      return [ip, range];
+      return [ip2, range];
     }
     function parseNetmask(netmask) {
-      var ip = parseip(netmask);
-      var kind = ip.kind();
-      return kind === "ipv4" ? ip.prefixLengthFromSubnetMask() : null;
+      var ip2 = parseip(netmask);
+      var kind = ip2.kind();
+      return kind === "ipv4" ? ip2.prefixLengthFromSubnetMask() : null;
     }
     function proxyaddr(req, trust) {
       if (!req) {
@@ -105903,21 +105903,21 @@ var require_proxy_addr = __commonJS({
       return function trust(addr) {
         if (!isip(addr))
           return false;
-        var ip = parseip(addr);
+        var ip2 = parseip(addr);
         var ipconv;
-        var kind = ip.kind();
+        var kind = ip2.kind();
         for (var i2 = 0; i2 < subnets.length; i2++) {
           var subnet = subnets[i2];
           var subnetip = subnet[0];
           var subnetkind = subnetip.kind();
           var subnetrange = subnet[1];
-          var trusted = ip;
+          var trusted = ip2;
           if (kind !== subnetkind) {
-            if (subnetkind === "ipv4" && !ip.isIPv4MappedAddress()) {
+            if (subnetkind === "ipv4" && !ip2.isIPv4MappedAddress()) {
               continue;
             }
             if (!ipconv) {
-              ipconv = subnetkind === "ipv4" ? ip.toIPv4Address() : ip.toIPv4MappedAddress();
+              ipconv = subnetkind === "ipv4" ? ip2.toIPv4Address() : ip2.toIPv4MappedAddress();
             }
             trusted = ipconv;
           }
@@ -105936,15 +105936,15 @@ var require_proxy_addr = __commonJS({
       return function trust(addr) {
         if (!isip(addr))
           return false;
-        var ip = parseip(addr);
-        var kind = ip.kind();
+        var ip2 = parseip(addr);
+        var kind = ip2.kind();
         if (kind !== subnetkind) {
-          if (subnetisipv4 && !ip.isIPv4MappedAddress()) {
+          if (subnetisipv4 && !ip2.isIPv4MappedAddress()) {
             return false;
           }
-          ip = subnetisipv4 ? ip.toIPv4Address() : ip.toIPv4MappedAddress();
+          ip2 = subnetisipv4 ? ip2.toIPv4Address() : ip2.toIPv4MappedAddress();
         }
-        return ip.match(subnetip, subnetrange);
+        return ip2.match(subnetip, subnetrange);
       };
     }
   }
@@ -107064,7 +107064,7 @@ var require_request3 = __commonJS({
     defineGetter(req, "secure", function secure() {
       return this.protocol === "https";
     });
-    defineGetter(req, "ip", function ip() {
+    defineGetter(req, "ip", function ip2() {
       var trust = this.app.get("trust proxy fn");
       return proxyaddr(this, trust);
     });
@@ -136703,8 +136703,8 @@ init_import_meta_url();
 var import_node_net = __toESM(require("node:net"), 1);
 var import_node_os = __toESM(require("node:os"), 1);
 var Locked = class extends Error {
-  constructor(port) {
-    super(`${port} is locked`);
+  constructor(port2) {
+    super(`${port2} is locked`);
   }
 };
 var lockedPorts = {
@@ -136728,9 +136728,9 @@ var checkAvailablePort = (options6) => new Promise((resolve15, reject) => {
   server2.unref();
   server2.on("error", reject);
   server2.listen(options6, () => {
-    const { port } = server2.address();
+    const { port: port2 } = server2.address();
     server2.close(() => {
-      resolve15(port);
+      resolve15(port2);
     });
   });
 });
@@ -136788,17 +136788,17 @@ async function getPorts(options6) {
     }
   }
   const hosts = getLocalHosts();
-  for (const port of portCheckSequence(ports)) {
+  for (const port2 of portCheckSequence(ports)) {
     try {
-      if (exclude.has(port)) {
+      if (exclude.has(port2)) {
         continue;
       }
-      let availablePort = await getAvailablePort({ ...options6, port }, hosts);
+      let availablePort = await getAvailablePort({ ...options6, port: port2 }, hosts);
       while (lockedPorts.old.has(availablePort) || lockedPorts.young.has(availablePort)) {
-        if (port !== 0) {
-          throw new Locked(port);
+        if (port2 !== 0) {
+          throw new Locked(port2);
         }
-        availablePort = await getAvailablePort({ ...options6, port }, hosts);
+        availablePort = await getAvailablePort({ ...options6, port: port2 }, hosts);
       }
       lockedPorts.young.add(availablePort);
       return availablePort;
@@ -137964,8 +137964,8 @@ function normalizeAndValidateMainField(configPath, rawMain, deprecatedUpload) {
 }
 function normalizeAndValidateDev(diagnostics, rawDev) {
   const {
-    ip = "0.0.0.0",
-    port,
+    ip: ip2 = "0.0.0.0",
+    port: port2,
     inspector_port,
     local_protocol = "http",
     upstream_protocol = "https",
@@ -137973,8 +137973,8 @@ function normalizeAndValidateDev(diagnostics, rawDev) {
     ...rest
   } = rawDev;
   validateAdditionalProperties(diagnostics, "dev", Object.keys(rest), []);
-  validateOptionalProperty(diagnostics, "dev", "ip", ip, "string");
-  validateOptionalProperty(diagnostics, "dev", "port", port, "number");
+  validateOptionalProperty(diagnostics, "dev", "ip", ip2, "string");
+  validateOptionalProperty(diagnostics, "dev", "port", port2, "number");
   validateOptionalProperty(
     diagnostics,
     "dev",
@@ -137999,7 +137999,7 @@ function normalizeAndValidateDev(diagnostics, rawDev) {
     ["http", "https"]
   );
   validateOptionalProperty(diagnostics, "dev", "host", host, "string");
-  return { ip, port, inspector_port, local_protocol, upstream_protocol, host };
+  return { ip: ip2, port: port2, inspector_port, local_protocol, upstream_protocol, host };
 }
 function normalizeAndValidateMigrations(diagnostics, rawMigrations, durableObjects) {
   if (!Array.isArray(rawMigrations)) {
@@ -141160,7 +141160,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.4.4";
+var version = "2.5.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -141476,7 +141476,7 @@ async function generateCertificate() {
         name: "subjectAltName",
         altNames: [
           { type: 2, value: "localhost" },
-          ...getAccessibleHosts().map((ip) => ({ type: 7, ip }))
+          ...getAccessibleHosts().map((ip2) => ({ type: 7, ip: ip2 }))
         ]
       }
     ]
@@ -141602,8 +141602,8 @@ async function startPreviewServer({
   previewToken,
   assetDirectory,
   localProtocol,
-  localPort: port,
-  ip,
+  localPort: port2,
+  ip: ip2,
   onReady
 }) {
   try {
@@ -141628,25 +141628,25 @@ async function startPreviewServer({
       },
       assetDirectory,
       localProtocol,
-      port,
+      port: port2,
       accessTokenRef
     });
-    await waitForPortToBeAvailable(port, {
+    await waitForPortToBeAvailable(port2, {
       retryPeriod: 200,
       timeout: 2e3,
       abortSignal: abortController.signal
     });
     proxy2.server.on("listening", () => {
       const address = proxy2.server.address();
-      const usedPort = address && typeof address === "object" ? address.port : port;
-      logger.log(`\u2B23 Listening at ${localProtocol}://${ip}:${usedPort}`);
-      const accessibleHosts = ip !== "0.0.0.0" ? [ip] : getAccessibleHosts2();
+      const usedPort = address && typeof address === "object" ? address.port : port2;
+      logger.log(`\u2B23 Listening at ${localProtocol}://${ip2}:${usedPort}`);
+      const accessibleHosts = ip2 !== "0.0.0.0" ? [ip2] : getAccessibleHosts2();
       for (const accessibleHost of accessibleHosts) {
         logger.log(`- ${localProtocol}://${accessibleHost}:${usedPort}`);
       }
-      onReady?.(ip, usedPort);
+      onReady?.(ip2, usedPort);
     });
-    proxy2.server.listen(port, ip);
+    proxy2.server.listen(port2, ip2);
     return {
       stop: () => {
         abortController.abort();
@@ -141664,8 +141664,8 @@ function usePreviewServer({
   previewToken,
   assetDirectory,
   localProtocol,
-  localPort: port,
-  ip
+  localPort: port2,
+  ip: ip2
 }) {
   const [proxy2, setProxy] = (0, import_react.useState)();
   (0, import_react.useEffect)(() => {
@@ -141699,7 +141699,7 @@ function usePreviewServer({
       retryServerSetup,
       assetDirectory,
       localProtocol,
-      port,
+      port: port2,
       accessTokenRef
     });
     return () => {
@@ -141708,7 +141708,7 @@ function usePreviewServer({
   }, [
     previewToken,
     assetDirectory,
-    port,
+    port2,
     localProtocol,
     proxy2,
     retryServerSetupSigil
@@ -141718,21 +141718,21 @@ function usePreviewServer({
     if (proxy2 === void 0) {
       return;
     }
-    waitForPortToBeAvailable(port, {
+    waitForPortToBeAvailable(port2, {
       retryPeriod: 200,
       timeout: 2e3,
       abortSignal: abortController.signal
     }).then(() => {
       proxy2.server.on("listening", () => {
         const address = proxy2.server.address();
-        const usedPort = address && typeof address === "object" ? address.port : port;
-        logger.log(`\u2B23 Listening at ${localProtocol}://${ip}:${usedPort}`);
-        const accessibleHosts = ip !== "0.0.0.0" ? [ip] : getAccessibleHosts2();
+        const usedPort = address && typeof address === "object" ? address.port : port2;
+        logger.log(`\u2B23 Listening at ${localProtocol}://${ip2}:${usedPort}`);
+        const accessibleHosts = ip2 !== "0.0.0.0" ? [ip2] : getAccessibleHosts2();
         for (const accessibleHost of accessibleHosts) {
           logger.log(`- ${localProtocol}://${accessibleHost}:${usedPort}`);
         }
       });
-      proxy2.server.listen(port, ip);
+      proxy2.server.listen(port2, ip2);
     }).catch((err2) => {
       if (err2.code !== "ABORT_ERR") {
         logger.error(`Failed to start server: ${err2}`);
@@ -141742,7 +141742,7 @@ function usePreviewServer({
       abortController.abort();
       proxy2.terminator.terminate().catch(() => logger.error("Failed to terminate the proxy server."));
     };
-  }, [port, ip, proxy2, localProtocol]);
+  }, [port2, ip2, proxy2, localProtocol]);
 }
 function configureProxyServer({
   proxy: proxy2,
@@ -141750,7 +141750,7 @@ function configureProxyServer({
   streamBufferRef,
   requestResponseBufferRef,
   retryServerSetup,
-  port,
+  port: port2,
   localProtocol,
   assetDirectory,
   accessTokenRef
@@ -141783,7 +141783,7 @@ function configureProxyServer({
   const handleStream = createStreamHandler(
     previewToken,
     remote,
-    port,
+    port2,
     localProtocol,
     accessTokenRef
   );
@@ -141824,7 +141824,7 @@ function configureProxyServer({
       rewriteRemoteHostToLocalHostInHeaders(
         responseHeaders,
         previewToken.host,
-        port,
+        port2,
         localProtocol
       );
       for (const name of Object.keys(responseHeaders)) {
@@ -141938,7 +141938,7 @@ function createStreamHandler(previewToken, remote, localPort, localProtocol, acc
     });
   };
 }
-async function waitForPortToBeAvailable(port, options6) {
+async function waitForPortToBeAvailable(port2, options6) {
   return new Promise((resolve15, reject) => {
     options6.abortSignal.addEventListener("abort", () => {
       const abortError = new Error("waitForPortToBeAvailable() aborted");
@@ -141946,7 +141946,7 @@ async function waitForPortToBeAvailable(port, options6) {
       doReject(abortError);
     });
     const timeout = setTimeout(() => {
-      doReject(new Error(`Timed out waiting for port ${port}`));
+      doReject(new Error(`Timed out waiting for port ${port2}`));
     }, options6.timeout);
     const interval2 = setInterval(checkPort, options6.retryPeriod);
     checkPort();
@@ -141961,6 +141961,10 @@ async function waitForPortToBeAvailable(port, options6) {
       reject(err2);
     }
     function checkPort() {
+      if (port2 === 0) {
+        doResolve();
+        return;
+      }
       const server2 = (0, import_node_http.createServer)();
       const terminator2 = (0, import_http_terminator2.createHttpTerminator)({
         server: server2,
@@ -141972,7 +141976,7 @@ async function waitForPortToBeAvailable(port, options6) {
         }
       });
       server2.listen(
-        port,
+        port2,
         () => terminator2.terminate().then(
           doResolve,
           () => logger.error("Failed to terminate the port checker.")
@@ -143981,12 +143985,12 @@ function useLocalWorker({
   bindings,
   workerDefinitions,
   assetPaths,
-  port,
+  initialPort,
   inspectorPort,
   rules,
   localPersistencePath,
   liveReload,
-  ip,
+  initialIp,
   crons,
   queueConsumers,
   localProtocol,
@@ -144024,7 +144028,7 @@ function useLocalWorker({
     async function startLocalWorker() {
       if (!bundle || !format6)
         return;
-      await waitForPortToBeAvailable(port, {
+      await waitForPortToBeAvailable(initialPort, {
         retryPeriod: 200,
         timeout: 2e3,
         abortSignal: abortController.signal
@@ -144053,10 +144057,10 @@ function useLocalWorker({
       });
       const { forkOptions, miniflareCLIPath, options: options6 } = setupMiniflareOptions({
         workerName,
-        port,
+        port: initialPort,
         scriptPath,
         localProtocol,
-        ip,
+        ip: initialIp,
         format: format6,
         rules,
         compatibilityDate,
@@ -144133,7 +144137,11 @@ function useLocalWorker({
         }
         return;
       }
-      const nodeOptions = setupNodeOptions({ inspect: inspect2, ip, inspectorPort });
+      const nodeOptions = setupNodeOptions({
+        inspect: inspect2,
+        ip: initialIp,
+        inspectorPort
+      });
       logger.log("\u2394 Starting a local server...");
       const child = local.current = (0, import_node_child_process2.fork)(miniflareCLIPath, forkOptions, {
         cwd: import_node_path15.default.dirname(scriptPath),
@@ -144151,19 +144159,19 @@ function useLocalWorker({
             await registerWorker(workerName, {
               protocol: localProtocol,
               mode: "local",
-              port,
-              host: ip,
+              port: message.port,
+              host: initialIp,
               durableObjects: internalDurableObjects.map((binding) => ({
                 name: binding.name,
                 className: binding.class_name
               })),
               ...message.durableObjectsPort ? {
-                durableObjectsHost: ip,
+                durableObjectsHost: initialIp,
                 durableObjectsPort: message.durableObjectsPort
               } : {}
             });
           }
-          onReady?.(ip, message.mfPort);
+          onReady?.(initialIp, message.port);
         }
       });
       child.on("close", (code) => {
@@ -144221,9 +144229,9 @@ function useLocalWorker({
     bundle,
     workerName,
     format6,
-    port,
+    initialPort,
     inspectorPort,
-    ip,
+    initialIp,
     queueConsumers,
     bindings.queues,
     bindings.durable_objects,
@@ -144319,10 +144327,10 @@ function setupBindings({
 }
 function setupMiniflareOptions({
   workerName,
-  port,
+  port: port2,
   scriptPath,
   localProtocol,
-  ip,
+  ip: ip2,
   format: format6,
   rules,
   compatibilityDate,
@@ -144350,10 +144358,10 @@ function setupMiniflareOptions({
 }) {
   const options6 = {
     name: workerName,
-    port,
+    port: port2,
     scriptPath,
     https: localProtocol === "https",
-    host: ip,
+    host: ip2,
     modules: format6 === "modules",
     modulesRules: (rules || []).concat(DEFAULT_MODULE_RULES).map(({ type: type2, globs: include, fallthrough }) => ({
       type: type2,
@@ -144446,7 +144454,7 @@ function setupMiniflareOptions({
 }
 function setupNodeOptions({
   inspect: inspect2,
-  ip,
+  ip: ip2,
   inspectorPort
 }) {
   const nodeOptions = [
@@ -144454,7 +144462,7 @@ function setupNodeOptions({
     "--no-warnings"
   ];
   if (inspect2) {
-    nodeOptions.push(`--inspect=${ip}:${inspectorPort}`);
+    nodeOptions.push(`--inspect=${ip2}:${inspectorPort}`);
   }
   return nodeOptions;
 }
@@ -146507,23 +146515,35 @@ function DevImplementation(props) {
     local: props.initialMode === "local"
   });
 }
+var ip;
+var port;
 function InteractiveDevSession(props) {
   const toggles = useHotkeys({
     initial: {
       local: props.initialMode === "local",
       tunnel: false
     },
-    port: props.port,
-    ip: props.ip,
     inspectorPort: props.inspectorPort,
     inspect: props.inspect,
     localProtocol: props.localProtocol,
     forceLocal: props.forceLocal
   });
+  ip = props.initialIp;
+  port = props.initialPort;
   useTunnel(toggles.tunnel);
+  const onReady = (newIp, newPort) => {
+    if (newIp !== props.initialIp || newPort !== props.initialPort) {
+      ip = newIp;
+      port = newPort;
+      if (props.onReady) {
+        props.onReady(newIp, newPort);
+      }
+    }
+  };
   return /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null, /* @__PURE__ */ import_react8.default.createElement(DevSession, {
     ...props,
-    local: toggles.local
+    local: toggles.local,
+    onReady
   }), /* @__PURE__ */ import_react8.default.createElement(import_ink4.Box, {
     borderStyle: "round",
     paddingLeft: 1,
@@ -146601,6 +146621,20 @@ function DevSession(props) {
       "Queues are currently in Beta and are not supported in wrangler dev remote mode."
     );
   }
+  const announceAndOnReady = (finalIp, finalPort) => {
+    if (process.send) {
+      process.send(
+        JSON.stringify({
+          event: "DEV_SERVER_READY",
+          ip: finalIp,
+          port: finalPort
+        })
+      );
+    }
+    if (props.onReady) {
+      props.onReady(finalIp, finalPort);
+    }
+  };
   return props.local ? /* @__PURE__ */ import_react8.default.createElement(Local, {
     name: props.name,
     bundle,
@@ -146611,8 +146645,8 @@ function DevSession(props) {
     bindings: props.bindings,
     workerDefinitions,
     assetPaths: props.assetPaths,
-    port: props.port,
-    ip: props.ip,
+    initialPort: props.initialPort,
+    initialIp: props.initialIp,
     rules: props.rules,
     inspectorPort: props.inspectorPort,
     localPersistencePath: props.localPersistencePath,
@@ -146623,7 +146657,7 @@ function DevSession(props) {
     localUpstream: props.localUpstream,
     logPrefix: props.logPrefix,
     inspect: props.inspect,
-    onReady: props.onReady,
+    onReady: announceAndOnReady,
     enablePagesAssetsServiceBinding: props.enablePagesAssetsServiceBinding,
     experimentalLocal: props.experimentalLocal,
     accountId: props.accountId,
@@ -146636,8 +146670,8 @@ function DevSession(props) {
     bindings: props.bindings,
     assetPaths: props.assetPaths,
     isWorkersSite: props.isWorkersSite,
-    port: props.port,
-    ip: props.ip,
+    port: props.initialPort,
+    ip: props.initialIp,
     localProtocol: props.localProtocol,
     inspectorPort: props.inspectorPort,
     inspect: props.inspect,
@@ -146649,7 +146683,7 @@ function DevSession(props) {
     zone: props.zone,
     host: props.host,
     routes: props.routes,
-    onReady: props.onReady,
+    onReady: announceAndOnReady,
     sourceMapPath: bundle?.sourceMapPath,
     sendMetrics: props.sendMetrics
   });
@@ -146768,15 +146802,7 @@ function useTunnel(toggle) {
   }, [toggle]);
 }
 function useHotkeys(props) {
-  const {
-    initial,
-    port,
-    ip,
-    inspectorPort,
-    inspect: inspect2,
-    localProtocol,
-    forceLocal
-  } = props;
+  const { initial, inspectorPort, inspect: inspect2, localProtocol, forceLocal } = props;
   const [toggles, setToggles] = (0, import_react8.useState)(initial);
   const { exit: exit2 } = (0, import_ink4.useApp)();
   (0, import_ink4.useInput)(
@@ -146927,8 +146953,8 @@ async function startDevServer(props) {
         compatibilityFlags: props.compatibilityFlags,
         bindings: props.bindings,
         assetPaths: props.assetPaths,
-        port: props.port,
-        ip: props.ip,
+        initialPort: props.initialPort,
+        initialIp: props.initialIp,
         rules: props.rules,
         inspectorPort: props.inspectorPort,
         localPersistencePath: props.localPersistencePath,
@@ -146963,8 +146989,8 @@ async function startDevServer(props) {
         bindings: props.bindings,
         assetPaths: props.assetPaths,
         isWorkersSite: props.isWorkersSite,
-        port: props.port,
-        ip: props.ip,
+        port: props.initialPort,
+        ip: props.initialIp,
         localProtocol: props.localProtocol,
         inspectorPort: props.inspectorPort,
         inspect: props.inspect,
@@ -147079,12 +147105,12 @@ async function startLocalServer({
   bindings,
   workerDefinitions,
   assetPaths,
-  port,
+  initialPort,
   inspectorPort,
   rules,
   localPersistencePath,
   liveReload,
-  ip,
+  initialIp,
   crons,
   queueConsumers,
   localProtocol,
@@ -147108,13 +147134,11 @@ async function startLocalServer({
   async function startLocalWorker() {
     if (!bundle || !format6)
       return;
-    if (port !== 0) {
-      await waitForPortToBeAvailable(port, {
-        retryPeriod: 200,
-        timeout: 2e3,
-        abortSignal: abortController.signal
-      });
-    }
+    await waitForPortToBeAvailable(initialPort, {
+      retryPeriod: 200,
+      timeout: 2e3,
+      abortSignal: abortController.signal
+    });
     if (bindings.services && bindings.services.length > 0) {
       logger.warn(
         "\u2394 Support for service bindings in local mode is experimental and may change."
@@ -147144,10 +147168,10 @@ async function startLocalServer({
     });
     const { forkOptions, miniflareCLIPath, options: options6 } = setupMiniflareOptions({
       workerName,
-      port,
+      port: initialPort,
       scriptPath,
       localProtocol,
-      ip,
+      ip: initialIp,
       format: format6,
       rules,
       compatibilityDate,
@@ -147198,7 +147222,11 @@ async function startLocalServer({
       onReady?.(runtimeURL.hostname, parseInt(runtimeURL.port ?? 8787));
       return;
     }
-    const nodeOptions = setupNodeOptions({ inspect: inspect2, ip, inspectorPort });
+    const nodeOptions = setupNodeOptions({
+      inspect: inspect2,
+      ip: initialIp,
+      inspectorPort
+    });
     logger.log("\u2394 Starting a local server...");
     const child = local = (0, import_node_child_process4.fork)(miniflareCLIPath, forkOptions, {
       cwd: path22.dirname(scriptPath),
@@ -147212,19 +147240,19 @@ async function startLocalServer({
           await registerWorker(workerName, {
             protocol: localProtocol,
             mode: "local",
-            port: message.mfPort,
-            host: ip,
+            port: message.port,
+            host: initialIp,
             durableObjects: internalDurableObjects.map((binding) => ({
               name: binding.name,
               className: binding.class_name
             })),
             ...message.durableObjectsPort ? {
-              durableObjectsHost: ip,
+              durableObjectsHost: initialIp,
               durableObjectsPort: message.durableObjectsPort
             } : {}
           });
         }
-        onReady?.(ip, message.mfPort);
+        onReady?.(initialIp, message.port);
       }
     });
     child.on("close", (code) => {
@@ -153851,9 +153879,9 @@ var RestoreHandler = withConfig(
       accountId,
       name
     );
-    console.log(`Restoring ${name} from backup ${backupId}....`);
+    logger.log(`Restoring ${name} from backup ${backupId}....`);
     await restoreBackup(accountId, db.uuid, backupId);
-    console.log(`Done!`);
+    logger.log(`Done!`);
   }
 );
 var restoreBackup = async (accountId, uuid, backupId) => {
@@ -153892,6 +153920,11 @@ var DownloadHandler = withConfig(
     );
     logger.log(`\u{1F300} Downloading backup ${backupId} from '${name}'`);
     const response = await getBackupResponse(accountId, db.uuid, backupId);
+    if (!response.ok) {
+      throw new Error(
+        `Failed to download backup ${backupId} from '${name}' - got ${response.status} from the API`
+      );
+    }
     logger.log(`\u{1F300} Saving to ${filename}`);
     const buffer2 = await response.arrayBuffer();
     await import_promises7.default.writeFile(filename, new Buffer(buffer2));
@@ -153963,19 +153996,19 @@ var Handler3 = withConfig(
       accountId,
       name
     );
-    console.log(`About to delete DB '${name}' (${db.uuid}).`);
+    logger.log(`About to delete DB '${name}' (${db.uuid}).`);
     if (!skipConfirmation) {
       const response = await confirm(`Ok to proceed?`);
       if (!response) {
-        console.log(`Not deleting.`);
+        logger.log(`Not deleting.`);
         return;
       }
     }
-    console.log("Deleting...");
+    logger.log("Deleting...");
     await fetchResult(`/accounts/${accountId}/d1/database/${db.uuid}`, {
       method: "DELETE"
     });
-    console.log(`Deleted '${name}' successfully.`);
+    logger.log(`Deleted '${name}' successfully.`);
   }
 );
 
@@ -154258,7 +154291,7 @@ var listAppliedMigrations = async (migrationsTableName, local, config, name, per
     local,
     config,
     name,
-    void 0,
+    isInteractive() && !CI.isCI(),
     persistTo,
     void 0,
     Query
@@ -154293,7 +154326,7 @@ var initMigrationsTable = async (migrationsTableName, local, config, name, persi
     local,
     config,
     name,
-    void 0,
+    isInteractive() && !CI.isCI(),
     persistTo,
     void 0,
     `
@@ -154307,9 +154340,22 @@ var initMigrationsTable = async (migrationsTableName, local, config, name, persi
   );
 };
 
+// src/d1/migrations/options.ts
+init_import_meta_url();
+function DatabaseWithLocal(yargs) {
+  return Database(yargs).option("local", {
+    describe: "Execute commands/files against a local DB for use with wrangler dev --local",
+    type: "boolean"
+  }).option("persist-to", {
+    describe: "Specify directory to use for local persistence (you must use --local with this flag)",
+    type: "string",
+    requiresArg: true
+  }).implies("persist-to", "local");
+}
+
 // src/d1/migrations/apply.tsx
 function ApplyOptions(yargs) {
-  return Database(yargs);
+  return DatabaseWithLocal(yargs);
 }
 var ApplyHandler = withConfig(
   async ({ config, database, local, persistTo }) => {
@@ -154363,8 +154409,7 @@ var ApplyHandler = withConfig(
       (0, import_ink10.render)(/* @__PURE__ */ import_react14.default.createElement(import_ink10.Text, null, "\u2705 No migrations to apply!"));
       return;
     }
-    const isInteractive2 = process.stdout.isTTY;
-    if (isInteractive2) {
+    if (isInteractive() && !CI.isCI()) {
       const ok = await confirm(
         `About to apply ${unappliedMigrations.length} migration(s)
 Your database may not be available to serve requests during the migration, continue?`,
@@ -154396,7 +154441,7 @@ Your database may not be available to serve requests during the migration, conti
           local,
           config,
           database,
-          void 0,
+          isInteractive() && !CI.isCI(),
           persistTo,
           void 0,
           query
@@ -154503,7 +154548,7 @@ var import_ink12 = __toESM(require_build2());
 var import_ink_table6 = __toESM(require_dist2());
 var import_react16 = __toESM(require_react());
 function ListOptions2(yargs) {
-  return Database(yargs);
+  return DatabaseWithLocal(yargs);
 }
 var ListHandler2 = withConfig(
   async ({ config, database, local, persistTo }) => {
@@ -154573,7 +154618,7 @@ var d1 = (yargs) => {
   ).command(
     "backup",
     "Interact with D1 Backups",
-    (yargs2) => yargs2.command(
+    (yargs2) => yargs2.demandCommand().command(
       "list <name>",
       "List your D1 backups",
       ListOptions,
@@ -154602,7 +154647,7 @@ var d1 = (yargs) => {
   ).command(
     "migrations",
     "Interact with D1 Migrations",
-    (yargs2) => yargs2.command(
+    (yargs2) => yargs2.demandCommand().command(
       "list <database>",
       "List your D1 migrations",
       ListOptions2,
@@ -158355,8 +158400,8 @@ var Handler7 = async ({
   directory,
   "compatibility-date": compatibilityDate,
   "compatibility-flags": compatibilityFlags,
-  ip,
-  port,
+  ip: ip2,
+  port: port2,
   "inspector-port": inspectorPort,
   proxy: requestedProxyPort,
   "script-path": singleWorkerScriptPath,
@@ -158601,8 +158646,8 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
   const { stop, waitUntilExit } = await unstable_dev(
     entrypoint,
     {
-      ip,
-      port,
+      ip: ip2,
+      port: port2,
       inspectorPort,
       watch: true,
       localProtocol,
@@ -158709,12 +158754,12 @@ function getPort(pid) {
   }
 }
 async function spawnProxyProcess({
-  port,
+  port: port2,
   command: command2
 }) {
   if (command2.length === 0) {
-    if (port !== void 0) {
-      return port;
+    if (port2 !== void 0) {
+      return port2;
     }
     CLEANUP();
     throw new FatalError(
@@ -158750,24 +158795,24 @@ async function spawnProxyProcess({
   });
   while (!proxy2.pid) {
   }
-  if (port === void 0) {
+  if (port2 === void 0) {
     logger.log(
       `Sleeping ${SECONDS_TO_WAIT_FOR_PROXY} seconds to allow proxy process to start before attempting to automatically determine port...`
     );
     logger.log("To skip, specify the proxy port with --proxy.");
     await sleep2(SECONDS_TO_WAIT_FOR_PROXY * 1e3);
-    port = getPids(proxy2.pid).map(getPort).filter((nr) => nr !== void 0)[0];
-    if (port === void 0) {
+    port2 = getPids(proxy2.pid).map(getPort).filter((nr) => nr !== void 0)[0];
+    if (port2 === void 0) {
       CLEANUP();
       throw new FatalError(
         "Could not automatically determine proxy port. Please specify the proxy port with --proxy.",
         1
       );
     } else {
-      logger.log(`Automatically determined the proxy port to be ${port}.`);
+      logger.log(`Automatically determined the proxy port to be ${port2}.`);
     }
   }
-  return port;
+  return port2;
 }
 var blockWorkerJsImports = {
   name: "block-worker-js-imports",
@@ -163586,9 +163631,9 @@ Switch out --local for ${import_chalk8.default.bold(
         accountId: configParam.account_id || getAccountFromCache()?.id,
         assetPaths,
         assetsConfig: configParam.assets,
-        port: args.port || configParam.dev.port || await getLocalPort(),
-        ip: args.ip || configParam.dev.ip,
-        inspectorPort: args.inspectorPort || configParam.dev.inspector_port || await getInspectorPort(),
+        initialPort: args.port ?? configParam.dev.port ?? await getLocalPort(),
+        initialIp: args.ip || configParam.dev.ip,
+        inspectorPort: args.inspectorPort ?? configParam.dev.inspector_port ?? await getInspectorPort(),
         isWorkersSite: Boolean(args.site || configParam.site),
         compatibilityDate: getDevCompatibilityDate(
           configParam,
@@ -163682,9 +163727,9 @@ async function startApiDev(args) {
       accountId: configParam.account_id || getAccountFromCache()?.id,
       assetPaths,
       assetsConfig: configParam.assets,
-      port: args.port === 0 ? args.port : args.port || configParam.dev.port || await getLocalPort(),
-      ip: args.ip || configParam.dev.ip,
-      inspectorPort: args["inspector-port"] || configParam.dev.inspector_port || await getInspectorPort(),
+      initialPort: args.port ?? configParam.dev.port ?? await getLocalPort(),
+      initialIp: args.ip || configParam.dev.ip,
+      inspectorPort: args["inspector-port"] ?? configParam.dev.inspector_port ?? await getInspectorPort(),
       isWorkersSite: Boolean(args.site || configParam.site),
       compatibilityDate: getDevCompatibilityDate(
         config,
@@ -163946,8 +163991,8 @@ unstable_dev()'s behaviour will likely change in future releases`
           port: options6?.port ?? 0,
           local: true,
           ...options6,
-          onReady: (address, port) => {
-            readyPort = port;
+          onReady: (address, port2) => {
+            readyPort = port2;
             readyAddress = address;
             ready(devServer);
           }
@@ -163985,8 +164030,8 @@ unstable_dev()'s behaviour will likely change in future releases`
           $0: "",
           local: true,
           ...options6,
-          onReady: (address, port) => {
-            readyPort = port;
+          onReady: (address, port2) => {
+            readyPort = port2;
             readyAddress = address;
             ready(devServer);
           }