Merge branch 'main' into linux-launch

1 files changed, 101 insertions, 25 deletions

diff --git a/src/app/main.js b/src/app/main.js
index 4918777..ad1a44f 100644
--- a/src/app/main.js
+++ b/src/app/main.js
@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { ipcRenderer, shell } = require("electron");
+const { ipcRenderer, shell, ipcMain } = require("electron");
 
 const lang = require("../lang");
 var modsobj = {};
@@ -15,6 +15,7 @@ var settings = {
 	autolang: true,
 	forcedlang: "en",
 	autoupdate: true,
+	originkill: false,
 	zip: "/northstar.zip",
 	lang: navigator.language,
 	winebin: "/usr/bin/wine64",
@@ -29,7 +30,24 @@ ipcRenderer.send("setlang", settings.lang);
 
 // Loads the settings
 if (fs.existsSync("viper.json")) {
-	settings = {...settings, ...JSON.parse(fs.readFileSync("viper.json", "utf8"))};
+	let conf = fs.readFileSync("viper.json", "utf8");
+	let json = {};
+
+	// Validates viper.json
+	try {
+		json = JSON.parse(conf);
+	}catch (e) {
+		let reset = confirm(lang("general.invalidconfig", navigator.language) + e);
+		if (! reset) {
+			ipcRenderer.send("exit");
+		} else {
+			fs.writeFileSync("viper.json", "{}");
+			ipcRenderer.send("relaunch");
+		}
+		
+	}
+
+	settings = {...settings, ...json};
 	settings.zip = path.join(settings.gamepath + "/northstar.zip");
 
 	if (settings.gamepath.length === 0) {
@@ -46,8 +64,14 @@ if (fs.existsSync("viper.json")) {
 	setpath();
 }
 
+
+// Show a toast message if no Internet connection has been detected.
+if (!navigator.onLine) {
+	ipcRenderer.send("no-internet");
+}
+
 function exit() {ipcRenderer.send("exit")}
-function update() {ipcRenderer.send("update")}
+function updateNorthstar() {ipcRenderer.send("update-northstar")}
 
 // Reports to the main process about game path status.
 // @param {boolean} value is game path loaded
@@ -58,15 +82,15 @@ function setpath(value = false) {
 // Tells the main process to launch or install Northstar
 function launch() {
 	if (shouldInstallNorthstar) {
-		update();
+		updateNorthstar();
 		shouldInstallNorthstar = false;
 	} else {
-		ipcRenderer.send("launch");
+		ipcRenderer.send("launch-ns");
 	}
 }
 
 // Tells the main process to launch the vanilla game
-function launchVanilla() {ipcRenderer.send("launchVanilla")}
+function launchVanilla() {ipcRenderer.send("launch-vanilla")}
 
 // In conjunction with utils.js' winLog(), it'll send log messages in
 // the devTools from utils.js
@@ -85,13 +109,11 @@ function setButtons(state) {
 		}
 	}
 
-	disablearray(document.querySelectorAll(".playBtnContainer .playBtn"))
-	disablearray(document.querySelectorAll("#nsMods .buttons.modbtns button"))
-	disablearray(document.querySelectorAll("#browser #browserEntries .text button"))
+	disablearray(document.querySelectorAll(".playBtnContainer .playBtn"));
+	disablearray(document.querySelectorAll("#nsMods .buttons.modbtns button"));
+	disablearray(document.querySelectorAll("#browser #browserEntries .text button"));
 }
 
-ipcRenderer.on("setbuttons", (event, state) => {setButtons(state)})
-
 ipcRenderer.on("gamestate", (event, state) => {
 	setButtons(! state);
 
@@ -105,7 +127,11 @@ ipcRenderer.on("gamestate", (event, state) => {
 	btns[1].innerHTML = string;
 })
 
-ipcRenderer.on("gamepathlost", (event, state) => {
+ipcRenderer.on("set-buttons", (event, state) => {
+	setButtons(state);
+})
+
+ipcRenderer.on("gamepath-lost", (event, state) => {
 	page(0);
 	setButtons(false);
 	alert(lang("gui.gamepath.lost"));
@@ -117,6 +143,7 @@ ipcRenderer.on("ns-update-event", (event, key) => {
 	console.log(lang(key));
 	switch(key) {
 		case "cli.update.uptodate.short":
+		case "cli.update.noInternet":
 			setButtons(true);
 			playNsBtn.innerText = lang("gui.launch");
 			break;
@@ -171,7 +198,7 @@ function selected(all) {
 				}
 			}
 
-			ipcRenderer.send("removemod", selected)
+			ipcRenderer.send("remove-mod", selected);
 		},
 		toggle: () => {
 			if (selected.match(/^Northstar\./)) {
@@ -184,33 +211,82 @@ function selected(all) {
 				}
 			}
 
-			ipcRenderer.send("togglemod", selected)
+			ipcRenderer.send("toggle-mod", selected);
 		}
 	}
 }
 
+let installqueue = [];
+
 // Tells the main process to install a mod through the file selector
 function installmod() {
 	setButtons(false);
-	ipcRenderer.send("installmod")
+	ipcRenderer.send("install-mod");
 }
 
 // Tells the main process to directly install a mod from this path
 function installFromPath(path) {
 	setButtons(false);
-	ipcRenderer.send("installfrompath", path)
+	ipcRenderer.send("install-from-path", path);
 }
 
 // Tells the main process to install a mod from a URL
-function installFromURL(url) {
+function installFromURL(url, dependencies, clearqueue) {
+	if (clearqueue) {installqueue = []};
+
+	let prettydepends = [];
+
+	if (dependencies) {
+		let newdepends = [];
+		for (let i = 0; i < dependencies.length; i++) {
+			let depend = dependencies[i].toLowerCase();
+			if (! depend.match(/northstar-northstar-.*/)) {
+				depend = dependencies[i].replaceAll("-", "/");
+				let pkg = depend.split("/");
+				if (! isModInstalled(pkg[1])) {
+					newdepends.push(depend);
+					prettydepends.push(`${pkg[1]} v${pkg[2]} - ${lang("gui.browser.madeby")} ${pkg[0]}`);
+				}
+			}
+		}
+
+		dependencies = newdepends;
+	} 
+
+	if (dependencies && dependencies.length != 0) {
+		let confirminstall = confirm(lang("gui.mods.confirmdependencies") + prettydepends.join("\n"));
+		if (! confirminstall) {
+			return
+		}
+	}
+
 	setButtons(false);
-	ipcRenderer.send("installfromurl", url)
+	ipcRenderer.send("install-from-url", url, dependencies);
+
+	if (dependencies) {
+		installqueue = dependencies;
+	}
+}
+
+function isModInstalled(modname) {
+	for (let i = 0; i < modsobj.all.length; i++) {
+		let mod = modsobj.all[i];
+		if (mod.ManifestName) {
+			if (mod.ManifestName.match(modname)) {
+				return true;
+			}
+		} else if (mod.Name.match(modname)) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
 // Frontend part of settings a new game path
 ipcRenderer.on("newpath", (event, newpath) => {
 	settings.gamepath = newpath;
-	ipcRenderer.send("guigetmods");
+	ipcRenderer.send("gui-getmods");
 })
 
 // Continuation of log()
@@ -258,23 +334,23 @@ ipcRenderer.on("version", (event, versions) => {
 		shouldInstallNorthstar = true;
 		playNsBtn.innerText = lang("gui.installnorthstar");
 	}
-}); ipcRenderer.send("getversion");
+}); ipcRenderer.send("get-version");
 
 // When an update is available it'll ask the user about it
-ipcRenderer.on("updateavailable", () => {
+ipcRenderer.on("update-available", () => {
 	if (confirm(lang("gui.update.available"))) {
-		ipcRenderer.send("updatenow");
+		ipcRenderer.send("update-now");
 	}
 })
 
 // Error out when no game path is set
-ipcRenderer.on("nopathselected", () => {
+ipcRenderer.on("no-path-selected", () => {
 	alert(lang("gui.gamepath.must"));
 	exit();
 });
 
 // Error out when game path is wrong
-ipcRenderer.on("wrongpath", () => {
+ipcRenderer.on("wrong-path", () => {
 	alert(lang("gui.gamepath.wrong"));
 	setpath(false);
 });
@@ -303,7 +379,7 @@ document.addEventListener("drop", (e) => {
     event.stopPropagation();
 
 	dragUI.classList.remove("shown");
-	installFromPath(event.dataTransfer.files[0].path)
+	installFromPath(event.dataTransfer.files[0].path);
 });
 
 document.body.addEventListener("keyup", (e) => {