@stremio/stremio-video 0.0.17-rc.6 → 0.0.18

package/package.json

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

package/src/ChromecastSenderVideo/ChromecastSenderVideo.js

@@ -71,10 +71,11 @@ function ChromecastSenderVideo(options) {
         extraSubtitlesOutlineColor: false
     };
 
-    function onTransportError(error, message) {
+    function onTransportError(error, action) {
         events.emit('error', Object.assign({}, ERROR.CHROMECAST_SENDER_VIDEO.MESSAGE_SEND_FAILED, {
             error: error,
-            message: message
+            action: action,
+            message: 'Chromecast transport error'
         }));
     }
     function onMessage(message) {

package/src/IFrameVideo/IFrameVideo.js

@@ -17,24 +17,39 @@ function IFrameVideo(options) {
     iframeElement.style.border = 0;
     iframeElement.style.backgroundColor = 'black';
     iframeElement.allowFullscreen = false;
+    iframeElement.allow = 'autoplay';
     containerElement.appendChild(iframeElement);
 
     var events = new EventEmitter();
     var destroyed = false;
-    var stream = null;
     var observedProps = {
-        stream: false
+        stream: false,
+        paused: false,
+        time: false,
+        duration: false,
+        buffering: false,
+        buffered: false,
+        volume: false,
+        muted: false,
+        playbackSpeed: false
     };
 
-    function getProp(propName) {
-        switch (propName) {
-            case 'stream': {
-                return stream;
-            }
-            default: {
-                return null;
-            }
+    function onMessage(event) {
+        if (event.source !== iframeElement.contentWindow) {
+            return;
         }
+
+        var data = event.data || event.message;
+        if (!data || typeof data.event !== 'string') {
+            return;
+        }
+
+        var eventName = data.event;
+        var args = Array.isArray(data.args) ? data.args : [];
+        events.emit.apply(events, [eventName].concat(args));
+    }
+    function sendMessage(action) {
+        iframeElement.contentWindow.postMessage(action, '*');
     }
     function onError(error) {
         events.emit('error', error);
@@ -42,14 +57,13 @@ function IFrameVideo(options) {
             command('unload');
         }
     }
-    function onPropChanged(propName) {
+    function onPropChanged(propName, propValue) {
         if (observedProps[propName]) {
-            events.emit('propChanged', propName, getProp(propName));
+            events.emit('propChanged', propName, propValue);
         }
     }
     function observeProp(propName) {
         if (observedProps.hasOwnProperty(propName)) {
-            events.emit('propValue', propName, getProp(propName));
             observedProps[propName] = true;
         }
     }
@@ -58,29 +72,46 @@ function IFrameVideo(options) {
             case 'load': {
                 command('unload');
                 if (commandArgs && commandArgs.stream && typeof commandArgs.stream.playerFrameUrl === 'string') {
-                    stream = commandArgs.stream;
-                    onPropChanged('stream');
+                    window.addEventListener('message', onMessage, false);
                     iframeElement.src = commandArgs.stream.playerFrameUrl;
+                    return false;
                 } else {
                     onError(Object.assign({}, ERROR.UNSUPPORTED_STREAM, {
                         critical: true,
                         stream: commandArgs ? commandArgs.stream : null
                     }));
+                    return true;
                 }
-                break;
             }
             case 'unload': {
-                stream = null;
+                window.removeEventListener('message', onMessage);
                 iframeElement.removeAttribute('src');
-                onPropChanged('stream');
-                break;
+                onPropChanged('stream', null);
+                onPropChanged('paused', null);
+                onPropChanged('time', null);
+                onPropChanged('duration', null);
+                onPropChanged('buffering', null);
+                onPropChanged('buffered', null);
+                onPropChanged('volume', null);
+                onPropChanged('muted', null);
+                onPropChanged('playbackSpeed', null);
+                return true;
             }
             case 'destroy': {
                 command('unload');
                 destroyed = true;
+                onPropChanged('stream', null);
+                onPropChanged('paused', null);
+                onPropChanged('time', null);
+                onPropChanged('duration', null);
+                onPropChanged('buffering', null);
+                onPropChanged('buffered', null);
+                onPropChanged('volume', null);
+                onPropChanged('muted', null);
+                onPropChanged('playbackSpeed', null);
                 events.removeAllListeners();
                 containerElement.removeChild(iframeElement);
-                break;
+                return true;
             }
         }
     }
@@ -102,10 +133,18 @@ function IFrameVideo(options) {
             switch (action.type) {
                 case 'observeProp': {
                     observeProp(action.propName);
+                    sendMessage(action);
+                    return;
+                }
+                case 'setProp': {
+                    sendMessage(action);
                     return;
                 }
                 case 'command': {
-                    command(action.commandName, action.commandArgs);
+                    if (!command(action.commandName, action.commandArgs)) {
+                        sendMessage(action);
+                    }
+
                     return;
                 }
             }
@@ -121,10 +160,10 @@ IFrameVideo.canPlayStream = function(stream) {
 
 IFrameVideo.manifest = {
     name: 'IFrameVideo',
-    external: false,
-    props: ['stream'],
-    commands: ['load', 'unload', 'destroy'],
-    events: ['propValue', 'propChanged', 'error']
+    external: true,
+    props: ['stream', 'paused', 'time', 'duration', 'buffering', 'buffered', 'audioTracks', 'selectedAudioTrackId', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'subtitlesOffset', 'subtitlesSize', 'subtitlesTextColor', 'subtitlesBackgroundColor', 'subtitlesOutlineColor', 'volume', 'muted', 'playbackSpeed', 'extraSubtitlesTracks', 'selectedExtraSubtitlesTrackId', 'extraSubtitlesDelay', 'extraSubtitlesSize', 'extraSubtitlesOffset', 'extraSubtitlesTextColor', 'extraSubtitlesBackgroundColor', 'extraSubtitlesOutlineColor'],
+    commands: ['load', 'unload', 'destroy', 'addExtraSubtitlesTracks'],
+    events: ['propValue', 'propChanged', 'ended', 'error', 'subtitlesTrackLoaded', 'audioTrackLoaded', 'extraSubtitlesTrackLoaded', 'implementationChanged']
 };
 
 module.exports = IFrameVideo;

package/src/StremioVideo/StremioVideo.js

@@ -4,9 +4,7 @@ var deepFreeze = require('deep-freeze');
 var selectVideoImplementation = require('./selectVideoImplementation');
 var ERROR = require('../error');
 
-function StremioVideo(options) {
-    options = options || {};
-
+function StremioVideo() {
     var video = null;
     var events = new EventEmitter();
     var destroyed = false;
@@ -18,15 +16,16 @@ function StremioVideo(options) {
 
         events.on(eventName, listener);
     };
-    this.dispatch = function(action) {
+    this.dispatch = function(action, options) {
         if (destroyed) {
             throw new Error('Video is destroyed');
         }
 
         if (action) {
             action = deepFreeze(cloneDeep(action));
+            options = options || {};
             if (action.type === 'command' && action.commandName === 'load' && action.commandArgs) {
-                var Video = selectVideoImplementation(action.commandArgs);
+                var Video = selectVideoImplementation(action.commandArgs, options);
                 if (video !== null && video.constructor !== Video) {
                     video.dispatch({ type: 'command', commandName: 'destroy' });
                     video = null;
@@ -41,7 +40,7 @@ function StremioVideo(options) {
                         return;
                     }
 
-                    video = new Video(Object.assign({}, options, action.commandArgs));
+                    video = new Video(options);
                     video.on('ended', function() {
                         events.emit('ended');
                     });

package/src/StremioVideo/selectVideoImplementation.js

@@ -5,28 +5,28 @@ var YouTubeVideo = require('../YouTubeVideo');
 var withStreamingServer = require('../withStreamingServer');
 var withHTMLSubtitles = require('../withHTMLSubtitles');
 
-function selectVideoImplementation(args) {
-    if (!args.stream || typeof args.stream.externalUrl === 'string') {
+function selectVideoImplementation(commandArgs, options) {
+    if (!commandArgs.stream || typeof commandArgs.stream.externalUrl === 'string') {
         return null;
     }
 
-    if (args.chromecastTransport && args.chromecastTransport.getCastState() === cast.framework.CastState.CONNECTED) {
+    if (options.chromecastTransport && options.chromecastTransport.getCastState() === cast.framework.CastState.CONNECTED) {
         return ChromecastSenderVideo;
     }
 
-    if (typeof args.stream.ytId === 'string') {
+    if (typeof commandArgs.stream.ytId === 'string') {
         return withHTMLSubtitles(YouTubeVideo);
     }
 
-    if (typeof args.stream.playerFrameUrl === 'string') {
+    if (typeof commandArgs.stream.playerFrameUrl === 'string') {
         return IFrameVideo;
     }
 
-    if (typeof args.streamingServerURL === 'string') {
+    if (typeof commandArgs.streamingServerURL === 'string') {
         return withStreamingServer(withHTMLSubtitles(HTMLVideo));
     }
 
-    if (typeof args.stream.url === 'string') {
+    if (typeof commandArgs.stream.url === 'string') {
         return withHTMLSubtitles(HTMLVideo);
     }