keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

move internal buildNewOnionPaths function into buildNewOnionPathsWorker per review

Browse Source
pull/1171/head
Ryan Tharp 5 years ago
parent db36067503
commit a905703cb4
1 changed files with 64 additions and 63 deletions
Show Stats Download Patch File Download Diff File

127
js/modules/loki_snode_api.js
Unescape Escape View File

@ -408,88 +408,89 @@ class LokiSnodeAPI {
}); });
} }
async buildNewOnionPaths() { async buildNewOnionPathsWorker() {
// Note: this function may be called concurrently const _ = window.Lodash;
return primitives.allowOnlyOneAtATime('buildNewOnionPaths', async () => { log.info('LokiSnodeAPI::buildNewOnionPaths - building new onion paths');
const _ = window.Lodash;
log.info('LokiSnodeAPI::buildNewOnionPaths - building new onion paths'); const allNodes = await this.getRandomSnodePool();
const allNodes = await this.getRandomSnodePool(); if (this.guardNodes.length === 0) {
// Not cached, load from DB
const nodes = await window.libloki.storage.getGuardNodes();
if (this.guardNodes.length === 0) { if (nodes.length === 0) {
// Not cached, load from DB log.warn(
const nodes = await window.libloki.storage.getGuardNodes(); 'LokiSnodeAPI::buildNewOnionPaths - no guard nodes in DB. Will be selecting new guards nodes...'
);
} else {
// We only store the nodes' keys, need to find full entries:
const edKeys = nodes.map(x => x.ed25519PubKey);
this.guardNodes = allNodes.filter(
x => edKeys.indexOf(x.pubkey_ed25519) !== -1
);
if (nodes.length === 0) { if (this.guardNodes.length < edKeys.length) {
log.warn( log.warn(
'LokiSnodeAPI::buildNewOnionPaths - no guard nodes in DB. Will be selecting new guards nodes...' `LokiSnodeAPI::buildNewOnionPaths - could not find some guard nodes: ${
); this.guardNodes.length
} else { }/${edKeys.length} left`
// We only store the nodes' keys, need to find full entries:
const edKeys = nodes.map(x => x.ed25519PubKey);
this.guardNodes = allNodes.filter(
x => edKeys.indexOf(x.pubkey_ed25519) !== -1
); );
if (this.guardNodes.length < edKeys.length) {
log.warn(
`LokiSnodeAPI::buildNewOnionPaths - could not find some guard nodes: ${
this.guardNodes.length
}/${edKeys.length} left`
);
}
} }
}
// If guard nodes is still empty (the old nodes are now invalid), select new ones: // If guard nodes is still empty (the old nodes are now invalid), select new ones:
if (this.guardNodes.length < MIN_GUARD_COUNT) { if (this.guardNodes.length < MIN_GUARD_COUNT) {
// TODO: don't throw away potentially good guard nodes // TODO: don't throw away potentially good guard nodes
this.guardNodes = await this.selectGuardNodes(); this.guardNodes = await this.selectGuardNodes();
}
} }
}
// TODO: select one guard node and 2 other nodes randomly // TODO: select one guard node and 2 other nodes randomly
let otherNodes = _.difference(allNodes, this.guardNodes); let otherNodes = _.difference(allNodes, this.guardNodes);
if (otherNodes.length < 2) { if (otherNodes.length < 2) {
log.warn( log.warn(
'LokiSnodeAPI::buildNewOnionPaths - Too few nodes to build an onion path! Refreshing pool and retrying' 'LokiSnodeAPI::buildNewOnionPaths - Too few nodes to build an onion path! Refreshing pool and retrying'
); );
await this.refreshRandomPool(); await this.refreshRandomPool();
await this.buildNewOnionPaths(); await this.buildNewOnionPaths();
return; return;
} }
otherNodes = _.shuffle(otherNodes); otherNodes = _.shuffle(otherNodes);
const guards = _.shuffle(this.guardNodes); const guards = _.shuffle(this.guardNodes);
// Create path for every guard node: // Create path for every guard node:
const nodesNeededPerPaths = window.lokiFeatureFlags.onionRequestHops - 1; const nodesNeededPerPaths = window.lokiFeatureFlags.onionRequestHops - 1;
// Each path needs X (nodesNeededPerPaths) nodes in addition to the guard node: // Each path needs X (nodesNeededPerPaths) nodes in addition to the guard node:
const maxPath = Math.floor( const maxPath = Math.floor(
Math.min( Math.min(
guards.length, guards.length,
nodesNeededPerPaths nodesNeededPerPaths
? otherNodes.length / nodesNeededPerPaths ? otherNodes.length / nodesNeededPerPaths
: otherNodes.length : otherNodes.length
) )
); );
// TODO: might want to keep some of the existing paths // TODO: might want to keep some of the existing paths
this.onionPaths = []; this.onionPaths = [];
for (let i = 0; i < maxPath; i += 1) { for (let i = 0; i < maxPath; i += 1) {
const path = [guards[i]]; const path = [guards[i]];
for (let j = 0; j < nodesNeededPerPaths; j += 1) { for (let j = 0; j < nodesNeededPerPaths; j += 1) {
path.push(otherNodes[i * nodesNeededPerPaths + j]); path.push(otherNodes[i * nodesNeededPerPaths + j]);
}
this.onionPaths.push({ path, bad: false });
} }
this.onionPaths.push({ path, bad: false });
}
log.info(`Built ${this.onionPaths.length} onion paths`, this.onionPaths); log.info(`Built ${this.onionPaths.length} onion paths`, this.onionPaths);
}); }
async buildNewOnionPaths() {
// this function may be called concurrently make sure we only have one inflight
return primitives.allowOnlyOneAtATime('buildNewOnionPaths', this.buildNewOnionPathsWorker);
} }
async getRandomSnodeAddress() { async getRandomSnodeAddress() {

Write Preview
Loading…
Cancel
Save