From acc3c79417bdc9ab08ba2588b83b69d4797f1e84 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 3 Apr 2023 17:17:47 +0200 Subject: [PATCH] 12345 MAP optimisation + UPSYNC command --- ASTROBOT/PLAYER.refresh.sh | 25 ++++++++++--------- _12345.sh | 50 ++++++++++++++++++++++++++++++++------ templates/register.html | 6 ++--- 3 files changed, 60 insertions(+), 21 deletions(-) diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index 432c03c7..3add1d25 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -228,21 +228,24 @@ done ################################################################# ## IPFSNODEID ASTRONAUTES SIGNALING ## 12345 port ############################ -# Scan local cache -if [[ -d ~/.zen/tmp/${IPFSNODEID} ]]; then - BSIZE=$(du -b ~/.zen/tmp/${IPFSNODEID} | tail -n 1 | cut -f 1) - ## Merge actual online version - ipfs get -o ~/.zen/tmp/${IPFSNODEID} /ipns/${IPFSNODEID}/ - ## MAP CACHE CLEANING - rm -f ~/.zen/tmp/${IPFSNODEID}/*TW.json +# UDATE STATION BALISE +if [[ -d ~/.zen/tmp/${IPFSNODEID} ]]; then + + # ONLY FRESH DATA HERE + # BSIZE=$(du -b ~/.zen/tmp/${IPFSNODEID} | tail -n 1 | cut -f 1) + ## Getting actual online version + # ipfs get -o ~/.zen/tmp/${IPFSNODEID} /ipns/${IPFSNODEID}/ + + ## COPY COINS VALUE OF THE DAY + cp ~/.zen/tmp/coucou/*.COINS ~/.zen/tmp/${IPFSNODEID}/ + ############################################ NSIZE=$(du -b ~/.zen/tmp/${IPFSNODEID} | tail -n 1 | cut -f 1) + ROUTING=$(ipfs add -rwHq ~/.zen/tmp/${IPFSNODEID}/* | tail -n 1 ) + ipfs name publish /ipfs/$ROUTING + echo ">> $NSIZE Bytes STATION BALISE > ${myIPFS}/ipns/${IPFSNODEID}" - [[ $BSIZE != $NSIZE ]] \ - && ROUTING=$(ipfs add -rwHq ~/.zen/tmp/${IPFSNODEID}/* | tail -n 1 ) \ - && echo "PUBLISH BALISE STATION /ipns/${IPFSNODEID} = $NSIZE octets" \ - && ipfs name publish /ipfs/$ROUTING fi echo "PLAYER.refresh DONE." diff --git a/_12345.sh b/_12345.sh index 5d2ab01a..046a984a 100755 --- a/_12345.sh +++ b/_12345.sh @@ -23,6 +23,8 @@ PORT=12345 ncrunning=$(ps axf --sort=+utime | grep -w 'nc -l -p 12345' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 2) [[ $ncrunning ]] && echo "(≖‿‿≖) - KILLING Already Running MAP Server - (≖‿‿≖) " && kill -9 $ncrunning + GNODEID=$($MY_PATH/tools/ipfs_to_g1.py ${IPFSNODEID}) + ## RESET MEMORY rm -Rf ~/.zen/tmp/swarm/* ## NAME PUBLISH EMPTY !!! @@ -60,17 +62,25 @@ while true; do ############# GET BOOTSTRAP SWARM DATA for bootnode in $(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#") # remove comments do - echo "############# RUN LOOP ######### $(date)" + echo "############# RUN LOOP ######### $(date)" ipfsnodeid=${bootnode##*/} mkdir -p ~/.zen/tmp/swarm/$ipfsnodeid - echo "IPFS get /ipns/$ipfsnodeid" - [[ $YOU ]] && ipfs --timeout 120s get -o ~/.zen/tmp/swarm/$ipfsnodeid /ipns/$ipfsnodeid/ + addtype=$(echo ${bootnode} | cut -d '/' -f 2) + nodeip=$(echo ${bootnode} | cut -d '/' -f 3) - echo "Updated : ~/.zen/tmp/swarm/$ipfsnodeid" + echo "Getting $nodeip : /ipns/$ipfsnodeid" + [[ $YOU ]] && ipfs --timeout 180s get -o ~/.zen/tmp/swarm/$ipfsnodeid /ipns/$ipfsnodeid/ + echo "Updated : ~/.zen/tmp/swarm/$ipfsnodeid" - ls ~/.zen/tmp/swarm/$ipfsnodeid + ls ~/.zen/tmp/swarm/$ipfsnodeid + + ## ASK FOR MY MAP UPSYNC + if [[ $addtype == "ip4" ]]; then + echo "STATION MAP UPSYNC : curl -s http://$nodeip:12345/?${GNODEID}=${IPFSNODEID}" + curl -s -m 10 http://$nodeip:12345/?${GNODEID}=${IPFSNODEID} -o ~/.zen/tmp/swarm/${ipfsnodeid}/map.json + fi done @@ -112,7 +122,7 @@ while true; do #### ACTIVATE LIBP2P PORT FORWARDINGS - ~/.zen/Astroport.ONE/tools/ipfs_P2P_forward.sh + # ~/.zen/Astroport.ONE/tools/ipfs_P2P_forward.sh # last run recording @@ -142,7 +152,33 @@ Content-Type: application/json; charset=UTF-8 ###################################################################################### # BLOCKING COMMAND nc 12345 port waiting echo '(◕‿‿◕) http://'$myIP:'12345 READY (◕‿‿◕)' - echo "$HTTPSEND" | nc -l -p 12345 -q 1 > /dev/null 2>&1 + REQ=$(echo "$HTTPSEND" | nc -l -p 12345 -q 1) ## # WAIT FOR 12345 PORT CONTACT + + URL=$(echo "$REQ" | grep '^GET' | cut -d ' ' -f2 | cut -d '?' -f2) + HOSTP=$(echo "$REQ" | grep '^Host:' | cut -d ' ' -f2 | cut -d '?' -f2) + HOST=$(echo "$HOSTP" | cut -d ':' -f 1) + COOKIE=$(echo "$REQ" | grep '^Cookie:' | cut -d ' ' -f2) + echo "RECEPTION : $URL" + arr=(${URL//[=&]/ }) + + ##################################################################### + ### UPSYNC STATION REQUEST /?G1PUB=g1_to_ipfs(G1PUB)&...(TODO include CODE HASH & TOKEN) + ##################################################################### + if [[ ${arr[0]} != "" ]]; then + ## + GPUB=${arr[0]} + ASTROTOIPFS=$(${MY_PATH}/tools/g1_to_ipfs.py ${arr[0]} 2>/dev/null) + if [[ "${ASTROTOIPFS}" == "${arr[1]}" ]]; then + echo "STATION ${GPUB} CONTACT" + ## CLIENT KNOWS HOW TO CONVERT G1 to IPFS + ( + mkdir -p ~/.zen/tmp/${IPFSNODEID}/swarm/${ASTROTOIPFS} + echo "UPSYNC TO ~/.zen/tmp/${IPFSNODEID}/swarm/${ASTROTOIPFS}" + [[ $YOU ]] && ipfs --timeout 180s get -o ~/.zen/tmp/${IPFSNODEID}/swarm/${ASTROTOIPFS} /ipns/${ASTROTOIPFS} + ) & + + fi + fi #### 12345 NETWORK MAP TOKEN end=`date +%s` diff --git a/templates/register.html b/templates/register.html index 44dc5f60..bce42c49 100644 --- a/templates/register.html +++ b/templates/register.html @@ -72,9 +72,9 @@ header {

-

/ LA ♥BOX /^3223

-

⌘ Interplanetary Off CLOUD ⛅ ^3222

-

Welcome In 👉Le Claude👈^3112

+

/ La♥BOX /^3223

+

⌘ Interplanetary Cloud Storage ⛅ ^3222

+

People made 👉Le Claude👈^3112

🔥.^999.^888.^777.^666.^555.^444.3^333.2^222.1^111 🚀^4321