From 590516e7914a7c8012b3bdd1908cc0b239671955 Mon Sep 17 00:00:00 2001
From: Littletsu <38116582+littletsu@users.noreply.github.com>
Date: Mon, 12 Aug 2024 05:42:02 -0600
Subject: [PATCH] Fix sticky notes

---
 src/App.vue                     | 10 +++++-----
 src/components/InstrumentUI.vue | 32 +++++++++++++++++---------------
 src/lib/net/PotatoClient.ts     |  2 +-
 src/lib/net/PotatoServer.ts     |  2 +-
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e8a91d5..6539a5c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 
 // imports
-import {reactive, ref} from "vue";
+import {ref} from "vue";
 
 // component imports
 import UIContainer from "./components/ui/UIContainer.vue";
@@ -13,7 +13,7 @@ import SoundHandler, { NoteEventPayload } from "./lib/SoundHandler";
 
 // refs
 const started = ref<boolean>(false)
-const sound_events = reactive<NoteEventPayload[]>([])
+// const sound_events = reactive<NoteEventPayload[]>([])
 const InstrumentUI_ref = ref<InstanceType<typeof InstrumentUI>>();
 const NetHandler_ref = ref<InstanceType<typeof NetHandler>>();
 
@@ -21,8 +21,8 @@ const NetHandler_ref = ref<InstanceType<typeof NetHandler>>();
 // functions
 function push_payload(payload: NoteEventPayload) {
   console.log(`received event: ${payload.event} - ${payload.note}`);
-  sound_events.push({event: payload.event, note: payload.note})
-  InstrumentUI_ref.value?.process_sound_events()
+  // sound_events.push(payload)
+  InstrumentUI_ref.value?.process_sound_events(payload)
 }
 
 // This one must only be called when the user produces the input, not any remote
@@ -58,9 +58,9 @@ async function initSoundHandler() {
     </UIContainer>
 
     <UIContainer :title="'instrument'">
+      <!-- v-model="sound_events"  -->
       <InstrumentUI
           ref="InstrumentUI_ref"
-          v-model="sound_events"
           @sound_handler_initialized="started = true"
       />
     </UIContainer>
diff --git a/src/components/InstrumentUI.vue b/src/components/InstrumentUI.vue
index 8402feb..82804a8 100644
--- a/src/components/InstrumentUI.vue
+++ b/src/components/InstrumentUI.vue
@@ -4,7 +4,7 @@ import InstrumentSwitcher from "./InstrumentSwitcher.vue";
 import SoundHandler, { NoteEventPayload } from "../lib/SoundHandler.ts";
 import {onMounted, ref } from "vue";
 
-let sound_events = defineModel<NoteEventPayload[]>()
+// let sound_events = defineModel<NoteEventPayload[]>()
 
 let soundHandler: SoundHandler;
 let instrument_selected: string = "meow"
@@ -19,20 +19,22 @@ defineExpose({
   process_sound_events
 })
 
-async function process_sound_events() {
-  let new_sound_events = sound_events.value
-  if(new_sound_events === undefined) return;
-  try {
-    let promises = []
-    for (const note_event of new_sound_events) {
-      promises.push(soundHandler.play(note_event.event, note_event.note, instrument_selected))
-      sound_events.value?.shift()
-    }
-    await Promise.allSettled(promises);
-  } catch (e) {
-    console.log('HELLO!')
-    console.error(e)
-  }
+async function process_sound_events(note_event: NoteEventPayload) {
+  // let new_sound_events = sound_events.value
+  // console.log(new_sound_events)
+  // if(new_sound_events === undefined) return;
+  // try {
+  //   let promises = []
+  //   for (const note_event of new_sound_events) {
+  //     promises.push()
+  //     sound_events.value?.shift()
+  //   }
+  //   await Promise.allSettled(promises);
+  // } catch (e) {
+  //   console.log('HELLO!')
+  //   console.error(e)
+  // }
+  soundHandler.play(note_event.event, note_event.note, instrument_selected)
 }
 
 async function read_file(files: any) {
diff --git a/src/lib/net/PotatoClient.ts b/src/lib/net/PotatoClient.ts
index d7a9875..1ff78d2 100644
--- a/src/lib/net/PotatoClient.ts
+++ b/src/lib/net/PotatoClient.ts
@@ -98,7 +98,7 @@ export class PotatoClientProcessing extends EventEmitter<PotatoClientEvents> {
             console.warn(`Got ${data} from server ${this.serverId}!`)
             return;
         }
-        console.log(data)
+        console.log("client got", data)
         if(typeof(data) !== "object") {
             console.warn(`Received unknown data type from server ${this.serverId}! Expected "object" got "${typeof(data)}"`)
             return;
diff --git a/src/lib/net/PotatoServer.ts b/src/lib/net/PotatoServer.ts
index 4df3a1e..01d2669 100644
--- a/src/lib/net/PotatoServer.ts
+++ b/src/lib/net/PotatoServer.ts
@@ -170,7 +170,7 @@ export default class PotatoServer {
             console.warn(`Got ${data} from ${id}!`)
             return;
         }
-        console.log(data)
+        console.log("server got", data)
         if(typeof(data) !== "object") {
             console.warn(`Received unknown data type from ${id}! Expected "object" got "${typeof(data)}"`)
             return;