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

more text response fixes, better snode not ready detection

Browse source
This commit is contained in:
Ryan Tharp 2020-02-06 16:26:30 -08:00
parent df1d032d96
commit 4d027909c6
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
js/modules/loki_app_dot_net_api.js
View file

@ -317,7 +317,7 @@ class LokiAppDotNetServerAPI {
// activate token
async submitToken(token) {
const options = {
const fetchOptions = {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@ -331,7 +331,8 @@ class LokiAppDotNetServerAPI {
try {
const res = await this.proxyFetch(
`${this.baseServerUrl}/loki/v1/submit_challenge`,
options
fetchOptions,
{ textResponse: true }
);
return res.ok;
} catch (e) {
@ -340,7 +341,7 @@ class LokiAppDotNetServerAPI {
}
}
async proxyFetch(urlObj, fetchOptions = { method: 'GET' }) {
async proxyFetch(urlObj, fetchOptions = { method: 'GET' }, options = {}) {
if (
window.lokiFeatureFlags.useSnodeProxy &&
(this.baseServerUrl === 'https://file-dev.lokinet.org' ||
@ -364,10 +365,10 @@ class LokiAppDotNetServerAPI {
json: () => response,
};
}
return nodeFetch(urlObj, fetchOptions);
return nodeFetch(urlObj, fetchOptions, options);
}
async _sendToProxy(endpoint, pFetchOptions) {
async _sendToProxy(endpoint, pFetchOptions, options = {}) {
const randSnode = await lokiSnodeAPI.getRandomSnodeAddress();
const url = `https://${randSnode.ip}:${randSnode.port}/file_proxy`;
@ -449,7 +450,7 @@ class LokiAppDotNetServerAPI {
const result = await nodeFetch(url, firstHopOptions);
const txtResponse = await result.text();
if (txtResponse === 'Service node is not ready: not in any swarm; \n') {
if (txtResponse.match(/^Service node is not ready: not in any swarm/i)) {
// mark snode bad
log.warn(`Marking random snode bad, internet address ${randSnode.ip}:${randSnode.port}`);
lokiSnodeAPI.markRandomNodeUnreachable(randSnode);
@ -476,12 +477,12 @@ class LokiAppDotNetServerAPI {
ivAndCiphertextResponse
);
const textDecoder = new TextDecoder();
const json = textDecoder.decode(decrypted);
const respStr = textDecoder.decode(decrypted);
// replace response
try {
response = JSON.parse(json);
response = options.textResponse ? respStr : JSON.parse(respStr);
} catch (e) {
log.warn(`_sendToProxy Could not parse inner JSON [${json}]`);
log.warn(`_sendToProxy Could not parse inner JSON [${respStr}]`);
}
} else {
log.warn(
@ -557,7 +558,8 @@ class LokiAppDotNetServerAPI {
.replace(`${this.baseServerUrl}/`, '');
({ response, txtResponse, result } = await this._sendToProxy(
endpointWithQS,
fetchOptions
fetchOptions,
options
));
} else {
// disable check for .loki