Dollerok/P8-ExchangeService
1
0
Fork 0
forked from CITKParus/P8-ExchangeService
Code Issues Pull Requests Projects Releases Wiki Activity

Добавлен параметр "promiseCancellable" для "wrapPromiseTimeout" - обеспечение корректной обработки промисов, не имеющих методов "isPending" и "cancel"

Browse Source
This commit is contained in:
Mikhail Chechnev 2025-12-01 19:23:46 +03:00
parent 9cd779dd64
commit 62786dcc5a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/utils.js
View File

@ -404,7 +404,7 @@ const getURLProtocol = sURL => {
}; };
//Обёртывание промиса в таймаут исполнения //Обёртывание промиса в таймаут исполнения
const wrapPromiseTimeout = (timeout, promise) => { const wrapPromiseTimeout = (timeout, promise, promiseCancellable = true) => {
if (!timeout) return promise; if (!timeout) return promise;
let timeoutPid; let timeoutPid;
const timeoutPromise = new Promise((resolve, reject) => { const timeoutPromise = new Promise((resolve, reject) => {
@ -414,7 +414,7 @@ const wrapPromiseTimeout = (timeout, promise) => {
timeoutPid = setTimeout(() => reject(e), timeout); timeoutPid = setTimeout(() => reject(e), timeout);
}); });
return Promise.race([promise, timeoutPromise]).finally(() => { return Promise.race([promise, timeoutPromise]).finally(() => {
if (promise.promise().isPending()) promise.cancel(); if (promiseCancellable && promise.promise().isPending()) promise.cancel();
if (timeoutPid) clearTimeout(timeoutPid); if (timeoutPid) clearTimeout(timeoutPid);
}); });
}; };