mirror of
https://github.com/imputnet/cobalt.git
synced 2025-01-19 13:18:28 +00:00
web: core system for queue & queen bee, move remux to new system
it's 3 am and i think i had a divine intervention
This commit is contained in:
parent
2273bb388f
commit
2279b5d845
|
@ -1,5 +1,7 @@
|
||||||
{
|
{
|
||||||
"title": "drag or select a file",
|
"title": "drag or select a file",
|
||||||
|
"title.multiple": "drag or select files",
|
||||||
"title.drop": "drop the file here!",
|
"title.drop": "drop the file here!",
|
||||||
|
"title.drop.multiple": "drop the files here!",
|
||||||
"accept": "supported formats: {{ formats }}."
|
"accept": "supported formats: {{ formats }}."
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,19 +3,20 @@
|
||||||
export let classes = "";
|
export let classes = "";
|
||||||
|
|
||||||
export let draggedOver = false;
|
export let draggedOver = false;
|
||||||
export let file: File | undefined;
|
export let files: FileList | undefined;
|
||||||
|
|
||||||
const dropHandler = async (ev: DragEvent) => {
|
const dropHandler = async (ev: DragEvent) => {
|
||||||
draggedOver = false;
|
draggedOver = false;
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
|
|
||||||
if (ev?.dataTransfer?.files.length === 1) {
|
if (ev?.dataTransfer?.files && ev?.dataTransfer?.files.length > 0) {
|
||||||
file = ev.dataTransfer.files[0];
|
files = ev.dataTransfer.files;
|
||||||
return file;
|
return files;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const dragOverHandler = (ev: DragEvent) => {
|
const dragOverHandler = (ev: DragEvent) => {
|
||||||
|
console.log("dragged over omg")
|
||||||
draggedOver = true;
|
draggedOver = true;
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
};
|
};
|
||||||
|
@ -25,6 +26,7 @@
|
||||||
{id}
|
{id}
|
||||||
class={classes}
|
class={classes}
|
||||||
role="region"
|
role="region"
|
||||||
|
aria-hidden="true"
|
||||||
on:drop={(ev) => dropHandler(ev)}
|
on:drop={(ev) => dropHandler(ev)}
|
||||||
on:dragover={(ev) => dragOverHandler(ev)}
|
on:dragover={(ev) => dragOverHandler(ev)}
|
||||||
on:dragend={() => {
|
on:dragend={() => {
|
||||||
|
|
|
@ -5,22 +5,33 @@
|
||||||
import IconFileImport from "@tabler/icons-svelte/IconFileImport.svelte";
|
import IconFileImport from "@tabler/icons-svelte/IconFileImport.svelte";
|
||||||
import IconUpload from "@tabler/icons-svelte/IconUpload.svelte";
|
import IconUpload from "@tabler/icons-svelte/IconUpload.svelte";
|
||||||
|
|
||||||
export let file: File | undefined;
|
export let files: FileList | undefined;
|
||||||
export let draggedOver = false;
|
export let draggedOver = false;
|
||||||
export let acceptTypes: string[];
|
export let acceptTypes: string[];
|
||||||
export let acceptExtensions: string[];
|
export let acceptExtensions: string[];
|
||||||
|
export let maxFileNumber: number = 100;
|
||||||
|
|
||||||
|
let selectorStringMultiple = maxFileNumber > 1 ? ".multiple" : "";
|
||||||
|
|
||||||
let fileInput: HTMLInputElement;
|
let fileInput: HTMLInputElement;
|
||||||
|
|
||||||
const openFile = async () => {
|
const openFile = async () => {
|
||||||
fileInput = document.createElement("input");
|
fileInput = document.createElement("input");
|
||||||
fileInput.type = "file";
|
fileInput.type = "file";
|
||||||
fileInput.accept = acceptTypes.join(",");
|
fileInput.accept = acceptTypes.join(",");
|
||||||
|
|
||||||
|
if (maxFileNumber > 1) {
|
||||||
|
fileInput.multiple = true;
|
||||||
|
}
|
||||||
|
|
||||||
fileInput.click();
|
fileInput.click();
|
||||||
fileInput.onchange = async () => {
|
fileInput.onchange = async () => {
|
||||||
if (fileInput.files?.length === 1) {
|
let userFiles = fileInput?.files;
|
||||||
file = fileInput.files[0];
|
if (userFiles && userFiles.length >= 1) {
|
||||||
return file;
|
if (userFiles.length > maxFileNumber) {
|
||||||
|
return alert("too many files, limit is " + maxFileNumber);
|
||||||
|
}
|
||||||
|
return files = userFiles;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -47,9 +58,9 @@
|
||||||
<div class="open-file-text">
|
<div class="open-file-text">
|
||||||
<div class="open-title">
|
<div class="open-title">
|
||||||
{#if draggedOver}
|
{#if draggedOver}
|
||||||
{$t("receiver.title.drop")}
|
{$t("receiver.title.drop" + selectorStringMultiple)}
|
||||||
{:else}
|
{:else}
|
||||||
{$t("receiver.title")}
|
{$t("receiver.title" + selectorStringMultiple)}
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div class="subtext accept-list">
|
<div class="subtext accept-list">
|
||||||
|
|
|
@ -2,11 +2,10 @@
|
||||||
import { t } from "$lib/i18n/translations";
|
import { t } from "$lib/i18n/translations";
|
||||||
import { onNavigate } from "$app/navigation";
|
import { onNavigate } from "$app/navigation";
|
||||||
|
|
||||||
import settings from "$lib/state/settings";
|
import { clearQueue, queue } from "$lib/state/queen-bee/queue";
|
||||||
import { addToQueue, nukeEntireQueue, queue } from "$lib/state/queue";
|
|
||||||
|
|
||||||
import type { SvelteComponent } from "svelte";
|
import type { SvelteComponent } from "svelte";
|
||||||
import type { QueueItem } from "$lib/types/queue";
|
import type { CobaltQueueItem } from "$lib/types/queue";
|
||||||
|
|
||||||
import SectionHeading from "$components/misc/SectionHeading.svelte";
|
import SectionHeading from "$components/misc/SectionHeading.svelte";
|
||||||
import PopoverContainer from "$components/misc/PopoverContainer.svelte";
|
import PopoverContainer from "$components/misc/PopoverContainer.svelte";
|
||||||
|
@ -15,47 +14,24 @@
|
||||||
import ProcessingQueueStub from "$components/queue/ProcessingQueueStub.svelte";
|
import ProcessingQueueStub from "$components/queue/ProcessingQueueStub.svelte";
|
||||||
|
|
||||||
import IconX from "@tabler/icons-svelte/IconX.svelte";
|
import IconX from "@tabler/icons-svelte/IconX.svelte";
|
||||||
import IconPlus from "@tabler/icons-svelte/IconPlus.svelte";
|
import { currentTasks } from "$lib/state/queen-bee/current-tasks";
|
||||||
|
|
||||||
import IconGif from "@tabler/icons-svelte/IconGif.svelte";
|
|
||||||
import IconMovie from "@tabler/icons-svelte/IconMovie.svelte";
|
|
||||||
import IconMusic from "@tabler/icons-svelte/IconMusic.svelte";
|
|
||||||
import IconPhoto from "@tabler/icons-svelte/IconPhoto.svelte";
|
|
||||||
import IconVolume3 from "@tabler/icons-svelte/IconVolume3.svelte";
|
|
||||||
|
|
||||||
let popover: SvelteComponent;
|
let popover: SvelteComponent;
|
||||||
$: expanded = false;
|
$: expanded = false;
|
||||||
|
|
||||||
$: queueItems = Object.entries($queue) as [id: string, item: QueueItem][];
|
$: queueItems = Object.entries($queue) as [
|
||||||
|
id: string,
|
||||||
|
item: CobaltQueueItem,
|
||||||
|
][];
|
||||||
|
|
||||||
$: queueLength = Object.keys($queue).length;
|
$: queueLength = Object.keys($queue).length;
|
||||||
|
$: completedQueueItems = queueItems.filter(([id, item]) => {
|
||||||
|
return item.state === "done"
|
||||||
|
}).length;
|
||||||
|
|
||||||
|
// TODO: toggle this only when progress is unknown
|
||||||
$: indeterminate = false;
|
$: indeterminate = false;
|
||||||
|
|
||||||
const itemIcons = {
|
|
||||||
video: IconMovie,
|
|
||||||
video_mute: IconVolume3,
|
|
||||||
audio: IconMusic,
|
|
||||||
audio_convert: IconMusic,
|
|
||||||
image: IconPhoto,
|
|
||||||
gif: IconGif,
|
|
||||||
};
|
|
||||||
|
|
||||||
const addFakeQueueItem = () => {
|
|
||||||
return addToQueue({
|
|
||||||
id: crypto.randomUUID(),
|
|
||||||
status: "waiting",
|
|
||||||
type: "video",
|
|
||||||
filename: "test.mp4",
|
|
||||||
files: [
|
|
||||||
{
|
|
||||||
type: "video",
|
|
||||||
url: "https://",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
processingSteps: [],
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const popoverAction = async () => {
|
const popoverAction = async () => {
|
||||||
expanded = !expanded;
|
expanded = !expanded;
|
||||||
};
|
};
|
||||||
|
@ -66,7 +42,7 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div id="processing-queue" class:expanded>
|
<div id="processing-queue" class:expanded>
|
||||||
<ProcessingStatus {indeterminate} expandAction={popover?.showPopover} />
|
<ProcessingStatus progress={(completedQueueItems / queueLength) * 100} {indeterminate} expandAction={popover?.showPopover} />
|
||||||
|
|
||||||
<PopoverContainer
|
<PopoverContainer
|
||||||
bind:this={popover}
|
bind:this={popover}
|
||||||
|
@ -84,27 +60,21 @@
|
||||||
/>
|
/>
|
||||||
<div class="header-buttons">
|
<div class="header-buttons">
|
||||||
{#if queueLength > 0}
|
{#if queueLength > 0}
|
||||||
<button class="clear-button" on:click={nukeEntireQueue}>
|
<button class="clear-button" on:click={clearQueue}>
|
||||||
<IconX />
|
<IconX />
|
||||||
{$t("button.clear")}
|
{$t("button.clear")}
|
||||||
</button>
|
</button>
|
||||||
{/if}
|
{/if}
|
||||||
<!-- button for ui debug -->
|
|
||||||
{#if $settings.advanced.debug}
|
|
||||||
<button class="test-button" on:click={addFakeQueueItem}>
|
|
||||||
<IconPlus />
|
|
||||||
add item
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="processing-list">
|
<div id="processing-list">
|
||||||
{#each queueItems as [id, item]}
|
{#each queueItems as [id, item]}
|
||||||
<ProcessingQueueItem
|
<ProcessingQueueItem
|
||||||
{id}
|
{id}
|
||||||
|
mediaType={item.mediaType}
|
||||||
filename={item.filename}
|
filename={item.filename}
|
||||||
status={item.status}
|
state={item.state}
|
||||||
icon={itemIcons[item.type]}
|
resultFile={item.state === "done" ? item.resultFile : undefined}
|
||||||
/>
|
/>
|
||||||
{/each}
|
{/each}
|
||||||
{#if queueLength === 0}
|
{#if queueLength === 0}
|
||||||
|
|
|
@ -1,41 +1,67 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
import { queue, removeItem } from "$lib/state/queen-bee/queue";
|
||||||
|
|
||||||
import IconX from "@tabler/icons-svelte/IconX.svelte";
|
import IconX from "@tabler/icons-svelte/IconX.svelte";
|
||||||
import IconDownload from "@tabler/icons-svelte/IconDownload.svelte";
|
import IconDownload from "@tabler/icons-svelte/IconDownload.svelte";
|
||||||
import { removeFromQueue } from "$lib/state/queue";
|
|
||||||
|
import IconMovie from "@tabler/icons-svelte/IconMovie.svelte";
|
||||||
|
import IconMusic from "@tabler/icons-svelte/IconMusic.svelte";
|
||||||
|
import IconPhoto from "@tabler/icons-svelte/IconPhoto.svelte";
|
||||||
|
import { downloadFile } from "$lib/download";
|
||||||
|
import type { CobaltQueueItemState } from "$lib/types/queue";
|
||||||
|
import type { CobaltPipelineResultFileType } from "$lib/types/workers";
|
||||||
|
|
||||||
|
const itemIcons = {
|
||||||
|
video: IconMovie,
|
||||||
|
audio: IconMusic,
|
||||||
|
image: IconPhoto,
|
||||||
|
};
|
||||||
|
|
||||||
export let id: string;
|
export let id: string;
|
||||||
|
export let mediaType: CobaltPipelineResultFileType;
|
||||||
export let filename: string;
|
export let filename: string;
|
||||||
export let status: string;
|
export let state: CobaltQueueItemState;
|
||||||
export let progress: number = 0;
|
export let resultFile: File | undefined;
|
||||||
export let icon: ConstructorOfATypedSvelteComponent;
|
|
||||||
|
// TODO: use a real value
|
||||||
|
const progress = 0;
|
||||||
|
|
||||||
|
const download = (file: File) =>
|
||||||
|
downloadFile({
|
||||||
|
file,
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="processing-item">
|
<div class="processing-item">
|
||||||
<div class="processing-info">
|
<div class="processing-info">
|
||||||
<div class="file-title">
|
<div class="file-title">
|
||||||
<div class="processing-type">
|
<div class="processing-type">
|
||||||
<svelte:component this={icon} />
|
<svelte:component this={itemIcons[mediaType]} />
|
||||||
</div>
|
</div>
|
||||||
<span>
|
<span>
|
||||||
{filename}
|
{filename}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="file-progress">
|
{#if state === "running"}
|
||||||
<div
|
<div class="file-progress">
|
||||||
class="progress"
|
<div
|
||||||
style="width: {Math.min(100, progress)}%"
|
class="progress"
|
||||||
></div>
|
style="width: {Math.min(100, progress)}%"
|
||||||
</div>
|
></div>
|
||||||
<div class="file-status">{id}: {status}</div>
|
</div>
|
||||||
|
{/if}
|
||||||
|
<div class="file-status">{id}: {state}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="file-actions">
|
<div class="file-actions">
|
||||||
<button class="action-button">
|
{#if state === "done" && resultFile}
|
||||||
<IconDownload />
|
<button
|
||||||
</button>
|
class="action-button"
|
||||||
<button
|
on:click={() => download(resultFile)}
|
||||||
class="action-button"
|
>
|
||||||
on:click={() => removeFromQueue(id)}
|
<IconDownload />
|
||||||
>
|
</button>
|
||||||
|
{/if}
|
||||||
|
<button class="action-button" on:click={() => removeItem(id)}>
|
||||||
<IconX />
|
<IconX />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
36
web/src/lib/queen-bee/queue.ts
Normal file
36
web/src/lib/queen-bee/queue.ts
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
import { addItem } from "$lib/state/queen-bee/queue";
|
||||||
|
import type { CobaltPipelineItem } from "$lib/types/workers";
|
||||||
|
|
||||||
|
export const getMediaType = (type: string) => {
|
||||||
|
const kind = type.split('/')[0];
|
||||||
|
|
||||||
|
// can't use .includes() here for some reason
|
||||||
|
if (kind === "video" || kind === "audio" || kind === "image") {
|
||||||
|
return kind;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const createRemuxPipeline = (file: File) => {
|
||||||
|
// chopped khia
|
||||||
|
const parentId = crypto.randomUUID();
|
||||||
|
const mediaType = getMediaType(file.type);
|
||||||
|
|
||||||
|
const pipeline: CobaltPipelineItem[] = [{
|
||||||
|
worker: "remux",
|
||||||
|
workerId: crypto.randomUUID(),
|
||||||
|
parentId,
|
||||||
|
workerArgs: {
|
||||||
|
files: [file],
|
||||||
|
},
|
||||||
|
}];
|
||||||
|
|
||||||
|
if (mediaType) {
|
||||||
|
addItem({
|
||||||
|
id: parentId,
|
||||||
|
state: "waiting",
|
||||||
|
pipeline,
|
||||||
|
filename: file.name,
|
||||||
|
mediaType,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
60
web/src/lib/queen-bee/run-worker.ts
Normal file
60
web/src/lib/queen-bee/run-worker.ts
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
import RemuxWorker from "$lib/workers/remux?worker";
|
||||||
|
//import RemoveBgWorker from "$lib/workers/removebg?worker";
|
||||||
|
|
||||||
|
import type { CobaltPipelineItem } from "$lib/types/workers";
|
||||||
|
import { itemDone, itemError } from "$lib/state/queen-bee/queue";
|
||||||
|
|
||||||
|
const workerError = (parentId: string, workerId: string, worker: Worker, error: string) => {
|
||||||
|
itemError(parentId, workerId, error);
|
||||||
|
worker.terminate();
|
||||||
|
}
|
||||||
|
|
||||||
|
const workerSuccess = (parentId: string, workerId: string, worker: Worker, file: File) => {
|
||||||
|
itemDone(parentId, workerId, file);
|
||||||
|
worker.terminate();
|
||||||
|
}
|
||||||
|
|
||||||
|
export const runRemuxWorker = async (workerId: string, parentId: string, file: File) => {
|
||||||
|
const worker = new RemuxWorker();
|
||||||
|
|
||||||
|
worker.postMessage({ file });
|
||||||
|
|
||||||
|
worker.onerror = (e) => {
|
||||||
|
console.error("remux worker exploded:", e);
|
||||||
|
|
||||||
|
// TODO: proper error code
|
||||||
|
workerError(parentId, workerId, worker, "internal error");
|
||||||
|
};
|
||||||
|
|
||||||
|
worker.onmessage = (event) => {
|
||||||
|
const eventData = event.data.cobaltRemuxWorker;
|
||||||
|
if (!eventData) return;
|
||||||
|
|
||||||
|
console.log(eventData);
|
||||||
|
|
||||||
|
// TODO: calculate & use progress again
|
||||||
|
|
||||||
|
if (eventData.render) {
|
||||||
|
return workerSuccess(
|
||||||
|
parentId,
|
||||||
|
workerId,
|
||||||
|
worker,
|
||||||
|
new File([eventData.render], eventData.filename, {
|
||||||
|
type: eventData.render.type,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (eventData.error) {
|
||||||
|
return workerError(parentId, workerId, worker, eventData.error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const startWorker = async ({ worker, workerId, parentId, workerArgs }: CobaltPipelineItem) => {
|
||||||
|
switch (worker) {
|
||||||
|
case "remux":
|
||||||
|
await runRemuxWorker(workerId, parentId, workerArgs.files[0]);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
41
web/src/lib/queen-bee/scheduler.ts
Normal file
41
web/src/lib/queen-bee/scheduler.ts
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
import { get } from "svelte/store";
|
||||||
|
import { itemRunning, queue } from "$lib/state/queen-bee/queue";
|
||||||
|
import { startWorker } from "$lib/queen-bee/run-worker";
|
||||||
|
import { addWorkerToQueue, currentTasks } from "$lib/state/queen-bee/current-tasks";
|
||||||
|
|
||||||
|
export const checkTasks = () => {
|
||||||
|
const queueItems = get(queue);
|
||||||
|
const ongoingTasks = get(currentTasks)
|
||||||
|
|
||||||
|
if (Object.keys(ongoingTasks).length > 0) return;
|
||||||
|
|
||||||
|
for (const item of Object.keys(queueItems)) {
|
||||||
|
const task = queueItems[item];
|
||||||
|
|
||||||
|
if (task.state === "running") {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (task.state === "waiting") {
|
||||||
|
for (let i = 0; i < task.pipeline.length; i++) {
|
||||||
|
// TODO: loop here and pass the file between pipelines
|
||||||
|
// or schedule several tasks one after another but within
|
||||||
|
// one parent & pipeline
|
||||||
|
const pipelineItem = task.pipeline[i];
|
||||||
|
|
||||||
|
startWorker(pipelineItem);
|
||||||
|
|
||||||
|
addWorkerToQueue({
|
||||||
|
id: pipelineItem.workerId,
|
||||||
|
parentId: task.id,
|
||||||
|
step: i + 1,
|
||||||
|
totalSteps: task.pipeline.length,
|
||||||
|
});
|
||||||
|
|
||||||
|
itemRunning(task.id, i);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
40
web/src/lib/state/queen-bee/current-tasks.ts
Normal file
40
web/src/lib/state/queen-bee/current-tasks.ts
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
import { readable, type Updater } from "svelte/store";
|
||||||
|
|
||||||
|
import type { CobaltWorkerProgress } from "$lib/types/workers";
|
||||||
|
import type { CobaltCurrentTasks, CobaltCurrentTaskItem } from "$lib/types/queen-bee";
|
||||||
|
|
||||||
|
let update: (_: Updater<CobaltCurrentTasks>) => void;
|
||||||
|
|
||||||
|
const currentTasks = readable<CobaltCurrentTasks>(
|
||||||
|
{},
|
||||||
|
(_, _update) => { update = _update }
|
||||||
|
);
|
||||||
|
|
||||||
|
export function addWorkerToQueue(item: CobaltCurrentTaskItem) {
|
||||||
|
update(tasks => {
|
||||||
|
tasks[item.id] = item;
|
||||||
|
return tasks;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function removeWorkerFromQueue(id: string) {
|
||||||
|
update(tasks => {
|
||||||
|
delete tasks[id];
|
||||||
|
return tasks;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function updateWorkerProgress(id: string, progress: CobaltWorkerProgress) {
|
||||||
|
update(tasks => {
|
||||||
|
tasks[id].progress = progress;
|
||||||
|
return tasks;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clearQueue() {
|
||||||
|
update(() => {
|
||||||
|
return {};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export { currentTasks };
|
84
web/src/lib/state/queen-bee/queue.ts
Normal file
84
web/src/lib/state/queen-bee/queue.ts
Normal file
|
@ -0,0 +1,84 @@
|
||||||
|
import { readable, type Updater } from "svelte/store";
|
||||||
|
import type { CobaltQueue, CobaltQueueItem } from "$lib/types/queue";
|
||||||
|
import { checkTasks } from "$lib/queen-bee/scheduler";
|
||||||
|
import { removeWorkerFromQueue } from "./current-tasks";
|
||||||
|
|
||||||
|
let update: (_: Updater<CobaltQueue>) => void;
|
||||||
|
|
||||||
|
const queue = readable<CobaltQueue>(
|
||||||
|
{},
|
||||||
|
(_, _update) => { update = _update }
|
||||||
|
);
|
||||||
|
|
||||||
|
export function addItem(item: CobaltQueueItem) {
|
||||||
|
update(queueData => {
|
||||||
|
queueData[item.id] = item;
|
||||||
|
return queueData;
|
||||||
|
});
|
||||||
|
|
||||||
|
checkTasks();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function itemError(id: string, workerId: string, error: string) {
|
||||||
|
update(queueData => {
|
||||||
|
if (queueData[id]) {
|
||||||
|
queueData[id] = {
|
||||||
|
...queueData[id],
|
||||||
|
state: "error",
|
||||||
|
errorCode: error,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return queueData;
|
||||||
|
});
|
||||||
|
|
||||||
|
removeWorkerFromQueue(workerId);
|
||||||
|
checkTasks();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function itemDone(id: string, workerId: string, file: File) {
|
||||||
|
update(queueData => {
|
||||||
|
if (queueData[id]) {
|
||||||
|
queueData[id] = {
|
||||||
|
...queueData[id],
|
||||||
|
state: "done",
|
||||||
|
resultFile: file,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return queueData;
|
||||||
|
});
|
||||||
|
|
||||||
|
removeWorkerFromQueue(workerId);
|
||||||
|
checkTasks();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function itemRunning(id: string, step: number) {
|
||||||
|
update(queueData => {
|
||||||
|
if (queueData[id]) {
|
||||||
|
queueData[id] = {
|
||||||
|
...queueData[id],
|
||||||
|
state: "running",
|
||||||
|
currentStep: step,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return queueData;
|
||||||
|
});
|
||||||
|
|
||||||
|
checkTasks();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function removeItem(id: string) {
|
||||||
|
update(queueData => {
|
||||||
|
delete queueData[id];
|
||||||
|
return queueData;
|
||||||
|
});
|
||||||
|
|
||||||
|
checkTasks();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clearQueue() {
|
||||||
|
update(() => {
|
||||||
|
return {};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export { queue };
|
|
@ -1,70 +0,0 @@
|
||||||
import { merge } from "ts-deepmerge";
|
|
||||||
import { get, readable, type Updater } from "svelte/store";
|
|
||||||
import type { OngoingQueueItem, QueueItem } from "$lib/types/queue";
|
|
||||||
|
|
||||||
type Queue = {
|
|
||||||
[id: string]: QueueItem;
|
|
||||||
}
|
|
||||||
|
|
||||||
type OngoingQueue = {
|
|
||||||
[id: string]: OngoingQueueItem;
|
|
||||||
}
|
|
||||||
|
|
||||||
let update: (_: Updater<Queue>) => void;
|
|
||||||
|
|
||||||
const queue = readable<Queue>(
|
|
||||||
{},
|
|
||||||
(_, _update) => { update = _update }
|
|
||||||
);
|
|
||||||
|
|
||||||
export function addToQueue(item: QueueItem) {
|
|
||||||
update(queueData => {
|
|
||||||
queueData[item.id] = item;
|
|
||||||
return queueData;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export function removeFromQueue(id: string) {
|
|
||||||
update(queueData => {
|
|
||||||
delete queueData[id];
|
|
||||||
return queueData;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let updateOngoing: (_: Updater<OngoingQueue>) => void;
|
|
||||||
|
|
||||||
const ongoingQueue = readable<OngoingQueue>(
|
|
||||||
{},
|
|
||||||
(_, _update) => { updateOngoing = _update }
|
|
||||||
);
|
|
||||||
|
|
||||||
export function updateOngoingQueue(id: string, itemInfo: Partial<OngoingQueueItem> = {}) {
|
|
||||||
updateOngoing(queueData => {
|
|
||||||
if (get(queue)?.id) {
|
|
||||||
queueData[id] = merge(queueData[id], {
|
|
||||||
id,
|
|
||||||
...itemInfo,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return queueData;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export function removeFromOngoingQueue(id: string) {
|
|
||||||
updateOngoing(queue => {
|
|
||||||
delete queue[id];
|
|
||||||
return queue;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export function nukeEntireQueue() {
|
|
||||||
update(() => {
|
|
||||||
return {};
|
|
||||||
});
|
|
||||||
updateOngoing(() => {
|
|
||||||
return {};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export { queue, ongoingQueue };
|
|
13
web/src/lib/types/queen-bee.ts
Normal file
13
web/src/lib/types/queen-bee.ts
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
import type { CobaltWorkerProgress } from "$lib/types/workers";
|
||||||
|
|
||||||
|
export type CobaltCurrentTaskItem = {
|
||||||
|
id: string,
|
||||||
|
parentId: string, // parent id is queue id to which this pipeline worker belongs to
|
||||||
|
step: number,
|
||||||
|
totalSteps: number,
|
||||||
|
progress?: CobaltWorkerProgress,
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CobaltCurrentTasks = {
|
||||||
|
[id: string]: CobaltCurrentTaskItem,
|
||||||
|
}
|
|
@ -1,34 +1,37 @@
|
||||||
type ProcessingStep = "mux" | "mux_hls" | "encode";
|
import type { CobaltPipelineItem, CobaltPipelineResultFileType } from "$lib/types/workers";
|
||||||
type ProcessingPreset = "mp4" | "webm" | "copy";
|
|
||||||
type ProcessingState = "completed" | "failed" | "canceled" | "waiting" | "downloading" | "muxing" | "converting";
|
|
||||||
type ProcessingType = "video" | "video_mute" | "audio" | "audio_convert" | "image" | "gif";
|
|
||||||
type QueueFileType = "video" | "audio" | "image" | "gif";
|
|
||||||
|
|
||||||
export type ProcessingStepItem = {
|
export type CobaltQueueItemState = "waiting" | "running" | "done" | "error";
|
||||||
type: ProcessingStep,
|
|
||||||
preset?: ProcessingPreset,
|
|
||||||
}
|
|
||||||
|
|
||||||
export type QueueFile = {
|
export type CobaltQueueBaseItem = {
|
||||||
type: QueueFileType,
|
|
||||||
url: string,
|
|
||||||
}
|
|
||||||
|
|
||||||
export type QueueItem = {
|
|
||||||
id: string,
|
id: string,
|
||||||
status: ProcessingState,
|
state: CobaltQueueItemState,
|
||||||
type: ProcessingType,
|
pipeline: CobaltPipelineItem[],
|
||||||
|
// TODO: metadata
|
||||||
filename: string,
|
filename: string,
|
||||||
files: QueueFile[],
|
mediaType: CobaltPipelineResultFileType,
|
||||||
processingSteps: ProcessingStepItem[],
|
};
|
||||||
}
|
|
||||||
|
|
||||||
export type OngoingQueueItem = {
|
export type CobaltQueueItemWaiting = CobaltQueueBaseItem & {
|
||||||
id: string,
|
state: "waiting",
|
||||||
currentStep?: ProcessingStep,
|
};
|
||||||
size?: {
|
|
||||||
expected: number,
|
export type CobaltQueueItemRunning = CobaltQueueBaseItem & {
|
||||||
current: number,
|
state: "running",
|
||||||
},
|
currentStep: number,
|
||||||
speed?: number,
|
};
|
||||||
}
|
|
||||||
|
export type CobaltQueueItemDone = CobaltQueueBaseItem & {
|
||||||
|
state: "done",
|
||||||
|
resultFile: File,
|
||||||
|
};
|
||||||
|
|
||||||
|
export type CobaltQueueItemError = CobaltQueueBaseItem & {
|
||||||
|
state: "error",
|
||||||
|
errorCode: string,
|
||||||
|
};
|
||||||
|
|
||||||
|
export type CobaltQueueItem = CobaltQueueItemWaiting | CobaltQueueItemRunning | CobaltQueueItemDone | CobaltQueueItemError;
|
||||||
|
|
||||||
|
export type CobaltQueue = {
|
||||||
|
[id: string]: CobaltQueueItem,
|
||||||
|
};
|
||||||
|
|
22
web/src/lib/types/workers.ts
Normal file
22
web/src/lib/types/workers.ts
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
export const resultFileTypes = ["video", "audio", "image"] as const;
|
||||||
|
|
||||||
|
export type CobaltWorkerType = "remux" | "removebg";
|
||||||
|
export type CobaltPipelineResultFileType = typeof resultFileTypes[number];
|
||||||
|
|
||||||
|
export type CobaltWorkerProgress = {
|
||||||
|
indeterminate: boolean,
|
||||||
|
speed?: number,
|
||||||
|
percentage: number,
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CobaltWorkerArgs = {
|
||||||
|
files: File[],
|
||||||
|
//TODO: args for libav & etc with unique types
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CobaltPipelineItem = {
|
||||||
|
worker: CobaltWorkerType,
|
||||||
|
workerId: string,
|
||||||
|
parentId: string,
|
||||||
|
workerArgs: CobaltWorkerArgs,
|
||||||
|
}
|
|
@ -1,11 +1,5 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import RemuxWorker from "$lib/workers/remux?worker";
|
|
||||||
|
|
||||||
import { beforeNavigate, goto } from "$app/navigation";
|
|
||||||
|
|
||||||
import { t } from "$lib/i18n/translations";
|
import { t } from "$lib/i18n/translations";
|
||||||
import { createDialog } from "$lib/state/dialogs";
|
|
||||||
import { downloadFile } from "$lib/download";
|
|
||||||
|
|
||||||
import Skeleton from "$components/misc/Skeleton.svelte";
|
import Skeleton from "$components/misc/Skeleton.svelte";
|
||||||
import DropReceiver from "$components/misc/DropReceiver.svelte";
|
import DropReceiver from "$components/misc/DropReceiver.svelte";
|
||||||
|
@ -15,130 +9,24 @@
|
||||||
import IconRepeat from "@tabler/icons-svelte/IconRepeat.svelte";
|
import IconRepeat from "@tabler/icons-svelte/IconRepeat.svelte";
|
||||||
import IconDevices from "@tabler/icons-svelte/IconDevices.svelte";
|
import IconDevices from "@tabler/icons-svelte/IconDevices.svelte";
|
||||||
import IconInfoCircle from "@tabler/icons-svelte/IconInfoCircle.svelte";
|
import IconInfoCircle from "@tabler/icons-svelte/IconInfoCircle.svelte";
|
||||||
|
import { createRemuxPipeline } from "$lib/queen-bee/queue";
|
||||||
|
|
||||||
let draggedOver = false;
|
let draggedOver = false;
|
||||||
let file: File | undefined;
|
let files: FileList | undefined;
|
||||||
|
|
||||||
let speed: number | undefined;
|
let speed: number | undefined;
|
||||||
let progress: string | undefined;
|
let progress: string | undefined;
|
||||||
let currentProgress: string | undefined;
|
let currentProgress: string | undefined;
|
||||||
|
|
||||||
let wentAway = false;
|
|
||||||
|
|
||||||
let processing = false;
|
let processing = false;
|
||||||
|
|
||||||
let worker: Worker;
|
|
||||||
|
|
||||||
const remux = async () => {
|
const remux = async () => {
|
||||||
worker = new RemuxWorker();
|
if (!files) return;
|
||||||
|
|
||||||
speed = undefined;
|
for (let i = 0; i < files?.length; i++) {
|
||||||
progress = undefined;
|
createRemuxPipeline(files[i]);
|
||||||
currentProgress = undefined;
|
|
||||||
|
|
||||||
worker.postMessage({ file });
|
|
||||||
processing = true;
|
|
||||||
|
|
||||||
worker.onerror = (e) => {
|
|
||||||
console.error("remux worker exploded:", e);
|
|
||||||
worker.terminate();
|
|
||||||
};
|
|
||||||
|
|
||||||
worker.onmessage = (event) => {
|
|
||||||
const eventData = event.data.cobaltRemuxWorker;
|
|
||||||
if (!eventData) return;
|
|
||||||
|
|
||||||
console.log(eventData);
|
|
||||||
|
|
||||||
if (eventData.progress) {
|
|
||||||
let eprogress = eventData.progress;
|
|
||||||
|
|
||||||
if (eprogress?.speed) {
|
|
||||||
speed = eprogress.speed;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (eprogress?.durationProcessed) {
|
|
||||||
currentProgress = eprogress.durationProcessed;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (eprogress?.duration && eprogress?.durationProcessed) {
|
|
||||||
progress = Math.max(
|
|
||||||
0,
|
|
||||||
Math.min(
|
|
||||||
100,
|
|
||||||
(eprogress.durationProcessed / eprogress.duration) *
|
|
||||||
100
|
|
||||||
)
|
|
||||||
).toFixed(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(eprogress, progress, speed, currentProgress);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (eventData.render) {
|
|
||||||
processing = false;
|
|
||||||
worker.terminate();
|
|
||||||
return downloadFile({
|
|
||||||
file: new File([eventData.render], eventData.filename, {
|
|
||||||
type: eventData.render.type,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (eventData.error) {
|
|
||||||
processing = false;
|
|
||||||
worker.terminate();
|
|
||||||
|
|
||||||
return createDialog({
|
|
||||||
id: "remux-error",
|
|
||||||
type: "small",
|
|
||||||
meowbalt: "error",
|
|
||||||
bodyText: $t(eventData.error),
|
|
||||||
buttons: [
|
|
||||||
{
|
|
||||||
text: $t("button.gotit"),
|
|
||||||
main: true,
|
|
||||||
action: () => {},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeNavigate((event) => {
|
|
||||||
if (processing && !wentAway) {
|
|
||||||
event.cancel();
|
|
||||||
const path = event.to?.route?.id;
|
|
||||||
|
|
||||||
if (path) {
|
|
||||||
return createDialog({
|
|
||||||
id: "remux-ongoing",
|
|
||||||
type: "small",
|
|
||||||
icon: "warn-red",
|
|
||||||
title: $t("dialog.processing.title.ongoing"),
|
|
||||||
bodyText: $t("dialog.processing.ongoing"),
|
|
||||||
buttons: [
|
|
||||||
{
|
|
||||||
text: $t("button.no"),
|
|
||||||
main: false,
|
|
||||||
action: () => {},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
text: $t("button.yes"),
|
|
||||||
main: true,
|
|
||||||
color: "red",
|
|
||||||
action: async () => {
|
|
||||||
worker.terminate();
|
|
||||||
wentAway = true;
|
|
||||||
goto(path);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:head>
|
<svelte:head>
|
||||||
|
@ -150,7 +38,7 @@
|
||||||
</svelte:head>
|
</svelte:head>
|
||||||
|
|
||||||
<DropReceiver
|
<DropReceiver
|
||||||
bind:file
|
bind:files
|
||||||
bind:draggedOver
|
bind:draggedOver
|
||||||
id="remux-container"
|
id="remux-container"
|
||||||
classes={processing ? "processing" : ""}
|
classes={processing ? "processing" : ""}
|
||||||
|
@ -165,7 +53,7 @@
|
||||||
<div id="remux-receiver">
|
<div id="remux-receiver">
|
||||||
<FileReceiver
|
<FileReceiver
|
||||||
bind:draggedOver
|
bind:draggedOver
|
||||||
bind:file
|
bind:files
|
||||||
acceptTypes={["video/*", "audio/*"]}
|
acceptTypes={["video/*", "audio/*"]}
|
||||||
acceptExtensions={[
|
acceptExtensions={[
|
||||||
"mp4",
|
"mp4",
|
||||||
|
@ -178,12 +66,12 @@
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{#if file}
|
{#if files}
|
||||||
<div class="button-row">
|
<div class="button-row">
|
||||||
<button on:click={remux}>remux</button>
|
<button on:click={remux}>remux</button>
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
file = undefined;
|
files = undefined;
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
clear imported files
|
clear imported files
|
||||||
|
@ -236,9 +124,8 @@
|
||||||
{/if}
|
{/if}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
file = undefined;
|
files = undefined;
|
||||||
processing = false;
|
processing = false;
|
||||||
worker?.terminate();
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
cancel
|
cancel
|
||||||
|
|
Loading…
Reference in a new issue