From e34b1cbf66a3b810ad103cf757cfb20031188d4d Mon Sep 17 00:00:00 2001
From: kaotisk <kaotisk@arching-kaos.org>
Date: Mon, 24 Jun 2024 06:22:47 +0300
Subject: refactoring

---
 bin/ak          |   2 +-
 install.sh      |   2 +-
 lib/_ak_network | 116 ++++++++++++++++++++++++++++----------------------------
 3 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/bin/ak b/bin/ak
index 07deae2..92bf097 100755
--- a/bin/ak
+++ b/bin/ak
@@ -15,9 +15,9 @@ fullprogrampath="$(realpath $0)"
 PROGRAM="$(basename $0)"
 descriptionString="Arching Kaos CLI"
 
+source $HOME/.arching-kaos/rc
 source $AK_LIBDIR/_ak_log
 source $AK_LIBDIR/_ak_script
-source $AK_WORKDIR/rc
 
 if [ $# -eq 0 ]
 then
diff --git a/install.sh b/install.sh
index 062a3ce..21325f2 100755
--- a/install.sh
+++ b/install.sh
@@ -12,7 +12,7 @@ printf "\n"
 printf "We discourage running the installer with sudo.\n"
 printf "\n"
 printf "Installation starts in..."
-countdown=15
+countdown=5
 printf " %s" "$countdown"
 countdown="$(expr $countdown - 1)"
 sleep 1
diff --git a/lib/_ak_network b/lib/_ak_network
index 2cdec02..76af4c0 100755
--- a/lib/_ak_network
+++ b/lib/_ak_network
@@ -4,64 +4,6 @@ source $AK_LIBDIR/_ak_ipfs
 
 cjdnstoolspath="$HOME/cjdns/tools"
 
-_ak_network_cjdns_scanner(){
-    #
-    # Needs CJDNS tools in your PATH
-    #
-    # Ref: https://github.com/cjdelisle/cjdns
-    #
-    which dumpLinks > /dev/null 2>&1
-    if [ $? -ne 0 ]
-    then
-        echo "You need to install cjdns and cjdns-tools"
-        exit 1
-    fi
-
-    which publictoip6 > /dev/null 2>&1
-    if [ $? -ne 0 ]
-    then
-        echo "You need to install cjdns and cjdns-tools"
-        exit 1
-    fi
-
-    TEMPDIR="$(_ak_make_temp_directory)"
-    AK_ZPEERSFILE="$HOME/.arching-kaos/peersFile"
-    cd $TEMPDIR
-    counter=0
-    printf '[' > walk.aknet
-    dumpLinks \
-        | cut -d ' ' -f 2,4 \
-        | sed 's/ /\n/g' \
-        | sort \
-        | uniq \
-        | while read -r ip || [ -n "$ip" ]
-    do
-        node_info="$(curl \
-            --connect-timeout 3 \
-            -A 'akd/0.1.0; https://github.com/arching-kaos' \
-            "http://[$(publictoip6 $ip)]:8610/v0/node_info" 2>/dev/null | jq -c -M)"
-        if [ $? -eq 0 ] && [ $(echo -n "$node_info" | wc -c) -gt 0 ]
-        then
-            if [ "$counter" -ne "0" ]
-            then
-                printf ',' >> walk.aknet
-            fi
-            if [ ! -n "$node_info" ]
-            then
-                node_info="null"
-            fi
-            printf '{"cjdns":{"public_key":"%s","ip":"%s"},"node_info":%s}' \
-                "$ip" "`publictoip6 $ip`" "$node_info" >> walk.aknet
-            counter="`expr $counter + 1`"
-        fi
-    done
-    printf ']' >> walk.aknet
-
-    mv walk.aknet $AK_ZPEERSFILE
-
-    rm -rf $TEMPDIR
-}
-
 _ak_network_stellar_show_ids(){
     i=0
     flag=0
@@ -185,7 +127,63 @@ _ak_network_scan_ipfs(){
 }
 
 _ak_network_scan_cjdns(){
-    _ak_network_cjdns_scanner
+    #
+    # Needs CJDNS tools in your PATH
+    #
+    # Ref: https://github.com/cjdelisle/cjdns
+    #
+    which dumpLinks > /dev/null 2>&1
+    if [ $? -ne 0 ]
+    then
+        echo "You need to install cjdns and cjdns-tools"
+        exit 1
+    fi
+
+    which publictoip6 > /dev/null 2>&1
+    if [ $? -ne 0 ]
+    then
+        echo "You need to install cjdns and cjdns-tools"
+        exit 1
+    fi
+
+    TEMPDIR="$(_ak_make_temp_directory)"
+    AK_ZPEERSFILE="$HOME/.arching-kaos/peersFile"
+    cd $TEMPDIR
+    counter=0
+    printf '[' > walk.aknet
+    dumpLinks \
+        | grep -v '0000\.0000\.0000\.0001 ' \
+        | cut -d ' ' -f 2,4 \
+        | sed 's/ /\n/g' \
+        | sort \
+        | uniq \
+        | while read -r ip || [ -n "$ip" ]
+    do
+        _ak_log_debug "Scanning $(publictoip6 $ip)..."
+        node_info="$(curl \
+            --connect-timeout 3 \
+            -A 'akd/0.1.0; https://github.com/arching-kaos' \
+            "http://[$(publictoip6 $ip)]:8610/v0/node_info" 2>/dev/null | jq -c -M)"
+        if [ $? -eq 0 ] && [ $(echo -n "$node_info" | wc -c) -gt 0 ]
+        then
+            if [ "$counter" -ne "0" ]
+            then
+                printf ',' >> walk.aknet
+            fi
+            if [ ! -n "$node_info" ]
+            then
+                node_info="null"
+            fi
+            printf '{"cjdns":{"public_key":"%s","ip":"%s"},"node_info":%s}' \
+                "$ip" "`publictoip6 $ip`" "$node_info" >> walk.aknet
+            counter="`expr $counter + 1`"
+        fi
+    done
+    printf ']' >> walk.aknet
+
+    mv walk.aknet $AK_ZPEERSFILE
+
+    rm -rf $TEMPDIR
 }
 
 _ak_network_scan(){
-- 
cgit v1.2.3