mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-05 15:40: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>
361 lines
11 KiB
TypeScript
361 lines
11 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { nextTick, ref } from 'vue'
|
|
|
|
import { useInstalledPacks } from '@/composables/nodePack/useInstalledPacks'
|
|
import { useUpdateAvailableNodes } from '@/composables/nodePack/useUpdateAvailableNodes'
|
|
import { useComfyManagerStore } from '@/stores/comfyManagerStore'
|
|
// Import mocked utils
|
|
import { compareVersions, isSemVer } from '@/utils/formatUtil'
|
|
|
|
// Mock Vue's onMounted to execute immediately for testing
|
|
vi.mock('vue', async () => {
|
|
const actual = await vi.importActual('vue')
|
|
return {
|
|
...actual,
|
|
onMounted: (cb: () => void) => cb()
|
|
}
|
|
})
|
|
|
|
// Mock the dependencies
|
|
vi.mock('@/composables/nodePack/useInstalledPacks', () => ({
|
|
useInstalledPacks: vi.fn()
|
|
}))
|
|
|
|
vi.mock('@/stores/comfyManagerStore', () => ({
|
|
useComfyManagerStore: vi.fn()
|
|
}))
|
|
|
|
vi.mock('@/utils/formatUtil', () => ({
|
|
compareVersions: vi.fn(),
|
|
isSemVer: vi.fn()
|
|
}))
|
|
|
|
const mockUseInstalledPacks = vi.mocked(useInstalledPacks)
|
|
const mockUseComfyManagerStore = vi.mocked(useComfyManagerStore)
|
|
|
|
const mockCompareVersions = vi.mocked(compareVersions)
|
|
const mockIsSemVer = vi.mocked(isSemVer)
|
|
|
|
describe('useUpdateAvailableNodes', () => {
|
|
const mockInstalledPacks = [
|
|
{
|
|
id: 'pack-1',
|
|
name: 'Outdated Pack',
|
|
latest_version: { version: '2.0.0' }
|
|
},
|
|
{
|
|
id: 'pack-2',
|
|
name: 'Up to Date Pack',
|
|
latest_version: { version: '1.0.0' }
|
|
},
|
|
{
|
|
id: 'pack-3',
|
|
name: 'Nightly Pack',
|
|
latest_version: { version: '1.5.0' }
|
|
},
|
|
{
|
|
id: 'pack-4',
|
|
name: 'No Latest Version',
|
|
latest_version: null
|
|
}
|
|
]
|
|
|
|
const mockStartFetchInstalled = vi.fn()
|
|
const mockIsPackInstalled = vi.fn()
|
|
const mockGetInstalledPackVersion = vi.fn()
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
|
|
// Default setup
|
|
mockIsPackInstalled.mockReturnValue(true)
|
|
mockGetInstalledPackVersion.mockImplementation((id: string) => {
|
|
switch (id) {
|
|
case 'pack-1':
|
|
return '1.0.0' // outdated
|
|
case 'pack-2':
|
|
return '1.0.0' // up to date
|
|
case 'pack-3':
|
|
return 'nightly-abc123' // nightly
|
|
case 'pack-4':
|
|
return '1.0.0' // no latest version
|
|
default:
|
|
return '1.0.0'
|
|
}
|
|
})
|
|
|
|
mockIsSemVer.mockImplementation(
|
|
(version: string): version is `${number}.${number}.${number}` => {
|
|
return !version.includes('nightly')
|
|
}
|
|
)
|
|
|
|
mockCompareVersions.mockImplementation(
|
|
(latest: string | undefined, installed: string | undefined) => {
|
|
if (latest === '2.0.0' && installed === '1.0.0') return 1 // outdated
|
|
if (latest === '1.0.0' && installed === '1.0.0') return 0 // up to date
|
|
return 0
|
|
}
|
|
)
|
|
|
|
mockUseComfyManagerStore.mockReturnValue({
|
|
isPackInstalled: mockIsPackInstalled,
|
|
getInstalledPackVersion: mockGetInstalledPackVersion
|
|
} as any)
|
|
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([]),
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
})
|
|
|
|
describe('core filtering logic', () => {
|
|
it('identifies outdated packs correctly', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref(mockInstalledPacks),
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
// Should only include pack-1 (outdated)
|
|
expect(updateAvailableNodePacks.value).toHaveLength(1)
|
|
expect(updateAvailableNodePacks.value[0].id).toBe('pack-1')
|
|
})
|
|
|
|
it('excludes up-to-date packs', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
expect(updateAvailableNodePacks.value).toHaveLength(0)
|
|
})
|
|
|
|
it('excludes nightly packs from updates', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
expect(updateAvailableNodePacks.value).toHaveLength(0)
|
|
})
|
|
|
|
it('excludes packs with no latest version', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([mockInstalledPacks[3]]), // pack-4: no latest version
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
expect(updateAvailableNodePacks.value).toHaveLength(0)
|
|
})
|
|
|
|
it('excludes uninstalled packs', () => {
|
|
mockIsPackInstalled.mockReturnValue(false)
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref(mockInstalledPacks),
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
expect(updateAvailableNodePacks.value).toHaveLength(0)
|
|
})
|
|
|
|
it('returns empty array when no installed packs exist', () => {
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
expect(updateAvailableNodePacks.value).toEqual([])
|
|
})
|
|
})
|
|
|
|
describe('hasUpdateAvailable computed', () => {
|
|
it('returns true when updates are available', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { hasUpdateAvailable } = useUpdateAvailableNodes()
|
|
|
|
expect(hasUpdateAvailable.value).toBe(true)
|
|
})
|
|
|
|
it('returns false when no updates are available', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { hasUpdateAvailable } = useUpdateAvailableNodes()
|
|
|
|
expect(hasUpdateAvailable.value).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe('automatic data fetching', () => {
|
|
it('fetches installed packs automatically when none exist', () => {
|
|
useUpdateAvailableNodes()
|
|
|
|
expect(mockStartFetchInstalled).toHaveBeenCalledOnce()
|
|
})
|
|
|
|
it('does not fetch when packs already exist', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref(mockInstalledPacks),
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
useUpdateAvailableNodes()
|
|
|
|
expect(mockStartFetchInstalled).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('does not fetch when already loading', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([]),
|
|
isLoading: ref(true),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
useUpdateAvailableNodes()
|
|
|
|
expect(mockStartFetchInstalled).not.toHaveBeenCalled()
|
|
})
|
|
})
|
|
|
|
describe('state management', () => {
|
|
it('exposes loading state from useInstalledPacks', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([]),
|
|
isLoading: ref(true),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { isLoading } = useUpdateAvailableNodes()
|
|
|
|
expect(isLoading.value).toBe(true)
|
|
})
|
|
|
|
it('exposes error state from useInstalledPacks', () => {
|
|
const testError = 'Failed to fetch installed packs'
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([]),
|
|
isLoading: ref(false),
|
|
error: ref(testError),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { error } = useUpdateAvailableNodes()
|
|
|
|
expect(error.value).toBe(testError)
|
|
})
|
|
})
|
|
|
|
describe('reactivity', () => {
|
|
it('updates when installed packs change', async () => {
|
|
const installedPacksRef = ref([])
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: installedPacksRef,
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks, hasUpdateAvailable } =
|
|
useUpdateAvailableNodes()
|
|
|
|
// Initially empty
|
|
expect(updateAvailableNodePacks.value).toEqual([])
|
|
expect(hasUpdateAvailable.value).toBe(false)
|
|
|
|
// Update installed packs
|
|
installedPacksRef.value = [mockInstalledPacks[0]] as any // pack-1: outdated
|
|
await nextTick()
|
|
|
|
// Should update available updates
|
|
expect(updateAvailableNodePacks.value).toHaveLength(1)
|
|
expect(hasUpdateAvailable.value).toBe(true)
|
|
})
|
|
})
|
|
|
|
describe('version comparison logic', () => {
|
|
it('calls compareVersions with correct parameters', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([mockInstalledPacks[0]]), // pack-1
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
// Access the computed to trigger the logic
|
|
expect(updateAvailableNodePacks.value).toBeDefined()
|
|
|
|
expect(mockCompareVersions).toHaveBeenCalledWith('2.0.0', '1.0.0')
|
|
})
|
|
|
|
it('calls isSemVer to check nightly versions', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
// Access the computed to trigger the logic
|
|
expect(updateAvailableNodePacks.value).toBeDefined()
|
|
|
|
expect(mockIsSemVer).toHaveBeenCalledWith('nightly-abc123')
|
|
})
|
|
|
|
it('calls isPackInstalled for each pack', () => {
|
|
mockUseInstalledPacks.mockReturnValue({
|
|
installedPacks: ref(mockInstalledPacks),
|
|
isLoading: ref(false),
|
|
error: ref(null),
|
|
startFetchInstalled: mockStartFetchInstalled
|
|
} as any)
|
|
|
|
const { updateAvailableNodePacks } = useUpdateAvailableNodes()
|
|
|
|
// Access the computed to trigger the logic
|
|
expect(updateAvailableNodePacks.value).toBeDefined()
|
|
|
|
expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-1')
|
|
expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-2')
|
|
expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-3')
|
|
expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-4')
|
|
})
|
|
})
|
|
})
|