rx-player 3.30.0-dev.2023020100 → 3.30.0-dev.2023022200

package/dist/_esm5.processed/core/init/media_source_content_initializer.js

@@ -69,6 +69,7 @@ import config from "../../config";
 import { MediaError } from "../../errors";
 import log from "../../log";
 import assert from "../../utils/assert";
+import createCancellablePromise from "../../utils/create_cancellable_promise";
 import objectAssign from "../../utils/object_assign";
 import createSharedReference from "../../utils/reference";
 import TaskCanceller from "../../utils/task_canceller";
@@ -127,11 +128,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
         if (this._initialManifestProm !== null) {
             return;
         }
-        this._initialManifestProm = new Promise(function (res, rej) {
-            _this._initCanceller.signal.register(function (err) {
-                _this._manifestFetcher.dispose();
-                rej(err);
-            });
+        this._initialManifestProm = createCancellablePromise(this._initCanceller.signal, function (res, rej) {
             _this._manifestFetcher.addEventListener("warning", function (err) {
                 return _this.trigger("warning", err);
             });
@@ -142,7 +139,10 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
             _this._manifestFetcher.addEventListener("manifestReady", function (manifest) {
                 res(manifest);
             });
-            _this._manifestFetcher.start();
+        });
+        this._manifestFetcher.start();
+        this._initCanceller.signal.register(function () {
+            _this._manifestFetcher.dispose();
         });
     };
     /**
@@ -176,7 +176,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
         this._initCanceller.cancel();
     };
     MediaSourceContentInitializer.prototype._onFatalError = function (err) {
-        if (this._initCanceller.isUsed) {
+        if (this._initCanceller.isUsed()) {
             return;
         }
         this._initCanceller.cancel();
@@ -184,12 +184,9 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
     };
     MediaSourceContentInitializer.prototype._initializeMediaSourceAndDecryption = function (mediaElement, protectionRef) {
         var _this = this;
-        return new Promise(function (resolve, reject) {
+        var initCanceller = this._initCanceller;
+        return createCancellablePromise(initCanceller.signal, function (resolve) {
             var keySystems = _this._settings.keySystems;
-            var initCanceller = _this._initCanceller;
-            var unregisterReject = initCanceller.signal.register(function (err) {
-                reject(err);
-            });
             /** Initialize decryption capabilities. */
             var drmInitRef = initializeContentDecryption(mediaElement, keySystems, protectionRef, {
                 onWarning: function (err) { return _this.trigger("warning", err); },
@@ -200,9 +197,8 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                     return;
                 }
                 stopListeningToDrmUpdates();
-                var mediaSourceCanceller = new TaskCanceller({
-                    cancelOn: initCanceller.signal,
-                });
+                var mediaSourceCanceller = new TaskCanceller();
+                mediaSourceCanceller.linkToSignal(initCanceller.signal);
                 openMediaSource(mediaElement, mediaSourceCanceller.signal)
                     .then(function (mediaSource) {
                     var lastDrmStatus = drmInitRef.getValue();
@@ -211,7 +207,6 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                         drmInitRef.onUpdate(function (newDrmStatus, stopListeningToDrmUpdatesAgain) {
                             if (newDrmStatus.initializationState.type === "initialized") {
                                 stopListeningToDrmUpdatesAgain();
-                                unregisterReject();
                                 resolve({ mediaSource: mediaSource, drmSystemId: newDrmStatus.drmSystemId,
                                     unlinkMediaSource: mediaSourceCanceller });
                                 return;
@@ -219,14 +214,13 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                         }, { emitCurrentValue: true, clearSignal: initCanceller.signal });
                     }
                     else if (drmStatus.initializationState.type === "initialized") {
-                        unregisterReject();
                         resolve({ mediaSource: mediaSource, drmSystemId: drmStatus.drmSystemId,
                             unlinkMediaSource: mediaSourceCanceller });
                         return;
                     }
                 })
                     .catch(function (err) {
-                    if (mediaSourceCanceller.isUsed) {
+                    if (mediaSourceCanceller.isUsed()) {
                         return;
                     }
                     _this._onFatalError(err);
@@ -252,20 +246,21 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                 bufferOnMediaSource(opts, onReloadMediaSource, currentCanceller.signal);
                 function onReloadMediaSource(reloadOrder) {
                     currentCanceller.cancel();
-                    if (initCanceller.isUsed) {
+                    if (initCanceller.isUsed()) {
                         return;
                     }
                     triggerEvent("reloadingMediaSource", null);
-                    if (initCanceller.isUsed) {
+                    if (initCanceller.isUsed()) {
                         return;
                     }
-                    var newCanceller = new TaskCanceller({ cancelOn: initCanceller.signal });
+                    var newCanceller = new TaskCanceller();
+                    newCanceller.linkToSignal(initCanceller.signal);
                     openMediaSource(mediaElement, newCanceller.signal)
                         .then(function (newMediaSource) {
                         recursivelyLoadOnMediaSource(newMediaSource, reloadOrder.position, reloadOrder.autoPlay, newCanceller);
                     })
                         .catch(function (err) {
-                        if (newCanceller.isUsed) {
+                        if (newCanceller.isUsed()) {
                             return;
                         }
                         onFatalError(err);
@@ -305,7 +300,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                         subBufferOptions = objectAssign({ textTrackOptions: textTrackOptions, drmSystemId: drmSystemId }, bufferOptions);
                         segmentFetcherCreator = new SegmentFetcherCreator(transport, segmentRequestOptions, initCanceller.signal);
                         this.trigger("manifestReady", manifest);
-                        if (initCanceller.isUsed) {
+                        if (initCanceller.isUsed()) {
                             return [2 /*return*/];
                         }
                         bufferOnMediaSource = this._startBufferingOnMediaSource.bind(this);
@@ -339,7 +334,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
             segmentBuffersStore.disposeAll();
         });
         var _b = performInitialSeekAndPlay(mediaElement, playbackObserver, initialTime, autoPlay, function (err) { return _this.trigger("warning", err); }, cancelSignal), autoPlayResult = _b.autoPlayResult, initialPlayPerformed = _b.initialPlayPerformed, initialSeekPerformed = _b.initialSeekPerformed;
-        if (cancelSignal.isCancelled) {
+        if (cancelSignal.isCancelled()) {
             return;
         }
         initialPlayPerformed.onUpdate(function (isPerformed, stopListening) {
@@ -368,7 +363,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
             }, { emitCurrentValue: true, clearSignal: cancelSignal });
         })
             .catch(function (err) {
-            if (cancelSignal.isCancelled) {
+            if (cancelSignal.isCancelled()) {
                 return; // Current loading cancelled, no need to trigger the error
             }
             _this._onFatalError(err);
@@ -395,7 +390,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                         discontinuity: imminentDiscontinuity,
                         position: position,
                     });
-                    if (cancelSignal.isCancelled) {
+                    if (cancelSignal.isCancelled()) {
                         return; // Previous call has stopped streams due to a side-effect
                     }
                     // If the status for the last Period indicates that segments are all loaded
@@ -432,14 +427,14 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                 },
                 adaptationChange: function (value) {
                     self.trigger("adaptationChange", value);
-                    if (cancelSignal.isCancelled) {
+                    if (cancelSignal.isCancelled()) {
                         return; // Previous call has stopped streams due to a side-effect
                     }
                     contentTimeBoundariesObserver.onAdaptationChange(value.type, value.period, value.adaptation);
                 },
                 representationChange: function (value) {
                     self.trigger("representationChange", value);
-                    if (cancelSignal.isCancelled) {
+                    if (cancelSignal.isCancelled()) {
                         return; // Previous call has stopped streams due to a side-effect
                     }
                     contentTimeBoundariesObserver.onRepresentationChange(value.type, value.period);
@@ -449,7 +444,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                 periodStreamReady: function (value) { return self.trigger("periodStreamReady", value); },
                 periodStreamCleared: function (value) {
                     contentTimeBoundariesObserver.onPeriodCleared(value.type, value.period);
-                    if (cancelSignal.isCancelled) {
+                    if (cancelSignal.isCancelled()) {
                         return; // Previous call has stopped streams due to a side-effect
                     }
                     self.trigger("periodStreamCleared", value);
@@ -479,7 +474,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                     for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
                         var protectionData = value_1[_i];
                         protectionRef.setValue(protectionData);
-                        if (cancelSignal.isCancelled) {
+                        if (cancelSignal.isCancelled()) {
                             return; // Previous call has stopped streams due to a side-effect
                         }
                     }
@@ -528,7 +523,8 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
         });
         contentTimeBoundariesObserver.addEventListener("endOfStream", function () {
             if (endOfStreamCanceller === null) {
-                endOfStreamCanceller = new TaskCanceller({ cancelOn: cancelSignal });
+                endOfStreamCanceller = new TaskCanceller();
+                endOfStreamCanceller.linkToSignal(cancelSignal);
                 log.debug("Init: end-of-stream order received.");
                 maintainEndOfStream(mediaSource, endOfStreamCanceller.signal);
             }

package/dist/_esm5.processed/core/init/utils/content_time_boundaries_observer.js

@@ -83,7 +83,7 @@ var ContentTimeBoundariesObserver = /** @class */ (function (_super) {
         }, { includeLastObservation: true, clearSignal: cancelSignal });
         manifest.addEventListener("manifestUpdate", function () {
             _this.trigger("durationUpdate", getManifestDuration());
-            if (cancelSignal.isCancelled) {
+            if (cancelSignal.isCancelled()) {
                 return;
             }
             _this._checkEndOfStream();
@@ -128,7 +128,7 @@ var ContentTimeBoundariesObserver = /** @class */ (function (_super) {
                 }
             }
         }
-        if (this._canceller.isUsed) {
+        if (this._canceller.isUsed()) {
             return;
         }
         if (adaptation === null) {

package/dist/_esm5.processed/core/init/utils/create_media_source.js

@@ -16,8 +16,8 @@
 import { clearElementSrc, events, MediaSource_, } from "../../../compat";
 import { MediaError } from "../../../errors";
 import log from "../../../log";
+import createCancellablePromise from "../../../utils/create_cancellable_promise";
 import isNonEmptyString from "../../../utils/is_non_empty_string";
-import TaskCanceller from "../../../utils/task_canceller";
 /**
  * Dispose of ressources taken by the MediaSource:
  *   - Clear the MediaSource' SourceBuffers
@@ -100,19 +100,10 @@ function createMediaSource(mediaElement, unlinkSignal) {
  * @returns {Promise}
  */
 export default function openMediaSource(mediaElement, unlinkSignal) {
-    return new Promise(function (resolve, reject) {
-        var hasResolved = false;
+    return createCancellablePromise(unlinkSignal, function (resolve) {
         var mediaSource = createMediaSource(mediaElement, unlinkSignal);
-        var eventListenerCanceller = new TaskCanceller({ cancelOn: unlinkSignal });
         events.onSourceOpen(mediaSource, function () {
-            eventListenerCanceller.cancel();
-            hasResolved = true;
             resolve(mediaSource);
-        }, eventListenerCanceller.signal);
-        unlinkSignal.register(function (error) {
-            if (!hasResolved) {
-                reject(error);
-            }
-        });
+        }, unlinkSignal);
     });
 }

package/dist/_esm5.processed/core/init/utils/end_of_stream.js

@@ -55,7 +55,8 @@ export default function triggerEndOfStream(mediaSource, cancelSignal) {
         return;
     }
     log.debug("Init: Waiting SourceBuffers to be updated before calling endOfStream.");
-    var innerCanceller = new TaskCanceller({ cancelOn: cancelSignal });
+    var innerCanceller = new TaskCanceller();
+    innerCanceller.linkToSignal(cancelSignal);
     for (var _i = 0, updatingSourceBuffers_1 = updatingSourceBuffers; _i < updatingSourceBuffers_1.length; _i++) {
         var sourceBuffer = updatingSourceBuffers_1[_i];
         onSourceBufferUpdate(sourceBuffer, function () {
@@ -75,10 +76,12 @@ export default function triggerEndOfStream(mediaSource, cancelSignal) {
  * @param {Object} cancelSignal
  */
 export function maintainEndOfStream(mediaSource, cancelSignal) {
-    var endOfStreamCanceller = new TaskCanceller({ cancelOn: cancelSignal });
+    var endOfStreamCanceller = new TaskCanceller();
+    endOfStreamCanceller.linkToSignal(cancelSignal);
     onSourceOpen(mediaSource, function () {
         endOfStreamCanceller.cancel();
-        endOfStreamCanceller = new TaskCanceller({ cancelOn: cancelSignal });
+        endOfStreamCanceller = new TaskCanceller();
+        endOfStreamCanceller.linkToSignal(cancelSignal);
         triggerEndOfStream(mediaSource, endOfStreamCanceller.signal);
     }, cancelSignal);
     triggerEndOfStream(mediaSource, endOfStreamCanceller.signal);

package/dist/_esm5.processed/core/init/utils/get_loaded_reference.js

@@ -26,7 +26,8 @@ import TaskCanceller from "../../../utils/task_canceller";
  * @returns {Object}
  */
 export default function getLoadedReference(playbackObserver, mediaElement, isDirectfile, cancelSignal) {
-    var listenCanceller = new TaskCanceller({ cancelOn: cancelSignal });
+    var listenCanceller = new TaskCanceller();
+    listenCanceller.linkToSignal(cancelSignal);
     var isLoaded = createSharedReference(false, listenCanceller.signal);
     playbackObserver.listen(function (observation) {
         if (observation.rebuffering !== null ||

package/dist/_esm5.processed/core/init/utils/initial_seek_and_play.js

@@ -42,7 +42,7 @@ export default function performInitialSeekAndPlay(mediaElement, playbackObserver
     if (mediaElement.readyState >= READY_STATES.HAVE_METADATA) {
         onLoadedMetadata();
     }
-    cancelSignal.register(function (err) {
+    var deregisterCancellation = cancelSignal.register(function (err) {
         mediaElement.removeEventListener("loadedmetadata", onLoadedMetadata);
         rejectAutoPlay(err);
     });
@@ -60,7 +60,7 @@ export default function performInitialSeekAndPlay(mediaElement, playbackObserver
                 "falsely announced having loaded the content.");
             onWarning(error);
         }
-        if (cancelSignal.isCancelled) {
+        if (cancelSignal.isCancelled()) {
             return;
         }
         playbackObserver.listen(function (observation, stopListening) {
@@ -82,6 +82,7 @@ export default function performInitialSeekAndPlay(mediaElement, playbackObserver
             }
             initialPlayPerformed.setValue(true);
             initialPlayPerformed.finish();
+            deregisterCancellation();
             return resolveAutoPlay({ type: "skipped" });
         }
         var playResult;
@@ -89,19 +90,22 @@ export default function performInitialSeekAndPlay(mediaElement, playbackObserver
             playResult = (_a = mediaElement.play()) !== null && _a !== void 0 ? _a : Promise.resolve();
         }
         catch (playError) {
+            deregisterCancellation();
             return rejectAutoPlay(playError);
         }
         playResult
             .then(function () {
-            if (cancelSignal.isCancelled) {
+            if (cancelSignal.isCancelled()) {
                 return;
             }
             initialPlayPerformed.setValue(true);
             initialPlayPerformed.finish();
+            deregisterCancellation();
             return resolveAutoPlay({ type: "autoplay" });
         })
             .catch(function (playError) {
-            if (cancelSignal.isCancelled) {
+            deregisterCancellation();
+            if (cancelSignal.isCancelled()) {
                 return;
             }
             if (playError instanceof Error && playError.name === "NotAllowedError") {
@@ -111,7 +115,7 @@ export default function performInitialSeekAndPlay(mediaElement, playbackObserver
                 var error = new MediaError("MEDIA_ERR_BLOCKED_AUTOPLAY", "Cannot trigger auto-play automatically: " +
                     "your browser does not allow it.");
                 onWarning(error);
-                if (cancelSignal.isCancelled) {
+                if (cancelSignal.isCancelled()) {
                     return;
                 }
                 return resolveAutoPlay({ type: "autoplay-blocked" });

package/dist/_esm5.processed/core/init/utils/initialize_content_decryption.js

@@ -62,7 +62,8 @@ export default function initializeContentDecryption(mediaElement, keySystems, pr
         ref.finish(); // We know that no new value will be triggered
         return ref;
     }
-    var decryptorCanceller = new TaskCanceller({ cancelOn: cancelSignal });
+    var decryptorCanceller = new TaskCanceller();
+    decryptorCanceller.linkToSignal(cancelSignal);
     var drmStatusRef = createSharedReference({
         initializationState: { type: "uninitialized", value: null },
         drmSystemId: undefined,

package/dist/_esm5.processed/core/init/utils/media_duration_updater.js

@@ -40,7 +40,8 @@ var MediaDurationUpdater = /** @class */ (function () {
         this._currentKnownDuration = currentKnownDuration;
         var isMediaSourceOpened = createMediaSourceOpenReference(mediaSource, this._canceller.signal);
         /** TaskCanceller triggered each time the MediaSource open status changes. */
-        var msUpdateCanceller = new TaskCanceller({ cancelOn: this._canceller.signal });
+        var msUpdateCanceller = new TaskCanceller();
+        msUpdateCanceller.linkToSignal(this._canceller.signal);
         isMediaSourceOpened.onUpdate(onMediaSourceOpenedStatusChanged, { emitCurrentValue: true,
             clearSignal: this._canceller.signal });
         function onMediaSourceOpenedStatusChanged() {
@@ -48,16 +49,15 @@ var MediaDurationUpdater = /** @class */ (function () {
             if (!isMediaSourceOpened.getValue()) {
                 return;
             }
-            msUpdateCanceller = new TaskCanceller({ cancelOn: canceller.signal });
-            /** TaskCanceller triggered each time the content's duration may have change */
-            var durationChangeCanceller = new TaskCanceller({
-                cancelOn: msUpdateCanceller.signal,
-            });
+            msUpdateCanceller = new TaskCanceller();
+            msUpdateCanceller.linkToSignal(canceller.signal);
+            /** TaskCanceller triggered each time the content's duration may have changed */
+            var durationChangeCanceller = new TaskCanceller();
+            durationChangeCanceller.linkToSignal(msUpdateCanceller.signal);
             var reSetDuration = function () {
                 durationChangeCanceller.cancel();
-                durationChangeCanceller = new TaskCanceller({
-                    cancelOn: msUpdateCanceller.signal,
-                });
+                durationChangeCanceller = new TaskCanceller();
+                durationChangeCanceller.linkToSignal(msUpdateCanceller.signal);
                 onDurationMayHaveChanged(durationChangeCanceller.signal);
             };
             currentKnownDuration.onUpdate(reSetDuration, { emitCurrentValue: false,
@@ -68,10 +68,12 @@ var MediaDurationUpdater = /** @class */ (function () {
         function onDurationMayHaveChanged(cancelSignal) {
             var areSourceBuffersUpdating = createSourceBuffersUpdatingReference(mediaSource.sourceBuffers, cancelSignal);
             /** TaskCanceller triggered each time SourceBuffers' updating status changes */
-            var sourceBuffersUpdatingCanceller = new TaskCanceller({ cancelOn: cancelSignal });
+            var sourceBuffersUpdatingCanceller = new TaskCanceller();
+            sourceBuffersUpdatingCanceller.linkToSignal(cancelSignal);
             return areSourceBuffersUpdating.onUpdate(function (areUpdating) {
                 sourceBuffersUpdatingCanceller.cancel();
-                sourceBuffersUpdatingCanceller = new TaskCanceller({ cancelOn: cancelSignal });
+                sourceBuffersUpdatingCanceller = new TaskCanceller();
+                sourceBuffersUpdatingCanceller.linkToSignal(cancelSignal);
                 if (areUpdating) {
                     return;
                 }
@@ -119,19 +121,21 @@ function setMediaSourceDuration(mediaSource, manifest, knownDuration) {
     var newDuration = knownDuration;
     if (newDuration === undefined) {
         if (manifest.isDynamic) {
-            var maxPotentialPos = (_a = manifest.getLivePosition()) !== null && _a !== void 0 ? _a : manifest.getMaximumSafePosition();
-            // Some targets poorly support setting a very high number for durations.
-            // Yet, in dynamic contents, we would prefer setting a value as high as possible
-            // to still be able to seek anywhere we want to (even ahead of the Manifest if
-            // we want to). As such, we put it at a safe default value of 2^32 excepted
-            // when the maximum position is already relatively close to that value, where
-            // we authorize exceptionally going over it.
-            newDuration = Math.max(Math.pow(2, 32), maxPotentialPos + YEAR_IN_SECONDS);
+            newDuration = (_a = manifest.getLivePosition()) !== null && _a !== void 0 ? _a : manifest.getMaximumSafePosition();
         }
         else {
             newDuration = manifest.getMaximumSafePosition();
         }
     }
+    if (manifest.isDynamic) {
+        // Some targets poorly support setting a very high number for durations.
+        // Yet, in dynamic contents, we would prefer setting a value as high as possible
+        // to still be able to seek anywhere we want to (even ahead of the Manifest if
+        // we want to). As such, we put it at a safe default value of 2^32 excepted
+        // when the maximum position is already relatively close to that value, where
+        // we authorize exceptionally going over it.
+        newDuration = Math.max(Math.pow(2, 32), newDuration + YEAR_IN_SECONDS);
+    }
     var maxBufferedEnd = 0;
     for (var i = 0; i < mediaSource.sourceBuffers.length; i++) {
         var sourceBuffer = mediaSource.sourceBuffers[i];

package/dist/_esm5.processed/core/init/utils/stream_events_emitter/stream_events_emitter.js

@@ -35,13 +35,15 @@ export default function streamEventsEmitter(manifest, mediaElement, playbackObse
         scheduledEventsRef.setValue(refreshScheduledEventsList(prev, manifest));
     }, cancelSignal);
     var isPollingEvents = false;
-    var cancelCurrentPolling = new TaskCanceller({ cancelOn: cancelSignal });
+    var cancelCurrentPolling = new TaskCanceller();
+    cancelCurrentPolling.linkToSignal(cancelSignal);
     scheduledEventsRef.onUpdate(function (_a) {
         var scheduledEventsLength = _a.length;
         if (scheduledEventsLength === 0) {
             if (isPollingEvents) {
                 cancelCurrentPolling.cancel();
-                cancelCurrentPolling = new TaskCanceller({ cancelOn: cancelSignal });
+                cancelCurrentPolling = new TaskCanceller();
+                cancelCurrentPolling.linkToSignal(cancelSignal);
                 isPollingEvents = false;
             }
             return;
@@ -127,7 +129,7 @@ export default function streamEventsEmitter(manifest, mediaElement, playbackObse
                 else {
                     onEventSkip(event_2.value);
                 }
-                if (stopSignal.isCancelled) {
+                if (stopSignal.isCancelled()) {
                     return;
                 }
             }
@@ -138,7 +140,7 @@ export default function streamEventsEmitter(manifest, mediaElement, playbackObse
                 if (typeof event_3.onExit === "function") {
                     event_3.onExit();
                 }
-                if (stopSignal.isCancelled) {
+                if (stopSignal.isCancelled()) {
                     return;
                 }
             }

package/dist/_esm5.processed/core/init/utils/throw_on_media_error.js

@@ -21,7 +21,7 @@ import isNullOrUndefined from "../../../utils/is_null_or_undefined";
  * @param {Object} cancelSignal
  */
 export default function listenToMediaError(mediaElement, onError, cancelSignal) {
-    if (cancelSignal.isCancelled) {
+    if (cancelSignal.isCancelled()) {
         return;
     }
     mediaElement.addEventListener("error", onMediaError);

package/dist/_esm5.processed/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.js

@@ -35,6 +35,7 @@ import { getLoggableSegmentId } from "../../../../manifest";
 import areArraysOfNumbersEqual from "../../../../utils/are_arrays_of_numbers_equal";
 import assertUnreachable from "../../../../utils/assert_unreachable";
 import { toUint8Array } from "../../../../utils/byte_parsing";
+import createCancellablePromise from "../../../../utils/create_cancellable_promise";
 import hashBuffer from "../../../../utils/hash_buffer";
 import noop from "../../../../utils/noop";
 import objectAssign from "../../../../utils/object_assign";
@@ -227,15 +228,15 @@ var AudioVideoSegmentBuffer = /** @class */ (function (_super) {
      */
     AudioVideoSegmentBuffer.prototype._addToQueue = function (operation, cancellationSignal) {
         var _this = this;
-        return new Promise(function (resolve, reject) {
-            if (cancellationSignal.cancellationError !== null) {
-                return reject(cancellationSignal.cancellationError);
-            }
+        return createCancellablePromise(cancellationSignal, function (resolve, reject) {
             var shouldRestartQueue = _this._queue.length === 0 &&
                 _this._pendingTask === null;
             var queueItem = objectAssign({ resolve: resolve, reject: reject }, operation);
             _this._queue.push(queueItem);
-            cancellationSignal.register(function (error) {
+            if (shouldRestartQueue) {
+                _this._flush();
+            }
+            return function () {
                 // Remove the corresponding element from the AudioVideoSegmentBuffer's
                 // queue.
                 // If the operation was a pending task, it should still continue to not
@@ -246,11 +247,7 @@ var AudioVideoSegmentBuffer = /** @class */ (function (_super) {
                 }
                 queueItem.resolve = noop;
                 queueItem.reject = noop;
-                reject(error);
-            });
-            if (shouldRestartQueue) {
-                _this._flush();
-            }
+            };
         });
     };
     /**

package/dist/_esm5.processed/core/segment_buffers/implementations/text/html/html_text_segment_buffer.js

@@ -272,7 +272,8 @@ var HTMLTextSegmentBuffer = /** @class */ (function (_super) {
         var proportionalCues = this._currentCues
             .filter(function (cue) { return cue.resolution !== null; });
         if (proportionalCues.length > 0) {
-            this._sizeUpdateCanceller = new TaskCanceller({ cancelOn: this._canceller.signal });
+            this._sizeUpdateCanceller = new TaskCanceller();
+            this._sizeUpdateCanceller.linkToSignal(this._canceller.signal);
             var TEXT_TRACK_SIZE_CHECKS_INTERVAL = config.getCurrent().TEXT_TRACK_SIZE_CHECKS_INTERVAL;
             // update propertionally-sized elements periodically
             var heightWidthRef = onHeightWidthChange(this._textTrackElement, TEXT_TRACK_SIZE_CHECKS_INTERVAL, this._sizeUpdateCanceller.signal);
@@ -297,7 +298,8 @@ var HTMLTextSegmentBuffer = /** @class */ (function (_super) {
         var MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL = config.getCurrent().MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL;
         var startAutoRefresh = function () {
             stopAutoRefresh();
-            autoRefreshCanceller = new TaskCanceller({ cancelOn: cancellationSignal });
+            autoRefreshCanceller = new TaskCanceller();
+            autoRefreshCanceller.linkToSignal(cancellationSignal);
             var intervalId = setInterval(function () { return _this.refreshSubtitles(); }, MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL);
             autoRefreshCanceller.signal.register(function () {
                 clearInterval(intervalId);

package/dist/_esm5.processed/core/segment_buffers/segment_buffers_store.js

@@ -16,6 +16,7 @@
 import { MediaError } from "../../errors";
 import features from "../../features";
 import log from "../../log";
+import createCancellablePromise from "../../utils/create_cancellable_promise";
 import { AudioVideoSegmentBuffer, } from "./implementations";
 var POSSIBLE_BUFFER_TYPES = ["audio",
     "video",
@@ -141,20 +142,23 @@ var SegmentBuffersStore = /** @class */ (function () {
         if (this._areNativeBuffersUsable()) {
             return Promise.resolve();
         }
-        return new Promise(function (res, rej) {
-            var onAddedOrDisabled = function () {
+        return createCancellablePromise(cancelWaitSignal, function (res) {
+            /* eslint-disable-next-line prefer-const */
+            var onAddedOrDisabled;
+            var removeCallback = function () {
+                var indexOf = _this._onNativeBufferAddedOrDisabled.indexOf(onAddedOrDisabled);
+                if (indexOf >= 0) {
+                    _this._onNativeBufferAddedOrDisabled.splice(indexOf, 1);
+                }
+            };
+            onAddedOrDisabled = function () {
                 if (_this._areNativeBuffersUsable()) {
+                    removeCallback();
                     res();
                 }
             };
             _this._onNativeBufferAddedOrDisabled.push(onAddedOrDisabled);
-            cancelWaitSignal.register(function (error) {
-                var indexOf = _this._onNativeBufferAddedOrDisabled.indexOf(onAddedOrDisabled);
-                if (indexOf >= 0) {
-                    _this._onNativeBufferAddedOrDisabled.splice(indexOf, 1);
-                }
-                rej(error);
-            });
+            return removeCallback;
         });
     };
     /**

package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.js

@@ -57,7 +57,8 @@ export default function AdaptationStream(_a, callbacks, parentCancelSignal) {
     var directManualBitrateSwitching = options.manualBitrateSwitchingMode === "direct";
     var manifest = content.manifest, period = content.period, adaptation = content.adaptation;
     /** Allows to cancel everything the `AdaptationStream` is doing. */
-    var adapStreamCanceller = new TaskCanceller({ cancelOn: parentCancelSignal });
+    var adapStreamCanceller = new TaskCanceller();
+    adapStreamCanceller.linkToSignal(parentCancelSignal);
     /**
      * The buffer goal ratio base itself on the value given by `wantedBufferAhead`
      * to determine a more dynamic buffer goal for a given Representation.
@@ -117,9 +118,8 @@ export default function AdaptationStream(_a, callbacks, parentCancelSignal) {
          * terminating and as such the next one might be immediately created
          * recursively.
          */
-        var repStreamTerminatingCanceller = new TaskCanceller({
-            cancelOn: adapStreamCanceller.signal,
-        });
+        var repStreamTerminatingCanceller = new TaskCanceller();
+        repStreamTerminatingCanceller.linkToSignal(adapStreamCanceller.signal);
         var _a = estimateRef.getValue(), representation = _a.representation, manual = _a.manual;
         if (representation === null) {
             return;
@@ -188,11 +188,11 @@ export default function AdaptationStream(_a, callbacks, parentCancelSignal) {
         }
         var repInfo = { type: adaptation.type, period: period, representation: representation };
         currentRepresentation.setValue(representation);
-        if (adapStreamCanceller.isUsed) {
+        if (adapStreamCanceller.isUsed()) {
             return; // previous callback has stopped everything by side-effect
         }
         callbacks.representationChange(repInfo);
-        if (adapStreamCanceller.isUsed) {
+        if (adapStreamCanceller.isUsed()) {
             return; // previous callback has stopped everything by side-effect
         }
         var representationStreamCallbacks = {
@@ -208,13 +208,13 @@ export default function AdaptationStream(_a, callbacks, parentCancelSignal) {
             },
             addedSegment: function (segmentInfo) {
                 abrCallbacks.addedSegment(segmentInfo);
-                if (adapStreamCanceller.isUsed) {
+                if (adapStreamCanceller.isUsed()) {
                     return;
                 }
                 callbacks.addedSegment(segmentInfo);
             },
             terminating: function () {
-                if (repStreamTerminatingCanceller.isUsed) {
+                if (repStreamTerminatingCanceller.isUsed()) {
                     return; // Already handled
                 }
                 repStreamTerminatingCanceller.cancel();
@@ -236,9 +236,8 @@ export default function AdaptationStream(_a, callbacks, parentCancelSignal) {
          * `TaskCanceller` triggered when the `RepresentationStream` calls its
          * `terminating` callback.
          */
-        var terminatingRepStreamCanceller = new TaskCanceller({
-            cancelOn: adapStreamCanceller.signal,
-        });
+        var terminatingRepStreamCanceller = new TaskCanceller();
+        terminatingRepStreamCanceller.linkToSignal(adapStreamCanceller.signal);
         var bufferGoal = createMappedReference(wantedBufferAhead, function (prev) {
             return prev * getBufferGoalRatio(representation);
         }, terminatingRepStreamCanceller.signal);