highperfocused/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-03-26 17:51:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repost "want" after reconnect.

Browse Source
This commit is contained in:
Simon Lindh 2019-08-09 21:45:31 +03:00
parent 85c4a3480b
commit 0fad0fbb42
5 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/about/about.component.ts
View File

@ -13,7 +13,7 @@ export class AboutComponent implements OnInit {
) { }
ngOnInit() {
this.apiService.sendWebSocket({'action': 'want', data: []});
this.apiService.webSocketWant([]);
}
}

6
frontend/src/app/blockchain/blockchain.component.ts
View File

@ -26,7 +26,7 @@ export class BlockchainComponent implements OnInit, OnDestroy {
) {}
ngOnInit() {
this.apiService.sendWebSocket({'action': 'want', data: ['stats', 'blocks', 'projected-blocks']});
this.apiService.webSocketWant(['stats', 'blocks', 'projected-blocks']);
this.txTrackingSubscription = this.memPoolService.txTracking$
.subscribe((response: ITxTracking) => {
@ -46,14 +46,14 @@ export class BlockchainComponent implements OnInit, OnDestroy {
return;
}
this.txTrackingLoading = true;
this.apiService.sendWebSocket({'action': 'track-tx', 'txId': txId});
this.apiService.webSocketStartTrackTx(txId);
});
this.memPoolService.txIdSearch$
.subscribe((txId) => {
if (txId) {
this.txTrackingLoading = true;
this.apiService.sendWebSocket({'action': 'track-tx', 'txId': txId});
this.apiService.webSocketStartTrackTx(txId);
}
});

25
frontend/src/app/services/api.service.ts
View File

@ -14,6 +14,8 @@ const API_BASE_URL = '/api/v1';
})
export class ApiService {
private websocketSubject: Observable<IMempoolDefaultResponse> = webSocket<IMempoolDefaultResponse | any>(WEB_SOCKET_URL);
private lastWant: string[] | null = null;
private goneOffline = false;
constructor(
private httpClient: HttpClient,
@ -27,7 +29,10 @@ export class ApiService {
.pipe(
retryWhen((errors: any) => errors
.pipe(
tap(() => this.memPoolService.isOffline$.next(true)),
tap(() => {
this.goneOffline = true;
this.memPoolService.isOffline$.next(true);
}),
delay(5000),
)
),
@ -92,17 +97,31 @@ export class ApiService {
if (response['live-2h-chart']) {
this.memPoolService.live2Chart$.next(response['live-2h-chart']);
}
if (this.goneOffline === true) {
this.goneOffline = false;
if (this.lastWant) {
this.webSocketWant(this.lastWant);
}
}
},
(err: Error) => {
console.log(err);
this.goneOffline = true;
console.log('Error, retrying in 10 sec');
setTimeout(() => this.startSubscription(), 10000);
});
}
sendWebSocket(data: any) {
webSocketStartTrackTx(txId: string) {
// @ts-ignore
this.websocketSubject.next(data);
this.websocketSubject.next({'action': 'track-tx', 'txId': txId});
}
webSocketWant(data: string[]) {
// @ts-ignore
this.websocketSubject.next({'action': 'want', data: data});
this.lastWant = data;
}
listTransactionsForBlock$(height: number): Observable<IBlockTransaction[]> {

4
frontend/src/app/statistics/statistics.component.ts
View File

@ -154,10 +154,10 @@ export class StatisticsComponent implements OnInit {
switchMap(() => {
this.spinnerLoading = true;
if (this.radioGroupForm.controls['dateSpan'].value === '2h') {
this.apiService.sendWebSocket({'action': 'want', data: ['live-2h-chart']});
this.apiService.webSocketWant(['live-2h-chart']);
return this.apiService.list2HStatistics$();
}
this.apiService.sendWebSocket({'action': 'want', data: ['']});
this.apiService.webSocketWant([]);
if (this.radioGroupForm.controls['dateSpan'].value === '24h') {
return this.apiService.list24HStatistics$();
}

2
frontend/src/app/television/television.component.ts
View File

@ -27,7 +27,7 @@ export class TelevisionComponent implements OnInit {
) { }
ngOnInit() {
this.apiService.sendWebSocket({'action': 'want', data: ['projected-blocks', 'live-2h-chart']});
this.apiService.webSocketWant(['projected-blocks', 'live-2h-chart']);
const labelInterpolationFnc = (value: any, index: any) => {
return index % 6 === 0 ? formatDate(value, 'HH:mm', this.locale) : null;