[addon] update debridlink status checks

This commit is contained in:
TheBeastLT
2021-03-09 16:07:39 +01:00
parent 5bb05027a5
commit 187972d7de

View File

@@ -40,7 +40,7 @@ async function getCatalog(apiKey, offset = 0) {
return DL.seedbox.list() return DL.seedbox.list()
.then(response => response.value) .then(response => response.value)
.then(torrents => (torrents || []) .then(torrents => (torrents || [])
.filter(torrent => torrent && statusReady(torrent.status)) .filter(torrent => torrent && statusReady(torrent))
.map(torrent => ({ .map(torrent => ({
id: `${KEY}:${torrent.id}`, id: `${KEY}:${torrent.id}`,
type: Type.OTHER, type: Type.OTHER,
@@ -85,12 +85,12 @@ async function resolve({ ip, apiKey, infoHash, fileIndex }) {
async function _resolve(DL, infoHash, fileIndex) { async function _resolve(DL, infoHash, fileIndex) {
const torrent = await _createOrFindTorrent(DL, infoHash); const torrent = await _createOrFindTorrent(DL, infoHash);
if (torrent && statusReady(torrent.status)) { if (torrent && statusReady(torrent)) {
return _unrestrictLink(DL, torrent, fileIndex); return _unrestrictLink(DL, torrent, fileIndex);
} else if (torrent && statusDownloading(torrent.status)) { } else if (torrent && statusDownloading(torrent)) {
console.log(`Downloading to DebridLink ${infoHash} [${fileIndex}]...`); console.log(`Downloading to DebridLink ${infoHash} [${fileIndex}]...`);
return StaticResponse.DOWNLOADING; return StaticResponse.DOWNLOADING;
} else if (torrent && statusOpening(torrent.status)) { } else if (torrent && statusOpening(torrent)) {
console.log(`Trying to open torrent on DebridLink ${infoHash} [${fileIndex}]...`); console.log(`Trying to open torrent on DebridLink ${infoHash} [${fileIndex}]...`);
return _openTorrent(DL, torrent.id) return _openTorrent(DL, torrent.id)
.then(() => { .then(() => {
@@ -114,9 +114,7 @@ async function _createOrFindTorrent(DL, infoHash) {
async function _findTorrent(DL, infoHash) { async function _findTorrent(DL, infoHash) {
const torrents = await DL.seedbox.list().then(response => response.value); const torrents = await DL.seedbox.list().then(response => response.value);
const foundTorrents = torrents.filter(torrent => torrent.hashString.toLowerCase() === infoHash); const foundTorrents = torrents.filter(torrent => torrent.hashString.toLowerCase() === infoHash);
const nonFailedTorrent = foundTorrents.find(torrent => !statusError(torrent.status)); return foundTorrents[0] || Promise.reject('No recent torrent found');
const foundTorrent = nonFailedTorrent || foundTorrents[0];
return foundTorrent || Promise.reject('No recent torrent found');
} }
async function _createTorrent(DL, infoHash) { async function _createTorrent(DL, infoHash) {
@@ -128,9 +126,9 @@ async function _createTorrent(DL, infoHash) {
async function _openTorrent(DL, torrentId, pollCounter = 0, pollRate = 2000, maxPollNumber = 15) { async function _openTorrent(DL, torrentId, pollCounter = 0, pollRate = 2000, maxPollNumber = 15) {
return DL.seedbox.list(torrentId) return DL.seedbox.list(torrentId)
.then(response => response.value[0]) .then(response => response.value[0])
.then(torrent => torrent && statusOpening(torrent.status) && pollCounter < maxPollNumber .then(torrent => torrent && statusOpening(torrent) && pollCounter < maxPollNumber
? delay(pollRate).then(() => _openTorrent(DL, torrentId, pollCounter + 1)) ? delay(pollRate).then(() => _openTorrent(DL, torrentId, pollCounter + 1))
: torrent); : statusOpening(torrent) ? Promise.reject('Failed opening torrent') : torrent);
} }
async function _unrestrictLink(DL, torrent, fileIndex) { async function _unrestrictLink(DL, torrent, fileIndex) {
@@ -143,7 +141,7 @@ async function _unrestrictLink(DL, torrent, fileIndex) {
return StaticResponse.FAILED_RAR; return StaticResponse.FAILED_RAR;
} }
if (!targetFile || !targetFile.downloadUrl) { if (!targetFile || !targetFile.downloadUrl) {
return Promise.reject(`No DebridLink links found for [${torrent.hash}] ${fileIndex}`); return Promise.reject(`No DebridLink links found for index ${fileIndex} in: ${JSON.stringify(torrent)}`);
} }
console.log(`Unrestricted DebridLink ${torrent.hash} [${fileIndex}] to ${targetFile.downloadUrl}`); console.log(`Unrestricted DebridLink ${torrent.hash} [${fileIndex}] to ${targetFile.downloadUrl}`);
return targetFile.downloadUrl; return targetFile.downloadUrl;
@@ -153,20 +151,16 @@ async function getDefaultOptions(ip) {
return { timeout: 30000 }; return { timeout: 30000 };
} }
function statusError(status) { function statusOpening(torrent) {
return [].includes(status); return [2].includes(torrent.status) && torrent.peersConnected === 0;
} }
function statusOpening(status) { function statusDownloading(torrent) {
return [2].includes(status); return [4].includes(torrent.status) || ([2].includes(torrent.status) && torrent.peersConnected !== 0);
} }
function statusDownloading(status) { function statusReady(torrent) {
return [4].includes(status); return torrent.downloadPercent === 100;
}
function statusReady(status) {
return [6, 100].includes(status);
} }
function errorExpiredSubscriptionError(error) { function errorExpiredSubscriptionError(error) {