Remove Loader.loader and replace Loader.getResponseHeader() with Laoder.getCacheAge()

api-extractor/report/hls.js.api.md

@@ -1555,13 +1555,10 @@ export interface Loader<T extends LoaderContext> {
     context: T;
     // (undocumented)
     destroy(): void;
-    // (undocumented)
-    getResponseHeader(name: string): string | null;
+    getCacheAge(): number;
     // (undocumented)
     load(context: LoaderContext, config: LoaderConfiguration, callbacks: LoaderCallbacks<T>): void;
     // (undocumented)
-    loader: any;
-    // (undocumented)
     stats: LoaderStats;
 }
 

src/loader/playlist-loader.ts

@@ -684,8 +684,7 @@ class PlaylistLoader {
     }
 
     if (levelDetails.live) {
-      const ageHeader = loader.getResponseHeader('age');
-      levelDetails.ageHeader = ageHeader ? parseFloat(ageHeader) : 0;
+      levelDetails.ageHeader = loader.getCacheAge();
     }
 
     switch (type) {

src/types/loader.ts

@@ -120,9 +120,12 @@ export interface Loader<T extends LoaderContext> {
     config: LoaderConfiguration,
     callbacks: LoaderCallbacks<T>
   ): void;
-  getResponseHeader(name: string): string | null;
+  /**
+   * Returns the time, in seconds, that this object has been in a proxy cache.
+   * For HTTP based loaders, this returns the value of the "age" HTTP header.
+   */
+  getCacheAge(): number;
   context: T;
-  loader: any;
   stats: LoaderStats;
 }
 

src/utils/fetch-loader.ts

@@ -37,7 +37,7 @@ class FetchLoader implements Loader<LoaderContext> {
   private config: LoaderConfiguration | null = null;
   private callbacks: LoaderCallbacks<LoaderContext> | null = null;
   public stats: LoaderStats;
-  public loader: Response | null = null;
+  private loader: Response | null = null;
 
   constructor(config /* HlsConfig */) {
     this.fetchSetup = config.fetchSetup || getRequest;
@@ -160,15 +160,13 @@ class FetchLoader implements Loader<LoaderContext> {
       });
   }
 
-  getResponseHeader(name: string): string | null {
+  getCacheAge(): number {
+    let result: number = 0;
     if (this.response) {
-      try {
-        return this.response.headers.get(name);
-      } catch (error) {
-        /* Could not get header */
-      }
+      const ageHeader = this.response.headers.get('age');
+      result = ageHeader ? parseFloat(ageHeader) : 0;
     }
-    return null;
+    return result;
   }
 
   private loadProgressively(

src/utils/xhr-loader.ts

@@ -17,7 +17,7 @@ class XhrLoader implements Loader<LoaderContext> {
   private callbacks: LoaderCallbacks<LoaderContext> | null = null;
   public context!: LoaderContext;
 
-  public loader: XMLHttpRequest | null = null;
+  private loader: XMLHttpRequest | null = null;
   public stats: LoaderStats;
 
   constructor(config /* HlsConfig */) {
@@ -249,11 +249,16 @@ class XhrLoader implements Loader<LoaderContext> {
     }
   }
 
-  getResponseHeader(name: string): string | null {
-    if (this.loader && this.loader.getAllResponseHeaders().indexOf(name) >= 0) {
-      return this.loader.getResponseHeader(name);
+  getCacheAge(): number {
+    let result: number = 0;
+    if (
+      this.loader &&
+      this.loader.getAllResponseHeaders().indexOf('age') >= 0
+    ) {
+      const ageHeader = this.loader.getResponseHeader('age');
+      result = ageHeader ? parseFloat(ageHeader) : 0;
     }
-    return null;
+    return result;
   }
 }
 

tests/unit/loader/fragment-loader.ts

@@ -22,7 +22,6 @@ const expect = chai.expect;
 
 class MockXhr implements Loader<LoaderContext> {
   context!: LoaderContext;
-  loader: any;
   stats: LoadStats;
   callbacks?: LoaderCallbacks<FragmentLoaderContext>;
 
@@ -36,8 +35,8 @@ class MockXhr implements Loader<LoaderContext> {
 
   abort() {}
   destroy(): void {}
-  getResponseHeader(name: string): string | null {
-    return null;
+  getCacheAge(): number {
+    return 0;
   }
 }