add custom-electron-prompt

also use it to set proxy option
th-ch · Apr 27, 2021 · e4eed2e · e4eed2e
1 parent 8decdf4
commit e4eed2e
Show file tree

Hide file tree

Showing 5 changed files with 154 additions and 76 deletions.
diff --git a/index.js b/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();

diff --git a/menu.js b/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,
@@ -103,30 +104,38 @@ const mainMenuTemplate = (win, withRoles = true, isTray = false) => [
  },
  ...(is.windows() || is.linux()
  ? [
- {
- label: "Hide menu",
- type: "checkbox",
- checked: config.get("options.hideMenu"),
- click: (item) => {
- config.set("options.hideMenu", item.checked);
- },
+ {
+ label: "Hide menu",
+ type: "checkbox",
+ checked: config.get("options.hideMenu"),
+ click: (item) => {
+ config.set("options.hideMenu", item.checked);
  },
- ]
+ },
+ ]
  : []),
  ...(is.windows() || is.macOS()
  ? // Only works on Win/Mac
- // https://www.electronjs.org/docs/api/app#appsetloginitemsettingssettings-macos-windows
- [
- {
- label: "Start at login",
- type: "checkbox",
- checked: config.get("options.startAtLogin"),
- click: (item) => {
- config.set("options.startAtLogin", item.checked);
- },
+ // https://www.electronjs.org/docs/api/app#appsetloginitemsettingssettings-macos-windows
+ [
+ {
+ label: "Start at login",
+ type: "checkbox",
+ checked: config.get("options.startAtLogin"),
+ click: (item) => {
+ config.set("options.startAtLogin", item.checked);
  },
- ]
+ },
+ ]
  : []),
+ {
+ label: "Proxy",
+ type: "checkbox",
+ checked: !!config.get("options.proxy"),
+ click: (item) => {
+ setProxy(item, win);
+ }
+ },
  {
  label: "Tray",
  submenu: [
@@ -194,56 +203,56 @@ const mainMenuTemplate = (win, withRoles = true, isTray = false) => [
  },
  ...(!isTray
  ? [
-  {
-  label: "View",
-  submenu: withRoles
-  ? [
-  { role: "reload" },
-  { role: "forceReload" },
-  { type: "separator" },
-  { role: "zoomIn" },
-  { role: "zoomOut" },
-  { role: "resetZoom" },
-  ]
-  : [
-  {
-  label: "Reload",
-  click: () => {
-  win.webContents.reload();
-  },
-  },
-  {
-  label: "Force Reload",
-  click: () => {
-  win.webContents.reloadIgnoringCache();
-  },
-  },
-  { type: "separator" },
-  {
-  label: "Zoom In",
-  click: () => {
-  win.webContents.setZoomLevel(
-  win.webContents.getZoomLevel() + 1
-  );
-  },
-  },
-  {
-  label: "Zoom Out",
-  click: () => {
-  win.webContents.setZoomLevel(
-  win.webContents.getZoomLevel() - 1
-  );
-  },
-  },
-  {
-  label: "Reset Zoom",
-  click: () => {
-  win.webContents.setZoomLevel(0);
-  },
-  },
-  ],
-  },
-  ]
+ {
+ label: "View",
+ submenu: withRoles
+ ? [
+ { role: "reload" },
+ { role: "forceReload" },
+ { type: "separator" },
+ { role: "zoomIn" },
+ { role: "zoomOut" },
+ { role: "resetZoom" },
+ ]
+ : [
+ {
+ label: "Reload",
+ click: () => {
+ win.webContents.reload();
+ },
+ },
+ {
+ label: "Force Reload",
+ click: () => {
+ win.webContents.reloadIgnoringCache();
+ },
+ },
+ { type: "separator" },
+ {
+ label: "Zoom In",
+ click: () => {
+ win.webContents.setZoomLevel(
+ win.webContents.getZoomLevel() + 1
+ );
+ },
+ },
+ {
+ label: "Zoom Out",
+ click: () => {
+ win.webContents.setZoomLevel(
+ win.webContents.getZoomLevel() - 1
+ );
+ },
+ },
+ {
+ label: "Reset Zoom",
+ click: () => {
+ win.webContents.setZoomLevel(0);
+ },
+ },
+ ],
+ },
+ ]
  : []),
  {
  label: "Navigation",
@@ -273,13 +282,13 @@ const mainMenuTemplate = (win, withRoles = true, isTray = false) => [
  },
  ...(!isTray
  ? [
- {
- label: "Quit App",
- click: () => {
- app.quit();
- },
+ {
+ label: "Quit App",
+ click: () => {
+ app.quit();
  },
- ]
+ },
+ ]
  : []),
  ],
  },
@@ -318,3 +327,39 @@ 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,
+ inputAttrs: {
+ type: 'text'
+ },
+ type: 'input',
+ icon: iconPath,
+ customStylesheet: "dark",
+ };
+ //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,
+ height: 200,
+ width: 450,
+ });
+ }
+ prompt(options, win)
+ .then(input => {
+ if (input !== null && input !== example) {
+ config.set("options.proxy", input);
+ item.checked = input !== "";
+ } else { //user pressed cancel
+ item.checked = !item.checked; //reset checkbox
+ }
+ })
+ .catch(console.error);
+}
diff --git a/package.json b/package.json
@@ -68,6 +68,7 @@
  "YoutubeNonStop": "git:/lawfx/YoutubeNonStop.git#v0.8.1",
  "async-mutex": "^0.3.1",
  "browser-id3-writer": "^4.4.0",
+ "custom-electron-prompt": "^1.0.2",
  "custom-electron-titlebar": "^3.2.6",
  "discord-rpc": "^3.2.0",
  "downloads-folder": "^3.0.1",

diff --git a/plugins/in-app-menu/prompt-custom-titlebar.js b/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";
+};
diff --git a/yarn.lock b/yarn.lock
@@ -2636,6 +2636,13 @@ cssstyle@^2.2.0:
  dependencies:
  cssom "~0.3.6"
 
+custom-electron-prompt@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/custom-electron-prompt/-/custom-electron-prompt-1.0.1.tgz#6d11c6e5130a444a9425bd27864777b36f1fef11"
+ integrity sha512-ldEiZ1t3rBDOb0nfvVpxQOjWJvkkUO3B/sD9IIYr2C/VG9COkc6IJNO2E3rXMPdDDIwejXEQx3CTWp2N2d4moQ==
+ dependencies:
+ electron "^11.4.4"
+
 custom-electron-titlebar@^3.2.6:
  version "3.2.6"
  resolved "https://registry.yarnpkg.com/custom-electron-titlebar/-/custom-electron-titlebar-3.2.6.tgz#4cd064efa5020954c09732efa8c667a7ee3636e3"
@@ -3140,6 +3147,15 @@ electron@^11.2.3:
  "@types/node" "^12.0.12"
  extract-zip "^1.0.3"
 
+electron@^11.4.4:
+ version "11.4.4"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-11.4.4.tgz#d6c046dedd9e22df5f6408841c3f8ae1a1d59414"
+ integrity sha512-m52nF85VADCmL9DpzJfgmkvc9fNiGZPYwptv/4fTYrYhAMiO+hmClGMXncCoSAzoULQjl+f+0b9CY4yd6nRFlQ==
+ dependencies:
+ "@electron/get" "^1.0.1"
+ "@types/node" "^12.0.12"
+ extract-zip "^1.0.3"
+
 elliptic@^6.5.3:
  version "6.5.4"
  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"