From 241e64b94b6796c70b9d9af535101b8e6a6cfda0 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Wed, 18 Mar 2020 17:17:46 -0700 Subject: [PATCH] lint --- js/modules/loki_rpc.js | 38 +++++++++++++++++++-------- js/modules/loki_snode_api.js | 51 ++++++++++++++++++++++++------------ 2 files changed, 61 insertions(+), 28 deletions(-) diff --git a/js/modules/loki_rpc.js b/js/modules/loki_rpc.js index c7a709337..b27bca1a0 100644 --- a/js/modules/loki_rpc.js +++ b/js/modules/loki_rpc.js @@ -29,7 +29,7 @@ const decryptResponse = async (response, address) => { return {}; }; -const timeoutDelay = (ms) => new Promise(resolve => setTimeout(resolve, ms)); +const timeoutDelay = ms => new Promise(resolve => setTimeout(resolve, ms)); const sendToProxy = async (options = {}, targetNode, retryNumber = 0) => { const randSnode = await lokiSnodeAPI.getRandomSnodeAddress(); @@ -73,10 +73,14 @@ const sendToProxy = async (options = {}, targetNode, retryNumber = 0) => { // remove // but which the proxy or the target... // we got a ton of randomPool nodes, let's just not worry about this one - const randomPoolRemainingCount = lokiSnodeAPI.markRandomNodeUnreachable(randSnode); + const randomPoolRemainingCount = lokiSnodeAPI.markRandomNodeUnreachable( + randSnode + ); log.warn( `lokiRpc sendToProxy`, - `snode ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${targetNode.port}`, + `snode ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${ + targetNode.port + }`, `snode is decom or dereg: `, ciphertext, // `marking random snode bad ${randomPoolRemainingCount} remaining` @@ -95,10 +99,14 @@ const sendToProxy = async (options = {}, targetNode, retryNumber = 0) => { // but the target node // we got a ton of randomPool nodes, let's just not worry about this one - const randomPoolRemainingCount = lokiSnodeAPI.markRandomNodeUnreachable(randSnode); + const randomPoolRemainingCount = lokiSnodeAPI.markRandomNodeUnreachable( + randSnode + ); log.warn( `lokiRpc sendToProxy`, - `snode ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${targetNode.port}`, + `snode ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${ + targetNode.port + }`, `code ${response.status} error`, ciphertext, // `marking random snode bad ${randomPoolRemainingCount} remaining` @@ -137,7 +145,9 @@ const sendToProxy = async (options = {}, targetNode, retryNumber = 0) => { log.warn( 'lokiRpc sendToProxy fetch non-200 statusCode', response.status, - `from snode ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${targetNode.port}` + `from snode ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${ + targetNode.port + }` ); return false; } @@ -171,7 +181,9 @@ const sendToProxy = async (options = {}, targetNode, retryNumber = 0) => { 'lokiRpc sendToProxy decode error', e.code, e.message, - `from ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${targetNode.port} ciphertext:`, + `from ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${ + targetNode.port + } ciphertext:`, ciphertext ); if (ciphertextBuffer) { @@ -198,9 +210,13 @@ const sendToProxy = async (options = {}, targetNode, retryNumber = 0) => { return false; }; if (retryNumber) { - log.info(`lokiRpc sendToProxy request succeeded,`, - `snode ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${targetNode.port}`, - `on retry #${retryNumber}`); + log.info( + `lokiRpc sendToProxy request succeeded,`, + `snode ${randSnode.ip}:${randSnode.port} to ${targetNode.ip}:${ + targetNode.port + }`, + `on retry #${retryNumber}` + ); } return jsonRes; } catch (e) { @@ -259,7 +275,7 @@ const lokiFetch = async (url, options = {}, targetNode = null) => { fetchOptions.agent = snodeHttpsAgent; process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; } else { - log.info ('lokiRpc http communication', url); + log.info('lokiRpc http communication', url); } const response = await nodeFetch(url, fetchOptions); // restore TLS checking diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js index 450cc03b7..9f3efcb76 100644 --- a/js/modules/loki_snode_api.js +++ b/js/modules/loki_snode_api.js @@ -76,9 +76,17 @@ class LokiSnodeAPI { pubkey_x25519: snode.pubkey_x25519, pubkey_ed25519: snode.pubkey_ed25519, })); - log.info('loki_snodes: Refreshed random snode pool with', this.randomSnodePool.length, 'snodes'); + log.info( + 'loki_snodes: Refreshed random snode pool with', + this.randomSnodePool.length, + 'snodes' + ); } catch (e) { - log.warn('loki_snodes: initialiseRandomPool error', e.code, e.message); + log.warn( + 'loki_snodes: initialiseRandomPool error', + e.code, + e.message + ); if (consecutiveErrors < 3) { // retry after a possible delay setTimeout(() => { @@ -100,7 +108,7 @@ class LokiSnodeAPI { // clear lock this.initialiseRandomPoolPromise = null; resolve(); - }) + }); } await this.initialiseRandomPoolPromise; } @@ -109,23 +117,30 @@ class LokiSnodeAPI { async unreachableNode(pubKey, unreachableNode) { const conversation = ConversationController.get(pubKey); const swarmNodes = [...conversation.get('swarmNodes')]; - if (typeof(unreachableNode) === 'string') { - log.warn('loki_snodes::unreachableNode: String passed as unreachableNode to unreachableNode'); + if (typeof unreachableNode === 'string') { + log.warn( + 'loki_snodes::unreachableNode: String passed as unreachableNode to unreachableNode' + ); return swarmNodes; } - let found = false - const filteredNodes = swarmNodes.filter( - node => { - // keep all but thisNode - const thisNode = (node.address === unreachableNode.address && node.ip === unreachableNode.ip && node.port === unreachableNode.port) - if (thisNode) { - found = true - } - return !thisNode + let found = false; + const filteredNodes = swarmNodes.filter(node => { + // keep all but thisNode + const thisNode = + node.address === unreachableNode.address && + node.ip === unreachableNode.ip && + node.port === unreachableNode.port; + if (thisNode) { + found = true; } - ); + return !thisNode; + }); if (!found) { - log.warn(`loki_snodes::unreachableNode snode ${unreachableNode.ip}:${unreachableNode.port} has already been marked as bad`); + log.warn( + `loki_snodes::unreachableNode snode ${unreachableNode.ip}:${ + unreachableNode.port + } has already been marked as bad` + ); } await conversation.updateSwarmNodes(filteredNodes); return filteredNodes; @@ -232,7 +247,9 @@ class LokiSnodeAPI { 'loki_snodes: getSnodesForPubkey error', e.code, e.message, - `for ${snode.ip}:${snode.port}. ${randomPoolRemainingCount} snodes remaining in randomPool` + `for ${snode.ip}:${ + snode.port + }. ${randomPoolRemainingCount} snodes remaining in randomPool` ); return []; }