okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some backend changes

Browse source
This commit is contained in:
booploops 2021-12-24 01:48:08 -08:00 • committed by BrandonPlank
parent 47a19dae94
commit 82301cde95
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.js
View file

@ -22,7 +22,7 @@ function CreateWindow() {
/** CIDER **/ /** CIDER **/
const ciderwin = require("./src/main/cider-base") const ciderwin = require("./src/main/cider-base")
app.win = ciderwin app.win = ciderwin
app.win.CreateBrowserWindow() app.win.Start()
/** CIDER **/ /** CIDER **/
} }

22
src/main/cider-base.js
View file

@ -89,7 +89,11 @@ const ElectronSentry = require("@sentry/electron");
ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214"}); ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214"});
const CiderBase = { const CiderBase = {
async Start() {
this.clientPort = await getPort({port : 9000});
this.CreateBrowserWindow()
},
clientPort: 0,
CreateBrowserWindow() { CreateBrowserWindow() {
// Set default window sizes // Set default window sizes
const mainWindowState = windowStateKeeper({ const mainWindowState = windowStateKeeper({
@ -144,7 +148,7 @@ const CiderBase = {
(details, callback) => { (details, callback) => {
if (details.url.includes("hls.js")) { if (details.url.includes("hls.js")) {
callback({ callback({
redirectURL: "http://localhost:9000/apple-hls.js" redirectURL: `http://localhost:${CiderBase.clientPort}/apple-hls.js`
}) })
} else { } else {
callback({ callback({
@ -165,7 +169,7 @@ const CiderBase = {
callback({ requestHeaders: details.requestHeaders }) callback({ requestHeaders: details.requestHeaders })
}) })
let location = "http://localhost:9000/" let location = `http://localhost:${CiderBase.clientPort}/`
win.loadURL(location) win.loadURL(location)
win.on("closed", () => { win.on("closed", () => {
win = null win = null
@ -267,19 +271,25 @@ const CiderBase = {
}, },
async InitWebServer() { async InitWebServer() {
const webRemotePort = await getPort({port : 9000});
const webapp = express(); const webapp = express();
const webRemotePath = path.join(__dirname, '../renderer/'); const webRemotePath = path.join(__dirname, '../renderer/');
webapp.set("views", path.join(webRemotePath, "views")); webapp.set("views", path.join(webRemotePath, "views"));
webapp.set("view engine", "ejs"); 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.use(express.static(webRemotePath));
webapp.get('/', function (req, res) { webapp.get('/', function (req, res) {
//res.sendFile(path.join(webRemotePath, 'index_old.html')); //res.sendFile(path.join(webRemotePath, 'index_old.html'));
res.render("main", CiderBase.EnvironmentVariables) res.render("main", CiderBase.EnvironmentVariables)
}); });
webapp.listen(webRemotePort, function () { webapp.listen(CiderBase.clientPort, function () {
console.log(`Web Remote listening on port ${webRemotePort}`); console.log(`Cider client port: ${CiderBase.clientPort}`);
}); });
}, },

4
src/renderer/index.js
View file

@ -217,7 +217,7 @@ const app = new Vue({
"attributes": { "attributes": {
"name": "Cider User", "name": "Cider User",
"handle": "CiderUser", "handle": "CiderUser",
"artwork": { "url": "http://localhost:9000/assets/logocut.png" } "artwork": { "url": "./assets/logocut.png" }
} }
}, },
menuOpened: false, menuOpened: false,
@ -312,7 +312,7 @@ const app = new Vue({
"attributes": { "attributes": {
"name": "Cider User", "name": "Cider User",
"handle": "CiderUser", "handle": "CiderUser",
"artwork": { "url": "http://localhost:9000/assets/logocut.png" } "artwork": { "url": "./assets/logocut.png" }
} }
} }
} }

1
src/web-remote/index.html Normal file
View file

@ -0,0 +1 @@
Web Remote