diff --git a/utils/network.js b/utils/network.js index ffb1d37..9c9bc02 100644 --- a/utils/network.js +++ b/utils/network.js @@ -1,6 +1,9 @@ import fetch from 'node-fetch'; -export async function checkLatency(url, timeout = 10000) { +//暂时先写死罢( +const timeout = 5000 + +export async function checkLatency(url) { const controller = new AbortController() const { signal } = controller const timeoutId = setTimeout(() => controller.abort(), timeout) @@ -23,9 +26,9 @@ export async function checkLatency(url, timeout = 10000) { export async function findLowestLatencyUrl(urls) { const results = await Promise.allSettled(urls.map(checkLatency)); const lowestLatencyResult = results.reduce((prev, curr) => - prev.latency < curr.latency ? prev : curr + prev.value.latency < curr.value.latency ? prev : curr ); - return lowestLatencyResult.url; + return lowestLatencyResult.value.url; } export function getQueryVariable(url, variable) { diff --git a/utils/request.js b/utils/request.js index 239a28d..fbc1de2 100644 --- a/utils/request.js +++ b/utils/request.js @@ -23,7 +23,7 @@ const _request = async (url, options) => { * @param {number} retry 重试次数 * @returns {Promise} */ -const request = (url, options, retry = 0, timeout = 30000) => { +const request = (url, options, retry = 0, timeout = 15000) => { let err; const controller = new AbortController() const { signal } = controller