Merge branch 'update-for-new-Netflix-player-2021.08'

1 files changed, 98 insertions, 26 deletions

diff --git a/netflix-immersive.user.js b/netflix-immersive.user.js
index e956541..d302682 100644
--- a/netflix-immersive.user.js
+++ b/netflix-immersive.user.js
@@ -1,13 +1,13 @@
 // ==UserScript==
 // @name Netflix Immersive
 // @description Netflix user script providing a more immersive experience
-// @version 0.0.1
+// @version 0.1.0
 // @namespace com.teddywing
 // @run-at document-idle
 // @match https://www.netflix.com/*
 // ==/UserScript==
 
-// Copyright (c) 2020  Teddy Wing
+// Copyright (c) 2020–2021  Teddy Wing
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -26,13 +26,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var logger_1 = require("./logger");
+// 2021.08.14: This may be obsolete, replaced by `seamless.ts`.
 var controls = {
     // Hide playback controls.
     hide: function () {
         logger_1.default.debug('hide():', 'Hiding controls');
         // When the player is activated, the mouse cursor is shown.
         hide_cursor();
-        var controls_el = document.querySelector('.PlayerControlsNeo__layout.PlayerControlsNeo__layout--active');
+        var controls_el = document.querySelector('.watch-video--bottom-controls-container');
         logger_1.default.debug('hide():', 'Controls:', controls_el);
         controls_el
             .classList
@@ -75,26 +76,47 @@ function hide_cursor() {
 },{"./logger":4}],2:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var controls_1 = require("./controls");
+var logger_1 = require("./logger");
 var wait_element_1 = require("./wait_element");
 // Prevent credits from being minimised.
 function init_mutation_observer(player) {
     var observer = new MutationObserver(function (mutation_list) {
-        for (var i = 0; i < mutation_list.length; i++) {
+        var _loop_1 = function () {
             var mutation = mutation_list[i];
             var player_1 = mutation.target;
+            var video = player_1.querySelector('video');
             // The `postplay` class minimises the movie. Remove it if it gets
             // added to remain in full frame.
-            if (player_1.classList.contains('postplay')) {
-                player_1.classList.remove('postplay');
-                // Playback controls are removed when postplay is activated.
-                // Re-enable them.
-                player_1.click();
+            if (player_1.classList.contains('watch-video--player-view-minimized')) {
+                logger_1.default.debug('fullscreen_credits', 'init_mutation_observer()', 'Maximising');
+                player_1.classList.remove('watch-video--player-view-minimized');
+                // Resize the video to full frame. Otherwise it will shrink for
+                // a second until the click event kicks in.
+                video.style.height = null;
+                video.style.width = 'inherit';
                 // Activating playback controls makes them visible. Keep them
                 // hidden.
-                controls_1.default.hide();
-                return;
+                var style_el_1 = document.createElement('style');
+                document.head.appendChild(style_el_1);
+                var stylesheet = style_el_1.sheet;
+                stylesheet.insertRule("\n\t\t\t\t\t.watch-video--back-container {\n\t\t\t\t\t\tvisibility: hidden !important;\n\t\t\t\t\t}\n\n\t\t\t\t\t.watch-video--bottom-controls-container {\n\t\t\t\t\t\tdisplay: none !important;\n\t\t\t\t\t}", stylesheet.cssRules.length);
+                // Playback controls are removed when postplay is activated.
+                // Re-enable them.
+                var click_area = player_1.children[0];
+                click_area.click();
+                // Once the player controls auto-hide themselves, remove our
+                // forced hiding so that the controls become user-accessible
+                // again.
+                setTimeout(function () {
+                    document.head.removeChild(style_el_1);
+                }, 4000);
+                return { value: void 0 };
             }
+        };
+        for (var i = 0; i < mutation_list.length; i++) {
+            var state_1 = _loop_1();
+            if (typeof state_1 === "object")
+                return state_1.value;
         }
     });
     observer.observe(player, {
@@ -103,36 +125,38 @@ function init_mutation_observer(player) {
 }
 // Initialise the mutation observer when the video player becomes available.
 function init() {
-    wait_element_1.default('.NFPlayer.nf-player-container')
+    wait_element_1.default('.watch-video--player-view')
         .then(function (player) {
         init_mutation_observer(player);
     });
 }
 exports.default = init;
 
-},{"./controls":1,"./wait_element":6}],3:[function(require,module,exports){
+},{"./logger":4,"./wait_element":7}],3:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var fullscreen_credits_1 = require("./fullscreen_credits");
+var logger_1 = require("./logger");
+var seamless_1 = require("./seamless");
 var styles_1 = require("./styles");
 var watch_credits_1 = require("./watch_credits");
 function main() {
+    logger_1.default.debug('Initialising');
     styles_1.default();
     fullscreen_credits_1.default();
     watch_credits_1.default();
+    seamless_1.default();
 }
 main();
 // Reinitialise when the page changes.
 window.onpopstate = main;
 
-},{"./fullscreen_credits":2,"./styles":5,"./watch_credits":7}],4:[function(require,module,exports){
+},{"./fullscreen_credits":2,"./logger":4,"./seamless":5,"./styles":6,"./watch_credits":8}],4:[function(require,module,exports){
 "use strict";
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
@@ -141,24 +165,71 @@ exports.default = {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        console.debug.apply(console, __spreadArrays(['Immersive:'], args));
+        console.debug.apply(console, __spreadArray(['Immersive:'], args));
     }
 };
 
 },{}],5:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var logger_1 = require("./logger");
+var wait_element_1 = require("./wait_element");
+// Hide the cursor when seamless credits are played.
+function init_mutation_observer(player) {
+    var observer = new MutationObserver(function (mutation_list) {
+        var _loop_1 = function () {
+            var mutation = mutation_list[i];
+            var player_1 = mutation.target;
+            var seamless_controls = document.querySelector('.SeamlessControls--container');
+            if (seamless_controls) {
+                logger_1.default.debug('seamless', 'init_mutation_observer()', 'Handling seamless');
+                var style_el_1 = document.createElement('style');
+                // Hide the cursor.
+                document.head.appendChild(style_el_1);
+                var stylesheet = style_el_1.sheet;
+                stylesheet.insertRule("\n\t\t\t\t\tbody {\n\t\t\t\t\t\tcursor: none !important;\n\t\t\t\t\t}", stylesheet.cssRules.length);
+                document.body.onmousemove = function () {
+                    document.head.removeChild(style_el_1);
+                };
+                return { value: void 0 };
+            }
+        };
+        for (var i = 0; i < mutation_list.length; i++) {
+            var state_1 = _loop_1();
+            if (typeof state_1 === "object")
+                return state_1.value;
+        }
+    });
+    observer.observe(player, {
+        childList: true,
+        subtree: true
+    });
+}
+// Initialise the mutation observer when the video player becomes available.
+function init() {
+    wait_element_1.default('.watch-video--player-view')
+        .then(function (player) {
+        init_mutation_observer(player);
+    });
+}
+exports.default = init;
+
+},{"./logger":4,"./wait_element":7}],6:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // Adds CSS to the page to hide superfluous user interface elements.
 function styles() {
     var style = document.createElement('style');
     document.head.appendChild(style);
     var stylesheet = style.sheet;
-    stylesheet.insertRule("\n\t\t/* \"Back to Browse\" button that appears when credits are minimised. */\n\t\t.OriginalsPostPlay-BackgroundTrailer .BackToBrowse,\n\n\t\t/* Age rating. */\n\t\t.player-view-childrens,\n\n\t\t/* \"Watch Credits\" button. */\n\t\t[data-uia=\"watch-credits-seamless-button\"],\n\n\t\t/* Skip buttons. */\n\t\ta[aria-label=\"Skip Intro\"],\n\t\ta[aria-label=\"Skip Recap\"],\n\t\ta[aria-label=\"Next Episode\"],\n\t\t[data-uia=\"next-episode-seamless-button\"] {\n\t\t\tvisibility: hidden !important;\n\t\t}", stylesheet.cssRules.length);
+    // 2021.08.13: May want to remove `.player-view-childrens`, which is now
+    // replaced by `.advisory-container`.
+    stylesheet.insertRule("\n\t\t/* \"Back to Browse\" button that appears when credits are minimised. */\n\t\t.OriginalsPostPlay-BackgroundTrailer .BackToBrowse,\n\t\t.watch-video--seamless-back,\n\n\t\t/* Promo that appears during credis */\n\t\t.OriginalsPostPlay-BackgroundTrailer,\n\t\t.SeamlessControls--background-artwork-visible,\n\t\t.ptrack-container.fill-container,\n\n\t\t/* Age rating. */\n\t\t.player-view-childrens,\n\t\t.advisory-container,\n\n\t\t/* \"Watch Credits\" button. */\n\t\t[data-uia=\"watch-credits-seamless-button\"],\n\n\t\t/* Skip buttons. */\n\t\ta[aria-label=\"Skip Intro\"],\n\t\ta[aria-label=\"Skip Recap\"],\n\t\ta[aria-label=\"Next Episode\"],\n\t\t[data-uia=\"next-episode-seamless-button\"],\n\t\t.watch-video--skip-content {\n\t\t\tvisibility: hidden !important;\n\t\t}", stylesheet.cssRules.length);
     stylesheet.insertRule("\n\t\t/* Remove white border around credits. */\n\t\t.NFPlayer.can-resume:hover {\n\t\t\tborder: none !important;\n\t\t}", stylesheet.cssRules.length);
 }
 exports.default = styles;
 
-},{}],6:[function(require,module,exports){
+},{}],7:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var logger_1 = require("./logger");
@@ -178,12 +249,13 @@ function wait_element(selector) {
 }
 exports.default = wait_element;
 
-},{"./logger":4}],7:[function(require,module,exports){
+},{"./logger":4}],8:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var controls_1 = require("./controls");
 var logger_1 = require("./logger");
 var wait_element_1 = require("./wait_element");
+// 2021.08.14: This may be obsolete, replaced by `seamless.ts`.
 // Remove the "Watch Credits" button.
 function init_mutation_observer(controls_el) {
     var observer = new MutationObserver(function (mutation_list) {
@@ -217,4 +289,4 @@ function init() {
 }
 exports.default = init;
 
-},{"./controls":1,"./logger":4,"./wait_element":6}]},{},[3]);
+},{"./controls":1,"./logger":4,"./wait_element":7}]},{},[3]);