From a8190836b90681892cb4f06239b25169b7fe3e34 Mon Sep 17 00:00:00 2001 From: rlaphoenix Date: Sun, 17 Jul 2022 16:50:11 +0100 Subject: [PATCH] Remove dead fallback token, add error log if capi call fails (#1289) I tested and the fallback key you are using is dead. 401s. Unusable. --- src/renderer/index.js | 45 ++++++------------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index a9aaf86b..b9a7de0e 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -56,37 +56,6 @@ Vue.component("animated-number", { }, }); -function fallbackinitMusicKit() { - const request = new XMLHttpRequest(); - - function loadAlternateKey() { - let parsedJson = JSON.parse(this.responseText); - MusicKit.configure({ - developerToken: parsedJson.developerToken, - app: { - name: "Apple Music", - build: "1978.4.1", - version: "1.0", - }, - sourceType: 24, - suppressErrorDialog: true, - }); - setTimeout(() => { - app.init(); - if (app.cfg.visual.window_background_style == "mica" && !app.isDev) { - app.spawnMica(); - } - }, 1000); - } - - request.addEventListener("load", loadAlternateKey); - request.open( - "GET", - "https://raw.githubusercontent.com/lujjjh/LitoMusic/main/token.json" - ); - request.send(); -} - function initMusicKit() { if(!this.responseText) { console.log("Using stored token") @@ -125,14 +94,12 @@ function capiInit() { request.timeout = 5000; request.addEventListener("load", initMusicKit); request.onreadystatechange = function (aEvt) { - if (request.readyState == 4) { - if (request.status != 200) { - if(localStorage.getItem("lastToken") != null) { - initMusicKit() - }else{ - fallbackinitMusicKit() - } - }; + if (request.readyState == 4 && request.status != 200) { + if(localStorage.getItem("lastToken") != null) { + initMusicKit() + } else { + console.error(`Failed to load capi, cannot get token [${request.status}]`) + } } }; request.open("GET", "https://api.cider.sh/v1/");