From 670b522675e60b1ebd5b87ed104cfaa3773e9e2c Mon Sep 17 00:00:00 2001
From: wvffle <wvffle@funkwhale.audio>
Date: Tue, 20 Feb 2024 14:31:55 +0000
Subject: [PATCH] refactor: adjust code for lru-cache v10

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2757>
---
 front/src/composables/audio/queue.ts      |  5 ++++-
 front/src/composables/audio/tracks.ts     | 15 ++++++++++-----
 front/src/composables/data/useLRUCache.ts | 11 -----------
 3 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 front/src/composables/data/useLRUCache.ts

diff --git a/front/src/composables/audio/queue.ts b/front/src/composables/audio/queue.ts
index b906612a4..9f4659f9c 100644
--- a/front/src/composables/audio/queue.ts
+++ b/front/src/composables/audio/queue.ts
@@ -101,7 +101,7 @@ export const currentTrack = computed(() => queue.value[currentIndex.value])
 
 // Use Queue
 export const useQueue = createGlobalState(() => {
-  const { currentSound } = useTracks()
+  const { currentSound, clearCache } = useTracks()
 
   const createQueueTrack = async (track: Track, skipFetch = false): Promise<QueueTrack> => {
     const { default: store } = await import('~/store')
@@ -341,6 +341,9 @@ export const useQueue = createGlobalState(() => {
     await delMany(lastTracks)
 
     currentIndex.value = 0
+
+    // Clear track cache
+    clearCache()
   }
 
   // Radio queue populating
diff --git a/front/src/composables/audio/tracks.ts b/front/src/composables/audio/tracks.ts
index 8ea991867..aeffe7020 100644
--- a/front/src/composables/audio/tracks.ts
+++ b/front/src/composables/audio/tracks.ts
@@ -4,13 +4,13 @@ import type { Sound } from '~/api/player'
 
 import { createGlobalState, syncRef, useTimeoutFn, whenever } from '@vueuse/core'
 import { computed, ref, watchEffect } from 'vue'
+import { LRUCache } from 'lru-cache'
 
 import { connectAudioSource } from '~/composables/audio/audio-api'
 import { usePlayer } from '~/composables/audio/player'
 import { useQueue } from '~/composables/audio/queue'
 import { soundImplementation } from '~/api/player'
 
-import useLRUCache from '~/composables/data/useLRUCache'
 import useLogger from '~/composables/useLogger'
 import store from '~/store'
 
@@ -22,11 +22,13 @@ const AUDIO_ELEMENT = document.createElement('audio')
 const logger = useLogger()
 
 const soundPromises = new Map<number, Promise<Sound>>()
-const soundCache = useLRUCache<number, Sound>({
+const soundCache = new LRUCache<number, Sound>({
   max: 3,
   dispose: (sound) => sound.dispose()
 })
 
+const currentTrack = ref<QueueTrack>()
+
 export const fetchTrackSources = async (id: number): Promise<QueueTrackSource[]> => {
   const { uploads } = await axios.get(`tracks/${id}/`)
     .then(response => response.data as Track, () => ({ uploads: [] as Upload[] }))
@@ -130,7 +132,7 @@ export const useTracks = createGlobalState(() => {
       //
       //       This means that the currently playing track (B) is never removed from the cache (and isn't disposed prematurely) during its playback.
       //       However, we end up in a situation where previous track isn't cached anymore but two next tracks are.
-      //       That implies that when user changes to the previous track ( onlybefore track B ends), a new sound instance would be created,
+      //       That implies that when user changes to the previous track (only before track B ends), a new sound instance would be created,
       //       which means that there might be some network requests before playback.
       if (currentTrack.value) {
         soundCache.get(currentTrack.value.id)
@@ -195,8 +197,6 @@ export const useTracks = createGlobalState(() => {
     }
   }
 
-  const currentTrack = ref<QueueTrack>()
-
   // NOTE: We want to have it called only once, hence we're using createGlobalState
   const initialize = createGlobalState(() => {
     const { currentIndex, currentTrack: track, queue, hasNext } = useQueue()
@@ -226,10 +226,15 @@ export const useTracks = createGlobalState(() => {
 
   const currentSound = computed(() => soundCache.get(currentTrack.value?.id ?? -1))
 
+  const clearCache = () => {
+    return soundCache.clear()
+  }
+
   return {
     initialize,
     createSound,
     createTrack,
+    clearCache,
     currentSound
   }
 })
diff --git a/front/src/composables/data/useLRUCache.ts b/front/src/composables/data/useLRUCache.ts
deleted file mode 100644
index 14c4de962..000000000
--- a/front/src/composables/data/useLRUCache.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import LRU from 'lru-cache'
-import { reactive } from 'vue'
-
-export default <T, K>(options: LRU.Options<T, K>) => {
-  const cache = new LRU(options)
-
-  // @ts-expect-error keyMap is used internally so it is not defined in the types
-  cache.keyMap = reactive(cache.keyMap)
-
-  return cache
-}