use .ok field on serverRequest to check for request success

js/expire.js

@@ -101,7 +101,7 @@
       const res = await window.tokenlessFileServerAdnAPI.serverRequest(
         'loki/v1/time'
       );
-      if (res.statusCode === 200) {
+      if (res.ok) {
         timestamp = res.response;
       }
     } catch (e) {

js/modules/loki_app_dot_net_api.js

@@ -243,6 +243,7 @@ const serverRequest = async (endpoint, options = {}) => {
     );
     return {
       err: e,
+      ok: false,
     };
   }
 
@@ -313,6 +314,7 @@ const serverRequest = async (endpoint, options = {}) => {
 
     return {
       err: e,
+      ok: false,
     };
   }
 
@@ -320,6 +322,7 @@ const serverRequest = async (endpoint, options = {}) => {
     return {
       err: 'noResult',
       response,
+      ok: false,
     };
   }
 
@@ -336,11 +339,13 @@ const serverRequest = async (endpoint, options = {}) => {
       err: 'statusCode',
       statusCode: result.status,
       response,
+      ok: false,
     };
   }
   return {
     statusCode: result.status,
     response,
+    ok: result.status >= 200 && result.status <= 299,
   };
 };
 
@@ -692,7 +697,7 @@ class LokiAppDotNetServerAPI {
       }
       return null;
     }
-    if (res.statusCode !== 200) {
+    if (!res.ok) {
       log.error('requestToken request failed');
       return null;
     }
@@ -712,7 +717,7 @@ class LokiAppDotNetServerAPI {
         },
         noJson: true,
       });
-      return res.statusCode === 200;
+      return res.ok;
     } catch (e) {
       log.error('submitToken serverRequest failure', e.code, e.message);
       return false;
@@ -937,12 +942,9 @@ class LokiAppDotNetServerAPI {
       rawBody: data,
     };
 
-    const { statusCode, response } = await this.serverRequest(
+    const { response, ok } = await this.serverRequest(endpoint, options);
-      endpoint,
-      options
-    );
 
-    if (statusCode !== 200) {
+    if (!ok) {
       throw new Error(`Failed to upload avatar to ${this.baseServerUrl}`);
     }
 
@@ -970,11 +972,8 @@ class LokiAppDotNetServerAPI {
       rawBody: data,
     };
 
-    const { statusCode, response } = await this.serverRequest(
+    const { ok, response } = await this.serverRequest(endpoint, options);
-      endpoint,
+    if (!ok) {
-      options
-    );
-    if (statusCode !== 200) {
       throw new Error(`Failed to upload data to server: ${this.baseServerUrl}`);
     }
 

ts/session/snode_api/onions.ts

@@ -438,8 +438,7 @@ const sendOnionRequest = async (
     id
   );
   onionPayload += payload.length;
-  log.debug('Onion payload size: ', payload.length);
+  log.debug('Onion payload size: ', payload.length, ' total:', onionPayload);
-  log.debug('Onion total: ', onionPayload);
 
   const guardFetchOptions = {
     method: 'POST',