Merge pull request #1352 from Bilb/fix-retries-onion-req

js/modules/loki_app_dot_net_api.js

@@ -26,13 +26,16 @@ const LOKIFOUNDATION_DEVFILESERVER_PUBKEY =
   'BSZiMVxOco/b3sYfaeyiMWv/JnqokxGXkHoclEx8TmZ6';
 const LOKIFOUNDATION_FILESERVER_PUBKEY =
   'BWJQnVm97sQE3Q1InB4Vuo+U/T1hmwHBv0ipkiv8tzEc';
+const LOKIFOUNDATION_APNS_PUBKEY =
+  'BWQqZYWRl0LlotTcUSRJZPvNi8qyt1YSQH3li4EHQNBJ';
+
 const urlPubkeyMap = {
   'https://file-dev.getsession.org': LOKIFOUNDATION_DEVFILESERVER_PUBKEY,
   'https://file-dev.lokinet.org': LOKIFOUNDATION_DEVFILESERVER_PUBKEY,
   'https://file.getsession.org': LOKIFOUNDATION_FILESERVER_PUBKEY,
   'https://file.lokinet.org': LOKIFOUNDATION_FILESERVER_PUBKEY,
-  'https://staging.apns.getsession.org':
-    'BWQqZYWRl0LlotTcUSRJZPvNi8qyt1YSQH3li4EHQNBJ',
+  'https://dev.apns.getsession.org': LOKIFOUNDATION_APNS_PUBKEY,
+  'https://live.apns.getsession.org': LOKIFOUNDATION_APNS_PUBKEY,
 };
 
 const HOMESERVER_USER_ANNOTATION_TYPE = 'network.loki.messenger.homeserver';
@@ -48,6 +51,8 @@ const snodeHttpsAgent = new https.Agent({
 
 const timeoutDelay = ms => new Promise(resolve => setTimeout(resolve, ms));
 
+const MAX_SEND_ONION_RETRIES = 3;
+
 const sendViaOnion = async (srvPubKey, url, fetchOptions, options = {}) => {
   if (!srvPubKey) {
     log.error(
@@ -134,6 +139,12 @@ const sendViaOnion = async (srvPubKey, url, fetchOptions, options = {}) => {
       `loki_app_dot_net:::sendViaOnion #${options.requestNumber} - Retry #${options.retry} Couldnt handle onion request, retrying`,
       payloadObj
     );
+    if (options.retry && options.retry >= MAX_SEND_ONION_RETRIES) {
+      log.error(
+        `sendViaOnion too many retries: ${options.retry}. Stopping retries.`
+      );
+      return {};
+    }
     return sendViaOnion(srvPubKey, url, fetchOptions, {
       ...options,
       retry: options.retry + 1,

js/modules/loki_push_notification_server_api.js

@@ -6,7 +6,7 @@ class LokiPushNotificationServerApi {
   constructor() {
     this.ourKey =
       '642a6585919742e5a2d4dc51244964fbcd8bcab2b75612407de58b810740d049';
-    this.serverUrl = 'https://staging.apns.getsession.org';
+    this.serverUrl = 'https://live.apns.getsession.org';
     this._server = new LokiAppDotNetAPI(this.ourKey, this.serverUrl);
 
     // make sure pubKey & pubKeyHex are set in _server