Improve resilience (#32)

* Adding aliases to improve code resiliance (#31)

* Adding more aliases to improve code resiliance

* Removed hardcoded dappmanager IP

* Improve getLocalIp

* Add log for retrieving domain

* Improve iteration

* Add retries for internal IP retrieval

* Add dappmanager IP as fallback

---------

Co-authored-by: Alex Gonzalez Matias <104903362+alexgonmad@users.noreply.github.com>

Author: dsimog01

api/src/createLocalConfigFile.ts

@@ -7,13 +7,14 @@ import { params } from "./params";
 export async function createLocalConfigFile(device: string): Promise<string> {
   try {
     const remoteFilePath = getRemoteConfigFilePath(device, "conf");
-    const localIp = await getLocalIp();
+    const localIp = await getLocalIpWithRetries(30);
     const localEndpoint = `${localIp}:${params.SERVER_PORT}`;
 
     const remoteConfigFile = fs.readFileSync(remoteFilePath, "utf8");
     const localConfigFile = setLocalEndpoint(remoteConfigFile, localEndpoint);
 
-    if (localConfigFile === remoteConfigFile) throw Error("Error generating localConfigFile");
+    if (localConfigFile === remoteConfigFile)
+      throw Error("Error generating localConfigFile");
     return localConfigFile;
   } catch (e) {
     e.message = `Error creating localConfigFile: ${e.message}`;
@@ -23,22 +24,55 @@ export async function createLocalConfigFile(device: string): Promise<string> {
 
 // Utils
 
+async function getLocalIpWithRetries(retries: number): Promise<string> {
+  // An integer n >= 1
+  retries = Math.max(Math.floor(retries), 1);
+
+  for (let i = 0; i < retries - 1; i++) {
+    try {
+      return await getLocalIp();
+    } catch (e) {
+      console.log(`Error getting local IP: ${e.message}`);
+      console.log(`Retrying... (${i + 1}/${retries})`);
+    }
+  }
+
+  return await getLocalIp();
+}
+
 async function getLocalIp(): Promise<string> {
-  try {
-    const localIp = await got(params.DAPPNODE_API_URL_GET_INTERNAL_IP).text();
-    if (!localIp) throw Error("localIp is empty");
-    if (!ipRegex({ exact: true }).test(localIp)) throw Error("Invalida localIp");
-    return localIp;
-  } catch (e) {
-    e.message = `Error fetching localIp: ${e.message}`;
-    throw e;
+  const dappmanagerHostnames = params.DAPPMANAGER_HOSTNAMES;
+  const getLocalIpUrls = dappmanagerHostnames.map(
+    (hostname) => `http://${hostname}${params.GET_INTERNAL_IP_ENDPOINT}`
+  );
+
+  let errorMessages: string[] = [];
+
+  for (const url of getLocalIpUrls) {
+    try {
+      const localIp = await got(url).text();
+      if (!localIp) throw Error("Local IP is empty");
+      if (!ipRegex({ exact: true }).test(localIp))
+        throw Error("Invalid local IP");
+      return localIp;
+    } catch (e) {
+      errorMessages.push(
+        `Local IP could not be fetched from ${url}: ${e.message}`
+      );
+    }
   }
+  throw Error(errorMessages.join("\n"));
 }
 
-export function setLocalEndpoint(configFile: string, localEndpoint: string): string {
+export function setLocalEndpoint(
+  configFile: string,
+  localEndpoint: string
+): string {
   return configFile
     .split("\n")
-    .map((row) => (row.startsWith("Endpoint =") ? `Endpoint = ${localEndpoint}` : row))
+    .map((row) =>
+      row.startsWith("Endpoint =") ? `Endpoint = ${localEndpoint}` : row
+    )
     .join("\n");
 }
 

api/src/params.ts

@@ -1,6 +1,7 @@
 export const params = {
   MASTER_ADMIN: "dappnode_admin",
-  DAPPNODE_API_URL_GET_INTERNAL_IP: "http://my.dappnode/global-envs/INTERNAL_IP",
+  DAPPMANAGER_HOSTNAMES: ["my.dappnode", "dappmanager.dappnode", "172.33.1.7"], // TODO: Remove dappmanager IP when IP migration is performed
+  GET_INTERNAL_IP_ENDPOINT: "/global-envs/INTERNAL_IP",
   SERVER_PORT: 51820,
   DATA_DIR: process.env.DATA_DIR || "/config",
   HELP_MESSAGE:

releases.json

@@ -5,4 +5,4 @@
       "dappnode": "Thu, 28 Jan 2021 02:25:25 GMT"
     }
   }
-}
+}

root/app/add-peer

@@ -9,14 +9,34 @@ fi
 
 INTERNAL_SUBNET=${INTERNAL_SUBNET:-10.13.13.0}
 INTERFACE=$(echo "$INTERNAL_SUBNET" | awk 'BEGIN{FS=OFS="."} NF--')
-if [ -z "$SERVERURL" ] || [ "$SERVERURL" = "auto" ]; then
-  SERVERURL=$(curl my.dappnode/global-envs/HOSTNAME)
-fi
 SERVERPORT=${SERVERPORT:-51820}
+
 if [ -z "$PEERDNS" ] || [ "$PEERDNS" = "auto" ]; then
   PEERDNS="${INTERFACE}.1"
 fi
 
+if [ -z "$SERVERURL" ] || [ "$SERVERURL" = "auto" ]; then
+
+  function fetchDappnodeDomain {
+    for i in {1..10}; do
+        for domain in "$@"; do
+          echo "**** Fetching DAppNode domain from $domain..."
+          SERVERURL=$(curl -s "$domain/global-envs/HOSTNAME")
+            if [ ! -z "$SERVERURL" ]; then
+              break
+            fi
+          sleep 2
+        done
+    done
+  }
+
+  # TODO: Remove IP when the IP migration is performed
+  domains=("my.dappnode" "dappmanager.dappnode" "172.33.1.7")
+
+  fetchDappnodeDomain "${domains[@]}"
+
+fi
+
 for i in {1..254}; do
   if grep -q "AllowedIPs = ${INTERFACE}.$(( $i + 1 ))/32" /config/wg0.conf; then
     echo "Peer $i exists"

root/etc/cont-init.d/30-config

@@ -244,13 +244,30 @@ if [ -n "$PEERS" ]; then
   fi
   PEERS_COUNT=$(echo "${#PEERS_ARRAY[@]}")
   if [ -z "$SERVERURL" ] || [ "$SERVERURL" = "auto" ]; then
-    for i in {1..90}; do
-      echo "**** Fetching DAppNode domain..."
-      SERVERURL=$(curl -s my.dappnode/global-envs/HOSTNAME)
-      if [ ! -z $SERVERURL ]; then break; fi
-      sleep 2
-    done
-    echo "**** SERVERURL var is either not set or is set to \"auto\", setting external IP to auto detected value of $SERVERURL ****"
+
+    function fetchDappnodeDomain {
+      for i in {1..30}; do
+          for domain in "$@"; do
+              echo "**** Fetching DAppNode domain from $domain..."
+              SERVERURL=$(curl -s "$domain/global-envs/HOSTNAME")
+              if [ ! -z "$SERVERURL" ]; then
+                  break 2
+              fi
+              sleep 2
+          done
+      done
+    }
+
+    # TODO: Remove IP when the IP migration is performed
+    domains=("my.dappnode" "dappmanager.dappnode" "172.33.1.7")
+
+    fetchDappnodeDomain "${domains[@]}"
+
+    if [ -z "$SERVERURL" ]; then
+        echo "**** SERVERURL var is either not set or is set to \"auto\", setting external IP to auto detected value of $SERVERURL  ****"
+    else
+        echo "**** SERVERURL var is set to $SERVERURL ****"
+    fi
   else
     echo "**** External server address is set to $SERVERURL ****"
   fi