Merge pull request #204 from play-dl/developer

1.6.0
This commit is contained in:
Killer069 2021-12-15 13:55:58 +05:30 committed by GitHub
commit b4e2991f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -39,7 +39,6 @@ export function request_stream(req_url: string, options: RequestOpts = { method:
*/
function internalRequest(
req_url: string,
cookies_added: boolean,
options: RequestOpts = { method: 'GET' }
): Promise<IncomingMessage> {
return new Promise(async (resolve, reject) => {
@ -49,14 +48,11 @@ function internalRequest(
return;
}
if (Number(res.statusCode) >= 300 && Number(res.statusCode) < 400) {
res = await internalRequest(res.headers.location as string, cookies_added, options);
res = await internalRequest(res.headers.location as string, options);
} else if (Number(res.statusCode) > 400) {
reject(new Error(`Got ${res.statusCode} from the request`));
return;
}
if (res.headers && res.headers['set-cookie'] && cookies_added) {
cookieHeaders(res.headers['set-cookie']);
}
resolve(res);
});
}
@ -83,11 +79,14 @@ export function request(req_url: string, options: RequestOpts = { method: 'GET'
'user-agent': getRandomUserAgent()
};
}
const res = await internalRequest(req_url, cookies_added, options).catch((err: Error) => err);
const res = await internalRequest(req_url, options).catch((err: Error) => err);
if (res instanceof Error) {
reject(res);
return;
}
if (res.headers && res.headers['set-cookie'] && cookies_added) {
cookieHeaders(res.headers['set-cookie']);
}
const data: string[] = [];
let decoder: BrotliDecompress | Gunzip | Deflate | undefined = undefined;
const encoding = res.headers['content-encoding'];