diff --git a/data_providers/avtocod.js b/data_providers/avtocod.js index 5be80ee..f0e23e5 100644 --- a/data_providers/avtocod.js +++ b/data_providers/avtocod.js @@ -141,10 +141,11 @@ class AvtocodProvider { console.log('Avtocod found vehicle: ', vehicle?.brand?.name?.original); return vehicle; } catch(ex) { + console.log('Avtocod error: ', ex.message); ex.debugInfo = { autocod: DebugInfo.fromError(ex.message) }; throw ex; } } } -export default AvtocodProvider; \ No newline at end of file +export default AvtocodProvider; diff --git a/data_providers/nomerogram.js b/data_providers/nomerogram.js index b834652..d032d11 100644 --- a/data_providers/nomerogram.js +++ b/data_providers/nomerogram.js @@ -20,11 +20,10 @@ class NomerogramProvider { let hash = createHash("sha256"); hash.update(secretSource); let secret = hash.digest("hex"); - console.log("secret: ", secret); let url = `${baseUrl}/group/list?from=${from}&carplate=${number}×tamp=${timestamp}&secret=${secret}&app_id=${appId}&device_id=${deviceId}`; let result = await fetch(url, { - timeout: 5000, + signal: AbortSignal.timeout(5000), headers: { "User-Agent": userAgent }, }); let json = await result.json(); diff --git a/data_providers/vin01.js b/data_providers/vin01.js index 85aa81e..9838552 100644 --- a/data_providers/vin01.js +++ b/data_providers/vin01.js @@ -3,33 +3,18 @@ import DebugInfo from '../models/DebugInfo.js'; import Vehicle from '../models/vehicle.js'; import Utils from '../utils/utils.js'; -const baseUrl = 'https://vin01.ru/v2'; +const baseUrl = 'https://vin-01.ru/v2'; const reportBaseUrl = `${baseUrl}/gibddApp.php`; -async function fetchWithTimeout(url, params, timeout) { - const controller = new AbortController(); - const timeoutId = setTimeout(() => { - controller.abort(); - }, timeout); - - let requestParams = params ?? {}; - requestParams.signal = controller.signal; - - try { - return await fetch(url, requestParams); - } finally { - clearInterval(timeoutId); - } -} - class Vin01Provider { static async getVin(number, token) { let url = `${baseUrl}/getVin.php?key=${token}&gosNumber=${encodeURIComponent(number)}`; - let result = await fetchWithTimeout(url, null, 14000); + let result = await fetch(url, { signal: AbortSignal.timeout(14000) }); let json = await result.json(); if(json.success && json.code == 200) { return json.data.vin; } else { + console.log('Vin01 provider failed to get VIN'); throw Error('Vin01 provider failed to get VIN'); } } @@ -77,6 +62,7 @@ class Vin01Provider { console.log('vin01 found VIN: ', vin); return await this.getReportVin(vin, number, token); } catch(ex) { + console.log('Vin01 error: ', ex.message); ex.debugInfo = { vin01vin:DebugInfo.fromError(ex.message), vin01history: DebugInfo.fromError('Not applicable (VIN was not found)'), @@ -160,4 +146,4 @@ class Vin01Provider { } } -export default Vin01Provider; \ No newline at end of file +export default Vin01Provider; diff --git a/ecosystem.config.js b/ecosystem.config.cjs similarity index 91% rename from ecosystem.config.js rename to ecosystem.config.cjs index 475765b..8305669 100644 --- a/ecosystem.config.js +++ b/ecosystem.config.cjs @@ -9,6 +9,7 @@ module.exports = { autorestart: true, watch: false, max_memory_restart: '1G', + log_date_format: 'YYYY-MM-DD HH:mm:ss', env: { NODE_ENV: 'development' },