fix(gateway): fix wide-area discovery update
This commit is contained in:
@@ -1101,15 +1101,14 @@ export async function startGatewayServer(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const tailnetDns = await resolveTailnetDnsHint();
|
const tailnetDns = await resolveTailnetDnsHint();
|
||||||
|
const sshPortEnv = process.env.CLAWDBOT_SSH_PORT?.trim();
|
||||||
|
const sshPortParsed = sshPortEnv ? Number.parseInt(sshPortEnv, 10) : NaN;
|
||||||
|
const sshPort =
|
||||||
|
Number.isFinite(sshPortParsed) && sshPortParsed > 0
|
||||||
|
? sshPortParsed
|
||||||
|
: undefined;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const sshPortEnv = process.env.CLAWDBOT_SSH_PORT?.trim();
|
|
||||||
const sshPortParsed = sshPortEnv ? Number.parseInt(sshPortEnv, 10) : NaN;
|
|
||||||
const sshPort =
|
|
||||||
Number.isFinite(sshPortParsed) && sshPortParsed > 0
|
|
||||||
? sshPortParsed
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
const bonjour = await startGatewayBonjourAdvertiser({
|
const bonjour = await startGatewayBonjourAdvertiser({
|
||||||
instanceName: formatBonjourInstanceName(machineDisplayName),
|
instanceName: formatBonjourInstanceName(machineDisplayName),
|
||||||
gatewayPort: port,
|
gatewayPort: port,
|
||||||
|
|||||||
@@ -270,6 +270,7 @@ async function discoverWideAreaViaTailnetDns(
|
|||||||
|
|
||||||
if (!nameserver || ptrs.length === 0) return [];
|
if (!nameserver || ptrs.length === 0) return [];
|
||||||
if (remainingMs() <= 0) return [];
|
if (remainingMs() <= 0) return [];
|
||||||
|
const nameserverArg = `@${nameserver}`;
|
||||||
|
|
||||||
const results: GatewayBonjourBeacon[] = [];
|
const results: GatewayBonjourBeacon[] = [];
|
||||||
for (const ptr of ptrs) {
|
for (const ptr of ptrs) {
|
||||||
@@ -285,7 +286,7 @@ async function discoverWideAreaViaTailnetDns(
|
|||||||
"+short",
|
"+short",
|
||||||
"+time=1",
|
"+time=1",
|
||||||
"+tries=1",
|
"+tries=1",
|
||||||
`@${nameserver}`,
|
nameserverArg,
|
||||||
ptrName,
|
ptrName,
|
||||||
"SRV",
|
"SRV",
|
||||||
],
|
],
|
||||||
@@ -312,7 +313,7 @@ async function discoverWideAreaViaTailnetDns(
|
|||||||
"+short",
|
"+short",
|
||||||
"+time=1",
|
"+time=1",
|
||||||
"+tries=1",
|
"+tries=1",
|
||||||
`@${nameserver}`,
|
nameserverArg,
|
||||||
ptrName,
|
ptrName,
|
||||||
"TXT",
|
"TXT",
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user