The shared upload limiter started with a full second of tokens and refilled up to one second during short idle gaps, so new uploads could briefly send almost twice the limit. In a parallel-upload test it released 3.87 MB in one second at a 2 MB/s limit. Uploads now reserve send time on one shared schedule with at most a 200 ms burst and exact waits. Speeds and limits used 1024-based kB and MB while being shown as kB/s and MB/s, so a limit of 100 meant 104.9 MB/s. Limits, measured speeds, ETA and the speed graph now use 1 MB = 1,000,000 bytes. Saved limits are converted once so the displayed value stays the same. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
290b9db8ce
commit
d37e86690f
5 files changed
+60
-54
No files matched your search
+8
-1
@@ -83,6 +83,7 @@ const DEFAULTS = {
|
||||
deleteSourceAfterSuccessfulUpload: false,
|
||||
showDropTarget: false,
|
||||
globalMaxSpeedKbs: 0, // 0 = unlimited global speed
|
||||
speedUnits: 'decimal',
|
||||
pendingQueue: null,
|
||||
uploadRecovery: null,
|
||||
scramble: {
|
||||
@@ -420,6 +421,9 @@ class ConfigStore {
|
||||
}
|
||||
}
|
||||
|
||||
const savedGlobal = data.globalSettings || {};
|
||||
const binarySpeeds = savedGlobal.speedUnits !== 'decimal';
|
||||
const toDecimalKbs = (value) => binarySpeeds && Number(value) > 0 ? Math.round(Number(value) * 1000 / 1024) : value;
|
||||
// Merge hoster settings with defaults
|
||||
const hosterSettings = {};
|
||||
for (const name of Object.keys(DEFAULTS.hosterSettings)) {
|
||||
@@ -427,12 +431,15 @@ class ConfigStore {
|
||||
...HOSTER_SETTINGS_DEFAULTS,
|
||||
...(data.hosterSettings && data.hosterSettings[name] || {})
|
||||
};
|
||||
hosterSettings[name].maxSpeedKbs = toDecimalKbs(hosterSettings[name].maxSpeedKbs);
|
||||
hosterSettings[name].restartBelowKbs = toDecimalKbs(hosterSettings[name].restartBelowKbs);
|
||||
}
|
||||
const savedGlobal = data.globalSettings || {};
|
||||
const globalSettings = {
|
||||
...DEFAULTS.globalSettings,
|
||||
...savedGlobal
|
||||
};
|
||||
globalSettings.globalMaxSpeedKbs = toDecimalKbs(globalSettings.globalMaxSpeedKbs);
|
||||
globalSettings.speedUnits = 'decimal';
|
||||
delete globalSettings.allowPlaintextCredentialStorage;
|
||||
// Deep-merge nested objects so new keys are always present
|
||||
for (const key of Object.keys(DEFAULTS.globalSettings)) {
|
||||
|
||||
+26
-27
@@ -1,42 +1,41 @@
|
||||
/**
|
||||
* Token-bucket speed limiter for bandwidth throttling.
|
||||
* Shared upload rate limiter. Every consumed byte reserves send time at the
|
||||
* configured rate, so concurrent uploads together never exceed it. Only a
|
||||
* short burst (burstMs) may be sent ahead after idle time.
|
||||
* maxBytesPerSec = 0 means unlimited (passthrough).
|
||||
*/
|
||||
class Throttle {
|
||||
constructor(maxBytesPerSec) {
|
||||
constructor(maxBytesPerSec, options = {}) {
|
||||
this.maxBps = maxBytesPerSec || 0;
|
||||
this.tokens = this.maxBps;
|
||||
this.lastRefill = Date.now();
|
||||
this.burstMs = Math.max(0, Number(options.burstMs ?? 200));
|
||||
this.now = typeof options.now === 'function' ? options.now : () => Date.now();
|
||||
this.nextFreeAt = this.now();
|
||||
}
|
||||
|
||||
async consume(bytes, signal) {
|
||||
if (this.maxBps <= 0) return; // unlimited
|
||||
|
||||
while (bytes > 0) {
|
||||
if (signal && signal.aborted) return;
|
||||
this._refill();
|
||||
const available = Math.min(bytes, Math.floor(this.tokens));
|
||||
if (available > 0) {
|
||||
this.tokens -= available;
|
||||
bytes -= available;
|
||||
if (this.maxBps <= 0 || !(bytes > 0)) return;
|
||||
if (signal && signal.aborted) return;
|
||||
const now = this.now();
|
||||
const start = Math.max(this.nextFreeAt, now - this.burstMs);
|
||||
this.nextFreeAt = start + (bytes * 1000) / this.maxBps;
|
||||
const wait = start - now;
|
||||
if (wait <= 0) return;
|
||||
await new Promise((resolve) => {
|
||||
const timer = setTimeout(done, wait);
|
||||
function done() {
|
||||
clearTimeout(timer);
|
||||
if (signal) signal.removeEventListener('abort', done);
|
||||
resolve();
|
||||
}
|
||||
if (bytes > 0) {
|
||||
if (signal && signal.aborted) return;
|
||||
// Wait 50ms for tokens to refill
|
||||
await new Promise((r) => setTimeout(r, 50));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_refill() {
|
||||
const now = Date.now();
|
||||
const elapsed = (now - this.lastRefill) / 1000;
|
||||
this.tokens = Math.min(this.maxBps, this.tokens + elapsed * this.maxBps);
|
||||
this.lastRefill = now;
|
||||
if (signal) signal.addEventListener('abort', done, { once: true });
|
||||
});
|
||||
}
|
||||
|
||||
updateRate(maxBytesPerSec) {
|
||||
this.maxBps = maxBytesPerSec || 0;
|
||||
const next = maxBytesPerSec || 0;
|
||||
if (next === this.maxBps) return;
|
||||
this.maxBps = next;
|
||||
this.nextFreeAt = Math.min(this.nextFreeAt, this.now() + this.burstMs);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+13
-13
@@ -319,9 +319,9 @@ class UploadManager extends EventEmitter {
|
||||
const newKbs = (this.globalSettings.globalMaxSpeedKbs || 0);
|
||||
if (newKbs > 0) {
|
||||
if (this.globalThrottle) {
|
||||
this.globalThrottle.updateRate(newKbs * 1024);
|
||||
this.globalThrottle.updateRate(newKbs * 1000);
|
||||
} else {
|
||||
this.globalThrottle = new Throttle(newKbs * 1024);
|
||||
this.globalThrottle = new Throttle(newKbs * 1000);
|
||||
}
|
||||
} else {
|
||||
this.globalThrottle = null;
|
||||
@@ -363,9 +363,9 @@ class UploadManager extends EventEmitter {
|
||||
const kbs = Number(this.globalSettings.globalMaxSpeedKbs || 0);
|
||||
if (!Number.isFinite(kbs) || kbs <= 0) return null;
|
||||
if (!this.globalThrottle) {
|
||||
this.globalThrottle = new Throttle(kbs * 1024);
|
||||
this.globalThrottle = new Throttle(kbs * 1000);
|
||||
} else {
|
||||
this.globalThrottle.updateRate(kbs * 1024);
|
||||
this.globalThrottle.updateRate(kbs * 1000);
|
||||
}
|
||||
return this.globalThrottle;
|
||||
}
|
||||
@@ -730,7 +730,7 @@ class UploadManager extends EventEmitter {
|
||||
});
|
||||
|
||||
const hosterThrottle = settings.maxSpeedKbs > 0
|
||||
? new Throttle(settings.maxSpeedKbs * 1024)
|
||||
? new Throttle(settings.maxSpeedKbs * 1000)
|
||||
: null;
|
||||
const globalThrottle = this._getGlobalThrottle();
|
||||
const throttle = hosterThrottle && globalThrottle
|
||||
@@ -770,7 +770,7 @@ class UploadManager extends EventEmitter {
|
||||
const timeDelta = (now - lastSpeedTime) / 1000;
|
||||
if (Number.isFinite(timeDelta) && timeDelta >= 1) {
|
||||
const bytesDelta = bytesUploaded - lastBytes;
|
||||
currentSpeedKbs = Math.round(bytesDelta / timeDelta / 1024);
|
||||
currentSpeedKbs = Math.round(bytesDelta / timeDelta / 1000);
|
||||
lastBytes = bytesUploaded;
|
||||
lastSpeedTime = now;
|
||||
}
|
||||
@@ -782,7 +782,7 @@ class UploadManager extends EventEmitter {
|
||||
lastEmitTime = now;
|
||||
|
||||
const remaining = currentSpeedKbs > 0
|
||||
? Math.round((bytesTotal - bytesUploaded) / (currentSpeedKbs * 1024))
|
||||
? Math.round((bytesTotal - bytesUploaded) / (currentSpeedKbs * 1000))
|
||||
: 0;
|
||||
|
||||
this._emitProgress(uploadId, fileName, task.hoster, { accountId: task.accountId,
|
||||
@@ -1105,7 +1105,7 @@ class UploadManager extends EventEmitter {
|
||||
const now = Date.now();
|
||||
const timeDelta = (now - lastSpeedTime) / 1000;
|
||||
if (timeDelta >= 1) {
|
||||
currentSpeedKbs = Math.round((bytesUploaded - lastBytes) / timeDelta / 1024);
|
||||
currentSpeedKbs = Math.round((bytesUploaded - lastBytes) / timeDelta / 1000);
|
||||
lastBytes = bytesUploaded;
|
||||
lastSpeedTime = now;
|
||||
}
|
||||
@@ -1114,7 +1114,7 @@ class UploadManager extends EventEmitter {
|
||||
if (now - lastEmitTime < PROGRESS_EMIT_INTERVAL) return;
|
||||
lastEmitTime = now;
|
||||
const elapsed = Math.round((now - jobStart) / 1000);
|
||||
const remaining = currentSpeedKbs > 0 ? Math.round((bytesTotal - bytesUploaded) / (currentSpeedKbs * 1024)) : 0;
|
||||
const remaining = currentSpeedKbs > 0 ? Math.round((bytesTotal - bytesUploaded) / (currentSpeedKbs * 1000)) : 0;
|
||||
this._emitProgress(uploadId, fileName, task.hoster, { accountId: task.accountId,
|
||||
jobId, status: 'uploading',
|
||||
progress: bytesTotal > 0 ? Math.min(1, bytesUploaded / bytesTotal) : 0,
|
||||
@@ -1123,7 +1123,7 @@ class UploadManager extends EventEmitter {
|
||||
});
|
||||
};
|
||||
|
||||
const hosterThrottle = settings.maxSpeedKbs > 0 ? new Throttle(settings.maxSpeedKbs * 1024) : null;
|
||||
const hosterThrottle = settings.maxSpeedKbs > 0 ? new Throttle(settings.maxSpeedKbs * 1000) : null;
|
||||
const globalThrottle = this._getGlobalThrottle();
|
||||
const throttle = hosterThrottle && globalThrottle
|
||||
? { consume: async (bytes, sig) => { await hosterThrottle.consume(bytes, sig); await globalThrottle.consume(bytes, sig); } }
|
||||
@@ -1259,7 +1259,7 @@ class UploadManager extends EventEmitter {
|
||||
const now = Date.now();
|
||||
const timeDelta = (now - lastSpeedTime) / 1000;
|
||||
if (timeDelta >= 1) {
|
||||
currentSpeedKbs = Math.round((bytesUploaded - lastBytes) / timeDelta / 1024);
|
||||
currentSpeedKbs = Math.round((bytesUploaded - lastBytes) / timeDelta / 1000);
|
||||
lastBytes = bytesUploaded;
|
||||
lastSpeedTime = now;
|
||||
}
|
||||
@@ -1268,7 +1268,7 @@ class UploadManager extends EventEmitter {
|
||||
if (now - lastEmitTime < PROGRESS_EMIT_INTERVAL) return;
|
||||
lastEmitTime = now;
|
||||
const elapsed = Math.round((now - jobStart) / 1000);
|
||||
const remaining = currentSpeedKbs > 0 ? Math.round((bytesTotal - bytesUploaded) / (currentSpeedKbs * 1024)) : 0;
|
||||
const remaining = currentSpeedKbs > 0 ? Math.round((bytesTotal - bytesUploaded) / (currentSpeedKbs * 1000)) : 0;
|
||||
this._emitProgress(uploadId, fileName, task.hoster, { accountId: task.accountId,
|
||||
jobId, status: 'uploading',
|
||||
progress: bytesTotal > 0 ? Math.min(1, bytesUploaded / bytesTotal) : 0,
|
||||
@@ -1276,7 +1276,7 @@ class UploadManager extends EventEmitter {
|
||||
elapsed, remaining, error: null, result: null, attempt: 1, maxAttempts: 1
|
||||
});
|
||||
};
|
||||
const hosterThrottle = settings.maxSpeedKbs > 0 ? new Throttle(settings.maxSpeedKbs * 1024) : null;
|
||||
const hosterThrottle = settings.maxSpeedKbs > 0 ? new Throttle(settings.maxSpeedKbs * 1000) : null;
|
||||
const globalThrottle = this._getGlobalThrottle();
|
||||
const throttle = hosterThrottle && globalThrottle
|
||||
? { consume: async (bytes, sig) => { await hosterThrottle.consume(bytes, sig); await globalThrottle.consume(bytes, sig); } }
|
||||
|
||||
Reference in new issue
Block a user