tools/knightcrawler
1
0
Fork 0
mirror of https://github.com/knightcrawler-stremio/knightcrawler.git synced 2024-12-20 03:29:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[addon] adds better logging for alldebrid

Browse Source
This commit is contained in:
TheBeastLT
2020-05-15 12:26:39 +02:00
parent dfa541d19a
commit 314ff98555
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
addon/moch/alldebrid.js
View File

@@ -13,7 +13,7 @@ async function getCachedStreams(streams, apiKey) {
console.warn('Failed AllDebrid cached torrent availability request: ', error); console.warn('Failed AllDebrid cached torrent availability request: ', error);
return undefined; return undefined;
}); });
return available && available.data && streams return available && available.data && available.data.magnets && streams
.reduce((mochStreams, stream) => { .reduce((mochStreams, stream) => {
const cachedEntry = available.data.magnets.find(magnet => stream.infoHash === magnet.hash.toLowerCase()); const cachedEntry = available.data.magnets.find(magnet => stream.infoHash === magnet.hash.toLowerCase());
const streamTitleParts = stream.title.replace(/\n👤.*/s, '').split('\n'); const streamTitleParts = stream.title.replace(/\n👤.*/s, '').split('\n');
@@ -29,20 +29,23 @@ async function getCachedStreams(streams, apiKey) {
} }
async function resolve({ ip, apiKey, infoHash, cachedEntryInfo, fileIndex }) { async function resolve({ ip, apiKey, infoHash, cachedEntryInfo, fileIndex }) {
console.log(`Unrestricting ${infoHash} [${fileIndex}]`); console.log(`Unrestricting AllDebrid ${infoHash} [${fileIndex}]`);
const options = await getDefaultOptions(apiKey, ip); const options = await getDefaultOptions(apiKey, ip);
const AD = new AllDebridClient(apiKey, options); const AD = new AllDebridClient(apiKey, options);
const torrent = await _createOrFindTorrent(AD, infoHash); const torrent = await _createOrFindTorrent(AD, infoHash);
if (torrent && statusReady(torrent.statusCode)) { if (torrent && statusReady(torrent.statusCode)) {
return _unrestrictLink(AD, torrent, cachedEntryInfo, fileIndex); return _unrestrictLink(AD, torrent, cachedEntryInfo, fileIndex);
} else if (torrent && statusDownloading(torrent.statusCode)) { } else if (torrent && statusDownloading(torrent.statusCode)) {
console.log(`Downloading to AllDebrid ${infoHash} [${fileIndex}]...`);
return StaticResponse.DOWNLOADING; return StaticResponse.DOWNLOADING;
} else if (torrent && statusHandledError(torrent.statusCode)) { } else if (torrent && statusHandledError(torrent.statusCode)) {
console.log(`Retrying downloading to AllDebrid ${infoHash} [${fileIndex}]...`);
return _retryCreateTorrent(AD, infoHash, cachedEntryInfo, fileIndex); return _retryCreateTorrent(AD, infoHash, cachedEntryInfo, fileIndex);
} else if (torrent && errorExpiredSubscriptionError(torrent)) { } else if (torrent && errorExpiredSubscriptionError(torrent)) {
console.log(`Access denied to AllDebrid ${infoHash} [${fileIndex}]`);
return StaticResponse.FAILED_ACCESS; return StaticResponse.FAILED_ACCESS;
} }
return Promise.reject("Failed AllDebrid adding torrent"); return Promise.reject(`Failed AllDebrid adding torrent ${torrent}`);
} }
async function _createOrFindTorrent(AD, infoHash) { async function _createOrFindTorrent(AD, infoHash) {
@@ -83,11 +86,11 @@ async function _unrestrictLink(AD, torrent, encodedFileName, fileIndex) {
? videos.find(video => targetFileName.includes(video.filename)) ? videos.find(video => targetFileName.includes(video.filename))
: videos.sort((a, b) => b.size - a.size)[0]; : videos.sort((a, b) => b.size - a.size)[0];
if (!targetVideo.link || !targetVideo.link.length) { if (!targetVideo || targetVideo.link || !targetVideo.link.length) {
return Promise.reject("No available links found"); return Promise.reject(`No AllDebrid links found for [${torrent.hash}] ${encodedFileName}`);
} }
const unrestrictedLink = await AD.link.unlock(targetVideo.link).then(response => response.data.link); const unrestrictedLink = await AD.link.unlock(targetVideo.link).then(response => response.data.link);
console.log(`Unrestricted ${torrent.hash} [${fileIndex}] to ${unrestrictedLink}`); console.log(`Unrestricted AllDebrid ${torrent.hash} [${fileIndex}] to ${unrestrictedLink}`);
return unrestrictedLink; return unrestrictedLink;
} }

2
addon/moch/moch.js
View File

@@ -70,7 +70,7 @@ async function applyMochs(streams, config) {
async function resolve(parameters) { async function resolve(parameters) {
const moch = MOCHS[parameters.mochKey]; const moch = MOCHS[parameters.mochKey];
if (!moch) { if (!moch) {
return Promise.reject('Not a valid moch provider'); return Promise.reject(`Not a valid moch provider: ${parameters.mochKey}`);
} }
if (!parameters.apiKey || !parameters.infoHash || !parameters.cachedEntryInfo) { if (!parameters.apiKey || !parameters.infoHash || !parameters.cachedEntryInfo) {