@stremio/stremio-video 0.0.21 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.21",
+    "version": "0.0.23",
     "description": "Abstraction layer on top of different media players",
     "author": "Smart Code OOD",
     "main": "src/index.js",
@@ -13,6 +13,8 @@
         "lint": "eslint src"
     },
     "dependencies": {
+        "buffer": "6.0.3",
+        "color": "4.2.3",
         "deep-freeze": "0.0.1",
         "eventemitter3": "4.0.7",
         "hat": "0.0.3",
@@ -21,8 +23,7 @@
         "magnet-uri": "6.2.0",
         "url": "0.11.0",
         "video-name-parser": "1.4.6",
-        "vtt.js": "github:jaruba/vtt.js#e4f5f5603730866bacb174a93f51b734c9f29e6a",
-        "color": "4.2.3"
+        "vtt.js": "github:jaruba/vtt.js#e4f5f5603730866bacb174a93f51b734c9f29e6a"
     },
     "devDependencies": {
         "eslint": "7.32.0"

package/src/ChromecastSenderVideo/ChromecastSenderVideo.js

@@ -45,6 +45,7 @@ function ChromecastSenderVideo(options) {
     var destroyed = false;
     var observedProps = {
         stream: false,
+        loaded: false,
         paused: false,
         time: false,
         duration: false,
@@ -107,6 +108,7 @@ function ChromecastSenderVideo(options) {
             case 'destroy': {
                 destroyed = true;
                 onPropChanged('stream', null);
+                onPropChanged('loaded', null);
                 onPropChanged('paused', null);
                 onPropChanged('time', null);
                 onPropChanged('duration', null);
@@ -188,7 +190,7 @@ ChromecastSenderVideo.canPlayStream = function() {
 ChromecastSenderVideo.manifest = {
     name: 'ChromecastSenderVideo',
     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'],
+    props: ['stream', 'loaded', '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']
 };

package/src/HTMLVideo/HTMLVideo.js

@@ -47,10 +47,12 @@ function HTMLVideo(options) {
         onPropChanged('buffered');
     };
     videoElement.onseeking = function() {
+        onPropChanged('time');
         onPropChanged('buffering');
         onPropChanged('buffered');
     };
     videoElement.onseeked = function() {
+        onPropChanged('time');
         onPropChanged('buffering');
         onPropChanged('buffered');
     };
@@ -59,6 +61,7 @@ function HTMLVideo(options) {
         onPropChanged('buffered');
     };
     videoElement.onplaying = function() {
+        onPropChanged('time');
         onPropChanged('buffering');
         onPropChanged('buffered');
     };
@@ -70,6 +73,9 @@ function HTMLVideo(options) {
         onPropChanged('buffering');
         onPropChanged('buffered');
     };
+    videoElement.onloadedmetadata = function() {
+        onPropChanged('loaded');
+    };
     videoElement.onloadeddata = function() {
         onPropChanged('buffering');
         onPropChanged('buffered');
@@ -98,6 +104,7 @@ function HTMLVideo(options) {
     var subtitlesOffset = 0;
     var observedProps = {
         stream: false,
+        loaded: false,
         paused: false,
         time: false,
         duration: false,
@@ -122,6 +129,13 @@ function HTMLVideo(options) {
             case 'stream': {
                 return stream;
             }
+            case 'loaded': {
+                if (stream === null) {
+                    return null;
+                }
+
+                return videoElement.readyState >= videoElement.HAVE_METADATA;
+            }
             case 'paused': {
                 if (stream === null) {
                     return null;
@@ -355,6 +369,7 @@ function HTMLVideo(options) {
             case 'paused': {
                 if (stream !== null) {
                     propValue ? videoElement.pause() : videoElement.play();
+                    onPropChanged('paused');
                 }
 
                 break;
@@ -362,6 +377,7 @@ function HTMLVideo(options) {
             case 'time': {
                 if (stream !== null && propValue !== null && isFinite(propValue)) {
                     videoElement.currentTime = parseInt(propValue, 10) / 1000;
+                    onPropChanged('time');
                 }
 
                 break;
@@ -377,6 +393,7 @@ function HTMLVideo(options) {
                             return track.id === propValue;
                         });
                     if (selecterdSubtitlesTrack) {
+                        onPropChanged('selectedSubtitlesTrackId');
                         events.emit('subtitlesTrackLoaded', selecterdSubtitlesTrack);
                     }
                 }
@@ -450,6 +467,7 @@ function HTMLVideo(options) {
                         });
                     hls.audioTrack = selecterdAudioTrack ? parseInt(selecterdAudioTrack.id.split('_').pop(), 10) : -1;
                     if (selecterdAudioTrack) {
+                        onPropChanged('selectedAudioTrackId');
                         events.emit('audioTrackLoaded', selecterdAudioTrack);
                     }
                 }
@@ -460,17 +478,21 @@ function HTMLVideo(options) {
                 if (propValue !== null && isFinite(propValue)) {
                     videoElement.muted = false;
                     videoElement.volume = Math.max(0, Math.min(100, parseInt(propValue, 10))) / 100;
+                    onPropChanged('muted');
+                    onPropChanged('volume');
                 }
 
                 break;
             }
             case 'muted': {
                 videoElement.muted = !!propValue;
+                onPropChanged('muted');
                 break;
             }
             case 'playbackSpeed': {
                 if (propValue !== null && isFinite(propValue)) {
                     videoElement.playbackRate = parseFloat(propValue);
+                    onPropChanged('playbackSpeed');
                 }
 
                 break;
@@ -484,6 +506,7 @@ function HTMLVideo(options) {
                 if (commandArgs && commandArgs.stream && typeof commandArgs.stream.url === 'string') {
                     stream = commandArgs.stream;
                     onPropChanged('stream');
+                    onPropChanged('loaded');
                     videoElement.autoplay = typeof commandArgs.autoplay === 'boolean' ? commandArgs.autoplay : true;
                     videoElement.currentTime = commandArgs.time !== null && isFinite(commandArgs.time) ? parseInt(commandArgs.time, 10) / 1000 : 0;
                     onPropChanged('paused');
@@ -547,6 +570,7 @@ function HTMLVideo(options) {
                 videoElement.load();
                 videoElement.currentTime = 0;
                 onPropChanged('stream');
+                onPropChanged('loaded');
                 onPropChanged('paused');
                 onPropChanged('time');
                 onPropChanged('duration');
@@ -646,7 +670,7 @@ HTMLVideo.canPlayStream = function(stream) {
 HTMLVideo.manifest = {
     name: 'HTMLVideo',
     external: false,
-    props: ['stream', 'paused', 'time', 'duration', 'buffering', 'buffered', 'audioTracks', 'selectedAudioTrackId', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'subtitlesOffset', 'subtitlesSize', 'subtitlesTextColor', 'subtitlesBackgroundColor', 'subtitlesOutlineColor', 'volume', 'muted', 'playbackSpeed'],
+    props: ['stream', 'loaded', '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', 'subtitlesTrackLoaded', 'audioTrackLoaded']
 };

package/src/IFrameVideo/IFrameVideo.js

@@ -24,6 +24,7 @@ function IFrameVideo(options) {
     var destroyed = false;
     var observedProps = {
         stream: false,
+        loaded: false,
         paused: false,
         time: false,
         duration: false,
@@ -95,6 +96,7 @@ function IFrameVideo(options) {
                 iframeElement.onload = null;
                 iframeElement.removeAttribute('src');
                 onPropChanged('stream', null);
+                onPropChanged('loaded', null);
                 onPropChanged('paused', null);
                 onPropChanged('time', null);
                 onPropChanged('duration', null);
@@ -108,15 +110,6 @@ function IFrameVideo(options) {
             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);
                 return true;
@@ -169,7 +162,7 @@ IFrameVideo.canPlayStream = function(stream) {
 IFrameVideo.manifest = {
     name: 'IFrameVideo',
     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'],
+    props: ['stream', 'loaded', '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']
 };

package/src/StremioVideo/selectVideoImplementation.js

@@ -2,6 +2,7 @@ var ChromecastSenderVideo = require('../ChromecastSenderVideo');
 var ShellVideo = require('../ShellVideo');
 var HTMLVideo = require('../HTMLVideo');
 var TizenVideo = require('../TizenVideo');
+var WebOsVideo = require('../WebOsVideo');
 var IFrameVideo = require('../IFrameVideo');
 var YouTubeVideo = require('../YouTubeVideo');
 var withStreamingServer = require('../withStreamingServer');
@@ -23,6 +24,7 @@ function selectVideoImplementation(commandArgs, options) {
     if (typeof commandArgs.stream.playerFrameUrl === 'string') {
         return IFrameVideo;
     }
+
     if (options.shellTransport) {
         return withStreamingServer(withHTMLSubtitles(ShellVideo));
     }
@@ -31,10 +33,16 @@ function selectVideoImplementation(commandArgs, options) {
         if (typeof global.tizen !== 'undefined') {
             return withStreamingServer(withHTMLSubtitles(TizenVideo));
         }
+        if (typeof global.webOS !== 'undefined') {
+            return withStreamingServer(withHTMLSubtitles(WebOsVideo));
+        }
         return withStreamingServer(withHTMLSubtitles(HTMLVideo));
     }
 
     if (typeof commandArgs.stream.url === 'string') {
+        if (typeof global.webOS !== 'undefined') {
+            return withHTMLSubtitles(WebOsVideo);
+        }
         if (typeof global.tizen !== 'undefined') {
             return withHTMLSubtitles(TizenVideo);
         }