@stremio/stremio-video 0.0.12 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.12",
+    "version": "0.0.15",
     "description": "Abstraction layer on top of different media players",
     "author": "Smart Code OOD",
     "main": "src/index.js",
@@ -16,7 +16,7 @@
         "deep-freeze": "0.0.1",
         "eventemitter3": "4.0.7",
         "hat": "0.0.3",
-        "hls.js": "https://github.com/Stremio/hls.js/releases/download/v1.0.10-patch1/hls.js-1.0.10-patch1.tgz",
+        "hls.js": "https://github.com/Stremio/hls.js/releases/download/v1.0.10-patch2/hls.js-1.0.10-patch2.tgz",
         "lodash.clonedeep": "4.5.0",
         "magnet-uri": "6.2.0",
         "url": "0.11.0",

package/src/HTMLVideo/hlsConfig.js

@@ -2,8 +2,8 @@ module.exports = {
     debug: false,
     enableWorker: true,
     lowLatencyMode: false,
-    backBufferLength: 0,
-    maxBufferLength: 80,
+    backBufferLength: 30,
+    maxBufferLength: 50,
     maxMaxBufferLength: 80,
     maxFragLookUpTolerance: 0,
     maxBufferHole: 0,

package/src/withHTMLSubtitles/subtitlesConverter.js

@@ -0,0 +1,67 @@
+// from: https://github.com/silviapfeiffer/silviapfeiffer.github.io/blob/master/index.html#L150-L216
+
+function srt2webvtt(data) {
+    // remove dos newlines
+    var srt = data.replace(/\r+/g, '');
+    // trim white space start and end
+    srt = srt.replace(/^\s+|\s+$/g, '');
+    // get cues
+    var cuelist = srt.split('\n\n');
+    var result = '';
+    if (cuelist.length > 0) {
+        result += 'WEBVTT\n\n';
+        for (var i = 0; i < cuelist.length; i=i+1) {
+            result += convertSrtCue(cuelist[i]);
+        }
+    }
+    return result;
+}
+
+function convertSrtCue(caption) {
+    // remove all html tags for security reasons
+    caption = caption.replace(/<[a-zA-Z/][^>]*>/g, '');
+
+    var cue = '';
+    var s = caption.split(/\n/);
+    // concatenate muilt-line string separated in array into one
+    while (s.length > 3) {
+        for (var i = 3; i < s.length; i++) {
+            s[2] += '\n' + s[i];
+        }
+        s.splice(3, s.length - 3);
+    }
+    var line = 0;
+    // detect identifier
+    if (!s[0].match(/\d+:\d+:\d+/) && s[1].match(/\d+:\d+:\d+/)) {
+        cue += s[0].match(/\w+/) + '\n';
+        line += 1;
+    }
+    // get time strings
+    if (s[line].match(/\d+:\d+:\d+/)) {
+        // 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';
+            line += 1;
+        } else {
+            // Unrecognized timestring
+            return '';
+        }
+    } else {
+        // file format error or comment lines
+        return '';
+    }
+    // get cue text
+    if (s[line]) {
+        cue += s[line] + '\n\n';
+    }
+    return cue;
+}
+
+module.exports = {
+    convert: function(text) {
+        // presume all to be SRT if not WEBVTT
+        return text.includes('WEBVTT') ? text : srt2webvtt(text);
+    }
+};

package/src/withHTMLSubtitles/withHTMLSubtitles.js

@@ -4,6 +4,7 @@ var deepFreeze = require('deep-freeze');
 var ERROR = require('../error');
 var subtitlesParser = require('./subtitlesParser');
 var subtitlesRenderer = require('./subtitlesRenderer');
+var subtitlesConverter = require('./subtitlesConverter');
 
 function withHTMLSubtitles(Video) {
     function VideoWithHTMLSubtitles(options) {
@@ -214,6 +215,9 @@ function withHTMLSubtitles(Video) {
                             .then(function(resp) {
                                 return resp.text();
                             })
+                            .then(function(text) {
+                                return subtitlesConverter.convert(text);
+                            })
                             .then(function(text) {
                                 return subtitlesParser.parse(text);
                             })

package/src/withStreamingServer/withStreamingServer.js

@@ -96,34 +96,47 @@ function withStreamingServer(Video) {
                         onPropChanged('stream');
                         convertStream(commandArgs.streamingServerURL, commandArgs.stream, commandArgs.seriesInfo)
                             .then(function(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);
-                                }
+                                return (commandArgs.forceTranscoding ? Promise.resolve(false) : Video.canPlayStream({ url: mediaURL }))
+                                    .catch(function(error) {
+                                        console.warn('Media probe error', error);
+                                        return false;
+                                    })
+                                    .then(function(canPlay) {
+                                        if (canPlay) {
+                                            return {
+                                                url: mediaURL
+                                            };
+                                        }
 
-                                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'
+                                        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);
+                                        }
+
+                                        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(stream) {
                                 if (commandArgs !== loadArgs) {