Change dev registry and inspector server to use 127.0.0.1 instead of …

…all interfaces
cloudflare · Nov 14, 2023 · ea22145 · ea22145
1 parent be36619
commit ea22145
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/.changeset/warm-dryers-double.md b/.changeset/warm-dryers-double.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Change dev registry and inspector server to listen on 127.0.0.1 instead of all interfaces
diff --git a/packages/wrangler/src/__tests__/unstableDev.test.ts b/packages/wrangler/src/__tests__/unstableDev.test.ts
@@ -23,7 +23,7 @@ describe("unstable devRegistry testing", () => {
 			mode: "local",
 			durableObjects: [{ name: "testing", className: "testing" }],
 		});
-		const resp = await fetch("http://localhost:6284/workers");
+		const resp = await fetch("http://127.0.0.1:6284/workers");
 		if (resp) {
 			const parsedResp = (await resp.json()) as {
 				test: unknown;
@@ -35,7 +35,7 @@ describe("unstable devRegistry testing", () => {
 	it("should not restart the devRegistry if the devRegistry already start", async () => {
 		await startWorkerRegistry();
 
-		await fetch("http://localhost:6284/workers/init", {
+		await fetch("http://127.0.0.1:6284/workers/init", {
 			method: "POST",
 			body: JSON.stringify({}),
 		});
@@ -48,7 +48,7 @@ describe("unstable devRegistry testing", () => {
 			durableObjects: [{ name: "testing", className: "testing" }],
 		});
 
-		const resp = await fetch("http://localhost:6284/workers");
+		const resp = await fetch("http://127.0.0.1:6284/workers");
 		if (resp) {
 			const parsedResp = (await resp.json()) as {
 				test: unknown;

diff --git a/packages/wrangler/src/dev-registry.ts b/packages/wrangler/src/dev-registry.ts
@@ -1,17 +1,17 @@
-import http from "http";
 import net from "net";
+import { createServer } from "node:http";
 import bodyParser from "body-parser";
 import express from "express";
 import { createHttpTerminator } from "http-terminator";
 import { fetch } from "undici";
 import { logger } from "./logger";
 
 import type { Config } from "./config";
-import type { Server } from "http";
 import type { HttpTerminator } from "http-terminator";
+import type { Server } from "node:http";
 
-const DEV_REGISTRY_PORT = "6284";
-const DEV_REGISTRY_HOST = `http://localhost:${DEV_REGISTRY_PORT}`;
+const DEV_REGISTRY_PORT = 6284;
+const DEV_REGISTRY_HOST = `http://127.0.0.1:${DEV_REGISTRY_PORT}`;
 
 let server: Server | null;
 let terminator: HttpTerminator;
@@ -48,7 +48,7 @@ async function isPortAvailable() {
 				netServer.close();
 				resolve(true);
 			});
-		netServer.listen(DEV_REGISTRY_PORT);
+		netServer.listen(DEV_REGISTRY_PORT, "127.0.0.1");
 	});
 }
 
@@ -80,9 +80,9 @@ export async function startWorkerRegistry() {
 				workers = {};
 				res.json(null);
 			});
-		server = http.createServer(app);
+		server = createServer(app);
 		terminator = createHttpTerminator({ server });
-		server.listen(DEV_REGISTRY_PORT);
+		server.listen(DEV_REGISTRY_PORT, "127.0.0.1");
 
 		/**
 		 * The registry server may have already been started by another wrangler process.

diff --git a/packages/wrangler/src/dev/inspect.ts b/packages/wrangler/src/dev/inspect.ts
@@ -2,6 +2,7 @@ import { readFileSync } from "fs";
 import assert from "node:assert";
 import crypto from "node:crypto";
 import { createServer } from "node:http";
+import { createHttpTerminator } from "http-terminator";
 import os from "node:os";
 import path from "node:path";
 import { URL, fileURLToPath, pathToFileURL } from "node:url";
@@ -125,7 +126,7 @@ export default function useInspector(props: InspectorProps) {
 					case "/json/list":
 						{
 							res.setHeader("Content-Type", "application/json");
-							const localHost = `localhost:${props.port}/ws`;
+							const localHost = `127.0.0.1:${props.port}/ws`;
 							const devtoolsFrontendUrl = `devtools://devtools/bundled/js_app.html?experiments=true&v8only=true&ws=${localHost}`;
 							const devtoolsFrontendUrlCompat = `devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${localHost}`;
 							res.end(
@@ -252,19 +253,25 @@ export default function useInspector(props: InspectorProps) {
 				timeout: 2000,
 				abortSignal: abortController.signal,
 			});
-			server.listen(props.port);
+			server.listen(props.port, "127.0.0.1");
 		}
 		startInspectorProxy().catch((err) => {
 			if ((err as { code: string }).code !== "ABORT_ERR") {
 				logger.error("Failed to start inspector:", err);
 			}
 		});
 		return () => {
-			server.close();
+			//server.close();
 			// Also disconnect any open websockets/devtools connections
 			wsServer.clients.forEach((ws) => ws.close());
 			wsServer.close();
 			abortController.abort();
+			createHttpTerminator({
+				server,
+				gracefulTerminationTimeout: 0,
+			})
+				.terminate()
+				.catch(() => logger.error("Failed to terminate the inspector server."));
 		};
 	}, [props.port, server, wsServer]);
 
@@ -862,7 +869,7 @@ export const openInspector = async (
 ) => {
 	const query = new URLSearchParams();
 	query.set("theme", "systemPreferred");
-	query.set("ws", `localhost:${inspectorPort}/ws`);
+	query.set("ws", `127.0.0.1:${inspectorPort}/ws`);
 	if (worker) query.set("domain", worker);
 	query.set("debugger", "true");
 	const url = `https://devtools.devprod.cloudflare.dev/js_app?${query.toString()}`;