EventHandler: reserve/handler-built-in events "hlsHandlerDestroying" …

…and "hlsHandlerDestroyed"
dailymotion · Dec 11, 2017 · f9ab77f · f9ab77f
1 parent 7ad8819
commit f9ab77f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/src/controller/audio-stream-controller.js b/src/controller/audio-stream-controller.js
@@ -58,11 +58,11 @@ class AudioStreamController extends TaskLoop {
     this.videoTrackCC = null;
   }
 
-  _onDestroying() {
+  onHandlerDestroying() {
     this.stopLoad();
   }
 
-  _onDestroyed() {
+  onHandlerDestroyed() {
     this.state = State.STOPPED;
   }
 

diff --git a/src/controller/level-controller.js b/src/controller/level-controller.js
@@ -22,7 +22,7 @@ export default class LevelController extends EventHandler {
     this.timer = null;
   }
 
-  _onDestroying() {
+  onHandlerDestroying() {
     this.cleanTimer();
     this.manualLevelIndex = -1;
   }

diff --git a/src/controller/stream-controller.js b/src/controller/stream-controller.js
@@ -54,11 +54,11 @@ class StreamController extends TaskLoop {
     this._state = State.STOPPED;
   }
 
-  _onDestroying() {
+  onHandlerDestroying() {
     this.stopLoad();
   }
 
-  _onDestroyed() {
+  onHandlerDestroyed() {
     this.state = State.STOPPED;
   }
 

diff --git a/src/controller/subtitle-stream-controller.js b/src/controller/subtitle-stream-controller.js
@@ -36,7 +36,7 @@ class SubtitleStreamController extends TaskLoop {
     this.decrypter = new Decrypter(hls.observer, hls.config);
   }
 
-  _onDestroyed() {
+  onHandlerDestroyed() {
     this.state = State.STOPPED;
   }
 

diff --git a/src/event-handler.js b/src/event-handler.js
@@ -8,6 +8,12 @@ import {logger} from './utils/logger';
 import {ErrorTypes, ErrorDetails} from './errors';
 import Event from './events';
 
+const FORBIDDEN_EVENT_NAMES = [
+  'hlsEventGeneric',
+  'hlsHandlerDestroying',
+  'hlsHandlerDestroyed'
+];
+
 class EventHandler {
 
   constructor(hls, ...events) {
@@ -20,13 +26,13 @@ class EventHandler {
   }
 
   destroy() {
-    this._onDestroying();
+    this.onHandlerDestroying();
     this.unregisterListeners();
-    this._onDestroyed();
+    this.onHandlerDestroyed();
   }
 
-  _onDestroying() {}
-  _onDestroyed() {}
+  onHandlerDestroying() {}
+  onHandlerDestroyed() {}
 
   isEventHandler() {
     return typeof this.handledEvents === 'object' && this.handledEvents.length && typeof this.onEvent === 'function';
@@ -35,8 +41,8 @@ class EventHandler {
   registerListeners() {
     if (this.isEventHandler()) {
       this.handledEvents.forEach(function(event) {
-        if (event === 'hlsEventGeneric') {
-          throw new Error('Forbidden event name: ' + event);
+        if (FORBIDDEN_EVENT_NAMES.includes(event)) {
+          throw new Error('Forbidden event-name: ' + event);
         }
         this.hls.on(event, this.onEvent);
       }, this);