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

Adding more websocket connection reconnect fail safe.

Browse Source 
fixes #44
This commit is contained in:
softsimon 2020-03-09 01:41:43 +07:00
parent 677f99d03b
commit 994c42440d
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { webSocket, WebSocketSubject } from 'rxjs/webSocket'; import { webSocket, WebSocketSubject } from 'rxjs/webSocket';
import { WebsocketResponse } from '../interfaces/websocket.interface'; import { WebsocketResponse } from '../interfaces/websocket.interface';
import { retryWhen, tap, delay } from 'rxjs/operators';
import { StateService } from './state.service'; import { StateService } from './state.service';
import { Block, Transaction } from '../interfaces/electrs.interface'; import { Block, Transaction } from '../interfaces/electrs.interface';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
@ -21,6 +20,7 @@ export class WebsocketService {
private latestGitCommit = ''; private latestGitCommit = '';
private onlineCheckTimeout: number; private onlineCheckTimeout: number;
private onlineCheckTimeoutTwo: number; private onlineCheckTimeoutTwo: number;
private connectionCheckTimeout: number;
private subscription: Subscription; private subscription: Subscription;
constructor( constructor(
@ -30,6 +30,12 @@ export class WebsocketService {
} }
startSubscription() { startSubscription() {
this.connectionCheckTimeout = window.setTimeout(() => {
console.log('WebSocket failed to connect, force closing, trying to reconnect in 10 seconds');
this.websocketSubject.complete();
this.subscription.unsubscribe();
this.goOffline();
}, 5000);
this.websocketSubject.next({'action': 'init'}); this.websocketSubject.next({'action': 'init'});
this.subscription = this.websocketSubject this.subscription = this.websocketSubject
.subscribe((response: WebsocketResponse) => { .subscribe((response: WebsocketResponse) => {
@ -112,6 +118,7 @@ export class WebsocketService {
this.stateService.isOffline$.next(false); this.stateService.isOffline$.next(false);
} }
clearTimeout(this.connectionCheckTimeout);
this.startOnlineCheck(); this.startOnlineCheck();
}, },
(err: Error) => { (err: Error) => {