From 7baf69ae007dd1e662c09caeb6edd21e059601da Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Tue, 12 May 2020 22:56:38 -0700
Subject: [PATCH] update seedNode format in config, try ip_url as fallback

---
 js/modules/loki_snode_api.js | 41 +++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js
index 7d120ff4e..98110b381 100644
--- a/js/modules/loki_snode_api.js
+++ b/js/modules/loki_snode_api.js
@@ -1,5 +1,5 @@
 /* eslint-disable class-methods-use-this */
-/* global window, textsecure, ConversationController, _, log, process, Buffer, StringView, dcodeIO */
+/* global window, textsecure, ConversationController, _, log, process, Buffer, StringView, dcodeIO, URL */
 
 const { lokiRpc } = require('./loki_rpc');
 // not sure I like this name but it's been than util
@@ -44,22 +44,33 @@ async function tryGetSnodeListFromLokidSeednode(
   )[0];
   let snodes = [];
   try {
-    const response = await lokiRpc(
-      `http://${seedNode.ip}`,
-      seedNode.port,
-      'get_n_service_nodes',
-      params,
-      {}, // Options
-      '/json_rpc' // Seed request endpoint
-    );
-    // Filter 0.0.0.0 nodes which haven't submitted uptime proofs
-    snodes = response.result.service_node_states.filter(
-      snode => snode.public_ip !== '0.0.0.0'
-    );
+    const getSnodesFromSeedUrl = async urlObj => {
+      const response = await lokiRpc(
+        `${urlObj.protocol}//${urlObj.hostname}`,
+        urlObj.port,
+        'get_n_service_nodes',
+        params,
+        {}, // Options
+        '/json_rpc' // Seed request endpoint
+      );
+      // Filter 0.0.0.0 nodes which haven't submitted uptime proofs
+      return response.result.service_node_states.filter(
+        snode => snode.public_ip !== '0.0.0.0'
+      );
+    };
+    const tryUrl = new URL(seedNode.url);
+    snodes = getSnodesFromSeedUrl(tryUrl);
     // throw before clearing the lock, so the retries can kick in
     if (snodes.length === 0) {
-      // does this error message need to be exactly this?
-      throw new window.textsecure.SeedNodeError('Failed to contact seed node');
+      // fall back on ip_url
+      const tryIpUrl = new URL(seedNode.ip_url);
+      snodes = getSnodesFromSeedUrl(tryIpUrl);
+      if (snodes.length === 0) {
+        // does this error message need to be exactly this?
+        throw new window.textsecure.SeedNodeError(
+          'Failed to contact seed node'
+        );
+      }
     }
     return snodes;
   } catch (e) {