From 997da6ef6ec364547248519dc2ceee2fcd1368ee Mon Sep 17 00:00:00 2001
From: jimbecker <beckerj03@gmail.com>
Date: Wed, 9 Jan 2019 13:19:30 -0500
Subject: [PATCH 1/4] test(test-fix): fixed failing jasmine clock test

fixed failing jasmine clock test as documented by
https://github.com/gruntjs/grunt-contrib-jasmine/issues/213#issue-80038755
---
 src/core/vg-media/vg-media.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/vg-media/vg-media.spec.ts b/src/core/vg-media/vg-media.spec.ts
index c2d7ff75..c870591a 100644
--- a/src/core/vg-media/vg-media.spec.ts
+++ b/src/core/vg-media/vg-media.spec.ts
@@ -39,6 +39,7 @@ describe('Videogular Media', () => {
     });
 
     it('Should load a new media if a change on dom have been happened', () => {
+        jasmine.clock().uninstall();
         jasmine.clock().install();
 
         spyOn(elem, 'load').and.callThrough();

From 3686fdc72a2e1293c9d19073d50a2186b206c941 Mon Sep 17 00:00:00 2001
From: jimbecker <beckerj03@gmail.com>
Date: Wed, 9 Jan 2019 13:26:11 -0500
Subject: [PATCH 2/4] feat(hls): add support for custom headers on hls streams

User can provide a map of key value pairs to add as headers when using the hls directive
---
 docs/modules/streaming/vg-hls/README.md | 2 ++
 src/streaming/vg-hls/vg-hls.ts          | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/docs/modules/streaming/vg-hls/README.md b/docs/modules/streaming/vg-hls/README.md
index cf3d7d55..ec7d2a60 100644
--- a/docs/modules/streaming/vg-hls/README.md
+++ b/docs/modules/streaming/vg-hls/README.md
@@ -46,6 +46,7 @@ This module is dependant of `hls.js` library and you need to install via `npm in
 | Input | Description |
 |--- |--- |
 | vgHls | Url to an HLS m3u8 file. |
+| vgHlsHeaders | Key/Value pairs that will be added as headers to the m3u8 file. Key is header name. Value is header value. |
 
 ## Outputs
 
@@ -59,6 +60,7 @@ This module is dependant of `hls.js` library and you need to install via `npm in
 <vg-player>
     <video #myMedia
            [vgHls]="'http://static.videogular.com/assets/videos/videogular.m3u8'"
+           [vgHlsHeaders]="headers"
            (onGetBitrates)="hlsBitrates = $event"
            id="my-video"
            type="video/mp4"
diff --git a/src/streaming/vg-hls/vg-hls.ts b/src/streaming/vg-hls/vg-hls.ts
index 4afeb076..e1f128ab 100644
--- a/src/streaming/vg-hls/vg-hls.ts
+++ b/src/streaming/vg-hls/vg-hls.ts
@@ -22,6 +22,7 @@ declare let Hls;
 })
 export class VgHLS implements OnInit, OnChanges, OnDestroy {
     @Input() vgHls:string;
+    @Input() vgHlsHeaders: {[key: string]: string} = {};
 
     @Output() onGetBitrates: EventEmitter<BitrateOption[]> = new EventEmitter();
 
@@ -59,6 +60,9 @@ export class VgHLS implements OnInit, OnChanges, OnDestroy {
             this.config.xhrSetup = (xhr, url) => {
                 // Send cookies
                 xhr.withCredentials = true;
+                for (const key of Object.keys(this.vgHlsHeaders)) {
+                    xhr.setRequestHeader(key, this.vgHlsHeaders[key]);
+                }
             };
         }
 

From 86ea1e11dcb275fbc089e42df3c39f7eb86e21a3 Mon Sep 17 00:00:00 2001
From: jimbecker <beckerj03@gmail.com>
Date: Thu, 10 Jan 2019 15:00:03 -0500
Subject: [PATCH 3/4] fix(hls): fix downloading m3u8 file twice

vgHls downloads the m3u8 file twice. It doesn't harm anything, but it's an extra call that is not
needed.

808
---
 src/streaming/vg-hls/vg-hls.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/streaming/vg-hls/vg-hls.ts b/src/streaming/vg-hls/vg-hls.ts
index e1f128ab..96a292b4 100644
--- a/src/streaming/vg-hls/vg-hls.ts
+++ b/src/streaming/vg-hls/vg-hls.ts
@@ -96,7 +96,7 @@ export class VgHLS implements OnInit, OnChanges, OnDestroy {
         }
 
         // It's a HLS source
-        if (this.vgHls && this.vgHls.indexOf('m3u8') > -1 && Hls.isSupported()) {
+        if (this.vgHls && this.vgHls.indexOf('m3u8') > -1 && Hls.isSupported() && this.API.isPlayerReady) {
             let video:HTMLVideoElement = this.ref.nativeElement;
 
             this.hls = new Hls(this.config);

From cabf471921f6163380a4b36d9a4cf92ab5398e5c Mon Sep 17 00:00:00 2001
From: jimbecker <beckerj03@gmail.com>
Date: Thu, 10 Jan 2019 15:07:45 -0500
Subject: [PATCH 4/4] feat(hls): fixed cors and custom header conflict

Had to move the crossOrigin check within the xhrSetup function so that cors and custom headers can
be used indepedently of one another

806
---
 src/streaming/vg-hls/vg-hls.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/streaming/vg-hls/vg-hls.ts b/src/streaming/vg-hls/vg-hls.ts
index 96a292b4..2b47f767 100644
--- a/src/streaming/vg-hls/vg-hls.ts
+++ b/src/streaming/vg-hls/vg-hls.ts
@@ -56,15 +56,15 @@ export class VgHLS implements OnInit, OnChanges, OnDestroy {
             autoStartLoad: this.preload
         };
 
-        if (this.crossorigin === 'use-credentials') {
-            this.config.xhrSetup = (xhr, url) => {
-                // Send cookies
+        this.config.xhrSetup = (xhr, url) => {
+            // Send cookies
+            if (this.crossorigin === 'use-credentials') {
                 xhr.withCredentials = true;
-                for (const key of Object.keys(this.vgHlsHeaders)) {
-                    xhr.setRequestHeader(key, this.vgHlsHeaders[key]);
-                }
-            };
-        }
+            }
+            for (const key of Object.keys(this.vgHlsHeaders)) {
+                xhr.setRequestHeader(key, this.vgHlsHeaders[key]);
+            }
+        };
 
         this.createPlayer();
 
@@ -85,6 +85,9 @@ export class VgHLS implements OnInit, OnChanges, OnDestroy {
         if (changes['vgHls'] && changes['vgHls'].currentValue) {
             this.createPlayer();
         }
+        else if (changes['vgHlsHeaders'] && changes['vgHlsHeaders'].currentValue) {
+            // Do nothing. We don't want to create a or destroy a player if the headers change.
+        }
         else {
             this.destroyPlayer();
         }