diff --git a/backend/src/api/explorer/nodes.api.ts b/backend/src/api/explorer/nodes.api.ts index 2d838524e..e59770d50 100644 --- a/backend/src/api/explorer/nodes.api.ts +++ b/backend/src/api/explorer/nodes.api.ts @@ -168,64 +168,115 @@ class NodesApi { } } - public async $getNodesISPRanking(groupBy: string, showTor: boolean) { + public async $getNodesISPRanking() { try { - const orderBy = groupBy === 'capacity' ? `CAST(SUM(capacity) as INT)` : `COUNT(DISTINCT nodes.public_key)`; - - // Clearnet - let query = `SELECT GROUP_CONCAT(DISTINCT(nodes.as_number)) as ispId, geo_names.names as names, - COUNT(DISTINCT nodes.public_key) as nodesCount, CAST(SUM(capacity) as INT) as capacity - FROM nodes - JOIN geo_names ON geo_names.id = nodes.as_number - JOIN channels ON channels.node1_public_key = nodes.public_key OR channels.node2_public_key = nodes.public_key - GROUP BY geo_names.names - ORDER BY ${orderBy} DESC - `; - const [nodesCountPerAS]: any = await DB.query(query); + let query = ''; - let total = 0; - const nodesPerAs: any[] = []; + // List all channels and the two linked ISP + query = ` + SELECT short_id, capacity, + channels.node1_public_key AS node1PublicKey, isp1.names AS isp1, isp1.id as isp1ID, + channels.node2_public_key AS node2PublicKey, isp2.names AS isp2, isp2.id as isp2ID + FROM channels + JOIN nodes node1 ON node1.public_key = channels.node1_public_key + JOIN nodes node2 ON node2.public_key = channels.node2_public_key + JOIN geo_names isp1 ON isp1.id = node1.as_number + JOIN geo_names isp2 ON isp2.id = node2.as_number + WHERE channels.status = 1 + ORDER BY short_id DESC + `; + const [channelsIsp]: any = await DB.query(query); - for (const asGroup of nodesCountPerAS) { - if (groupBy === 'capacity') { - total += asGroup.capacity; - } else { - total += asGroup.nodesCount; + // Sum channels capacity and node count per ISP + const ispList = {}; + for (const channel of channelsIsp) { + const isp1 = JSON.parse(channel.isp1); + const isp2 = JSON.parse(channel.isp2); + + if (!ispList[isp1]) { + ispList[isp1] = { + id: channel.isp1ID, + capacity: 0, + channels: 0, + nodes: {}, + }; } + if (!ispList[isp2]) { + ispList[isp2] = { + id: channel.isp2ID, + capacity: 0, + channels: 0, + nodes: {}, + }; + } + + ispList[isp1].capacity += channel.capacity; + ispList[isp1].channels += 1; + ispList[isp1].nodes[channel.node1PublicKey] = true; + ispList[isp2].capacity += channel.capacity; + ispList[isp2].channels += 1; + ispList[isp2].nodes[channel.node2PublicKey] = true; } - // Tor - if (showTor) { - query = `SELECT COUNT(DISTINCT nodes.public_key) as nodesCount, CAST(SUM(capacity) as INT) as capacity - FROM nodes - JOIN channels ON channels.node1_public_key = nodes.public_key OR channels.node2_public_key = nodes.public_key - ORDER BY ${orderBy} DESC - `; - const [nodesCountTor]: any = await DB.query(query); - - total += groupBy === 'capacity' ? nodesCountTor[0].capacity : nodesCountTor[0].nodesCount; - nodesPerAs.push({ - ispId: null, - name: 'Tor', - count: nodesCountTor[0].nodesCount, - share: Math.floor((groupBy === 'capacity' ? nodesCountTor[0].capacity : nodesCountTor[0].nodesCount) / total * 10000) / 100, - capacity: nodesCountTor[0].capacity, - }); + const ispRanking: any[] = []; + for (const isp of Object.keys(ispList)) { + ispRanking.push([ + ispList[isp].id, + isp, + ispList[isp].capacity, + ispList[isp].channels, + Object.keys(ispList[isp].nodes).length, + ]); } - for (const as of nodesCountPerAS) { - nodesPerAs.push({ - ispId: as.ispId, - name: JSON.parse(as.names), - count: as.nodesCount, - share: Math.floor((groupBy === 'capacity' ? as.capacity : as.nodesCount) / total * 10000) / 100, - capacity: as.capacity, - }); - } + // Total active channels capacity + query = `SELECT SUM(capacity) AS capacity FROM channels WHERE status = 1`; + const [totalCapacity]: any = await DB.query(query); - return nodesPerAs; + // Get the total capacity of all channels which have at least one node on clearnet + query = ` + SELECT SUM(capacity) as capacity + FROM ( + SELECT capacity, GROUP_CONCAT(socket1.type, socket2.type) as networks + FROM channels + JOIN nodes_sockets socket1 ON node1_public_key = socket1.public_key + JOIN nodes_sockets socket2 ON node2_public_key = socket2.public_key + AND channels.status = 1 + GROUP BY short_id + ) channels_tmp + WHERE channels_tmp.networks LIKE '%ipv%' + `; + const [clearnetCapacity]: any = await DB.query(query); + + // Get the total capacity of all channels which have both nodes on Tor + query = ` + SELECT SUM(capacity) as capacity + FROM ( + SELECT capacity, GROUP_CONCAT(socket1.type, socket2.type) as networks + FROM channels + JOIN nodes_sockets socket1 ON node1_public_key = socket1.public_key + JOIN nodes_sockets socket2 ON node2_public_key = socket2.public_key + AND channels.status = 1 + GROUP BY short_id + ) channels_tmp + WHERE channels_tmp.networks NOT LIKE '%ipv%' AND + channels_tmp.networks NOT LIKE '%dns%' AND + channels_tmp.networks NOT LIKE '%websocket%' + `; + const [torCapacity]: any = await DB.query(query); + + const clearnetCapacityValue = parseInt(clearnetCapacity[0].capacity, 10); + const torCapacityValue = parseInt(torCapacity[0].capacity, 10); + const unknownCapacityValue = parseInt(totalCapacity[0].capacity) - clearnetCapacityValue - torCapacityValue; + + return { + clearnetCapacity: clearnetCapacityValue, + torCapacity: torCapacityValue, + unknownCapacity: unknownCapacityValue, + ispRanking: ispRanking, + }; } catch (e) { - logger.err(`Cannot get nodes grouped by AS. Reason: ${e instanceof Error ? e.message : e}`); + logger.err(`Cannot get LN ISP ranking. Reason: ${e instanceof Error ? e.message : e}`); throw e; } } diff --git a/backend/src/api/explorer/nodes.routes.ts b/backend/src/api/explorer/nodes.routes.ts index 5e0f95acb..a07001c8d 100644 --- a/backend/src/api/explorer/nodes.routes.ts +++ b/backend/src/api/explorer/nodes.routes.ts @@ -71,15 +71,7 @@ class NodesRoutes { private async $getISPRanking(req: Request, res: Response): Promise { try { - const groupBy = req.query.groupBy as string; - const showTor = req.query.showTor as string === 'true' ? true : false; - - if (!['capacity', 'node-count'].includes(groupBy)) { - res.status(400).send(`groupBy must be one of 'capacity' or 'node-count'`); - return; - } - - const nodesPerAs = await nodesApi.$getNodesISPRanking(groupBy, showTor); + const nodesPerAs = await nodesApi.$getNodesISPRanking(); res.header('Pragma', 'public'); res.header('Cache-control', 'public'); diff --git a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html index 01be4f036..25773a06e 100644 --- a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html +++ b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -3,21 +3,24 @@
-
Tagged ISPs
-

- {{ stats.taggedISP }} +

Clearnet capacity
+

+

-
Tagged nodes
-

- {{ stats.taggedNodeCount }} +

Unknown capacity
+

+

-
Tagged capacity
-

- +

Tor capacity
+

+

@@ -25,13 +28,13 @@
- Lightning nodes per ISP + Top 100 ISP hosting LN nodes
- (Tor nodes excluded) + (Tor nodes excluded)
@@ -44,9 +47,8 @@
-
- - +
+
@@ -59,16 +61,15 @@ - - - + + + - - - + + +
Capacity
{{ asEntry.rank }}
{{ isp[5] }} - {{ asEntry.name }} - {{ asEntry.name }} + {{ isp[1] }} {{ asEntry.count }}{{ isp[4] }}
diff --git a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.scss b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.scss index 874d901b2..c6897cda9 100644 --- a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.scss +++ b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.scss @@ -149,7 +149,8 @@ } .name { - width: 25%; + width: 35%; + max-width: 300px; @media (max-width: 576px) { width: 70%; max-width: 150px; @@ -159,14 +160,14 @@ } .share { - width: 20%; + width: 15%; @media (max-width: 576px) { display: none } } .nodes { - width: 20%; + width: 15%; @media (max-width: 576px) { width: 10%; } diff --git a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts index cd8a72884..116c3215c 100644 --- a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts +++ b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -26,14 +26,15 @@ export class NodesPerISPChartComponent implements OnInit { renderer: 'svg', }; timespan = ''; + sortBy = 'capacity'; + showUnknown = false; chartInstance = undefined; @HostBinding('attr.dir') dir = 'ltr'; nodesPerAsObservable$: Observable; - showTorObservable$: Observable; - groupBySubject = new Subject(); - showTorSubject = new Subject(); + sortBySubject = new Subject(); + showUnknownSubject = new Subject(); constructor( private apiService: ApiService, @@ -48,32 +49,49 @@ export class NodesPerISPChartComponent implements OnInit { ngOnInit(): void { this.seoService.setTitle($localize`Lightning nodes per ISP`); - this.showTorObservable$ = this.showTorSubject.asObservable(); - this.nodesPerAsObservable$ = combineLatest([ - this.groupBySubject.pipe(startWith(false)), - this.showTorSubject.pipe(startWith(false)), + this.sortBySubject.pipe(startWith(true)), ]) .pipe( switchMap((selectedFilters) => { - return this.apiService.getNodesPerAs( - selectedFilters[0] ? 'capacity' : 'node-count', - selectedFilters[1] // Show Tor nodes - ) + this.sortBy = selectedFilters[0] ? 'capacity' : 'node-count'; + return this.apiService.getNodesPerIsp() .pipe( - tap(data => { + tap(() => { this.isLoading = false; - this.prepareChartOptions(data); }), map(data => { - for (let i = 0; i < data.length; ++i) { - data[i].rank = i + 1; + let nodeCount = 0; + let totalCapacity = 0; + + for (let i = 0; i < data.ispRanking.length; ++i) { + nodeCount += data.ispRanking[i][4]; + totalCapacity += data.ispRanking[i][2]; + data.ispRanking[i][5] = i; } + for (let i = 0; i < data.ispRanking.length; ++i) { + data.ispRanking[i][6] = Math.round(data.ispRanking[i][4] / nodeCount * 10000) / 100; + data.ispRanking[i][7] = Math.round(data.ispRanking[i][2] / totalCapacity * 10000) / 100; + } + + if (selectedFilters[0] === true) { + data.ispRanking.sort((a, b) => b[7] - a[7]); + } else { + data.ispRanking.sort((a, b) => b[6] - a[6]); + } + + for (let i = 0; i < data.ispRanking.length; ++i) { + data.ispRanking[i][5] = i + 1; + } + + this.prepareChartOptions(data.ispRanking); + return { - taggedISP: data.length, - taggedCapacity: data.reduce((partialSum, isp) => partialSum + isp.capacity, 0), - taggedNodeCount: data.reduce((partialSum, isp) => partialSum + isp.count, 0), - data: data.slice(0, 100), + taggedISP: data.ispRanking.length, + clearnetCapacity: data.clearnetCapacity, + unknownCapacity: data.unknownCapacity, + torCapacity: data.torCapacity, + ispRanking: data.ispRanking.slice(0, 100), }; }) ); @@ -82,22 +100,22 @@ export class NodesPerISPChartComponent implements OnInit { ); if (this.widget) { - this.showTorSubject.next(false); - this.groupBySubject.next(false); + this.sortBySubject.next(false); } } - generateChartSerieData(as): PieSeriesOption[] { + generateChartSerieData(ispRanking): PieSeriesOption[] { let shareThreshold = 0.5; if (this.widget && isMobile() || isMobile()) { shareThreshold = 1; } else if (this.widget) { shareThreshold = 0.75; } - + const data: object[] = []; let totalShareOther = 0; - let totalNodeOther = 0; + let nodeCountOther = 0; + let capacityOther = 0; let edgeDistance: string | number = '10%'; if (isMobile() && this.widget) { @@ -106,18 +124,19 @@ export class NodesPerISPChartComponent implements OnInit { edgeDistance = 10; } - as.forEach((as) => { - if (as.share < shareThreshold) { - totalShareOther += as.share; - totalNodeOther += as.count; + ispRanking.forEach((isp) => { + if ((this.sortBy === 'capacity' ? isp[7] : isp[6]) < shareThreshold) { + totalShareOther += this.sortBy === 'capacity' ? isp[7] : isp[6]; + nodeCountOther += isp[4]; + capacityOther += isp[2]; return; } data.push({ itemStyle: { - color: as.ispId === null ? '#7D4698' : undefined, + color: isp[0] === null ? '#7D4698' : undefined, }, - value: as.share, - name: as.name + (isMobile() || this.widget ? `` : ` (${as.share}%)`), + value: this.sortBy === 'capacity' ? isp[7] : isp[6], + name: isp[1].replace('&', '') + (isMobile() || this.widget ? `` : ` (${this.sortBy === 'capacity' ? isp[7] : isp[6]}%)`), label: { overflow: 'truncate', width: isMobile() ? 75 : this.widget ? 125 : 250, @@ -135,13 +154,13 @@ export class NodesPerISPChartComponent implements OnInit { }, borderColor: '#000', formatter: () => { - return `${as.name} (${as.share}%)
` + - $localize`${as.count.toString()} nodes
` + - $localize`${this.amountShortenerPipe.transform(as.capacity / 100000000, 2)} BTC capacity` + return `${isp[1]} (${isp[6]}%)
` + + $localize`${isp[4].toString()} nodes
` + + $localize`${this.amountShortenerPipe.transform(isp[2] / 100000000, 2)} BTC` ; } }, - data: as.ispId, + data: isp[0], } as PieSeriesOption); }); @@ -167,8 +186,9 @@ export class NodesPerISPChartComponent implements OnInit { }, borderColor: '#000', formatter: () => { - return `${'Other'} (${totalShareOther.toFixed(2)}%)
` + - totalNodeOther.toString() + ` nodes`; + return `Other (${totalShareOther.toFixed(2)}%)
` + + $localize`${nodeCountOther.toString()} nodes
` + + $localize`${this.amountShortenerPipe.transform(capacityOther / 100000000, 2)} BTC`; } }, data: 9999 as any, @@ -177,7 +197,7 @@ export class NodesPerISPChartComponent implements OnInit { return data; } - prepareChartOptions(as): void { + prepareChartOptions(ispRanking): void { let pieSize = ['20%', '80%']; // Desktop if (isMobile() && !this.widget) { pieSize = ['15%', '60%']; @@ -194,11 +214,11 @@ export class NodesPerISPChartComponent implements OnInit { series: [ { zlevel: 0, - minShowLabelAngle: 1.8, + minShowLabelAngle: 0.9, name: 'Lightning nodes', type: 'pie', radius: pieSize, - data: this.generateChartSerieData(as), + data: this.generateChartSerieData(ispRanking), labelLine: { lineStyle: { width: 2, @@ -259,16 +279,8 @@ export class NodesPerISPChartComponent implements OnInit { this.chartInstance.setOption(this.chartOptions); } - onTorToggleStatusChanged(e): void { - this.showTorSubject.next(e); - } - onGroupToggleStatusChanged(e): void { - this.groupBySubject.next(e); - } - - isEllipsisActive(e) { - return (e.offsetWidth < e.scrollWidth); + this.sortBySubject.next(e); } } diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts index 844451574..f7f4cb5b6 100644 --- a/frontend/src/app/services/api.service.ts +++ b/frontend/src/app/services/api.service.ts @@ -255,9 +255,8 @@ export class ApiService { return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/v1/lightning/search', { params }); } - getNodesPerAs(groupBy: 'capacity' | 'node-count', showTorNodes: boolean): Observable { - return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/v1/lightning/nodes/isp-ranking' - + `?groupBy=${groupBy}&showTor=${showTorNodes}`); + getNodesPerIsp(): Observable { + return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/v1/lightning/nodes/isp-ranking'); } getNodeForCountry$(country: string): Observable { diff --git a/frontend/src/app/shared/components/toggle/toggle.component.html b/frontend/src/app/shared/components/toggle/toggle.component.html index dac33c9d8..ea67f5416 100644 --- a/frontend/src/app/shared/components/toggle/toggle.component.html +++ b/frontend/src/app/shared/components/toggle/toggle.component.html @@ -1,7 +1,7 @@
{{ textLeft }}   {{ textRight }} diff --git a/frontend/src/app/shared/components/toggle/toggle.component.ts b/frontend/src/app/shared/components/toggle/toggle.component.ts index 4bd31ffbd..f389989d9 100644 --- a/frontend/src/app/shared/components/toggle/toggle.component.ts +++ b/frontend/src/app/shared/components/toggle/toggle.component.ts @@ -10,6 +10,7 @@ export class ToggleComponent implements AfterViewInit { @Output() toggleStatusChanged = new EventEmitter(); @Input() textLeft: string; @Input() textRight: string; + @Input() checked: boolean = false; ngAfterViewInit(): void { this.toggleStatusChanged.emit(false);