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

Use country iso code in ln nodes per country page url

Browse Source
This commit is contained in:
nymkappa 2022-07-17 09:53:02 +02:00
parent 0902015264
commit 93e93d44f4
No known key found for this signature in database
GPG Key ID: E155910B16E8BD04
4 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/api/database-migration.ts
View File

@ -4,7 +4,7 @@ import logger from '../logger';
import { Common } from './common'; import { Common } from './common';
class DatabaseMigration { class DatabaseMigration {
private static currentVersion = 32; private static currentVersion = 33;
private queryTimeout = 120000; private queryTimeout = 120000;
private statisticsAddedIndexed = false; private statisticsAddedIndexed = false;
private uniqueLogs: string[] = []; private uniqueLogs: string[] = [];
@ -302,6 +302,10 @@ class DatabaseMigration {
if (databaseSchemaVersion < 32 && isBitcoin == true) { if (databaseSchemaVersion < 32 && isBitcoin == true) {
await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD `template` JSON DEFAULT "[]"'); await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD `template` JSON DEFAULT "[]"');
} }
if (databaseSchemaVersion < 33 && isBitcoin == true) {
await this.$executeQuery('ALTER TABLE `geo_names` CHANGE `type` `type` enum("city","country","division","continent","as_organization", "country_iso_code") NOT NULL');
}
} }
/** /**

14
backend/src/api/explorer/nodes.api.ts
View File

@ -125,10 +125,10 @@ class NodesApi {
} }
} }
public async $getNodesPerCountry(country: string) { public async $getNodesPerCountry(countryId: string) {
try { try {
const query = ` const query = `
SELECT node_stats.public_key, node_stats.capacity, node_stats.channels, nodes.alias, SELECT DISTINCT node_stats.public_key, node_stats.capacity, node_stats.channels, nodes.alias,
UNIX_TIMESTAMP(nodes.first_seen) as first_seen, UNIX_TIMESTAMP(nodes.updated_at) as updated_at, UNIX_TIMESTAMP(nodes.first_seen) as first_seen, UNIX_TIMESTAMP(nodes.updated_at) as updated_at,
geo_names_city.names as city geo_names_city.names as city
FROM node_stats FROM node_stats
@ -137,20 +137,20 @@ class NodesApi {
FROM node_stats FROM node_stats
GROUP BY public_key GROUP BY public_key
) as b ON b.public_key = node_stats.public_key AND b.last_added = node_stats.added ) as b ON b.public_key = node_stats.public_key AND b.last_added = node_stats.added
LEFT JOIN nodes ON nodes.public_key = node_stats.public_key JOIN nodes ON nodes.public_key = node_stats.public_key
LEFT JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id
LEFT JOIN geo_names geo_names_city ON geo_names_city.id = nodes.city_id LEFT JOIN geo_names geo_names_city ON geo_names_city.id = nodes.city_id
WHERE LOWER(JSON_EXTRACT(geo_names_country.names, '$.en')) = ? WHERE geo_names_country.id = ?
ORDER BY capacity DESC ORDER BY capacity DESC
`; `;
const [rows]: any = await DB.query(query, [`"${country}"`]); const [rows]: any = await DB.query(query, [countryId]);
for (let i = 0; i < rows.length; ++i) { for (let i = 0; i < rows.length; ++i) {
rows[i].city = JSON.parse(rows[i].city); rows[i].city = JSON.parse(rows[i].city);
} }
return rows; return rows;
} catch (e) { } catch (e) {
logger.err(`Cannot get nodes for country ${country}. Reason: ${e instanceof Error ? e.message : e}`); logger.err(`Cannot get nodes for country id ${countryId}. Reason: ${e instanceof Error ? e.message : e}`);
throw e; throw e;
} }
} }

17
backend/src/api/explorer/nodes.routes.ts
View File

@ -75,20 +75,25 @@ class NodesRoutes {
private async $getNodesPerCountry(req: Request, res: Response) { private async $getNodesPerCountry(req: Request, res: Response) {
try { try {
const [countryName]: any[] = await DB.query(`SELECT names FROM geo_names WHERE LOWER(JSON_EXTRACT(geo_names.names, '$.en')) = ?`, const [country]: any[] = await DB.query(
[`"${req.params.country}"`]); `SELECT geo_names.id, geo_names_country.names as country_names
FROM geo_names
JOIN geo_names geo_names_country on geo_names.id = geo_names_country.id AND geo_names_country.type = 'country'
WHERE geo_names.type = 'country_iso_code' AND geo_names.names = ?`,
[req.params.country]
);
if (countryName.length === 0) { if (country.length === 0) {
res.status(404).send(`This country does not exists`); res.status(404).send(`This country does not exist or does not host any lightning nodes on clearnet`);
return; return;
} }
const nodes = await nodesApi.$getNodesPerCountry(req.params.country.toLowerCase()); const nodes = await nodesApi.$getNodesPerCountry(country[0].id);
res.header('Pragma', 'public'); res.header('Pragma', 'public');
res.header('Cache-control', 'public'); res.header('Cache-control', 'public');
res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString()); res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
res.json({ res.json({
country: JSON.parse(countryName[0].names), country: JSON.parse(country[0].country_names),
nodes: nodes, nodes: nodes,
}); });
} catch (e) { } catch (e) {

7
backend/src/tasks/lightning/sync-tasks/node-locations.ts
View File

@ -39,6 +39,13 @@ export async function $lookupNodeLocation(): Promise<void> {
[city.country?.geoname_id, JSON.stringify(city.country?.names)]); [city.country?.geoname_id, JSON.stringify(city.country?.names)]);
} }
// Store Country ISO code
if (city.country?.iso_code) {
await DB.query(
`INSERT IGNORE INTO geo_names (id, type, names) VALUES (?, 'country_iso_code', ?)`,
[city.country?.geoname_id, city.country?.iso_code]);
}
// Store Division // Store Division
if (city.subdivisions && city.subdivisions[0]) { if (city.subdivisions && city.subdivisions[0]) {
await DB.query( await DB.query(