feat: improve song change and error handling

miksuh-dev · Nov 16, 2022 · 5d109a6 · 5d109a6
1 parent 8e2162f
commit 5d109a6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/server/common/playlist/internal.ts b/server/common/playlist/internal.ts
@@ -15,19 +15,17 @@ let playing: PlayingSong | undefined;
 let stream: Readable | undefined;
 let endTimeout: NodeJS.Timeout | undefined;
 
-export const onSongEnd = async () => {
-  if (!playing) return;
-
+export const onSongEnd = async (song: Song) => {
   await prisma.song.update({
     where: {
-      id: playing.id,
+      id: song.id,
     },
     data: {
       ended: true,
     },
   });
 
-  sendMessage(`Kappale ${playing.title} päättyi.`);
+  sendMessage(`Kappale ${song.title} päättyi.`);
 
   stopCurrentSong();
 
@@ -44,16 +42,21 @@ const onPlayError = (song: Song, error: string) => {
   );
 
   setTimeout(() => {
-    if (playing?.id === song.id) {
-      onSongEnd().catch((e) => console.log("e", e));
+    if (playing?.id === song.id || !playing) {
+      onSongEnd(song).catch((e) => {
+        if (e instanceof Error) {
+          onPlayError(song, `Virhe kappaleen päättämisessä: ${e.message}`);
+        }
+        console.log("e", e);
+      });
     }
   }, 5000);
 };
 
 export const playSong = async (song: Song) => {
   const videoInfo = await getVideoInfo(song);
   if (!videoInfo) {
-    onPlayError(song, "Ei videoinfoa");
+    onPlayError(song, "Videon tiedot eivät ole saatavilla");
     return;
   }
 
@@ -82,7 +85,12 @@ export const playSong = async (song: Song) => {
     .diffNow("seconds").seconds;
 
   endTimeout = setTimeout(() => {
-    onSongEnd().catch((e) => console.log("e", e));
+    onSongEnd(song).catch((e) => {
+      if (e instanceof Error) {
+        onPlayError(song, `Virhe kappaleen päättämisessä: ${e.message}`);
+      }
+      console.log("e", e);
+    });
   }, secondsLeft * 1000);
 
   stream = createStream(song);

diff --git a/server/common/playlist/user.ts b/server/common/playlist/user.ts
@@ -69,29 +69,20 @@ export const removeSong = async (id: number, user: MumbleUser) => {
     },
   });
 
-  if (!getCurrentSong()) {
-    const nextSong = await getNextSong();
-    if (nextSong) {
-      await playSong(nextSong);
-    }
-  }
-
   if (song.id === getCurrentSong()?.id) {
     sendMessage(`${user.name} ohitti kappaleen "${song.title}"`);
-
     stopCurrentSong();
+  } else {
+    sendMessage(`${user.name} poisti "${song.title}" kappaleen jonosta`);
+    ee.emit(`onUpdate`, { song: { remove: song.id } });
+  }
 
+  if (!getCurrentSong()) {
     const nextSong = await getNextSong();
     if (nextSong) {
       await playSong(nextSong);
     }
-
-    return song;
   }
 
-  ee.emit(`onUpdate`, { song: { remove: song.id } });
-
-  sendMessage(`${user.name} poisti "${song.title}" kappaleen jonosta`);
-
   return song;
 };