Skip to content
Merged
Changes from all commits
Commits
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
44 changes: 27 additions & 17 deletions src/update-check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,24 +198,34 @@ export async function finishBackgroundUpdateCheck(
return;
}

const latest = await Promise.race([
checkPromise,
new Promise<null>((resolve) =>
setTimeout(() => resolve(null), updateCheckHTTPTimeoutMs),
),
]);
checkPromise = null;

if (!latest || !isNewerVersion(latest, Version)) {
return;
}
let timeout: ReturnType<typeof setTimeout> | undefined;
try {
const latest = await Promise.race([
checkPromise,
new Promise<null>((resolve) => {
timeout = setTimeout(() => resolve(null), updateCheckHTTPTimeoutMs);
timeout.unref?.();
}),
]);

if (!latest || !isNewerVersion(latest, Version)) {
return;
}

write(
`\nA new version of vanta is available: ${displayVersion(latest)} (you have ${displayVersion(Version)})\nUpdate with:\n curl -fsSL ${installScriptURL} | bash\n\n`,
);
write(
`\nA new version of vanta is available: ${displayVersion(latest)} (you have ${displayVersion(Version)})\nUpdate with:\n curl -fsSL ${installScriptURL} | bash\n\n`,
);
} finally {
if (timeout !== undefined) {
clearTimeout(timeout);
}
checkPromise = null;
}
}

/** Test helper to clear in-flight check state. */
export function resetUpdateCheckStateForTests(): void {
checkPromise = null;
/** Test helper to seed or clear in-flight check state. */
export function resetUpdateCheckStateForTests(
promise: Promise<string | null> | null = null,
): void {
checkPromise = promise;
}
Loading