From 671f9161d68bc9aa1748e718537e74871c9c17ab Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 8 Sep 2023 15:58:39 +0200 Subject: [PATCH] PLAYER.unplug.sh : remove PLAYER from ~/.zen/game/players/ & remove from UmapNS --- RUNTIME/PLAYER.refresh.sh | 146 +++++++++++++++++++------------------- command.sh | 52 +------------- tools/PLAYER.unplug.sh | 76 ++++++++++++++++++++ 3 files changed, 152 insertions(+), 122 deletions(-) create mode 100755 tools/PLAYER.unplug.sh diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 1ef65262..ef44436d 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -120,7 +120,9 @@ for PLAYER in ${PLAYERONE[@]}; do --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' ## Astroport Tiddler ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport) ## Raccorded G1Station IPNS address CURCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].chain | rev | cut -f 1 -d '/' | rev) # Remove "/ipfs/" part - [[ ${CURCHAIN} == "" || ${CURCHAIN} == "null" ]] && CURCHAIN="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" # AVOID EMPTY + [[ ${CURCHAIN} == "" || ${CURCHAIN} == "null" ]] \ + && CURCHAIN="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" # AVOID EMPTY + echo "CURCHAIN=${CURCHAIN}" IPNSTAIL=$(echo ${ASTROPORT} | rev | cut -f 1 -d '/' | rev) # Remove "/ipns/" part echo "TW ASTROPORT GATEWAY : ${ASTROPORT}" @@ -136,94 +138,94 @@ for PLAYER in ${PLAYERONE[@]}; do ########### ASTROPORT is not IPFSNODEID => EJECT TW ## MOVED PLAYER (KEY IS KEPT ON LAST CONNECTED ASTROPORT) - if [[ ${IPNSTAIL} != ${IPFSNODEID} && ${IPNSTAIL} != "_ASTROPORT_" ]]; then + ## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + ## TODO UNPLUG PLAYER + ## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + if [[ ${IPNSTAIL} != ${IPFSNODEID} || ${IPNSTAIL} == "_ASTROPORT_" ]]; then echo "> I AM ${IPFSNODEID} : PLAYER MOVED TO ${IPNSTAIL} : EJECTION " - echo "REMOVE PLAYER & G1VOEU IPNS KEYS" - ipfs key rm "${PLAYER}" "${PLAYER}_feed" "$G1PUB" - for vk in $(ls -d ~/.zen/game/players/${PLAYER}/voeux/*/* | rev | cut -d / -f 1 | rev); do - ipfs key rm $vk - done - rm -Rf ~/.zen/game/players/${PLAYER}/ + echo "UNPLUG PLAYER" + ${MY_PATH}/../tools/PLAYER.unplug.sh "${HOME}/.zen/game/players/${PLAYER}/ipfs/moa/index.html" "${PLAYER}" echo ">>>> ASTRONAUT ${PLAYER} TW CAPSULE EJECTION TERMINATED" continue fi fi - ############################################################# - ## GWIP == myIP or TUBE !! - ############################################################# - # Connect_PLAYER_To_Gchange.sh : Sync FRIENDS TW - ############################################################## - echo "##################################################################" - echo "## GCHANGE+ & Ŋ1 EXPLORATION: Connect_PLAYER_To_Gchange.sh" - ${MY_PATH}/../tools/Connect_PLAYER_To_Gchange.sh "${PLAYER}" - ############### - # VOEUX.create.sh # - ############################################################## - ## SPECIAL TAG "voeu" => Creation G1Voeu (G1Titre) makes AstroBot TW G1Processing - ############################################################## - ${MY_PATH}/VOEUX.create.sh ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html "${PLAYER}" "${G1PUB}" + ############################################################# + ## GWIP == myIP or TUBE !! + ############################################################# + # Connect_PLAYER_To_Gchange.sh : Sync FRIENDS TW + ############################################################## + echo "##################################################################" + echo "## GCHANGE+ & Ŋ1 EXPLORATION: Connect_PLAYER_To_Gchange.sh" + ${MY_PATH}/../tools/Connect_PLAYER_To_Gchange.sh "${PLAYER}" - ############### - # VOEUX.refresh.sh # - ############################################################## - ## RUN ASTROBOT G1Voeux SUBPROCESS (SPECIFIC Ŋ1 COPY) - ############################################################## - ${MY_PATH}/VOEUX.refresh.sh "${PLAYER}" "${MOATS}" ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html + ############### + # VOEUX.create.sh # + ############################################################## + ## SPECIAL TAG "voeu" => Creation G1Voeu (G1Titre) makes AstroBot TW G1Processing + ############################################################## + ${MY_PATH}/VOEUX.create.sh ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html "${PLAYER}" "${G1PUB}" - ################### - # REFRESH PLAYER_feed # - ################################## - echo "# TW : GW API + LightBeam Feed + Friends" - TUBE=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 3) + ############### + # VOEUX.refresh.sh # + ############################################################## + ## RUN ASTROBOT G1Voeux SUBPROCESS (SPECIFIC Ŋ1 COPY) + ############################################################## + ${MY_PATH}/VOEUX.refresh.sh "${PLAYER}" "${MOATS}" ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html - FEEDNS=$(ipfs key list -l | grep -w "${PLAYER}_feed" | cut -d ' ' -f 1) - [[ ! ${FEEDNS} ]] && echo ">>>>> ERROR ${PLAYER}_feed IPNS KEY NOT FOUND - ERROR" && continue + ################### + # REFRESH PLAYER_feed # + ################################## + echo "# TW : GW API + LightBeam Feed + Friends" + TUBE=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 3) - # WRITE lightbeam params - echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-name","text":"'${PLAYER}_feed'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-name.json - echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-key","text":"'${FEEDNS}'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-key.json + FEEDNS=$(ipfs key list -l | grep -w "${PLAYER}_feed" | cut -d ' ' -f 1) + [[ ! ${FEEDNS} ]] && echo ">>>>> ERROR ${PLAYER}_feed IPNS KEY NOT FOUND - ERROR" && continue - ########################### - # Tiddlers controling GW & API - #~ echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"'$(myPlayerApiGw)'"}]' > ~/.zen/tmp/${MOATS}/5001.json - #~ echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"'$myIPFS'"}]' > ~/.zen/tmp/${MOATS}/8080.json + # WRITE lightbeam params + echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-name","text":"'${PLAYER}_feed'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-name.json + echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-key","text":"'${FEEDNS}'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-key.json - ## COPY DATA PRODUCED BY GCHANGE STAR EXTRACTION - FRIENDSFEEDS=$(cat ~/.zen/tmp/${IPFSNODEID}/RSS/${PLAYER}/FRIENDSFEEDS 2>/dev/null) - echo "FRIENDS qo-op FEEDS : "${FRIENDSFEEDS} - echo '[{"title":"$:/plugins/astroport/lightbeams/state/subscriptions","text":"'${FRIENDSFEEDS}'","tags":""}]' > ~/.zen/tmp/${MOATS}/friends.json + ########################### + # Tiddlers controling GW & API + #~ echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"'$(myPlayerApiGw)'"}]' > ~/.zen/tmp/${MOATS}/5001.json + #~ echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"'$myIPFS'"}]' > ~/.zen/tmp/${MOATS}/8080.json - ## WRITE TIDDLERS IN TW - tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \ - --import ~/.zen/tmp/${MOATS}/lightbeam-name.json "application/json" \ - --import ~/.zen/tmp/${MOATS}/lightbeam-key.json "application/json" \ - --import "$HOME/.zen/tmp/${MOATS}/friends.json" "application/json" \ - --output ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER} --render "$:/core/save/all" "newindex.html" "text/plain" + ## COPY DATA PRODUCED BY GCHANGE STAR EXTRACTION + FRIENDSFEEDS=$(cat ~/.zen/tmp/${IPFSNODEID}/RSS/${PLAYER}/FRIENDSFEEDS 2>/dev/null) + echo "FRIENDS qo-op FEEDS : "${FRIENDSFEEDS} + echo '[{"title":"$:/plugins/astroport/lightbeams/state/subscriptions","text":"'${FRIENDSFEEDS}'","tags":""}]' > ~/.zen/tmp/${MOATS}/friends.json - ## CHECK IT IS OK - [[ -s ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/newindex.html ]] \ - && cp ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/newindex.html ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \ - && rm ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/newindex.html - ########################### + ## WRITE TIDDLERS IN TW + tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \ + --import ~/.zen/tmp/${MOATS}/lightbeam-name.json "application/json" \ + --import ~/.zen/tmp/${MOATS}/lightbeam-key.json "application/json" \ + --import "$HOME/.zen/tmp/${MOATS}/friends.json" "application/json" \ + --output ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER} --render "$:/core/save/all" "newindex.html" "text/plain" - #################### + ## CHECK IT IS OK + [[ -s ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/newindex.html ]] \ + && cp ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/newindex.html ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \ + && rm ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/newindex.html + ########################### - ## ANY CHANGES ? - ############################################################## - DIFF=$(diff ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html) - if [[ $DIFF ]]; then - echo "DIFFERENCE DETECTED !! " - echo "Backup & Upgrade TW local copy..." - cp ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html + #################### - [[ -s ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain ]] \ - && ZCHAIN=$(cat ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain) \ - && echo "# CHAIN : ${CURCHAIN} -> ${ZCHAIN}" \ - && [[ ${CURCHAIN} != "" && ${ZCHAIN} != "" ]] \ - && sed -i "s~${CURCHAIN}~${ZCHAIN}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html - fi - ############################################################## + ## ANY CHANGES ? + ############################################################## + DIFF=$(diff ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html) + if [[ $DIFF ]]; then + echo "DIFFERENCE DETECTED !! " + echo "Backup & Upgrade TW local copy..." + cp ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html + + [[ -s ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain ]] \ + && ZCHAIN=$(cat ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain) \ + && echo "# CHAIN : ${CURCHAIN} -> ${ZCHAIN}" \ + && [[ ${CURCHAIN} != "" && ${ZCHAIN} != "" ]] \ + && sed -i "s~${CURCHAIN}~${ZCHAIN}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html + fi + ############################################################## ################################################## ################################################## diff --git a/command.sh b/command.sh index dc152af5..83e1568a 100755 --- a/command.sh +++ b/command.sh @@ -10,7 +10,7 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized TS=$(date -u +%s%N | cut -b1-13) MOATS=$(date -u +"%Y%m%d%H%M%S%4N") -mkdir -p ~/.zen/tmp/${MOATS} +#~ mkdir -p ~/.zen/tmp/${MOATS} echo ' _ ____ _____ ____ ___ ____ ___ ____ _____ ___ _ _ _____ @@ -137,55 +137,7 @@ select fav in "${choices[@]}"; do echo "Enter to continue. Ctrl+C to stop" read espeak "Droping TW in cyber space" - - ## REMOVING PLAYER FROM UMAP - ## GET "GPS" TIDDLER - tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \ - --output ~/.zen/tmp/${MOATS} \ - --render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler - TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap) - LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat) - LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon) - echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}" - rm ~/.zen/tmp/${MOATS}/GPS.json - - ### IPNS "$LAT" "$LON" KEY - ${MY_PATH}/tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/_ipns.priv "$LAT" "$LON" - IMAPNS="/ipns/"$(ipfs key import ${MOATS} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/_ipns.priv) - rm ~/.zen/tmp/${MOATS}/_ipns.priv - ### GET IMAPNS - - if [[ ${IMAPNS} != ${TWMAPNS} ]]; then - echo "ERROR TW/GPS ERROR : IMAPNS ${IMAPNS}" - echo " - MANUAL GPS SETTINGS NEEDED " - echo "- CONTINUE -" - else - # Modifying UMAP - echo "ipfs --timeout 42s get -o ~/.zen/tmp/${MOATS}/ ${TWMAPNS}/" - ipfs --timeout 42s get -o ~/.zen/tmp/${MOATS}/ ${TWMAPNS}/ - ## REMOVE PLAYER REFERENCES from UMAP - rm -f ~/.zen/tmp/${MOATS}/*/_${PLAYER}.HPASS - rm -f ~/.zen/tmp/${MOATS}/*${PLAYER}.asc - rm -f ~/.zen/tmp/${MOATS}/*${PLAYER}.jpg - rm -Rf ~/.zen/tmp/${MOATS}/TW/${PLAYER} - ## UPDATE IPFSROOT - IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1) && echo "NEW ROOT ${IPFSROOT}" - ## PUBLISH NEW UMAPNS - ipfs name publish --key=${MOATS} /ipfs/${IPFSROOT} - ipfs key rm ${MOATS} && echo "IPNS key identified" - ### - fi - - ## REMOVING PLAYER from ASTROPORT - ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB}; - for vk in $(ls -d ~/.zen/game/players/${PLAYER}/voeux/*/* | rev | cut -d / -f 1 | rev); do - ipfs key rm ${vk} - done - - echo "PLAYER IPNS KEYS UNPLUGD" - echo "rm -Rf ~/.zen/game/players/$PLAYER" - rm -Rf ~/.zen/game/players/$PLAYER - rm -Rf ~/.zen/tmp/${MOATS} + ${MY_PATH}/tools/PLAYER.unplug.sh "${HOME}/.zen/game/players/${PLAYER}/ipfs/moa/index.html" "${PLAYER}" break ;; diff --git a/tools/PLAYER.unplug.sh b/tools/PLAYER.unplug.sh new file mode 100755 index 00000000..8cf945a9 --- /dev/null +++ b/tools/PLAYER.unplug.sh @@ -0,0 +1,76 @@ +#!/bin/bash +################################################################################ +# Author: Fred (support@qo-op.com) +# Version: 0.2 +# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) +################################################################################ +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized +. "$MY_PATH/my.sh" +################################################################################ +## UNPLUG A PLAYER FROM ASTROPORT STATION +############################################ +[[ ${IPFSNODEID} == "" ]] && echo "IPFSNODEID is empty - EXIT -" && exit 1 + +INDEX="$1" +[[ ! -s ${INDEX} ]] && echo "INDEX ${INDEX} NOT FOUND - EXIT -" && exit 1 + +PLAYER="$2" +[[ ! -s ~/.zen/game/players/${PLAYER}/secret.dunikey ]] && echo "PLAYER ${PLAYER} NOT FOUND - EXIT -" && exit 1 + +MOATS=$(date -u +"%Y%m%d%H%M%S%4N") +mkdir -p ~/.zen/tmp/${MOATS} + +## REMOVING PLAYER FROM UMAP + ## GET "GPS" TIDDLER + tiddlywiki --load ${INDEX} \ + --output ~/.zen/tmp/${MOATS} \ + --render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler + TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap) + LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat) + LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon) + echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}" + rm ~/.zen/tmp/${MOATS}/GPS.json + + ### IPNS "$LAT" "$LON" KEY + ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/_ipns.priv "$LAT" "$LON" + IMAPNS="/ipns/"$(ipfs key import ${MOATS} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/_ipns.priv) + rm ~/.zen/tmp/${MOATS}/_ipns.priv + ### GET IMAPNS + +## DOES IT NEED UMAP CORRECTION ? + if [[ ${IMAPNS} != ${TWMAPNS} ]]; then + echo "ERROR TW/GPS ERROR : IMAPNS ${IMAPNS}" + echo " - MANUAL GPS CORRECTION NEEDED " + echo "- CONTINUE -" + else + # Modifying UMAP + echo "ipfs --timeout 42s get -o ~/.zen/tmp/${MOATS}/ ${TWMAPNS}/" + ipfs --timeout 42s get -o ~/.zen/tmp/${MOATS}/ ${TWMAPNS}/ + ## REMOVE PLAYER REFERENCES from UMAP + rm -f ~/.zen/tmp/${MOATS}/*/_${PLAYER}.HPASS + rm -f ~/.zen/tmp/${MOATS}/*${PLAYER}.asc + rm -f ~/.zen/tmp/${MOATS}/*${PLAYER}.jpg + rm -Rf ~/.zen/tmp/${MOATS}/TW/${PLAYER} + ## UPDATE IPFSROOT + IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1) && echo "UMAP NEW ROOT ${IPFSROOT}" + ## PUBLISH NEW UMAPNS + ipfs name publish --key=${MOATS} /ipfs/${IPFSROOT} + ipfs key rm ${MOATS} && echo "UMAP IPNS PUBLISHING FINISHED" + ### + fi + +## REMOVING PLAYER from ASTROPORT + ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB}; + for vk in $(ls -d ~/.zen/game/players/${PLAYER}/voeux/*/* | rev | cut -d / -f 1 | rev); do + ipfs key rm ${vk} + done + + echo "PLAYER IPNS KEYS UNPLUGED" + echo "rm -Rf ~/.zen/game/players/${PLAYER}" + rm -Rf ~/.zen/game/players/${PLAYER} + +echo "CLEANING SESSION CACHE" +rm -Rf ~/.zen/tmp/${MOATS} + +exit 0