big ass front end cleanup

src/renderer/audio/audio.js

@@ -1,4 +1,4 @@
-var CiderAudio = {
+const CiderAudio = {
     context : null,
     source : null,
     audioNodes : {
@@ -304,7 +304,7 @@ var CiderAudio = {
             CiderAudio.audioNodes.analogWarmth = []
             
             
-            for (i = 0; i < WARMTH_FREQUENCIES.length; i++) {
+            for (let i = 0; i < WARMTH_FREQUENCIES.length; i++) {
                 CiderAudio.audioNodes.analogWarmth[i] = CiderAudio.context.createBiquadFilter();
                 CiderAudio.audioNodes.analogWarmth[i].type = 'peaking'; // 'peaking';
                 CiderAudio.audioNodes.analogWarmth[i].frequency.value = WARMTH_FREQUENCIES[i];
@@ -312,7 +312,7 @@ var CiderAudio = {
                 CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * app.cfg.audio.maikiwiAudio.analogWarmth_value; 
             }
     
-            for (i = 1; i < WARMTH_FREQUENCIES.length; i ++) {
+            for (let i = 1; i < WARMTH_FREQUENCIES.length; i ++) {
                 CiderAudio.audioNodes.analogWarmth[i-1].connect(CiderAudio.audioNodes.analogWarmth[i]);
             }
 
@@ -345,7 +345,7 @@ var CiderAudio = {
             CiderAudio.audioNodes.llpw = []
             
             if (app.cfg.audio.maikiwiAudio.ciderPPE_value === 0.55)  { 
-            for (i = 0; i < c_LLPW_FREQUENCIES.length; i++) {
+            for (let i = 0; i < c_LLPW_FREQUENCIES.length; i++) {
                 CiderAudio.audioNodes.llpw[i] = CiderAudio.context.createBiquadFilter();
                 CiderAudio.audioNodes.llpw[i].type = 'peaking'; // 'peaking';
                 CiderAudio.audioNodes.llpw[i].frequency.value = c_LLPW_FREQUENCIES[i];
@@ -354,7 +354,7 @@ var CiderAudio = {
             }
             
 
-            for (i = 1; i < c_LLPW_FREQUENCIES.length; i ++) {
+            for (let i = 1; i < c_LLPW_FREQUENCIES.length; i ++) {
                 CiderAudio.audioNodes.llpw[i-1].connect(CiderAudio.audioNodes.llpw[i]);
             } 
 
@@ -373,7 +373,7 @@ var CiderAudio = {
         }
 
             else if (app.cfg.audio.maikiwiAudio.ciderPPE_value === 0.5)  { 
-            for (i = 0; i < LLPW_FREQUENCIES.length; i++) {
+            for (let i = 0; i < LLPW_FREQUENCIES.length; i++) {
                 CiderAudio.audioNodes.llpw[i] = CiderAudio.context.createBiquadFilter();
                 CiderAudio.audioNodes.llpw[i].type = 'peaking'; // 'peaking';
                 CiderAudio.audioNodes.llpw[i].frequency.value = LLPW_FREQUENCIES[i];
@@ -382,7 +382,7 @@ var CiderAudio = {
             }
            
 
-            for (i = 1; i < LLPW_FREQUENCIES.length; i ++) {
+            for (let i = 1; i < LLPW_FREQUENCIES.length; i ++) {
                 CiderAudio.audioNodes.llpw[i-1].connect(CiderAudio.audioNodes.llpw[i]);
             } 
 
@@ -408,7 +408,7 @@ var CiderAudio = {
         let VIBRANTBASSQ = app.cfg.audio.maikiwiAudio.vibrantBass.Q;
         CiderAudio.audioNodes.vibrantbassNode = []
         
-        for (i = 0; i < VIBRANTBASSBANDS.length; i++) {
+        for (let i = 0; i < VIBRANTBASSBANDS.length; i++) {
             CiderAudio.audioNodes.vibrantbassNode[i] = CiderAudio.context.createBiquadFilter();
             CiderAudio.audioNodes.vibrantbassNode[i].type = 'peaking'; // 'peaking';
             CiderAudio.audioNodes.vibrantbassNode[i].frequency.value = VIBRANTBASSBANDS[i];
@@ -416,7 +416,7 @@ var CiderAudio = {
             CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * app.cfg.audio.maikiwiAudio.vibrantBass.multiplier;
         }
 
-        for (i = 1; i < VIBRANTBASSBANDS.length; i ++) {
+        for (let i = 1; i < VIBRANTBASSBANDS.length; i ++) {
             CiderAudio.audioNodes.vibrantbassNode[i-1].connect(CiderAudio.audioNodes.vibrantbassNode[i]);
         }
 
@@ -683,7 +683,7 @@ var CiderAudio = {
 
         CiderAudio.audioNodes.audioBands = []; 
 
-        for (i = 0; i < BANDS.length; i++) {
+        for (let i = 0; i < BANDS.length; i++) {
             CiderAudio.audioNodes.audioBands[i] = CiderAudio.context.createBiquadFilter();
             CiderAudio.audioNodes.audioBands[i].type = 'peaking'; // 'peaking';
             CiderAudio.audioNodes.audioBands[i].frequency.value = BANDS[i];
@@ -694,14 +694,11 @@ var CiderAudio = {
         // Dynamic-ish loading
         CiderAudio.hierarchical_loading();
 
-        for (i = 1; i < BANDS.length; i ++) {
+        for (let i = 1; i < BANDS.length; i ++) {
             CiderAudio.audioNodes.audioBands[i-1].connect(CiderAudio.audioNodes.audioBands[i]);
         }
         CiderAudio.audioNodes.audioBands[BANDS.length-1].connect(CiderAudio.context.destination);
     }
 
 }
-if (app.cfg.advanced.AudioContext){
-    CiderAudio.init()
-   
-}
+export {CiderAudio}

src/renderer/main/app.js

@@ -0,0 +1,28 @@
+import { app } from "./vueapp.js"
+import {CiderCache} from './cidercache.js'
+import {CiderFrontAPI} from './ciderfrontapi.js'
+import {simulateGamepad} from './gamepad.js'
+import {CiderAudio} from '../audio/audio.js'
+import {Events} from './events.js'
+import { wsapi } from "./wsapi_interop.js"
+
+
+// Define window objects
+window.app = app
+window.CiderAudio = CiderAudio
+window.CiderCache = CiderCache
+window.CiderFrontAPI = CiderFrontAPI
+window.wsapi = wsapi
+
+// Mount Vue to #app
+app.$mount("#app")
+
+// Init CiderAudio
+if (app.cfg.advanced.AudioContext){
+    CiderAudio.init()
+}
+
+// Import gamepad support
+app.simulateGamepad = simulateGamepad
+
+Events.InitEvents()

src/renderer/main/cidercache.js

@@ -0,0 +1,24 @@
+const CiderCache = {
+    async getCache(file) {
+        let cache = await ipcRenderer.sendSync("get-cache", file)
+        if (isJson(cache)) {
+            cache = JSON.parse(cache)
+            if (Object.keys(cache).length === 0) {
+                cache = false
+            }
+        } else {
+            cache = false
+        }
+        return cache
+    },
+    async putCache(file, data) {
+        console.log(`Caching ${file}`)
+        ipcRenderer.invoke("put-cache", {
+            file: file,
+            data: JSON.stringify(data)
+        })
+        return true
+    }
+}
+
+export {CiderCache}

src/renderer/main/ciderfrontapi.js

@@ -0,0 +1,16 @@
+const CiderFrontAPI = {
+    Objects: {
+        MenuEntry: function () {
+            this.id = ""
+            this.name = ""
+            this.onClick = () => {
+            }
+        }
+    },
+    AddMenuEntry(entry) {
+        app.pluginMenuEntries.push(entry)
+        app.pluginInstalled = true
+    }
+}
+
+export {CiderFrontAPI}

src/renderer/main/events.js

@@ -0,0 +1,74 @@
+const Events = {
+    InitEvents() {
+        const app = window.app
+        // Key binds
+        document.addEventListener('keydown', function (e) {
+            if (e.keyCode === 70 && e.ctrlKey) {
+                app.$refs.searchInput.focus()
+                app.$refs.searchInput.select()
+            }
+        });
+
+// add event listener for when window.location.hash changes
+        window.addEventListener("hashchange", function () {
+            app.appRoute(window.location.hash)
+        });
+
+        // Key bind to unjam MusicKit in case it fails: CTRL+F10
+
+        document.addEventListener('keydown', function (event) {
+            if (event.ctrlKey && event.keyCode == 121) {
+                try {
+                    app.mk._services.mediaItemPlayback._currentPlayer.stop()
+                } catch (e) {
+                }
+                try {
+                    app.mk._services.mediaItemPlayback._currentPlayer.destroy()
+                } catch (e) {
+                }
+            }
+        });
+
+        window.addEventListener("mouseup", (e) => {
+            if (e.button === 3) {
+                e.preventDefault()
+                app.navigateBack()
+            } else if (e.button === 4) {
+                e.preventDefault()
+                app.navigateForward()
+            }
+        });
+
+        document.addEventListener('keydown', function (event) {
+            if (event.ctrlKey && event.keyCode == 122) {
+                try {
+                    ipcRenderer.send('detachDT', '')
+                } catch (e) {
+                }
+            }
+        });
+
+        // Hang Timer
+        app.hangtimer = setTimeout(() => {
+            if (confirm("Cider is not responding. Reload the app?")) {
+                window.location.reload()
+            }
+        }, 10000)
+
+// Refresh Focus
+        function refreshFocus() {
+            if (document.hasFocus() == false) {
+                app.windowFocus(false)
+            } else {
+                app.windowFocus(true)
+            }
+            setTimeout(refreshFocus, 200);
+        }
+
+        app.getHTMLStyle()
+
+        refreshFocus();
+    }
+}
+
+export {Events}

src/renderer/main/gamepad.js

@@ -0,0 +1,326 @@
+function simulateGamepad () {
+    const app = window.app
+    app.chrome.showCursor = true
+    let cursorPos = [0, 0];
+    let intTabIndex = 0
+    const cursorSpeedPvt = 8
+    const cursorSize = 16
+    let scrollSpeed = 8
+    let buttonPressDelay = 500
+    let stickDeadZone = 0.2
+    let scrollGroup = null
+    let scrollGroupY = null
+    let elementFocusEnabled = true
+
+    let cursorSpeed = cursorSpeedPvt
+
+    let lastButtonPress = {
+
+    }
+
+    var sounds = {
+        Confirm: new Audio("./sounds/confirm.ogg"),
+        Menu: new Audio("./sounds/btn1.ogg"),
+        Hover: new Audio("./sounds/hover.ogg")
+    }
+
+    let element = document.elementFromPoint(0, 0)
+    let elementType = 0
+
+    function appLoop() {
+        var gamepads = navigator.getGamepads ? navigator.getGamepads() : (navigator.webkitGetGamepads ? navigator.webkitGetGamepads() : []);
+        if (!gamepads) {
+            return;
+        }
+
+        var gp = gamepads[0];
+
+        //  LEFT STICK
+        if (gp.axes[0] > stickDeadZone) {
+            cursorPos[0] += (gp.axes[0] * cursorSpeed)
+        } else if (gp.axes[0] < -stickDeadZone) {
+            cursorPos[0] += (gp.axes[0] * cursorSpeed)
+        }
+
+        if (gp.axes[1] > stickDeadZone) {
+            cursorPos[1] += (gp.axes[1] * cursorSpeed)
+        } else if (gp.axes[1] < -stickDeadZone) {
+            cursorPos[1] += (gp.axes[1] * cursorSpeed)
+        }
+
+        if (cursorPos[0] < cursorSize) {
+            cursorPos[0] = cursorSize
+        }
+        if (cursorPos[1] < cursorSize) {
+            cursorPos[1] = cursorSize
+        }
+        if (cursorPos[0] > window.innerWidth - cursorSize) {
+            cursorPos[0] = window.innerWidth - cursorSize
+        }
+        if (cursorPos[1] > window.innerHeight - cursorSize) {
+            cursorPos[1] = window.innerHeight - cursorSize
+        }
+
+
+        // RIGHT STICK.
+        if (scrollGroupY) {
+            if (gp.axes[3] > stickDeadZone) {
+                $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
+                elementFocusEnabled = false
+            } else if (gp.axes[3] < -stickDeadZone) {
+                $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
+                elementFocusEnabled = false
+            } else {
+                elementFocusEnabled = true
+            }
+        }
+
+
+
+        if (scrollGroup) {
+            if (gp.axes[2] > stickDeadZone) {
+                $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
+                elementFocusEnabled = false
+            } else if (gp.axes[2] < -stickDeadZone) {
+                $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
+                elementFocusEnabled = false
+            } else {
+                elementFocusEnabled = true
+            }
+        }
+
+
+        $(".cursor").css({
+            top: cursorPos[1] + "px",
+            left: cursorPos[0] + "px",
+            display: "block"
+        })
+
+        // A BUTTON
+        if (gp.buttons[0].pressed) {
+            if (!lastButtonPress["A"]) {
+                lastButtonPress["A"] = 0
+            }
+            if (Date.now() - lastButtonPress["A"] > buttonPressDelay) {
+                lastButtonPress["A"] = Date.now()
+                sounds.Confirm.play()
+                if (elementType == 0) {
+                    document.activeElement.dispatchEvent(new Event("click"))
+                    document.activeElement.dispatchEvent(new Event("controller-click"))
+                } else {
+                    element.dispatchEvent(new Event("click"))
+                    element.dispatchEvent(new Event("controller-click"))
+                }
+            }
+        }
+
+        // B BUTTON
+        if (gp.buttons[1].pressed) {
+
+            if (!lastButtonPress["B"]) {
+                lastButtonPress["B"] = 0
+            }
+            if (Date.now() - lastButtonPress["B"] > buttonPressDelay) {
+                lastButtonPress["B"] = Date.now()
+                if (elementType == 0) {
+                    document.activeElement.dispatchEvent(new Event("contextmenu"))
+                    setTimeout(() => {
+                        if ($(".menu-option").length > 0) {
+                            let bounds = $(".menu-option")[0].getBoundingClientRect()
+                            cursorPos[0] = bounds.left + (bounds.width / 2)
+                            cursorPos[1] = bounds.top + (bounds.height / 2)
+                        }
+                    }, 100)
+                } else {
+                    element.dispatchEvent(new Event("contextmenu"))
+                }
+            }
+
+        }
+
+        // right bumper
+        if (gp.buttons[5].pressed) {
+            if (!lastButtonPress["RB"]) {
+                lastButtonPress["RB"] = 0
+            }
+            if (Date.now() - lastButtonPress["RB"] > buttonPressDelay) {
+                lastButtonPress["RB"] = Date.now()
+                app.navigateForward()
+
+            }
+        }
+
+        // left bumper
+        if (gp.buttons[4].pressed) {
+            if (!lastButtonPress["LB"]) {
+                lastButtonPress["LB"] = 0
+            }
+            if (Date.now() - lastButtonPress["LB"] > buttonPressDelay) {
+                lastButtonPress["LB"] = Date.now()
+                app.navigateBack()
+
+            }
+        }
+
+
+
+        // cursor hover
+        if (elementFocusEnabled) {
+            element = document.elementFromPoint(cursorPos[0], cursorPos[1])
+        }
+
+        if (element) {
+
+            let closest = element.closest("[tabindex], input, button, a")
+
+            // VERT SCROLL
+            let scrollGroupCloY = element.closest(`[scrollaxis="y"]`)
+            if (scrollGroupCloY) {
+                scrollGroupY = scrollGroupCloY
+            }
+
+
+            //  HOZ SCROLL
+            let scrollGroupClo = element.closest(".v-hl-container")
+
+            if (scrollGroupClo) {
+                if (scrollGroupClo.classList.contains("v-hl-container")) {
+                    scrollGroup = scrollGroupClo
+                    scrollGroup.style["scroll-snap-type"] = "unset"
+                } else {
+                    scrollGroup.style["scroll-snap-type"] = ""
+                    scrollGroup = null
+                }
+            }
+
+            if (closest) {
+                elementType = 0
+                closest.focus()
+            } else {
+                if (closest) {
+                    closest.blur()
+                }
+                elementType = 1
+                element.focus()
+            }
+            cursorSpeed = cursorSpeedPvt
+            if (!element.classList.contains("app-chrome")
+                && !element.classList.contains("app-content")) {
+                cursorSpeed = cursorSpeedPvt
+            }
+            // console.log($._data($(element), "events"))
+        } else {
+            cursorSpeed = 12
+        }
+        // console.log(gp.axes[0], gp.axes[1])
+        start = requestAnimationFrame(appLoop);
+    }
+
+// controller pairing
+    notyf.error("Press the button on your controller to pair it to Cider.")
+    window.addEventListener("gamepadconnected", function (e) {
+        console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.",
+            e.gamepad.index, e.gamepad.id,
+            e.gamepad.buttons.length, e.gamepad.axes.length);
+        notyf.success("Pairing successful!")
+        appLoop()
+    }, { once: true });
+
+    document.addEventListener("keydown", (e) => {
+        sounds.Confirm.currentTime = 0
+        sounds.Menu.currentTime = 0
+        sounds.Hover.currentTime = 0
+        let tabbable = $("[tabindex]")
+        console.log(e.key)
+        switch (e.key) {
+            default:
+                break;
+            case "ArrowLeft":
+                e.preventDefault()
+
+                cursorPos[0] -= cursorSpeed
+                break;
+            case "ArrowRight":
+                e.preventDefault()
+
+                cursorPos[0] += cursorSpeed
+                break;
+            case "ArrowUp":
+                e.preventDefault()
+
+                cursorPos[1] -= cursorSpeed
+                // sounds.Hover.play()
+                // if(intTabIndex <= 0) {
+                //     intTabIndex = 0
+                // }else{
+                //     intTabIndex--
+                // }
+                // $(tabbable[intTabIndex]).focus()
+                // $("#app-content").scrollTop($(document.activeElement).offset().top)
+                break;
+            case "ArrowDown":
+                e.preventDefault()
+
+                cursorPos[1] += cursorSpeed
+                // if(intTabIndex < tabbable.length) {
+                //     intTabIndex++
+                // }else{
+                //     intTabIndex = tabbable.length
+                // }
+                // $(tabbable[intTabIndex]).focus()
+                // $("#app-content").scrollTop($(document.activeElement).offset().top)
+                break;
+            case "c":
+                app.resetState()
+                break;
+            case "x":
+                // set cursorPos to the top right of the screen
+                // sounds.Menu.play()
+                if (elementType == 0) {
+                    document.activeElement.dispatchEvent(new Event("contextmenu"))
+                } else {
+                    element.dispatchEvent(new Event("contextmenu"))
+                }
+
+                e.preventDefault()
+                break;
+            case "z":
+                sounds.Confirm.play()
+                if (elementType == 0) {
+                    document.activeElement.dispatchEvent(new Event("click"))
+                    document.activeElement.dispatchEvent(new Event("controller-click"))
+                } else {
+                    element.dispatchEvent(new Event("click"))
+                    element.dispatchEvent(new Event("controller-click"))
+                }
+
+                e.preventDefault()
+                break;
+        }
+
+        $(".cursor").css({
+            top: cursorPos[1] + "px",
+            left: cursorPos[0] + "px"
+        })
+        function lerp(a, b, n) {
+            return (1 - n) * a + n * b
+        }
+
+
+        element = document.elementFromPoint(cursorPos[0], cursorPos[1])
+
+        if (element) {
+            let closest = element.closest("[tabindex], input, button, a")
+            if (closest) {
+                elementType = 0
+                closest.focus()
+            } else {
+                elementType = 1
+                element.focus()
+            }
+        }
+        console.log(element)
+    });
+}
+
+export {simulateGamepad}

src/renderer/main/vuex-store.js

@@ -0,0 +1,20 @@
+const store = new Vuex.Store({
+    state: {
+        library: {
+            // songs: ipcRenderer.sendSync("get-library-songs"),
+            // albums: ipcRenderer.sendSync("get-library-albums"),
+            // recentlyAdded: ipcRenderer.sendSync("get-library-recentlyAdded"),
+            // playlists: ipcRenderer.sendSync("get-library-playlists")
+        },
+        artwork: {
+            playerLCD: ""
+        }
+    },
+    mutations: {
+        setLCDArtwork(state, artwork) {
+            state.artwork.playerLCD = artwork
+        }
+    }
+})
+
+export {store}

src/renderer/main/wsapi_interop.js

@@ -49,13 +49,13 @@ const wsapi = {
     },
     musickitApi(method, id, params, library = false) {
         if (library) {
-        MusicKit.getInstance().api.library[method](id, params).then((results)=>{
-            ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method)
-        })
+            MusicKit.getInstance().api.library[method](id, params).then((results)=>{
+                ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method)
+            })
         } else {
-        MusicKit.getInstance().api[method](id, params).then((results)=>{
-            ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method)
-        }) 
+            MusicKit.getInstance().api[method](id, params).then((results)=>{
+                ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method)
+            })
         }
     },
     getPlaybackState () {
@@ -112,3 +112,5 @@ const wsapi = {
         ipcRenderer.send('wsapi-returnvolumeMax',JSON.stringify(app.cfg.audio.maxVolume));
     }
 }
+
+export {wsapi}

src/renderer/views/main.ejs

@@ -17,24 +17,24 @@
     <title>Cider</title>
     <link rel="stylesheet/less" type="text/css" href="style.less"/>
     <link rel="stylesheet/less" type="text/css" id="userTheme" href="themes/default.less"/>
-    <script src="./js/less.js"></script>
-    <script src="<%- (env.dev ? "./js/vue.js" : "./js/vue.dev.js") %>"></script>
-    <script src="./js/vue-horizontal.js"></script>
-    <script src="./js/smoothscroll.js"></script>
-    <script src="./js/vuex.min.js"></script>
-    <script src="./js/sortable.min.js"></script>
-    <script src="./js/vue-observe-visibility.min.js"></script>
-    <script src="./js/vuedraggable.umd.min.js"></script>
+    <script src="./lib/less.js"></script>
+    <script src="<%- (env.dev ? "./lib/vue.js" : "./lib/vue.dev.js") %>"></script>
+    <script src="./lib/vue-horizontal.js"></script>
+    <script src="./lib/smoothscroll.js"></script>
+    <script src="./lib/vuex.min.js"></script>
+    <script src="./lib/sortable.min.js"></script>
+    <script src="./lib/vue-observe-visibility.min.js"></script>
+    <script src="./lib/vuedraggable.umd.min.js"></script>
     <link rel="manifest" href="./manifest.json?v=2">
     <script src="https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js"></script>
     <script src="hlscider.js"></script>
-    <script src="./js/jquery-3.2.1.slim.min.js"></script>
-    <script src="./js/popper.min.js"></script>
-    <script src="./js/bootstrap.min.js"></script>
-    <script src="./js/bootbox.min.js"></script>
-    <script src="./js/notyf.min.js"></script>
-    <script src="./js/showdown.min.js"></script>
-    <script src="./js/velocity.min.js"></script>
+    <script src="./lib/jquery-3.2.1.slim.min.js"></script>
+    <script src="./lib/popper.min.js"></script>
+    <script src="./lib/bootstrap.min.js"></script>
+    <script src="./lib/bootbox.min.js"></script>
+    <script src="./lib/notyf.min.js"></script>
+    <script src="./lib/showdown.min.js"></script>
+    <script src="./lib/velocity.min.js"></script>
     <style>
         #LOADER {
             position: fixed;
@@ -103,22 +103,21 @@
     </button>
 </script>
 
-<script
-        src="musickit.js?v=1"></script>
+
+<script src="./lib/fast-plural-rules.js"></script>
+
+<script type="module" src="./main/app.js"></script>
+
 <script>
     if (typeof MusicKit == 'undefined') {
         document.write(unescape("%3Cscript src='https://js-cdn.music.apple.com/musickit/v2/amp/musickit.js' type='text/javascript'%3E%3C/script%3E"));
     }
 </script>
-<script src="./js/fast-plural-rules.js"></script>
+
 <script
         src="index.js?v=1"></script>
 <script
-        src="https://cdn.jsdelivr.net/npm/resonance-audio/build/resonance-audio.min.js"></script>
-<script
-        src="/audio/audio.js?v=1"></script>
-<script
-        src="./js/WSAPI_Interop.js"></script>
+        src="./lib/resonance-audio.min.js"></script>
 </body>
 
 </html>