silence createOrLoad unhandled rejections in attach

shaka-project · Oct 11, 2022 · e00ec59 · e00ec59
1 parent 92c75b9
commit e00ec59
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/lib/media/drm_engine.js b/lib/media/drm_engine.js
@@ -510,7 +510,10 @@ shaka.media.DrmEngine = class {
       await this.attachMediaKeys_();
     }
 
-    this.createOrLoad();
+    this.createOrLoad().catch(() => {
+      // Silence errors
+      // createOrLoad will run async, errors are triggered through onError_
+    });
 
     // Explicit init data for any one stream or an offline session is
     // sufficient to suppress 'encrypted' events for all streams.

diff --git a/test/media/drm_engine_unit.js b/test/media/drm_engine_unit.js
@@ -1088,32 +1088,32 @@ describe('DrmEngine', () => {
           message, nativeError, undefined));
     });
 
-    // it('should throw a OFFLINE_SESSION_REMOVED error', async () => {
-    //   // Given persistent session is not available
-    //   session1.load.and.returnValue(false);
+    it('should throw a OFFLINE_SESSION_REMOVED error', async () => {
+      // Given persistent session is not available
+      session1.load.and.returnValue(false);
 
-    //   onErrorSpy.and.stub();
+      onErrorSpy.and.stub();
 
-    //   await drmEngine.initForPlayback(
-    //       manifest.variants, ['persistent-session-id']);
-    //   await drmEngine.attach(mockVideo);
+      await drmEngine.initForPlayback(
+          manifest.variants, ['persistent-session-id']);
+      await drmEngine.attach(mockVideo);
 
-    //   expect(drmEngine.initialized()).toBe(true);
+      expect(drmEngine.initialized()).toBe(true);
 
-    //   await Util.shortDelay();
+      await Util.shortDelay();
 
-    //   expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(1);
-    //   expect(mockMediaKeys.createSession)
-    //       .toHaveBeenCalledWith('persistent-license');
-    //   expect(session1.load).toHaveBeenCalledWith('persistent-session-id');
+      expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(1);
+      expect(mockMediaKeys.createSession)
+          .toHaveBeenCalledWith('persistent-license');
+      expect(session1.load).toHaveBeenCalledWith('persistent-session-id');
 
-    //   expect(onErrorSpy).toHaveBeenCalled();
-    //   const error = onErrorSpy.calls.argsFor(0)[0];
-    //   shaka.test.Util.expectToEqualError(error, new shaka.util.Error(
-    //       shaka.util.Error.Severity.CRITICAL,
-    //       shaka.util.Error.Category.DRM,
-    //       shaka.util.Error.Code.OFFLINE_SESSION_REMOVED));
-    // });
+      expect(onErrorSpy).toHaveBeenCalled();
+      const error = onErrorSpy.calls.argsFor(0)[0];
+      shaka.test.Util.expectToEqualError(error, new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.DRM,
+          shaka.util.Error.Code.OFFLINE_SESSION_REMOVED));
+    });
 
     it('uses persistent session ids when available', async () => {
       const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;