Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(app): prevent onboard port conflict by fixing wrangler-config regex

Guse6297877459b
diff --git a/src/app/src/lib/wrangler-config.ts b/src/app/src/lib/wrangler-config.ts
index a05e322ec..7e50a9da3 100644
--- a/src/app/src/lib/wrangler-config.ts
+++ b/src/app/src/lib/wrangler-config.ts
@@ -5,7 +5,12 @@ import { SELF_HOSTED_DIR } from "./constants.js";
function setDevPort(tomlPath: string, port: number): void {
let content = readFileSync(tomlPath, "utf-8");
if (content.includes("[dev]")) {
- content = content.replace(/(\[dev\][^\[]*?)port\s*=\s*\d+/, `$1port = ${port}`);
+ const patched = content.replace(/(\[dev\][^\[]*?)(?<!inspector_)port\s*=\s*\d+/, `$1port = ${port}`);
+ if (patched === content) {
+ content = content.replace(/(\[dev\][^\[]*)/, `$1port = ${port}\n`);
+ } else {
+ content = patched;
+ }
} else {
content += `\n[dev]\nport = ${port}\n`;
}
@@ -42,7 +47,12 @@ export function patchWranglerConfigs(ports: { web: number; emailWorker: number;
if (!webContent.includes("[dev]")) {
webContent += `\n[dev]\nport = ${ports.web}\n`;
} else {
- webContent = webContent.replace(/(\[dev\][^\[]*?)port\s*=\s*\d+/, `$1port = ${ports.web}`);
+ const patched = webContent.replace(/(\[dev\][^\[]*?)(?<!inspector_)port\s*=\s*\d+/, `$1port = ${ports.web}`);
+ if (patched === webContent) {
+ webContent = webContent.replace(/(\[dev\][^\[]*)/, `$1port = ${ports.web}\n`);
+ } else {
+ webContent = patched;
+ }
}
webContent = setVar(webContent, "DEV_WS_DO_URL", `http://localhost:${ports.wsDo}`);
diff --git a/src/app/test/wrangler-config.test.ts b/src/app/test/wrangler-config.test.ts
index 649e75676..28a0c02f9 100644
--- a/src/app/test/wrangler-config.test.ts
+++ b/src/app/test/wrangler-config.test.ts
@@ -14,7 +14,11 @@ function setVar(content: string, key: string, value: string): string {
function setDevPort(content: string, port: number): string {
if (content.includes("[dev]")) {
- return content.replace(/(\[dev\][^\[]*?)port\s*=\s*\d+/, `$1port = ${port}`);
+ const patched = content.replace(/(\[dev\][^\[]*?)(?<!inspector_)port\s*=\s*\d+/, `$1port = ${port}`);
+ if (patched === content) {
+ return content.replace(/(\[dev\][^\[]*)/, `$1port = ${port}\n`);
+ }
+ return patched;
}
return content + `\n[dev]\nport = ${port}\n`;
}
@@ -61,5 +65,34 @@ describe("wrangler-config", () => {
expect(result).toContain("[dev]");
expect(result).toContain("port = 3000");
});
+
+ it("does not match inspector_port when it precedes port", () => {
+ const content = `[dev]\ninspector_port = 19229\nport = 15210`;
+ const result = setDevPort(content, 16000);
+ expect(result).toContain("inspector_port = 19229");
+ expect(result).toContain("port = 16000");
+ expect(result).not.toContain("port = 15210");
+ });
+
+ it("correctly matches standalone port when inspector_port precedes it", () => {
+ const content = `[dev]\ninspector_port = 19229\nport = 15210\n`;
+ const result = setDevPort(content, 8080);
+ expect(result).toContain("inspector_port = 19229");
+ expect(result).toContain("port = 8080");
+ });
+
+ it("correctly matches port when port comes first (no regression)", () => {
+ const content = `[dev]\nport = 15210\ninspector_port = 19229\n`;
+ const result = setDevPort(content, 9000);
+ expect(result).toContain("port = 9000");
+ expect(result).toContain("inspector_port = 19229");
+ });
+
+ it("appends port when [dev] exists with only inspector_port", () => {
+ const content = `[dev]\ninspector_port = 19229\n`;
+ const result = setDevPort(content, 15210);
+ expect(result).toContain("inspector_port = 19229");
+ expect(result).toContain("port = 15210");
+ });
});
});