slow dig backup

Author: ipitio

debian/control

@@ -4,7 +4,7 @@ Homepage: https://github.com/ipitio/closure
 Standards-Version: 3.9.2
 
 Package: closure
-Version: 1.6.24
+Version: 1.6.25
 Maintainer: ipitio <[email protected]>
 Depends: curl, flatpak, gpg, hostapd, isc-dhcp-server, iw, macchanger, netplan.io, network-manager, net-tools, qrencode, rfkill, wireguard, wireless-tools, wget
 Recommends: containerd.io, docker-ce, docker-ce-cli, docker-buildx-plugin, docker-compose-plugin

lib.sh

@@ -220,7 +220,7 @@ curl() {
     local result
 
     while [ "$i" -lt "$max_attempts" ]; do
-        result=$(command curl -sSLNZ --connect-timeout 60 -m 120 "$@" 2>/dev/null)
+        result=$(command curl -sSLNZ --connect-timeout 60 -m 120 --retry 5 --retry-delay 1 --retry-all-errors "$@" 2>/dev/null)
         [ -n "$result" ] && echo "$result" && return 0
         sleep "$wait_time"
         ((i++))
@@ -232,7 +232,7 @@ curl() {
 }
 
 dig() {
-    command dig +short "$1" 2>/dev/null | tail -n1
+    [ -z "$2" ] && command dig +short "$1" 2>/dev/null | tail -n1 || command dig "$1" +trace 2>/dev/null | grep -oP "(?<=^${1//\./\\\.}\.).+(AAA)?A.+" | grep -oP '\S+$'
 }
 
 direct_domain() {
@@ -248,7 +248,7 @@ get_server_ip() {
 
     if ! is_ip "$server_ip"; then
         if [[ "$CLS_TYPE_NODE" =~ (spoke|saah) ]]; then
-            server_ip=$(dig "$SERVERURL" | tail -n1)
+            server_ip=$(dig "$SERVERURL" "$1" | tail -n1)
         else
             server_ip=$(direct_domain "curl https://icanhazip.com" | tail -n1)
         fi

start.sh

@@ -93,8 +93,16 @@ eval "cast pre-up ${*@Q}"
 
     until ip a show "$CLS_INTERN_IFACE" | grep -q UP && ([[ ! "$CLS_TYPE_NODE" =~ spoke ]] || ping -c1 "$CLS_WG_SERVER" >/dev/null); do
         get_local_ip
-        new_ip=$(get_server_ip)
-        ! is_ip "$new_ip" || og_server_ip="$new_ip"
+        new_ip=$(get_server_ip 1)
+
+        if is_ip "$new_ip"; then
+            if is_ip "$og_server_ip"; then
+                [ "$og_server_ip" = "$new_ip" ] || exec sudo CLS_WG_ONLY=true bash restart.sh ${@@Q}
+            else
+                og_server_ip="$new_ip"
+            fi
+        fi
+
         sleep 1
     done