machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding a third connection state and preventing offline indicator from pushing the menu.

Browse Source
This commit is contained in:
softsimon
2020-03-09 17:53:54 +07:00
parent 91179c8d25
commit a3e52deb72
7 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/services/state.service.ts
View File

@@ -20,5 +20,5 @@ export class StateService {
live2Chart$ = new Subject<OptimizedMempoolStats>();
viewFiat$ = new BehaviorSubject<boolean>(false);
isOffline$ = new BehaviorSubject<boolean>(false);
connectionState$ = new BehaviorSubject<0 | 1 | 2>(2);
}

28
frontend/src/app/services/websocket.service.ts
View File

@@ -29,13 +29,19 @@ export class WebsocketService {
this.startSubscription();
}
startSubscription() {
startSubscription(retrying = false) {
this.connectionCheckTimeout = window.setTimeout(() => {
console.log('WebSocket failed to connect, force closing, trying to reconnect in 10 seconds');
console.log('WebSocket failed to connect, force closing, trying to reconnect');
this.websocketSubject.complete();
this.subscription.unsubscribe();
this.goOffline();
}, 5000);
this.goOffline(true);
}, 10000);
if (retrying) {
if (this.stateService.connectionState$.value === 2) {
return;
}
this.stateService.connectionState$.next(1);
}
this.websocketSubject.next({'action': 'init'});
this.subscription = this.websocketSubject
.subscribe((response: WebsocketResponse) => {
@@ -115,7 +121,11 @@ export class WebsocketService {
if (this.trackingAddress) {
this.startTrackTransaction(this.trackingAddress);
}
this.stateService.isOffline$.next(false);
this.stateService.connectionState$.next(2);
}
if (this.stateService.connectionState$.value === 1) {
this.stateService.connectionState$.next(2);
}
clearTimeout(this.connectionCheckTimeout);
@@ -147,10 +157,12 @@ export class WebsocketService {
this.lastWant = data;
}
goOffline() {
goOffline(instant = false) {
this.goneOffline = true;
this.stateService.isOffline$.next(true);
window.setTimeout(() => this.startSubscription(), 10000);
this.stateService.connectionState$.next(0);
window.setTimeout(() => {
this.startSubscription(true);
}, instant ? 10 : 10000);
}
startOnlineCheck() {