update user agent workaround

Author: nleush

lib/request.js

@@ -152,11 +152,6 @@ export default function(options, iframely_options, callback) {
             });
         }
 
-        if (!options.headers || !options.headers['User-Agent']) {
-            options.headers = options.headers || {};
-            options.headers['User-Agent'] = CONFIG.USER_AGENT;
-        }
-
         iframely_options.registerFetch({
             source: 'api',
             url: options.uri

lib/utils.js

@@ -110,6 +110,9 @@ export function prepareRequestOptions(request_options, options) {
                 setPrerender(enable_domain_prerender);
             }
 
+            request_options.headers = request_options.headers || {};
+            request_options.headers['User-Agent'] = options.user_agent || CONFIG.USER_AGENT;
+
             if (CONFIG.PROXY || (options && options.proxy)) {
 
                 var proxy = (options && options.proxy) || getCustomProxyForUri(uri, options);
@@ -125,7 +128,6 @@ export function prepareRequestOptions(request_options, options) {
                         request_options.uri = proxy.proxy_url.replace(/{url}/, encodeURIComponent(uri));
                     }
                     if (proxy.user_agent) {
-                        request_options.headers = request_options.headers || {};
                         request_options.headers['User-Agent'] = proxy.user_agent;
                     }
                     if (proxy.headers) {
@@ -153,17 +155,18 @@ export function prepareRequestOptions(request_options, options) {
                 }
             }
 
-            if (options && options.getProviderOptions 
+            // Add user agent extension to default agent if avaliable.
+            if (options?.getProviderOptions 
                 && (options.getProviderOptions('app.name') || options.getProviderOptions('app.ua_extension'))
                 && request_options.headers
                 && request_options.headers['User-Agent'] === CONFIG.USER_AGENT) {
 
                 var ext = options.getProviderOptions('app.ua_extension', options.getProviderOptions('app.name'));
-                if ( /^[a-zA-Z0-9\.\s_-]+$/.test(ext) && ext.length > 1) {
+                if (/^[a-zA-Z0-9\.\s_-]+$/.test(ext) && ext.length > 1) {
                     ext =  ext[0].toUpperCase() + ext.slice(1)
                     request_options.headers['User-Agent'] += ' ' + ext;
-                }        
-            } 
+                }
+            }
 
             var lang = options?.getProviderOptions && options.getProviderOptions('locale') || '';
             if (!disable_language) {
@@ -244,7 +247,6 @@ export function prepareRequestOptions(request_options, options) {
             uri: url,
             method: 'GET',
             headers: {
-                'User-Agent': options.user_agent || CONFIG.USER_AGENT,
                 'Accept': '*/*'
             },
             timeout: options.timeout || CONFIG.RESPONSE_TIMEOUT,
@@ -322,9 +324,6 @@ var getHead = function(url, options, callbacks) {
             // Reviewed.
             uri: url,
             method: 'HEAD',
-            headers: {
-                'User-Agent': CONFIG.USER_AGENT
-            },
             timeout: options.timeout || CONFIG.RESPONSE_TIMEOUT,
             redirect: redirect,
             follow: follow
@@ -1278,9 +1277,6 @@ var getUriStatusPrivate = function(uri, options, cb) {
             // Reviewed.
             uri: uri,
             method: 'GET',
-            headers: {
-                'User-Agent': CONFIG.USER_AGENT
-            },
             timeout: options.timeout || CONFIG.RESPONSE_TIMEOUT,
             follow: CONFIG.MAX_REDIRECTS
         })