@stremio/stremio-video 0.0.20-rc.3 → 0.0.20-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.20-rc.3",
+    "version": "0.0.20-rc.4",
     "description": "Abstraction layer on top of different media players",
     "author": "Smart Code OOD",
     "main": "src/index.js",

package/src/ChromecastSenderVideo/ChromecastSenderVideo.js

@@ -39,6 +39,7 @@ function ChromecastSenderVideo(options) {
     deviceNameContainerElement.appendChild(deviceNameLabelElement);
     containerElement.appendChild(deviceNameContainerElement);
     chromecastTransport.on('message', onMessage);
+    chromecastTransport.on('message-error', onMessageReceivedError);
 
     var events = new EventEmitter();
     var destroyed = false;
@@ -71,33 +72,25 @@ function ChromecastSenderVideo(options) {
         extraSubtitlesOutlineColor: false
     };
 
-    function onTransportError(error, action) {
+    function onMessageSendError(error, action) {
         events.emit('error', Object.assign({}, ERROR.CHROMECAST_SENDER_VIDEO.MESSAGE_SEND_FAILED, {
             error: error,
             action: action
         }));
     }
+    function onMessageReceivedError(error) {
+        events.emit('error', Object.assign({}, ERROR.CHROMECAST_SENDER_VIDEO.INVALID_MESSAGE_RECEIVED, {
+            error: error
+        }));
+    }
     function onMessage(message) {
-        var parsedMessage;
-        try {
-            parsedMessage = JSON.parse(message);
-        } catch (error) {
-            events.emit('error', Object.assign({}, ERROR.CHROMECAST_SENDER_VIDEO.INVALID_MESSAGE_RECEIVED, {
-                error: error,
-                args: message
-            }));
-            return;
-        }
-
-        if (!parsedMessage || typeof parsedMessage.event !== 'string') {
-            events.emit('error', Object.assign({}, ERROR.CHROMECAST_SENDER_VIDEO.INVALID_MESSAGE_RECEIVED, {
-                args: message
-            }));
+        if (!message || typeof message.event !== 'string') {
+            onMessageReceivedError(new Error('Invalid message: ' + message));
             return;
         }
 
-        var args = Array.isArray(parsedMessage.args) ? parsedMessage.args : [];
-        events.emit.apply(events, [parsedMessage.event].concat(args));
+        var args = Array.isArray(message.args) ? message.args : [];
+        events.emit.apply(events, [message.event].concat(args));
     }
     function onPropChanged(propName, propValue) {
         if (observedProps[propName]) {
@@ -164,20 +157,20 @@ function ChromecastSenderVideo(options) {
                 case 'observeProp': {
                     observeProp(action.propName);
                     chromecastTransport.sendMessage(action).catch(function(error) {
-                        onTransportError(error, action);
+                        onMessageSendError(error, action);
                     });
                     return;
                 }
                 case 'setProp': {
                     chromecastTransport.sendMessage(action).catch(function(error) {
-                        onTransportError(error, action);
+                        onMessageSendError(error, action);
                     });
                     return;
                 }
                 case 'command': {
                     command(action.commandName, action.commandArgs);
                     chromecastTransport.sendMessage(action).catch(function(error) {
-                        onTransportError(error, action);
+                        onMessageSendError(error, action);
                     });
                     return;
                 }