From 11c2ca30ddf229350679a9afed29adc84bc08581 Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:58:08 +0100
Subject: [PATCH 1/9] Update Yospace SDK to 3.8.3

---
 package-lock.json | 30 +++++++++++++++---------------
 package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2d6fc0c..6a78eaa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "2.7.1",
       "license": "MIT",
       "dependencies": {
-        "@yospace/admanagement-sdk": "3.6.9",
+        "@yospace/admanagement-sdk": "3.8.3",
         "fast-safe-stringify": "^2.0.7",
         "process": "^0.11.10",
         "stream-browserify": "^3.0.0"
@@ -1007,11 +1007,11 @@
       "dev": true
     },
     "node_modules/@yospace/admanagement-sdk": {
-      "version": "3.6.9",
-      "resolved": "https://yospacerepo.jfrog.io/artifactory/api/npm/javascript-sdk/@yospace/admanagement-sdk/-/@yospace/admanagement-sdk-3.6.9.tgz",
-      "integrity": "sha512-sW7rYt00lHeIemcsf1EkaygAARFsfOCM48Sj4XS7oAJJs1pxa3PjL7QN7R5Vd+fU/M7iApX0fuHsqvgAjIedCA==",
+      "version": "3.8.3",
+      "resolved": "https://yospacerepo.jfrog.io/artifactory/api/npm/javascript-sdk/@yospace/admanagement-sdk/-/@yospace/admanagement-sdk-3.8.3.tgz",
+      "integrity": "sha512-E19chNvNyH/Ynfu+21Duiyfn8Fac833GrVHIdXqYEVXY1xvXm3meSHCKnxmXo/ijc9kJKUkAPlb1EN59J8BEcA==",
       "dependencies": {
-        "sax": "1.2.4"
+        "sax": "1.3.0"
       }
     },
     "node_modules/accepts": {
@@ -4566,9 +4566,9 @@
       "dev": true
     },
     "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
     },
     "node_modules/schema-utils": {
       "version": "3.1.1",
@@ -6736,11 +6736,11 @@
       "dev": true
     },
     "@yospace/admanagement-sdk": {
-      "version": "3.6.9",
-      "resolved": "https://yospacerepo.jfrog.io/artifactory/api/npm/javascript-sdk/@yospace/admanagement-sdk/-/@yospace/admanagement-sdk-3.6.9.tgz",
-      "integrity": "sha512-sW7rYt00lHeIemcsf1EkaygAARFsfOCM48Sj4XS7oAJJs1pxa3PjL7QN7R5Vd+fU/M7iApX0fuHsqvgAjIedCA==",
+      "version": "3.8.3",
+      "resolved": "https://yospacerepo.jfrog.io/artifactory/api/npm/javascript-sdk/@yospace/admanagement-sdk/-/@yospace/admanagement-sdk-3.8.3.tgz",
+      "integrity": "sha512-E19chNvNyH/Ynfu+21Duiyfn8Fac833GrVHIdXqYEVXY1xvXm3meSHCKnxmXo/ijc9kJKUkAPlb1EN59J8BEcA==",
       "requires": {
-        "sax": "1.2.4"
+        "sax": "1.3.0"
       }
     },
     "accepts": {
@@ -9331,9 +9331,9 @@
       "dev": true
     },
     "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
     },
     "schema-utils": {
       "version": "3.1.1",
diff --git a/package.json b/package.json
index f0f4468..eaf41db 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   "author": "Bitmovin",
   "license": "MIT",
   "dependencies": {
-    "@yospace/admanagement-sdk": "3.6.9",
+    "@yospace/admanagement-sdk": "3.8.3",
     "fast-safe-stringify": "^2.0.7",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0"

From 240b6d7b3d6fb242bedd10d7d309b59a5a73370b Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:59:26 +0100
Subject: [PATCH 2/9] Fix close button in demo page

---
 web/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/index.html b/web/index.html
index 5490914..628daea 100644
--- a/web/index.html
+++ b/web/index.html
@@ -72,8 +72,8 @@
               <button class="btn btn-outline-secondary" type="button" data-toggle="collapse" data-target="#collapsable-customization">
                 🛠️ Customize asset
               </button>
-              <label class="btn btn-outline-secondary">
-                <input type="radio" name="options" id="option-close" autocomplete="off" checked />✖️ Close Player
+              <label class="btn btn-outline-secondary" id="option-close">
+                <input type="radio" name="options" autocomplete="off" checked />✖️ Close Player
               </label>
             </div>
           </div>

From 526bd554fd3bfd504f22b1b80d01168a87dde524 Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:02:41 +0100
Subject: [PATCH 3/9] Add button to demo page to enable/disable ad immunity

---
 web/index.html      |  9 ++++++++-
 web/js/pageSetup.js | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index 628daea..05d5d19 100644
--- a/web/index.html
+++ b/web/index.html
@@ -140,9 +140,12 @@
       </div>
 
       <div class="row">
-        <div class="col-12">
+        <div class="col-9">
           <p1 id="segmentPlaybackLabel">Playing Segment: unknown</p1>
         </div>
+        <div class="col-3">
+          <label class="btn btn-outline-secondary" id="toggle-ad-immunity"> Enable Ad Immunity (60sec) </label>
+        </div>
       </div>
 
       <div class="row">
@@ -296,6 +299,10 @@
         // We are using the default, built-in policy in the demo. Another policy can easily be set using this method:
         // yospacePlayer.setPolicy(simplePolicy);
 
+        yospacePlayer.on(bitmovin.player.ads.yospace.YospacePlayerEvent.AdImmunityEnded, adImmunityEndedEventHandler);
+
+        yospacePlayer.on(bitmovin.player.ads.yospace.YospacePlayerEvent.AdImmunityStarted, adImmunityStartedEventHandler);
+
         yospacePlayer.on('segmentplayback', function (event) {
           if (event.mimeType === 'video/mp4') {
             let segmentUrl = event.url;
diff --git a/web/js/pageSetup.js b/web/js/pageSetup.js
index 6e3be82..c4f4751 100644
--- a/web/js/pageSetup.js
+++ b/web/js/pageSetup.js
@@ -40,6 +40,28 @@ function setupTestPage() {
     yospacePlayer.unload();
     yospacePlayer.load(modifySourceBeforeLoading(customSource));
   });
+
+  document.querySelector('#toggle-ad-immunity').addEventListener('click', toggleAdImmunity);
+
+  function toggleAdImmunity() {
+    if (yospacePlayer.isAdImmunityActive()) {
+      yospacePlayer.endAdImmunity();
+    } else {
+      yospacePlayer.setAdImmunityConfig({
+        duration: 60,
+        disablePassedAdBreaks: true,
+      });
+      yospacePlayer.startAdImmunity();
+    }
+  }
+}
+
+function adImmunityEndedEventHandler() {
+  document.querySelector('#toggle-ad-immunity').innerHTML = 'Enable Ad Immunity for 60sec';
+}
+
+function adImmunityStartedEventHandler() {
+  document.querySelector('#toggle-ad-immunity').innerHTML = 'Disable Ad Immunity';
 }
 
 function applyQueryParameters() {

From b8df080d20b8911a3f350a65de8163d2bb616e62 Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:03:40 +0100
Subject: [PATCH 4/9] Add DVRLive asset type to custom asset configuration in
 demo page

---
 web/index.html      | 5 +++--
 web/js/pageSetup.js | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/index.html b/web/index.html
index 05d5d19..6682e16 100644
--- a/web/index.html
+++ b/web/index.html
@@ -92,8 +92,9 @@
                 />
                 <select class="custom-select col-2" id="stream-type-select">
                   <option value="1">VoD</option>
-                  <option value="2">Live</option>
-                  <option value="3">None</option>
+                  <option value="2">Live (deprecated)</option>
+                  <option value="3">DVRLive</option>
+                  <option value="4">None</option>
                 </select>
                 <div class="input-group-append">
                   <button id="load-custom-steam" class="btn btn-outline-secondary" type="button">Load</button>
diff --git a/web/js/pageSetup.js b/web/js/pageSetup.js
index c4f4751..89bff14 100644
--- a/web/js/pageSetup.js
+++ b/web/js/pageSetup.js
@@ -35,6 +35,8 @@ function setupTestPage() {
       customSource.assetType = bitmovin.player.ads.yospace.YospaceAssetType.VOD;
     } else if (customStreamTypeSelect.val() === '2') {
       customSource.assetType = bitmovin.player.ads.yospace.YospaceAssetType.LINEAR;
+    } else if (customStreamTypeSelect.val() === '3') {
+      customSource.assetType = bitmovin.player.ads.yospace.YospaceAssetType.DVRLIVE;
     }
 
     yospacePlayer.unload();

From ea75adcad60f8a09199d83cbf6e799158a71fffd Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:06:28 +0100
Subject: [PATCH 5/9] Update README

---
 README.md | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ec7f9c0..b4a9f57 100644
--- a/README.md
+++ b/README.md
@@ -172,20 +172,31 @@ const yospaceConfig = {
 
 ## Development, Contribution, Releases
 
-### Set up environment
+### Set up dev environment
 
 1. Use node.js version specified in `.nvmrc`
 2. Set up your access to the private npm registry of Yospace
 3. Run `npm ci`
 4. Use `npm run start` to run a webpack dev server
 
-### Branching & Releasing
+### Branching & Development
 
-- This repo uses git-flow and semantic versioning
-- PRs should be made against `develop` branch
+- This repo uses semantic versioning. Features and bug fixes should be implemented in separate feature branches, branch off the `main` branch.
+- PRs should be made against `main` branch
 - PRs should always contain an update of the [CHANGELOG.md](CHANGELOG.md) file
-- New versions will be manually released into the `main` branch and tagged there
-- Tagged versions will be manually published to [npm](https://www.npmjs.com/package/@bitmovin/player-integration-yospace)
+
+### Validation & Release
+- Especially when updating the Yospace SDK, this project should be validated following https://developer.yospace.com/sdk-documentation/javascript/userguide/yosdk/latest/en/validate-your-app.html. This can be done using the sample page with the following steps:
+  1. Run `npm start`
+  2. Open `localhost:8080?validation=true` in a browser
+  3. Select a source from the list to start playback and the validation logs. Alternatively, you can add the URL parameter `autoLoadSource=1` (to load the first source in the list).
+  4. Save console logs and upload to the [Yospace validation tool](https://sdkvalidation.yospace.com/)
+- Releasing a new version is fully automated. It can be triggered using the [Release a new version](https://github.com/bitmovin/bitmovin-player-web-integrations-yospace/actions/workflows/release.yml) Github Action on the `main` branch. The workflow will:
+  - bump the version automatically based on the current version in `package.json` and changes in the `[Unreleased]` section of the `CHANGELOG.md`
+  - build the project
+  - tag the new release in git
+  - create a new release on Github
+  - publish the update to [npm](https://www.npmjs.com/package/@bitmovin/player-integration-yospace)
 
 ### Principles
 

From 122718603db112fd0963d7765df78f9812c410d9 Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:06:53 +0100
Subject: [PATCH 6/9] Add documentation for query parameters

---
 web/index.html | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/web/index.html b/web/index.html
index 6682e16..b5b9dd1 100644
--- a/web/index.html
+++ b/web/index.html
@@ -175,12 +175,43 @@
       /* queryParameters */
       var isValidationMode = false;
       var debugOverride = true;
+
+      /**
+       * validation = true|false
+       *
+       * Should be used to enable Yospace SDK logs (and disable other logs) for validating the yospace integration at
+       * https://developer.yospace.com/sdk-documentation/javascript/userguide/yosdk/latest/en/validate-your-app.html
+       */
       var autoplay = true;
+
+      /**
+       * debug = true|false
+       */
       var aggressiveVpaid = true;
+
+      /**
+       * autoplay = true|false
+       */
       var vpaid = true;
+
+      /**
+       * aggressiveVpaid = true|false
+       */
       var autoLoadSource = platformType !== 'web' ? 1 : -1;
+
+      /**
+       * vpaid = true|false
+       */
       /* end of queryParameters */
 
+      /**
+       * autoLoadSource = <number>
+       *
+       * Automatically load a pre-defined source into the player after loading the sample page.
+       * Index starts at 1.
+       */
+
+
       var bitmovinPlayerLicenseKey = 'YOUR-KEY';
 
       var yospacePlayer;

From cb087c6dfef8a2794c02e8c7fcc5c228c4648210 Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:07:43 +0100
Subject: [PATCH 7/9] Add changelog entry

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a529a9d..a5fe6bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Support for the `DVRLIVE` PlaybackMode to not rely on Metadata parsing for live streams anymore
 
+### Changed
+
+- Yospace SDK to v3.8.3
+
 ## [2.7.1] - 2024-10-03
 
 ### Fixed

From 4e2a475f2d8e0d3bd0bed1aeb39518253844f5c1 Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:32:06 +0100
Subject: [PATCH 8/9] Update README.md

Co-authored-by: David Steinacher <david.steinacher@bitmovin.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b4a9f57..476fee6 100644
--- a/README.md
+++ b/README.md
@@ -190,12 +190,12 @@ const yospaceConfig = {
   1. Run `npm start`
   2. Open `localhost:8080?validation=true` in a browser
   3. Select a source from the list to start playback and the validation logs. Alternatively, you can add the URL parameter `autoLoadSource=1` (to load the first source in the list).
-  4. Save console logs and upload to the [Yospace validation tool](https://sdkvalidation.yospace.com/)
+  4. Save console logs and upload them to the [Yospace validation tool](https://sdkvalidation.yospace.com/)
 - Releasing a new version is fully automated. It can be triggered using the [Release a new version](https://github.com/bitmovin/bitmovin-player-web-integrations-yospace/actions/workflows/release.yml) Github Action on the `main` branch. The workflow will:
   - bump the version automatically based on the current version in `package.json` and changes in the `[Unreleased]` section of the `CHANGELOG.md`
   - build the project
   - tag the new release in git
-  - create a new release on Github
+  - create a new release on GitHub
   - publish the update to [npm](https://www.npmjs.com/package/@bitmovin/player-integration-yospace)
 
 ### Principles

From be752f9813bf997eb868eae44b5543a55e405fca Mon Sep 17 00:00:00 2001
From: Daniel Weinberger <dweinber@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:35:04 +0100
Subject: [PATCH 9/9] Fix messed up documentation

---
 web/index.html | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/index.html b/web/index.html
index b5b9dd1..aba789f 100644
--- a/web/index.html
+++ b/web/index.html
@@ -173,8 +173,6 @@
     </div>
     <script type="text/javascript">
       /* queryParameters */
-      var isValidationMode = false;
-      var debugOverride = true;
 
       /**
        * validation = true|false
@@ -182,27 +180,27 @@
        * Should be used to enable Yospace SDK logs (and disable other logs) for validating the yospace integration at
        * https://developer.yospace.com/sdk-documentation/javascript/userguide/yosdk/latest/en/validate-your-app.html
        */
-      var autoplay = true;
+      var isValidationMode = false;
 
       /**
        * debug = true|false
        */
-      var aggressiveVpaid = true;
+      var debugOverride = true;
 
       /**
        * autoplay = true|false
        */
-      var vpaid = true;
+      var autoplay = true;
 
       /**
        * aggressiveVpaid = true|false
        */
-      var autoLoadSource = platformType !== 'web' ? 1 : -1;
+      var aggressiveVpaid = true;
 
       /**
        * vpaid = true|false
        */
-      /* end of queryParameters */
+      var vpaid = true;
 
       /**
        * autoLoadSource = <number>
@@ -210,6 +208,9 @@
        * Automatically load a pre-defined source into the player after loading the sample page.
        * Index starts at 1.
        */
+      var autoLoadSource = platformType !== 'web' ? 1 : -1;
+
+      /* end of queryParameters */
 
 
       var bitmovinPlayerLicenseKey = 'YOUR-KEY';