[Manager] "Restarting" state after clicking restart button (#4637)

This commit is contained in:
Jin Yi
2025-08-02 04:04:58 +09:00
committed by bymyself
parent 2a8c474425
commit 2cf4dab010
8 changed files with 859 additions and 71 deletions

View File

@@ -29,6 +29,7 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
const enabledPacksIds = ref<Set<string>>(new Set())
const disabledPacksIds = ref<Set<string>>(new Set())
const installedPacksIds = ref<Set<string>>(new Set())
const installingPacksIds = ref<Set<string>>(new Set())
const isStale = ref(true)
const taskLogs = ref<TaskLog[]>([])
@@ -49,6 +50,9 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
isInstalledPackId(packName) &&
enabledPacksIds.value.has(packName)
const isInstallingPackId = (packName: string | undefined): boolean =>
!!packName && installingPacksIds.value.has(packName)
const packsToIdSet = (packs: ManagerPackInstalled[]) =>
packs.reduce((acc, pack) => {
const id = pack.cnr_id || pack.aux_id
@@ -117,7 +121,11 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
whenever(isStale, refreshInstalledList, { immediate: true })
whenever(uncompletedCount, () => showManagerProgressDialog())
const withLogs = (task: () => Promise<null>, taskName: string) => {
const withLogs = (
task: () => Promise<null>,
taskName: string,
packId?: string
) => {
const { startListening, stopListening, logs } = useServerLogs()
const loggedTask = async () => {
@@ -128,6 +136,9 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
const onComplete = async () => {
await stopListening()
if (packId) {
installingPacksIds.value.delete(packId)
}
setStale()
}
@@ -152,8 +163,11 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
}
}
installingPacksIds.value.add(params.id)
const task = () => managerService.installPack(params, signal)
enqueueTask(withLogs(task, `${actionDescription} ${params.id}`))
enqueueTask(
withLogs(task, `${actionDescription} ${params.id}`, params.id)
)
},
{ maxSize: 1 }
)
@@ -162,14 +176,16 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
installPack.clear()
installPack.cancel()
const task = () => managerService.uninstallPack(params, signal)
enqueueTask(withLogs(task, t('manager.uninstalling', { id: params.id })))
enqueueTask(
withLogs(task, t('manager.uninstalling', { id: params.id }), params.id)
)
}
const updatePack = useCachedRequest<ManagerPackInfo, void>(
async (params: ManagerPackInfo, signal?: AbortSignal) => {
updateAllPacks.cancel()
const task = () => managerService.updatePack(params, signal)
enqueueTask(withLogs(task, t('g.updating', { id: params.id })))
enqueueTask(withLogs(task, t('g.updating', { id: params.id }), params.id))
},
{ maxSize: 1 }
)
@@ -184,7 +200,7 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
const disablePack = (params: ManagerPackInfo, signal?: AbortSignal) => {
const task = () => managerService.disablePack(params, signal)
enqueueTask(withLogs(task, t('g.disabling', { id: params.id })))
enqueueTask(withLogs(task, t('g.disabling', { id: params.id }), params.id))
}
const getInstalledPackVersion = (packId: string) => {
@@ -212,6 +228,7 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
installedPacksIds,
isPackInstalled: isInstalledPackId,
isPackEnabled: isEnabledPackId,
isPackInstalling: isInstallingPackId,
getInstalledPackVersion,
refreshInstalledList,