Avoiding double throws in error reporting

Author: mgurgel

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

@@ -47,14 +47,14 @@ export class DuckPlayerNativeMessages {
     }
 
     /**
-     * @returns {Promise<import('../duck-player-native.js').InitialSettings>}
+     * @returns {Promise<import('../duck-player-native.js').InitialSettings|null>}
      */
     async initialSetup() {
         try {
             return await this.messaging.request(constants.MSG_NAME_INITIAL_SETUP);
         } catch (e) {
             this.metrics.reportException({ message: e?.message, kind: EXCEPTION_KIND_MESSAGING_ERROR });
-            throw e;
+            return null;
         }
     }
 

injected/src/features/duckplayer/overlay-messages.js

@@ -26,7 +26,7 @@ export class DuckPlayerOverlayMessages {
     }
 
     /**
-     * @returns {Promise<import("../duck-player.js").OverlaysInitialSettings>}
+     * @returns {Promise<import("../duck-player.js").OverlaysInitialSettings|null>}
      */
     async initialSetup() {
         if (this.environment.isIntegrationMode()) {
@@ -42,33 +42,33 @@ export class DuckPlayerOverlayMessages {
             return await this.messaging.request(constants.MSG_NAME_INITIAL_SETUP);
         } catch (e) {
             this.metrics.reportException({ message: e?.message, kind: EXCEPTION_KIND_MESSAGING_ERROR });
-            throw e;
+            return null;
         }
     }
 
     /**
      * Inform the native layer that an interaction occurred
      * @param {import("../duck-player.js").UserValues} userValues
-     * @returns {Promise<import("../duck-player.js").UserValues>}
+     * @returns {Promise<import("../duck-player.js").UserValues|null>}
      */
     async setUserValues(userValues) {
         try {
             return await this.messaging.request(constants.MSG_NAME_SET_VALUES, userValues);
         } catch (e) {
             this.metrics.reportException({ message: e?.message, kind: EXCEPTION_KIND_MESSAGING_ERROR });
-            throw e;
+            return null;
         }
     }
 
     /**
-     * @returns {Promise<import("../duck-player.js").UserValues>}
+     * @returns {Promise<import("../duck-player.js").UserValues|null>}
      */
     async getUserValues() {
         try {
             return await this.messaging.request(constants.MSG_NAME_READ_VALUES, {});
         } catch (e) {
             this.metrics.reportException({ message: e?.message, kind: EXCEPTION_KIND_MESSAGING_ERROR });
-            throw e;
+            return null;
         }
     }
 

injected/src/features/duckplayer/overlays.js

@@ -22,18 +22,17 @@ export async function initOverlays(settings, environment, messages) {
     // bind early to attach all listeners
     const domState = new DomState();
 
-    /** @type {import("../duck-player.js").OverlaysInitialSettings} */
+    /** @type {import("../duck-player.js").OverlaysInitialSettings|null} */
     let initialSetup;
     try {
         initialSetup = await messages.initialSetup();
     } catch (e) {
-        console.warn(e);
+        // console.warn(e);
         return;
     }
 
     if (!initialSetup) {
         const message = 'InitialSetup data is missing';
-        console.warn(message);
         messages.metrics.reportException({ message, kind: EXCEPTION_KIND_INITIAL_SETUP_ERROR });
         return;
     }

injected/src/features/duckplayer/video-overlay.js

@@ -452,9 +452,11 @@ export class VideoOverlay {
                     overlayInteracted: true,
                 })
                 .then((values) => {
-                    this.userValues = values;
+                    if (values) {
+                        this.userValues = values;
+                        this.watchForVideoBeingAdded({ ignoreCache: true, via: 'userOptOut' });
+                    }
                 })
-                .then(() => this.watchForVideoBeingAdded({ ignoreCache: true, via: 'userOptOut' }))
                 .catch((e) => {
                     console.error(e);
                     this.messages.metrics.reportExceptionWithError(e);
@@ -517,7 +519,9 @@ export class VideoOverlay {
         const updatedValues = await this.messages.setUserValues(next);
 
         // this is needed to ensure any future page navigations respect the new settings
-        this.userValues = updatedValues;
+        if (updatedValues) {
+            this.userValues = updatedValues;
+        }
 
         if (this.environment.debug) {
             console.log('user values response:', updatedValues);

special-pages/pages/duckplayer/src/index.js

@@ -19,7 +19,7 @@ export class DuckplayerPage {
     /**
      * This will be sent if the application has loaded, but a client-side error
      * has occurred that cannot be recovered from
-     * @returns {Promise<import("../types/duckplayer.ts").InitialSetupResponse>}
+     * @returns {Promise<import("../types/duckplayer.ts").InitialSetupResponse|null>}
      */
     async initialSetup() {
         if (this.injectName === 'integration') {
@@ -42,7 +42,7 @@ export class DuckplayerPage {
             return await this.messaging.request('initialSetup');
         } catch (e) {
             this.metrics.reportException({ message: e?.message, kind: EXCEPTION_KIND_MESSAGING_ERROR });
-            throw e;
+            return null;
         }
     }
 
@@ -56,7 +56,7 @@ export class DuckplayerPage {
             return await this.messaging.request('setUserValues', userValues);
         } catch (e) {
             this.metrics.reportException({ message: e?.message, kind: EXCEPTION_KIND_MESSAGING_ERROR });
-            throw e;
+            return null;
         }
     }