Fix On Livestream

manifest.json

@@ -1,17 +1,19 @@
 {
-    "description": "This browser extension forces DisneyNOW to use their higher-resolution video stream by imitating the Android app. (It also blocks DisneyNOW ads.)",
     "manifest_version": 2,
     "name": "Force High-Resolution DisneyNOW",
-    "version": "1.0",
+    "author": "TheBrokenRail",
+    "version": "1.3",
+    "description": "This browser extension forces DisneyNOW to use their higher-resolution video stream by imitating the Android app. (It also blocks some DisneyNOW ads.)",
+    "homepage_url": "https://gitea.thebrokenrail.com/TheBrokenRail/force-high-resolution-disneynow",
     "content_scripts": [
         {
             "matches": ["*://disneynow.com/*"],
-            "js": ["content.js"],
-            "run_at": "document_end"
+            "js": ["src/content.js"],
+            "run_at": "document_start"
         }
     ],
     "web_accessible_resources": [
-        "page.js"
+        "src/page.js"
     ],
     "browser_specific_settings": {
         "gecko": {

package.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+rm -f out.xpi
+zip -r out.xpi src manifest.json

src/content.js

@@ -1,5 +1,9 @@
+'use strict';
+
+// Load Extension
 const script = document.createElement('SCRIPT');
-script.src = chrome.runtime.getURL('page.js');
+script.src = chrome.runtime.getURL('src/page.js');
+script.type = 'text/javascript';
 script.onload = function() {
     this.remove();
 };

src/page.js

@@ -1,15 +1,22 @@
 'use strict';
 
 // Constants
-const DEVICE_ID = '031_04'; // Found in the APK as @string/device_id
-const BRAND_ID = '011'; // Selected from the function mapBrandCode(), which is found in embed.min.js (a script loaded by the website)
+const DEVICE_ID = '031_04'; // Found in the APK as the resource @string/device_id. (Default: "001")
+const BRAND_ID = '011'; // Selected from the function mapBrandCode(), which is found in embed.min.js (a script loaded by the website). (Default: "004")
+
+// Lock the reported app name and version to a known working value. (The reported app name and version can determine the video stream format.)
+const APP_NAME = 'webplayer-dc';
+const APP_VERSION = '1.2.7.49';
+
+// Target File
+const TARGET_FILE = 'playmanifest_secure.json';
 
 // Patch XMLHttpRequest.open
 const oldOpen = XMLHttpRequest.prototype.open;
 Object.defineProperty(XMLHttpRequest.prototype, 'open', {
     value: function (method, url, ...args) {
         // Flag
-        this._isTargetUrl = (new URL(url)).pathname.endsWith('/playmanifest_secure.json');
+        this._isTargetUrl = (new URL(url)).pathname.endsWith('/' + TARGET_FILE);
 
         // Call Original Method
         oldOpen.call(this, method, url, ...args);
@@ -19,34 +26,84 @@ Object.defineProperty(XMLHttpRequest.prototype, 'open', {
     writable: false
 });
 
+// Patch XMLHttpRequest.setRequestHeader
+const oldSetRequestHeader = XMLHttpRequest.prototype.setRequestHeader;
+Object.defineProperty(XMLHttpRequest.prototype, 'setRequestHeader', {
+    value: function (name, value) {
+        // Lock App Version
+        if (this._isTargetUrl && name.toLowerCase() === 'appversion') {
+            value = APP_VERSION;
+        }
+
+        // Call Original Method
+        oldSetRequestHeader.call(this, name, value);
+    },
+    enumerable: false,
+    configurable: false,
+    writable: false
+});
+
+// Add resolution info to video player.
+function addResolutionInfo(player) {
+    // Remove existing <p> element (if possible).
+    const id = '__disneynow_resolution_info__';
+    let p = document.getElementById(id);
+    if (p) {
+        p.remove();
+    }
+
+    // Create <p> element
+    p = document.createElement('P');
+    p.id = id;
+
+    // Add <p> element to DOM.
+    player.parentElement.insertBefore(p, player);
+
+    // Set initial resolution text.
+    function setResolutionText(resolution) {
+        p.innerText = `Video Quality: ${resolution}`;
+    }
+    setResolutionText('N/A');
+
+    // Hook into <video> element.
+    const video = player.getElementsByTagName('VIDEO')[0];
+    video.addEventListener("resize", e => setResolutionText(`${e.target.videoWidth}x${e.target.videoHeight}`), false);
+}
+
 // Patch XMLHttpRequest.send
 const oldSend = XMLHttpRequest.prototype.send;
 Object.defineProperty(XMLHttpRequest.prototype, 'send', {
     value: function (body, ...args) {
         // Check
-        if (body && this._isTargetUrl) {
+        if (this._isTargetUrl && body) {
             // Parse Request Body
             const params = new URLSearchParams(body);
 
-            // Pretend to be an Android device
-            if (params.has('device')) {
-                params.set('device', DEVICE_ID);
-            }
-            
-            // Switch brand to one without ads
-            if (params.has('brand')) {
-                params.set('brand', BRAND_ID);
-            }
+            // Pretend to be an Android device.
+            params.set('device', DEVICE_ID);
+            // Switch brand ID to one without ads.
+            params.set('brand', BRAND_ID);
+            // Set recommended video player size to current screen resolution.
+            params.set('vps', `${window.screen.width * window.devicePixelRatio}x${window.screen.height * window.devicePixelRatio}`);
+            // Ensure other miscellaneous parameters are correct.
+            params.set('hdcp_level', '2.3');
+            params.set('hlsver', '6');
+            params.set('app_name', APP_NAME);
 
             // Apply Patch
             body = params.toString();
 
-            // Verify
+            // Log Video Stream URL
             this.addEventListener("load", function () {
                 const obj = JSON.parse(this.responseText);
-                const assetUrl = new URL(obj.video.assets.asset[0].value);
+                const video = obj.video ? obj.video : obj.channels.channel[0];
+                const assetUrl = new URL(video.assets.asset[0].value);
                 console.log('Video Stream URL: ' + assetUrl);
             });
+
+            // Find video player and add resolution info.
+            const player = document.getElementsByClassName('VideoPlayer')[0];
+            addResolutionInfo(player);
         }
 
         // Call Original Method