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

Improved websocket disconnections.

Browse Source
This commit is contained in:
softsimon 2020-03-06 13:47:04 +07:00
parent a6809e99f1
commit 4574d18ce3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import { WebsocketResponse } from '../interfaces/websocket.interface';
import { retryWhen, tap, delay } from 'rxjs/operators'; 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';
const WEB_SOCKET_PROTOCOL = (document.location.protocol === 'https:') ? 'wss:' : 'ws:'; const WEB_SOCKET_PROTOCOL = (document.location.protocol === 'https:') ? 'wss:' : 'ws:';
const WEB_SOCKET_URL = WEB_SOCKET_PROTOCOL + '//' + document.location.hostname + ':' + document.location.port + '/ws'; const WEB_SOCKET_URL = WEB_SOCKET_PROTOCOL + '//' + document.location.hostname + ':' + document.location.port + '/ws';
@ -20,6 +21,7 @@ export class WebsocketService {
private latestGitCommit = ''; private latestGitCommit = '';
private onlineCheckTimeout: number; private onlineCheckTimeout: number;
private onlineCheckTimeoutTwo: number; private onlineCheckTimeoutTwo: number;
private subscription: Subscription;
constructor( constructor(
private stateService: StateService, private stateService: StateService,
@ -29,7 +31,7 @@ export class WebsocketService {
startSubscription() { startSubscription() {
this.websocketSubject.next({'action': 'init'}); this.websocketSubject.next({'action': 'init'});
this.websocketSubject this.subscription = this.websocketSubject
.subscribe((response: WebsocketResponse) => { .subscribe((response: WebsocketResponse) => {
if (response.blocks && response.blocks.length) { if (response.blocks && response.blocks.length) {
const blocks = response.blocks; const blocks = response.blocks;
@ -154,6 +156,7 @@ export class WebsocketService {
if (!this.goneOffline) { if (!this.goneOffline) {
console.log('WebSocket response timeout, force closing, trying to reconnect in 10 seconds'); console.log('WebSocket response timeout, force closing, trying to reconnect in 10 seconds');
this.websocketSubject.complete(); this.websocketSubject.complete();
this.subscription.unsubscribe();
this.goOffline(); this.goOffline();
} }
}, 1000); }, 1000);