Update to manifest v3

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

.eslintrc.json

@@ -0,0 +1,29 @@
+{
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es2021": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 12
+    },
+    "rules": {
+        "indent": [
+            "error",
+            "tab"
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+}

.gitignore

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

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 shirt
+Copyright (c) 2022 shirt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,6 +2,11 @@
 Extension to play Netflix with all dubs & subs, 1080p, and 5.1.
 
 - Firefox: https://addons.mozilla.org/en-US/firefox/addon/netflix-international/
-- Chrome (currently taken down): https://chrome.google.com/webstore/detail/netflix-international/pbbaoiomplacehgkfnlejmibhmbebaal
+- Chrome: https://chrome.google.com/webstore/detail/netflix-international/pbbaoiomplacehgkfnlejmibhmbebaal
 
 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,52 +0,0 @@
-// 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.extension.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 = event => {
-				fetch(browser.extension.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

@@ -1,15 +1,26 @@
-/* This script runs as a drop-in replacement of the original cadmium-playercore */
+/* eslint-disable no-undef */
+// 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!");
 
-// promisify chrome storage API for easier chaining
+if (window.globalOptions === undefined) {
-function chromeStorageGet(opts) {
+    try {
-    if (getBrowser() == "Firefox") {
+        window.globalOptions = JSON.parse(document.getElementById("netflix-intl-settings").innerText);
-        return chrome.storage.sync.get(opts);
+    } catch(e) {
+        console.error("Could not load settings:", e);
     }
-    else {
+}
-        return new Promise(resolve => {
+
-            chrome.storage.sync.get(opts, resolve);
+/* 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";
 	}
 }
 
@@ -30,40 +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;
 
-function get_profile_list() {
+// eslint-disable-next-line no-unused-vars
-	custom_profiles = [
+function get_profile_list(original_profiles) {
+	var profiles = original_profiles;
+	// Always add h264 main 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",
+			"h264mpl40-dash-playready-prk-qc",
+		]);
+	}
+
+	if (!globalOptions.disableHPL) {
+		if (original_profiles.includes("playready-h264hpl30-dash")) {
+			profiles = profiles.concat([
 				"playready-h264hpl30-dash",
 				"playready-h264hpl31-dash",
 				"playready-h264hpl40-dash",
-		"heaac-2-dash",
+			]);
-		"heaac-2hq-dash",
+		}
-		"simplesdh",
+		if (original_profiles.includes("h264hpl30-dash-playready-live")) {
-		"nflx-cmisc",
+			profiles = profiles.concat([
-		"BIF240",
+				"h264hpl30-dash-playready-live",
-		"BIF320"
+				"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")) {
-		custom_profiles = custom_profiles.concat([
+		profiles = 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-"));
 	}
 
     if (globalOptions.use6Channels) {
-		custom_profiles.push("heaac-5.1-dash");
+        profiles = profiles.concat([
+            "heaac-5.1-dash",
+        ]);
     }
 
-	return custom_profiles;
+	profiles = [...new Set(profiles)].sort();
+	return profiles;
 }
 
 do_patch(
@@ -74,35 +118,40 @@ 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",
-	/this\...\....\s*\&\&\s*this\.toggle\(\);/,
-	"this.toggle();"
 );
 
-if (globalOptions.use6Channels) {
+do_patch(
-	do_patch("Show channel indicator",
+	"Re-enable Ctrl+Shift+Alt+B menu",
-	/displayName:([^\.]{1})\.([^,]{2}),/,
+	/this\...\....\s*&&\s*this\.toggle\(\);/,
-	"displayName:$1.$2 + \" - \" + $1.channelsFormat,"
+	"this.toggle();"
-	)
+);
-}
 
 if (globalOptions.showAllTracks) {
 	do_patch("Show all audio tracks",
 		/"showAllSubDubTracks",!1/,
 		"\"showAllSubDubTracks\",!0"
-	)
+	);
 }
 
-// run our patched copy of playercore
+do_patch(
-eval(cadmium_src);
+	"Set preferred audio locale",
+	/preferredAudioLocale:.\.preferredAudioLocale/,
+	"preferredAudioLocale: globalOptions.preferredLocale"
+);
+
+do_patch(
+	"Set preferred text locale",
+	/preferredTextLocale:.\.preferredTextLocale/,
+	"preferredTextLocale: globalOptions.preferredTextLocale"
+);
+
+// run our patched copy of playercore in a non-privileged context on the page
+window.Function(cadmium_src)();

content_script.js

@@ -1,8 +1,9 @@
+/* eslint-disable no-undef */
 
-script_urls = [];
+var script_urls = [];
 
-urls = [
+var urls = [
-    'netflix_max_bitrate.js'
+	"netflix_max_bitrate.js"
 ];
 
 // https://stackoverflow.com/a/45985333
@@ -30,40 +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');
+	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,11 +1,12 @@
 {
-	"manifest_version": 2,
+	"manifest_version": 3,
 	"name": "Netflix International",
-	"description": "Displays all available Netflix audio tracks.",
+	"description": "Displays all available Netflix audio and subtitle tracks.",
-	"version": "2.0.0",
+	"version": "2.0.23",
 	"author": "shirt",
-	"browser_action": {
+	"action": {
-	  "default_icon": "img/icon128.png"
+	  "default_icon": "img/icon128.png",
+	  "default_popup": "pages/options.html"
 	},
 	"browser_specific_settings": {
 		"gecko": {
@@ -18,32 +19,43 @@
 	},
 	"content_scripts": [{
 	  "matches": [
-		"*://assets.nflxext.com/*/ffe/player/html/*",
-		"*://www.assets.nflxext.com/*/ffe/player/html/*",
 		"*://netflix.com/*",
 		"*://www.netflix.com/*"
 	  ],
 	  "all_frames": true,
+	  "css": ["netflix.css"],
 	  "js": ["content_script.js"],
 	  "run_at": "document_start"
 	}],
-	"background": {
-	  "scripts": ["background.js"]
-	},
 	"options_ui": {
 	  "page": "pages/options.html",
-	  "open_in_tab": false
+	  "open_in_tab": true
 	},
-	"web_accessible_resources": [
+	"web_accessible_resources": [{
+		"resources": [
 			"cadmium-playercore-shim.js",
-	  "netflix_max_bitrate.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.css

@@ -0,0 +1,29 @@
+/* Fixes audio and subtitle picker scrolling */
+
+.watch-video--selector-audio-subtitle {
+    display: flex;
+}
+
+div[data-uia="selector-audio-subtitle"] {
+    white-space: normal;
+}
+
+div[data-uia="selector-audio-subtitle"] > div {
+    display: flex;
+    flex-direction: column;
+}
+
+div[data-uia="selector-audio-subtitle"] > div > ul {
+    overflow-y: auto;
+}
+
+/* Make more tracks visible at once */
+
+div[data-uia="selector-audio-subtitle"] > div > h3 {
+    padding-bottom: 0.75rem;
+}
+
+div[data-uia="selector-audio-subtitle"] > div > ul > li {
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+}

netflix_max_bitrate.js

@@ -1,21 +1,37 @@
+/* eslint-disable no-undef */
 let getElementByXPath = function (xpath) {
 	return document.evaluate(
 		xpath, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null
 	).singleNodeValue;
 };
 
-const fn = function () {
+let fn = function () {
+	const VIDEO_SELECT = getElementByXPath("//div[text()='Video Bitrate']") || getElementByXPath("//div[text()='Video Bitrate / VMAF']");
+	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: 83,
+		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;
 	}
@@ -32,31 +48,37 @@ const fn = function () {
 		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

@@ -3,6 +3,12 @@
 
 <head>
     <title>Netflix International Options</title>
+    <style>
+        body {
+            min-width: 300px;
+            font-family: Sans-Serif;
+        }
+    </style>
 </head>
 
 <body>
@@ -13,9 +19,59 @@
     <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 codec</label>
+    <br>
+    <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">
+    <br>
+    <label for="preferredTextLocale">Preferred subtitle language</label>
+    <input list="locales" id="preferredTextLocale" maxlength="5">
+    <br>
 
+    <datalist name="locales" id="locales">
+        <option value="ar">
+        <option value="cs">
+        <option value="da">
+        <option value="de">
+        <option value="el">
+        <option value="en">
+        <option value="es">
+        <option value="es-ES">
+        <option value="fi">
+        <option value="fr">
+        <option value="he">
+        <option value="hi">
+        <option value="hr">
+        <option value="hu">
+        <option value="id">
+        <option value="it">
+        <option value="ja">
+        <option value="ko">
+        <option value="ms">
+        <option value="nb">
+        <option value="nl">
+        <option value="pl">
+        <option value="pt">
+        <option value="pt-BR">
+        <option value="ro">
+        <option value="ru">
+        <option value="sv">
+        <option value="ta">
+        <option value="te">
+        <option value="th">
+        <option value="tr">
+        <option value="uk">
+        <option value="vi">
+        <option value="zh">
+    </datalist>
+
+    <br>
     <div id="status"></div>
     <button id="save">Save</button>
+    <button id="reset">Reset</button>
 
     <script src="options.js"></script>
 </body>

pages/options.js

@@ -1,20 +1,57 @@
+/* eslint-disable no-undef */
 function save_options() {
 	const use6Channels = document.getElementById("use51").checked;
 	const showAllTracks = document.getElementById("showAllTracks").checked;
 	const setMaxBitrate = document.getElementById("setMaxBitrate").checked;
 	const disableVP9 = document.getElementById("disableVP9").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;
 
 	chrome.storage.sync.set({
-        use6Channels,
+		use6Channels: use6Channels,
-        showAllTracks,
+		showAllTracks: showAllTracks,
-        setMaxBitrate,
+		setMaxBitrate: setMaxBitrate,
-        disableVP9,
+		disableVP9: disableVP9,
+		disableAV1: disableAV1,
+		disableHPL: disableHPL,
+		preferredLocale: preferredLocale,
+		preferredTextLocale: preferredTextLocale,
 	}, function() {
-        var status = document.getElementById('status');
+		var status = document.getElementById("status");
-        status.textContent = 'Options saved.';
+		status.textContent = "Options saved.";
 		setTimeout(function() {
-            status.textContent = '';
+			status.textContent = "";
-        }, 750);
+		}, 2000);
+	});
+}
+
+function reset_options() {
+	document.getElementById("use51").checked = true;
+	document.getElementById("showAllTracks").checked = true;
+	document.getElementById("setMaxBitrate").checked = false;
+	document.getElementById("disableVP9").checked = false;
+	document.getElementById("disableAV1").checked = true;
+	document.getElementById("disableHPL").checked = false;
+	document.getElementById("preferredLocale").value = null;
+	document.getElementById("preferredTextLocale").value = null;
+
+	chrome.storage.sync.set({
+		use6Channels: true,
+		showAllTracks: true,
+		setMaxBitrate: false,
+		disableVP9: false,
+		disableAV1: true,
+		disableHPL: false,
+		preferredLocale: null,
+		preferredTextLocale: null,
+	}, function() {
+		var status = document.getElementById("status");
+		status.textContent = "Options reset.";
+		setTimeout(function() {
+			status.textContent = "";
+		}, 2000);
 	});
 }
 
@@ -24,13 +61,22 @@ function restore_options() {
 		showAllTracks: true,
 		setMaxBitrate: false,
 		disableVP9: false,
+		disableAV1: true,
+		disableHPL: false,
+		preferredLocale: null,
+		preferredTextLocale: null,
 	}, function(items) {
 		document.getElementById("use51").checked = items.use6Channels;
 		document.getElementById("showAllTracks").checked = items.showAllTracks;
 		document.getElementById("setMaxBitrate").checked = items.setMaxBitrate;
 		document.getElementById("disableVP9").checked = items.disableVP9;
+		document.getElementById("disableAV1").checked = items.disableAV1;
+		document.getElementById("disableHPL").checked = items.disableHPL;
+		document.getElementById("preferredLocale").value = items.preferredLocale;
+		document.getElementById("preferredTextLocale").value = items.preferredTextLocale;
 	});
 }
 
-document.addEventListener('DOMContentLoaded', restore_options);
+document.addEventListener("DOMContentLoaded", restore_options);
-document.getElementById('save').addEventListener('click', save_options);
+document.getElementById("save").addEventListener("click", save_options);
+document.getElementById("reset").addEventListener("click", reset_options);

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"]
+        }
+    }
+]