[node_info] A bug where the node info couldn't be retrieved

4 files changed, 113 insertions, 100 deletions

diff --git a/lib/_ak_ipfs b/lib/_ak_ipfs
index aa2f96c..16397a7 100755
--- a/lib/_ak_ipfs
+++ b/lib/_ak_ipfs
@@ -350,8 +350,7 @@ function _ak_ipfs_name_resolve(){
         _ak_log_error "No argument given"
         exit 1
     fi
-
-    if [ ! -d $AK_IPNS_ARTIFACTS/$1 ]
+    if [ ! -f $AK_IPNS_ARTIFACTS/$1 ]
     then
         _ak_log_error "Failed to resolve $1"
         exit 1
diff --git a/lib/_ak_network_incoming b/lib/_ak_network_incoming
index f3e675e..cf8920d 100755
--- a/lib/_ak_network_incoming
+++ b/lib/_ak_network_incoming
@@ -41,55 +41,58 @@ function _ak_network_incoming_show_peers(){
 function _ak_network_incoming_scan(){
     if [ -f "${AK_ZPEERSINCOMING}" ]
     then
-    if [ $(cat ${AK_ZPEERSINCOMING}|wc -l) -gt 0 ]
-    then
-        counter=0
-        count=0
-        _ak_fm_sort_uniq_file ${AK_ZPEERSINCOMING}
-        max="$(cat ${AK_ZPEERSINCOMING}|grep -v '\.'|wc -l)"
-        printf '[' > walk.aknet
-        cat ${AK_ZPEERSINCOMING} \
-            | grep -v '\.' \
-            | sort \
-            | uniq \
-            | while read -r uip || [ -n "$uip" ]
-        do
-            ip="$(_ak_network_utils_pad_ip $uip)"
-            count="$(( $count + 1 ))"
-            _ak_log_debug "Scanning [${count}/${max}] $ip..."
-            node_fs_path="$AK_ZPEERSDIR/inc/$(echo -n $ip| sed 's/://g')"
-            scan_ts="$(_ak_datetime_unix)"
-            if [ ! -d ${node_fs_path} ]
-            then
-                mkdir -p ${node_fs_path}
-            fi
-            node_fs_pathname="${node_fs_path}/${scan_ts}"
-            curl \
-                --connect-timeout 3 \
-                -A 'akd/0.1.0; https://github.com/arching-kaos' \
-                "http://[$ip]:8610/v0/node_info" 2>/dev/null | jq -c -M > ${node_fs_pathname}
-            node_info="$(cat ${node_fs_pathname})"
-            if [ $? -eq 0 ] && [ $(echo -n "$node_info" | wc -c) -gt 0 ]
-            then
-                if [ "$counter" -ne "0" ]
+        if [ $(cat ${AK_ZPEERSINCOMING}|wc -l) -gt 0 ]
+        then
+            counter=0
+            count=0
+            _ak_fm_sort_uniq_file ${AK_ZPEERSINCOMING}
+            max="$(cat ${AK_ZPEERSINCOMING}|grep -v '\.'|wc -l)"
+            printf '[' > walk.aknet
+            cat ${AK_ZPEERSINCOMING} \
+                | grep -v '\.' \
+                | sort \
+                | uniq \
+                | while read -r uip || [ -n "$uip" ]
+            do
+                ip="$(_ak_network_utils_pad_ip $uip)"
+                count="$(( $count + 1 ))"
+                _ak_log_debug "Scanning [${count}/${max}] $ip..."
+                node_fs_path="$AK_ZPEERSDIR/inc/$(echo -n $ip| sed 's/://g')"
+                scan_ts="$(_ak_datetime_unix)"
+                if [ ! -d ${node_fs_path} ]
                 then
-                    printf ',' >> walk.aknet
+                    _ak_log_info "New peer: $ip..."
+                    mkdir -p ${node_fs_path}
                 fi
-                if [ ! -n "$node_info" ]
+                node_fs_pathname="${node_fs_path}/${scan_ts}"
+                _ak_log_info "Requesting peer's node info: $ip..."
+                curl \
+                    --connect-timeout 3 \
+                    -A 'akd/0.1.0; https://github.com/arching-kaos' \
+                    "http://[$ip]:8610/v0/node_info" 2>/dev/null | jq -c -M > ${node_fs_pathname}
+                node_info="$(cat ${node_fs_pathname})"
+                if [ $? -eq 0 ] && [ $(echo -n "$node_info" | wc -c) -gt 0 ]
                 then
-                    node_info="null"
+                    _ak_log_info "Appending: $ip..."
+                    if [ "$counter" -ne "0" ]
+                    then
+                        printf ',' >> walk.aknet
+                    fi
+                    if [ ! -n "$node_info" ]
+                    then
+                        node_info="null"
+                    fi
+                    printf '{"incoming":{"ip":"%s"},"node_info":%s}' \
+                        "$ip" "$node_info" >> walk.aknet
+                    counter="`expr $counter + 1`"
                 fi
-                printf '{"incoming":{"ip":"%s"},"node_info":%s}' \
-                    "$ip" "$node_info" >> walk.aknet
-                counter="`expr $counter + 1`"
-            fi
-        done
-        printf ']' >> walk.aknet
-        mv walk.aknet $AK_ZPEERSFILE.incoming
-        rm -rf $TEMPDIR
-    else
-        _ak_log_info "No incoming requests found."
-    fi
+            done
+            printf ']' >> walk.aknet
+            mv walk.aknet $AK_ZPEERSFILE.incoming
+            rm -rf $TEMPDIR
+        else
+            _ak_log_info "No incoming requests found."
+        fi
     fi
 }
 
diff --git a/lib/_ak_node b/lib/_ak_node
index 5ca8521..937ff84 100755
--- a/lib/_ak_node
+++ b/lib/_ak_node
@@ -24,7 +24,7 @@ _ak_lib_load _ak_ipfs
 # Resolves the IPNS key "ak-config" to its current IPFS value
 # Return IPFS CIDv0 without /ipfs/ prefix
 function _ak_node_info_ipfs_hash(){
-    _ak_ipfs_name_resolve /ipns/$(_ak_node_info_ipns_key) | sed -e 's/\/ipfs\///'
+    _ak_ipfs_name_resolve $(_ak_node_info_ipns_key) | sed -e 's/\/ipfs\///'
 }
 
 # Finds ak-config ipns key
diff --git a/lib/_ak_ns b/lib/_ak_ns
index 3506908..fcdef63 100755
--- a/lib/_ak_ns
+++ b/lib/_ak_ns
@@ -287,63 +287,74 @@ function _ak_ns_publish_config(){
 function _ak_ns_resolve_all_keys(){
     tmpdir="$(_ak_make_temp_directory)"
     cd $tmpdir
+    _ak_log_info "Looking at local IPs..."
     ip a | grep inet6 | sed 's/ *inet6 //g' | cut -d '/' -f 1 > ip_list
-    # cat /dev/null > ip_list
-    ak network -p 2>/dev/null| jq -r '.[].incoming.ip' | while read ip ; do if [ $ip != null ]; then echo $ip ;fi;done > peer_list
-    cat ip_list | while read ip ; do sed -i 's/^'$ip'$//g' peer_list; done
-    # cat peer_list | while read ip ; do ak network -p | jq --arg ip "$ip" '.[] | select(.incoming.ip == $ip )' | jq -r '.node_info.keys.[]'> key_list.$ip; done
-    cat peer_list | while read ip ; do ak network -p | jq --arg ip "$ip" '.[] | select(.incoming.ip == $ip )' | jq '.node_info.keymaps.[]'> keymaps_list.$ip; done
-    # cat peer_list | while read ip
-    # do
-    #     cat key_list.$ip | while read key
-    #     do
-    #         ak fs --net-cat-from-map $key > $key && ak fs --import $key
-    #     done
-    # done
-    # cat peer_list | while read ip
-    # do
-    #     proof="$(cat keymaps_list.$ip | jq -r '.')"
-    #     while read key
-    #     do
-    #         ak fs --net-cat-from-map $key > $key && ak fs --import $key
-    #     done
-    # done
+    ak network -p 2>/dev/null| jq -r '.[].incoming.ip' | while read ip
+    do
+        if [ $ip != "null" ]
+        then
+            echo $ip
+        fi
+    done > peer_list
+    _ak_log_info "Filtering IPs out of locals..."
+    cat ip_list | while read ip
+    do
+        sed -i 's/^'$ip'$//g' peer_list
+    done
+    if [ $(cat peer_list | wc -l) -eq 0 ]
+    then
+        _ak_log_error "No IPs to scan from"
+        exit 1
+    fi
     cat peer_list | while read ip
     do
-        cat keymaps_list.$ip | jq -r '.fingerprint' | while read key
-        do
-            map="$(cat keymaps_list.$ip | jq -r 'select(.fingerprint == "'$key'")|.map')"
-            ak fs --net-cat-from-map $map > $key
-            ak fs --import $key
-            curl -s http://[$ip]:8610/v0/ns_get/$key > $key.reply
-            proof="$(cat $key.reply | jq -r '.proof')"
-            resolved="$(cat $key.reply | jq -r '.resolved')"
-            key="$(cat $key.reply | jq -r '.key')"
-            ak fs --net-cat-from-map $proof > $key.proof
-            _ak_gpg_verify_clear_signature $key.proof
-            if [ $? -ne 0 ]
-            then
-                _ak_log_error "Couldn't verify"
-                exit 1
-            fi
-            if [ -f ${AK_NS_DIR}/${key} ]
-            then
-                _ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key} >> ${AK_NS_DIR}/${key}.history
-            fi
-            signed_akfs_map=$(_ak_fs_import ${key}.proof)
-            if [ -f ${AK_NS_DIR}/${key}.map ]
-            then
-                printf '%s %s\n' "$(echo -n $signed_akfs_map)" \
-                    "$(_ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key})" \
-                    >> ${AK_NS_DIR}/${key}.history_map
+        _ak_log_info "Extracing keys from $ip..."
+        ak network -p \
+            | jq --arg ip "$ip" '.[] | select(.incoming.ip == $ip )' \
+            | jq '.node_info.keymaps.[]'> keymaps_list.$ip
+    done
+    cat peer_list | while read ip
+    do
+        _ak_log_info "Looking at peer $ip"
+        if [ $ip != "null" ]
+        then
+            cat keymaps_list.$ip | jq -r '.fingerprint' | while read key
+            do
+                map="$(cat keymaps_list.$ip | jq -r 'select(.fingerprint == "'$key'")|.map')"
+                ak fs --net-cat-from-map $map > $key
+                ak fs --import $key
+                curl -s http://[$ip]:8610/v0/ns_get/$key > $key.reply
+                proof="$(cat $key.reply | jq -r '.proof')"
+                resolved="$(cat $key.reply | jq -r '.resolved')"
+                key="$(cat $key.reply | jq -r '.key')"
+                ak fs --net-cat-from-map $proof > $key.proof
+                _ak_gpg_verify_clear_signature $key.proof
+                if [ $? -ne 0 ]
+                then
+                    _ak_log_error "Couldn't verify"
+                    exit 1
+                fi
+                if [ -f ${AK_NS_DIR}/${key} ]
+                then
+                    _ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key} >> ${AK_NS_DIR}/${key}.history
+                fi
+                signed_akfs_map=$(_ak_fs_import ${key}.proof)
+                if [ -f ${AK_NS_DIR}/${key}.map ]
+                then
+                    printf '%s %s\n' "$(echo -n $signed_akfs_map)" \
+                        "$(_ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key})" \
+                        >> ${AK_NS_DIR}/${key}.history_map
 
-            fi
-            mv ${key}.proof ${AK_NS_DIR}/${key}
-            printf '%s %s\n' "$(echo -n $proof)" \
-                "$(_ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key})" \
-                > ${AK_NS_DIR}/${key}.map
-        done
+                fi
+                mv ${key}.proof ${AK_NS_DIR}/${key}
+                printf '%s %s\n' "$(echo -n $proof)" \
+                    "$(_ak_gpg_verify_clear_signature ${AK_NS_DIR}/${key})" \
+                    > ${AK_NS_DIR}/${key}.map
+            done
+            _ak_log_info "Finished peer $ip"
+        fi
     done
+    _ak_log_info "Finished resolving"
 }
 
 _ak_log_debug "_ak_ns loaded $(caller)"