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

improve logging

Browse source
This commit is contained in:
Ryan Tharp 2020-02-05 01:08:24 -08:00
parent 3bba0571a0
commit 99afd33fb4
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
js/modules/loki_rpc.js
View file

@ -13,16 +13,18 @@ const LOKI_EPHEMKEY_HEADER = 'X-Loki-EphemKey';
const endpointBase = '/storage_rpc/v1';
const decryptResponse = async (response, address) => {
let plaintext = false;
try {
const ciphertext = await response.text();
const plaintext = await libloki.crypto.snodeCipher.decrypt(
address,
ciphertext
);
plaintext = await libloki.crypto.snodeCipher.decrypt(address, ciphertext);
const result = plaintext === '' ? {} : JSON.parse(plaintext);
return result;
} catch (e) {
log.warn(`Could not decrypt response from ${address}`, e);
log.warn(
`Could not decrypt response [${plaintext}] from [${address}],`,
e.code,
e.message
);
}
return {};
};
@ -80,11 +82,21 @@ const sendToProxy = async (options = {}, targetNode) => {
const textDecoder = new TextDecoder();
const plaintext = textDecoder.decode(plaintextBuffer);
const jsonRes = JSON.parse(plaintext);
jsonRes.json = () => JSON.parse(jsonRes.body);
return jsonRes;
try {
const jsonRes = JSON.parse(plaintext);
// emulate nodeFetch response...
jsonRes.json = () => JSON.parse(jsonRes.body);
return jsonRes;
} catch (e) {
log.error(
'lokiRpc sendToProxy error',
e.code,
e.message,
'json',
plaintext
);
}
return false;
};
// A small wrapper around node-fetch which deserializes response