Skip to content

refactor(withStreamingServer): remove convert stream logic #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tymmesyde wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

refactor(withStreamingServer): remove convert stream logic #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 0 additions & 77 deletions src/withStreamingServer/convertStream.js
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions src/withStreamingServer/createTorrent.js
View file
Open in desktop

This file was deleted.

154 changes: 75 additions & 79 deletions src/withStreamingServer/withStreamingServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ var hat = require('hat');
var cloneDeep = require('lodash.clonedeep');
var deepFreeze = require('deep-freeze');
var mediaCapabilities = require('../mediaCapabilities');
var convertStream = require('./convertStream');
var fetchVideoParams = require('./fetchVideoParams');
var isPlayerLoaded = require('./isPlayerLoaded');
var supportsTranscoding = require('../supportsTranscoding');
Expand Down Expand Up @@ -104,91 +103,88 @@ function withStreamingServer(Video) {
video.dispatch({ type: 'command', commandName: 'unload' });
loadArgs = commandArgs;
onPropChanged('stream');
convertStream(commandArgs.streamingServerURL, commandArgs.stream, commandArgs.seriesInfo, commandArgs.streamingServerSettings)
.then(function(result) {
var mediaURL = result.url;
var infoHash = result.infoHash;
var fileIdx = result.fileIdx;
var formats = Array.isArray(commandArgs.formats) ?
commandArgs.formats
:
mediaCapabilities.formats;
var videoCodecs = Array.isArray(commandArgs.videoCodecs) ?
commandArgs.videoCodecs
:
mediaCapabilities.videoCodecs;
var audioCodecs = Array.isArray(commandArgs.audioCodecs) ?
commandArgs.audioCodecs
:
mediaCapabilities.audioCodecs;
var maxAudioChannels = commandArgs.maxAudioChannels !== null && isFinite(commandArgs.maxAudioChannels) ?
commandArgs.maxAudioChannels
:
mediaCapabilities.maxAudioChannels;
var canPlayStreamOptions = Object.assign({}, commandArgs, {
formats: formats,
videoCodecs: videoCodecs,
audioCodecs: audioCodecs,
maxAudioChannels: maxAudioChannels
});
return (commandArgs.forceTranscoding ? Promise.resolve(false) : VideoWithStreamingServer.canPlayStream({ url: mediaURL }, canPlayStreamOptions))
.catch(function(error) {
console.warn('Media probe error', error);
return false;
})
.then(function(canPlay) {
if (canPlay) {
return {
mediaURL: mediaURL,
infoHash: infoHash,
fileIdx: fileIdx,
stream: {
url: mediaURL
}
};
var mediaURL = commandArgs.stream.deepLinks.externalPlayer.streaming;
var infoHash = commandArgs.stream.infoHash;
var fileIdx = commandArgs.stream.fileIdx;
var formats = Array.isArray(commandArgs.formats) ?
commandArgs.formats
:
mediaCapabilities.formats;
var videoCodecs = Array.isArray(commandArgs.videoCodecs) ?
commandArgs.videoCodecs
:
mediaCapabilities.videoCodecs;
var audioCodecs = Array.isArray(commandArgs.audioCodecs) ?
commandArgs.audioCodecs
:
mediaCapabilities.audioCodecs;
var maxAudioChannels = commandArgs.maxAudioChannels !== null && isFinite(commandArgs.maxAudioChannels) ?
commandArgs.maxAudioChannels
:
mediaCapabilities.maxAudioChannels;
var canPlayStreamOptions = Object.assign({}, commandArgs, {
formats: formats,
videoCodecs: videoCodecs,
audioCodecs: audioCodecs,
maxAudioChannels: maxAudioChannels
});
return (commandArgs.forceTranscoding ? Promise.resolve(false) : VideoWithStreamingServer.canPlayStream({ url: mediaURL }, canPlayStreamOptions))
.catch(function(error) {
console.warn('Media probe error', error);
return false;
})
.then(function(canPlay) {
if (canPlay) {
return {
mediaURL: mediaURL,
infoHash: infoHash,
fileIdx: fileIdx,
stream: {
url: mediaURL
}
};
}

var id = hat();
var queryParams = new URLSearchParams([['mediaURL', mediaURL]]);
if (commandArgs.forceTranscoding) {
queryParams.set('forceTranscoding', '1');
}
var id = hat();
var queryParams = new URLSearchParams([['mediaURL', mediaURL]]);
if (commandArgs.forceTranscoding) {
queryParams.set('forceTranscoding', '1');
}

videoCodecs.forEach(function(videoCodec) {
queryParams.append('videoCodecs', videoCodec);
});
videoCodecs.forEach(function(videoCodec) {
queryParams.append('videoCodecs', videoCodec);
});

audioCodecs.forEach(function(audioCodec) {
queryParams.append('audioCodecs', audioCodec);
});
audioCodecs.forEach(function(audioCodec) {
queryParams.append('audioCodecs', audioCodec);
});

queryParams.set('maxAudioChannels', maxAudioChannels);
queryParams.set('maxAudioChannels', maxAudioChannels);

return {
mediaURL: mediaURL,
infoHash: infoHash,
fileIdx: fileIdx,
stream: {
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'
}
}
return {
mediaURL: mediaURL,
infoHash: infoHash,
fileIdx: fileIdx,
stream: {
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) {
if (commandArgs !== loadArgs) {
Expand Down