Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ export function skipLoggingFetchError(error) {
|| error?.code === 'ERR_STREAM_PREMATURE_CLOSE'
|| error?.code === 'ERR_HTTP2_STREAM_ERROR'
|| error?.code === 'ERR_HTTP2_SESSION_ERROR'
|| error?.code === 'Z_DATA_ERROR';
|| error?.code === 'Z_DATA_ERROR'
|| error?.code === 'Z_BUF_ERROR';
}

function doFetch(fetch_func, h1_fetch_func, options) {
Expand Down
17 changes: 13 additions & 4 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,16 @@ export function prepareRequestOptions(request_options, options) {
setPrerender(enable_domain_prerender);
}

// Make empty headers by default for all cases.
request_options.headers = request_options.headers || {};

// Put forward headers.
const forward_headers = options?.getProviderOptions && options.getProviderOptions('app.http_forward_headers');
if (forward_headers && typeof forward_headers === 'object' && !Array.isArray(forward_headers)) {
for (const [key, value] of Object.entries(forward_headers)) {
request_options.headers[key] = value;
}
}

if (CONFIG.PROXY || options?.proxy) {

Expand All @@ -135,7 +144,6 @@ export function prepareRequestOptions(request_options, options) {
request_options.headers['User-Agent'] = proxy.user_agent;
}
if (proxy.headers) {
request_options.headers = request_options.headers || {};
Object.assign(request_options.headers, proxy.headers)
}
if (proxy.request_options) {
Expand Down Expand Up @@ -182,7 +190,6 @@ export function prepareRequestOptions(request_options, options) {

var lang = options?.getProviderOptions && options.getProviderOptions('locale') || '';
if (!disable_language) {
request_options.headers = request_options.headers || {};
request_options.headers['Accept-Language'] =
lang /* !== '' */
? lang.replace('_', '-')
Expand All @@ -195,15 +202,17 @@ export function prepareRequestOptions(request_options, options) {

setCookieFromJar(uri, request_options.headers, options?.jar)

if ((options?.sig || request_sig) && options?.getSigHeaders) {
// Has header begining from "Signature".
const skip_sig = Object.keys(request_options.headers).some(key => /^signature/i.test(key));

if (!skip_sig && (options?.sig || request_sig) && options?.getSigHeaders) {
try {
options.getSigHeaders(original_uri, function(error, headers) {
if (error) {
// Skip error.
console.error('getSigHeaders error', error);
resolve(request_options);
} else {
request_options.headers = request_options.headers || {};
Object.assign(request_options.headers, headers);
resolve(request_options);
}
Expand Down
Loading