eliott/openwork
1
0
Fork 0
mirror of https://github.com/different-ai/openwork synced 2026-04-25 17:15:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix stale desktop server settings

Browse Source
This commit is contained in:
Benjamin Shafii
2026-04-24 15:54:25 -07:00
parent d13b6d624b
commit 2b9b382a4d
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app/src/react-app/shell/session-route.tsx
View File

@@ -118,14 +118,14 @@ async function resolveRouteOpenworkConnection() {
try {
const info = await openworkServerInfo();
hostInfo = info;
if (!normalizedBaseUrl) {
normalizedBaseUrl =
normalizeOpenworkServerUrl(info.connectUrl ?? info.baseUrl ?? info.lanUrl ?? info.mdnsUrl ?? "") ??
normalizedBaseUrl;
}
if (!resolvedToken) {
resolvedToken = info.ownerToken?.trim() || info.clientToken?.trim() || resolvedToken;
}
// Desktop-hosted servers use a fresh loopback port and freshly minted
// owner token per boot. Prefer the live runtime info over localStorage;
// the stored URL/token can point at the previous process and produce
// ERR_CONNECTION_REFUSED or 401 before the boot event refreshes settings.
normalizedBaseUrl =
normalizeOpenworkServerUrl(info.connectUrl ?? info.baseUrl ?? info.lanUrl ?? info.mdnsUrl ?? "") ??
normalizedBaseUrl;
resolvedToken = info.ownerToken?.trim() || info.clientToken?.trim() || resolvedToken;
} catch {
// ignore and fall back to stored settings only
}

5
apps/app/src/react-app/shell/settings-route.tsx
View File

@@ -178,9 +178,12 @@ async function resolveRouteOpenworkConnection() {
let normalizedBaseUrl = normalizeOpenworkServerUrl(settings.urlOverride ?? "") ?? "";
let resolvedToken = settings.token?.trim() ?? "";
if ((!normalizedBaseUrl || !resolvedToken) && isDesktopRuntime()) {
if (isDesktopRuntime()) {
try {
const info = await openworkServerInfo();
// Desktop-hosted servers use a fresh loopback port and freshly minted
// owner token per boot. Prefer the live runtime info over localStorage;
// stored settings may belong to a previous server process.
normalizedBaseUrl =
normalizeOpenworkServerUrl(info.connectUrl ?? info.baseUrl ?? info.lanUrl ?? info.mdnsUrl ?? "") ??
normalizedBaseUrl;