Pausing

Author: mgurgel

injected/src/features/duck-player-native.js

@@ -16,7 +16,7 @@ export class DuckPlayerNativeFeature extends ContentFeature {
     /** @type {DuckPlayerNative} */
     current;
 
-    init(args) {
+    async init(args) {
         console.log('DUCK PLAYER NATIVE LOADING', args);
 
         // TODO: May depend on page type
@@ -49,6 +49,20 @@ export class DuckPlayerNativeFeature extends ContentFeature {
         const comms = new DuckPlayerNativeMessages(this.messaging);
         const settings = { selectors };
 
+
+        /** @type {InitialSettings} */
+        let initialSetup;
+
+        // TODO: This seems to get initted twice. Check with Daniel
+        try {
+            initialSetup = await comms.initialSetup();
+        } catch (e) {
+            console.error(e);
+            return;
+        }
+
+        console.log('INITIAL SETUP', initialSetup);
+
         comms.subscribeToURLChange(({ pageType }) => {
             console.log('GOT PAGE TYPE', pageType);
             let next;
@@ -77,9 +91,6 @@ export class DuckPlayerNativeFeature extends ContentFeature {
                 this.current = next;
             }
         });
-
-        /** Fire onReady event */
-        comms.notifyFeatureIsReady();
     }
 }
 

injected/src/features/duckplayer-native/duckplayer-native.js

@@ -76,20 +76,7 @@ export class DuckPlayerNative {
         });
     }
 
-    async init() {
-        /** @type {InitialSettings} */
-        let initialSetup;
-
-        // TODO: This seems to get initted twice. Check with Daniel
-        try {
-            initialSetup = await this.messages.initialSetup();
-        } catch (e) {
-            this.logger.error(e);
-            return;
-        }
-
-        this.logger.log('INITIAL SETUP', initialSetup);
-
+    init() {
         this.logger.log('Running init handlers');
         this.onInit(this.sideEffects, this.logger);
 
@@ -108,6 +95,8 @@ export class DuckPlayerNative {
             this.logger.log('Running load handlers immediately');
             this.onLoad(this.sideEffects, this.logger);
         }
+
+        this.messages.notifyFeatureIsReady();
     }
 }
 
@@ -140,12 +129,19 @@ export function setupDuckPlayerForYouTube(settings, environment, messages) {
 
             const targetElement = document.querySelector(videoElementContainer);
             if (targetElement) {
-                sideEffects.add('stopping video from playing', () => stopVideoFromPlaying(videoElement));
-                sideEffects.add('appending thumbnail', () =>
-                    appendThumbnailOverlay(/** @type {HTMLElement} */ (targetElement), this.environment),
-                );
+
+                if (pause) {
+                    sideEffects.add('stopping video from playing', () => stopVideoFromPlaying(videoElement));
+                    sideEffects.add('appending thumbnail', () =>
+                        appendThumbnailOverlay(/** @type {HTMLElement} */ (targetElement), environment),
+                    );
+                } else {
+                    sideEffects.destroy('stopping video from playing');
+                    sideEffects.destroy('appending thumbnail');
+                }
             }
         });
+
         messages.subscribeToMuteAudio(({ mute }) => {
             logger.log('Running mute audio handler. Mute:', mute);
             muteAudio(mute);

injected/src/features/duckplayer-native/mock-transport.js

@@ -71,7 +71,7 @@ class TestTransport {
                 console.log('PAGE TYPE', response);
                 timeout = 100;
                 break;
-            }
+        }
 
         const callbackTimeout = setTimeout(() => {
             logger.log('Calling handler for', _msg.subscriptionName);

injected/src/features/duckplayer-native/util.js

@@ -118,9 +118,11 @@ export class SideEffects {
 
     /**
      * Remove elements, event listeners etc
+     * @param {string} [name]
      */
-    destroy() {
-        for (const cleanup of this._cleanups) {
+    destroy(name) {
+        const cleanups = name ? this._cleanups.filter(c => c.name === name) : this._cleanups;
+        for (const cleanup of cleanups) {
             if (typeof cleanup.fn === 'function') {
                 try {
                     if (this.debug) {
@@ -134,7 +136,11 @@ export class SideEffects {
                 throw new Error('invalid cleanup');
             }
         }
-        this._cleanups = [];
+        if (name) {
+            this._cleanups = this._cleanups.filter(c => c.name !== name);
+        } else {
+            this._cleanups = [];
+        }
     }
 }