Custom Prompt for changing options

config/defaults.js

@@ -30,6 +30,7 @@ const defaultConfig = {
 		// Disabled plugins
 		shortcuts: {
 			enabled: false,
+			overrideMediaKeys: false,
 		},
 		downloader: {
 			enabled: false,
@@ -58,9 +59,8 @@ const defaultConfig = {
 			steps: 1, //percentage of volume to change
 			arrowsShortcut: true, //enable ArrowUp + ArrowDown local shortcuts
 			globalShortcuts: {
-				enabled: false, // enable global shortcuts
-				volumeUp: "Shift+PageUp", // Keybind default can be changed
-				volumeDown: "Shift+PageDown"
+				volumeUp: "",
+				volumeDown: ""
 			},
 			savedVolume: undefined //plugin save volume between session here
 		}

index.js

@@ -37,7 +37,9 @@ if (config.get("options.proxy")) {
 }
 
 // Adds debug features like hotkeys for triggering dev tools and reload
-require("electron-debug")();
+require("electron-debug")({
+	showDevTools: false //disable automatic devTools on new window
+});
 
 // Prevent window being garbage collected
 let mainWindow;
@@ -58,7 +60,7 @@ function onClosed() {
 
 function loadPlugins(win) {
 	injectCSS(win.webContents, path.join(__dirname, "youtube-music.css"));
-	win.webContents.on("did-finish-load", () => {
+	win.webContents.once("did-finish-load", () => {
 		if (is.dev()) {
 			console.log("did finish load");
 			win.webContents.openDevTools();

menu.js

@@ -6,6 +6,7 @@ const is = require("electron-is");
 
 const { getAllPlugins } = require("./plugins/utils");
 const config = require("./config");
+const prompt = require("custom-electron-prompt");
 
 const pluginEnabledMenu = (win, plugin, label = "", hasSubmenu = false) => ({
 	label: label || plugin,
@@ -143,6 +144,14 @@ const mainMenuTemplate = (win) => [
 			{
 				label: "Advanced options",
 				submenu: [
+					{
+						label: "Proxy",
+						type: "checkbox",
+						checked: !!config.get("options.proxy"),
+						click: (item) => {
+							setProxy(item, win);
+						}
+					},
 					{
 						label: "Disable hardware acceleration",
 						type: "checkbox",
@@ -300,3 +309,38 @@ module.exports.setApplicationMenu = (win) => {
 	const menu = Menu.buildFromTemplate(menuTemplate);
 	Menu.setApplicationMenu(menu);
 };
+
+const iconPath = path.join(__dirname, "assets", "youtube-music-tray.png");
+const example = "Example: 'socks5://127.0.0.1:9999'";
+function setProxy(item, win) {
+	let options = {
+		title: 'Set Proxy',
+		label: 'Enter Proxy Address: (leave empty to disable)',
+		value: config.get("options.proxy") || example,
+		type: 'input',
+		inputAttrs: {
+			type: 'url'
+		},
+		icon: iconPath,
+		customStylesheet: "dark",
+		width: 450,
+	};
+	//TODO: custom bar on prompt need testing on macOS
+	if (!is.macOS()) {
+		Object.assign(options, {
+			frame: false,
+			customScript: path.join(__dirname, "plugins", "in-app-menu", "prompt-custom-titlebar.js"),
+			enableRemoteModule: true,			
+		});
+	}
+	prompt(options, win)
+		.then(output => {
+			if (output !== null && output !== example) {
+				config.set("options.proxy", output);
+				item.checked = output !== "";
+			} else { //user pressed cancel
+				item.checked = !item.checked; //reset checkbox
+			}
+		})
+		.catch(console.error);
+}

package.json

@@ -69,6 +69,7 @@
 		"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.9.0",
 		"async-mutex": "^0.3.1",
 		"browser-id3-writer": "^4.4.0",
+		"custom-electron-prompt": "^1.1.0",
 		"chokidar": "^3.5.1",
 		"custom-electron-titlebar": "^3.2.6",
 		"discord-rpc": "^3.2.0",

plugins/in-app-menu/prompt-custom-titlebar.js

@@ -0,0 +1,14 @@
+const customTitlebar = require("custom-electron-titlebar");
+
+module.exports = () => {
+	const bar = new customTitlebar.Titlebar({
+		backgroundColor: customTitlebar.Color.fromHex("#050505"),
+		minimizable: false,
+		maximizable: false,
+		menu: null
+	});
+	const mainStyle = document.querySelector("#container").style;
+	mainStyle.width = "100%";
+	mainStyle.position = "fixed";
+	mainStyle.border = "unset";
+};

plugins/precise-volume/front.js

@@ -12,9 +12,7 @@ module.exports = (options) => {
 
 	setupLocalArrowShortcuts(options);
 
-	if (options.globalShortcuts?.enabled) {
-		setupGlobalShortcuts(options);
-	}
+	setupGlobalShortcuts(options);
 
 	firstRun(options);
 

plugins/precise-volume/menu.js

@@ -1,19 +1,109 @@
 const { enabled } = require("./back");
+const { app } = require("electron");
 const { setOptions } = require("../../config/plugins");
+const prompt = require("custom-electron-prompt");
+const path = require("path");
+const is = require("electron-is");
 
 module.exports = (win, options) => [
 	{
-		label: "Arrowkeys controls",
+		label: "Local Arrowkeys Controls",
 		type: "checkbox",
 		checked: !!options.arrowsShortcut,
-		click: (item) => {
-			// Dynamically change setting if plugin enabled
+		click: item => {
+			// Dynamically change setting if plugin is enabled
 			if (enabled()) {
 				win.webContents.send("setArrowsShortcut", item.checked);
 			} else { // Fallback to usual method if disabled
 				options.arrowsShortcut = item.checked;
 				setOptions("precise-volume", options);
 			}
 		}
+	},
+	{
+		label: "Global Hotkeys",
+		type: "checkbox",
+		checked: !!options.globalShortcuts.volumeUp || !!options.globalShortcuts.volumeDown,
+		click: item => promptGlobalShortcuts(win, options, item)
+	},
+	{
+		label: "Set Custom Volume Steps",
+		click: () => promptVolumeSteps(win, options)
 	}
 ];
+
+const iconPath = path.join(app.getAppPath(), "assets", "youtube-music-tray.png");
+const customTitlebarPath = path.join(app.getAppPath(), "plugins", "in-app-menu", "prompt-custom-titlebar.js");
+// Helper function for globalShortcuts prompt
+const kb = (label_, value_, default_) => { return { value: value_, label: label_, default: default_ || undefined }; };
+
+function promptVolumeSteps(win, options) {
+	const promptOptions = {
+		title: "Volume Steps",
+		label: "Choose Volume Increase/Decrease Steps",
+		value: options.steps || 1,
+		type: "counter",
+		counterOptions: { minimum: 0, maximum: 100, multiFire: true },
+		width: 380
+	};
+
+	setupPromptOptions(promptOptions);
+
+	prompt(promptOptions, win)
+		.then(output => {
+			if (output || output === 0) { // 0 is somehow valid
+				options.steps = output;
+				setOptions("precise-volume", options);
+			}
+		}).catch(console.error);
+}
+
+function promptGlobalShortcuts(win, options, item) {
+	const promptOptions = {
+		title: "Global Volume Keybinds",
+		label: "Choose Global Volume Keybinds:",
+		type: "keybind",
+		keybindOptions: [
+			kb("Increase Volume", "volumeUp", options.globalShortcuts?.volumeUp),
+			kb("Decrease Volume", "volumeDown", options.globalShortcuts?.volumeDown)
+		]
+	};
+
+	setupPromptOptions(promptOptions);
+
+	prompt(promptOptions, win)
+		.then(output => {
+			if (output) {
+				for (const keybindObject of output) {
+					options.globalShortcuts[keybindObject.value] = keybindObject.accelerator;
+				}
+
+				setOptions("precise-volume", options);
+
+				item.checked = !!options.globalShortcuts.volumeUp || !!options.globalShortcuts.volumeDown;
+			} else {
+				// Reset checkbox if prompt was canceled
+				item.checked = !item.checked;
+			}
+		})
+		.catch(console.error);
+}
+
+function setupPromptOptions(options) {
+	// TODO Custom titlebar needs testing on macOS
+	if (is.macOS()) {
+		Object.assign(options, {
+			customStylesheet: "dark",
+			icon: iconPath
+		});
+	} else {
+		Object.assign(options, {
+			customStylesheet: "dark",
+			icon: iconPath,
+			// The following are used for custom titlebar
+			frame: false,
+			customScript: customTitlebarPath,
+			enableRemoteModule: true
+		});
+	}
+}

plugins/shortcuts/back.js

@@ -1,5 +1,6 @@
 const { globalShortcut } = require("electron");
 const electronLocalshortcut = require("electron-localshortcut");
+const { setOptions } = require("../../config/plugins");
 
 const getSongControls = require("../../providers/song-controls");
 
@@ -19,31 +20,65 @@ function registerShortcuts(win, options) {
 	const songControls = getSongControls(win);
 	const { playPause, next, previous, search } = songControls;
 
-	_registerGlobalShortcut(win.webContents, "MediaPlayPause", playPause);
-	_registerGlobalShortcut(win.webContents, "MediaNextTrack", next);
-	_registerGlobalShortcut(win.webContents, "MediaPreviousTrack", previous);
+	updateOptions(options);
+
+	if (options.overrideMediaKeys) {
+		_registerGlobalShortcut(win.webContents, "MediaPlayPause", playPause);
+		_registerGlobalShortcut(win.webContents, "MediaNextTrack", next);
+		_registerGlobalShortcut(win.webContents, "MediaPreviousTrack", previous);
+	}
+
 	_registerLocalShortcut(win, "CommandOrControl+F", search);
 	_registerLocalShortcut(win, "CommandOrControl+L", search);
 
 	const { global, local } = options;
-	(global || []).forEach(({ shortcut, action }) => {
-		console.debug("Registering global shortcut", shortcut, ":", action);
-		if (!action || !songControls[action]) {
-			console.warn("Invalid action", action);
-			return;
+	const shortcutOptions = { global, local };
+
+	for (const optionType in shortcutOptions) {
+		registerAllShortcuts(shortcutOptions[optionType], optionType);
+	}
+
+	function registerAllShortcuts(container, type) {
+		for (const action in container) {
+			if (!container[action]) {
+				continue; // Action accelerator is empty
+			}
+
+			console.debug(`Registering ${type} shortcut`, container[action], ":", action);
+			if (!songControls[action]) {
+				console.warn("Invalid action", action);
+				continue;
+			}
+
+			if (type === "global") {
+				_registerGlobalShortcut(win.webContents, container[action], songControls[action]);
+			} else { // type === "local"
+				_registerLocalShortcut(win, local[action], songControls[action]);
+			}
 		}
+	}
+}
 
-		_registerGlobalShortcut(win.webContents, shortcut, songControls[action]);
-	});
-	(local || []).forEach(({ shortcut, action }) => {
-		console.debug("Registering local shortcut", shortcut, ":", action);
-		if (!action || !songControls[action]) {
-			console.warn("Invalid action", action);
-			return;
+/** Update options to new format if they are still an array (old format) */
+function updateOptions(options) {
+	let updated = false;
+	for (const optionType of ["global", "local"]) {
+		if (Array.isArray(options[optionType])) {
+			const updatedOptions = {};
+			for (const optionObject of options[optionType]) {
+				if (optionObject.action && optionObject.shortcut) {
+					updatedOptions[optionObject.action] = optionObject.shortcut;
+				}
+			}
+
+			options[optionType] = updatedOptions;
+			updated = true;
 		}
+	}
 
-		_registerLocalShortcut(win, shortcut, songControls[action]);
-	});
+	if (updated) {
+		setOptions("shortcuts", options);
+	}
 }
 
 module.exports = registerShortcuts;