@stremio/stremio-video 0.0.16 → 0.0.17-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.16",
+    "version": "0.0.17-rc.3",
     "description": "Abstraction layer on top of different media players",
     "author": "Smart Code OOD",
     "main": "src/index.js",
@@ -21,7 +21,8 @@
         "magnet-uri": "6.2.0",
         "url": "0.11.0",
         "video-name-parser": "1.4.6",
-        "vtt.js": "github:jaruba/vtt.js#e4f5f5603730866bacb174a93f51b734c9f29e6a"
+        "vtt.js": "github:jaruba/vtt.js#e4f5f5603730866bacb174a93f51b734c9f29e6a",
+        "color": "4.2.3"
     },
     "devDependencies": {
         "eslint": "7.32.0"

package/src/ChromecastSenderVideo/ChromecastSenderVideo.js

@@ -49,10 +49,18 @@ function ChromecastSenderVideo(options) {
         duration: false,
         buffering: false,
         buffered: false,
-        volume: false,
-        muted: false,
+        audioTracks: false,
+        selectedAudioTrackId: false,
         subtitlesTracks: false,
         selectedSubtitlesTrackId: false,
+        subtitlesOffset: false,
+        subtitlesSize: false,
+        subtitlesTextColor: false,
+        subtitlesBackgroundColor: false,
+        subtitlesOutlineColor: false,
+        volume: false,
+        muted: false,
+        playbackSpeed: false,
         extraSubtitlesTracks: false,
         selectedExtraSubtitlesTrackId: false,
         extraSubtitlesDelay: false,
@@ -60,7 +68,7 @@ function ChromecastSenderVideo(options) {
         extraSubtitlesOffset: false,
         extraSubtitlesTextColor: false,
         extraSubtitlesBackgroundColor: false,
-        extraSubtitlesShadowColor: false
+        extraSubtitlesOutlineColor: false
     };
 
     function onTransportError(error, message) {
@@ -111,10 +119,18 @@ function ChromecastSenderVideo(options) {
                 onPropChanged('duration', null);
                 onPropChanged('buffering', null);
                 onPropChanged('buffered', null);
-                onPropChanged('volume', null);
-                onPropChanged('muted', null);
+                onPropChanged('audioTracks', []);
+                onPropChanged('selectedAudioTrackId', []);
                 onPropChanged('subtitlesTracks', []);
                 onPropChanged('selectedSubtitlesTrackId', null);
+                onPropChanged('subtitlesOffset', null);
+                onPropChanged('subtitlesSize', null);
+                onPropChanged('subtitlesTextColor', null);
+                onPropChanged('subtitlesBackgroundColor', null);
+                onPropChanged('subtitlesOutlineColor', null);
+                onPropChanged('volume', null);
+                onPropChanged('muted', null);
+                onPropChanged('playbackSpeed', null);
                 onPropChanged('extraSubtitlesTracks', []);
                 onPropChanged('selectedExtraSubtitlesTrackId', null);
                 onPropChanged('extraSubtitlesDelay', null);
@@ -122,7 +138,7 @@ function ChromecastSenderVideo(options) {
                 onPropChanged('extraSubtitlesOffset', null);
                 onPropChanged('extraSubtitlesTextColor', null);
                 onPropChanged('extraSubtitlesBackgroundColor', null);
-                onPropChanged('extraSubtitlesShadowColor', null);
+                onPropChanged('extraSubtitlesOutlineColor', null);
                 events.removeAllListeners();
                 chromecastTransport.off('message', onMessage);
                 containerElement.removeChild(deviceNameContainerElement);
@@ -179,9 +195,9 @@ ChromecastSenderVideo.canPlayStream = function() {
 ChromecastSenderVideo.manifest = {
     name: 'ChromecastSenderVideo',
     external: true,
-    props: ['stream', 'paused', 'time', 'duration', 'buffering', 'buffered', 'volume', 'muted', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'extraSubtitlesTracks', 'selectedExtraSubtitlesTrackId', 'extraSubtitlesDelay', 'extraSubtitlesSize', 'extraSubtitlesOffset', 'extraSubtitlesTextColor', 'extraSubtitlesBackgroundColor', 'extraSubtitlesShadowColor'],
+    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', 'extraSubtitlesTrackLoaded', 'implementationChanged']
+    events: ['propValue', 'propChanged', 'ended', 'error', 'subtitlesTrackLoaded', 'audioTrackLoaded', 'extraSubtitlesTrackLoaded', 'implementationChanged']
 };
 
 module.exports = ChromecastSenderVideo;

package/src/HTMLVideo/HTMLVideo.js

@@ -2,6 +2,7 @@ var EventEmitter = require('eventemitter3');
 var Hls = require('hls.js');
 var cloneDeep = require('lodash.clonedeep');
 var deepFreeze = require('deep-freeze');
+var Color = require('color');
 var ERROR = require('../error');
 var getContentType = require('./getContentType');
 var HLS_CONFIG = require('./hlsConfig');
@@ -14,6 +15,9 @@ function HTMLVideo(options) {
         throw new Error('Container element required to be instance of HTMLElement');
     }
 
+    var styleElement = document.createElement('style');
+    containerElement.appendChild(styleElement);
+    styleElement.sheet.insertRule('video::cue { font-size: 4vmin; color: rgb(255, 255, 255); background-color: rgba(0, 0, 0, 0); text-shadow: rgb(34, 34, 34) 1px 1px 0.1em; }');
     var videoElement = document.createElement('video');
     videoElement.style.width = '100%';
     videoElement.style.height = '100%';
@@ -75,12 +79,24 @@ function HTMLVideo(options) {
         onPropChanged('volume');
         onPropChanged('muted');
     };
+    videoElement.onratechange = function() {
+        onPropChanged('playbackSpeed');
+    };
+    videoElement.textTracks.onchange = function() {
+        onPropChanged('subtitlesTracks');
+        onPropChanged('selectedSubtitlesTrackId');
+        onCueChange();
+        Array.from(videoElement.textTracks).forEach(function(track) {
+            track.oncuechange = onCueChange;
+        });
+    };
     containerElement.appendChild(videoElement);
 
     var hls = null;
     var events = new EventEmitter();
     var destroyed = false;
     var stream = null;
+    var subtitlesOffset = 0;
     var observedProps = {
         stream: false,
         paused: false,
@@ -88,8 +104,18 @@ function HTMLVideo(options) {
         duration: false,
         buffering: false,
         buffered: false,
+        subtitlesTracks: false,
+        selectedSubtitlesTrackId: false,
+        subtitlesOffset: false,
+        subtitlesSize: false,
+        subtitlesTextColor: false,
+        subtitlesBackgroundColor: false,
+        subtitlesOutlineColor: false,
+        audioTracks: false,
+        selectedAudioTrackId: false,
         volume: false,
-        muted: false
+        muted: false,
+        playbackSpeed: false
     };
 
     function getProp(propName) {
@@ -139,6 +165,106 @@ function HTMLVideo(options) {
 
                 return Math.floor(time * 1000);
             }
+            case 'subtitlesTracks': {
+                if (stream === null) {
+                    return [];
+                }
+
+                return Array.from(videoElement.textTracks)
+                    .map(function(track, index) {
+                        return Object.freeze({
+                            id: 'EMBEDDED_' + String(index),
+                            lang: track.language,
+                            label: track.label,
+                            origin: 'EMBEDDED',
+                            embedded: true
+                        });
+                    });
+            }
+            case 'selectedSubtitlesTrackId': {
+                if (stream === null) {
+                    return null;
+                }
+
+                return Array.from(videoElement.textTracks)
+                    .reduce(function(result, track, index) {
+                        if (result === null && track.mode === 'showing') {
+                            return 'EMBEDDED_' + String(index);
+                        }
+
+                        return result;
+                    }, null);
+            }
+            case 'subtitlesOffset': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return subtitlesOffset;
+            }
+            case 'subtitlesSize': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return parseInt(styleElement.sheet.cssRules[0].style.fontSize, 10) * 25;
+            }
+            case 'subtitlesTextColor': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return styleElement.sheet.cssRules[0].style.color;
+            }
+            case 'subtitlesBackgroundColor': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return styleElement.sheet.cssRules[0].style.backgroundColor;
+            }
+            case 'subtitlesOutlineColor': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return styleElement.sheet.cssRules[0].style.textShadow.slice(0, styleElement.sheet.cssRules[0].style.textShadow.indexOf(')') + 1);
+            }
+            case 'audioTracks': {
+                if (hls === null || !Array.isArray(hls.audioTracks)) {
+                    return [];
+                }
+
+                return hls.audioTracks
+                    .map(function(track) {
+                        return Object.freeze({
+                            id: 'EMBEDDED_' + String(track.id),
+                            lang: typeof track.lang === 'string' && track.lang.length > 0 ?
+                                track.lang
+                                :
+                                typeof track.name === 'string' && track.name.length > 0 ?
+                                    track.name
+                                    :
+                                    String(track.id),
+                            label: typeof track.name === 'string' && track.name.length > 0 ?
+                                track.name
+                                :
+                                typeof track.lang === 'string' && track.lang.length > 0 ?
+                                    track.lang
+                                    :
+                                    String(track.id),
+                            origin: 'EMBEDDED',
+                            embedded: true
+                        });
+                    });
+            }
+            case 'selectedAudioTrackId': {
+                if (hls === null || hls.audioTrack === null || !isFinite(hls.audioTrack) || hls.audioTrack === -1) {
+                    return null;
+                }
+
+                return 'EMBEDDED_' + String(hls.audioTrack);
+            }
             case 'volume': {
                 if (destroyed || videoElement.volume === null || !isFinite(videoElement.volume)) {
                     return null;
@@ -153,11 +279,26 @@ function HTMLVideo(options) {
 
                 return !!videoElement.muted;
             }
+            case 'playbackSpeed': {
+                if (destroyed || videoElement.playbackRate === null || !isFinite(videoElement.playbackRate)) {
+                    return null;
+                }
+
+                return videoElement.playbackRate;
+            }
             default: {
                 return null;
             }
         }
     }
+    function onCueChange() {
+        Array.from(videoElement.textTracks).forEach(function(track) {
+            Array.from(track.activeCues || []).forEach(function(cue) {
+                cue.snapToLines = false;
+                cue.line = 100 - subtitlesOffset;
+            });
+        });
+    }
     function onVideoError() {
         if (destroyed) {
             return;
@@ -226,6 +367,96 @@ function HTMLVideo(options) {
 
                 break;
             }
+            case 'selectedSubtitlesTrackId': {
+                if (stream !== null) {
+                    Array.from(videoElement.textTracks)
+                        .forEach(function(track, index) {
+                            track.mode = 'EMBEDDED_' + String(index) === propValue ? 'showing' : 'disabled';
+                        });
+                    var selecterdSubtitlesTrack = getProp('subtitlesTracks')
+                        .find(function(track) {
+                            return track.id === propValue;
+                        });
+                    if (selecterdSubtitlesTrack) {
+                        events.emit('subtitlesTrackLoaded', selecterdSubtitlesTrack);
+                    }
+                }
+
+                break;
+            }
+            case 'subtitlesOffset': {
+                if (propValue !== null && isFinite(propValue)) {
+                    subtitlesOffset = Math.max(0, Math.min(100, parseInt(propValue, 10)));
+                    onCueChange();
+                    onPropChanged('subtitlesOffset');
+                }
+
+                break;
+            }
+            case 'subtitlesSize': {
+                if (propValue !== null && isFinite(propValue)) {
+                    styleElement.sheet.cssRules[0].style.fontSize = Math.floor(Math.max(0, parseInt(propValue, 10)) / 25) + 'vmin';
+                    onPropChanged('subtitlesSize');
+                }
+
+                break;
+            }
+            case 'subtitlesTextColor': {
+                if (typeof propValue === 'string') {
+                    try {
+                        styleElement.sheet.cssRules[0].style.color = Color(propValue).rgb().string();
+                    } catch (error) {
+                        // eslint-disable-next-line no-console
+                        console.error('HTMLVideo', error);
+                    }
+
+                    onPropChanged('subtitlesTextColor');
+                }
+
+                break;
+            }
+            case 'subtitlesBackgroundColor': {
+                if (typeof propValue === 'string') {
+                    try {
+                        styleElement.sheet.cssRules[0].style.backgroundColor = Color(propValue).rgb().string();
+                    } catch (error) {
+                        // eslint-disable-next-line no-console
+                        console.error('HTMLVideo', error);
+                    }
+
+                    onPropChanged('subtitlesBackgroundColor');
+                }
+
+                break;
+            }
+            case 'subtitlesOutlineColor': {
+                if (typeof propValue === 'string') {
+                    try {
+                        styleElement.sheet.cssRules[0].style.textShadow = Color(propValue).rgb().string() + ' 1px 1px 0.1em';
+                    } catch (error) {
+                        // eslint-disable-next-line no-console
+                        console.error('HTMLVideo', error);
+                    }
+
+                    onPropChanged('subtitlesOutlineColor');
+                }
+
+                break;
+            }
+            case 'selectedAudioTrackId': {
+                if (hls !== null) {
+                    var selecterdAudioTrack = getProp('audioTracks')
+                        .find(function(track) {
+                            return track.id === propValue;
+                        });
+                    hls.audioTrack = selecterdAudioTrack ? parseInt(selecterdAudioTrack.id.split('_').pop(), 10) : -1;
+                    if (selecterdAudioTrack) {
+                        events.emit('audioTrackLoaded', selecterdAudioTrack);
+                    }
+                }
+
+                break;
+            }
             case 'volume': {
                 if (propValue !== null && isFinite(propValue)) {
                     videoElement.muted = false;
@@ -238,6 +469,13 @@ function HTMLVideo(options) {
                 videoElement.muted = !!propValue;
                 break;
             }
+            case 'playbackSpeed': {
+                if (propValue !== null && isFinite(propValue)) {
+                    videoElement.playbackRate = parseFloat(propValue);
+                }
+
+                break;
+            }
         }
     }
     function command(commandName, commandArgs) {
@@ -254,6 +492,10 @@ function HTMLVideo(options) {
                     onPropChanged('duration');
                     onPropChanged('buffering');
                     onPropChanged('buffered');
+                    onPropChanged('subtitlesTracks');
+                    onPropChanged('selectedSubtitlesTrackId');
+                    onPropChanged('audioTracks');
+                    onPropChanged('selectedAudioTrackId');
                     getContentType(stream)
                         .then(function(contentType) {
                             if (stream !== commandArgs.stream) {
@@ -262,6 +504,14 @@ function HTMLVideo(options) {
 
                             if (contentType === 'application/vnd.apple.mpegurl' && Hls.isSupported()) {
                                 hls = new Hls(HLS_CONFIG);
+                                hls.on(Hls.Events.AUDIO_TRACKS_UPDATED, function() {
+                                    onPropChanged('audioTracks');
+                                    onPropChanged('selectedAudioTrackId');
+                                });
+                                hls.on(Hls.Events.AUDIO_TRACK_SWITCHED, function() {
+                                    onPropChanged('audioTracks');
+                                    onPropChanged('selectedAudioTrackId');
+                                });
                                 hls.loadSource(stream.url);
                                 hls.attachMedia(videoElement);
                             } else {
@@ -285,7 +535,12 @@ function HTMLVideo(options) {
             }
             case 'unload': {
                 stream = null;
+                Array.from(videoElement.textTracks).forEach(function(track) {
+                    track.oncuechange = null;
+                });
                 if (hls !== null) {
+                    hls.removeAllListeners();
+                    hls.detachMedia(videoElement);
                     hls.destroy();
                     hls = null;
                 }
@@ -298,13 +553,23 @@ function HTMLVideo(options) {
                 onPropChanged('duration');
                 onPropChanged('buffering');
                 onPropChanged('buffered');
+                onPropChanged('subtitlesTracks');
+                onPropChanged('selectedSubtitlesTrackId');
+                onPropChanged('audioTracks');
+                onPropChanged('selectedAudioTrackId');
                 break;
             }
             case 'destroy': {
                 command('unload');
                 destroyed = true;
+                onPropChanged('subtitlesOffset');
+                onPropChanged('subtitlesSize');
+                onPropChanged('subtitlesTextColor');
+                onPropChanged('subtitlesBackgroundColor');
+                onPropChanged('subtitlesOutlineColor');
                 onPropChanged('volume');
                 onPropChanged('muted');
+                onPropChanged('playbackSpeed');
                 events.removeAllListeners();
                 videoElement.onerror = null;
                 videoElement.onended = null;
@@ -321,7 +586,10 @@ function HTMLVideo(options) {
                 videoElement.canplaythrough = null;
                 videoElement.onloadeddata = null;
                 videoElement.onvolumechange = null;
+                videoElement.onratechange = null;
+                videoElement.textTracks.onchange = null;
                 containerElement.removeChild(videoElement);
+                containerElement.removeChild(styleElement);
                 break;
             }
         }
@@ -379,9 +647,9 @@ HTMLVideo.canPlayStream = function(stream) {
 HTMLVideo.manifest = {
     name: 'HTMLVideo',
     external: false,
-    props: ['stream', 'paused', 'time', 'duration', 'buffering', 'buffered', 'volume', 'muted'],
+    props: ['stream', 'paused', 'time', 'duration', 'buffering', 'buffered', 'audioTracks', 'selectedAudioTrackId', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'subtitlesOffset', 'subtitlesSize', 'subtitlesTextColor', 'subtitlesBackgroundColor', 'subtitlesOutlineColor', 'volume', 'muted', 'playbackSpeed'],
     commands: ['load', 'unload', 'destroy'],
-    events: ['propValue', 'propChanged', 'ended', 'error']
+    events: ['propValue', 'propChanged', 'ended', 'error', 'subtitlesTrackLoaded', 'audioTrackLoaded']
 };
 
 module.exports = HTMLVideo;

package/src/HTMLVideo/getContentType.js

@@ -9,7 +9,11 @@ function getContentType(stream) {
 
     return fetch(stream.url, { method: 'HEAD' })
         .then(function(resp) {
-            return resp.headers.get('content-type');
+            if (resp.ok) {
+                return resp.headers.get('content-type');
+            }
+
+            throw new Error(resp.status + ' (' + resp.statusText + ')');
         });
 }
 

package/src/StremioVideo/StremioVideo.js

@@ -57,6 +57,9 @@ function StremioVideo(options) {
                     video.on('subtitlesTrackLoaded', function(track) {
                         events.emit('subtitlesTrackLoaded', track);
                     });
+                    video.on('audioTrackLoaded', function(track) {
+                        events.emit('audioTrackLoaded', track);
+                    });
                     video.on('extraSubtitlesTrackLoaded', function(track) {
                         events.emit('extraSubtitlesTrackLoaded', track);
                     });

package/src/YouTubeVideo/YouTubeVideo.js

@@ -243,7 +243,7 @@ function YouTubeVideo(options) {
                     })
                     .map(function(track, index) {
                         return Object.freeze({
-                            id: String(index),
+                            id: 'EMBEDDED_' + String(index),
                             lang: track.languageCode,
                             label: typeof track.displayName === 'string' ? track.displayName : track.languageCode,
                             origin: 'EMBEDDED',

package/src/withHTMLSubtitles/subtitlesConverter.js

@@ -10,7 +10,7 @@ function srt2webvtt(data) {
     var result = '';
     if (cuelist.length > 0) {
         result += 'WEBVTT\n\n';
-        for (var i = 0; i < cuelist.length; i=i+1) {
+        for (var i = 0; i < cuelist.length; i = i + 1) {
             result += convertSrtCue(cuelist[i]);
         }
     }
@@ -41,8 +41,8 @@ function convertSrtCue(caption) {
         // convert time string
         var m = s[1].match(/(\d+):(\d+):(\d+)(?:,(\d+))?\s*--?>\s*(\d+):(\d+):(\d+)(?:,(\d+))?/);
         if (m) {
-            cue += m[1]+':'+m[2]+':'+m[3]+'.'+m[4]+' --> '
-                  +m[5]+':'+m[6]+':'+m[7]+'.'+m[8]+'\n';
+            cue += m[1] + ':' + m[2] + ':' + m[3] + '.' + m[4] + ' --> '
+                + m[5] + ':' + m[6] + ':' + m[7] + '.' + m[8] + '\n';
             line += 1;
         } else {
             // Unrecognized timestring
@@ -62,6 +62,14 @@ function convertSrtCue(caption) {
 module.exports = {
     convert: function(text) {
         // presume all to be SRT if not WEBVTT
-        return text.includes('WEBVTT') ? text : srt2webvtt(text);
+        if (text.includes('WEBVTT')) {
+            return text;
+        }
+
+        try {
+            return srt2webvtt(text);
+        } catch (error) {
+            throw new Error('Failed to convert srt to webvtt: ' + error.message);
+        }
     }
 };

package/src/withHTMLSubtitles/withHTMLSubtitles.js

@@ -1,6 +1,7 @@
 var EventEmitter = require('eventemitter3');
 var cloneDeep = require('lodash.clonedeep');
 var deepFreeze = require('deep-freeze');
+var Color = require('color');
 var ERROR = require('../error');
 var subtitlesParser = require('./subtitlesParser');
 var subtitlesRenderer = require('./subtitlesRenderer');
@@ -49,9 +50,9 @@ function withHTMLSubtitles(Video) {
         var delay = null;
         var size = 100;
         var offset = 0;
-        var textColor = '#FFFFFFFF';
-        var backgroundColor = '#00000000';
-        var shadowColor = '#222222FF';
+        var textColor = 'rgb(255, 255, 255)';
+        var backgroundColor = 'rgba(0, 0, 0, 0)';
+        var outlineColor = 'rgb(34, 34, 34)';
         var observedProps = {
             extraSubtitlesTracks: false,
             selectedExtraSubtitlesTrackId: false,
@@ -60,7 +61,7 @@ function withHTMLSubtitles(Video) {
             extraSubtitlesOffset: false,
             extraSubtitlesTextColor: false,
             extraSubtitlesBackgroundColor: false,
-            extraSubtitlesShadowColor: false
+            extraSubtitlesOutlineColor: false
         };
 
         function renderSubtitles() {
@@ -79,8 +80,9 @@ function withHTMLSubtitles(Video) {
                 cueNode.style.fontSize = Math.floor(size / 25) + 'vmin';
                 cueNode.style.color = textColor;
                 cueNode.style.backgroundColor = backgroundColor;
-                cueNode.style.textShadow = '1px 1px 0.1em ' + shadowColor;
-                subtitlesElement.append(cueNode, document.createElement('br'));
+                cueNode.style.textShadow = '1px 1px 0.1em ' + outlineColor;
+                subtitlesElement.appendChild(cueNode);
+                subtitlesElement.appendChild(document.createElement('br'));
             });
         }
         function onVideoError(error) {
@@ -168,12 +170,12 @@ function withHTMLSubtitles(Video) {
 
                     return backgroundColor;
                 }
-                case 'extraSubtitlesShadowColor': {
+                case 'extraSubtitlesOutlineColor': {
                     if (destroyed) {
                         return null;
                     }
 
-                    return shadowColor;
+                    return outlineColor;
                 }
                 default: {
                     return videoPropValue;
@@ -189,7 +191,7 @@ function withHTMLSubtitles(Video) {
                 case 'extraSubtitlesOffset':
                 case 'extraSubtitlesTextColor':
                 case 'extraSubtitlesBackgroundColor':
-                case 'extraSubtitlesShadowColor': {
+                case 'extraSubtitlesOutlineColor': {
                     events.emit('propValue', propName, getProp(propName, null));
                     observedProps[propName] = true;
                     return true;
@@ -213,7 +215,11 @@ function withHTMLSubtitles(Video) {
                         delay = 0;
                         fetch(selectedTrack.url)
                             .then(function(resp) {
-                                return resp.text();
+                                if (resp.ok) {
+                                    return resp.text();
+                                }
+
+                                throw new Error(resp.status + ' (' + resp.statusText + ')');
                             })
                             .then(function(text) {
                                 return subtitlesConverter.convert(text);
@@ -276,7 +282,13 @@ function withHTMLSubtitles(Video) {
                 }
                 case 'extraSubtitlesTextColor': {
                     if (typeof propValue === 'string') {
-                        textColor = propValue;
+                        try {
+                            textColor = Color(propValue).rgb().string();
+                        } catch (error) {
+                            // eslint-disable-next-line no-console
+                            console.error('withHTMLSubtitles', error);
+                        }
+
                         renderSubtitles();
                         onPropChanged('extraSubtitlesTextColor');
                     }
@@ -285,18 +297,30 @@ function withHTMLSubtitles(Video) {
                 }
                 case 'extraSubtitlesBackgroundColor': {
                     if (typeof propValue === 'string') {
-                        backgroundColor = propValue;
+                        try {
+                            backgroundColor = Color(propValue).rgb().string();
+                        } catch (error) {
+                            // eslint-disable-next-line no-console
+                            console.error('withHTMLSubtitles', error);
+                        }
+
                         renderSubtitles();
                         onPropChanged('extraSubtitlesBackgroundColor');
                     }
 
                     return true;
                 }
-                case 'extraSubtitlesShadowColor': {
+                case 'extraSubtitlesOutlineColor': {
                     if (typeof propValue === 'string') {
-                        shadowColor = propValue;
+                        try {
+                            outlineColor = Color(propValue).rgb().string();
+                        } catch (error) {
+                            // eslint-disable-next-line no-console
+                            console.error('withHTMLSubtitles', error);
+                        }
+
                         renderSubtitles();
-                        onPropChanged('extraSubtitlesShadowColor');
+                        onPropChanged('extraSubtitlesOutlineColor');
                     }
 
                     return true;
@@ -361,7 +385,7 @@ function withHTMLSubtitles(Video) {
                     onPropChanged('extraSubtitlesOffset');
                     onPropChanged('extraSubtitlesTextColor');
                     onPropChanged('extraSubtitlesBackgroundColor');
-                    onPropChanged('extraSubtitlesShadowColor');
+                    onPropChanged('extraSubtitlesOutlineColor');
                     video.dispatch({ type: 'command', commandName: 'destroy' });
                     events.removeAllListeners();
                     containerElement.removeChild(subtitlesElement);
@@ -423,7 +447,7 @@ function withHTMLSubtitles(Video) {
     VideoWithHTMLSubtitles.manifest = {
         name: Video.manifest.name + 'WithHTMLSubtitles',
         external: Video.manifest.external,
-        props: Video.manifest.props.concat(['extraSubtitlesTracks', 'selectedExtraSubtitlesTrackId', 'extraSubtitlesDelay', 'extraSubtitlesSize', 'extraSubtitlesOffset', 'extraSubtitlesTextColor', 'extraSubtitlesBackgroundColor', 'extraSubtitlesShadowColor'])
+        props: Video.manifest.props.concat(['extraSubtitlesTracks', 'selectedExtraSubtitlesTrackId', 'extraSubtitlesDelay', 'extraSubtitlesSize', 'extraSubtitlesOffset', 'extraSubtitlesTextColor', 'extraSubtitlesBackgroundColor', 'extraSubtitlesOutlineColor'])
             .filter(function(value, index, array) { return array.indexOf(value) === index; }),
         commands: Video.manifest.commands.concat(['load', 'unload', 'destroy', 'addExtraSubtitlesTracks'])
             .filter(function(value, index, array) { return array.indexOf(value) === index; }),

package/src/withStreamingServer/convertStream.js

@@ -1,9 +1,22 @@
 var url = require('url');
 var magnet = require('magnet-uri');
-var inferTorrentFileIdx = require('./inferTorrentFileIdx');
+var createTorrent = require('./createTorrent');
 
 function convertStream(streamingServerURL, stream, seriesInfo) {
     return new Promise(function(resolve, reject) {
+        var guessFileIdx = false;
+        if (stream.fileIdx === null || !isFinite(stream.fileIdx)) {
+            guessFileIdx = {};
+            if (seriesInfo) {
+                if (seriesInfo.season !== null && isFinite(seriesInfo.season)) {
+                    guessFileIdx.season = seriesInfo.season;
+                }
+                if (seriesInfo.episode !== null && isFinite(seriesInfo.episode)) {
+                    guessFileIdx.episode = seriesInfo.episode;
+                }
+            }
+        }
+
         if (typeof stream.url === 'string') {
             if (stream.url.indexOf('magnet:') === 0) {
                 var parsedMagnetURI;
@@ -24,8 +37,9 @@ function convertStream(streamingServerURL, stream, seriesInfo) {
                     })
                     :
                     [];
-                inferTorrentFileIdx(streamingServerURL, parsedMagnetURI.infoHash, sources, seriesInfo)
-                    .then(function(fileIdx) {
+                createTorrent(streamingServerURL, parsedMagnetURI.infoHash, sources, guessFileIdx)
+                    .then(function(resp) {
+                        var fileIdx = guessFileIdx ? resp.guessedFileIdx : stream.fileIdx;
                         resolve(url.resolve(streamingServerURL, '/' + encodeURIComponent(parsedMagnetURI.infoHash) + '/' + encodeURIComponent(fileIdx)));
                     })
                     .catch(function(error) {
@@ -39,17 +53,14 @@ function convertStream(streamingServerURL, stream, seriesInfo) {
         }
 
         if (typeof stream.infoHash === 'string') {
-            if (stream.fileIdx !== null && isFinite(stream.fileIdx)) {
-                resolve(url.resolve(streamingServerURL, '/' + encodeURIComponent(stream.infoHash) + '/' + encodeURIComponent(stream.fileIdx)));
-            } else {
-                inferTorrentFileIdx(streamingServerURL, stream.infoHash, stream.announce, seriesInfo)
-                    .then(function(fileIdx) {
-                        resolve(url.resolve(streamingServerURL, '/' + encodeURIComponent(stream.infoHash) + '/' + encodeURIComponent(fileIdx)));
-                    })
-                    .catch(function(error) {
-                        reject(error);
-                    });
-            }
+            createTorrent(streamingServerURL, stream.infoHash, stream.announce, guessFileIdx)
+                .then(function(resp) {
+                    var fileIdx = guessFileIdx ? resp.guessedFileIdx : stream.fileIdx;
+                    resolve(url.resolve(streamingServerURL, '/' + encodeURIComponent(stream.infoHash) + '/' + encodeURIComponent(fileIdx)));
+                })
+                .catch(function(error) {
+                    reject(error);
+                });
 
             return;
         }

package/src/withStreamingServer/createTorrent.js

@@ -0,0 +1,30 @@
+var url = require('url');
+
+function createTorrent(streamingServerURL, infoHash, sources, guessFileIdx) {
+    var body = {
+        torrent: {
+            infoHash: infoHash,
+        }
+    };
+    if (Array.isArray(sources) && sources.length > 0) {
+        body.torrent.peerSearch = {
+            sources: ['dht:' + infoHash].concat(sources),
+            min: 40,
+            max: 150
+        };
+    }
+    if (guessFileIdx) {
+        body.guessFileIdx = guessFileIdx;
+    }
+    return fetch(url.resolve(streamingServerURL, '/' + encodeURIComponent(infoHash) + '/create'), {
+        method: 'POST',
+        headers: {
+            'content-type': 'application/json'
+        },
+        body: JSON.stringify(body)
+    }).then(function(resp) {
+        return resp.json();
+    });
+}
+
+module.exports = createTorrent;

package/src/withStreamingServer/withStreamingServer.js

@@ -113,8 +113,8 @@ function withStreamingServer(Video) {
                                         if (commandArgs.forceTranscoding) {
                                             queryParams.set('forceTranscoding', '1');
                                         }
-                                        if (commandArgs.audioChannels !== null && isFinite(commandArgs.audioChannels)) {
-                                            queryParams.set('audioChannels', commandArgs.audioChannels);
+                                        if (commandArgs.maxAudioChannels !== null && isFinite(commandArgs.maxAudioChannels)) {
+                                            queryParams.set('maxAudioChannels', commandArgs.maxAudioChannels);
                                         }
 
                                         return {

package/src/withStreamingServer/inferTorrentFileIdx.js

@@ -1,63 +0,0 @@
-var url = require('url');
-var parseVideoName = require('video-name-parser');
-
-var MEDIA_FILE_EXTENTIONS = /.mkv$|.avi$|.mp4$|.wmv$|.vp8$|.mov$|.mpg$|.ts$|.m3u8$|.webm$|.flac$|.mp3$|.wav$|.wma$|.aac$|.ogg$/i;
-
-function inferTorrentFileIdx(streamingServerURL, infoHash, sources, seriesInfo) {
-    return fetch(url.resolve(streamingServerURL, '/' + encodeURIComponent(infoHash) + '/create'), {
-        method: 'POST',
-        headers: {
-            'content-type': 'application/json'
-        },
-        body: JSON.stringify({
-            torrent: {
-                infoHash: infoHash,
-                peerSearch: {
-                    sources: ['dht:' + infoHash].concat(Array.isArray(sources) ? sources : []),
-                    min: 40,
-                    max: 150
-                }
-            }
-        })
-    }).then(function(resp) {
-        return resp.json();
-    }).then(function(resp) {
-        if (!resp || !Array.isArray(resp.files) || resp.files.some(function(file) { return !file || typeof file.path !== 'string' || file.length === null || !isFinite(file.length); })) {
-            throw new Error('No files found in the torrent');
-        }
-
-        var mediaFiles = resp.files.filter(function(file) {
-            return file.path.match(MEDIA_FILE_EXTENTIONS);
-        });
-        if (mediaFiles.length === 0) {
-            throw new Error('No media files found in the torrent');
-        }
-
-        var mediaFilesForEpisode = seriesInfo ?
-            mediaFiles.filter(function(file) {
-                try {
-                    var info = parseVideoName(file.path);
-                    return info.season !== null &&
-                        isFinite(info.season) &&
-                        info.season === seriesInfo.season &&
-                        Array.isArray(info.episode) &&
-                        info.episode.indexOf(seriesInfo.episode) !== -1;
-                } catch (e) {
-                    return false;
-                }
-            })
-            :
-            [];
-        var selectedFile = (mediaFilesForEpisode.length > 0 ? mediaFilesForEpisode : mediaFiles)
-            .reduce(function(result, file) {
-                if (!result || file.length > result.length) {
-                    return file;
-                }
-
-                return result;
-            }, null);
-        return resp.files.indexOf(selectedFile);
-    });
-}
-
-module.exports = inferTorrentFileIdx;