@stremio/stremio-video 0.0.35 → 0.0.39-beta.3

package/package.json

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

package/src/HTMLVideo/hlsConfig.js

@@ -11,5 +11,21 @@ module.exports = {
     nudgeMaxRetry: 20,
     manifestLoadingTimeOut: 30000,
     manifestLoadingMaxRetry: 10,
+    fragLoadPolicy: {
+        default: {
+            maxTimeToFirstByteMs: 10000,
+            maxLoadTimeMs: 120000,
+            timeoutRetry: {
+                maxNumRetry: 20,
+                retryDelayMs: 0,
+                maxRetryDelayMs: 15
+            },
+            errorRetry: {
+                maxNumRetry: 6,
+                retryDelayMs: 1000,
+                maxRetryDelayMs: 15
+            }
+        }
+    }
     // liveDurationInfinity: false
 };

package/src/WebOsVideo/WebOsVideo.js

@@ -671,6 +671,7 @@ function WebOsVideo(options) {
                 if (stream !== null && videoElement.readyState >= videoElement.HAVE_METADATA && propValue !== null && isFinite(propValue)) {
                     try {
                         videoElement.currentTime = parseInt(propValue, 10) / 1000;
+                        onPropChanged('time');
                     } catch(e) {
                         // console.log('webos video change time error');
                         // console.error(e);

package/src/supportsTranscoding.js

@@ -0,0 +1,8 @@
+function supportsTranscoding() {
+    if (typeof global.tizen !== 'undefined' || typeof global.webOS !== 'undefined') {
+        return Promise.resolve(false);
+    }
+    return Promise.resolve(true);
+}
+
+module.exports = supportsTranscoding;

package/src/withStreamingServer/destroyHLSConverter.js

@@ -0,0 +1,7 @@
+var url = require('url');
+
+function destroyHLSConverter(streamingServerURL, id) {
+    return fetch(url.resolve(streamingServerURL, '/hlsv2/' + encodeURIComponent(id) + '/destroy'));
+}
+
+module.exports = destroyHLSConverter;

package/src/withStreamingServer/withStreamingServer.js

@@ -6,6 +6,8 @@ var deepFreeze = require('deep-freeze');
 var mediaCapabilities = require('../mediaCapabilities');
 var convertStream = require('./convertStream');
 var fetchVideoParams = require('./fetchVideoParams');
+var destroyHLSConverter = require('./destroyHLSConverter');
+var supportsTranscoding = require('../supportsTranscoding');
 var ERROR = require('../error');
 
 function withStreamingServer(Video) {
@@ -26,6 +28,7 @@ function withStreamingServer(Video) {
 
         var self = this;
         var loadArgs = null;
+        var hlsConverterId = null;
         var loaded = false;
         var actionsQueue = [];
         var videoParams = null;
@@ -140,6 +143,7 @@ function withStreamingServer(Video) {
                                                 mediaURL: mediaURL,
                                                 infoHash: infoHash,
                                                 fileIdx: fileIdx,
+                                                hlsConverterId: null,
                                                 stream: {
                                                     url: mediaURL
                                                 }
@@ -166,6 +170,7 @@ function withStreamingServer(Video) {
                                             mediaURL: mediaURL,
                                             infoHash: infoHash,
                                             fileIdx: fileIdx,
+                                            hlsConverterId: id,
                                             stream: {
                                                 url: url.resolve(commandArgs.streamingServerURL, '/hlsv2/' + id + '/master.m3u8?' + queryParams.toString()),
                                                 subtitles: Array.isArray(commandArgs.stream.subtitles) ?
@@ -200,6 +205,7 @@ function withStreamingServer(Video) {
                                         stream: result.stream
                                     })
                                 });
+                                hlsConverterId = result.hlsConverterId;
                                 loaded = true;
                                 flushActionsQueue();
                                 fetchVideoParams(commandArgs.streamingServerURL, result.mediaURL, result.infoHash, result.fileIdx, commandArgs.stream.behaviorHints)
@@ -273,6 +279,13 @@ function withStreamingServer(Video) {
                     return true;
                 }
                 case 'unload': {
+                    if (loadArgs && hlsConverterId !== null) {
+                        destroyHLSConverter(loadArgs.streamingServerURL, hlsConverterId).catch(function(error) {
+                            // eslint-disable-next-line no-console
+                            console.error(error);
+                        });
+                    }
+                    hlsConverterId = null;
                     loadArgs = null;
                     loaded = false;
                     actionsQueue = [];
@@ -341,15 +354,13 @@ function withStreamingServer(Video) {
     }
 
     VideoWithStreamingServer.canPlayStream = function(stream, options) {
-        return Video.canPlayStream(stream)
-            .then(function(canPlay) {
-                if (!canPlay) {
-                    throw new Error('Fallback using /hlsv2/probe');
+        return supportsTranscoding()
+            .then(function(supported) {
+                if (!supported) {
+                    // we cannot probe the video in this case
+                    return Video.canPlayStream(stream);
                 }
-
-                return canPlay;
-            })
-            .catch(function() {
+                // probing normally gives more accurate results
                 var queryParams = new URLSearchParams([['mediaURL', stream.url]]);
                 return fetch(url.resolve(options.streamingServerURL, '/hlsv2/probe?' + queryParams.toString()))
                     .then(function(resp) {
@@ -370,6 +381,11 @@ function withStreamingServer(Video) {
                             return true;
                         });
                         return isFormatSupported && areStreamsSupported;
+                    })
+                    .catch(function() {
+                        // this uses content-type header in HTMLVideo which
+                        // is unreliable, check can also fail due to CORS
+                        return Video.canPlayStream(stream);
                     });
             });
     };