mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-28 02:34:10 +00:00
This commit integrates the previously recovered ComfyUI Manager functionality with significant enhancements from PR #3367, including: ## Core Manager System Recovery - **v2 API Integration**: All manager endpoints now use `/v2/manager/queue/*` - **Task Queue System**: Complete client-side task queuing with WebSocket status - **Service Layer**: Comprehensive manager service with all CRUD operations - **Store Integration**: Full manager store with progress dialog support ## New Features & Enhancements - **Reactive Feature Flags**: Foundation for dynamic feature toggling - **Enhanced UI Components**: Improved loading states, progress tracking - **Package Management**: Install, update, enable/disable functionality - **Version Selection**: Support for latest/nightly package versions - **Progress Dialogs**: Real-time installation progress with logs - **Missing Node Detection**: Automated detection and installation prompts ## Technical Improvements - **TypeScript Definitions**: Complete type system for manager operations - **WebSocket Integration**: Real-time status updates via `cm-queue-status` - **Error Handling**: Comprehensive error handling with user feedback - **Testing**: Updated test suites for new functionality - **Documentation**: Complete backup documentation for recovery process ## API Endpoints Restored - `manager/queue/start` - Start task queue - `manager/queue/status` - Get queue status - `manager/queue/task` - Queue individual tasks - `manager/queue/install` - Install packages - `manager/queue/update` - Update packages - `manager/queue/disable` - Disable packages ## Breaking Changes - Manager API base URL changed to `/v2/` - Updated TypeScript interfaces for manager operations - New WebSocket message format for queue status This restores all critical manager functionality lost during the previous rebase while integrating the latest enhancements and maintaining compatibility with the current main branch. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
158 lines
4.6 KiB
TypeScript
158 lines
4.6 KiB
TypeScript
import { useEventListener } from '@vueuse/core'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { nextTick } from 'vue'
|
|
|
|
import { useServerLogs } from '@/composables/useServerLogs'
|
|
import { LogsWsMessage } from '@/schemas/apiSchema'
|
|
import { api } from '@/scripts/api'
|
|
|
|
vi.mock('@/scripts/api', () => ({
|
|
api: {
|
|
subscribeLogs: vi.fn(),
|
|
addEventListener: vi.fn(),
|
|
removeEventListener: vi.fn()
|
|
}
|
|
}))
|
|
|
|
vi.mock('@vueuse/core', () => ({
|
|
useEventListener: vi.fn().mockReturnValue(vi.fn())
|
|
}))
|
|
|
|
describe('useServerLogs', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
})
|
|
|
|
it('should initialize with empty logs array', () => {
|
|
const { logs } = useServerLogs({ ui_id: 'test-ui-id' })
|
|
expect(logs.value).toEqual([])
|
|
})
|
|
|
|
it('should not subscribe to logs by default', () => {
|
|
useServerLogs({ ui_id: 'test-ui-id' })
|
|
expect(api.subscribeLogs).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should subscribe to logs when immediate is true', () => {
|
|
useServerLogs({ ui_id: 'test-ui-id', immediate: true })
|
|
expect(api.subscribeLogs).toHaveBeenCalledWith(true)
|
|
})
|
|
|
|
it('should start listening when startListening is called', async () => {
|
|
const { startListening } = useServerLogs({ ui_id: 'test-ui-id' })
|
|
|
|
await startListening()
|
|
|
|
expect(api.subscribeLogs).toHaveBeenCalledWith(true)
|
|
})
|
|
|
|
it('should stop listening when stopListening is called', async () => {
|
|
const { startListening, stopListening } = useServerLogs({
|
|
ui_id: 'test-ui-id'
|
|
})
|
|
|
|
await startListening()
|
|
await stopListening()
|
|
|
|
// TODO: Update this test when subscribeLogs(false) is re-enabled
|
|
// Currently commented out in useServerLogs to prevent logs from stopping
|
|
// after 1st of multiple queue tasks
|
|
expect(api.subscribeLogs).toHaveBeenCalledWith(true)
|
|
})
|
|
|
|
it('should register event listener when starting', async () => {
|
|
const { startListening } = useServerLogs({ ui_id: 'test-ui-id' })
|
|
|
|
await startListening()
|
|
|
|
expect(vi.mocked(useEventListener)).toHaveBeenCalledWith(
|
|
api,
|
|
'logs',
|
|
expect.any(Function)
|
|
)
|
|
})
|
|
|
|
it('should handle log messages correctly', async () => {
|
|
const { logs, startListening } = useServerLogs({ ui_id: 'test-ui-id' })
|
|
|
|
await startListening()
|
|
|
|
// Get the callbacks that were registered with useEventListener
|
|
const mockCalls = vi.mocked(useEventListener).mock.calls
|
|
const logsCallback = mockCalls.find((call) => call[1] === 'logs')?.[2] as (
|
|
event: CustomEvent<LogsWsMessage>
|
|
) => void
|
|
const taskStartedCallback = mockCalls.find(
|
|
(call) => call[1] === 'cm-task-started'
|
|
)?.[2] as (event: CustomEvent<any>) => void
|
|
|
|
// First, simulate task started event
|
|
const taskStartedEvent = new CustomEvent('cm-task-started', {
|
|
detail: {
|
|
type: 'cm-task-started',
|
|
ui_id: 'test-ui-id'
|
|
}
|
|
})
|
|
taskStartedCallback(taskStartedEvent)
|
|
await nextTick()
|
|
|
|
// Now simulate receiving a log event
|
|
const mockEvent = new CustomEvent('logs', {
|
|
detail: {
|
|
type: 'logs',
|
|
entries: [{ m: 'Log message 1' }, { m: 'Log message 2' }]
|
|
} as unknown as LogsWsMessage
|
|
}) as CustomEvent<LogsWsMessage>
|
|
|
|
logsCallback(mockEvent)
|
|
await nextTick()
|
|
|
|
expect(logs.value).toEqual(['Log message 1', 'Log message 2'])
|
|
})
|
|
|
|
it('should use the message filter if provided', async () => {
|
|
const { logs, startListening } = useServerLogs({
|
|
ui_id: 'test-ui-id',
|
|
messageFilter: (msg) => msg !== 'remove me'
|
|
})
|
|
|
|
await startListening()
|
|
|
|
// Get the callbacks that were registered with useEventListener
|
|
const mockCalls = vi.mocked(useEventListener).mock.calls
|
|
const logsCallback = mockCalls.find((call) => call[1] === 'logs')?.[2] as (
|
|
event: CustomEvent<LogsWsMessage>
|
|
) => void
|
|
const taskStartedCallback = mockCalls.find(
|
|
(call) => call[1] === 'cm-task-started'
|
|
)?.[2] as (event: CustomEvent<any>) => void
|
|
|
|
// First, simulate task started event
|
|
const taskStartedEvent = new CustomEvent('cm-task-started', {
|
|
detail: {
|
|
type: 'cm-task-started',
|
|
ui_id: 'test-ui-id'
|
|
}
|
|
})
|
|
taskStartedCallback(taskStartedEvent)
|
|
await nextTick()
|
|
|
|
// Now simulate receiving a log event
|
|
const mockEvent = new CustomEvent('logs', {
|
|
detail: {
|
|
type: 'logs',
|
|
entries: [
|
|
{ m: 'Log message 1 dont remove me' },
|
|
{ m: 'remove me' },
|
|
{ m: '' }
|
|
]
|
|
} as unknown as LogsWsMessage
|
|
}) as CustomEvent<LogsWsMessage>
|
|
|
|
logsCallback(mockEvent)
|
|
await nextTick()
|
|
|
|
expect(logs.value).toEqual(['Log message 1 dont remove me', ''])
|
|
})
|
|
})
|