Revert "[wrangler] fix: listen on loopback for wrangler dev port chec…

…k and login (#4830)" This reverts commit 48f9085.
cloudflare · Feb 3, 2024 · f97c258 · f97c258
1 parent bef4ac4
commit f97c258
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 36 deletions.
diff --git a/.changeset/smart-owls-jog.md b/.changeset/smart-owls-jog.md
diff --git a/packages/wrangler/src/__tests__/dev.test.tsx b/packages/wrangler/src/__tests__/dev.test.tsx
@@ -879,12 +879,12 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				dev: {
-					ip: "::1",
+					ip: "1.2.3.4",
 				},
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].initialIp).toEqual("::1");
+			expect((Dev as jest.Mock).mock.calls[0][0].initialIp).toEqual("1.2.3.4");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -894,14 +894,12 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				dev: {
-					ip: "::1",
+					ip: "1.2.3.4",
 				},
 			});
 			fs.writeFileSync("index.js", `export default {};`);
-			await runWrangler("dev --ip=127.0.0.1");
-			expect((Dev as jest.Mock).mock.calls[0][0].initialIp).toEqual(
-				"127.0.0.1"
-			);
+			await runWrangler("dev --ip=5.6.7.8");
+			expect((Dev as jest.Mock).mock.calls[0][0].initialIp).toEqual("5.6.7.8");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);

diff --git a/packages/wrangler/src/dev.tsx b/packages/wrangler/src/dev.tsx
@@ -626,16 +626,12 @@ export async function startApiDev(args: StartDevOptions) {
 	};
 }
 /**
- * Get an available TCP port number.
- *
  * Avoiding calling `getPort()` multiple times by memoizing the first result.
  */
-function memoizeGetPort(defaultPort: number, host: string) {
+function memoizeGetPort(defaultPort?: number) {
 	let portValue: number;
 	return async () => {
-		// Check a specific host to avoid probing all local addresses.
-		portValue = portValue ?? (await getPort({ port: defaultPort, host: host }));
-		return portValue;
+		return portValue || (portValue = await getPort({ port: defaultPort }));
 	};
 }
 /**
@@ -709,16 +705,14 @@ async function validateDevServerSettings(
 	);
 
 	const { zoneId, host, routes } = await getZoneIdHostAndRoutes(args, config);
-	const initialIp = args.ip || config.dev.ip;
-	const initialIpListenCheck = initialIp === "*" ? "0.0.0.0" : initialIp;
-	const getLocalPort = memoizeGetPort(DEFAULT_LOCAL_PORT, initialIpListenCheck);
-	const getInspectorPort = memoizeGetPort(DEFAULT_INSPECTOR_PORT, "localhost");
+	const getLocalPort = memoizeGetPort(DEFAULT_LOCAL_PORT);
+	const getInspectorPort = memoizeGetPort(DEFAULT_INSPECTOR_PORT);
 
 	// Our inspector proxy server will be binding to the result of
 	// `getInspectorPort`. If we attempted to bind workerd to the same inspector
 	// port, we'd get a port already in use error. Therefore, generate a new port
 	// for our runtime to bind its inspector service to.
-	const getRuntimeInspectorPort = memoizeGetPort(0, "localhost");
+	const getRuntimeInspectorPort = memoizeGetPort();
 
 	if (config.services && config.services.length > 0) {
 		logger.warn(

diff --git a/packages/wrangler/src/dev/proxy.ts b/packages/wrangler/src/dev/proxy.ts
@@ -154,7 +154,7 @@ export async function startPreviewServer({
 			accessTokenRef,
 		});
 
-		await waitForPortToBeAvailable(port, ip, {
+		await waitForPortToBeAvailable(port, {
 			retryPeriod: 200,
 			timeout: 2000,
 			abortSignal: abortController.signal,
@@ -295,7 +295,7 @@ export function usePreviewServer({
 			return;
 		}
 
-		waitForPortToBeAvailable(port, ip, {
+		waitForPortToBeAvailable(port, {
 			retryPeriod: 200,
 			timeout: 2000,
 			abortSignal: abortController.signal,
@@ -636,13 +636,9 @@ function createStreamHandler(
  */
 export async function waitForPortToBeAvailable(
 	port: number,
-	host: string,
 	options: { retryPeriod: number; timeout: number; abortSignal: AbortSignal }
 ): Promise<void> {
 	return new Promise((resolve, reject) => {
-		if (host === "*") {
-			host = "0.0.0.0";
-		}
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		options.abortSignal.addEventListener("abort", () => {
 			const abortError = new Error("waitForPortToBeAvailable() aborted");
@@ -690,7 +686,7 @@ export async function waitForPortToBeAvailable(
 					doReject(err);
 				}
 			});
-			server.listen(port, host, () =>
+			server.listen(port, () =>
 				terminator
 					.terminate()
 					.then(doResolve, () =>

diff --git a/packages/wrangler/src/user/user.ts b/packages/wrangler/src/user/user.ts
@@ -1014,7 +1014,7 @@ export async function login(
 			}
 		});
 
-		server.listen(8976, "localhost");
+		server.listen(8976);
 	});
 	if (props?.browser) {
 		logger.log(`Opening a link in your default browser: ${urlToOpen}`);