- rename INTERNAL_KEY_STATUSES_CHANGED into INTERNAL_KEY_STATUS_CHANGED

- keep sending public event KEY_STATUSES_CHANGED when statuses changed

Author: bbert

src/streaming/protection/ProtectionEvents.js

@@ -58,11 +58,10 @@ class ProtectionEvents extends EventsBase {
         this.INTERNAL_KEY_SYSTEM_SELECTED = 'internalKeySystemSelected';
 
         /**
-         * Event ID for events delivered when the status of one or more
-         * decryption keys has changed
+         * Event ID for events delivered when the status of one decryption keys has changed
          * @ignore
          */
-        this.INTERNAL_KEY_STATUSES_CHANGED = 'internalkeyStatusesChanged';
+        this.INTERNAL_KEY_STATUS_CHANGED = 'internalkeyStatusChanged';
 
         /**
          * Event ID for events delivered when a new key has been added

src/streaming/protection/controllers/ProtectionController.js

@@ -90,7 +90,7 @@ function ProtectionController(config) {
         // Once Keysystem is selected and before creating the session, we will do that check
         // so we create the strictly necessary DRM sessions
         eventBus.on(events.INTERNAL_KEY_MESSAGE, onKeyMessage, this);
-        eventBus.on(events.INTERNAL_KEY_STATUSES_CHANGED, onKeyStatusesChanged, this);
+        eventBus.on(events.INTERNAL_KEY_STATUS_CHANGED, onKeyStatusChanged, this);
 
         mediaInfoArr.push(mediaInfo);
 
@@ -287,7 +287,7 @@ function ProtectionController(config) {
     function reset() {
 
         eventBus.off(events.INTERNAL_KEY_MESSAGE, onKeyMessage, this);
-        eventBus.off(events.INTERNAL_KEY_STATUSES_CHANGED, onKeyStatusesChanged, this);
+        eventBus.off(events.INTERNAL_KEY_STATUS_CHANGED, onKeyStatusChanged, this);
 
         setMediaElement(null);
 
@@ -438,11 +438,11 @@ function ProtectionController(config) {
         eventBus.trigger(events.LICENSE_REQUEST_COMPLETE, {data: data, error: error});
     }
 
-    function onKeyStatusesChanged(e) {
-        if (!e.error) {
-            log('[DRM] Key statuses changed. statuses = ' + e.data);
-        } else {
+    function onKeyStatusChanged(e) {
+        if (e.error) {
             eventBus.trigger(events.KEY_STATUSES_CHANGED, {data: null, error: 'DRM: KeyStatusChange error! -- ' + e.error});
+        } else {
+            log('DRM: key status = ' + e.status);
         }
     }
 

src/streaming/protection/models/ProtectionModel_21Jan2015.js

@@ -332,9 +332,9 @@ function ProtectionModel_21Jan2015(config) {
             handleEvent: function (event) {
                 switch (event.type) {
                     case 'keystatuseschange':
-                        eventBus.trigger(events.INTERNAL_KEY_STATUSES_CHANGED, {data: this});
+                        eventBus.trigger(events.KEY_STATUSES_CHANGED, {data: this});
                         event.target.keyStatuses.forEach(function () {
-                            // has Edge and Chrome implement different version of keystatues, param are not on same order
+                            // Edge and Chrome implement different version of keystatues, param are not on same order
                             let status, keyId;
                             if (arguments && arguments.length > 0) {
                                 if (arguments[0]) {
@@ -355,9 +355,10 @@ function ProtectionModel_21Jan2015(config) {
                             }
                             switch (status) {
                                 case 'expired':
-                                    eventBus.trigger(events.INTERNAL_KEY_STATUSES_CHANGED, {error: 'License has expired'});
+                                    eventBus.trigger(events.INTERNAL_KEY_STATUS_CHANGED, {error: 'License has expired'});
                                     break;
                                 default:
+                                    eventBus.trigger(events.INTERNAL_KEY_STATUS_CHANGED, {status: status, keyId: keyId});
                                     break;
                             }
                         });