Yunzai-Plugin/ZZZ-Plugin
1
0
Fork 0
mirror of https://github.com/ZZZure/ZZZ-Plugin.git synced 2025-12-18 06:07:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

为utils/request.js添加timeout

Browse source
This commit is contained in:
HDTianRu 2024-08-18 15:53:36 +08:00
parent bd7ad919a8
commit 1716aff86e
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
utils/request.js
View file

@ -23,18 +23,24 @@ const _request = async (url, options) => {
* @param {number} retry 重试次数 * @param {number} retry 重试次数
* @returns {Promise<Response>} * @returns {Promise<Response>}
*/ */
const request = (url, options, retry = 0) => { const request = (url, options, retry = 0, timeout = 5000) => {
let err; let err;
const controller = new AbortController()
const { signal } = controller
const timeoutId = setTimeout(() => controller.abort(), timeout)
const _fetch = async (url, options, retryCount = 0) => { const _fetch = async (url, options, retryCount = 0) => {
if (retryCount > retry) { if (retryCount > retry) {
throw new Error('Retry limit reached', err); throw new Error('Retry limit reached', err);
} }
try { try {
return await _request(url, options); return await _request(url, { signal, ...options });
} catch (error) { } catch (error) {
logger.debug(`Fetch error: ${error.message}`); logger.debug(error.name === 'AbortError' ? 'Request timed out' : `Fetch error: ${error.message}`);
err = error; err = error;
return await _fetch(url, options, retryCount + 1); return await _fetch(url, options, retryCount + 1);
} finally {
clearTimeout(timeoutId)
} }
}; };
return _fetch(url, options); return _fetch(url, options);
@ -49,8 +55,8 @@ const request = (url, options, retry = 0) => {
*/ */
request.get = async (url, data, options) => { request.get = async (url, data, options) => {
const params = new URLSearchParams(data); const params = new URLSearchParams(data);
const { retry, ...restOptions } = options; const { retry, timeout, ...restOptions } = options;
return request(`${url}?${params}`, restOptions, retry); return request(`${url}?${params}`, restOptions, retry, timeout);
}; };
/** /**
@ -62,8 +68,8 @@ request.get = async (url, data, options) => {
*/ */
request.post = async (url, data, options) => { request.post = async (url, data, options) => {
const body = JSON.stringify(data); const body = JSON.stringify(data);
const { retry, ...restOptions } = options; const { retry, timeout, ...restOptions } = options;
return request(url, { ...restOptions, method: 'POST', body }, retry); return request(url, { ...restOptions, method: 'POST', body }, retry, timeout);
}; };
export default request; export default request;