refactor: make game host return the setup promise

This commit is contained in:
hypercross 2026-04-04 23:50:46 +08:00
parent dd73deabb0
commit cc7f302677
2 changed files with 16 additions and 12 deletions

View File

@ -1,5 +1,11 @@
import { ReadonlySignal, Signal } from '@preact/signals-core';
import type {CommandSchema, CommandRegistry, PromptEvent, CommandRunnerContextExport} from '@/utils/command';
import type {
CommandSchema,
CommandRegistry,
PromptEvent,
CommandRunnerContextExport,
CommandResult
} from '@/utils/command';
import type { MutableSignal } from '@/utils/mutable-signal';
import {createGameContext, IGameContext} from './game';
@ -93,7 +99,7 @@ export class GameHost<TState extends Record<string, unknown>> {
this._state.clearInterruptions();
}
async setup(setupCommand: string): Promise<void> {
setup(setupCommand: string): Promise<CommandResult<unknown>> {
if (this._isDisposed) {
throw new Error('GameHost is disposed');
}
@ -103,14 +109,12 @@ export class GameHost<TState extends Record<string, unknown>> {
const initialState = this._createInitialState();
this._state.value = initialState as any;
// Start the setup command but don't wait for it to complete
// The command will run in the background and prompt for input
this._commands.run(setupCommand).catch(() => {
// Command may be cancelled or fail, which is expected
});
const promise = this._commands.run(setupCommand);
this._status.value = 'running';
this._emitEvent('setup');
return promise;
}
dispose(): void {

View File

@ -150,7 +150,7 @@ describe('GameHost', () => {
const newPromptPromise = waitForPromptEvent(host);
// Reset - should reset state and start new game
await host.setup('setup');
host.setup('setup');
// State should be back to initial
expect(host.context._state.value.currentPlayer).toBe('X');
@ -173,7 +173,7 @@ describe('GameHost', () => {
await promptPromise;
// Setup should cancel the active prompt and reset state
await host.setup('setup');
host.setup('setup');
// The original runPromise should be rejected due to cancellation
try {
@ -188,11 +188,11 @@ describe('GameHost', () => {
expect(host.context._state.value.turn).toBe(0);
});
it('should throw error when disposed', async () => {
it('should throw error when disposed', () => {
const { host } = createTestHost();
host.dispose();
await expect(host.setup('setup')).rejects.toThrow('GameHost is disposed');
expect(() => host.setup('setup')).toThrow('GameHost is disposed');
});
});
@ -245,7 +245,7 @@ describe('GameHost', () => {
const promptPromise = waitForPromptEvent(host);
// Initial setup via reset
await host.setup('setup');
host.setup('setup');
expect(setupCount).toBe(1);
// State should be running