Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion proxy16/transports.js
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,42 @@ class Transports {
setTimeout(() => resolve(orReturn), seconds * 1000);
});

static waitTimeoutFineGrained(seconds, orReturn) {
let timerId;
let settled = false;

const promise = new Promise(resolve => {
const target = Date.now() + seconds * 1000;

function check() {
if (settled) return;

const now = Date.now();
if (now >= target) {
settled = true;
resolve(orReturn);
} else {
const remaining = target - now;
const next = remaining > 5000 ? 5000
: remaining > 1000 ? 1000
: remaining;
timerId = setTimeout(check, next);
}
}

timerId = setTimeout(check, Math.min(1000, seconds * 1000));
});

promise.cancel = () => {
if (!settled) {
settled = true;
clearTimeout(timerId);
}
};

return promise;
}

async hasDirectAccess(url) {
let { hostname, port, protocol } = new URL(url);

Expand Down Expand Up @@ -642,7 +678,7 @@ class Transports {
}

async waitTorReady() {
const timeout = Transports.waitTimeout(60 * 5, false);
const timeout = Transports.waitTimeoutFineGrained(60, false);

let torStart;

Expand Down