From bdef9aefb41dcbbabdcad2a22b291417f1d637a3 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 21 May 2023 21:05:18 +0300 Subject: [PATCH] Update client.js --- src/client.js | 198 +++++++++++++++++++++++++------------------------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/src/client.js b/src/client.js index 1e5e6e8..8bb2cab 100644 --- a/src/client.js +++ b/src/client.js @@ -13,125 +13,125 @@ module.exports.parseResponse = parseResponse let timeout function create(config) { - const client = setupCache( - axios.create({ - headers: { - 'User-Agent': - 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36 Edg/79.0.309.71' - } - }) - ) + const client = setupCache( + axios.create({ + headers: { + 'User-Agent': + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36 Edg/79.0.309.71' + } + }) + ) - client.interceptors.request.use( - function (request) { - if (config.debug) { - console.log('Request:', JSON.stringify(request, null, 2)) - } - return request - }, - function (error) { - return Promise.reject(error) - } - ) + client.interceptors.request.use( + function (request) { + if (config.debug) { + console.log('Request:', JSON.stringify(request, null, 2)) + } + return request + }, + function (error) { + return Promise.reject(error) + } + ) - client.interceptors.response.use( - function (response) { - if (config.debug) { - const data = - isObject(response.data) || Array.isArray(response.data) - ? JSON.stringify(response.data) - : response.data.toString() - console.log( - 'Response:', - JSON.stringify( - { - headers: response.headers, - data, - cached: response.cached - }, - null, - 2 - ) - ) - } + client.interceptors.response.use( + function (response) { + if (config.debug) { + const data = + isObject(response.data) || Array.isArray(response.data) + ? JSON.stringify(response.data) + : response.data.toString() + console.log( + 'Response:', + JSON.stringify( + { + headers: response.headers, + data, + cached: response.cached + }, + null, + 2 + ) + ) + } - clearTimeout(timeout) - return response - }, - function (error) { - clearTimeout(timeout) - return Promise.reject(error) - } - ) + clearTimeout(timeout) + return response + }, + function (error) { + clearTimeout(timeout) + return Promise.reject(error) + } + ) - return client + return client } async function buildRequest({ channel, date, config }) { - const CancelToken = axios.CancelToken - const source = CancelToken.source() - const request = { ...config.request } - timeout = setTimeout(() => { - source.cancel('Connection timeout') - }, request.timeout) - request.headers = await getRequestHeaders({ channel, date, config }) - request.url = await getRequestUrl({ channel, date, config }) - request.data = await getRequestData({ channel, date, config }) - request.cancelToken = source.token + const CancelToken = axios.CancelToken + const source = CancelToken.source() + const request = { ...config.request } + timeout = setTimeout(() => { + source.cancel('Connection timeout') + }, request.timeout) + request.headers = await getRequestHeaders({ channel, date, config }) + request.url = await getRequestUrl({ channel, date, config }) + request.data = await getRequestData({ channel, date, config }) + request.cancelToken = source.token - if (config.curl) { - const curl = CurlGenerator({ - url: request.url, - method: request.method, - headers: request.headers, - body: request.data - }) - console.log(curl) - } + if (config.curl) { + const curl = CurlGenerator({ + url: request.url, + method: request.method, + headers: request.headers, + body: request.data + }) + console.log(curl) + } - return request + return request } function parseResponse(response) { - return { - content: response.data.toString(), - buffer: response.data, - headers: response.headers, - request: response.request, - cached: response.cached - } + return { + content: response.data.toString(), + buffer: response.data, + headers: response.headers, + request: response.request, + cached: response.cached + } } async function getRequestHeaders({ channel, date, config }) { - if (typeof config.request.headers === 'function') { - const headers = config.request.headers({ channel, date }) - if (isPromise(headers)) { - return await headers - } - return headers - } + if (typeof config.request.headers === 'function') { + const headers = config.request.headers({ channel, date }) + if (isPromise(headers)) { + return await headers + } + return headers + } - return config.request.headers || null + return config.request.headers || null } async function getRequestData({ channel, date, config }) { - if (typeof config.request.data === 'function') { - const data = config.request.data({ channel, date }) - if (isPromise(data)) { - return await data - } - return data - } - return config.request.data || null + if (typeof config.request.data === 'function') { + const data = config.request.data({ channel, date }) + if (isPromise(data)) { + return await data + } + return data + } + return config.request.data || null } async function getRequestUrl({ channel, date, config }) { - if (typeof config.url === 'function') { - const url = config.url({ channel, date }) - if (isPromise(url)) { - return await url - } - return url - } - return config.url + if (typeof config.url === 'function') { + const url = config.url({ channel, date }) + if (isPromise(url)) { + return await url + } + return url + } + return config.url }