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

package/package.json

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

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/inferTorrentFileIdx.js

@@ -1,67 +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) {
-        if (resp.ok) {
-            return resp.json();
-        }
-
-        throw new Error(resp.status + ' (' + resp.statusText + ')');
-    }).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;