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] propagate ip to debrid catalog/meta requests

Browse Source
This commit is contained in:
TheBeastLT
2021-01-31 22:55:37 +01:00
parent d7313ecb91
commit 0a68bec37a
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addon/moch/moch.js
View File

@@ -98,7 +98,7 @@ async function getMochCatalog(mochKey, config) {
return Promise.reject(`Invalid API key for moch provider: ${mochKey}`);
}
return moch.instance.getCatalog(config[moch.key], config.skip);
return moch.instance.getCatalog(config[moch.key], config.skip, config.ip);
}
async function getMochItemMeta(mochKey, itemId, config) {
@@ -107,7 +107,7 @@ async function getMochItemMeta(mochKey, itemId, config) {
return Promise.reject(`Not a valid moch provider: ${mochKey}`);
}
return moch.instance.getItemMeta(itemId, config[moch.key])
return moch.instance.getItemMeta(itemId, config[moch.key], config.ip)
.then(meta => {
meta.videos
.map(video => video.streams)

12
addon/moch/premiumize.js
View File

@@ -49,11 +49,11 @@ async function getCatalog(apiKey, offset = 0) {
})));
}
async function getItemMeta(itemId, apiKey) {
async function getItemMeta(itemId, apiKey, ip) {
const options = await getDefaultOptions(apiKey);
const PM = new PremiumizeClient(apiKey, options);
const rootFolder = await PM.folder.list(itemId, null);
return getFolderContents(PM, itemId)
return getFolderContents(PM, itemId, ip)
.then(contents => ({
id: `${KEY}:${itemId}`,
type: Type.OTHER,
@@ -85,7 +85,7 @@ async function getFolderContents(PM, itemId, ip, folderPrefix = '') {
async function resolve({ ip, apiKey, infoHash, cachedEntryInfo, fileIndex }) {
console.log(`Unrestricting ${infoHash} [${fileIndex}] for IP ${ip}`);
const options = await getDefaultOptions(apiKey, ip);
const options = await getDefaultOptions(apiKey);
const PM = new PremiumizeClient(apiKey, options);
const cachedLink = await _getCachedLink(PM, infoHash, cachedEntryInfo, fileIndex, ip).catch(() => undefined);
@@ -160,12 +160,10 @@ function statusReady(status) {
return ['finished', 'seeding'].includes(status);
}
async function getDefaultOptions(id, ip) {
async function getDefaultOptions(id) {
const userAgent = await cacheUserAgent(id, () => getRandomUserAgent()).catch(() => getRandomUserAgent());
const proxy = await cacheWrapProxy('moch', () => getRandomProxy()).catch(() => getRandomProxy());
const agent = getProxyAgent(proxy);
return { timeout: 30000, agent: agent, headers: { 'User-Agent': userAgent } };
return { timeout: 30000, headers: { 'User-Agent': userAgent } };
}
module.exports = { getCachedStreams, resolve, getCatalog, getItemMeta };