From 08b1c02af7f2c6b82d5e6a44a0a4246ae61f7916 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 22 Apr 2020 20:48:25 +0200 Subject: [PATCH] remove start value, can be hardcoded for now also fix params in wrong order this way --- src/matrix/SessionContainer.js | 2 +- src/matrix/net/ExponentialRetryDelay.js | 5 +++-- src/matrix/net/Reconnector.js | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/matrix/SessionContainer.js b/src/matrix/SessionContainer.js index f0445163..c5db341b 100644 --- a/src/matrix/SessionContainer.js +++ b/src/matrix/SessionContainer.js @@ -115,7 +115,7 @@ export class SessionContainer { this._status.set(LoadStatus.Loading); this._reconnector = new Reconnector({ onlineStatus: this._onlineStatus, - delay: new ExponentialRetryDelay(2000, this._clock.createTimeout), + retryDelay: new ExponentialRetryDelay(this._clock.createTimeout), createMeasure: this._clock.createMeasure }); const hsApi = new HomeServerApi({ diff --git a/src/matrix/net/ExponentialRetryDelay.js b/src/matrix/net/ExponentialRetryDelay.js index a1317619..a1bae822 100644 --- a/src/matrix/net/ExponentialRetryDelay.js +++ b/src/matrix/net/ExponentialRetryDelay.js @@ -1,7 +1,8 @@ import {AbortError} from "../../utils/error.js"; export class ExponentialRetryDelay { - constructor(createTimeout, start = 2000) { + constructor(createTimeout) { + const start = 2000; this._start = start; this._current = start; this._createTimeout = createTimeout; @@ -49,7 +50,7 @@ export function tests() { return { "test sequence": async assert => { const clock = new MockClock(); - const retryDelay = new ExponentialRetryDelay(clock.createTimeout, 2000); + const retryDelay = new ExponentialRetryDelay(clock.createTimeout); let promise; assert.strictEqual(retryDelay.nextValue, 2000); diff --git a/src/matrix/net/Reconnector.js b/src/matrix/net/Reconnector.js index aa1f80da..0489b963 100644 --- a/src/matrix/net/Reconnector.js +++ b/src/matrix/net/Reconnector.js @@ -137,7 +137,7 @@ export function tests() { const clock = new MockClock(); const {createMeasure} = clock; const onlineStatus = new ObservableValue(false); - const retryDelay = new ExponentialRetryDelay(clock.createTimeout, 2000); + const retryDelay = new ExponentialRetryDelay(clock.createTimeout); const reconnector = new Reconnector({retryDelay, onlineStatus, createMeasure}); const {connectionStatus} = reconnector; const statuses = []; @@ -162,7 +162,7 @@ export function tests() { const clock = new MockClock(); const {createMeasure} = clock; const onlineStatus = new ObservableValue(false); - const retryDelay = new ExponentialRetryDelay(clock.createTimeout, 2000); + const retryDelay = new ExponentialRetryDelay(clock.createTimeout); const reconnector = new Reconnector({retryDelay, onlineStatus, createMeasure}); const {connectionStatus} = reconnector; reconnector.onRequestFailed(createHsApiMock(1));