chore: Use promiseWithTimeout where possible (#7716)

shaka-project · Dec 5, 2024 · 554c326 · 554c326
1 parent 1d44f70
commit 554c326
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/lib/media/drm_engine.js b/lib/media/drm_engine.js
@@ -2012,18 +2012,10 @@ shaka.media.DrmEngine = class {
    * @private
    */
   async closeSession_(session) {
-    const DrmEngine = shaka.media.DrmEngine;
-
-    const timeout = new Promise((resolve, reject) => {
-      const timer = new shaka.util.Timer(reject);
-      timer.tickAfter(DrmEngine.CLOSE_TIMEOUT_);
-    });
-
     try {
-      await Promise.race([
-        Promise.all([session.close(), session.closed]),
-        timeout,
-      ]);
+      await shaka.util.Functional.promiseWithTimeout(
+          shaka.media.DrmEngine.CLOSE_TIMEOUT_,
+          Promise.all([session.close(), session.closed]));
     } catch (e) {
       shaka.log.warning('Timeout waiting for session close');
     }

diff --git a/lib/player.js b/lib/player.js
@@ -3142,15 +3142,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       fullyLoaded.reject(this.videoErrorToShakaError_());
     });
 
-    const timeout = new Promise((resolve, reject) => {
-      const timer = new shaka.util.Timer(reject);
-      timer.tickAfter(this.config_.streaming.loadTimeout);
-    });
-
-    await Promise.race([
-      fullyLoaded,
-      timeout,
-    ]);
+    await shaka.util.Functional.promiseWithTimeout(
+        this.config_.streaming.loadTimeout, fullyLoaded);
 
     const isLive = this.isLive();