From cebe6a8242873da57c4a9a12d74e80c568103cc0 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 24 Dec 2021 01:48:08 -0800
Subject: [PATCH] some backend changes

---
 index.js                  |  2 +-
 src/main/cider-base.js    | 22 ++++++++++++++++------
 src/renderer/index.js     |  4 ++--
 src/web-remote/index.html |  1 +
 4 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 src/web-remote/index.html

diff --git a/index.js b/index.js
index cbb03925..d8991683 100644
--- a/index.js
+++ b/index.js
@@ -22,7 +22,7 @@ function CreateWindow() {
     /** CIDER **/
     const ciderwin = require("./src/main/cider-base")
     app.win = ciderwin
-    app.win.CreateBrowserWindow()
+    app.win.Start()
     /** CIDER **/
 }
 
diff --git a/src/main/cider-base.js b/src/main/cider-base.js
index 0303cbae..e20635c4 100644
--- a/src/main/cider-base.js
+++ b/src/main/cider-base.js
@@ -89,7 +89,11 @@ const ElectronSentry = require("@sentry/electron");
 ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214"});
 
 const CiderBase = {
-
+    async Start() {
+        this.clientPort = await getPort({port : 9000});
+        this.CreateBrowserWindow()
+    },
+    clientPort: 0,
     CreateBrowserWindow() {
         // Set default window sizes
         const mainWindowState = windowStateKeeper({
@@ -144,7 +148,7 @@ const CiderBase = {
             (details, callback) => {
                 if (details.url.includes("hls.js")) {
                     callback({
-                        redirectURL: "http://localhost:9000/apple-hls.js"
+                        redirectURL: `http://localhost:${CiderBase.clientPort}/apple-hls.js`
                     })
                 } else {
                     callback({
@@ -165,7 +169,7 @@ const CiderBase = {
             callback({ requestHeaders: details.requestHeaders })
         })
 
-        let location = "http://localhost:9000/"
+        let location = `http://localhost:${CiderBase.clientPort}/`
         win.loadURL(location)
         win.on("closed", () => {
             win = null
@@ -267,19 +271,25 @@ const CiderBase = {
     },
 
     async InitWebServer() {
-        const webRemotePort = await getPort({port : 9000});
         const webapp = express();
         const webRemotePath = path.join(__dirname, '../renderer/');
         webapp.set("views", path.join(webRemotePath, "views"));
         webapp.set("view engine", "ejs");
 
+        webapp.use(function (req, res, next) {
+            // if not localhost
+            if (req.headers.host.includes("localhost") && req.headers["user-agent"].includes("Cider")) {
+                next();
+            }
+        });
+
         webapp.use(express.static(webRemotePath));
         webapp.get('/', function (req, res) {
             //res.sendFile(path.join(webRemotePath, 'index_old.html'));
             res.render("main", CiderBase.EnvironmentVariables)
         });
-        webapp.listen(webRemotePort, function () {
-            console.log(`Web Remote listening on port ${webRemotePort}`);
+        webapp.listen(CiderBase.clientPort, function () {
+            console.log(`Cider client port: ${CiderBase.clientPort}`);
         });
     },
 
diff --git a/src/renderer/index.js b/src/renderer/index.js
index c2f373ef..fdea85dd 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -217,7 +217,7 @@ const app = new Vue({
                 "attributes": {
                     "name": "Cider User",
                     "handle": "CiderUser",
-                    "artwork": { "url": "http://localhost:9000/assets/logocut.png" }
+                    "artwork": { "url": "./assets/logocut.png" }
                 }
             },
             menuOpened: false,
@@ -312,7 +312,7 @@ const app = new Vue({
                     "attributes": {
                         "name": "Cider User",
                         "handle": "CiderUser",
-                        "artwork": { "url": "http://localhost:9000/assets/logocut.png" }
+                        "artwork": { "url": "./assets/logocut.png" }
                     }
                 }
             }
diff --git a/src/web-remote/index.html b/src/web-remote/index.html
new file mode 100644
index 00000000..74bb16bc
--- /dev/null
+++ b/src/web-remote/index.html
@@ -0,0 +1 @@
+Web Remote
\ No newline at end of file