From f76fee2b6e24dadf337ebd7a5af424cbca51ad14 Mon Sep 17 00:00:00 2001
From: Steven Vandevelde <steven@tokono.ma>
Date: Mon, 21 Apr 2025 15:52:59 +0200
Subject: [PATCH] =?UTF-8?q?refactor:=20orchestrator/storage=20=E2=86=92=20?=
 =?UTF-8?q?storage/output/memory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/applets/orchestrator/queue/applet.astro    | 14 ++++++++------
 .../output/memory}/applet.astro                |  4 ++--
 .../output/memory}/manifest.json               |  0
 src/pages/index.astro                          | 17 +++++++++++++----
 src/scripts/themes/pilot/index.ts              | 18 ++++++++++++++----
 5 files changed, 37 insertions(+), 16 deletions(-)
 rename src/applets/{orchestrator/storage => storage/output/memory}/applet.astro (91%)
 rename src/applets/{orchestrator/storage => storage/output/memory}/manifest.json (100%)

diff --git a/src/applets/orchestrator/queue/applet.astro b/src/applets/orchestrator/queue/applet.astro
index 6214330..6666eaf 100644
--- a/src/applets/orchestrator/queue/applet.astro
+++ b/src/applets/orchestrator/queue/applet.astro
@@ -19,8 +19,10 @@
     queue: await applet<QueueEngine.State>("../../engine/queue", { context: self.parent }),
   };
 
-  const orchestrator = {
-    storage: await applet<Output>("../../orchestrator/storage", { context: self.parent }),
+  const storage = {
+    output: {
+      memory: await applet<Output>("../../storage/output/memory", { context: self.parent }),
+    },
   };
 
   ////////////////////////////////////////////
@@ -33,7 +35,7 @@
     //       into a usable audio URL.
     engine.queue.sendAction(
       "add",
-      orchestrator.storage.data.tracks.map((track: Track) => {
+      storage.output.memory.data.tracks.map((track: Track) => {
         return {
           expiresAt: Infinity,
           id: track.id,
@@ -97,11 +99,11 @@
   );
 
   ////////////////////////////////////////////
-  // 📦 [Connections → Storages]
-  // 🧠 MEMORY
+  // ⚙️ [Connections → Engines]
+  // 📦 Storage
   ////////////////////////////////////////////
   reactive(
-    orchestrator.storage,
+    storage.output.memory,
     (data) => comparable(data.tracks),
     () => fill(),
   );
diff --git a/src/applets/orchestrator/storage/applet.astro b/src/applets/storage/output/memory/applet.astro
similarity index 91%
rename from src/applets/orchestrator/storage/applet.astro
rename to src/applets/storage/output/memory/applet.astro
index 1fcf38f..8d734c4 100644
--- a/src/applets/orchestrator/storage/applet.astro
+++ b/src/applets/storage/output/memory/applet.astro
@@ -1,8 +1,8 @@
 <script>
   import { applets } from "@web-applets/sdk";
 
-  import type { Output, Track } from "../../core/types.d.ts";
-  import { applet, reactive } from "../../../scripts/theme";
+  import type { Output, Track } from "../../../core/types.d.ts";
+  import { applet, reactive } from "../../../../scripts/theme";
 
   ////////////////////////////////////////////
   // SETUP
diff --git a/src/applets/orchestrator/storage/manifest.json b/src/applets/storage/output/memory/manifest.json
similarity index 100%
rename from src/applets/orchestrator/storage/manifest.json
rename to src/applets/storage/output/memory/manifest.json
diff --git a/src/pages/index.astro b/src/pages/index.astro
index dd0459a..f401a66 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -9,10 +9,9 @@ const engines = [
   { url: "engine/queue/", title: "Queue" },
 ];
 
-const orchestrators = [
-  { url: "orchestrator/queue/", title: "Queue" },
-  { url: "orchestrator/storage/", title: "Storage" },
-];
+const orchestrators = [{ url: "orchestrator/queue/", title: "Queue" }];
+
+const storages = [{ url: "storage/output/memory/", title: "Output / Memory" }];
 
 const themes = [{ url: "themes/pilot/", title: "Pilot" }];
 ---
@@ -101,6 +100,16 @@ const themes = [{ url: "themes/pilot/", title: "Pilot" }];
         >
       </p>
 
+      <ul>
+        {
+          storages.map((item: any) => (
+            <li>
+              <a href={item.url}>{item.title}</a>
+            </li>
+          ))
+        }
+      </ul>
+
       <h3>Processors</h3>
 
       <p>
diff --git a/src/scripts/themes/pilot/index.ts b/src/scripts/themes/pilot/index.ts
index c68fe98..b382836 100644
--- a/src/scripts/themes/pilot/index.ts
+++ b/src/scripts/themes/pilot/index.ts
@@ -22,7 +22,12 @@ const engine = {
 
 const orchestrator = {
   queue: await applet("../../orchestrator/queue"),
-  storage: await applet<Output>("../../orchestrator/storage"),
+};
+
+const storage = {
+  output: {
+    memory: await applet<Output>("../../storage/output/memory"),
+  },
 };
 
 const ui = {
@@ -59,8 +64,8 @@ reactive(
 );
 
 ////////////////////////////////////////////
-// 📦 [Connections → Storages]
-// 🧠 MEMORY
+// 📦 [Connections → Storages/Output]
+// 🧠 Memory
 ////////////////////////////////////////////
 
 // Track changes to in-memory user data,
@@ -69,7 +74,7 @@ reactive(
 //       Move to orchestrator?
 
 reactive(
-  orchestrator.storage,
+  storage.output.memory,
   (data) => comparable(data),
   (data) => {
     // TODO: Store locally
@@ -84,6 +89,11 @@ reactive(
 );
 
 // NOTE: How do we sync new remote data with our local/in-memory data?
+//
+// orchestrator.storage.data = {
+//   sources: [],
+//   tracks: []
+// }
 
 ////////////////////////////////////////////
 // 🌅 [Connections → UI]
-- 
2.51.2