diff --git a/src/renderer/src/stores/sessionStore.test.ts b/src/renderer/src/stores/sessionStore.test.ts index d79248162..019d7591b 100644 --- a/src/renderer/src/stores/sessionStore.test.ts +++ b/src/renderer/src/stores/sessionStore.test.ts @@ -426,4 +426,77 @@ describe('useSessionStore', () => { expect(store.errorInstances.size).toBe(0) }) }) + + describe('init with events arriving during hydration', () => { + let handlers: Record void> + let releaseLaunching: (value: unknown[]) => void + let runningRead: Promise + + beforeEach(() => { + handlers = {} + const on = + (name: string) => + (cb: (data: unknown) => void): (() => void) => { + handlers[name] = cb + return () => {} + } + let markRunningRead: () => void = () => {} + runningRead = new Promise((resolve) => { + markRunningRead = resolve + }) + ;(window as Record).api = { + getRunningInstances: vi.fn(() => { + markRunningRead() + return Promise.resolve([ + { installationId: 'inst-1', installationName: 'Install 1', port: 8188, mode: 'window' } + ]) + }), + getLaunchingInstances: vi.fn( + () => + new Promise((resolve) => { + releaseLaunching = resolve + }) + ), + getStoppingInstances: vi.fn().mockResolvedValue([]), + getActiveOperations: vi.fn().mockResolvedValue([]), + getCrashInstances: vi.fn().mockResolvedValue([]), + onInstanceLaunching: vi.fn(on('instance-launching')), + onInstanceLaunchFailed: vi.fn(on('instance-launch-failed')), + onInstanceStarted: vi.fn(on('instance-started')), + onInstanceStopped: vi.fn(on('instance-stopped')), + onInstanceStopping: vi.fn(on('instance-stopping')), + onOperationChanged: vi.fn(on('operation-changed')), + onComfyOutput: vi.fn(() => () => {}), + onComfyExited: vi.fn(() => () => {}), + onInstanceCrashed: vi.fn(on('instance-crashed')) + } + }) + + it('keeps an install that starts while a new window is still reading the running list', async () => { + const init = store.init() + await runningRead + handlers['instance-started']?.({ + installationId: 'inst-2', + installationName: 'Install 2', + port: 0, + mode: 'window' + }) + releaseLaunching([]) + await init + + expect(store.isRunning('inst-2')).toBe(true) + expect(store.isRunning('inst-1')).toBe(true) + }) + + it('drops an install that stops while a new window is still reading the running list', async () => { + const init = store.init() + await runningRead + await vi.waitFor(() => expect(window.api.getLaunchingInstances).toHaveBeenCalled()) + handlers['instance-stopped']?.({ installationId: 'inst-1' }) + releaseLaunching([]) + await init + + expect(store.isRunning('inst-1')).toBe(false) + }) + }) }) diff --git a/src/renderer/src/stores/sessionStore.ts b/src/renderer/src/stores/sessionStore.ts index 355d1f82e..5aae1a1ea 100644 --- a/src/renderer/src/stores/sessionStore.ts +++ b/src/renderer/src/stores/sessionStore.ts @@ -126,42 +126,6 @@ export const useSessionStore = defineStore('session', () => { async function init(): Promise { dispose() - const instances = await window.api.getRunningInstances() - for (const inst of instances) { - runningInstances.set(inst.installationId, inst) - } - - const launching = (await window.api.getLaunchingInstances?.()) ?? [] - for (const inst of launching) { - if (!runningInstances.has(inst.installationId)) { - launchingInstances.set(inst.installationId, { installationName: inst.installationName }) - } - } - - const stopping = (await window.api.getStoppingInstances?.()) ?? [] - for (const id of stopping) markStopping(id) - - const activeOps = (await window.api.getActiveOperations?.()) ?? [] - for (const op of activeOps) { - operationInstances.set(op.installationId, { actionId: op.actionId }) - } - - const crashes = (await window.api.getCrashInstances?.()) ?? [] - for (const c of crashes) { - if (!runningInstances.has(c.installationId) && !launchingInstances.has(c.installationId)) { - errorInstances.set(c.installationId, { - installationName: c.installationName, - exitCode: c.exitCode, - signal: c.signal, - lastStderr: c.lastStderr, - exitCodeHex: c.exitCodeHex, - crashKind: c.crashKind, - vcRuntimeMissing: c.vcRuntimeMissing, - crashedAtMs: c.crashedAtMs - }) - } - } - cleanups.push( window.api.onInstanceLaunching( (data: { installationId: string; installationName: string }) => { @@ -222,6 +186,42 @@ export const useSessionStore = defineStore('session', () => { }) ) + const instances = await window.api.getRunningInstances() + for (const inst of instances) { + runningInstances.set(inst.installationId, inst) + } + + const launching = (await window.api.getLaunchingInstances?.()) ?? [] + for (const inst of launching) { + if (!runningInstances.has(inst.installationId)) { + launchingInstances.set(inst.installationId, { installationName: inst.installationName }) + } + } + + const stopping = (await window.api.getStoppingInstances?.()) ?? [] + for (const id of stopping) markStopping(id) + + const activeOps = (await window.api.getActiveOperations?.()) ?? [] + for (const op of activeOps) { + operationInstances.set(op.installationId, { actionId: op.actionId }) + } + + const crashes = (await window.api.getCrashInstances?.()) ?? [] + for (const c of crashes) { + if (!runningInstances.has(c.installationId) && !launchingInstances.has(c.installationId)) { + errorInstances.set(c.installationId, { + installationName: c.installationName, + exitCode: c.exitCode, + signal: c.signal, + lastStderr: c.lastStderr, + exitCodeHex: c.exitCodeHex, + crashKind: c.crashKind, + vcRuntimeMissing: c.vcRuntimeMissing, + crashedAtMs: c.crashedAtMs + }) + } + } + ready.value = true }