This commit is contained in:
fred 2023-09-01 20:15:15 +02:00
parent f4371a1375
commit c7bd3b2298
4 changed files with 89 additions and 42 deletions

View File

@ -44,20 +44,21 @@ mkdir -p ~/.zen/tmp/${MOATS}/
## DIRECT VISA.print.sh
PLAYER=${THAT}
[[ ${PLAYER} == "lat" ]] && PLAYER="@"
[[ ${AND} == "lat" ]] && SALT=${THIS}
[[ ${AND} == "lat" ]] && SALT=${THIS} || SALT=${AND}
input_number=${SALT}
if [[ ! $input_number =~ ^[0-9]{1,3}\.[0-9]{2}$ ]]; then
if [[ ! $input_number =~ ^[0-9]{1,3}\.[0-9]*$ ]]; then
(echo "$HTTPCORS ERROR - BAD LAT $LAT" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
else
LAT=${input_number}
fi
[[ ${APPNAME} == "lon" ]] && PEPPER=${WHAT}
[[ ${APPNAME} == "lon" ]] && PEPPER=${WHAT} || PEPPER=${APPNAME}
input_number=${PEPPER}
if [[ ! $input_number =~ ^[0-9]{1,3}\.[0-9]{2}$ ]]; then
if [[ ! $input_number =~ ^[0-9]{1,3}\.[0-9]*$ ]]; then
(echo "$HTTPCORS ERROR - BAD LON $LON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
else
LON=${input_number}
@ -68,7 +69,7 @@ PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
### CHECK PLAYER EMAIL
EMAIL="${PLAYER,,}" # lowercase
[[ ! ${EMAIL} ]] && (echo "$HTTPCORS ERROR - MISSING ${EMAIL} FOR ${WHAT} CONTACT" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
[[ ! ${EMAIL} ]] && (echo "$HTTPCORS ERROR - MISSING ${EMAIL} FOR UPLANET LANDING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
## CHECK WHAT IS EMAIL
if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
@ -79,8 +80,8 @@ else
fi
### CREATE G1VISA & G1Card
echo "${MY_PATH}/../tools/VISA.print.sh" "${EMAIL}" "'"$SALT"'" "'"$PEPPER"'" "'"$PASS"'" "'"$MOATS"'"
${MY_PATH}/../tools/VISA.print.sh "${EMAIL}" "$SALT" "$PEPPER" "$PASS" "${MOATS}"##
echo "${MY_PATH}/../tools/VISA.print.sh" "${EMAIL}" "'"$SALT"'" "'"$PEPPER"'" "'"$PASS"'" "'"$PASS"'"
${MY_PATH}/../tools/VISA.print.sh "${EMAIL}" "$SALT" "$PEPPER" "$PASS" "${PASS}"##
[[ ${EMAIL} != "" && ${EMAIL} != $(cat ~/.zen/game/players/.current/.player 2>/dev/null) ]] && rm -Rf ~/.zen/game/players/${EMAIL}/
# UPLANET #############################################
@ -96,27 +97,68 @@ echo "MAPG1PUB : ${G1PUB}"
echo "# CALCULATING UMAP IPNS ADDRESS"
ipfs key rm ${G1PUB} > /dev/null 2>&1
rm -f ~/.zen/tmp/${MOATS}/${G1PUB}.ipns.key
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${G1PUB}.ipns.key "$LAT" "$LON"
UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${G1PUB}.ipns.key )
rm -f ~/.zen/tmp/${MOATS}/${G1PUB}.priv
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${G1PUB}.priv "$LAT" "$LON"
UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${G1PUB}.priv )
[[ ! ${UMAPNS} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - UMAPNS COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
echo "UMAPNS : http://ipfs.localhost:8080/ipns/${UMAPNS}"
echo "# OSM2IPFS ~/.zen/tmp/${MOATS}/Umap.png"
chromium --headless --disable-gpu --screenshot=/tmp/Umap.png --window-size=600x600 "https://ipfs.copylaradio.com/ipfs/QmSgeT3bo5GZMAfY1yPDHDPpt9tg1EwWYAKom9pb4Gyfeq/Umap.html?southWestLat=$SALT&southWestLon=$PEPPER&deg=0.01"
cp /tmp/Umap.png ~/.zen/tmp/${MOATS}/Umap.png
####################################### Umap.png
## CREATING Umap_${SALT}_${PEPPER}.png
echo "# OSM2IPFS ~/.zen/tmp/${MOATS}/Umap_${SALT}_${PEPPER}.png"
chromium --headless --disable-gpu --screenshot=/tmp/Umap_${SALT}_${PEPPER}.png --window-size=600x600 "https://ipfs.copylaradio.com/ipfs/QmegythUHq8bhcLKDAtLh5TRfBt8w1aES3gHykuywyMg9a/Umap.html?southWestLat=$SALT&southWestLon=$PEPPER&deg=0.01"
## COPYING FILES FROM ABROAD
cp /tmp/Umap_${SALT}_${PEPPER}.png ~/.zen/tmp/${MOATS}/Umap_${SALT}_${PEPPER}.png
cp ~/.zen/tmp/${PASS}##/G1*.jpg ~/.zen/tmp/${MOATS}/
ls ~/.zen/tmp/${MOATS}/
## ADD TO FRIENDS
echo "${EMAIL}" >> ~/.zen/tmp/${MOATS}/UFriends.txt
## ADD HPASS to verify PASS is right
HPASS=$(echo $PASS | sha512sum | cut -d ' ' -f 1)
echo "${HPASS}" > ~/.zen/tmp/${MOATS}/.hpass
## TAKING CARE OF THE CHAIN
########################################
IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1)
ipfs name publish --key=${G1PUB} /ipfs/${IPFSROOT}
########################################
ZCHAIN=$(cat ~/.zen/tmp/${MOATS}/.chain 2>/dev/null)
ZMOATS=$(cat ~/.zen/tmp/${MOATS}/.moats 2>/dev/null)
[[ ${ZCHAIN} && ${ZMOATS} ]] && cp ~/.zen/tmp/${MOATS}/.chain ~/.zen/tmp/${MOATS}/.chain.${ZMOATS}
## DOES CHAIN CHANGED ?
[[ ${ZCHAIN} != ${IPFSROOT} || ${ZCHAIN} == "" ]] \
&& echo "${IPFSROOT}" > ~/.zen/tmp/${MOATS}/.chain \
&& echo "${MOATS}" > ~/.zen/tmp/${MOATS}/.moats
[[ ! ${ZCHAIN} ]] && IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1) && echo "INIT THE CHAIN"
########################################
echo "IPFSROOT : http://ipfs.localhost:8080/ipfs/${IPFSROOT}"
## CHECK FOR NOT PUBLISHING ALREADY (AVOID IPNS CRUSH)
alreadypublishing=$(ps axf --sort=+utime | grep -w 'ipfs name publish --key=' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1)
if [[ ${alreadypublishing} ]]; then
echo "$HTTPCORS ERROR - (╥☁╥ ) - IPFS ALREADY PUBLISHING RETRY LATER" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
exit 1
else
(
ipfs name publish --key=${G1PUB} /ipfs/${IPFSROOT}
end=`date +%s`
echo "(IPNS) publish time was "`expr $end - $start` seconds.
) &
fi
echo "$HTTPCORS
<html>
<head>
echo "$HTTPCORS
<html>
<head>
<title>[Astroport] :powered: Station</title>
<meta http-equiv=\"refresh\" content=\"5; url='https://ipfs.copylaradio.com/ipfs/${IPFSROOT}'\" />
</head>
$LAT/$LON BLOCKCHAIN REGISTRED by ${EMAIL} : ${MOATS} : $(date)" > ~/.zen/tmp/${MOATS}/http.rep
<meta http-equiv=\"refresh\" content=\"300; url='https://ipfs.copylaradio.com/ipns/${UMAPNS}'\" />
</head><body>
UMAPNS : http://ipfs.localhost:8080/ipns/${UMAPNS}
CHAIN : https://ipfs.copylaradio.com/ipfs/${IPFSROOT}
<br>
$LAT/$LON BLOCKCHAIN REGISTRED by ${EMAIL} : ${MOATS} : $(date)
</body></html>" > ~/.zen/tmp/${MOATS}/http.rep
cat ~/.zen/tmp/${MOATS}/http.rep | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &

View File

@ -69,7 +69,7 @@ header {
<form id="formlink" action = "http://127.0.0.1:1234" method = "GET" enctype="application/x-www-form-urlencoded">
<h1></h1>
<h1>U Planet</h1>
<span>Email : </span><input name=uplanet value=''></br></br>
<div id="yellow">
@ -81,10 +81,11 @@ header {
<input type='submit' value='[(♥‿‿♥)]'>
</form>
<span>Astroport <a href="https://pad.p2p.legal/s/Astroport.ONE">Ŋ1</a> - Crypto Commons for a United Planet -</span>
<h6>
<br>
<span>Astroport <a href="https://pad.p2p.legal/s/Astroport.ONE">Ŋ1</a> - Crypto Commons Defender -</span>
<h2>
<p id="station"><div id='countdown'></div></span></p>
</h6>
</h2>
</main>
</body>
<script>
@ -103,7 +104,7 @@ document.addEventListener('DOMContentLoaded', function() {
if (latElement && lonElement) {
latElement.value = lat || '0.00'; // Default to '0.00' if lat is missing
lonElement.value = lon || '0.00'; // Default to '0.00' if lon is missing
uplanetnElement.value = uplanet || '@'; // Default to '0.00' if lon is missing
uplanetElement.value = uplanet || '@'; // Default to '0.00' if lon is missing
}
});
@ -130,7 +131,7 @@ testLatency(function(avg){
isConnectedFast = (avg <= tThreshold);
/** output */
document.body.appendChild(
document.createTextNode("Time: " + (avg.toFixed(2)) + "ms - ♥Box ready ? " + isConnectedFast)
document.createTextNode("https://github.com/papiche/Astroport.ONE - Swarm delay: " + (avg.toFixed(2)) + "ms - ♥Box ready ? " + isConnectedFast)
);
});
@ -167,7 +168,7 @@ function testLatency(cb) {
function countdown() {
if (timeLeft == -1) {
clearTimeout(timerId);
document.getElementById("countdown").innerHTML = "<form method='get' action='http://g1billet.localhost:33101' target='aframe'><input type='hidden' name='montant' value='0' ><label for='type'>Type :</label><select name='type'><option value=''>G1BILLET+ ( x 6 )</option><option value='jeu'>G1CARD</option><option value='xastro' selected>G1CARD+TW</option><option value='@astroport'>G1CARD+@</option></select><input type='hidden' name='dice' value='4' >&nbsp;&nbsp;&nbsp;&nbsp;<button type='submit'>Make Extra</button></form>";
document.getElementById("countdown").innerHTML = "<form method='get' action='http://g1billet.localhost:33101' target='aframe'><input type='hidden' name='montant' value='0' ><label for='type'>Type :</label><select name='type'><option value=''>G1BILLET+ ( x 6 )</option><option value='jeu'>G1CARD</option><option value='xastro' selected>G1CARD+TW</option><option value='@astroport'>G1CARD+@</option></select><input type='hidden' name='dice' value='4' >&nbsp;&nbsp;&nbsp;&nbsp;<button type='submit'>more crypto wallets...</button></form>";
} else {
// elem.innerHTML = timeLeft + " s";
timeLeft--;

View File

@ -40,7 +40,7 @@ if [[ ${SALT} == "" || ${PEPPER} == "" ]]; then
else
echo "VIRTUAL PLAYER ${PLAYER} WELCOME - CREATING G1CARD"
echo "VIRTUAL PLAYER ${PLAYER} WELCOME - CREATING G1Card"
VIRTUAL=1
G1PUB=$(${MY_PATH}/keygen -t duniter "${SALT}" "${PEPPER}")
ASTRONAUTENS=$(${MY_PATH}/keygen -t ipfs "${SALT}" "${PEPPER}")
@ -70,7 +70,7 @@ p=$(${MY_PATH}/diceware.sh 1 | xargs)
BILLETNAME=$(echo "$SALT" | sed 's/ /_/g')
## GET IMAGE FROM G1BILLET ENGINE
mv ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.BILLET.jpg ~/.zen/tmp/${MOATS}/${PASS}.jpg
cp ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.BILLET.jpg ~/.zen/tmp/${MOATS}/${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/${PASS}.jpg
@ -93,30 +93,34 @@ convert -gravity NorthEast -pointsize 15 -fill black -draw "text 42,32 \"$PLAYER
convert -gravity NorthWest -pointsize 15 -fill black -draw "text 20,2 \"$G1PUB\"" ~/.zen/tmp/${MOATS}/image.png ~/.zen/tmp/${MOATS}/pseudo.png
convert -gravity SouthEast -pointsize 30 -fill black -draw "text 100, 72 \"${PASS}\"" ~/.zen/tmp/${MOATS}/pseudo.png ~/.zen/tmp/${MOATS}/pass.png
convert -gravity SouthEast -pointsize 13 -fill black -draw "text 10,25 \"$SALT\"" ~/.zen/tmp/${MOATS}/pass.png ~/.zen/tmp/${MOATS}/salt.png
convert -gravity SouthEast -pointsize 13 -fill black -draw "text 10,10 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/salt.png ~/.zen/tmp/${MOATS}/visa.${PASS}.jpg
convert -gravity SouthEast -pointsize 13 -fill black -draw "text 10,10 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/salt.png ~/.zen/tmp/${MOATS}/G1Visa.${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/visa.${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/G1Visa.${PASS}.jpg
## PRINT VISA
[[ $LP ]] \
&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/visa.${PASS}.jpg > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null \
&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/G1Visa.${PASS}.jpg > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null \
&& sudo brother_ql_print ~/.zen/tmp/${MOATS}/toprint.bin $LP
## PRINT PGP G1CARD
convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.G1CARD.png -resize 400 ~/.zen/tmp/${MOATS}/ASTROPORT.png
## PRINT PGP G1Card
convert ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.G1Card.png -resize 400 ~/.zen/tmp/${MOATS}/ASTROPORT.png
convert -gravity NorthWest -pointsize 15 -fill black -draw "text 20,2 \"$G1PUB\"" ~/.zen/tmp/${MOATS}/ASTROPORT.png ~/.zen/tmp/${MOATS}/one.png
composite -compose Over -gravity Center -geometry +0+0 ~/.zen/tmp/${MOATS}/one.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${MOATS}/G1CARD.${PASS}.jpg
composite -compose Over -gravity Center -geometry +0+0 ~/.zen/tmp/${MOATS}/one.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${MOATS}/G1Card.${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/G1CARD.${PASS}.jpg
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/G1Card.${PASS}.jpg
[[ $LP ]] \
&& brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/${PASS}.png > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null \
&& sudo brother_ql_print ~/.zen/tmp/${MOATS}/toprint.bin $LP
echo "DEBUG"
ls ~/.zen/tmp/${MOATS}
echo "DEBUG"
## SELECTIVE CLEANING
rm -f ~/.zen/tmp/${MOATS}/*.bin
rm -f ~/.zen/tmp/${MOATS}/*.png
#~ rm -f ~/.zen/tmp/${MOATS}/*.bin
#~ rm -f ~/.zen/tmp/${MOATS}/*.png
exit 0

View File

@ -400,16 +400,16 @@ myIP="$(myIp)" # "127.0.0.1"
myIP=$(hostname -I | awk '{print $1}' | head -n 1)
isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
myASTROPORT="http://${myIP}:1234"
myASTRONEF="http://${myIP}:1234"
myASTROPORT="http://astroport.localhost:1234"
myASTRONEF="http://astroport.localhost:1234"
myAPI="http://${myIP}:5001"
myDATA="https://data.gchange.fr"
myGCHANGE="https://www.gchange.fr"
myCESIUM="https://g1.data.e-is.pro"
myG1BILLET="http://${myIP}:33101"
myG1BILLET="http://g1billet.localhost:33101"
myHOST="$(myHostName)"
myIPFS="http://${myIP}:8080"
myIPFS="http://ipfs.localhost:8080"
myIPFSGW="$(myIpfsGw)"
myTUBE="$(myTube)"
myASTROTUBE="https://$(myAstroTube)"