From 699e51a576a9d81905f126b2b817bda5ea119705 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 17 Oct 2023 21:26:04 +0200 Subject: [PATCH] coucou is for COIN.check only (other goes to MOATS temp dir) --- 20h12.process.sh | 4 +- API/QRCODE.sh | 64 +++++++++++++++--------------- API/SALT.sh | 99 ++++++++++++++++++++++++----------------------- tools/TW.cache.sh | 18 +++++---- 4 files changed, 95 insertions(+), 90 deletions(-) diff --git a/20h12.process.sh b/20h12.process.sh index 0ae6d73f..4c485462 100755 --- a/20h12.process.sh +++ b/20h12.process.sh @@ -12,8 +12,10 @@ espeak "Ding" > /dev/null 2>&1 ## REMOVE TMP BUT KEEP SWARM mv ~/.zen/tmp/swarm ~/.zen/swarm +mv ~/.zen/tmp/coucou ~/.zen/coucou rm -Rf ~/.zen/tmp/* mv ~/.zen/swarm ~/.zen/tmp/swarm +mv ~/.zen/coucou ~/.zen/tmp/coucou ## IPFS DAEMON STATUS LOWMODE=$(sudo systemctl status ipfs | grep disabled) ## IPFS DISABLED - START ONLY FOR SYNC - @@ -84,7 +86,7 @@ espeak "duration was $dur seconds" > /dev/null 2>&1 espeak "Restarting Astroport Station API" > /dev/null 2>&1 ## CLOSING API PORT -[[ -s ~/.zen/.pid ]] && kill -9 $(cat ~/.zen/.pid) +[[ -s ~/.zen/.pid ]] && kill -9 $(cat ~/.zen/.pid) > /dev/null 2>&1 ## KILL ALL REMAINING nc killall nc 12345.sh ## OPEN API ENGINE diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 923917a2..7f47896c 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -222,16 +222,16 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then && PLAYER=${salt} \ || PLAYER=${WHAT} - echo "TW : $myIPFS/ipns/$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1)" > ~/.zen/tmp/coucou/${MOATS}.log - echo "

$PLAYER LOGOUT ...

" >> ~/.zen/tmp/coucou/${MOATS}.log - ipfs key rm ${G1PUB} >> ~/.zen/tmp/coucou/${MOATS}.log - ipfs key rm ${PLAYER} >> ~/.zen/tmp/coucou/${MOATS}.log - ipfs key rm "${PLAYER}_feed" >> ~/.zen/tmp/coucou/${MOATS}.log + echo "TW : $myIPFS/ipns/$(ipfs key list -l | grep -w ${PLAYER} | cut -d ' ' -f1)" > ~/.zen/tmp/${MOATS}/${MOATS}.log + echo "

$PLAYER LOGOUT ...

" >> ~/.zen/tmp/${MOATS}/${MOATS}.log + ipfs key rm ${G1PUB} >> ~/.zen/tmp/${MOATS}/${MOATS}.log + ipfs key rm ${PLAYER} >> ~/.zen/tmp/${MOATS}/${MOATS}.log + ipfs key rm "${PLAYER}_feed" >> ~/.zen/tmp/${MOATS}/${MOATS}.log - echo "$HTTPCORS $(cat ~/.zen/tmp/coucou/${MOATS}.log)"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & + echo "$HTTPCORS $(cat ~/.zen/tmp/${MOATS}/${MOATS}.log)"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & end=`date +%s` echo $APPNAME "(☉_☉ ) Execution time was "`expr $end - $start` seconds. - rm ~/.zen/tmp/coucou/${MOATS}.* + rm ~/.zen/tmp/${MOATS}/${MOATS}.* exit 0 fi @@ -272,7 +272,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then echo "url='"${REPLACE}"'" >> ~/.zen/tmp/${MOATS}.index.redirect ( cat ~/.zen/tmp/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 - echo "BLURP " && rm -Rf ~/.zen/tmp/${MOATS} && rm ~/.zen/tmp/coucou/${MOATS}* + echo "BLURP " && rm -Rf ~/.zen/tmp/${MOATS} && rm ~/.zen/tmp/${MOATS}/${MOATS}* ) & exit 0 @@ -413,16 +413,16 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then G1VOEUNS=$(${MY_PATH}/../tools/g1_to_ipfs.py ${G1VOEUPUB}) ## RETRIEVE IPNS CONTENT echo "http://127.0.0.1:8080/ipns/$G1VOEUNS" - if [[ ! -s ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt ]]; then + if [[ ! -s ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt ]]; then HELLO="@PASS :: G1BILLET+ :: ${G1VOEUPUB} :: $(date) :: ${player} :: ${PLAYERORIG1}" echo "${HELLO}" avanla=$(ps axf --sort=+utime | grep -w 'ipfs cat /ipns/$G1VOEUNS' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) [[ ! $avanla ]] \ - && ( ipfs cat /ipns/$G1VOEUNS > ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt \ - && [[ ! -s ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt ]] \ + && ( ipfs cat /ipns/$G1VOEUNS > ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt \ + && [[ ! -s ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt ]] \ && echo "@PASS G1BILLET+ INIT" \ - && echo "${HELLO}" > ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt \ - && MILGRAM=$(ipfs add -q ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt) \ + && echo "${HELLO}" > ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt \ + && MILGRAM=$(ipfs add -q ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt) \ && ipfs name publish -k ${player}_${VoeuName} /ipfs/${MILGRAM} & ) & @@ -435,7 +435,7 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then fi echo "

" >> ~/.zen/tmp/${MOATS}/disco - cat ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt >> ~/.zen/tmp/${MOATS}/disco + cat ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt >> ~/.zen/tmp/${MOATS}/disco [[ ${NEWLINE} == "" || ${NEWLINE} == "undefined" ]] && echo "
NO NEW LINE
" >> ~/.zen/tmp/${MOATS}/disco [[ ${DESTMAIL} == "" || ${DESTMAIL} == "undefined" ]] && echo "
Missing Destination EMAIL
" >> ~/.zen/tmp/${MOATS}/disco @@ -466,14 +466,14 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then ## ADD NEWLINE TO MESSAGE if [[ ${NEWLINE} != "" ]]; then CLINE=$(echo "${NEWLINE}" | detox --inline) - echo "$CLINE" >> ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt ## NB: File could still being into "ipfs cat" process... TODO MAKE BETTER + echo "$CLINE" >> ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt ## NB: File could still being into "ipfs cat" process... TODO MAKE BETTER fi echo "UPDATED" >> ~/.zen/tmp/${MOATS}/disco - cat ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt >> ~/.zen/tmp/${MOATS}/disco + cat ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt >> ~/.zen/tmp/${MOATS}/disco echo "
" >> ~/.zen/tmp/${MOATS}/disco - MILGRAM=$(ipfs add -q ~/.zen/tmp/coucou/${PLAYERORIG1}.${VoeuName}.missive.txt) + MILGRAM=$(ipfs add -q ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt) ( ipfs name publish -k ${DESTMAIL}_${VoeuName} /ipfs/${MILGRAM} @@ -693,12 +693,12 @@ else ## GET G1 WALLET HISTORY if [[ ${VISITORCOINS} != "null" && ${VISITORCOINS} -gt 0 ]]; then - [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.g1history.json ]] \ - && ${MY_PATH}/../tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/coucou/${QRCODE}.g1history.json + [[ ! -s ~/.zen/tmp/${MOATS}/${QRCODE}.g1history.json ]] \ + && ${MY_PATH}/../tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/${MOATS}/${QRCODE}.g1history.json echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect echo "

Solde $VISITORCOINS Ǧ1

" >> ~/.zen/tmp/${MOATS}/index.redirect - echo "

HISTORIQUE ${QRCODE}

" >> ~/.zen/tmp/${MOATS}/index.redirect + echo "

HISTORIQUE ${QRCODE}

" >> ~/.zen/tmp/${MOATS}/index.redirect ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS} @@ -708,10 +708,10 @@ else fi ## SCAN GCHANGE + - [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.gchange.json ]] \ - && ${MY_PATH}/../tools/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${QRCODE} > ~/.zen/tmp/coucou/${QRCODE}.gchange.json & + [[ ! -s ~/.zen/tmp/${MOATS}/${QRCODE}.gchange.json ]] \ + && ${MY_PATH}/../tools/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${QRCODE} > ~/.zen/tmp/${MOATS}/${QRCODE}.gchange.json & - GFOUND=$(cat ~/.zen/tmp/coucou/${QRCODE}.gchange.json | jq -r '.found') + GFOUND=$(cat ~/.zen/tmp/${MOATS}/${QRCODE}.gchange.json | jq -r '.found') echo "FOUND IN GCHANGE+ ? $GFOUND" if [[ $GFOUND == "false" ]]; then @@ -723,14 +723,14 @@ else exit 0 else [[ $VISITORCOINS == "null" ]] && PALPE=10 \ - && echo "~/.zen/tmp/coucou/${QRCODE}.gchange.json CHECK : PALPE=10" + && echo "~/.zen/tmp/${MOATS}/${QRCODE}.gchange.json CHECK : PALPE=10" fi ## SCAN CESIUM + - [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.gplus.json ]] \ - && ${MY_PATH}/../tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${QRCODE} > ~/.zen/tmp/coucou/${QRCODE}.gplus.json 2>/dev/null & + [[ ! -s ~/.zen/tmp/${MOATS}/${QRCODE}.gplus.json ]] \ + && ${MY_PATH}/../tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${QRCODE} > ~/.zen/tmp/${MOATS}/${QRCODE}.gplus.json 2>/dev/null & - GCFOUND=$(cat ~/.zen/tmp/coucou/${QRCODE}.gplus.json | jq -r '.found') + GCFOUND=$(cat ~/.zen/tmp/${MOATS}/${QRCODE}.gplus.json | jq -r '.found') echo "FOUND IN CESIUM+ ? $GCFOUND" if [[ $GCFOUND == "false" ]]; then @@ -742,11 +742,11 @@ else exit 0 else [[ $VISITORCOINS == "null" ]] && PALPE=50 \ - && echo "~/.zen/tmp/coucou/${QRCODE}.gplus.json CHECK : PALPE=50" + && echo "~/.zen/tmp/${MOATS}/${QRCODE}.gplus.json CHECK : PALPE=50" fi ## CHECK IF GCHANGE IS LINKED TO "A DECLARED CESIUM" - CPLUS=$(cat ~/.zen/tmp/coucou/${QRCODE}.gchange.json | jq -r '._source.pubkey' 2>/dev/null) + CPLUS=$(cat ~/.zen/tmp/${MOATS}/${QRCODE}.gchange.json | jq -r '._source.pubkey' 2>/dev/null) echo "CPLUS=$CPLUS" ## SCAN GPUB CESIUM + @@ -754,10 +754,10 @@ else if [[ $CPLUS != "" && $CPLUS != 'null' && $CPLUS != $QRCODE ]]; then ## SCAN FOR CPLUS CESIUM + ACCOUNT - [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.cplus.json ]] \ - && ${MY_PATH}/../tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${CPLUS} > ~/.zen/tmp/coucou/${QRCODE}.cplus.json 2>/dev/null & + [[ ! -s ~/.zen/tmp/${MOATS}/${QRCODE}.cplus.json ]] \ + && ${MY_PATH}/../tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${CPLUS} > ~/.zen/tmp/${MOATS}/${QRCODE}.cplus.json 2>/dev/null & - CCFOUND=$(cat ~/.zen/tmp/coucou/${QRCODE}.cplus.json | jq -r '.found') + CCFOUND=$(cat ~/.zen/tmp/${MOATS}/${QRCODE}.cplus.json | jq -r '.found') if [[ $CCFOUND == "false" ]]; then echo "AUCUN CCPLUS : MEMBRE LIE" diff --git a/API/SALT.sh b/API/SALT.sh index 8140493d..c6be125f 100755 --- a/API/SALT.sh +++ b/API/SALT.sh @@ -24,6 +24,7 @@ Server: Astroport.ONE Content-Type: text/html; charset=UTF-8 " +mkdir -p ~/.zen/tmp/${MOATS}/ [[ ! $APPNAME || $SALT == "pepper" ]] && echo "NO APPNAME - BAD APP - CONTINUE" && (echo "$HTTPCORS ERROR - BAD CREDENTIALS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 ############################################################################ @@ -36,19 +37,19 @@ Content-Type: text/html; charset=UTF-8 ## SAVE "salt" "pepper" DEBUG REMOVE OR PASS ENCRYPT FOR SECURITY REASON echo "PLAYER : \"$SALT\" \"$PEPPER\" : $APPNAME ($WHAT)" - echo "\"$SALT\" \"$PEPPER\"" > ~/.zen/tmp/coucou/${MOATS}.secret.june + echo "\"$SALT\" \"$PEPPER\"" > ~/.zen/tmp/${MOATS}/${MOATS}.secret.june # CALCULATING ${MOATS}.secret.key + G1PUB - ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/coucou/${MOATS}.secret.key "$SALT" "$PEPPER" - G1PUB=$(cat ~/.zen/tmp/coucou/${MOATS}.secret.key | grep 'pub:' | cut -d ' ' -f 2) + ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/${MOATS}.secret.key "$SALT" "$PEPPER" + G1PUB=$(cat ~/.zen/tmp/${MOATS}/${MOATS}.secret.key | grep 'pub:' | cut -d ' ' -f 2) [[ ! ${G1PUB} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - KEYGEN COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 echo "G1PUB : ${G1PUB}" ## CALCULATING ${MOATS}.${G1PUB}.ipns.key ADDRESS ipfs key rm ${G1PUB} > /dev/null 2>&1 - rm -f ~/.zen/tmp/coucou/${MOATS}.${G1PUB}.ipns.key - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/coucou/${MOATS}.${G1PUB}.ipns.key "$SALT" "$PEPPER" - ASTRONAUTENS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/coucou/${MOATS}.${G1PUB}.ipns.key ) + rm -f ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key "$SALT" "$PEPPER" + ASTRONAUTENS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key ) [[ ! ${ASTRONAUTENS} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - ASTRONAUTENS COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 echo "TW ADDRESS : $myIPFS/ipns/${ASTRONAUTENS}" @@ -67,29 +68,29 @@ Content-Type: text/html; charset=UTF-8 echo "Extracting ${G1PUB} messages..." ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \ - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key read -n 10 -j > ~/.zen/tmp/coucou/messin.${G1PUB}.json - [[ ! -s ~/.zen/tmp/coucou/messin.${G1PUB}.json || $(grep -v -E 'Aucun message à afficher' ~/.zen/tmp/coucou/messin.${G1PUB}.json) == "True" ]] && echo "[]" > ~/.zen/tmp/coucou/messin.${G1PUB}.json + ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/${MOATS}.secret.key read -n 10 -j > ~/.zen/tmp/${MOATS}/messin.${G1PUB}.json + [[ ! -s ~/.zen/tmp/${MOATS}/messin.${G1PUB}.json || $(grep -v -E 'Aucun message à afficher' ~/.zen/tmp/${MOATS}/messin.${G1PUB}.json) == "True" ]] && echo "[]" > ~/.zen/tmp/${MOATS}/messin.${G1PUB}.json ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \ - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key read -n 10 -j -o > ~/.zen/tmp/coucou/messout.${G1PUB}.json - [[ ! -s ~/.zen/tmp/coucou/messout.${G1PUB}.json || $(grep -v -E 'Aucun message à afficher' ~/.zen/tmp/coucou/messout.${G1PUB}.json) == "True" ]] && echo "[]" > ~/.zen/tmp/coucou/messout.${G1PUB}.json + ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/${MOATS}.secret.key read -n 10 -j -o > ~/.zen/tmp/${MOATS}/messout.${G1PUB}.json + [[ ! -s ~/.zen/tmp/${MOATS}/messout.${G1PUB}.json || $(grep -v -E 'Aucun message à afficher' ~/.zen/tmp/${MOATS}/messout.${G1PUB}.json) == "True" ]] && echo "[]" > ~/.zen/tmp/${MOATS}/messout.${G1PUB}.json - echo "Creating messages In/Out JSON ~/.zen/tmp/coucou/${MOATS}.messaging.json" - echo '[' > ~/.zen/tmp/coucou/${MOATS}.messaging.json - cat ~/.zen/tmp/coucou/messin.${G1PUB}.json >> ~/.zen/tmp/coucou/${MOATS}.messaging.json - echo "," >> ~/.zen/tmp/coucou/${MOATS}.messaging.json - cat ~/.zen/tmp/coucou/messout.${G1PUB}.json >> ~/.zen/tmp/coucou/${MOATS}.messaging.json - echo ']' >> ~/.zen/tmp/coucou/${MOATS}.messaging.json + echo "Creating messages In/Out JSON ~/.zen/tmp/${MOATS}/${MOATS}.messaging.json" + echo '[' > ~/.zen/tmp/${MOATS}/${MOATS}.messaging.json + cat ~/.zen/tmp/${MOATS}/messin.${G1PUB}.json >> ~/.zen/tmp/${MOATS}/${MOATS}.messaging.json + echo "," >> ~/.zen/tmp/${MOATS}/${MOATS}.messaging.json + cat ~/.zen/tmp/${MOATS}/messout.${G1PUB}.json >> ~/.zen/tmp/${MOATS}/${MOATS}.messaging.json + echo ']' >> ~/.zen/tmp/${MOATS}/${MOATS}.messaging.json ## ADDING HTTP/1.1 PROTOCOL HEADER - echo "$HTTPCORS" > ~/.zen/tmp/coucou/${MOATS}.index.redirect - sed -i "s~text/html~application/json~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect - cat ~/.zen/tmp/coucou/${MOATS}.messaging.json >> ~/.zen/tmp/coucou/${MOATS}.index.redirect + echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect + sed -i "s~text/html~application/json~g" ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect + cat ~/.zen/tmp/${MOATS}/${MOATS}.messaging.json >> ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect ## SEND REPONSE PROCESS IN BACKGROUD - ( cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && rm ~/.zen/tmp/coucou/${MOATS}* ) & + ( cat ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && rm ~/.zen/tmp/${MOATS}/${MOATS}* ) & #~ ( ## USING IPNS SESSION KEY - #~ REPONSE=$(cat ~/.zen/tmp/coucou/${MOATS}.messaging.json | ipfs add -q) + #~ REPONSE=$(cat ~/.zen/tmp/${MOATS}/${MOATS}.messaging.json | ipfs add -q) #~ ipfs name publish --allow-offline --key=${PORT} /ipfs/$REPONSE #~ echo "SESSION ${myIPFS}/ipns/$SESSIONNS " #~ ) & @@ -119,17 +120,17 @@ Content-Type: text/html; charset=UTF-8 echo ${REPLACE} ## REDIRECT TO TW OR GCHANGE PROFILE - sed "s~_TWLINK_~${REPLACE}/~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/coucou/${MOATS}.index.redirect + sed "s~_TWLINK_~${REPLACE}/~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect ## USED BY https://git.p2p.legal/La_Bureautique/zeg1jeux/src/branch/main/lib/Fred.class.php#L81 - echo "url='"${REPLACE}"'" >> ~/.zen/tmp/coucou/${MOATS}.index.redirect + echo "url='"${REPLACE}"'" >> ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect ### REPONSE=$(echo $myGCHANGE/#/app/user/${G1PUB}/ | ipfs add -q) ### ipfs name publish --allow-offline --key=${PORT} /ipfs/$REPONSE ### echo "SESSION ${myIPFS}/ipns/$SESSIONNS " ( - cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 + cat ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 ${MY_PATH}/../tools/TW.cache.sh ${ASTRONAUTENS} ${MOATS} - rm ~/.zen/tmp/coucou/${MOATS}* + rm ~/.zen/tmp/${MOATS}/${MOATS}* ) & end=`date +%s` echo $APPNAME" (0‿‿0) ${WHAT} Execution time was "`expr $end - $start` seconds. @@ -304,11 +305,11 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh # cp ~/.zen/tmp/${IPFSNODEID}/${APPNAME}/${PLAYER}/${MOATS}.data.${WHAT} ~/.zen/tmp/${IPFSNODEID}/${APPNAME}/${RWHAT}.${TWHAT} ## REPONSE ON PORT - echo "$HTTPCORS" > ~/.zen/tmp/coucou/${MOATS}.index.redirect - sed -i "s~text/html~application/json~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect - cat ~/.zen/tmp/${IPFSNODEID}/${APPNAME}/${PLAYER}/${MOATS}.data.${WHAT} >> ~/.zen/tmp/coucou/${MOATS}.index.redirect + echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect + sed -i "s~text/html~application/json~g" ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect + cat ~/.zen/tmp/${IPFSNODEID}/${APPNAME}/${PLAYER}/${MOATS}.data.${WHAT} >> ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect - (cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && rm ~/.zen/tmp/coucou/${MOATS}.* ) & + (cat ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && rm ~/.zen/tmp/${MOATS}/${MOATS}.* ) & ## REPONSE ON IPFSNODEID ( @@ -387,13 +388,13 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh g1friend=${WHAT} stars=${VAL:-1} // Default 1 ★ - $MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key stars -p $g1friend -n $stars > ~/.zen/tmp/coucou/${MOATS}.log + $MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/${MOATS}.secret.key stars -p $g1friend -n $stars > ~/.zen/tmp/${MOATS}/${MOATS}.log ( - echo "$HTTPCORS $(cat ~/.zen/tmp/coucou/${MOATS}.log)"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 + echo "$HTTPCORS $(cat ~/.zen/tmp/${MOATS}/${MOATS}.log)"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 ) & - rm ~/.zen/tmp/coucou/${MOATS}.* + rm ~/.zen/tmp/${MOATS}/${MOATS}.* end=`date +%s` echo $APPNAME "(☉_☉ ) ${MESTAR} Execution time was "`expr $end - $start` seconds. exit 0 @@ -408,7 +409,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh url='"${ASTRONAUTENS}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getipns : ${ASTRONAUTENS}" ) & end=`date +%s` echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds. - rm ~/.zen/tmp/coucou/${MOATS}.* + rm ~/.zen/tmp/${MOATS}/${MOATS}.* exit 0 fi @@ -423,7 +424,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh ) & end=`date +%s` echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds. - rm ~/.zen/tmp/coucou/${MOATS}* + rm ~/.zen/tmp/${MOATS}/${MOATS}* exit 0 fi @@ -437,7 +438,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh && PLAYER=${SALT} \ || PLAYER=${WHAT} - ipfs key import ${PLAYER} -f pem-pkcs8-cleartext ~/.zen/tmp/coucou/${MOATS}.${G1PUB}.ipns.key + ipfs key import ${PLAYER} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key ASTRONAUTENS=$(ipfs key list -l | grep -w $PLAYER | cut -d ' ' -f1) #~ WSTATION=$(cat ~/.zen/tmp/WSTATION 2>/dev/null) @@ -450,16 +451,16 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh USALT=$(echo "$SALT" | jq -Rr @uri) UPEPPER=$(echo "$PEPPER" | jq -Rr @uri) echo "/?salt=${USALT}&pepper=${UPEPPER} IS LOGIN - OPEN TW -" - sed "s~_TWLINK_~${REPLACE}~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/coucou/${MOATS}.index.redirect + sed "s~_TWLINK_~${REPLACE}~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect ## SET COOKIE - #~ sed -i "s~_USALT_~${USALT}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect - #~ sed -i "s~_UPEPPER_~${UPEPPER}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect - echo "url='"${REPLACE}"'" >> ~/.zen/tmp/coucou/${MOATS}.index.redirect + #~ sed -i "s~_USALT_~${USALT}~g" ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect + #~ sed -i "s~_UPEPPER_~${UPEPPER}~g" ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect + echo "url='"${REPLACE}"'" >> ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect ( - cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 + cat ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 echo "BLURP ${PORT}" ) & - rm ~/.zen/tmp/coucou/${MOATS}* + rm ~/.zen/tmp/${MOATS}/${MOATS}* end=`date +%s` echo $APPNAME "(☉_☉ ) Execution time was "`expr $end - $start` seconds. exit 0 @@ -476,15 +477,15 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh && PLAYER=${SALT} \ || PLAYER=${WHAT} - echo "

$PLAYER LOGOUT OK

" > ~/.zen/tmp/coucou/${MOATS}.log + echo "

$PLAYER LOGOUT OK

" > ~/.zen/tmp/${MOATS}/${MOATS}.log - ipfs key rm ${G1PUB} >> ~/.zen/tmp/coucou/${MOATS}.log - ipfs key rm ${PLAYER} >> ~/.zen/tmp/coucou/${MOATS}.log + ipfs key rm ${G1PUB} >> ~/.zen/tmp/${MOATS}/${MOATS}.log + ipfs key rm ${PLAYER} >> ~/.zen/tmp/${MOATS}/${MOATS}.log - echo "$HTTPCORS $(cat ~/.zen/tmp/coucou/${MOATS}.log)"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & + echo "$HTTPCORS $(cat ~/.zen/tmp/${MOATS}/${MOATS}.log)"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & end=`date +%s` echo $APPNAME "(☉_☉ ) Execution time was "`expr $end - $start` seconds. - rm ~/.zen/tmp/coucou/${MOATS}.* + rm ~/.zen/tmp/${MOATS}/${MOATS}.* exit 0 fi @@ -496,13 +497,13 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh ## END RESPONDING - [[ ! -s ~/.zen/tmp/coucou/${MOATS}.index.redirect ]] && echo "$HTTPCORS PORT=$1 THAT=$2 AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 url=/user/$G1PUB" > ~/.zen/tmp/coucou/${MOATS}.index.redirect - cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > ~/.zen/tmp/coucou/${MOATS}.official.swallow & + [[ ! -s ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect ]] && echo "$HTTPCORS PORT=$1 THAT=$2 AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 url=/user/$G1PUB" > ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect + cat ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > ~/.zen/tmp/${MOATS}/${MOATS}.official.swallow & echo "HTTP 1.1 PROTOCOL DOCUMENT READY" echo "${MOATS} -----> PAGE AVAILABLE -----> http://${myHOST}:${PORT}" end=`date +%s` echo $type" (J‿‿J) Execution time was "`expr $end - $start` seconds. - rm ~/.zen/tmp/coucou/${MOATS}.* + rm ~/.zen/tmp/${MOATS}/${MOATS}.* exit 0 diff --git a/tools/TW.cache.sh b/tools/TW.cache.sh index 6d79e570..ce828125 100755 --- a/tools/TW.cache.sh +++ b/tools/TW.cache.sh @@ -10,25 +10,27 @@ MOATS="$2" [[ ! ${ASTRONAUTENS} || ! $MOATS ]] && echo "${ME} : ASTRONAUTENS & MOATS needed" && exit 1 +mkdir -p ~/.zen/tmp/${MOATS} + start=$(date +%s) if [[ ${IPFSNODEID} == "" ]]; then IPFSNODEID=$(ipfs --timeout 12s id -f='\n') fi ## GETTING LAST TW via IPFS echo "${ME} : IPFS : ipfs --timeout 120s cat /ipns/${ASTRONAUTENS}"\ - && ipfs --timeout 360s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/coucou/${MOATS}.astroindex.html + && ipfs --timeout 360s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html ## GETTING LAST TW via HTTP - #~ [[ ! -s ~/.zen/tmp/coucou/${MOATS}.astroindex.html ]] \ + #~ [[ ! -s ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html ]] \ #~ && echo "${ME} : WWW : $myTUBE/ipns/${ASTRONAUTENS}" \ - #~ && curl -m 60 -so ~/.zen/tmp/coucou/${MOATS}.astroindex.html "$myTUBE/ipns/${ASTRONAUTENS}" \ + #~ && curl -m 60 -so ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html "$myTUBE/ipns/${ASTRONAUTENS}" \ #~ || curl -m 1 -so ~/.zen/tmp/${MOATS}.html "$myTUBE/ipns/${ASTRONAUTENS}" ## Ask caching ### GOT TW !! - if [[ -s ~/.zen/tmp/coucou/${MOATS}.astroindex.html ]]; then + if [[ -s ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html ]]; then echo "${ME} : GOT TW !!" - tiddlywiki --load ~/.zen/tmp/coucou/${MOATS}.astroindex.html --output ~/.zen/tmp --render '.' ${MOATS}'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' + tiddlywiki --load ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html --output ~/.zen/tmp --render '.' ${MOATS}'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' [[ ! -s ~/.zen/tmp/${MOATS}MadeInZion.json ]] && echo "${ME} : BAD TW (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 1 PLAYER=$(cat ~/.zen/tmp/${MOATS}MadeInZion.json | jq -r .[].player) @@ -37,7 +39,7 @@ fi if [[ "${PLAYER}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then echo "${ME} : VALID PLAYER (✜‿‿✜) $PLAYER " - tiddlywiki --load ~/.zen/tmp/coucou/${MOATS}.astroindex.html --output ~/.zen/tmp --render '.' ${MOATS}'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' + tiddlywiki --load ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html --output ~/.zen/tmp --render '.' ${MOATS}'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' [[ ! -s ~/.zen/tmp/${MOATS}Astroport.json ]] && echo "${ME} : BAD TW (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 1 ## EXPORT PLAYER VALUE TO CALLING SCRIPT @@ -51,8 +53,8 @@ fi ## IN CACHE echo "${ME} : CACHING ~/.zen/tmp/${IPFSNODEID}/$PLAYER/" mkdir -p ~/.zen/tmp/${IPFSNODEID}/$PLAYER/ - cp -f ~/.zen/tmp/coucou/${MOATS}.astroindex.html ~/.zen/tmp/${IPFSNODEID}/$PLAYER/index.html \ - && rm ~/.zen/tmp/coucou/${MOATS}.astroindex.html + cp -f ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html ~/.zen/tmp/${IPFSNODEID}/$PLAYER/index.html \ + && rm ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html ### NO TW !! else