taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

fix utterly broken throttling logic

Browse Source
This commit is contained in:
Florian Dold 2020-09-04 16:17:32 +05:30
parent 8139608a3b
commit ccaac89c3b
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/taler-wallet-core/src/util/RequestThrottler.ts
View File

@ -21,7 +21,7 @@
/** /**
* Imports. * Imports.
*/ */
import { getTimestampNow, timestampDifference } from "../util/time"; import { getTimestampNow, timestampDifference, timestampCmp } from "../util/time";
import { URL } from "./url"; import { URL } from "./url";
import { Logger } from "./logging"; import { Logger } from "./logging";
@ -53,25 +53,26 @@ class OriginState {
private refill(): void { private refill(): void {
const now = getTimestampNow(); const now = getTimestampNow();
if (timestampCmp(now, this.lastUpdate) < 0) {
// Did the system time change?
this.lastUpdate = now;
return;
}
const d = timestampDifference(now, this.lastUpdate); const d = timestampDifference(now, this.lastUpdate);
if (d.d_ms === "forever") { if (d.d_ms === "forever") {
throw Error("assertion failed"); throw Error("assertion failed");
} }
if (d.d_ms < 0) {
return;
}
const d_s = d.d_ms / 1000;
this.tokensSecond = Math.min( this.tokensSecond = Math.min(
MAX_PER_SECOND, MAX_PER_SECOND,
this.tokensSecond + d_s / 1000, this.tokensSecond + d.d_ms / 1000,
); );
this.tokensMinute = Math.min( this.tokensMinute = Math.min(
MAX_PER_MINUTE, MAX_PER_MINUTE,
this.tokensMinute + (d_s / 1000) * 60, this.tokensMinute + d.d_ms / 1000 / 60,
); );
this.tokensHour = Math.min( this.tokensHour = Math.min(
MAX_PER_HOUR, MAX_PER_HOUR,
this.tokensHour + (d_s / 1000) * 60 * 60, this.tokensHour + d.d_ms / 1000 / 60 / 60,
); );
this.lastUpdate = now; this.lastUpdate = now;
} }