pull/296/head
Beaudan 6 years ago
parent b6b0248e9d
commit d5546b9473

@ -86,7 +86,7 @@ const retrieveNextMessages = async (nodeUrl, nodeData, ourKey) => {
options
);
return result.messages || [];
}
};
class LokiMessageAPI {
constructor() {
@ -172,7 +172,11 @@ class LokiMessageAPI {
while (!_.isEmpty(this.sendingSwarmNodes[params.timestamp])) {
const snode = this.sendingSwarmNodes[params.timestamp].shift();
// TODO: Revert back to using snode address instead of IP
const successfulSend = await this.sendToNode(snode.ip, snode.port, params);
const successfulSend = await this.sendToNode(
snode.ip,
snode.port,
params
);
if (successfulSend) {
return true;
}
@ -185,12 +189,7 @@ class LokiMessageAPI {
while (successiveFailures < 3) {
await sleepFor(successiveFailures * 500);
try {
const result = await rpc(
`https://${address}`,
port,
'store',
params
);
const result = await rpc(`https://${address}`, port, 'store', params);
// Make sure we aren't doing too much PoW
const currentDifficulty = window.storage.get('PoWDifficulty', null);
@ -240,7 +239,11 @@ class LokiMessageAPI {
try {
// TODO: Revert back to using snode address instead of IP
let messages = await retrieveNextMessages(nodeData.ip, nodeData, ourKey);
let messages = await retrieveNextMessages(
nodeData.ip,
nodeData,
ourKey
);
successiveFailures = 0;
if (messages.length) {
const lastMessage = _.last(messages);

@ -102,7 +102,14 @@ const fetch = async (url, options = {}) => {
};
// Wrapper for a JSON RPC request
const rpc = (address, port, method, params, options = {}, seedRequest = false) => {
const rpc = (
address,
port,
method,
params,
options = {},
seedRequest = false
) => {
const headers = options.headers || {};
const portString = port ? `:${port}` : '';
const endpoint = seedRequest ? seedEndpointBase : endpointBase;
@ -128,7 +135,6 @@ const rpc = (address, port, method, params, options = {}, seedRequest = false) =
return fetch(url, fetchOptions);
};
module.exports = {
rpc,
};

@ -70,7 +70,9 @@ class LokiSnodeAPI {
if (this.randomSnodePool.length === 0) {
await this.initialiseRandomPool();
}
return this.randomSnodePool[Math.floor(Math.random() * this.randomSnodePool.length)];
return this.randomSnodePool[
Math.floor(Math.random() * this.randomSnodePool.length)
];
}
async initialiseRandomPool() {
@ -86,8 +88,7 @@ class LokiSnodeAPI {
this.randomSnodePool = snodes.map(snode => ({
address: snode.public_ip,
port: snode.storage_port,
})
);
}));
}
async unreachableNode(pubKey, nodeUrl) {
@ -139,7 +140,9 @@ class LokiSnodeAPI {
async updateOurSwarmNodes(newNodes) {
this.ourSwarmNodes = {};
const ps = newNodes.map(async snode => {
const lastHash = await window.Signal.Data.getLastHashBySnode(snode.address);
const lastHash = await window.Signal.Data.getLastHashBySnode(
snode.address
);
this.ourSwarmNodes[snode.address] = {
lastHash,
port: snode.port,

Loading…
Cancel
Save