Skip to content

Commit 4b474b0

Browse files
t3dotggclaude
andcommitted
fix(server): pairing URLs prefer a LAN address over a tailnet one
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 88bd8c7 commit 4b474b0

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

‎apps/server/src/startupAccess.test.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ it("skips public and container addresses for a private-network listener", () =>
4646
).toBe("http://localhost:3773");
4747
});
4848

49+
it("prefers a LAN address over a tailnet one for a private-network pairing URL", () => {
50+
expect(
51+
resolveHeadlessConnectionString("0.0.0.0", 3773, {
52+
interfaces: { tailscale0: [ipv4("100.101.102.103")], en0: [ipv4("192.168.1.42")] },
53+
privateNetworkOnly: true,
54+
}),
55+
).toBe("http://192.168.1.42:3773");
56+
});
57+
4958
describe("acceptsPrivateNetworkConnection", () => {
5059
const accepts = (localAddress: string | undefined, remoteAddress: string | undefined) =>
5160
acceptsPrivateNetworkConnection({ localAddress, remoteAddress });

‎apps/server/src/startupAccess.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as NodeNet from "node:net";
22
import * as NodeOS from "node:os";
33

4-
import { isPrivateNetworkHost } from "@t3tools/shared/hostClassification";
4+
import { isPrivateNetworkHost, isSharedAddressSpaceHost } from "@t3tools/shared/hostClassification";
55
import { QrCode } from "@t3tools/shared/qrCode";
66
import * as Effect from "effect/Effect";
77
import { HttpServer } from "effect/http";
@@ -98,12 +98,17 @@ const resolveHeadlessConnectionHost = (
9898
const interfaceEntries = Object.entries(interfaces).flatMap(([name, entries]) =>
9999
privateNetworkOnly && VIRTUAL_INTERFACE.test(name) ? [] : (entries ?? []),
100100
);
101-
const externalIpv4 = interfaceEntries.find(
101+
const externalIpv4Entries = interfaceEntries.filter(
102102
(entry) =>
103103
!entry.internal &&
104104
isIpv4Family(entry.family) &&
105105
(!privateNetworkOnly || isPrivateNetworkAddress(entry.address)),
106106
);
107+
// A tailnet or other CGNAT address reaches fewer devices than the LAN one.
108+
const externalIpv4 = privateNetworkOnly
109+
? (externalIpv4Entries.find((entry) => !isSharedAddressSpaceHost(entry.address)) ??
110+
externalIpv4Entries[0])
111+
: externalIpv4Entries[0];
107112
if (externalIpv4) {
108113
return externalIpv4.address;
109114
}

0 commit comments

Comments
 (0)