Update to manifest v3

Unfortunately Netflix keeps breaking Dolby Digital Plus and I don't have time to fix it. PRs welcome.

.gitignore

@@ -1 +1,2 @@
 *.zip
+_metadata

README.md

@@ -9,3 +9,4 @@ Contact me on discord: shirt#1337
 # Based on the following extensions
 - https://github.com/DavidBuchanan314/Turbo-Recadmiumator
 - https://github.com/truedread/netflix-1080p
+- https://github.com/lkmvip/netflix-4K-DDplus

background.js

@@ -1,51 +0,0 @@
-/* eslint-disable no-undef */
-// https://stackoverflow.com/a/45985333
-function getBrowser() {
-	if (typeof chrome !== "undefined") {
-		if (typeof browser !== "undefined") {
-			return "Firefox";
-		} else {
-			return "Chrome";
-		}
-	} else {
-		return "Edge";
-	}
-}
-
-chrome.webRequest.onBeforeRequest.addListener(
-	function (details) {
-		/* Allow our shim to load an untouched copy */
-		if (details.url.endsWith("?no_filter")) {
-			return {};
-		}
-		
-		if (getBrowser() == "Chrome") {
-			return { redirectUrl: chrome.runtime.getURL("cadmium-playercore-shim.js") };
-		}
-		
-		/* Work around funky CORS behaviour on Firefox */
-		else if (getBrowser() == "Firefox") {
-			let filter = browser.webRequest.filterResponseData(details.requestId);
-			let encoder = new TextEncoder();
-			filter.onstop = () => {
-				fetch(browser.runtime.getURL("cadmium-playercore-shim.js")).
-					then(response => response.text()).
-					then(text => {
-						filter.write(encoder.encode(text));
-						filter.close();
-					});
-			};
-			return {};
-		}
-		
-		else {
-			console.error("Unsupported web browser.");
-			return {};
-		}
-	}, {
-		urls: [
-			"*://assets.nflxext.com/*/ffe/player/html/*",
-			"*://www.assets.nflxext.com/*/ffe/player/html/*"
-		]
-	}, ["blocking"]
-);

cadmium-playercore-shim.js

@@ -2,6 +2,28 @@
 // This script runs as a drop-in replacement of the original cadmium-playercore. This is not a content script.
 console.log("Netflix International script active!");
 
+if (window.globalOptions === undefined) {
+    try {
+        window.globalOptions = JSON.parse(document.getElementById("netflix-intl-settings").innerText);
+    } catch(e) {
+        console.error("Could not load settings:", e);
+    }
+}
+
+/* eslint-disable no-undef */
+// https://stackoverflow.com/a/45985333
+function getBrowser() {
+	if (typeof chrome !== "undefined") {
+		if (typeof browser !== "undefined") {
+			return "Firefox";
+		} else {
+			return "Chrome";
+		}
+	} else {
+		return "Edge";
+	}
+}
+
 function do_patch(desc, needle, replacement) {
 	var match = cadmium_src.match(needle);
 	if (!match) {
@@ -19,105 +41,73 @@ function do_patch(desc, needle, replacement) {
 the response before the body of this script finishes executing */
 var request = new XMLHttpRequest();
 var cadmium_url = document.getElementById("player-core-js").src;
-request.open("GET", cadmium_url + "?no_filter", false); // synchronous
+request.open("GET", cadmium_url, false); // synchronous
 request.send();
 
 var cadmium_src = request.responseText;
 
 // eslint-disable-next-line no-unused-vars
-function get_profile_list() {
+function get_profile_list(original_profiles) {
+	var profiles = original_profiles;
 	// Always add h264 main profiles
-	var custom_profiles = [
+	if (original_profiles.includes("playready-h264mpl30-dash")) {
+		profiles = profiles.concat([
 			"playready-h264mpl30-dash",
 			"playready-h264mpl31-dash",
 			"playready-h264mpl40-dash",
-	];
+			"h264mpl30-dash-playready-prk-qc",
-
+			"h264mpl31-dash-playready-prk-qc",
-	if (window.MSMediaKeys) {
+			"h264mpl40-dash-playready-prk-qc",
-		// PlayReady Specific
-
-		// Always add 2.0 AAC profiles, some manifests fail without them
-		custom_profiles = custom_profiles.concat([
-			"heaac-2-dash",
-			"heaac-2hq-dash",
-		]);
-
-		if (globalOptions.useDDPlus) {
-			// Dolby Digital
-			custom_profiles = custom_profiles.concat([
-				"ddplus-2.0-dash",
-			]);
-
-			if (globalOptions.use6Channels) {
-				custom_profiles = custom_profiles.concat([
-					"ddplus-5.1-dash",
-					"ddplus-5.1hq-dash",
-					"ddplus-atmos-dash",
 		]);
 	}
-		} else {
-			// No Dolby Digital
-			if (globalOptions.use6Channels) {
-				custom_profiles = custom_profiles.concat([
-					"heaac-5.1-dash",
-				]);
-			}
-		}
 
-		
+	if (!globalOptions.disableHPL) {
-	} else {
+		if (original_profiles.includes("playready-h264hpl30-dash")) {
-		// Widevine Specific
+			profiles = profiles.concat([
-		custom_profiles = custom_profiles.concat([
 				"playready-h264hpl30-dash",
 				"playready-h264hpl31-dash",
 				"playready-h264hpl40-dash",
 			]);
+		}
+		if (original_profiles.includes("h264hpl30-dash-playready-live")) {
+			profiles = profiles.concat([
+				"h264hpl30-dash-playready-live",
+				"h264hpl31-dash-playready-live",
+				"h264hpl40-dash-playready-live",
+			]);
+		}
+	} else {
+		profiles = profiles.filter(val => !val.includes("h264hpl")); 
+	}
 
-		if (!globalOptions.disableVP9) {
+	if (!globalOptions.disableVP9 && original_profiles.includes("vp9-profile0-L30-dash-cenc")) {
-			// Add VP9 Profiles if wanted
+		profiles = profiles.concat([
-			custom_profiles = custom_profiles.concat([
 			"vp9-profile0-L30-dash-cenc",
 			"vp9-profile0-L31-dash-cenc",
 			"vp9-profile0-L40-dash-cenc",
+		]);
+	} else {
+		profiles = profiles.filter(val => !val.includes("vp9-"));
+	}
+
+	if (!globalOptions.disableAV1 && original_profiles.includes("av1-main-L30-dash-cbcs-prk")) {
+		profiles = profiles.concat([
 			"av1-main-L30-dash-cbcs-prk",
 			"av1-main-L31-dash-cbcs-prk",
 			"av1-main-L40-dash-cbcs-prk",
 		]);
+	} else {
+		profiles = profiles.filter(val => !val.includes("av1-"));
 	}
 
-		custom_profiles = custom_profiles.concat([
-			"heaac-2-dash",
-			"heaac-2hq-dash",
-		]);
-
     if (globalOptions.use6Channels) {
-			custom_profiles = custom_profiles.concat([
+        profiles = profiles.concat([
             "heaac-5.1-dash",
         ]);
     }
-	}
 
-	// Always add subtitles
+	profiles = [...new Set(profiles)].sort();
-	custom_profiles = custom_profiles.concat([
+	return profiles;
-		"dfxp-ls-sdh",
-		"simplesdh",
-		"nflx-cmisc",
-		"imsc1.1",
-		"BIF240",
-		"BIF320",
-	]);
-
-	return custom_profiles;
-}
-
-// eslint-disable-next-line no-unused-vars
-function get_preferred_locale() {
-	return globalOptions.preferredLocale;
-}
-
-// eslint-disable-next-line no-unused-vars
-function get_preferred_text_locale() {
-	return globalOptions.preferredTextLocale;
 }
 
 do_patch(
@@ -128,18 +118,18 @@ do_patch(
 
 do_patch(
 	"Custom profiles",
-	/(viewableId:.,profiles:).,/,
+	/(viewableId:.,profiles:)(.),/,
-	"$1 get_profile_list(),"
+	"$1 get_profile_list($2),"
 );
 
 do_patch(
 	"Custom profiles 2",
-	/(name:"default",profiles:).}/,
+	/(name:"default",profiles:)(.)}/,
-	"$1 get_profile_list()}"
+	"$1 get_profile_list($2)}"
 );
 
 do_patch(
-	"Re-enable Ctrl+Shift+Alt+S menu",
+	"Re-enable Ctrl+Shift+Alt+B menu",
 	/this\...\....\s*&&\s*this\.toggle\(\);/,
 	"this.toggle();"
 );
@@ -154,13 +144,13 @@ if (globalOptions.showAllTracks) {
 do_patch(
 	"Set preferred audio locale",
 	/preferredAudioLocale:.\.preferredAudioLocale/,
-	"preferredAudioLocale: get_preferred_locale()"
+	"preferredAudioLocale: globalOptions.preferredLocale"
 );
 
 do_patch(
 	"Set preferred text locale",
 	/preferredTextLocale:.\.preferredTextLocale/,
-	"preferredTextLocale: get_preferred_text_locale()"
+	"preferredTextLocale: globalOptions.preferredTextLocale"
 );
 
 // run our patched copy of playercore in a non-privileged context on the page

content_script.js

@@ -31,43 +31,32 @@ function chromeStorageGet(opts) {
 	}
 }
 
-function attachScript(resp) {
-	let xhr = resp.target;
-	let mainScript = document.createElement("script");
-	mainScript.type = "application/javascript";
-	if (xhr.status == 200) {
-		mainScript.text = xhr.responseText;
-		document.documentElement.appendChild(mainScript);
-	}
-}
-
 chromeStorageGet({
 	use6Channels: true,
 	showAllTracks: true,
 	setMaxBitrate: false,
 	disableVP9: false,
+	disableAV1: true,
+	disableHPL: false,
 	useDDPlus: false,
 	preferredLocale: null,
 	preferredTextLocale: null,
 }).then(items => {
 	// very messy workaround for accessing chrome storage outside of background / content scripts
 	let mainScript = document.createElement("script");
-	mainScript.type = "application/javascript";
+	mainScript.type = "application/json";
-	mainScript.text = `var globalOptions = JSON.parse('${JSON.stringify(items)}');`; 
+	mainScript.id = "netflix-intl-settings";
+	mainScript.text = JSON.stringify(items); 
 	document.documentElement.appendChild(mainScript);
 }).then(() => {
 	// attach and include additional scripts after we have loaded the main configuration
-	for (let i = 0; i < script_urls.length; i++) {
-		let script = document.createElement("script");
-		script.src = script_urls[i];
-		document.documentElement.appendChild(script);
-	}
 
 	for (let i = 0; i < urls.length; i++) {
-		let mainScriptUrl = chrome.extension.getURL(urls[i]);
+		const mainScriptUrl = chrome.runtime.getURL(urls[i]);
-		let xhr = new XMLHttpRequest();
+		
-		xhr.open("GET", mainScriptUrl, true);
+		const mainScript = document.createElement('script');
-		xhr.onload = attachScript;
+        mainScript.type = 'application/javascript';
-		xhr.send();
+        mainScript.src = mainScriptUrl;
+        document.documentElement.appendChild(mainScript);
 	}
 });

manifest.json

@@ -1,10 +1,10 @@
 {
-	"manifest_version": 2,
+	"manifest_version": 3,
 	"name": "Netflix International",
 	"description": "Displays all available Netflix audio and subtitle tracks.",
-	"version": "2.0.13",
+	"version": "2.0.23",
 	"author": "shirt",
-	"browser_action": {
+	"action": {
 	  "default_icon": "img/icon128.png",
 	  "default_popup": "pages/options.html"
 	},
@@ -19,8 +19,6 @@
 	},
 	"content_scripts": [{
 	  "matches": [
-		"*://assets.nflxext.com/*/ffe/player/html/*",
-		"*://www.assets.nflxext.com/*/ffe/player/html/*",
 		"*://netflix.com/*",
 		"*://www.netflix.com/*"
 	  ],
@@ -29,24 +27,35 @@
 	  "js": ["content_script.js"],
 	  "run_at": "document_start"
 	}],
-	"background": {
-	  "scripts": ["background.js"]
-	},
 	"options_ui": {
 	  "page": "pages/options.html",
 	  "open_in_tab": true
 	},
-	"web_accessible_resources": [
+	"web_accessible_resources": [{
+		"resources": [
 			"cadmium-playercore-shim.js",
 			"netflix_max_bitrate.js",
 			"netflix.css"
 		],
+		"matches": [
+			"*://assets.nflxext.com/*",
+			"*://netflix.com/*",
+			"*://www.netflix.com/*"
+		]
+	}],
+	"declarative_net_request" : {
+		"rule_resources" : [{
+			"id": "1",
+			"enabled": true,
+			"path": "rules.json"
+		}]
+	},
 	"permissions": [
 	  "storage",
-	  "webRequest",
+	  "declarativeNetRequestWithHostAccess"
-	  "webRequestBlocking",
+	],
-	  "*://assets.nflxext.com/*/ffe/player/html/*",
+	"host_permissions": [
-	  "*://www.assets.nflxext.com/*/ffe/player/html/*",
+	  "*://assets.nflxext.com/*",
 	  "*://netflix.com/*",
 	  "*://www.netflix.com/*"
 	]

netflix_max_bitrate.js

@@ -5,18 +5,33 @@ let getElementByXPath = function (xpath) {
 	).singleNodeValue;
 };
 
-const fn = function () {
+let fn = function () {
-	window.dispatchEvent(new KeyboardEvent("keydown", {
+	const VIDEO_SELECT = getElementByXPath("//div[text()='Video Bitrate']") || getElementByXPath("//div[text()='Video Bitrate / VMAF']");
-		keyCode: 83,
+	const AUDIO_SELECT = getElementByXPath("//div[text()='Audio Bitrate']");
+	const BUTTON = getElementByXPath("//button[text()='Override']");
+
+	const videoPlayer = netflix.appContext.state.playerApp.getAPI().videoPlayer;
+	if(!videoPlayer) {
+		console.log("API Not Loading!");
+		return false;
+	}
+	const player = videoPlayer.getVideoPlayerBySessionId(videoPlayer.getAllPlayerSessionIds()[0]);
+	if(!player) {
+		console.log("Video Not Loading!");
+		return false;
+	}
+	if(!player.isPlaying()) {
+		console.log("Video Not Playing!");
+		return false;
+	}
+
+	window.dispatchEvent(new KeyboardEvent('keydown', {
+		keyCode: 66,
 		ctrlKey: true,
 		altKey: true,
 		shiftKey: true,
 	}));
 
-	const VIDEO_SELECT = getElementByXPath("//div[text()='Video Bitrate']");
-	const AUDIO_SELECT = getElementByXPath("//div[text()='Audio Bitrate']");
-	const BUTTON = getElementByXPath("//button[text()='Override']");
-
 	if (!(VIDEO_SELECT && AUDIO_SELECT && BUTTON)){
 		return false;
 	}
@@ -24,40 +39,46 @@ const fn = function () {
 	[VIDEO_SELECT, AUDIO_SELECT].forEach(function (el) {
 		let parent = el.parentElement;
 
-		let options = parent.querySelectorAll("select > option");
+		let options = parent.querySelectorAll('select > option');
 
 		for (var i = 0; i < options.length - 1; i++) {
-			options[i].removeAttribute("selected");
+			options[i].removeAttribute('selected');
 		}
 
-		options[options.length - 1].setAttribute("selected", "selected");
+		options[options.length - 1].setAttribute('selected', 'selected');
 	});
 
+	console.log("Video Playing!");
 	BUTTON.click();
 
 	return true;
 };
 
 let run = function () {
-	if (!fn()) {
+	fn() || setTimeout(run, 100)	
-		setTimeout(run, 100);
-	}
 };
 
 const WATCH_REGEXP = /netflix.com\/watch\/.*/;
 
 let oldLocation;
 
-if(globalOptions.setMaxBitrate) {
+if (window.globalOptions === undefined) {
+    try {
+        window.globalOptions = JSON.parse(document.getElementById("netflix-intl-settings").innerText);
+    } catch(e) {
+        console.error("Could not load settings:", e);
+    }
+}
+if(window.globalOptions.setMaxBitrate ) {
 	console.log("netflix_max_bitrate.js enabled");
+	//setInterval(test, 500);
 	setInterval(function () {
+		
 		let newLocation = window.location.toString();
 
 		if (newLocation !== oldLocation) {
 			oldLocation = newLocation;
-			if (WATCH_REGEXP.test(newLocation)) {
+			WATCH_REGEXP.test(newLocation) && run();
-				run();
-			}
 		}
   }, 500);
 }

pages/options.html

@@ -6,6 +6,7 @@
     <style>
         body {
             min-width: 300px;
+            font-family: Sans-Serif;
         }
     </style>
 </head>
@@ -17,9 +18,11 @@
     <br>
     <input type="checkbox" id="setMaxBitrate"><label for="setMaxBitrate">Automatically select best bitrate available</label>
     <br>
-    <input type="checkbox" id="disableVP9"><label for="disableVP9">Disable VP9/AV1 codecs (Chrome/Firefox)</label>
+    <input type="checkbox" id="disableVP9"><label for="disableVP9">Disable VP9 codec</label>
     <br>
-    <input type="checkbox" id="useDDPlus"><label for="useDDPlus">Use Dolby Digital Plus (Chromium Edge)</label>
+    <input type="checkbox" id="disableAV1"><label for="disableAV1">Disable AV1 codec</label>
+    <br>
+    <input type="checkbox" id="disableHPL"><label for="disableHPL">Disable H264 HPL profile</label>
     <br>
     <label for="preferredLocale">Preferred audio language</label>
     <input list="locales" id="preferredLocale" maxlength="5">

pages/options.js

@@ -4,7 +4,8 @@ function save_options() {
 	const showAllTracks = document.getElementById("showAllTracks").checked;
 	const setMaxBitrate = document.getElementById("setMaxBitrate").checked;
 	const disableVP9 = document.getElementById("disableVP9").checked;
-	const useDDPlus = document.getElementById("useDDPlus").checked;
+	const disableAV1 = document.getElementById("disableAV1").checked;
+	const disableHPL = document.getElementById("disableHPL").checked;
 	const preferredLocale = document.getElementById("preferredLocale").value;
 	const preferredTextLocale = document.getElementById("preferredTextLocale").value;
 
@@ -13,7 +14,8 @@ function save_options() {
 		showAllTracks: showAllTracks,
 		setMaxBitrate: setMaxBitrate,
 		disableVP9: disableVP9,
-		useDDPlus: useDDPlus,
+		disableAV1: disableAV1,
+		disableHPL: disableHPL,
 		preferredLocale: preferredLocale,
 		preferredTextLocale: preferredTextLocale,
 	}, function() {
@@ -30,7 +32,8 @@ function reset_options() {
 	document.getElementById("showAllTracks").checked = true;
 	document.getElementById("setMaxBitrate").checked = false;
 	document.getElementById("disableVP9").checked = false;
-	document.getElementById("useDDPlus").checked = false;
+	document.getElementById("disableAV1").checked = true;
+	document.getElementById("disableHPL").checked = false;
 	document.getElementById("preferredLocale").value = null;
 	document.getElementById("preferredTextLocale").value = null;
 
@@ -39,7 +42,8 @@ function reset_options() {
 		showAllTracks: true,
 		setMaxBitrate: false,
 		disableVP9: false,
-		useDDPlus: false,
+		disableAV1: true,
+		disableHPL: false,
 		preferredLocale: null,
 		preferredTextLocale: null,
 	}, function() {
@@ -57,7 +61,8 @@ function restore_options() {
 		showAllTracks: true,
 		setMaxBitrate: false,
 		disableVP9: false,
-		useDDPlus: false,
+		disableAV1: true,
+		disableHPL: false,
 		preferredLocale: null,
 		preferredTextLocale: null,
 	}, function(items) {
@@ -65,7 +70,8 @@ function restore_options() {
 		document.getElementById("showAllTracks").checked = items.showAllTracks;
 		document.getElementById("setMaxBitrate").checked = items.setMaxBitrate;
 		document.getElementById("disableVP9").checked = items.disableVP9;
-		document.getElementById("useDDPlus").checked = items.useDDPlus;
+		document.getElementById("disableAV1").checked = items.disableAV1;
+		document.getElementById("disableHPL").checked = items.disableHPL;
 		document.getElementById("preferredLocale").value = items.preferredLocale;
 		document.getElementById("preferredTextLocale").value = items.preferredTextLocale;
 	});

rules.json

@@ -0,0 +1,26 @@
+[
+    {
+        "id": 1,
+        "priority": 1,
+        "action": {
+            "type": "redirect",
+            "redirect": { "extensionPath": "/cadmium-playercore-shim.js" }
+        },
+        "condition": {
+            "urlFilter": "*://assets.nflxext.com/*/ffe/player/html/*",
+            "resourceTypes": ["script"]
+        }
+    },
+    {
+        "id": 2,
+        "priority": 1,
+        "action": {
+            "type": "redirect",
+            "redirect": { "extensionPath": "/cadmium-playercore-shim.js" }
+        },
+        "condition": {
+            "urlFilter": "*://assets.nflxext.com/player/html/ffe/*",
+            "resourceTypes": ["script"]
+        }
+    }
+]