From 9ac4d4f57b4e2a7826364a617f107f0a41d6166b Mon Sep 17 00:00:00 2001
From: Steven Vandevelde <steven@tokono.ma>
Date: Sat, 21 Jun 2025 17:31:14 +0200
Subject: [PATCH] refactor: queue

---
 src/pages/engine/audio/_applet.astro       |  8 ++--
 src/pages/engine/queue/_applet.astro       | 47 +++++++--------------
 src/pages/engine/queue/types.d.ts          |  8 +---
 src/pages/input/opensubsonic/_applet.astro |  5 +--
 src/scripts/engine/queue/types.d.ts        |  7 ++++
 src/scripts/engine/queue/worker.ts         | 49 ++++++++++++++++++++++
 6 files changed, 78 insertions(+), 46 deletions(-)
 create mode 100644 src/scripts/engine/queue/types.d.ts
 create mode 100644 src/scripts/engine/queue/worker.ts

diff --git a/src/pages/engine/audio/_applet.astro b/src/pages/engine/audio/_applet.astro
index 588dd33..ce49e5f 100644
--- a/src/pages/engine/audio/_applet.astro
+++ b/src/pages/engine/audio/_applet.astro
@@ -53,9 +53,11 @@
   context.scope.ondata = (event: any) => setDefaultVolume(event.data.volume.default);
 
   effect(() => {
-    const volume = defaultVolume();
-    if (volume === undefined) return;
-    localStorage.setItem(VOLUME_KEY, volume.toString());
+    if (context.isMainInstance()) {
+      const volume = defaultVolume();
+      if (volume === undefined) return;
+      localStorage.setItem(VOLUME_KEY, volume.toString());
+    }
   });
 
   ////////////////////////////////////////////
diff --git a/src/pages/engine/queue/_applet.astro b/src/pages/engine/queue/_applet.astro
index 54fda9d..0dc43da 100644
--- a/src/pages/engine/queue/_applet.astro
+++ b/src/pages/engine/queue/_applet.astro
@@ -1,12 +1,19 @@
 <script>
+  import type { Actions } from "@scripts/engine/queue/worker";
   import type { Track } from "@applets/core/types";
   import type { State } from "./types.d.ts";
 
   import { register } from "@scripts/applet/common";
+  import { endpoint } from "@scripts/common";
 
   ////////////////////////////////////////////
   // SETUP
   ////////////////////////////////////////////
+  const worker = endpoint<Actions>(
+    new Worker("../../../scripts/engine/queue/worker", { type: "module" }),
+  );
+
+  // Register applet
   const context = register<State>();
 
   // Initial state
@@ -16,11 +23,6 @@
     future: [],
   };
 
-  // State helpers
-  function update(partial: Partial<State>): void {
-    context.data = { ...context.data, ...partial };
-  }
-
   ////////////////////////////////////////////
   // ACTIONS
   ////////////////////////////////////////////
@@ -29,38 +31,19 @@
   context.setActionHandler("shift", shift);
   context.setActionHandler("unshift", unshift);
 
-  function add(items: Track[]) {
-    update({ future: [...context.data.future, ...items] });
+  async function add(items: Track[]) {
+    context.data = await worker.call.add(context.data, items);
   }
 
-  // TODO: Shuffle, limit track amount, etc.
-  function fill(availableItems: Track[]) {
-    add(availableItems);
-
-    // Automatically insert track if there isn't any
-    if (!context.data.now) shift();
+  async function fill(availableItems: Track[]) {
+    context.data = await worker.call.fill(context.data, availableItems);
   }
 
-  function shift() {
-    const now = context.data.future[0] || null;
-    const future = context.data.future.slice(1);
-    const past = context.data.now ? [...context.data.past, context.data.now] : context.data.past;
-
-    update({ past, now, future });
-
-    return now;
+  async function shift() {
+    context.data = await worker.call.shift(context.data);
   }
 
-  function unshift() {
-    if (context.data.past.length === 0) return;
-
-    const past = [...context.data.past];
-    const [last] = past.splice(past.length - 1, 1);
-    const now = last ?? null;
-    const future = context.data.now
-      ? [context.data.now, ...context.data.future]
-      : context.data.future;
-
-    update({ past, now, future });
+  async function unshift() {
+    context.data = await worker.call.unshift(context.data);
   }
 </script>
diff --git a/src/pages/engine/queue/types.d.ts b/src/pages/engine/queue/types.d.ts
index 4795771..fddaddd 100644
--- a/src/pages/engine/queue/types.d.ts
+++ b/src/pages/engine/queue/types.d.ts
@@ -1,7 +1 @@
-import type { Track } from "@applets/core/types";
-
-export interface State<Stats = TrackStats, Tags = TrackTags> {
-  past: Track<Stats, Tags>[];
-  now: Track<Stats, Tags> | null;
-  future: Track<Stats, Tags>[];
-}
+export * from "@scripts/engine/queue/types.d.ts";
diff --git a/src/pages/input/opensubsonic/_applet.astro b/src/pages/input/opensubsonic/_applet.astro
index 3f2ccea..53b2c41 100644
--- a/src/pages/input/opensubsonic/_applet.astro
+++ b/src/pages/input/opensubsonic/_applet.astro
@@ -27,10 +27,7 @@
   // SETUP
   ////////////////////////////////////////////
   const worker = endpoint<Actions>(
-    new Worker("../../../scripts/input/opensubsonic/worker", {
-      type: "module",
-    }),
-    self as any,
+    new Worker("../../../scripts/input/opensubsonic/worker", { type: "module" }),
   );
 
   // Register applet
diff --git a/src/scripts/engine/queue/types.d.ts b/src/scripts/engine/queue/types.d.ts
new file mode 100644
index 0000000..4795771
--- /dev/null
+++ b/src/scripts/engine/queue/types.d.ts
@@ -0,0 +1,7 @@
+import type { Track } from "@applets/core/types";
+
+export interface State<Stats = TrackStats, Tags = TrackTags> {
+  past: Track<Stats, Tags>[];
+  now: Track<Stats, Tags> | null;
+  future: Track<Stats, Tags>[];
+}
diff --git a/src/scripts/engine/queue/worker.ts b/src/scripts/engine/queue/worker.ts
new file mode 100644
index 0000000..517b409
--- /dev/null
+++ b/src/scripts/engine/queue/worker.ts
@@ -0,0 +1,49 @@
+import type { Track } from "@applets/core/types.js";
+import { expose } from "../../../scripts/common.ts";
+import type { State } from "./types";
+
+////////////////////////////////////////////
+// ACTIONS
+////////////////////////////////////////////
+const actions = expose({
+  add,
+  fill,
+  shift,
+  unshift,
+});
+
+export type Actions = typeof actions;
+
+// Actions
+
+function add(state: State, items: Track[]): State {
+  return { ...state, future: [...state.future, ...items] };
+}
+
+// TODO: Shuffle, limit track amount, etc.
+function fill(state: State, availableItems: Track[]): State {
+  state = add(state, availableItems);
+
+  // Automatically insert track if there isn't any
+  if (!state.now) return shift(state);
+  return state;
+}
+
+function shift(state: State): State {
+  const now = state.future[0] || null;
+  const future = state.future.slice(1);
+  const past = state.now ? [...state.past, state.now] : state.past;
+
+  return { past, now, future };
+}
+
+function unshift(state: State): State {
+  if (state.past.length === 0) return state;
+
+  const past = [...state.past];
+  const [last] = past.splice(past.length - 1, 1);
+  const now = last ?? null;
+  const future = state.now ? [state.now, ...state.future] : state.future;
+
+  return { past, now, future };
+}
-- 
knotmirror 0.0.1