@stremio/stremio-video 0.0.8 → 0.0.12

package/src/withStreamingServer/withStreamingServer.js

@@ -1,92 +1,42 @@
 var EventEmitter = require('eventemitter3');
+var url = require('url');
+var hat = require('hat');
 var cloneDeep = require('lodash.clonedeep');
 var deepFreeze = require('deep-freeze');
-var convertStreamToURL = require('./convertStreamToURL');
-var createTranscoder = require('./createTranscoder');
-var transcodeNextSegment = require('./transcodeNextSegment');
+var convertStream = require('./convertStream');
 var ERROR = require('../error');
 
-var STARVATION_THRESHOLD = 25000;
-var STARVATION_TIMEOUT = 1000;
-
 function withStreamingServer(Video) {
     function VideoWithStreamingServer(options) {
         options = options || {};
 
         var video = new Video(options);
         video.on('error', onVideoError);
-        video.on('propChanged', onPropEvent.bind(null, 'propChanged'));
-        video.on('propValue', onPropEvent.bind(null, 'propValue'));
+        video.on('propValue', onVideoPropEvent.bind(null, 'propValue'));
+        video.on('propChanged', onVideoPropEvent.bind(null, 'propChanged'));
         Video.manifest.events
             .filter(function(eventName) {
-                return !['error', 'propChanged', 'propValue'].includes(eventName);
+                return !['error', 'propValue', 'propChanged'].includes(eventName);
             })
             .forEach(function(eventName) {
-                video.on(eventName, onOtherEvent(eventName));
+                video.on(eventName, onOtherVideoEvent(eventName));
             });
 
-        var videoState = {
-            time: null,
-            duration: null
-        };
+        var self = this;
         var loadArgs = null;
-        var transcoder = null;
-        var transcodingNextSegment = false;
-        var starvationHandlerTimeoutId = null;
-        var lastStarvationDuration = null;
+        var loaded = false;
+        var actionsQueue = [];
         var events = new EventEmitter();
         var destroyed = false;
         var observedProps = {
             stream: false
         };
 
-        function isStarving() {
-            return transcoder !== null &&
-                !transcoder.ended &&
-                !transcodingNextSegment &&
-                starvationHandlerTimeoutId === null &&
-                videoState.time !== null &&
-                videoState.duration !== null &&
-                videoState.duration !== lastStarvationDuration &&
-                videoState.time + STARVATION_THRESHOLD > videoState.duration;
-        }
-        function onStarving() {
-            transcodingNextSegment = true;
-            lastStarvationDuration = videoState.duration;
-            var loadingТranscoder = transcoder;
-            transcodeNextSegment(transcoder.streamingServerURL, transcoder.hash)
-                .then(function(resp) {
-                    if (loadingТranscoder !== transcoder) {
-                        return;
-                    }
-
-                    if (resp.error) {
-                        if (resp.error.code !== 21) {
-                            throw resp.error;
-                        }
-
-                        command('load', Object.assign({}, loadArgs, {
-                            time: videoState.time
-                        }));
-                        return;
-                    }
-
-                    transcoder.ended = resp.ended;
-                    transcodingNextSegment = false;
-                    if (isStarving()) {
-                        onStarving();
-                    }
-                })
-                .catch(function(error) {
-                    if (loadingТranscoder !== transcoder) {
-                        return;
-                    }
-
-                    onError(Object.assign({}, ERROR.WITH_STREAMING_SERVER.TRANSCODING_FAILED, {
-                        critical: true,
-                        error: error
-                    }));
-                });
+        function flushActionsQueue() {
+            while (actionsQueue.length > 0) {
+                var action = actionsQueue.shift();
+                self.dispatch.call(self, action);
+            }
         }
         function onVideoError(error) {
             events.emit('error', error);
@@ -94,41 +44,17 @@ function withStreamingServer(Video) {
                 command('unload');
             }
         }
-        function onPropEvent(eventName, propName, propValue) {
-            switch (propName) {
-                case 'time': {
-                    videoState.time = propValue;
-                    if (isStarving()) {
-                        onStarving();
-                    }
-                    break;
-                }
-                case 'duration': {
-                    videoState.duration = propValue;
-                    clearTimeout(starvationHandlerTimeoutId);
-                    starvationHandlerTimeoutId = !transcodingNextSegment ?
-                        setTimeout(function() {
-                            starvationHandlerTimeoutId = null;
-                            if (isStarving()) {
-                                onStarving();
-                            }
-                        }, STARVATION_TIMEOUT)
-                        :
-                        null;
-                    break;
-                }
-            }
-
+        function onVideoPropEvent(eventName, propName, propValue) {
             events.emit(eventName, propName, getProp(propName, propValue));
         }
-        function onOtherEvent(eventName) {
+        function onOtherVideoEvent(eventName) {
             return function() {
                 events.emit.apply(events, [eventName].concat(Array.from(arguments)));
             };
         }
         function onPropChanged(propName) {
             if (observedProps[propName]) {
-                events.emit('propChanged', propName, getProp(propName));
+                events.emit('propChanged', propName, getProp(propName, null));
             }
         }
         function onError(error) {
@@ -143,24 +69,6 @@ function withStreamingServer(Video) {
                 case 'stream': {
                     return loadArgs !== null ? loadArgs.stream : null;
                 }
-                case 'time': {
-                    return videoPropValue !== null && transcoder !== null ?
-                        videoPropValue + transcoder.timeOffset
-                        :
-                        videoPropValue;
-                }
-                case 'duration': {
-                    return transcoder !== null ?
-                        transcoder.duration
-                        :
-                        videoPropValue;
-                }
-                case 'buffered': {
-                    return videoPropValue !== null && transcoder !== null ?
-                        videoPropValue + transcoder.timeOffset
-                        :
-                        videoPropValue;
-                }
                 default: {
                     return videoPropValue;
                 }
@@ -169,7 +77,7 @@ function withStreamingServer(Video) {
         function observeProp(propName) {
             switch (propName) {
                 case 'stream': {
-                    events.emit('propValue', propName, getProp(propName));
+                    events.emit('propValue', propName, getProp(propName, null));
                     observedProps[propName] = true;
                     return true;
                 }
@@ -178,27 +86,6 @@ function withStreamingServer(Video) {
                 }
             }
         }
-        function setProp(propName, propValue) {
-            switch (propName) {
-                case 'time': {
-                    if (transcoder !== null) {
-                        if (propValue !== null && isFinite(propValue)) {
-                            var commandArgs = Object.assign({}, loadArgs, {
-                                time: parseInt(propValue, 10)
-                            });
-                            command('load', commandArgs);
-                        }
-
-                        return true;
-                    }
-
-                    return false;
-                }
-                default: {
-                    return false;
-                }
-            }
-        }
         function command(commandName, commandArgs) {
             switch (commandName) {
                 case 'load': {
@@ -207,84 +94,106 @@ function withStreamingServer(Video) {
                         video.dispatch({ type: 'command', commandName: 'unload' });
                         loadArgs = commandArgs;
                         onPropChanged('stream');
-                        convertStreamToURL(commandArgs.streamingServerURL, commandArgs.stream, commandArgs.seriesInfo)
+                        convertStream(commandArgs.streamingServerURL, commandArgs.stream, commandArgs.seriesInfo)
                             .then(function(mediaURL) {
-                                return (commandArgs.forceTranscoding ? Promise.resolve(false) : Video.canPlayStream({ url: mediaURL }))
-                                    .catch(function(error) {
-                                        throw Object.assign({}, ERROR.UNKNOWN_ERROR, {
-                                            error: error,
-                                            stream: commandArgs.stream
-                                        });
-                                    })
-                                    .then(function(canPlay) {
-                                        if (canPlay) {
-                                            return {
-                                                transcoder: null,
-                                                loadArgsExt: {
-                                                    stream: {
-                                                        url: mediaURL
-                                                    }
-                                                }
-                                            };
-                                        }
+                                var id = hat();
+                                var queryParams = new URLSearchParams([['mediaURL', mediaURL]]);
+                                if (commandArgs.forceTranscoding) {
+                                    queryParams.set('forceTranscoding', '1');
+                                }
+                                if (commandArgs.audioChannels !== null && isFinite(commandArgs.audioChannels)) {
+                                    queryParams.set('audioChannels', commandArgs.audioChannels);
+                                }
 
-                                        var time = commandArgs.time !== null && isFinite(commandArgs.time) ? parseInt(commandArgs.time, 10) : 0;
-                                        return createTranscoder(commandArgs.streamingServerURL, mediaURL, time, commandArgs.audioChannels)
-                                            .then(function(transcoder) {
-                                                return {
-                                                    transcoder: transcoder,
-                                                    loadArgsExt: {
-                                                        time: 0,
-                                                        stream: {
-                                                            url: transcoder.url,
-                                                            behaviorHints: {
-                                                                headers: {
-                                                                    'content-type': 'application/vnd.apple.mpegurl'
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                };
+                                return {
+                                    url: url.resolve(commandArgs.streamingServerURL, '/hlsv2/' + id + '/master.m3u8?' + queryParams.toString()),
+                                    subtitles: Array.isArray(commandArgs.stream.subtitles) ?
+                                        commandArgs.stream.subtitles.map(function(track) {
+                                            return Object.assign({}, track, {
+                                                url: typeof track.url === 'string' ?
+                                                    url.resolve(commandArgs.streamingServerURL, '/subtitles.vtt?' + new URLSearchParams([['from', track.url]]).toString())
+                                                    :
+                                                    track.url
                                             });
-                                    });
+                                        })
+                                        :
+                                        [],
+                                    behaviorHints: {
+                                        headers: {
+                                            'content-type': 'application/vnd.apple.mpegurl'
+                                        }
+                                    }
+                                };
                             })
-                            .then(function(result) {
+                            .then(function(stream) {
                                 if (commandArgs !== loadArgs) {
                                     return;
                                 }
 
-                                transcoder = result.transcoder;
                                 video.dispatch({
                                     type: 'command',
                                     commandName: 'load',
-                                    commandArgs: Object.assign({}, commandArgs, result.loadArgsExt)
+                                    commandArgs: Object.assign({}, commandArgs, {
+                                        stream: stream
+                                    })
                                 });
+                                loaded = true;
+                                flushActionsQueue();
                             })
                             .catch(function(error) {
                                 if (commandArgs !== loadArgs) {
                                     return;
                                 }
 
-                                onError(Object.assign({}, error, {
-                                    critical: true
+                                onError(Object.assign({}, ERROR.WITH_STREAMING_SERVER.CONVERT_FAILED, {
+                                    error: error,
+                                    critical: true,
+                                    stream: commandArgs.stream,
+                                    streamingServerURL: commandArgs.streamingServerURL
                                 }));
                             });
                     } else {
                         onError(Object.assign({}, ERROR.UNSUPPORTED_STREAM, {
                             critical: true,
-                            stream: commandArgs ? commandArgs.stream : null
+                            stream: commandArgs ? commandArgs.stream : null,
+                            streamingServerURL: commandArgs && typeof commandArgs.streamingServerURL === 'string' ? commandArgs.streamingServerURL : null
                         }));
                     }
 
                     return true;
                 }
+                case 'addExtraSubtitlesTracks': {
+                    if (loadArgs && commandArgs && Array.isArray(commandArgs.tracks)) {
+                        if (loaded) {
+                            video.dispatch({
+                                type: 'command',
+                                commandName: 'addExtraSubtitlesTracks',
+                                commandArgs: Object.assign({}, commandArgs, {
+                                    tracks: commandArgs.tracks.map(function(track) {
+                                        return Object.assign({}, track, {
+                                            url: typeof track.url === 'string' ?
+                                                url.resolve(loadArgs.streamingServerURL, '/subtitles.vtt?' + new URLSearchParams([['from', track.url]]).toString())
+                                                :
+                                                track.url
+                                        });
+                                    })
+                                })
+                            });
+                        } else {
+                            actionsQueue.push({
+                                type: 'command',
+                                commandName: 'addExtraSubtitlesTracks',
+                                commandArgs: commandArgs
+                            });
+                        }
+                    }
+
+                    return true;
+                }
                 case 'unload': {
-                    clearTimeout(starvationHandlerTimeoutId);
                     loadArgs = null;
-                    transcoder = null;
-                    transcodingNextSegment = false;
-                    starvationHandlerTimeoutId = null;
-                    lastStarvationDuration = null;
+                    loaded = false;
+                    actionsQueue = [];
                     onPropChanged('stream');
                     return false;
                 }
@@ -296,6 +205,16 @@ function withStreamingServer(Video) {
                     return true;
                 }
                 default: {
+                    if (!loaded) {
+                        actionsQueue.push({
+                            type: 'command',
+                            commandName: commandName,
+                            commandArgs: commandArgs
+                        });
+
+                        return true;
+                    }
+
                     return false;
                 }
             }
@@ -323,13 +242,6 @@ function withStreamingServer(Video) {
 
                         break;
                     }
-                    case 'setProp': {
-                        if (setProp(action.propName, action.propValue)) {
-                            return;
-                        }
-
-                        break;
-                    }
                     case 'command': {
                         if (command(action.commandName, action.commandArgs)) {
                             return;
@@ -353,9 +265,9 @@ function withStreamingServer(Video) {
         external: Video.manifest.external,
         props: Video.manifest.props.concat(['stream'])
             .filter(function(value, index, array) { return array.indexOf(value) === index; }),
-        commands: Video.manifest.commands.concat(['load', 'unload', 'destroy'])
+        commands: Video.manifest.commands.concat(['load', 'unload', 'destroy', 'addExtraSubtitlesTracks'])
             .filter(function(value, index, array) { return array.indexOf(value) === index; }),
-        events: Video.manifest.events.concat(['error'])
+        events: Video.manifest.events.concat(['propValue', 'propChanged', 'error'])
             .filter(function(value, index, array) { return array.indexOf(value) === index; })
     };
 

package/src/withHTMLSubtitles/fetchSubtitles.js

@@ -1,27 +0,0 @@
-var ERROR = require('../error');
-var subtitlesParser = require('./subtitlesParser');
-
-function fetchSubtitles(track) {
-    return fetch(track.url)
-        .then(function(resp) {
-            return resp.text();
-        })
-        .catch(function(error) {
-            throw Object.assign({}, ERROR.WITH_HTML_SUBTITLES.FETCH_FAILED, {
-                track: track,
-                error: error
-            });
-        })
-        .then(function(text) {
-            var cuesByTime = subtitlesParser.parse(text);
-            if (cuesByTime.times.length === 0) {
-                throw Object.assign({}, ERROR.WITH_HTML_SUBTITLES.PARSE_FAILED, {
-                    track: track
-                });
-            }
-
-            return cuesByTime;
-        });
-}
-
-module.exports = fetchSubtitles;

package/src/withStreamingServer/convertStreamToURL.js

@@ -1,142 +0,0 @@
-var url = require('url');
-var magnet = require('magnet-uri');
-var parseVideoName = require('video-name-parser');
-var ERROR = require('../error');
-
-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();
-    }).catch(function(error) {
-        throw Object.assign({}, ERROR.WITH_STREAMING_SERVER.TORRENT_CREATE_FAILED, {
-            infoHash: infoHash,
-            sources: sources,
-            error: error
-        });
-    }).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 Object.assign({}, ERROR.WITH_STREAMING_SERVER.TORRENT_CREATE_FAILED, {
-                infoHash: infoHash,
-                sources: sources,
-                files: resp.files,
-                error: new Error('Invalid files')
-            });
-        }
-
-        var mediaFiles = resp.files.filter(function(file) {
-            return file.path.match(MEDIA_FILE_EXTENTIONS);
-        });
-        if (mediaFiles.length === 0) {
-            throw Object.assign({}, ERROR.WITH_STREAMING_SERVER.NO_MEDIA_FILES_FOUND, {
-                infoHash: infoHash,
-                sources: sources,
-                files: resp.files
-            });
-        }
-
-        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);
-    });
-}
-
-function convertStreamToURL(streamingServerURL, stream, seriesInfo) {
-    return new Promise(function(resolve, reject) {
-        if (typeof stream.url === 'string') {
-            if (stream.url.indexOf('magnet:') === 0) {
-                var parsedMagnetURI;
-                try {
-                    parsedMagnetURI = magnet.decode(stream.url);
-                } catch (error) {
-                    reject(Object.assign({}, ERROR.WITH_STREAMING_SERVER.STREAM_CONVERT_FAILED, {
-                        stream: stream,
-                        error: error
-                    }));
-                    return;
-                }
-                if (parsedMagnetURI && typeof parsedMagnetURI.infoHash === 'string') {
-                    var sources = Array.isArray(parsedMagnetURI.announce) ?
-                        parsedMagnetURI.announce.map(function(source) {
-                            return 'tracker:' + source;
-                        })
-                        :
-                        [];
-                    inferTorrentFileIdx(streamingServerURL, parsedMagnetURI.infoHash, sources, seriesInfo)
-                        .then(function(fileIdx) {
-                            resolve(url.resolve(streamingServerURL, '/' + encodeURIComponent(stream.infoHash) + '/' + encodeURIComponent(fileIdx)));
-                        })
-                        .catch(function(error) {
-                            reject(Object.assign({}, error, {
-                                stream: stream
-                            }));
-                        });
-                    return;
-                }
-            } else {
-                resolve(stream.url);
-                return;
-            }
-        }
-
-        if (typeof stream.infoHash === 'string') {
-            if (stream.fileIdx !== null && isFinite(stream.fileIdx)) {
-                resolve(url.resolve(streamingServerURL, '/' + encodeURIComponent(stream.infoHash) + '/' + encodeURIComponent(stream.fileIdx)));
-                return;
-            } else {
-                inferTorrentFileIdx(streamingServerURL, stream.infoHash, stream.announce, seriesInfo)
-                    .then(function(fileIdx) {
-                        resolve(url.resolve(streamingServerURL, '/' + encodeURIComponent(stream.infoHash) + '/' + encodeURIComponent(fileIdx)));
-                    })
-                    .catch(function(error) {
-                        reject(Object.assign({}, error, {
-                            stream: stream
-                        }));
-                    });
-                return;
-            }
-        }
-
-        reject(Object.assign({}, ERROR.WITH_STREAMING_SERVER.STREAM_CONVERT_FAILED, {
-            stream: stream
-        }));
-    });
-}
-
-module.exports = convertStreamToURL;

package/src/withStreamingServer/createTranscoder.js

@@ -1,46 +0,0 @@
-var url = require('url');
-var ERROR = require('../error');
-
-function createTranscoder(streamingServerURL, mediaURL, time, audioChannels) {
-    var queryParams = new URLSearchParams([
-        ['url', mediaURL],
-        ['time', time]
-    ]);
-    if (audioChannels !== null && isFinite(audioChannels)) {
-        queryParams.set('audioChannels', audioChannels);
-    }
-    return fetch(url.resolve(streamingServerURL, '/transcode/create') + '?' + queryParams.toString())
-        .then(function(resp) {
-            return resp.json();
-        })
-        .then(function(resp) {
-            if (resp.error) {
-                throw resp.error;
-            }
-
-            if (typeof resp.hash !== 'string' || (resp.duration !== null && !isFinite(resp.duration)) || typeof resp.ended !== 'boolean') {
-                throw new Error('Inavalid response: ' + JSON.stringify(resp));
-            }
-
-            return Object.assign({}, resp, {
-                streamingServerURL: streamingServerURL,
-                timeOffset: resp.videoTimeOffset !== null && isFinite(resp.videoTimeOffset) ?
-                    resp.videoTimeOffset
-                    :
-                    resp.audioTimeOffset !== null && isFinite(resp.audioTimeOffset) ?
-                        resp.audioTimeOffset
-                        :
-                        0,
-                url: url.resolve(streamingServerURL, '/transcode/' + encodeURIComponent(resp.hash) + '/playlist.m3u8')
-            });
-        })
-        .catch(function(error) {
-            throw Object.assign({}, ERROR.WITH_STREAMING_SERVER.TRANSCODER_CREATE_FAILED, {
-                error: error,
-                mediaURL: mediaURL,
-                time: time
-            });
-        });
-}
-
-module.exports = createTranscoder;

package/src/withStreamingServer/transcodeNextSegment.js

@@ -1,17 +0,0 @@
-var url = require('url');
-
-function transcodeNextSegment(streamingServerURL, hash) {
-    return fetch(url.resolve(streamingServerURL, '/transcode/next') + '?' + new URLSearchParams([['hash', hash]]).toString())
-        .then(function(resp) {
-            return resp.json();
-        })
-        .then(function(resp) {
-            if (!resp.error && typeof resp.ended !== 'boolean') {
-                throw new Error('Inavalid response: ' + JSON.stringify(resp));
-            }
-
-            return resp;
-        });
-}
-
-module.exports = transcodeNextSegment;