diff --git a/web/src/lib/types/queue.ts b/web/src/lib/types/queue.ts index d11993a5..242d75e4 100644 --- a/web/src/lib/types/queue.ts +++ b/web/src/lib/types/queue.ts @@ -1,8 +1,10 @@ import type { CobaltSaveRequestBody } from "$lib/types/api"; import type { CobaltPipelineItem, CobaltPipelineResultFileType } from "$lib/types/workers"; +export type UUID = string; + type CobaltQueueBaseItem = { - id: string, + id: UUID, pipeline: CobaltPipelineItem[], canRetry?: boolean, originalRequest?: CobaltSaveRequestBody, @@ -17,7 +19,7 @@ type CobaltQueueItemWaiting = CobaltQueueBaseItem & { export type CobaltQueueItemRunning = CobaltQueueBaseItem & { state: "running", - completedWorkers: Set, + completedWorkers: Set, pipelineResults: File[], }; @@ -37,5 +39,5 @@ export type CobaltQueueItem = CobaltQueueItemWaiting | CobaltQueueItemError; export type CobaltQueue = { - [id: string]: CobaltQueueItem, + [id: UUID]: CobaltQueueItem, }; diff --git a/web/src/lib/types/task-manager.ts b/web/src/lib/types/task-manager.ts index 56d099b0..61882cc6 100644 --- a/web/src/lib/types/task-manager.ts +++ b/web/src/lib/types/task-manager.ts @@ -1,11 +1,12 @@ import type { CobaltPipelineItem, CobaltWorkerProgress } from "$lib/types/workers"; +import type { UUID } from "./queue"; export type CobaltCurrentTaskItem = { type: CobaltPipelineItem['worker'], - parentId: string, + parentId: UUID, progress?: CobaltWorkerProgress, } export type CobaltCurrentTasks = { - [id: string]: CobaltCurrentTaskItem, + [id: UUID]: CobaltCurrentTaskItem, } diff --git a/web/src/lib/types/workers.ts b/web/src/lib/types/workers.ts index 58ab9b0a..56e44baa 100644 --- a/web/src/lib/types/workers.ts +++ b/web/src/lib/types/workers.ts @@ -1,4 +1,5 @@ import type { FileInfo } from "$lib/types/libav"; +import type { UUID } from "./queue"; export const resultFileTypes = ["video", "audio", "image"] as const; @@ -17,9 +18,9 @@ type CobaltFFmpegWorkerArgs = { }; type CobaltPipelineItemBase = { - workerId: string, - parentId: string, - dependsOn?: string[], + workerId: UUID, + parentId: UUID, + dependsOn?: UUID[], }; type CobaltRemuxPipelineItem = CobaltPipelineItemBase & {