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

do not encode realdebrid cachedIds into stream url

Browse Source
This commit is contained in:
TheBeastLT
2023-10-31 21:27:36 +02:00
parent 77db08c9b2
commit 8a2f0093c6
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
addon/moch/realdebrid.js
View File

@@ -21,10 +21,9 @@ export async function getCachedStreams(streams, apiKey) {
.reduce((mochStreams, stream) => { .reduce((mochStreams, stream) => {
const cachedEntry = available[stream.infoHash]; const cachedEntry = available[stream.infoHash];
const cachedIds = _getCachedFileIds(stream.fileIdx, cachedEntry); const cachedIds = _getCachedFileIds(stream.fileIdx, cachedEntry);
const cachedIdsString = cachedIds.length ? cachedIds.join(',') : null;
mochStreams[stream.infoHash] = { mochStreams[stream.infoHash] = {
url: `${apiKey}/${stream.infoHash}/${cachedIdsString}/${stream.fileIdx}`, url: `${apiKey}/${stream.infoHash}/null/${stream.fileIdx}`,
cached: !!cachedIdsString cached: !!cachedIds.length
}; };
return mochStreams; return mochStreams;
}, {}) }, {})
@@ -61,7 +60,7 @@ async function _getInstantAvailable(hashes, apiKey, retries = 3, maxChunkSize =
console.log(`Reducing chunk size for availability request: ${hashes[0]}`); console.log(`Reducing chunk size for availability request: ${hashes[0]}`);
return _getInstantAvailable(hashes, apiKey, retries - 1, Math.ceil(maxChunkSize / 10)); return _getInstantAvailable(hashes, apiKey, retries - 1, Math.ceil(maxChunkSize / 10));
} }
if (retries > 0 && NON_BLACKLIST_ERRORS.some(v => error && error.message && error.message.includes(v))) { if (retries > 0 && NON_BLACKLIST_ERRORS.some(v => error?.message?.includes(v))) {
return _getInstantAvailable(hashes, apiKey, retries - 1); return _getInstantAvailable(hashes, apiKey, retries - 1);
} }
console.warn(`Failed RealDebrid cached [${hashes[0]}] torrent availability request:`, error.message); console.warn(`Failed RealDebrid cached [${hashes[0]}] torrent availability request:`, error.message);
@@ -176,12 +175,13 @@ async function _getAllDownloads(RD, page = 1) {
return RD.downloads.get(page - 1, page, CATALOG_PAGE_SIZE); return RD.downloads.get(page - 1, page, CATALOG_PAGE_SIZE);
} }
export async function resolve({ ip, isBrowser, apiKey, infoHash, cachedEntryInfo, fileIndex }) { export async function resolve({ ip, isBrowser, apiKey, infoHash, fileIndex }) {
console.log(`Unrestricting RealDebrid ${infoHash} [${fileIndex}]`); console.log(`Unrestricting RealDebrid ${infoHash} [${fileIndex}]`);
const options = await getDefaultOptions(ip); const options = await getDefaultOptions(ip);
const RD = new RealDebridClient(apiKey, options); const RD = new RealDebridClient(apiKey, options);
const cachedFileIds = await _resolveCachedFileIds(infoHash, fileIndex, apiKey);
return _resolve(RD, infoHash, cachedEntryInfo, fileIndex, isBrowser) return _resolve(RD, infoHash, cachedFileIds, fileIndex, isBrowser)
.catch(error => { .catch(error => {
if (accessDeniedError(error)) { if (accessDeniedError(error)) {
console.log(`Access denied to RealDebrid ${infoHash} [${fileIndex}]`); console.log(`Access denied to RealDebrid ${infoHash} [${fileIndex}]`);
@@ -195,8 +195,15 @@ export async function resolve({ ip, isBrowser, apiKey, infoHash, cachedEntryInfo
}); });
} }
async function _resolve(RD, infoHash, cachedEntryInfo, fileIndex, isBrowser) { async function _resolveCachedFileIds(infoHash, fileIndex, apiKey) {
const torrentId = await _createOrFindTorrentId(RD, infoHash, cachedEntryInfo, fileIndex); const available = await _getInstantAvailable([infoHash], apiKey);
const cachedEntry = available?.[infoHash];
const cachedIds = _getCachedFileIds(fileIndex, cachedEntry);
return cachedIds?.join(',');
}
async function _resolve(RD, infoHash, cachedFileIds, fileIndex, isBrowser) {
const torrentId = await _createOrFindTorrentId(RD, infoHash, cachedFileIds, fileIndex);
const torrent = await _getTorrentInfo(RD, torrentId); const torrent = await _getTorrentInfo(RD, torrentId);
if (torrent && statusReady(torrent.status)) { if (torrent && statusReady(torrent.status)) {
return _unrestrictLink(RD, torrent, fileIndex, isBrowser); return _unrestrictLink(RD, torrent, fileIndex, isBrowser);
@@ -234,7 +241,7 @@ async function _findTorrent(RD, infoHash, fileIndex) {
.filter(torrent => torrent.hash.toLowerCase() === infoHash) .filter(torrent => torrent.hash.toLowerCase() === infoHash)
.filter(torrent => !statusError(torrent.status)); .filter(torrent => !statusError(torrent.status));
const foundTorrent = await _findBestFitTorrent(RD, foundTorrents, fileIndex); const foundTorrent = await _findBestFitTorrent(RD, foundTorrents, fileIndex);
return foundTorrent && foundTorrent.id || Promise.reject('No recent torrent found'); return foundTorrent?.id || Promise.reject('No recent torrent found');
} }
async function _findBestFitTorrent(RD, torrents, fileIndex) { async function _findBestFitTorrent(RD, torrents, fileIndex) {
@@ -281,7 +288,7 @@ async function _retryCreateTorrent(RD, infoHash, fileIndex) {
async function _selectTorrentFiles(RD, torrent, fileIndex) { async function _selectTorrentFiles(RD, torrent, fileIndex) {
torrent = statusWaitingSelection(torrent.status) ? torrent : await _openTorrent(RD, torrent.id); torrent = statusWaitingSelection(torrent.status) ? torrent : await _openTorrent(RD, torrent.id);
if (torrent && torrent.files && statusWaitingSelection(torrent.status)) { if (torrent?.files && statusWaitingSelection(torrent.status)) {
const videoFileIds = Number.isInteger(fileIndex) ? `${fileIndex + 1}` : torrent.files const videoFileIds = Number.isInteger(fileIndex) ? `${fileIndex + 1}` : torrent.files
.filter(file => isVideo(file.path)) .filter(file => isVideo(file.path))
.filter(file => file.bytes > MIN_SIZE) .filter(file => file.bytes > MIN_SIZE)
@@ -313,7 +320,7 @@ async function _unrestrictLink(RD, torrent, fileIndex, isBrowser) {
? torrent.links[0] ? torrent.links[0]
: torrent.links[selectedFiles.indexOf(targetFile)]; : torrent.links[selectedFiles.indexOf(targetFile)];
if (!fileLink || !fileLink.length) { if (!fileLink?.length) {
console.log(`No RealDebrid links found for ${torrent.hash} [${fileIndex}]`); console.log(`No RealDebrid links found for ${torrent.hash} [${fileIndex}]`);
return _retryCreateTorrent(RD, torrent.hash, fileIndex) return _retryCreateTorrent(RD, torrent.hash, fileIndex)
} }
@@ -373,7 +380,7 @@ function statusReady(status) {
} }
function accessDeniedError(error) { function accessDeniedError(error) {
return [9, 20].includes(error && error.code); return [9, 20].includes(error?.code);
} }
function infringingFile(error) { function infringingFile(error) {