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

merge from master

Browse Source
This commit is contained in:
softsimon
2020-07-05 23:24:06 +07:00
parent d39b4a5c92 c4c3751e16
commit f7fec55024
5 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/components/about/about.component.html
View File

@@ -73,7 +73,7 @@
</tr>
<tr>
<td style="border: 0;">
<input class="form-control" type="text" value="wss://mempool.space/ws" readonly>
<input class="form-control" type="text" value="wss://mempool.space/api/v1/ws" readonly>
</td>
</tr>
</table>

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

@@ -5,7 +5,7 @@ import { Observable } from 'rxjs';
import { StateService } from './state.service';
import { BisqTransaction, BisqBlock } from '../interfaces/bisq.interfaces';
const API_BASE_URL = '/api{network}/v1';
const API_BASE_URL = '{network}/api/v1';
@Injectable({
providedIn: 'root'

6
frontend/src/app/services/electrs-api.service.ts
View File

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
import { Block, Transaction, Address, Outspend, Recent, Asset } from '../interfaces/electrs.interface';
import { StateService } from './state.service';
const API_BASE_URL = document.location.protocol + '//' + document.location.hostname + ':' + document.location.port + '/electrs';
const API_BASE_URL = '{network}/api';
@Injectable({
providedIn: 'root'
@@ -16,12 +16,12 @@ export class ElectrsApiService {
private httpClient: HttpClient,
private stateService: StateService,
) {
this.apiBaseUrl = API_BASE_URL;
this.apiBaseUrl = API_BASE_URL.replace('{network}', '');
this.stateService.networkChanged$.subscribe((network) => {
if (network === 'bisq') {
network = '';
}
this.apiBaseUrl = API_BASE_URL + '/' + network;
this.apiBaseUrl = API_BASE_URL.replace('{network}', network ? '/' + network : '');
});
}

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

@@ -6,7 +6,7 @@ import { Block, Transaction } from '../interfaces/electrs.interface';
import { Subscription } from 'rxjs';
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 + '{network}/api/v1/ws';
const OFFLINE_RETRY_AFTER_MS = 10000;
const OFFLINE_PING_CHECK_AFTER_MS = 30000;
@@ -30,7 +30,7 @@ export class WebsocketService {
private stateService: StateService,
) {
this.network = this.stateService.network === 'bisq' ? '' : this.stateService.network;
this.websocketSubject = webSocket<WebsocketResponse | any>(WEB_SOCKET_URL + '/' + this.network);
this.websocketSubject = webSocket<WebsocketResponse | any>(WEB_SOCKET_URL.replace('{network}', this.network ? '/' + this.network : ''));
this.startSubscription();
this.stateService.networkChanged$.subscribe((network) => {
@@ -48,7 +48,7 @@ export class WebsocketService {
this.websocketSubject.complete();
this.subscription.unsubscribe();
this.websocketSubject = webSocket<WebsocketResponse | any>(WEB_SOCKET_URL + '/' + network);
this.websocketSubject = webSocket<WebsocketResponse | any>(WEB_SOCKET_URL.replace('{network}', this.network ? '/' + this.network : ''));
this.startSubscription();
});