From 41546528176a713767088f0e62d1e0778ddf479e Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 27 Feb 2023 02:34:26 +0100 Subject: [PATCH] MOVED PLAYER (KEY IS KEPT ON LAST CONNECTED ASTROPORT) --- ASTROBOT/PLAYER.refresh.sh | 33 +++++++++++++++++++++++++++------ tools/VISA.new.sh | 24 +++++++++++++----------- tools/ipfs_config.sh | 2 +- 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index 9db8e6f7..4e12f044 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -91,18 +91,39 @@ for PLAYER in ${PLAYERONE[@]}; do ## FOUND TW ############################################################# ## CHECK WHO IS ACTUAL OFFICIAL GATEWAY - tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html --output ~/.zen/tmp/${MOATS} --render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' + tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html \ + --output ~/.zen/tmp/${MOATS} \ + --render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' + [[ ! -s ~/.zen/tmp/${MOATS}/MadeInZion.json ]] && echo "${PLAYER} MadeInZion : BAD TW (☓‿‿☓) " && continue - ## DETECT IF GOOD LAST VERSION - tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html --output ~/.zen/tmp/${MOATS} --render '.' 'Last.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[all[tiddlers]days:modified[-1]]' - - player=$(cat ~/.zen/tmp/${MOATS}/MadeInZion.json | jq -r .[].player) [[ $player == $PLAYER ]] \ && echo "$PLAYER OFFICIAL TW - (⌐■_■) -" \ - || ( echo "BAD PLAYER=$player in TW" && continue) + || ( echo "> BAD PLAYER=$player in TW" && continue) + + ## DETECT IF GOOD ASTROPORT + tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html \ + --output ~/.zen/tmp/${MOATS} \ + --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' + ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport) + + IPNSTAIL=$(echo ${ASTROPORT} | rev | cut -f 1 -d '/' | rev) # Remove "/ipns/" part + echo "TW ASTROPORT GATEWAY : ${ASTROPORT}" + + ## CHECK ONLINE + ipfs ping -n 3 ${ASTROPORT} + [ $? != 0 ] && echo "STATION IS NOT RESPONDING" && continue + + ## MOVED PLAYER (KEY IS KEPT ON LAST CONNECTED ASTROPORT) + [[ ${IPNSTAIL} != ${IPFSNODEID} ]] \ + && echo "> I AM ${IPFSNODEID} : PLAYER MOVED : EJECTION " \ + && rm -Rf ~/.zen/game/players/${PLAYER}/ \ + && ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm $G1PUB; + && echo ">>>> ASTRONAUT EJECTION OPERATION FINISHED" + && continue + fi ############################################################# ## GWIP == myIP or TUBE !! diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index f05051d4..e56cb9b6 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -169,10 +169,11 @@ NID="${myIPFS}" WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance WID="https://ipfs.$(myHostName)/api" # WID="http://ipfs.$(myHostName):5001" - +DISCO="https://astroport.$(myHostName)/?salt=${SALT}&pepper=${PEPPER}&logout=${PLAYER}" [[ $isLAN ]] && NID="http://ipfs.localhost:8080" \ - && WID="http://ipfs.localhost:5001" + && WID="http://ipfs.localhost:5001" \ + && DISCO="http://ipfs.localhost:1234/?salt=${SALT}&pepper=${PEPPER}&logout=${PLAYER}" #### @@ -404,30 +405,31 @@ echo "$(${MY_PATH}/face.sh cool)" echo " 'Astronaute' $PSEUDO" echo echo "G1VISA : ${myIPFS}/ipfs/${IASTRO}" -echo "TW : ${myIPFS}/ipns/${ASTRONAUTENS}" -echo "Lien Favori : $URL" echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" echo "${PLAYER}" echo "Portefeuille (ğ1) : $G1PUB"; sleep 1 +echo "Lien Favori : $URL" echo " -A la place de tous vos mots de passe. -Utilisez vos Phrases Secrètes : +vos Phrases Secrètes : $SALT $PEPPER -dans le Monde propulsé par la Monnaie Libre +la Monnaie Libre https://monnaie-libre.fr -1) Installez Cesium et GChange sur votre smartphone. +1) Visitez https://Cesium.app et https://GChange.fr 2) Connectez-vous. Faites des rencontres, des échanges. -3) Envoyez, recevez des ★. Activez vos toiles de confiance Ŋ1"; sleep 1 +3) Envoyer des ★ active vos toiles de confiance Ŋ1"; sleep 1 echo echo "Explorateur du Monde Libre. Bienvenue." -echo "$(${MY_PATH}/face.sh friendly)" +echo "TW : ${myIPFS}/ipns/${ASTRONAUTENS}" + +echo "${myIPFS}/ipns/${ASTRONAUTENS}" +echo "$(${MY_PATH}/face.sh friendly) DISCONNECT : $DISCO " echo $PSEUDO > ~/.zen/tmp/PSEUDO ## Return data to start.sh echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" -echo "---" +echo "--- web3 PKI system ---" echo "export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$PLAYER ASTROFEED=$FEEDNS" ## CLEANING CACHE diff --git a/tools/ipfs_config.sh b/tools/ipfs_config.sh index 33d8151a..a495d4e6 100755 --- a/tools/ipfs_config.sh +++ b/tools/ipfs_config.sh @@ -40,7 +40,7 @@ ipfs config --json Swarm.ConnMgr.LowWater 20 ipfs config --json Swarm.ConnMgr.HighWater 40 [[ ! $isLAN ]] && ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["http://'$myIP':8080", "http://ipfs.localhost:8080", "http://127.0.0.1:8080", "http://127.0.1.1:8080", "https://ipfs.'$(hostname)'.copylaradio.com" ]' \ - || ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["http://'$(hostname)':8080", "http://127.0.0.1:8080", "http://ipfs.localhost:8080", "http://127.0.1.1:8080" ]' + || ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["http://'$(hostname)'.local:8080","http://'$(hostname)':8080", "http://127.0.0.1:8080", "http://ipfs.localhost:8080", "http://127.0.1.1:8080" ]' ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT", "GET", "POST"]' ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials '["true"]'