fix getSwarmNodes exception handler, lint

pull/734/head
Ryan Tharp 5 years ago
parent 9e10d11e9d
commit 1a785a2435

@ -4,7 +4,7 @@
const is = require('@sindresorhus/is'); const is = require('@sindresorhus/is');
const dns = require('dns'); const dns = require('dns');
const process = require('process'); const process = require('process');
const { loki_rpc } = require('./loki_rpc'); const { lokiRPC } = require('./loki_rpc');
const natUpnp = require('nat-upnp'); const natUpnp = require('nat-upnp');
const resolve4 = url => const resolve4 = url =>
@ -103,8 +103,7 @@ class LokiSnodeAPI {
1 1
)[0]; )[0];
try { try {
const result = await lokiRPC(
const result = await loki_rpc(
`http://${seedNode.ip}`, `http://${seedNode.ip}`,
seedNode.port, seedNode.port,
'get_n_service_nodes', 'get_n_service_nodes',
@ -198,16 +197,24 @@ class LokiSnodeAPI {
// TODO: Hit multiple random nodes and merge lists? // TODO: Hit multiple random nodes and merge lists?
const snode = await this.getRandomSnodeAddress(); const snode = await this.getRandomSnodeAddress();
try { try {
const result = await lokiRPC(
const result = await loki_rpc(`https://${snode.ip}`, snode.port, 'get_snodes_for_pubkey', { `https://${snode.ip}`,
snode.port,
'get_snodes_for_pubkey',
{
pubKey, pubKey,
}, {}, '/storage_rpc/v1', snode); },
const snodes = result.snodes.filter(snode => snode.ip !== '0.0.0.0'); {},
'/storage_rpc/v1',
snode
);
const snodes = result.snodes.filter(tSnode => tSnode.ip !== '0.0.0.0');
return snodes; return snodes;
} catch (e) { } catch (e) {
//
this.randomSnodePool = _.without( this.randomSnodePool = _.without(
this.randomSnodePool, this.randomSnodePool,
_.find(this.randomSnodePool, { ip }) _.find(this.randomSnodePool, { ip: snode.ip })
); );
return this.getSwarmNodes(pubKey); return this.getSwarmNodes(pubKey);
} }

Loading…
Cancel
Save