[addon] add a timeout for resolve method
This commit is contained in:
22
addon/lib/promises.js
Normal file
22
addon/lib/promises.js
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
/**
|
||||||
|
* Delay promise
|
||||||
|
*/
|
||||||
|
async function delay(duration) {
|
||||||
|
return new Promise((resolve) => setTimeout(resolve, duration));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Timeout promise after a set time in ms
|
||||||
|
*/
|
||||||
|
async function timeout(timeoutMs, promise, message = 'Timed out') {
|
||||||
|
return Promise.race([
|
||||||
|
promise,
|
||||||
|
new Promise(function (resolve, reject) {
|
||||||
|
setTimeout(function () {
|
||||||
|
reject(message);
|
||||||
|
}, timeoutMs);
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { delay, timeout };
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
const DebridLinkClient = require('debrid-link-api');
|
const DebridLinkClient = require('debrid-link-api');
|
||||||
const { Type } = require('../lib/types');
|
const { Type } = require('../lib/types');
|
||||||
const { isVideo, isArchive } = require('../lib/extension');
|
const { isVideo, isArchive } = require('../lib/extension');
|
||||||
|
const { delay } = require('../lib/promises');
|
||||||
const StaticResponse = require('./static');
|
const StaticResponse = require('./static');
|
||||||
const { getMagnetLink } = require('../lib/magnetHelper');
|
const { getMagnetLink } = require('../lib/magnetHelper');
|
||||||
const { chunkArray, BadTokenError } = require('./mochHelper');
|
const { chunkArray, BadTokenError } = require('./mochHelper');
|
||||||
const delay = require('./delay');
|
|
||||||
|
|
||||||
const KEY = 'debridlink';
|
const KEY = 'debridlink';
|
||||||
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
module.exports = duration => new Promise((resolve) => setTimeout(resolve, duration));
|
|
||||||
@@ -7,8 +7,10 @@ const debridlink = require('./debridlink');
|
|||||||
const putio = require('./putio');
|
const putio = require('./putio');
|
||||||
const StaticResponse = require('./static');
|
const StaticResponse = require('./static');
|
||||||
const { cacheWrapResolvedUrl } = require('../lib/cache');
|
const { cacheWrapResolvedUrl } = require('../lib/cache');
|
||||||
|
const { timeout } = require('../lib/promises');
|
||||||
const { BadTokenError } = require('./mochHelper');
|
const { BadTokenError } = require('./mochHelper');
|
||||||
|
|
||||||
|
const RESOLVE_TIMEOUT = 10 * 60 * 1000; // 10 minutes
|
||||||
const MIN_API_KEY_SYMBOLS = 15;
|
const MIN_API_KEY_SYMBOLS = 15;
|
||||||
const TOKEN_BLACKLIST = [];
|
const TOKEN_BLACKLIST = [];
|
||||||
const RESOLVER_HOST = process.env.RESOLVER_HOST || 'http://localhost:7050';
|
const RESOLVER_HOST = process.env.RESOLVER_HOST || 'http://localhost:7050';
|
||||||
@@ -87,12 +89,11 @@ async function resolve(parameters) {
|
|||||||
return Promise.reject("No valid parameters passed");
|
return Promise.reject("No valid parameters passed");
|
||||||
}
|
}
|
||||||
const id = `${parameters.mochKey}_${parameters.apiKey}_${parameters.infoHash}_${parameters.fileIndex}`;
|
const id = `${parameters.mochKey}_${parameters.apiKey}_${parameters.infoHash}_${parameters.fileIndex}`;
|
||||||
const method = () => cacheWrapResolvedUrl(id, () => moch.instance.resolve(parameters))
|
const method = () => timeout(RESOLVE_TIMEOUT, cacheWrapResolvedUrl(id, () => moch.instance.resolve(parameters)))
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.warn(error);
|
console.warn(error);
|
||||||
return StaticResponse.FAILED_UNEXPECTED;
|
return StaticResponse.FAILED_UNEXPECTED;
|
||||||
});
|
});
|
||||||
console.log(`Starting [${parameters.infoHash}] link resolve with queue size: ${unrestrictQueue.length()}`);
|
|
||||||
return new Promise(((resolve, reject) => {
|
return new Promise(((resolve, reject) => {
|
||||||
unrestrictQueue.push({ id, method }, (error, result) => result ? resolve(result) : reject(error));
|
unrestrictQueue.push({ id, method }, (error, result) => result ? resolve(result) : reject(error));
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
const PutioAPI = require('@putdotio/api-client').default
|
const PutioAPI = require('@putdotio/api-client').default
|
||||||
const { isVideo } = require('../lib/extension');
|
const { isVideo } = require('../lib/extension');
|
||||||
const delay = require('./delay');
|
const { delay } = require('../lib/promises');
|
||||||
const StaticResponse = require('./static');
|
const StaticResponse = require('./static');
|
||||||
const { getMagnetLink } = require('../lib/magnetHelper');
|
const { getMagnetLink } = require('../lib/magnetHelper');
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
const RealDebridClient = require('real-debrid-api');
|
const RealDebridClient = require('real-debrid-api');
|
||||||
const { Type } = require('../lib/types');
|
const { Type } = require('../lib/types');
|
||||||
const { isVideo, isArchive } = require('../lib/extension');
|
const { isVideo, isArchive } = require('../lib/extension');
|
||||||
const delay = require('./delay');
|
const { delay } = require('../lib/promises');
|
||||||
const StaticResponse = require('./static');
|
const StaticResponse = require('./static');
|
||||||
const { getMagnetLink } = require('../lib/magnetHelper');
|
const { getMagnetLink } = require('../lib/magnetHelper');
|
||||||
const { chunkArray, BadTokenError } = require('./mochHelper');
|
const { chunkArray, BadTokenError } = require('./mochHelper');
|
||||||
|
|||||||
Reference in New Issue
Block a user