shaka-player 4.12.8 → 4.13.0

package/lib/net/networking_engine.js

@@ -53,6 +53,8 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    *   of whether the switching is allowed.
    * @param {shaka.net.NetworkingEngine.OnHeadersReceived=} onHeadersReceived
    *   Called when the headers are received for a download.
+   * @param {shaka.net.NetworkingEngine.OnDownloadCompleted=
+   *        } onDownloadCompleted Called when a download completed successfully.
    * @param {shaka.net.NetworkingEngine.OnDownloadFailed=} onDownloadFailed
    *   Called when a download fails, for any reason.
    * @param {shaka.net.NetworkingEngine.OnRequest=} onRequest
@@ -62,8 +64,8 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    * @param {shaka.net.NetworkingEngine.OnResponse=} onResponse
    *   Called when receive the response
    */
-  constructor(onProgressUpdated, onHeadersReceived, onDownloadFailed,
-      onRequest, onRetry, onResponse) {
+  constructor(onProgressUpdated, onHeadersReceived, onDownloadCompleted,
+      onDownloadFailed, onRequest, onRetry, onResponse) {
     super();
 
     /** @private {boolean} */
@@ -72,10 +74,10 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     /** @private {!shaka.util.OperationManager} */
     this.operationManager_ = new shaka.util.OperationManager();
 
-    /** @private {!Set.<shaka.extern.RequestFilter>} */
+    /** @private {!Set<shaka.extern.RequestFilter>} */
     this.requestFilters_ = new Set();
 
-    /** @private {!Set.<shaka.extern.ResponseFilter>} */
+    /** @private {!Set<shaka.extern.ResponseFilter>} */
     this.responseFilters_ = new Set();
 
     /** @private {?shaka.net.NetworkingEngine.onProgressUpdated} */
@@ -84,6 +86,9 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     /** @private {?shaka.net.NetworkingEngine.OnHeadersReceived} */
     this.onHeadersReceived_ = onHeadersReceived || null;
 
+    /** @private {?shaka.net.NetworkingEngine.OnDownloadCompleted} */
+    this.onDownloadCompleted_ = onDownloadCompleted || null;
+
     /** @private {?shaka.net.NetworkingEngine.OnDownloadFailed} */
     this.onDownloadFailed_ = onDownloadFailed || null;
 
@@ -104,6 +109,9 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
 
     /** @private {number} */
     this.minBytesForProgressEvents_ = 16e3;
+
+    /** @private {!Map<string, string>} */
+    this.hostCommonAccessTokenMap_ = new Map();
   }
 
   /**
@@ -241,6 +249,15 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     this.responseFilters_.clear();
   }
 
+  /**
+   * Clears Common Access Token map.
+   *
+   * @export
+   */
+  clearCommonAccessTokenMap() {
+    this.hostCommonAccessTokenMap_.clear();
+  }
+
   /**
    * Gets a copy of the default retry parameters.
    *
@@ -258,7 +275,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
   /**
    * Makes a simple network request for the given URIs.
    *
-   * @param {!Array.<string>} uris
+   * @param {!Array<string>} uris
    * @param {shaka.extern.RetryParameters} retryParams
    * @param {?function(BufferSource):!Promise=} streamDataCallback
    * @return {shaka.extern.Request}
@@ -289,6 +306,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     this.destroyed_ = true;
     this.requestFilters_.clear();
     this.responseFilters_.clear();
+    this.hostCommonAccessTokenMap_.clear();
 
     // FakeEventTarget implements IReleasable
     super.release();
@@ -453,8 +471,8 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    * @param {shaka.net.NetworkingEngine.RequestType} type
    * @param {shaka.extern.Request} request
    * @param {(shaka.extern.RequestContext|undefined)} context
-   * @param {shaka.net.NetworkingEngine.NumBytesRemainingClass}
-   *            numBytesRemainingObj
+   * @param {shaka.net.NetworkingEngine.NumBytesRemainingClass
+   *        } numBytesRemainingObj
    * @return {!shaka.extern.IAbortableOperation.<
    *            shaka.net.NetworkingEngine.ResponseAndGotProgress>}
    * @private
@@ -477,8 +495,8 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    * @param {!shaka.net.Backoff} backoff
    * @param {number} index
    * @param {?shaka.util.Error} lastError
-   * @param {shaka.net.NetworkingEngine.NumBytesRemainingClass}
-   *     numBytesRemainingObj
+   * @param {shaka.net.NetworkingEngine.NumBytesRemainingClass
+   *        } numBytesRemainingObj
    * @return {!shaka.extern.IAbortableOperation.<
    *               shaka.net.NetworkingEngine.ResponseAndGotProgress>}
    * @private
@@ -533,6 +551,13 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     }
     const progressSupport = object.progressSupport;
 
+    // Add headers from CommonAccessToken
+    const commonAccessToken =
+        this.hostCommonAccessTokenMap_.get(uri.getDomain());
+    if (commonAccessToken) {
+      request.headers[shaka.net.NetworkingEngine.CommonAccessTokenHeaderName_] =
+          commonAccessToken;
+    }
 
     // Every attempt must have an associated backoff.attempt() call so that the
     // accounting is correct.
@@ -624,6 +649,14 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
       if (response.timeMs == undefined) {
         response.timeMs = Date.now() - startTimeMs;
       }
+      // Process headers to get the new CommonAccessToken
+      const commonAccessTokenHeader = response.headers[
+          shaka.net.NetworkingEngine.CommonAccessTokenHeaderName_];
+      if (commonAccessTokenHeader) {
+        const responseHost = new goog.Uri(response.uri);
+        this.hostCommonAccessTokenMap_.set(
+            responseHost.getDomain(), commonAccessTokenHeader);
+      }
       const responseAndGotProgress = {
         response: response,
         gotProgress: gotProgress,
@@ -635,7 +668,9 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
           this.onHeadersReceived_(response.headers, request, type);
         }
       }
-
+      if (this.onDownloadCompleted_) {
+        this.onDownloadCompleted_(request, response);
+      }
       return responseAndGotProgress;
     }, (error) => {
       if (connectionTimer) {
@@ -700,8 +735,8 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
 
   /**
    * @param {shaka.net.NetworkingEngine.RequestType} type
-   * @param {shaka.net.NetworkingEngine.ResponseAndGotProgress}
-   *        responseAndGotProgress
+   * @param {shaka.net.NetworkingEngine.ResponseAndGotProgress
+   *        } responseAndGotProgress
    * @param {shaka.extern.RequestContext=} context
    * @return {!shaka.extern.IAbortableOperation.<
    *               shaka.net.NetworkingEngine.ResponseAndGotProgress>}
@@ -828,12 +863,12 @@ class extends shaka.util.AbortableOperation {
    *   shaka.util.Error object using the error code OPERATION_ABORTED.
    * @param {function():!Promise} onAbort
    *   Will be called by this object to abort the underlying operation.  This
-   *   is not cancelation, and will not necessarily result in any work being
+   *   is not cancellation, and will not necessarily result in any work being
    *   undone.  abort() should return a Promise which is resolved when the
    *   underlying operation has been aborted.  The returned Promise should
    *   never be rejected.
-   * @param {shaka.net.NetworkingEngine.NumBytesRemainingClass}
-   *   numBytesRemainingObj
+   * @param {shaka.net.NetworkingEngine.NumBytesRemainingClass
+   *        } numBytesRemainingObj
    */
   constructor(promise, onAbort, numBytesRemainingObj) {
     super(promise, onAbort);
@@ -850,6 +885,14 @@ class extends shaka.util.AbortableOperation {
   }
 };
 
+/**
+ * @const {string}
+ * @private
+ */
+shaka.net.NetworkingEngine.CommonAccessTokenHeaderName_ =
+  'common-access-token';
+
+
 /**
  * Request types.  Allows a filter to decide which requests to read/alter.
  *
@@ -929,7 +972,7 @@ shaka.net.NetworkingEngine.SchemeObject;
 /**
  * Contains the scheme plugins.
  *
- * @private {!Object.<string, shaka.net.NetworkingEngine.SchemeObject>}
+ * @private {!Object<string, shaka.net.NetworkingEngine.SchemeObject>}
  */
 shaka.net.NetworkingEngine.schemes_ = {};
 
@@ -952,7 +995,7 @@ shaka.net.NetworkingEngine.ResponseAndGotProgress;
 
 /**
  * @typedef {function(
- *    !Object.<string, string>,
+ *    !Object<string, string>,
  *    !shaka.extern.Request,
  *    !shaka.net.NetworkingEngine.RequestType)}
  *
@@ -979,6 +1022,18 @@ shaka.net.NetworkingEngine.OnHeadersReceived;
  */
 shaka.net.NetworkingEngine.onProgressUpdated;
 
+/**
+ * @typedef {function(
+ *    !shaka.extern.Request,
+ *    !shaka.extern.Response)}
+ *
+ * @description
+ * A callback function that notifies the player when a download completed
+ * successfully.
+ * @export
+ */
+shaka.net.NetworkingEngine.OnDownloadCompleted;
+
 /**
  * @typedef {function(
  *    !shaka.extern.Request,

package/lib/net/networking_utils.js

@@ -19,7 +19,7 @@ shaka.net.NetworkingUtils = class {
    * @param {string} uri
    * @param {!shaka.net.NetworkingEngine} netEngine
    * @param {shaka.extern.RetryParameters} retryParams
-   * @return {!Promise.<string>}
+   * @return {!Promise<string>}
    */
   static async getMimeType(uri, netEngine, retryParams) {
     const extension = shaka.net.NetworkingUtils.getExtension_(uri);
@@ -73,7 +73,7 @@ shaka.net.NetworkingUtils = class {
 };
 
 /**
- * @const {!Object.<string, string>}
+ * @const {!Object<string, string>}
  * @private
  */
 shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_ = {
@@ -104,9 +104,12 @@ shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_ = {
   'lrc': 'application/x-subtitle-lrc',
   'ssa': 'text/x-ssa',
   'ass': 'text/x-ssa',
+  'jpeg': 'image/jpeg',
   'jpg': 'image/jpeg',
   'png': 'image/png',
   'svg': 'image/svg+xml',
   'webp': 'image/webp',
   'avif': 'image/avif',
+  'html': 'text/html',
+  'htm': 'text/html',
 };

package/lib/offline/download_info.js

@@ -22,8 +22,9 @@ shaka.offline.DownloadInfo = class {
    * @param {number} estimateId
    * @param {number} groupId
    * @param {boolean} isInitSegment
+   * @param {number} refPosition
    */
-  constructor(ref, estimateId, groupId, isInitSegment) {
+  constructor(ref, estimateId, groupId, isInitSegment, refPosition) {
     /** @type {shaka.media.SegmentReference|shaka.media.InitSegmentReference} */
     this.ref = ref;
 
@@ -35,6 +36,9 @@ shaka.offline.DownloadInfo = class {
 
     /** @type {boolean} */
     this.isInitSegment = isInitSegment;
+
+    /** @type {number} */
+    this.refPosition = refPosition;
   }
 
   /**

package/lib/offline/download_manager.js

@@ -38,7 +38,7 @@ shaka.offline.DownloadManager = class {
      * series. Between groups, the requests are executed in parallel. We store
      * the promise chain that is doing the work.
      *
-     * @private {!Map.<number, !Promise>}
+     * @private {!Map<number, !Promise>}
      */
     this.groups_ = new Map();
 
@@ -51,7 +51,7 @@ shaka.offline.DownloadManager = class {
     /**
      * A list of callback functions to cancel any in-progress downloads.
      *
-     * @private {!Array.<function():!Promise>}
+     * @private {!Array<function(): !Promise>}
      */
     this.abortCallbacks_ = [];
 
@@ -75,6 +75,9 @@ shaka.offline.DownloadManager = class {
 
     /** @private {shaka.offline.DownloadProgressEstimator} */
     this.estimator_ = new shaka.offline.DownloadProgressEstimator();
+
+    /** @private {boolean} */
+    this.aborted_ = false;
   }
 
   /** @override */
@@ -97,11 +100,19 @@ shaka.offline.DownloadManager = class {
    *   aborted.
    */
   abortAll() {
+    this.aborted_ = true;
     const promises = this.abortCallbacks_.map((callback) => callback());
     this.abortCallbacks_ = [];
     return Promise.all(promises);
   }
 
+  /**
+   * @return {boolean}
+   */
+  isAborted() {
+    return this.aborted_;
+  }
+
   /**
    * Adds a byte length to the download estimate.
    *
@@ -247,7 +258,7 @@ shaka.offline.DownloadManager = class {
    * Get a promise that will resolve when all currently queued downloads have
    * finished.
    *
-   * @return {!Promise.<number>}
+   * @return {!Promise<number>}
    */
   async waitToFinish() {
     await Promise.all(this.groups_.values());
@@ -258,7 +269,7 @@ shaka.offline.DownloadManager = class {
    * Download a segment and return the data in the response.
    *
    * @param {shaka.extern.Request} request
-   * @return {!Promise.<BufferSource>}
+   * @return {!Promise<BufferSource>}
    * @private
    */
   async fetchSegment_(request) {

package/lib/offline/download_progress_estimator.js

@@ -48,7 +48,7 @@ shaka.offline.DownloadProgressEstimator = class {
      * internal id) to the estimate. This will allow us to update
      * |estimatedDownloaded_| when |close| is called.
      *
-     * @private {!Map.<number, number>}
+     * @private {!Map<number, number>}
      */
     this.pending_ = new Map();
 

package/lib/offline/indexeddb/base_storage_cell.js

@@ -122,7 +122,7 @@ shaka.offline.indexeddb.BaseStorageCell = class {
     /** @type {!shaka.offline.indexeddb.DBOperation} */
     const op = this.connection_.startReadOnlyOperation(this.manifestStore_);
 
-    /** @type {!Map.<number, shaka.extern.ManifestDB>} */
+    /** @type {!Map<number, shaka.extern.ManifestDB>} */
     const values = new Map();
 
     await op.forEachEntry(async (key, value) => {
@@ -146,7 +146,7 @@ shaka.offline.indexeddb.BaseStorageCell = class {
 
   /**
    * @param {?} old
-   * @return {!Promise.<shaka.extern.ManifestDB>}
+   * @return {!Promise<shaka.extern.ManifestDB>}
    * @protected
    */
   convertManifest(old) {
@@ -182,8 +182,8 @@ shaka.offline.indexeddb.BaseStorageCell = class {
 
   /**
    * @param {string} storeName
-   * @param {!Array.<T>} values
-   * @return {!Promise.<!Array.<number>>}
+   * @param {!Array<T>} values
+   * @return {!Promise<!Array<number>>}
    * @template T
    * @protected
    */
@@ -191,7 +191,7 @@ shaka.offline.indexeddb.BaseStorageCell = class {
     const op = this.connection_.startReadWriteOperation(storeName);
     const store = op.store();
 
-    /** @type {!Array.<number>} */
+    /** @type {!Array<number>} */
     const keys = [];
 
     // Write each segment out. When each request completes, the key will
@@ -213,7 +213,7 @@ shaka.offline.indexeddb.BaseStorageCell = class {
 
   /**
    * @param {string} storeName
-   * @param {!Array.<number>} keys
+   * @param {!Array<number>} keys
    * @param {function(number)} onRemove
    * @return {!Promise}
    * @private
@@ -231,8 +231,8 @@ shaka.offline.indexeddb.BaseStorageCell = class {
 
   /**
    * @param {string} storeName
-   * @param {!Array.<number>} keys
-   * @return {!Promise.<!Array.<T>>}
+   * @param {!Array<number>} keys
+   * @return {!Promise<!Array<T>>}
    * @template T
    * @private
    */
@@ -241,7 +241,7 @@ shaka.offline.indexeddb.BaseStorageCell = class {
     const store = op.store();
 
     const values = {};
-    /** @type {!Array.<number>} */
+    /** @type {!Array<number>} */
     const missing = [];
 
     // Use a map to store the objects so that we can reorder the results to

package/lib/offline/indexeddb/db_connection.js

@@ -22,7 +22,7 @@ shaka.offline.indexeddb.DBConnection = class {
   constructor(connection) {
     /** @private {IDBDatabase} */
     this.connection_ = connection;
-    /** @private {!Array.<shaka.offline.indexeddb.DBOperation>} */
+    /** @private {!Array<shaka.offline.indexeddb.DBOperation>} */
     this.pending_ = [];
   }
 

package/lib/offline/indexeddb/db_operation.js

@@ -62,8 +62,8 @@ shaka.offline.indexeddb.DBOperation = class {
   /**
    * Calls the given callback for each entry in the database.
    *
-   * @param {function(!IDBKeyType, T, !IDBCursorWithValue=):(Promise|undefined)}
-   *   callback
+   * @param {function(!IDBKeyType, T, !IDBCursorWithValue=):
+   *             (Promise|undefined)} callback
    * @return {!Promise}
    * @template T
    */

package/lib/offline/indexeddb/eme_session_storage_cell.js

@@ -35,7 +35,7 @@ shaka.offline.indexeddb.EmeSessionStorageCell = class {
   async getAll() {
     /** @type {!shaka.offline.indexeddb.DBOperation} */
     const op = this.connection_.startReadOnlyOperation(this.store_);
-    /** @type {!Array.<shaka.extern.EmeSessionDB>} */
+    /** @type {!Array<shaka.extern.EmeSessionDB>} */
     const values = [];
 
     await op.forEachEntry((key, value) => {

package/lib/offline/indexeddb/storage_mechanism.js

@@ -392,7 +392,7 @@ shaka.offline.indexeddb.StorageMechanism.SESSION_ID_STORE = 'session-ids';
 shaka.offline.StorageMuxer.register(
     'idb',
     () => {
-      // Offline storage is not supported on the Chromecast Linux/Fuschia or
+      // Offline storage is not supported on the Chromecast Linux/Fuchsia or
       // Xbox One platforms.
       if ((shaka.util.Platform.isChromecast() &&
           !shaka.util.Platform.isAndroidCastDevice()) ||

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -42,7 +42,7 @@ shaka.offline.indexeddb.V1StorageCell = class
       // Indexeddb does not fail when you get a value that is not in the
       // database. It will return an undefined value. However, we expect
       // the value to never be null, so something is wrong if we get a
-      // falsey value.
+      // falsy value.
       if (manifest) {
         // Since this store's scheme uses in-line keys, we don't specify the key
         // with |put|.  This difference is why we must override the base class.
@@ -69,7 +69,7 @@ shaka.offline.indexeddb.V1StorageCell = class
   /**
    * @override
    * @param {shaka.extern.ManifestDBV1} old
-   * @return {!Promise.<shaka.extern.ManifestDB>}
+   * @return {!Promise<shaka.extern.ManifestDB>}
    */
   async convertManifest(old) {
     const V1StorageCell = shaka.offline.indexeddb.V1StorageCell;
@@ -106,7 +106,7 @@ shaka.offline.indexeddb.V1StorageCell = class
   /**
    * @param {shaka.extern.PeriodDBV1} old
    * @param {number} periodDuration
-   * @return {!Array.<shaka.extern.StreamDB>}
+   * @return {!Array<shaka.extern.StreamDB>}
    * @private
    */
   static convertPeriod_(old, periodDuration) {

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -31,7 +31,7 @@ shaka.offline.indexeddb.V2StorageCell = class
   /**
    * @override
    * @param {shaka.extern.ManifestDBV2} old
-   * @return {!Promise.<shaka.extern.ManifestDB>}
+   * @return {!Promise<shaka.extern.ManifestDB>}
    */
   async convertManifest(old) {
     const streamsPerPeriod = [];
@@ -67,7 +67,7 @@ shaka.offline.indexeddb.V2StorageCell = class
   /**
    * @param {shaka.extern.PeriodDBV2} period
    * @param {number} periodDuration
-   * @return {!Array.<shaka.extern.StreamDB>}
+   * @return {!Array<shaka.extern.StreamDB>}
    * @private
    */
   convertPeriod_(period, periodDuration) {

package/lib/offline/manifest_converter.js

@@ -49,23 +49,23 @@ shaka.offline.ManifestConverter = class {
     const timeline = new shaka.media.PresentationTimeline(null, 0);
     timeline.setDuration(manifestDB.duration);
 
-    /** @type {!Array.<shaka.extern.StreamDB>} */
+    /** @type {!Array<shaka.extern.StreamDB>} */
     const audioStreams =
         manifestDB.streams.filter((streamDB) => this.isAudio_(streamDB));
 
-    /** @type {!Array.<shaka.extern.StreamDB>} */
+    /** @type {!Array<shaka.extern.StreamDB>} */
     const videoStreams =
         manifestDB.streams.filter((streamDB) => this.isVideo_(streamDB));
 
-    /** @type {!Map.<number, shaka.extern.Variant>} */
+    /** @type {!Map<number, shaka.extern.Variant>} */
     const variants = this.createVariants(audioStreams, videoStreams, timeline);
 
-    /** @type {!Array.<shaka.extern.Stream>} */
+    /** @type {!Array<shaka.extern.Stream>} */
     const textStreams =
         manifestDB.streams.filter((streamDB) => this.isText_(streamDB))
             .map((streamDB) => this.fromStreamDB_(streamDB, timeline));
 
-    /** @type {!Array.<shaka.extern.Stream>} */
+    /** @type {!Array<shaka.extern.Stream>} */
     const imageStreams =
         manifestDB.streams.filter((streamDB) => this.isImage_(streamDB))
             .map((streamDB) => this.fromStreamDB_(streamDB, timeline));
@@ -84,7 +84,6 @@ shaka.offline.ManifestConverter = class {
 
     return {
       presentationTimeline: timeline,
-      minBufferTime: 2,
       offlineSessionIds: manifestDB.sessionIds,
       variants: Array.from(variants.values()),
       textStreams: textStreams,
@@ -104,14 +103,14 @@ shaka.offline.ManifestConverter = class {
   /**
    * Recreates Variants from audio and video StreamDB collections.
    *
-   * @param {!Array.<!shaka.extern.StreamDB>} audios
-   * @param {!Array.<!shaka.extern.StreamDB>} videos
+   * @param {!Array<!shaka.extern.StreamDB>} audios
+   * @param {!Array<!shaka.extern.StreamDB>} videos
    * @param {shaka.media.PresentationTimeline} timeline
-   * @return {!Map.<number, !shaka.extern.Variant>}
+   * @return {!Map<number, !shaka.extern.Variant>}
    */
   createVariants(audios, videos, timeline) {
     // Get all the variant ids from all audio and video streams.
-    /** @type {!Set.<number>} */
+    /** @type {!Set<number>} */
     const variantIds = new Set();
     for (const streamDB of audios) {
       for (const id of streamDB.variantIds) {
@@ -124,7 +123,7 @@ shaka.offline.ManifestConverter = class {
       }
     }
 
-    /** @type {!Map.<number, shaka.extern.Variant>} */
+    /** @type {!Map<number, shaka.extern.Variant>} */
     const variantMap = new Map();
     for (const id of variantIds) {
       variantMap.set(id, this.createEmptyVariant_(id));
@@ -173,7 +172,7 @@ shaka.offline.ManifestConverter = class {
    * @private
    */
   fromStreamDB_(streamDB, timeline) {
-    /** @type {!Array.<!shaka.media.SegmentReference>} */
+    /** @type {!Array<!shaka.media.SegmentReference>} */
     const segments = streamDB.segments.map(
         (segment, index) => this.fromSegmentDB_(index, segment, streamDB));
 

package/lib/offline/offline_scheme.js

@@ -32,12 +32,12 @@ shaka.offline.OfflineScheme = class {
     const offlineUri = shaka.offline.OfflineUri.parse(uri);
 
     if (offlineUri && offlineUri.isManifest()) {
-      return shaka.offline.OfflineScheme.getManifest_(uri);
+      return shaka.offline.OfflineScheme.getManifest_(uri, request);
     }
 
     if (offlineUri && offlineUri.isSegment()) {
       return shaka.offline.OfflineScheme.getSegment_(
-          offlineUri.key(), offlineUri);
+          offlineUri.key(), offlineUri, request);
     }
 
     return shaka.util.AbortableOperation.failed(
@@ -50,16 +50,18 @@ shaka.offline.OfflineScheme = class {
 
   /**
    * @param {string} uri
+   * @param {shaka.extern.Request} request
    * @return {!shaka.extern.IAbortableOperation.<shaka.extern.Response>}
    * @private
    */
-  static getManifest_(uri) {
+  static getManifest_(uri, request) {
     /** @type {shaka.extern.Response} */
     const response = {
       uri: uri,
       originalUri: uri,
       data: new ArrayBuffer(0),
       headers: {'content-type': 'application/x-offline-manifest'},
+      originalRequest: request,
     };
 
     return shaka.util.AbortableOperation.completed(response);
@@ -68,10 +70,11 @@ shaka.offline.OfflineScheme = class {
   /**
    * @param {number} id
    * @param {!shaka.offline.OfflineUri} uri
+   * @param {shaka.extern.Request} request
    * @return {!shaka.extern.IAbortableOperation.<shaka.extern.Response>}
    * @private
    */
-  static getSegment_(id, uri) {
+  static getSegment_(id, uri, request) {
     goog.asserts.assert(
         uri.isSegment(),
         'Only segment uri\'s should be given to getSegment');
@@ -90,6 +93,7 @@ shaka.offline.OfflineScheme = class {
             uri: uri,
             data: segment.data,
             headers: {},
+            originalRequest: request,
           };
         })
         .finally(() => muxer.destroy());