Merge branch 'release/1.14.1'

Author: bbert

RELEASES NOTES.txt

@@ -1,3 +1,8 @@
+### Release Notes v1.14.1 (2018/02/15)
+* Bugs fixing:
+* - [HLS] Correct key error ('webkitkeyerror') handler (native HLS+FP on Safari/OSx use case)
+* - [HLS] Correct licenser url getting from protection data (native HLS+FP on Safari/OSx use case)
+
 ### Release Notes v1.14.0 (2018/02/08)
 * [MSS] Add automatic Widevine pssh generation [#216]
 * [MSS] Detect PlayReady messages encoding [#207]

app/js/hls/HlsStream.js

@@ -338,11 +338,12 @@ Hls.dependencies.HlsStream = function() {
         },
 
         getKeyError = function(event) {
-            var code = MediaPlayer.dependencies.ErrorHandler.prototype.MEDIA_KEYERR,
+            var error = event.target.error,
+                code = MediaPlayer.dependencies.ErrorHandler.prototype.MEDIA_KEYERR,
                 msg = "MediakeyError";
 
-            if (event.errorCode) {
-                switch (event.errorCode.code) {
+            if (error) {
+                switch (error.code) {
                     case 1:
                         code = MediaPlayer.dependencies.ErrorHandler.prototype.MEDIA_KEYERR_UNKNOWN;
                         msg = "An unspecified error occurred. This value is used for errors that don't match any of the other codes.";
@@ -376,7 +377,7 @@ Hls.dependencies.HlsStream = function() {
                 code = MediaPlayer.dependencies.ErrorHandler.prototype.MEDIA_KEYERR_UNKNOWN;
                 msg = "An unspecified error occurred. This value is used for errors that don't match any of the other codes.";
             }
-            if (event.systemCode) {
+            if (error.systemCode) {
                 msg += "  (System Code = " + event.systemCode + ")";
             }
             return new MediaPlayer.vo.protection.KeyError(code, msg);
@@ -416,18 +417,27 @@ Hls.dependencies.HlsStream = function() {
 
             var session = e.target,
                 message = e.message,
-                type;
+                url = null,
+                type,
+                protData = getKsProtectionData('com.apple.fps.1_0');
+
+            if (protData) {
+                if (protData.serverURL && typeof protData.serverURL === "string" && protData.serverURL !== "") {
+                    url = protData.serverURL;
+                } else if (protData.laURL && protData.laURL !== "") { // TODO: Deprecated!
+                    url = protData.laURL;
+                }
+            }
 
-            var protData = getKsProtectionData('com.apple.fps.1_0');
-            if (!protData || !protData.laURL) {
+            if (url === null) {
                 this.errHandler.sendError(MediaPlayer.dependencies.ErrorHandler.prototype.MEDIA_KEYMESSERR_URL_LICENSER_UNKNOWN, "No license server URL specified");
                 return;
             }
 
             type = (protData && protData.requestType && protData.requestType === 'text') ? 'text' : 'stream';
 
             message = processLicenseMessage(session, type, message);
-            sendLicenseRequest.call(this, session, type, protData.laURL, message);
+            sendLicenseRequest.call(this, session, type, url, message);
         },
 
         onKeyAdded = function(e) {

app/js/streaming/MediaPlayer.js

@@ -938,7 +938,7 @@ MediaPlayer = function () {
 
             _isPlayerInitialized();
 
-            if (typeof time !== 'number') {
+            if (typeof time !== 'number' || isNaN(time)) {
                 throw new Error('MediaPlayer.seek(): Invalid Arguments');
             }
 

build/deploy.js

@@ -166,7 +166,7 @@ getBranchName().then(
     });
 })
 
-// 7 - Add, commit and push changes on gh-pages branch to repository
+// 7 - Update index.html file content, and update 'latest' symbolic link
 .then(function() {
     // Open index.html file
     var path = 'gh-pages/index.html';
@@ -185,14 +185,15 @@ getBranchName().then(
 
             // Update 'latest' symbolic link
             console.info('Update \'latest\' symbolic link');
+            fs.removeSync('gh-pages/latest');
             fs.ensureSymlinkSync('gh-pages/' + pkg.dir, 'gh-pages/latest');
         }
     }
 
     return Promise.resolve();
 })
 
-// 8 - Add, commit and push changes to Github
+// 8 - Add, commit and push changes on gh-pages branch to repository
 .then(execCommand.bind(null, 'cd gh-pages && '+ gitCommands.configUser))
 .then(execCommand.bind(null, 'cd gh-pages && '+ gitCommands.configEmail))
 .then(execCommand.bind(null, 'cd gh-pages && '+ gitCommands.add))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hasplayer.js",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "scripts": {
     "build": "cd build && gulp",
     "doc": "cd build && gulp doc",