Merge pull request #13 from th-ch/snyk-upgrade-5770951f6ab79d4e413754bb7cab1225

[Snyk] Upgrade electron-localshortcut from 3.1.0 to 3.2.1

.npmrc

@@ -0,0 +1,2 @@
+engine-strict=true
+scripts-prepend-node-path=true

.travis.yml

@@ -13,8 +13,8 @@ matrix:
       language: generic
 
 cache:
+  yarn: false
   directories:
-    - node_modules
     - $HOME/.cache/electron
     - $HOME/.cache/electron-builder
 
@@ -30,13 +30,15 @@ script:
         -v ${PWD}:/project \
         -v ~/.cache/electron:/root/.cache/electron \
         -v ~/.cache/electron-builder:/root/.cache/electron-builder \
-        electronuserland/builder \
+        electronuserland/builder:10 \
-        /bin/bash -c "npm install && npm run release:linux"
+        /bin/bash -c "yarn && npm run release:linux"
     else
       npm run release:mac
     fi
 before_cache:
   - rm -rf $HOME/.cache/electron-builder
+before_install:
+  - rm -rf node_modules
 
 branches:
   except:

appveyor.yml

@@ -11,10 +11,10 @@ init:
   - git config --global core.autocrlf input
 
 install:
-  - ps: Install-Product node 8 x64
+  - ps: Install-Product node 10 x64
-  - npm install
+  - yarn
 
 build_script:
-  - npm run release:win
+  - yarn run release:win
 
 test: off

index.js

@@ -42,8 +42,10 @@ function createMainWindow() {
 		backgroundColor: "#000",
 		show           : false,
 		webPreferences : {
-			nodeIntegration: false,
+			nodeIntegration : false,
-			preload        : path.join(__dirname, "preload.js")
+			preload         : path.join(__dirname, "preload.js"),
+			nativeWindowOpen: true,                                 // window.open return Window object(like in regular browsers), not BrowserWindowProxy
+			affinity        : "main-window"                         // main window, and addition windows should work in one process
 		},
 		frame        : !is.macOS(),
 		titleBarStyle: is.macOS() ? "hiddenInset": "default"
@@ -86,6 +88,17 @@ function createMainWindow() {
 		}
 	});
 
+	win.webContents.on(
+		"new-window",
+		(e, url, frameName, disposition, options) => {
+			// hook on new opened window
+
+			// at now new window in mainWindow renderer process.
+			// Also, this will automatically get an option `nodeIntegration=false`(not override to true, like in iframe's) - like in regular browsers
+			options.webPreferences.affinity = "main-window";
+		}
+	);
+
 	win.on("move", () => {
 		let position = win.getPosition();
 		store.set("window-position", { x: position[0], y: position[1] });

package.json

@@ -1,60 +1,65 @@
 {
-	"name"       : "youtube-music",
+	"name": "youtube-music",
 	"productName": "YouTube Music",
-	"version"    : "1.1.5",
+	"version": "1.2.0",
 	"description": "YouTube Music Desktop App - including custom plugins",
-	"license"    : "MIT",
+	"license": "MIT",
-	"repository" : "th-ch/youtube-music",
+	"repository": "th-ch/youtube-music",
-	"author"     : {
+	"author": {
-		"name" : "th-ch",
+		"name": "th-ch",
 		"email": "th-ch@users.noreply.github.com",
-		"url"  : "https://github.com/th-ch/youtube-music"
+		"url": "https://github.com/th-ch/youtube-music"
 	},
 	"build": {
-		"appId"      : "com.github.th-ch.youtube-music",
+		"appId": "com.github.th-ch.youtube-music",
 		"productName": "YouTube Music",
-		"mac"        : {
+		"mac": {
 			"identity": null,
-			"icon"    : "assets/generated/icons/mac/icon.icns"
+			"icon": "assets/generated/icons/mac/icon.icns"
 		},
 		"win": {
 			"icon": "assets/generated/icons/win/icon.ico"
 		},
 		"linux": {
-			"icon"    : "assets/generated/icons/png",
+			"icon": "assets/generated/icons/png",
 			"category": "AudioVideo"
 		}
 	},
 	"scripts": {
-		"test"         : "xo",
+		"test": "xo",
-		"start"        : "electron .",
+		"start": "electron .",
-		"icon"         : "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
+		"icon": "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
-		"postinstall"  : "npm run icon && npm rebuild && node plugins/adblocker/generator.js && electron-rebuild",
+		"generate:package": "node utils/generate-package-json.js",
-		"clean"        : "rimraf dist",
+		"postinstall": "yarn run generate:package YoutubeNonStop && yarn run icon && npm rebuild && node plugins/adblocker/generator.js && electron-rebuild",
-		"build"        : "npm run clean && build --win --mac --linux",
+		"clean": "rimraf dist",
-		"build:mac"    : "npm run clean && build --mac",
+		"build": "yarn run clean && build --win --mac --linux",
-		"build:win"    : "npm run clean && build --win",
+		"build:mac": "yarn run clean && build --mac",
-		"release:linux": "npm run clean && build --linux -p always",
+		"build:win": "yarn run clean && build --win",
-		"release:mac"  : "npm run clean && build --mac -p always",
+		"release:linux": "yarn run clean && build --linux -p always",
-		"release:win"  : "npm run clean && build --win -p always"
+		"release:mac": "yarn run clean && build --mac -p always",
+		"release:win": "yarn run clean && build --win -p always"
+	},
+	"engines": {
+		"npm": "Please use yarn and not npm"
 	},
 	"dependencies": {
-		"ad-block"              : "^4.1.3",
+		"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.7.1",
-		"electron-debug"        : "^2.0.0",
+		"ad-block": "^4.1.3",
-		"electron-is"           : "^3.0.0",
+		"electron-debug": "^2.2.0",
-		"electron-localshortcut": "^3.1.0",
+		"electron-is": "^3.0.0",
-		"electron-store"        : "^2.0.0",
+		"electron-localshortcut": "^3.2.1",
-		"electron-updater"      : "^4.0.6"
+		"electron-store": "^3.1.0",
+		"electron-updater": "^4.2.2"
 	},
 	"devDependencies": {
-		"devtron"                    : "^1.4.0",
+		"devtron": "^1.4.0",
-		"electron"                   : "^4.0.8",
+		"electron": "^4.0.8",
-		"electron-builder"           : "^20.40.2",
+		"electron-builder": "^20.40.2",
 		"electron-devtools-installer": "^2.2.4",
-		"electron-icon-maker"        : "0.0.4",
+		"electron-icon-maker": "0.0.4",
-		"electron-rebuild"           : "^1.8.4",
+		"electron-rebuild": "^1.8.4",
-		"rimraf"                     : "^2.6.3",
+		"rimraf": "^2.6.3",
-		"xo"                         : "^0.24.0"
+		"xo": "^0.24.0"
 	},
 	"xo": {
 		"envs": [

plugins/auto-confirm-when-paused/front.js

@@ -0,0 +1,12 @@
+// Define global chrome object to be compliant with the extension code
+global.chrome = {
+	runtime: {
+		getManifest: () => ({
+			version: 1
+		})
+	}
+};
+
+module.exports = () => {
+	require("YoutubeNonStop/autoconfirm.js");
+};

readme.md

@@ -1,9 +1,11 @@
 # YouTube Music
+
 [![GitHub release](https://img.shields.io/github/release/th-ch/youtube-music.svg)](https://GitHub.com/th-ch/youtube-music/releases/)
 [![GitHub license](https://img.shields.io/github/license/th-ch/youtube-music.svg)](https://github.com/th-ch/youtube-music/blob/master/LICENSE)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
 [![Build status](https://ci.appveyor.com/api/projects/status/tgre12r150ynvwl2?svg=true)](https://ci.appveyor.com/project/th-ch/youtube-music)
 [![Build Status](https://travis-ci.org/th-ch/youtube-music.svg?branch=master)](https://travis-ci.org/th-ch/youtube-music)
+[![Known Vulnerabilities](https://snyk.io/test/github/th-ch/youtube-music/badge.svg)](https://snyk.io/test/github/th-ch/youtube-music)
 
 ![Screenshot](screenshot.jpg "Screenshot")
 
@@ -22,14 +24,15 @@ You can check out the [latest release](https://github.com/th-ch/youtube-music/re
 - **No Google Login**: remove Google login buttons and links from the interface
 - **Shortcuts**: use your usual shortcuts (media keys, Ctrl/CMD + F…) to control YouTube Music
 - **Navigation**: next/back navigation arrows directly integrated in the interface, like in your favorite browser
+- **Auto confirm when paused**: when the "Continue Watching?" modal appears, automatically click "Yes"
 
 ## Dev
 
 ```sh
 git clone https://github.com/th-ch/youtube-music
 cd youtube-music
-npm install
+yarn
-npm start
+yarn start
 ```
 
 ## Build your own plugins
@@ -80,7 +83,7 @@ module.exports = win => {
 // front.js
 module.exports = () => {
 	// Remove the login button
-	document.querySelector('.sign-in-link.ytmusic-nav-bar').remove();
+	document.querySelector(".sign-in-link.ytmusic-nav-bar").remove();
 };
 ```
 

utils/generate-package-json.js

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+
+const { existsSync, writeFile } = require("fs");
+const { join } = require("path");
+const { promisify } = require("util");
+
+/**
+ * Generates a fake package.json for given packages that don't have any.
+ * Allows electron-builder to resolve them
+ */
+
+const generatePackageJson = async packageName => {
+	var filepath = join("node_modules", packageName, "package.json");
+	if (!existsSync(filepath)) {
+		console.log(
+			`No package.json found for ${packageName} module, generating one…`
+		);
+		pkg = {
+			name: packageName,
+			version: "0.0.0",
+			description: "-",
+			repository: { type: "git", url: "-" },
+			readme: "-"
+		};
+		const writeFileAsync = promisify(writeFile);
+		await writeFileAsync(filepath, JSON.stringify(pkg, null, 2));
+	}
+};
+
+if (require.main === module) {
+	process.argv.slice(2).forEach(async packageName => {
+		await generatePackageJson(packageName);
+	});
+}

youtube-music.css

@@ -23,3 +23,8 @@ ytmusic-app-layout {
 ytmusic-search-box.ytmusic-nav-bar {
 	margin-top: 12px;
 }
+
+/* Blocking annoying elements */
+ytmusic-mealbar-promo-renderer {
+	display: none !important;
+}