From 49fa403354b31df83065edd83b81a82059f91ad2 Mon Sep 17 00:00:00 2001 From: fred Date: Thu, 15 Feb 2024 14:53:26 +0100 Subject: [PATCH] List visited UPlanet ZONE --- 20h12.process.sh | 5 ++- API/ZONE.sh | 71 ++++++++++++++++-------------- templates/UPlanetSector/index.html | 2 + 3 files changed, 44 insertions(+), 34 deletions(-) diff --git a/20h12.process.sh b/20h12.process.sh index c867206d0..5b973c732 100755 --- a/20h12.process.sh +++ b/20h12.process.sh @@ -26,7 +26,10 @@ while [[ ! $(netstat -tan | grep 5001 | grep LISTEN) ]]; do done # espeak "CODE git pull" > /dev/null 2>&1 -## REMOVE TMP BUT KEEP SWARM +# show ZONE.sh cache of the day +ls ~/.zen/tmp/ZONE_* + +## REMOVE TMP BUT KEEP SWARM and coucou mv ~/.zen/tmp/swarm ~/.zen/swarm mv ~/.zen/tmp/coucou ~/.zen/coucou rm -Rf ~/.zen/tmp/* diff --git a/API/ZONE.sh b/API/ZONE.sh index 6a9e72ddc..b2248520a 100755 --- a/API/ZONE.sh +++ b/API/ZONE.sh @@ -7,8 +7,7 @@ ## API: ZONE ## Used by OSM2IPFS map_render.html & other UPlanet Client App # ?zone=DEG&ulat=LAT&ulon=LON -## Search for TW numbers in received zone -# = json +## Search for TW numbers in received zone # >> return json ################################################################################ MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized @@ -42,10 +41,13 @@ function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } ## RUNNING UPLANET LAT/LON TW DETECTION mkdir -p ~/.zen/tmp/${MOATS}/ -# GET RECEPTION : zone=0.001&ulat=0.02&ulon=0.01 +# ------------------------------------------------------------------- # +# GET/?zone=0.001&ulat=0.02&ulon=0.01 +# ------------------------------------------------------------------- # DEG=${THAT} [[ -z $DEG ]] && DEG=1 # DEG=$(echo "$DEG * 10" | bc -l ) + LAT=${THIS} [[ -z $LAT ]] && LAT=0.00 LON=${WHAT} @@ -57,37 +59,15 @@ sed -i "s~text/html~application/json~g" ~/.zen/tmp/${MOATS}.http LAT=$(makecoord $LAT) LON=$(makecoord $LON) +JSON="ZONE_$LAT_$LON_$DEG.json" [[ $(date +"%H%M") -gt 2012 ]] \ && THEDATE=${TODATE} \ || THEDATE=${YESTERDATE} echo "${THEDATE}" -echo "REQUEST $LAT / $LON / $DEG" if [[ ! -s ~/.zen/tmp/ZONE_$LAT_$LON_$DEG.json ]]; then - ## REGION & ABOVE LEVEL - if [[ $DEG == "0.1" || $DEG == "1" ]]; then - LAT=$(echo ${LAT} | cut -d '.' -f 1) - LON=$(echo ${LON} | cut -d '.' -f 1) - ZONE="_${LAT}_${LON}" - echo "ZONE = ${ZONE}" - ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${ZONE}" "${UPLANETNAME}${ZONE}") - ZONEINDEX="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${THEDATE}${UPLANETNAME}${ZONE}" "${THEDATE}${UPLANETNAME}${ZONE}") - - fi - - ## SECTOR LEVEL - if [[ $DEG == "0.01" ]]; then - SECLAT="${LAT::-1}" - SECLON="${LON::-1}" - SECTOR="_${SECLAT}_${SECLON}" - echo "SECTOR = ${SECTOR}" - ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}") - ZONEINDEX="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${THEDATE}${UPLANETNAME}${SECTOR}" "${THEDATE}${UPLANETNAME}${SECTOR}")"/_index.html" - - fi - ## UMAP LEVEL if [[ $DEG == "0.001" ]]; then @@ -102,8 +82,8 @@ if [[ ! -s ~/.zen/tmp/ZONE_$LAT_$LON_$DEG.json ]]; then UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv) echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": "(_'${LAT}'_'${LON}') = '${totnum}'", "ipns": "'${myIPFS}/ipns/${UMAPNS}/_index.html'" } ] }' > ~/.zen/tmp/${MOATS}.http.grid - cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/ZONE_$LAT_$LON_$DEG.json - cat ~/.zen/tmp/ZONE_$LAT_$LON_$DEG.json >> ~/.zen/tmp/${MOATS}.http + cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON} + cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & @@ -114,6 +94,30 @@ if [[ ! -s ~/.zen/tmp/ZONE_$LAT_$LON_$DEG.json ]]; then fi + ## SECTOR LEVEL + if [[ $DEG == "0.01" ]]; then + SECLAT="${LAT::-1}" + SECLON="${LON::-1}" + SECTOR="_${SECLAT}_${SECLON}" + echo "SECTOR = ${SECTOR}" + ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}") + ZONEINDEX="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${THEDATE}${UPLANETNAME}${SECTOR}" "${THEDATE}${UPLANETNAME}${SECTOR}")"/_index.html" + JSON="ZONE${SECTOR}_$DEG.json" + + fi + + ## REGION & ABOVE LEVEL + if [[ $DEG == "0.1" || $DEG == "1" ]]; then + LAT=$(echo ${LAT} | cut -d '.' -f 1) + LON=$(echo ${LON} | cut -d '.' -f 1) + ZONE="_${LAT}_${LON}" + echo "ZONE = ${ZONE}" + ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${ZONE}" "${UPLANETNAME}${ZONE}") + ZONEINDEX="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${THEDATE}${UPLANETNAME}${ZONE}" "${THEDATE}${UPLANETNAME}${ZONE}") + JSON="ZONE${ZONE}_$DEG.json" + + fi + ## ALL OTHER DEG : SEARCH FOR UPLANET TW NUMBERS echo '{ "gridNumbers": [' >> ~/.zen/tmp/${MOATS}.http.grid @@ -145,17 +149,18 @@ if [[ ! -s ~/.zen/tmp/ZONE_$LAT_$LON_$DEG.json ]]; then echo ']}' >> ~/.zen/tmp/${MOATS}.http.grid ## ADD TO CACHE - cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/ZONE_$LAT_$LON_$DEG.json + cp ~/.zen/tmp/${MOATS}.http.grid ~/.zen/tmp/${JSON} fi ### SEND RESPONSE ON PORT -cat ~/.zen/tmp/ZONE_$LAT_$LON_$DEG.json >> ~/.zen/tmp/${MOATS}.http -cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & - +cat ~/.zen/tmp/${JSON} >> ~/.zen/tmp/${MOATS}.http +( + cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 + rm ~/.zen/tmp/${MOATS}.http && echo "BLURP ${JSON}" +) & ## CLEANING rm -Rf ~/.zen/tmp/${MOATS}/ - ## TIMING end=`date +%s` echo "(ZONE) Operation time was "`expr $end - $start` seconds. diff --git a/templates/UPlanetSector/index.html b/templates/UPlanetSector/index.html index cc9a21d07..f65797d96 100644 --- a/templates/UPlanetSector/index.html +++ b/templates/UPlanetSector/index.html @@ -162,7 +162,9 @@ iframe { | _ | | + ( ° - °)📺 |