oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix some bugs

Browse source
This commit is contained in:
Beaudan 2019-08-05 14:03:12 +10:00
parent 43c2e9c953
commit 6140fef1f7
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
js/modules/loki_message_api.js
View file

@ -96,7 +96,9 @@ class LokiMessageAPI {
const timestamp = Date.now();
const nonce = await calcNonce(
messageEventData,
pubKey,
window.getEnvironment() === 'production'
? pubKey
: pubKey.substring(0, pubKey.length - 2),
data64,
timestamp,
ttl
@ -112,7 +114,7 @@ class LokiMessageAPI {
}
const params = {
pubKey: window.getEnvironment() === 'production' ? pubKey : pubKey.substring(0, pubKey.length - 2),
pubKey,
ttl: ttl.toString(),
nonce,
timestamp: timestamp.toString(),
@ -214,8 +216,22 @@ class LokiMessageAPI {
let successiveFailures = 0;
while (successiveFailures < MAX_ACCEPTABLE_FAILURES) {
await sleepFor(successiveFailures * 500);
let result;
try {
const result = await rpc(`https://${address}`, port, 'store', params);
if (window.getEnvironment() === 'production') {
result = await rpc(`https://${address}`, port, 'store', params);
} else {
const testnetParams = {
...params,
pubKey: params.pubKey.substring(0, params.pubKey.length - 2),
};
result = await rpc(
`https://${address}`,
port,
'store',
testnetParams
);
}
// Make sure we aren't doing too much PoW
const currentDifficulty = window.storage.get('PoWDifficulty', null);
@ -323,8 +339,12 @@ class LokiMessageAPI {
}
async retrieveNextMessages(nodeUrl, nodeData) {
let { ourKey } = this;
if (window.getEnvironment() !== 'production') {
ourKey = ourKey.substring(0, ourKey.length - 2);
}
const params = {
pubKey: this.ourKey,
pubKey: ourKey,
lastHash: nodeData.lastHash || '',
};
const options = {

5
js/modules/loki_snode_api.js
View file

@ -190,7 +190,10 @@ class LokiSnodeAPI {
const { ip, port } = await this.getRandomSnodeAddress();
try {
const result = await rpc(`https://${ip}`, port, 'get_snodes_for_pubkey', {
pubKey,
pubKey:
window.getEnvironment() === 'production'
? pubKey
: pubKey.substring(0, pubKey.length - 2),
});
const snodes = result.snodes.filter(snode => snode.ip !== '0.0.0.0');
return snodes;