From 4ed07dde8845d6042009bb7dee98cbc5d28dfe8a Mon Sep 17 00:00:00 2001 From: Steven Vandevelde Date: Fri, 24 Oct 2025 23:37:08 +0200 Subject: [PATCH] feat: queue-audio orchestrator --- .../orchestrator/queue-audio/_applet.astro | 97 ------------------- .../orchestrator/queue-audio/_manifest.json | 6 -- .../orchestrator/queue-audio/index.astro | 9 -- .../orchestrator/queue-tracks/_applet.astro | 74 -------------- .../orchestrator/queue-tracks/_manifest.json | 6 -- .../orchestrator/queue-tracks/index.astro | 9 -- src/common/element.js | 2 +- src/common/signal.js | 7 +- src/component/engine/audio/element.js | 3 + .../orchestrator/queue-audio/element.js | 97 +++++++++++++++++++ .../orchestrator/queue-tracks/element.js | 4 +- src/theme/blur/index.js | 24 ++--- src/theme/blur/index.vto | 8 +- 13 files changed, 118 insertions(+), 228 deletions(-) delete mode 100644 _backup/pages/orchestrator/queue-audio/_applet.astro delete mode 100644 _backup/pages/orchestrator/queue-audio/_manifest.json delete mode 100644 _backup/pages/orchestrator/queue-audio/index.astro delete mode 100644 _backup/pages/orchestrator/queue-tracks/_applet.astro delete mode 100644 _backup/pages/orchestrator/queue-tracks/_manifest.json delete mode 100644 _backup/pages/orchestrator/queue-tracks/index.astro create mode 100644 src/component/orchestrator/queue-audio/element.js diff --git a/_backup/pages/orchestrator/queue-audio/_applet.astro b/_backup/pages/orchestrator/queue-audio/_applet.astro deleted file mode 100644 index 17a1dbf4..00000000 --- a/_backup/pages/orchestrator/queue-audio/_applet.astro +++ /dev/null @@ -1,97 +0,0 @@ - diff --git a/_backup/pages/orchestrator/queue-audio/_manifest.json b/_backup/pages/orchestrator/queue-audio/_manifest.json deleted file mode 100644 index abe028f0..00000000 --- a/_backup/pages/orchestrator/queue-audio/_manifest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "diffuse/orchestrator/queue-audio", - "title": "Diffuse Orchestrator | Queue Audio", - "entrypoint": "index.html", - "actions": {} -} diff --git a/_backup/pages/orchestrator/queue-audio/index.astro b/_backup/pages/orchestrator/queue-audio/index.astro deleted file mode 100644 index dfb1e1a8..00000000 --- a/_backup/pages/orchestrator/queue-audio/index.astro +++ /dev/null @@ -1,9 +0,0 @@ ---- -import Layout from "@layouts/applet.astro"; -import Applet from "./_applet.astro"; -import { title } from "./_manifest.json"; ---- - - - - diff --git a/_backup/pages/orchestrator/queue-tracks/_applet.astro b/_backup/pages/orchestrator/queue-tracks/_applet.astro deleted file mode 100644 index 8eef1d66..00000000 --- a/_backup/pages/orchestrator/queue-tracks/_applet.astro +++ /dev/null @@ -1,74 +0,0 @@ - diff --git a/_backup/pages/orchestrator/queue-tracks/_manifest.json b/_backup/pages/orchestrator/queue-tracks/_manifest.json deleted file mode 100644 index 5e44c917..00000000 --- a/_backup/pages/orchestrator/queue-tracks/_manifest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "diffuse/orchestrator/queue-tracks", - "title": "Diffuse Orchestrator | Queue Tracks", - "entrypoint": "index.html", - "actions": {} -} diff --git a/_backup/pages/orchestrator/queue-tracks/index.astro b/_backup/pages/orchestrator/queue-tracks/index.astro deleted file mode 100644 index dfb1e1a8..00000000 --- a/_backup/pages/orchestrator/queue-tracks/index.astro +++ /dev/null @@ -1,9 +0,0 @@ ---- -import Layout from "@layouts/applet.astro"; -import Applet from "./_applet.astro"; -import { title } from "./_manifest.json"; ---- - - - - diff --git a/src/common/element.js b/src/common/element.js index b1ed6ee4..cdd76aee 100644 --- a/src/common/element.js +++ b/src/common/element.js @@ -123,7 +123,7 @@ export class BroadcastableDiffuseElement extends DiffuseElement { this.broadcast = this.broadcast.bind(this); /** @type {Signal>} */ - this.#broadcastingStatus = signal(this.#status.promise, { unbiased: true }); + this.#broadcastingStatus = signal(this.#status.promise, { eager: true }); this.broadcastingStatus = this.#broadcastingStatus.get; } diff --git a/src/common/signal.js b/src/common/signal.js index e0eef924..c0991ec4 100644 --- a/src/common/signal.js +++ b/src/common/signal.js @@ -10,15 +10,12 @@ export * from "alien-signals"; /** * @template T * @param {T} initialValue - * @param {{ unbiased?: boolean }} [options] + * @param {{ eager?: boolean }} [options] * @returns {Signal} */ export function signal(initialValue, options) { const s = alienSignal(initialValue); - const isPrimitive = initialValue !== null && - initialValue !== undefined && - Object(initialValue) !== initialValue; - if (isPrimitive || options?.unbiased === true) { + if (options?.eager === true) { return _signal({ get: () => s(), set: (v) => s(v), diff --git a/src/component/engine/audio/element.js b/src/component/engine/audio/element.js index c9f18f62..7e33f8d7 100644 --- a/src/component/engine/audio/element.js +++ b/src/component/engine/audio/element.js @@ -49,10 +49,12 @@ class AudioEngine extends BroadcastableDiffuseElement { #items = signal(/** @type {Audio[]} */ ([])); #volume = signal(0.5); + $hasEnded = signal(false); $isPlaying = signal(false); // STATE + hasEnded = this.$hasEnded.get; isPlaying = this.$isPlaying.get; items = this.#items.get; volume = this.#volume.get; @@ -332,6 +334,7 @@ class AudioEngineItem extends HTMLElement { audio.currentTime = 0; engineItem(audio)?.state({ hasEnded: true }); + engineItem(audio)?.engine?.$hasEnded.set(true); } /** diff --git a/src/component/orchestrator/queue-audio/element.js b/src/component/orchestrator/queue-audio/element.js new file mode 100644 index 00000000..65ad8de3 --- /dev/null +++ b/src/component/orchestrator/queue-audio/element.js @@ -0,0 +1,97 @@ +import { DiffuseElement, query } from "@common/element.js"; +import { untracked } from "@common/signal.js"; + +/** + * @import {InputElement, OutputElement, Track} from "@component/core/types.d.ts" + */ + +//////////////////////////////////////////// +// ELEMENT +//////////////////////////////////////////// + +/** + * When the active queue item changes, + * coordinate the audio engine accordingly. + * + * Vice versa, when the audio ends, + * shift the queue if needed. + */ +class QueueAudioOrchestrator extends DiffuseElement { + constructor() { + super(); + + /** @type {InputElement} */ + this.input = query(this, "input-selector"); + + /** @type {import("@component/engine/audio/element.js").CLASS} */ + this.audio = query(this, "audio-engine-selector"); + + /** @type {import("@component/engine/queue/element.js").CLASS} */ + this.queue = query(this, "queue-engine-selector"); + } + + // LIFECYCLE + + /** + * @override + */ + async connectedCallback() { + super.connectedCallback(); + + // Wait until defined + await customElements.whenDefined(this.audio.localName); + await customElements.whenDefined(this.input.localName); + await customElements.whenDefined(this.queue.localName); + + // Effects + this.effect(() => this.monitorActiveQueueItem()); + this.effect(() => this.monitorAudioEnd()); + } + + // 🛠️ + + async monitorActiveQueueItem() { + const activeTrack = this.queue.now(); + const isPlaying = untracked(this.audio.isPlaying); + + // Resolve URIs + const url = activeTrack + ? await this.input.resolve({ method: "GET", uri: activeTrack.uri }).then( + (a) => a?.url, + ) + : undefined; + + // Check if we still need to render + if (this.queue.now?.()?.id !== activeTrack?.id) return; + + // Play new active queue item + // TODO: Take URL expiration timestamp into account + // TODO: Preload next queue item + this.audio.supply({ + audio: activeTrack && url + ? [{ + id: activeTrack.id, + isPreload: false, + url, + }] + // TODO: Keep preloads + : [], + play: activeTrack && isPlaying ? { audioId: activeTrack.id } : undefined, + }); + } + + async monitorAudioEnd() { + if (this.audio.hasEnded()) await this.queue.shift(); + } +} + +export default QueueAudioOrchestrator; + +//////////////////////////////////////////// +// REGISTER +//////////////////////////////////////////// + +export const CLASS = QueueAudioOrchestrator; +export const NAME = "do-queue-audio"; + +customElements.define(NAME, QueueAudioOrchestrator); diff --git a/src/component/orchestrator/queue-tracks/element.js b/src/component/orchestrator/queue-tracks/element.js index d8b715fc..f847b241 100644 --- a/src/component/orchestrator/queue-tracks/element.js +++ b/src/component/orchestrator/queue-tracks/element.js @@ -35,10 +35,10 @@ class QueueTracksOrchestrator extends DiffuseElement { async connectedCallback() { super.connectedCallback(); - // Wait until defined + // When defined await customElements.whenDefined(this.output.localName); - // ... + // Watch tracks collection this.effect(() => { const tracks = this.output.tracks.collection(); this.poolAvailable(tracks); diff --git a/src/theme/blur/index.js b/src/theme/blur/index.js index dd99da1e..d8272f06 100644 --- a/src/theme/blur/index.js +++ b/src/theme/blur/index.js @@ -1,12 +1,13 @@ +import "@component/engine/audio/element.js"; import "@component/input/opensubsonic/element.js"; +import "@component/orchestrator/process-tracks/element.js"; +import "@component/orchestrator/queue-audio/element.js"; +import "@component/orchestrator/queue-tracks/element.js"; import "@component/processor/metadata/element.js"; -import * as Audio from "@component/engine/audio/element.js"; import * as Output from "@component/output/indexed-db/element.js"; import * as Queue from "@component/engine/queue/element.js"; -import "@component/orchestrator/process-tracks/element.js"; - import { component } from "@common/element.js"; import { effect } from "@common/signal.js"; @@ -14,25 +15,12 @@ import { effect } from "@common/signal.js"; * @import {Item} from "@component/engine/queue/types.d.ts" */ -const audio = component(Audio); const output = component(Output); const queue = component(Queue); globalThis.output = output; - -// QUEUE +globalThis.queue = queue; effect(() => { - const now = queue.now(); - if (now === null) return; - - audio.supply({ - audio: [ - { - id: now.id, - isPreload: false, - url: now.uri, - }, - ], - }); + console.log("Active queue item:", queue.now()); }); diff --git a/src/theme/blur/index.vto b/src/theme/blur/index.vto index d83493cb..5a6e44b1 100644 --- a/src/theme/blur/index.vto +++ b/src/theme/blur/index.vto @@ -24,10 +24,16 @@ output-selector="do-indexed-db" > + + -- knotmirror 0.0.1