Merge pull request #325 from vector-im/bwindels/connectionerror-initi…

…al-sync Fix handling connection error during initial sync
element-hq · Apr 9, 2021 · 3cf8699 · 3cf8699
2 parents 4d0ad04 + d414fb6
commit 3cf8699
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/src/matrix/SessionContainer.js b/src/matrix/SessionContainer.js
@@ -21,7 +21,6 @@ import {Reconnector, ConnectionStatus} from "./net/Reconnector.js";
 import {ExponentialRetryDelay} from "./net/ExponentialRetryDelay.js";
 import {MediaRepository} from "./net/MediaRepository.js";
 import {RequestScheduler} from "./net/RequestScheduler.js";
-import {HomeServerError, ConnectionError, AbortError} from "./error.js";
 import {Sync, SyncStatus} from "./Sync.js";
 import {Session} from "./Session.js";
 
@@ -109,7 +108,7 @@ export class SessionContainer {
             let sessionInfo;
             try {
                 const request = this._platform.request;
-                const hsApi = new HomeServerApi({homeServer, request, createTimeout: clock.createTimeout});
+                const hsApi = new HomeServerApi({homeServer, request});
                 const loginData = await hsApi.passwordLogin(username, password, "Hydrogen", {log}).response();
                 const sessionId = this.createNewSessionId();
                 sessionInfo = {
@@ -124,15 +123,15 @@ export class SessionContainer {
                 await this._platform.sessionInfoStorage.add(sessionInfo);            
             } catch (err) {
                 this._error = err;
-                if (err instanceof HomeServerError) {
+                if (err.name === "HomeServerError") {
                     if (err.errcode === "M_FORBIDDEN") {
                         this._loginFailure = LoginFailure.Credentials;
                     } else {
                         this._loginFailure = LoginFailure.Unknown;
                     }
                     log.set("loginFailure", this._loginFailure);
                     this._status.set(LoadStatus.LoginFailed);
-                } else if (err instanceof ConnectionError) {
+                } else if (err.name === "ConnectionError") {
                     this._loginFailure = LoginFailure.Connection;
                     this._status.set(LoadStatus.LoginFailed);
                 } else {
@@ -169,7 +168,6 @@ export class SessionContainer {
             accessToken: sessionInfo.accessToken,
             request: this._platform.request,
             reconnector: this._reconnector,
-            createTimeout: clock.createTimeout
         });
         this._sessionId = sessionInfo.id;
         this._storage = await this._platform.storageFactory.create(sessionInfo.id);
@@ -235,27 +233,26 @@ export class SessionContainer {
     }
 
     async _waitForFirstSync() {
-        try {
-            this._sync.start();
-            this._status.set(LoadStatus.FirstSync);
-        } catch (err) {
-            // swallow ConnectionError here and continue,
-            // as the reconnector above will call 
-            // sync.start again to retry in this case
-            if (!(err instanceof ConnectionError)) {
-                throw err;
-            }
-        }
+        this._sync.start();
+        this._status.set(LoadStatus.FirstSync);
         // only transition into Ready once the first sync has succeeded
-        this._waitForFirstSyncHandle = this._sync.status.waitFor(s => s === SyncStatus.Syncing || s === SyncStatus.Stopped);
+        this._waitForFirstSyncHandle = this._sync.status.waitFor(s => {
+            if (s === SyncStatus.Stopped) {
+                // keep waiting if there is a ConnectionError
+                // as the reconnector above will call 
+                // sync.start again to retry in this case
+                return this._sync.error?.name !== "ConnectionError";
+            }
+            return s === SyncStatus.Syncing;
+        });
         try {
             await this._waitForFirstSyncHandle.promise;
-            if (this._sync.status.get() === SyncStatus.Stopped) {
+            if (this._sync.status.get() === SyncStatus.Stopped && this._sync.error) {
                 throw this._sync.error;
             }
         } catch (err) {
             // if dispose is called from stop, bail out
-            if (err instanceof AbortError) {
+            if (err.name === "AbortError") {
                 return;
             }
             throw err;

diff --git a/src/matrix/net/HomeServerApi.js b/src/matrix/net/HomeServerApi.js
@@ -19,13 +19,12 @@ import {encodeQueryParams, encodeBody} from "./common.js";
 import {HomeServerRequest} from "./HomeServerRequest.js";
 
 export class HomeServerApi {
-    constructor({homeServer, accessToken, request, createTimeout, reconnector}) {
+    constructor({homeServer, accessToken, request, reconnector}) {
         // store these both in a closure somehow so it's harder to get at in case of XSS?
         // one could change the homeserver as well so the token gets sent there, so both must be protected from read/write
         this._homeserver = homeServer;
         this._accessToken = accessToken;
         this._requestFn = request;
-        this._createTimeout = createTimeout;
         this._reconnector = reconnector;
     }