Improved Intra 42, version 3

.gitignore

@@ -4,6 +4,13 @@
 *.crx
 server/nogit.php
 server/test.php
-server/settings/*
-server/banners/*
+server/db/*.json
+server/settings/*.json
+server/banners/*.jpeg
+server/banners/*.png
+server/banners/*.webp
+server/banners/*.jpg
+server/banners/*.bmp
+server/banners/*.gif
+server/banners/*.mp4
 temp.js

background/comm.js

@@ -0,0 +1,125 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        ::::::::            */
+/*   comm.js                                            :+:    :+:            */
+/*                                                     +:+                    */
+/*   By: fbes <[email protected]>                 +#+                     */
+/*                                                   +#+                      */
+/*   Created: 2022/03/26 23:57:53 by fbes          #+#    #+#                 */
+/*   Updated: 2022/03/26 23:57:53 by fbes          ########   odam.nl         */
+/*                                                                            */
+/* ************************************************************************** */
+
+const incognitoPortName = "incog_comm";
+const normalPorts = [];
+const incognitoPorts = [];
+
+// message only ports in non-incognito context
+function messageNormalPorts(msg) {
+	for (let i = 0; i < normalPorts.length; i++) {
+		normalPorts[i].postMessage(msg);
+	}
+}
+
+// message only ports in incognito context
+function messageIncognitoPorts(msg) {
+	for (let i = 0; i < incognitoPorts.length; i++) {
+		incognitoPorts[i].postMessage(msg);
+	}
+}
+
+// message all ports
+function messageAllPorts(msg) {
+	messageNormalPorts(msg);
+	messageIncognitoPorts(msg);
+}
+
+// message ports of specified type
+function messagePortsOfType(type, msg) {
+	if (type == "incognito") {
+		messageIncognitoPorts(msg);
+	}
+	else {
+		messageNormalPorts(msg);
+	}
+}
+
+// detect if port is incognito or not
+function isIncognitoPort(port) {
+	return (port.name == incognitoPortName);
+}
+
+// resync on port message function
+function resyncOnPortMessage(incognitoSession) {
+	const type = (incognitoSession ? "incognito" : "normal");
+	const improvedStorage = (incognitoSession ? incognitoStorage : normalStorage);
+
+	improvedStorage.get("username").then(function(data) {
+		if (data["username"]) {
+			getSettingsFromSyncServer(improvedStorage, data["username"])
+				.then(function() {
+					iConsole.log("Settings successfully retrieved from server. Stored a copy locally in " + type + " storage.");
+					messagePortsOfType(type, { action: "resynced" });
+				})
+				.catch(function(err) {
+					iConsole.error(err);
+					resetOptions(improvedStorage).then(function() {
+						messagePortsOfType(type, { action: "resynced" });
+					});
+				});
+		}
+		else {
+			iConsole.warn("Could not resync, as no username was given to sync from");
+		}
+	});
+}
+
+// port message listener
+function portMessageListener(msg, port) {
+	switch(msg["action"]) {
+		case "ping":
+			port.postMessage({ action: "pong" });
+			break;
+		case "resync":
+			resyncOnPortMessage(isIncognitoPort(port));
+			break;
+		case "options-changed":
+			if (isIncognitoPort(port)) {
+				messageIncognitoPorts({ action: "options-changed", settings: msg["settings"] });
+			}
+			else {
+				messageNormalPorts({ action: "options-changed", settings: msg["settings"] })
+			}
+			break;
+		default:
+			iConsole.log("Unknown action received over port: ", msg["action"]);
+			break;
+	}
+}
+
+chrome.runtime.onConnect.addListener(function(port) {
+	// add port to array of ports depending on the name
+	if (port.name == incognitoPortName) {
+		incognitoPorts.push(port);
+	}
+	else {
+		normalPorts.push(port);
+	}
+
+	// remove port from array of ports on closure
+	port.onDisconnect.addListener(function(port) {
+		const normalIndex = normalPorts.indexOf(port);
+		const incognitoIndex = incognitoPorts.indexOf(port);
+
+		if (incognitoIndex > -1) {
+			incognitoPorts.splice(incognitoIndex, 1);
+		}
+		else if (normalIndex > -1) {
+			normalPorts.splice(normalIndex, 1);
+		}
+	});
+
+	// run specific functions on specific messages
+	// basically treating messages as commands
+	port.onMessage.addListener(portMessageListener);
+});

background/main.js

@@ -0,0 +1,31 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        ::::::::            */
+/*   main.js                                            :+:    :+:            */
+/*                                                     +:+                    */
+/*   By: fbes <[email protected]>                 +#+                     */
+/*                                                   +#+                      */
+/*   Created: 2022/03/26 23:54:09 by fbes          #+#    #+#                 */
+/*   Updated: 2022/03/26 23:54:09 by fbes          ########   odam.nl         */
+/*                                                                            */
+/* ************************************************************************** */
+
+function resyncOptions() {
+	setOptionsIfUnset(normalStorage);
+	setOptionsIfUnset(incognitoStorage);
+	fetchUserSettings(normalStorage);
+}
+
+chrome.runtime.onInstalled.addListener(function(details) {
+	if (details.reason == "install") {
+		iConsole.log("First install.");
+		resyncOptions();
+	}
+	else if (details.reason == "update") {
+		iConsole.log("An update has been installed.");
+		resetLastSyncTimestamp(normalStorage);
+		resetLastSyncTimestamp(incognitoStorage);
+		removeUnusedOptions();
+		resyncOptions();
+	}
+});