increase ipfs_swarm sync to 30s
This commit is contained in:
parent
1946884a28
commit
d3aed161e9
|
@ -40,7 +40,7 @@ do
|
||||||
[[ "$liking_me" == "" || "$liking_me" == "$G1PUB" ]] && continue
|
[[ "$liking_me" == "" || "$liking_me" == "$G1PUB" ]] && continue
|
||||||
# DE TOUS CEUX QUI M'AIMENT JE VAIS LIRE LES MESSAGES pour collecter leurs ipfstryme vers ~/.zen/A_swarm_map.txt
|
# DE TOUS CEUX QUI M'AIMENT JE VAIS LIRE LES MESSAGES pour collecter leurs ipfstryme vers ~/.zen/A_swarm_map.txt
|
||||||
# SI JE SUIS LEUR AMI EN RETOUR, je conserve leur ID dans ~/.zen/A_my_swarm.txt
|
# SI JE SUIS LEUR AMI EN RETOUR, je conserve leur ID dans ~/.zen/A_my_swarm.txt
|
||||||
# Check if my like is reverse
|
# Check if my like is reverse
|
||||||
liking_me_count=$((liking_me_count+1))
|
liking_me_count=$((liking_me_count+1))
|
||||||
echo ">>>>>> CHECKING liking_me n° $liking_me_count : READING 'ipfstryme' message from $liking_me"
|
echo ">>>>>> CHECKING liking_me n° $liking_me_count : READING 'ipfstryme' message from $liking_me"
|
||||||
## Get "/tmp/ipfstryme.$liking_me" from Gchange "ipfstryme" message
|
## Get "/tmp/ipfstryme.$liking_me" from Gchange "ipfstryme" message
|
||||||
|
@ -57,7 +57,7 @@ do
|
||||||
[[ $ipfsnodeid == "" ]] && break
|
[[ $ipfsnodeid == "" ]] && break
|
||||||
[[ ! $(cat /tmp/ipfstryme.clean | grep $ipfsnodeid) ]] && echo $line >> /tmp/ipfstryme.clean
|
[[ ! $(cat /tmp/ipfstryme.clean | grep $ipfsnodeid) ]] && echo $line >> /tmp/ipfstryme.clean
|
||||||
done
|
done
|
||||||
|
|
||||||
cat /tmp/ipfstryme.clean | sort | uniq > /tmp/ipfstryme.$liking_me
|
cat /tmp/ipfstryme.clean | sort | uniq > /tmp/ipfstryme.$liking_me
|
||||||
cat /tmp/ipfstryme.$liking_me
|
cat /tmp/ipfstryme.$liking_me
|
||||||
echo "__________________________________________"
|
echo "__________________________________________"
|
||||||
|
@ -75,7 +75,7 @@ do
|
||||||
## Remove Qm ipfs nodes
|
## Remove Qm ipfs nodes
|
||||||
[[ "${ipfsnodeid:0:2}" != "Qm" ]] && whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
|
[[ "${ipfsnodeid:0:2}" != "Qm" ]] && whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
|
||||||
[[ ! $whoisg1 ]] && continue
|
[[ ! $whoisg1 ]] && continue
|
||||||
|
|
||||||
# KEEPING LAST ipfstryme MESSAGES only
|
# KEEPING LAST ipfstryme MESSAGES only
|
||||||
nbmessage=0
|
nbmessage=0
|
||||||
for messageid in $(~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" read -n300 -j | jq -r --arg friendKEY "$whoisg1" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.id')
|
for messageid in $(~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" read -n300 -j | jq -r --arg friendKEY "$whoisg1" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.id')
|
||||||
|
@ -91,7 +91,7 @@ do
|
||||||
echo $peerline >> ~/.zen/A_swarm_map.txt
|
echo $peerline >> ~/.zen/A_swarm_map.txt
|
||||||
cat ~/.zen/A_swarm_map.txt | sort | uniq > /tmp/A_swarm_map.txt
|
cat ~/.zen/A_swarm_map.txt | sort | uniq > /tmp/A_swarm_map.txt
|
||||||
cp -f /tmp/A_swarm_map.txt ~/.zen/A_swarm_map.txt
|
cp -f /tmp/A_swarm_map.txt ~/.zen/A_swarm_map.txt
|
||||||
|
|
||||||
# FRIEND ADDRESS DISCOVERY
|
# FRIEND ADDRESS DISCOVERY
|
||||||
echo "Am I friend with my FRIEND friend $whoisg1 ?"
|
echo "Am I friend with my FRIEND friend $whoisg1 ?"
|
||||||
friend_of_mine=$(~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" stars -p $whoisg1 | jq -r '.yours.pseudo'); # must contains my XZUID
|
friend_of_mine=$(~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" stars -p $whoisg1 | jq -r '.yours.pseudo'); # must contains my XZUID
|
||||||
|
@ -106,7 +106,7 @@ do
|
||||||
else
|
else
|
||||||
echo "ALREADY RECORDED FRIEND"
|
echo "ALREADY RECORDED FRIEND"
|
||||||
fi
|
fi
|
||||||
ipfs --timeout=20s get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid
|
ipfs --timeout=30s get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid
|
||||||
else
|
else
|
||||||
echo "NOT FULL FRIEND $ipfsnodeid / $whoisg1"
|
echo "NOT FULL FRIEND $ipfsnodeid / $whoisg1"
|
||||||
[[ "$liking_me" != "" ]] && rm -Rf ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me
|
[[ "$liking_me" != "" ]] && rm -Rf ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me
|
||||||
|
@ -114,7 +114,7 @@ do
|
||||||
# SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d $whoisg1 -t 'Astroport' -m 'Rejoins mon #Swarm0 https://copylaradio.com'"
|
# SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d $whoisg1 -t 'Astroport' -m 'Rejoins mon #Swarm0 https://copylaradio.com'"
|
||||||
fi
|
fi
|
||||||
done;
|
done;
|
||||||
|
|
||||||
# UNIQ file
|
# UNIQ file
|
||||||
cat ~/.zen/A_my_swarm.txt | sort | uniq > /tmp/A_my_swarm.txt
|
cat ~/.zen/A_my_swarm.txt | sort | uniq > /tmp/A_my_swarm.txt
|
||||||
cp -f /tmp/A_my_swarm.txt ~/.zen/A_my_swarm.txt
|
cp -f /tmp/A_my_swarm.txt ~/.zen/A_my_swarm.txt
|
||||||
|
@ -129,7 +129,7 @@ My actual #SWARM0"
|
||||||
ipfs swarm peers
|
ipfs swarm peers
|
||||||
echo $(date)
|
echo $(date)
|
||||||
|
|
||||||
# ipfs SWARM shaping
|
# ipfs SWARM shaping
|
||||||
[[ $(cat ~/.zen/A_my_swarm.txt | wc -l) -gt 0 ]] && ~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh && exit 0 || echo "SWARM LOST !! "
|
[[ $(cat ~/.zen/A_my_swarm.txt | wc -l) -gt 0 ]] && ~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh && exit 0 || echo "SWARM LOST !! "
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
|
@ -142,7 +142,7 @@ ipfs bootstrap > /tmp/ipfs_bootstrap
|
||||||
for bootnode in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remove comments
|
for bootnode in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remove comments
|
||||||
do
|
do
|
||||||
ipfsnodeid=${bootnode##*/}
|
ipfsnodeid=${bootnode##*/}
|
||||||
[[ "$ipfsnodeid" != "$IPFSNODEID" ]] && sleep 20 ## RALENTIR DEMARRAGE STATIONS NON BOOTSTRAP
|
[[ "$ipfsnodeid" != "$IPFSNODEID" ]] && sleep 20 ## RALENTIR DEMARRAGE STATIONS NON BOOTSTRAP
|
||||||
## ADD $bootnode TO BOOTSTRAP
|
## ADD $bootnode TO BOOTSTRAP
|
||||||
ipfs bootstrap add $bootnode
|
ipfs bootstrap add $bootnode
|
||||||
echo "$bootnode" >> ~/.zen/A_my_swarm.txt
|
echo "$bootnode" >> ~/.zen/A_my_swarm.txt
|
||||||
|
|
Loading…
Reference in New Issue