This commit is contained in:
LukeParkerDev
2026-04-28 09:20:16 +10:00
parent ca8e6e4d67
commit 70443cd2de
6 changed files with 0 additions and 49 deletions

View File

@@ -44,15 +44,9 @@ export type WslOpencodeCheck = {
matchesDesktop: boolean | null
error: string | null
}
export type WslServerAcknowledgements = {
root: boolean
mismatch: { path: string; version: string } | null
}
export type WslServerConfig = {
id: string
distro: string
acknowledgements: WslServerAcknowledgements
}
export type WslServerRuntime =
@@ -103,7 +97,6 @@ export type WslServersPlatform = {
startServer(id: string): Promise<void>
stopServer(id: string): Promise<void>
cancelJob(): Promise<void>
updateAcknowledgements(id: string, acks: Partial<WslServerAcknowledgements>): Promise<void>
}
export type Platform = {

View File

@@ -373,7 +373,6 @@ registerIpcHandlers({
wslServersStartServer: (id) => wslServers.startServer(id),
wslServersStopServer: (id) => wslServers.stopServer(id),
wslServersCancelJob: () => wslServers.cancelJob(),
wslServersUpdateAcknowledgements: (id, acks) => wslServers.updateAcknowledgements(id, acks),
getWindowConfig: () => ({ updaterEnabled: UPDATER_ENABLED }),
consumeInitialDeepLinks: () => pendingDeepLinks.splice(0),
getDefaultServerUrl: () => getDefaultServerUrl(),

View File

@@ -8,7 +8,6 @@ import type {
SqliteMigrationProgress,
TitlebarTheme,
WindowConfig,
WslServerAcknowledgements,
WslServerConfig,
WslServersEvent,
WslServersState,
@@ -40,7 +39,6 @@ type Deps = {
wslServersStartServer: (id: string) => Promise<void> | void
wslServersStopServer: (id: string) => Promise<void> | void
wslServersCancelJob: () => Promise<void> | void
wslServersUpdateAcknowledgements: (id: string, acks: Partial<WslServerAcknowledgements>) => Promise<void> | void
getWindowConfig: () => Promise<WindowConfig> | WindowConfig
consumeInitialDeepLinks: () => Promise<string[]> | string[]
getDefaultServerUrl: () => Promise<string | null> | string | null
@@ -171,11 +169,6 @@ export function registerIpcHandlers(deps: Deps) {
deps.wslServersStopServer(requireString("server id", id)),
)
handle("wsl-servers-cancel", () => deps.wslServersCancelJob())
handle(
"wsl-servers-update-acknowledgements",
(_event: IpcMainInvokeEvent, id: string, acks: Partial<WslServerAcknowledgements>) =>
deps.wslServersUpdateAcknowledgements(requireString("server id", id), acks),
)
handle("get-window-config", () => deps.getWindowConfig())
handle("consume-initial-deep-links", () => deps.consumeInitialDeepLinks())
handle("get-default-server-url", () => deps.getDefaultServerUrl())

View File

@@ -5,7 +5,6 @@ import type {
WslOnlineDistro,
WslOpencodeCheck,
WslRuntimeCheck,
WslServerAcknowledgements,
WslServerConfig,
WslServerItem,
WslServerRuntime,
@@ -331,7 +330,6 @@ export function createWslServersController(appVersion: string, spawnSidecar: Spa
const config: WslServerConfig = {
id,
distro,
acknowledgements: { root: false, mismatch: null },
}
persistServers([...readPersistedServers(), config])
setState({
@@ -357,15 +355,6 @@ export function createWslServersController(appVersion: string, spawnSidecar: Spa
setRuntime(id, { kind: "stopped" })
},
async updateAcknowledgements(id: string, acks: Partial<WslServerAcknowledgements>) {
const persisted = readPersistedServers()
const next = persisted.map((config) =>
config.id === id ? { ...config, acknowledgements: { ...config.acknowledgements, ...acks } } : config,
)
persistServers(next)
refreshFromStore()
},
stopAll() {
for (const item of state.servers) invalidateStartAttempt(item.config.id)
for (const existing of sidecars.values()) {
@@ -417,7 +406,6 @@ function migrateLegacyLocalServer(): WslServerConfig[] {
{
id: wslServerIdForDistro(distro),
distro,
acknowledgements: { root: false, mismatch: null },
},
]
}
@@ -432,24 +420,10 @@ function normalizePersistedServer(value: unknown): WslServerConfig[] {
{
id,
distro,
acknowledgements: normalizeAcks(record.acknowledgements),
},
]
}
function normalizeAcks(value: unknown): WslServerAcknowledgements {
const record = value && typeof value === "object" ? (value as Record<string, unknown>) : {}
const mismatch =
record.mismatch && typeof record.mismatch === "object" ? (record.mismatch as Record<string, unknown>) : null
return {
root: record.root === true,
mismatch:
mismatch && typeof mismatch.path === "string" && typeof mismatch.version === "string"
? { path: mismatch.path, version: mismatch.version }
: null,
}
}
function opencodeCheck(
distro: string,
resolvedPath: string | null,

View File

@@ -35,7 +35,6 @@ const api: ElectronAPI = {
startServer: (id) => ipcRenderer.invoke("wsl-servers-start", id),
stopServer: (id) => ipcRenderer.invoke("wsl-servers-stop", id),
cancelJob: () => ipcRenderer.invoke("wsl-servers-cancel"),
updateAcknowledgements: (id, acks) => ipcRenderer.invoke("wsl-servers-update-acknowledgements", id, acks),
},
getWindowConfig: () => ipcRenderer.invoke("get-window-config"),
consumeInitialDeepLinks: () => ipcRenderer.invoke("consume-initial-deep-links"),

View File

@@ -47,15 +47,9 @@ export type WslOpencodeCheck = {
matchesDesktop: boolean | null
error: string | null
}
export type WslServerAcknowledgements = {
root: boolean
mismatch: { path: string; version: string } | null
}
export type WslServerConfig = {
id: string
distro: string
acknowledgements: WslServerAcknowledgements
}
export type WslServerRuntime =
@@ -106,7 +100,6 @@ export type WslServersAPI = {
startServer: (id: string) => Promise<void>
stopServer: (id: string) => Promise<void>
cancelJob: () => Promise<void>
updateAcknowledgements: (id: string, acks: Partial<WslServerAcknowledgements>) => Promise<void>
}
export type LinuxDisplayBackend = "wayland" | "auto"