Skip to content

hotfix: probe target gateway URL during TUI startup launch #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yohjisakamoto wants to merge 1 commit into
base: main
Choose a base branch
from
Open

hotfix: probe target gateway URL during TUI startup launch #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions apps/tui/src/gateway/autostart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,21 +304,30 @@ async function launchGatewayProcess(request: GatewayLaunchRequest): Promise<stri
),
);
}
const activeUrl = readActiveGatewayUrl(request.instanceHome);
const candidateUrl = activeUrl ? stripTrailingSlash(activeUrl) : targetUrl;
const identity = await gatewayIdentityWithProbeTimeout(candidateUrl);
if (
identity &&
gatewayMatchesInstance(identity, request.instanceHome, request.projectRoot, false)
) {
return candidateUrl;
const candidateUrls = launchCandidateGatewayUrls(request.instanceHome, targetUrl);
for (const candidateUrl of candidateUrls) {
const identity = await gatewayIdentityWithProbeTimeout(candidateUrl);
if (
identity &&
gatewayMatchesInstance(identity, request.instanceHome, request.projectRoot, false)
) {
return candidateUrl;
}
}
await delay(HEALTH_POLL_INTERVAL_MS);
}
stopUnreadyChild(child);
throw new Error(gatewayLaunchError(t("gatewayStartTimeout"), stderrPath, stderrOffset));
}

function launchCandidateGatewayUrls(instanceHome: string, targetUrl: string): string[] {
const activeUrl = readActiveGatewayUrl(instanceHome);
const candidates = new Set<string>();
if (activeUrl) candidates.add(stripTrailingSlash(activeUrl));
candidates.add(targetUrl);
return Array.from(candidates);
}

function gatewayProcessEnv(request: GatewayLaunchRequest): NodeJS.ProcessEnv {
const port = portFromGatewayUrl(request.targetUrl);
return {
Expand Down
Loading