Merge pull request #276 from GetStream/fix-reconnect-error

fix: Multiple state recovery requests #273

Author: szuperaz

projects/stream-chat-angular/src/lib/channel.service.spec.ts

@@ -1544,4 +1544,21 @@ describe('ChannelService', () => {
 
     expect(service.reset).toHaveBeenCalledWith();
   });
+
+  it(`shouldn't do duplicate state reset after connection recovered`, async () => {
+    await init();
+    spyOn(service, 'init');
+    spyOn(service, 'reset');
+    events$.next({ eventType: 'connection.recovered' } as ClientEvent);
+    events$.next({ eventType: 'connection.recovered' } as ClientEvent);
+
+    expect(service.init).toHaveBeenCalledOnceWith(
+      service['filters']!,
+      service['sort'],
+      service['options'],
+      service['shouldSetActiveChannel']
+    );
+
+    expect(service.reset).toHaveBeenCalledOnceWith();
+  });
 });

projects/stream-chat-angular/src/lib/channel.service.ts

@@ -261,6 +261,7 @@ export class ChannelService<
   private _shouldMarkActiveChannelAsRead = true;
   private shouldSetActiveChannel: boolean | undefined;
   private clientEventsSubscription: Subscription | undefined;
+  private isStateRecoveryInProgress = false;
 
   private channelListSetter = (
     channels: (Channel<T> | ChannelResponse<T>)[]
@@ -797,14 +798,23 @@ export class ChannelService<
   private handleNotification(clientEvent: ClientEvent<T>) {
     switch (clientEvent.eventType) {
       case 'connection.recovered': {
-        this.ngZone.run(() => {
+        void this.ngZone.run(async () => {
+          if (this.isStateRecoveryInProgress) {
+            return;
+          }
+          this.isStateRecoveryInProgress = true;
           this.reset();
-          void this.init(
-            this.filters!,
-            this.sort,
-            this.options,
-            this.shouldSetActiveChannel
-          );
+          try {
+            await this.init(
+              this.filters!,
+              this.sort,
+              this.options,
+              this.shouldSetActiveChannel
+            );
+            this.isStateRecoveryInProgress = false;
+          } catch {
+            this.isStateRecoveryInProgress = false;
+          }
         });
         break;
       }