From 79a62b5e2f0cee2e503ac7eb60a31e4e2e12f360 Mon Sep 17 00:00:00 2001 From: Brandon Plank <52553007+BrandonPlank@users.noreply.github.com> Date: Sun, 5 Dec 2021 14:03:41 -0500 Subject: [PATCH 1/5] Use API --- .gitignore | 1 + index.js | 3 ++- resources/cider-ui-tests/index.js | 32 +++++++++++++------------------ resources/functions/cider-base.js | 14 ++++++++++++++ 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 0c735597..1850e4a1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ package-lock.json .DS_Store yarn-error.log .yarnclean +auth.json diff --git a/index.js b/index.js index 4c821223..07e3bf6d 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,6 @@ require('v8-compile-cache'); const {app} = require('electron'); +const {BrowserWindow} = require("electron-acrylic-window"); // Creating the Application Window and Calling all the Functions function CreateWindow() { @@ -19,7 +20,7 @@ function CreateWindow() { app.on('ready', () => { if (app.isQuiting) { app.quit(); return; } - + console.log('[Cider] Application is Ready. Creating Window.') CreateWindow() }); diff --git a/resources/cider-ui-tests/index.js b/resources/cider-ui-tests/index.js index 4332fdc4..f4ee74ea 100644 --- a/resources/cider-ui-tests/index.js +++ b/resources/cider-ui-tests/index.js @@ -779,26 +779,20 @@ const app = new Vue({ document.addEventListener('musickitloaded', function () { // MusicKit global is now defined - fetch("https://beta.music.apple.com/", {mode: "no-cors"}) - .then(response => response.text()) - .then(data => { - var el = document.createElement("html"); - el.innerHTML = data; - var u = el.querySelector(`[name="desktop-music-app/config/environment"]`) - var amwebCFG = JSON.parse(decodeURIComponent(u.getAttribute("content"))); - console.log(amwebCFG.MEDIA_API.token) - MusicKit.configure({ - developerToken: amwebCFG.MEDIA_API.token, - app: { - name: 'My Cool Web App', - build: '1978.4.1' - } - }); - setTimeout(() => { - app.init() - }, 1000) + console.log("Loading musickit") + ipcRenderer.on('devkey', (event, key) => { + console.log(key); + MusicKit.configure({ + developerToken: key, + app: { + name: 'My Cool Web App', + build: '1978.4.1' + } }); - + setTimeout(() => { + app.init() + }, 1000) + }) }); function xmlToJson(xml) { diff --git a/resources/functions/cider-base.js b/resources/functions/cider-base.js index 0bfd2573..1b59a6de 100644 --- a/resources/functions/cider-base.js +++ b/resources/functions/cider-base.js @@ -4,6 +4,8 @@ const getPort = require("get-port"); const express = require("express"); const path = require("path"); const windowStateKeeper = require("electron-window-state"); +const request = require('request'); +const authFile = require("../auth.json"); const CiderBase = { @@ -106,6 +108,18 @@ const CiderBase = { }) } + win.webContents.on('did-finish-load', () => { + let authFile = require("../auth.json") + request({url: "https://devkey.cider.sh/", + headers: { + "Authorization": "Bearer "+authFile.authHeader + } + }, function (error, response, body) { + if (error) return console.log(error); + let parsedJson = JSON.parse(body) + win.webContents.send("devkey", parsedJson.Key) + }) + }) return win }, async InitWebServer() { From 008835b3723113f92196ad82c90585d4664345a8 Mon Sep 17 00:00:00 2001 From: Brandon Plank <52553007+BrandonPlank@users.noreply.github.com> Date: Sun, 5 Dec 2021 15:17:08 -0500 Subject: [PATCH 2/5] Remove unnecessary logging from testing --- resources/cider-ui-tests/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/cider-ui-tests/index.js b/resources/cider-ui-tests/index.js index f4ee74ea..961d08cd 100644 --- a/resources/cider-ui-tests/index.js +++ b/resources/cider-ui-tests/index.js @@ -779,9 +779,7 @@ const app = new Vue({ document.addEventListener('musickitloaded', function () { // MusicKit global is now defined - console.log("Loading musickit") ipcRenderer.on('devkey', (event, key) => { - console.log(key); MusicKit.configure({ developerToken: key, app: { From a7d1ce006963b45e39ee59d48ffb0a921c118f3e Mon Sep 17 00:00:00 2001 From: Brandon Plank <52553007+BrandonPlank@users.noreply.github.com> Date: Sun, 5 Dec 2021 15:19:33 -0500 Subject: [PATCH 3/5] Update index.js --- index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/index.js b/index.js index 07e3bf6d..feb9e087 100644 --- a/index.js +++ b/index.js @@ -1,11 +1,9 @@ require('v8-compile-cache'); const {app} = require('electron'); -const {BrowserWindow} = require("electron-acrylic-window"); // Creating the Application Window and Calling all the Functions function CreateWindow() { if (app.isQuiting) { app.quit(); return; } - /** CIDER **/ const ciderwin = require("./resources/functions/cider-base") app.win = ciderwin @@ -20,7 +18,6 @@ function CreateWindow() { app.on('ready', () => { if (app.isQuiting) { app.quit(); return; } - console.log('[Cider] Application is Ready. Creating Window.') CreateWindow() }); From 56defb0e5bd3dd45f9d0ec4e3b8aa5f0a4dc79c6 Mon Sep 17 00:00:00 2001 From: Brandon Plank <52553007+BrandonPlank@users.noreply.github.com> Date: Mon, 6 Dec 2021 17:27:56 -0500 Subject: [PATCH 4/5] Completely fix api calls Fix web browser api call --- resources/cider-ui-tests/index.html | 2 +- resources/cider-ui-tests/index.js | 11 ++++++++--- resources/functions/cider-base.js | 13 ------------- resources/preload/cider-preload.js | 3 ++- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/resources/cider-ui-tests/index.html b/resources/cider-ui-tests/index.html index 445ad7ea..03f6f495 100644 --- a/resources/cider-ui-tests/index.html +++ b/resources/cider-ui-tests/index.html @@ -1,5 +1,5 @@ - + diff --git a/resources/cider-ui-tests/index.js b/resources/cider-ui-tests/index.js index 961d08cd..b0db084c 100644 --- a/resources/cider-ui-tests/index.js +++ b/resources/cider-ui-tests/index.js @@ -779,9 +779,10 @@ const app = new Vue({ document.addEventListener('musickitloaded', function () { // MusicKit global is now defined - ipcRenderer.on('devkey', (event, key) => { + function initMusicKit () { + let parsedJson = JSON.parse(this.responseText) MusicKit.configure({ - developerToken: key, + developerToken: parsedJson.Key, app: { name: 'My Cool Web App', build: '1978.4.1' @@ -790,7 +791,11 @@ document.addEventListener('musickitloaded', function () { setTimeout(() => { app.init() }, 1000) - }) + } + const request = new XMLHttpRequest(); + request.addEventListener("load", initMusicKit); + request.open("GET", "https://devkey.cider.sh/"); + request.send(); }); function xmlToJson(xml) { diff --git a/resources/functions/cider-base.js b/resources/functions/cider-base.js index 1b59a6de..334c5366 100644 --- a/resources/functions/cider-base.js +++ b/resources/functions/cider-base.js @@ -107,19 +107,6 @@ const CiderBase = { } }) } - - win.webContents.on('did-finish-load', () => { - let authFile = require("../auth.json") - request({url: "https://devkey.cider.sh/", - headers: { - "Authorization": "Bearer "+authFile.authHeader - } - }, function (error, response, body) { - if (error) return console.log(error); - let parsedJson = JSON.parse(body) - win.webContents.send("devkey", parsedJson.Key) - }) - }) return win }, async InitWebServer() { diff --git a/resources/preload/cider-preload.js b/resources/preload/cider-preload.js index 0c1240f1..b8089fc4 100644 --- a/resources/preload/cider-preload.js +++ b/resources/preload/cider-preload.js @@ -1,7 +1,8 @@ const electron = require('electron') -console.log('preload is in baby') +console.log('Loaded Preload') process.once('loaded', () => { + console.log("Setting ipcRenderer") global.ipcRenderer = electron.ipcRenderer; }); \ No newline at end of file From bf0edb98f709db455b3081180571c6e99bbce256 Mon Sep 17 00:00:00 2001 From: Brandon Plank <52553007+BrandonPlank@users.noreply.github.com> Date: Mon, 6 Dec 2021 20:14:48 -0500 Subject: [PATCH 5/5] oh nose --- resources/cider-ui-tests/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/cider-ui-tests/index.html b/resources/cider-ui-tests/index.html index 4edb071d..8b56cf83 100644 --- a/resources/cider-ui-tests/index.html +++ b/resources/cider-ui-tests/index.html @@ -1,5 +1,5 @@ - +