Fix content steering BaseURL blacklisting duration (#4502)

Dash-Industry-Forum · Jun 19, 2024 · 9b4aa90 · 9b4aa90
1 parent ca4c7aa
commit 9b4aa90
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/src/streaming/controllers/BlacklistController.js b/src/streaming/controllers/BlacklistController.js
@@ -60,6 +60,13 @@ function BlackListController(config) {
         eventBus.trigger(updateEventName, { entry: entry });
     }
 
+    function remove(entry) {
+        const index = blacklist.indexOf(entry);
+        if (index !== -1) {
+            blacklist.splice(index, 1)
+        }
+    }
+
     function onAddBlackList(e) {
         add(e.entry);
     }
@@ -76,6 +83,7 @@ function BlackListController(config) {
 
     instance = {
         add: add,
+        remove: remove,
         contains: contains,
         reset: reset
     };

diff --git a/src/streaming/utils/BaseURLSelector.js b/src/streaming/utils/BaseURLSelector.js
@@ -70,7 +70,8 @@ function BaseURLSelector() {
 
         contentSteeringSelector = ContentSteeringSelector(context).create();
         contentSteeringSelector.setConfig({
-            blacklistController: serviceLocationBlacklistController
+            blacklistController: serviceLocationBlacklistController,
+            addBlacklistEventName: Events.SERVICE_LOCATION_BASE_URL_BLACKLIST_ADD
         })
 
         selector = basicSelector;
@@ -131,6 +132,7 @@ function BaseURLSelector() {
     }
 
     function reset() {
+        contentSteeringSelector.reset();
         serviceLocationBlacklistController.reset();
     }
 

diff --git a/src/streaming/utils/baseUrlResolution/ContentSteeringSelector.js b/src/streaming/utils/baseUrlResolution/ContentSteeringSelector.js
@@ -31,13 +31,16 @@
 
 import FactoryMaker from '../../../core/FactoryMaker.js';
 import ContentSteeringController from '../../../dash/controllers/ContentSteeringController.js';
+import EventBus from '../../../core/EventBus.js';
 
 function ContentSteeringSelector() {
 
     const context = this.context;
+    const eventBus = EventBus(context).getInstance();
     let instance,
         contentSteeringController,
-        blacklistController;
+        blacklistController,
+        blacklistResetTimeout = [];
 
     function setup() {
         contentSteeringController = ContentSteeringController(context).getInstance();
@@ -50,6 +53,7 @@ function ContentSteeringSelector() {
         if (config.contentSteeringController) {
             contentSteeringController = config.contentSteeringController;
         }
+        eventBus.on(config.addBlacklistEventName, _onAddBlackList, instance);
     }
 
     function selectBaseUrlIndex(data) {
@@ -73,6 +77,11 @@ function ContentSteeringSelector() {
         return steeringIndex;
     }
 
+    function reset() {
+        blacklistResetTimeout.forEach(timer => clearTimeout(timer))
+        blacklistResetTimeout = []
+    }
+
     function _findexIndexOfServiceLocation(pathwayPriority = [], baseUrls = []) {
         let i = 0;
         let steeringIndex = NaN;
@@ -90,9 +99,25 @@ function ContentSteeringSelector() {
         return steeringIndex;
     }
 
+
+    function _onAddBlackList(e) {
+        const currentSteeringResponseData = contentSteeringController.getCurrentSteeringResponseData();
+        if (!currentSteeringResponseData) {
+            return
+        }
+        const entry = e.entry
+        const timer = setTimeout(() => {
+            blacklistController.remove(entry);
+            blacklistResetTimeout.splice(blacklistResetTimeout.indexOf(timer, 1))
+        }, currentSteeringResponseData.ttl * 1000);
+        blacklistResetTimeout.push(timer)
+    }
+
+
     instance = {
         selectBaseUrlIndex,
-        setConfig
+        setConfig,
+        reset
     };
 
     setup();