New UPlanet treatment - distribute UMap, USector & URegion keys - publish RSS numbers

2023-10-14 18:31:07 +02:00 · 2023-10-14 18:31:07 +02:00 · 7612da2fca
parent 3469acc3e6
commit 7612da2fca
3 changed files with 92 additions and 28 deletions
--- a/RUNTIME/REGION.refresh.sh
+++ b/RUNTIME/REGION.refresh.sh
@ -19,6 +19,8 @@ LAT=$1
 LON=$2
 MOATS=$3
 UMAP=$4
+REGIONNODE=$5
+

 [[ ! $(ls ~/.zen/tmp/${MOATS-undefined}/${UMAP-undefined}) ]] && echo "MISSING UMAP CONTEXT" && exit 1

@ -31,14 +33,39 @@ REGIONMAPGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Umap.html?sou
 REGIONSATGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Usat.html?southWestLat=${CLAT}&southWestLon=${CLON}&deg=1"
 echo "<meta http-equiv=\"refresh\" content=\"0; url='${REGIONMAPGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Map.html
 echo "<meta http-equiv=\"refresh\" content=\"0; url='${REGIONSATGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Sat.html
+
+[[ "${REGIONNODE}" == "${IPFSNODEID}" ]] && echo ">>> MANAGING REGION PUBLICATION" || exit 0
+
 ##############################################################
 REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${REGION}" "${REGION}")
 [[ ! ${REGIONG1PUB} ]] && echo "ERROR generating REGION WALLET" && exit 1
-echo "ACTUAL REGION WALLET : ${REGIONG1PUB}"
+echo "REGION WALLET : ${REGIONG1PUB}"
+
 ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${REGION}" "${REGION}"
 ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
 REGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv)
 ##############################################################
+echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${REGIONNS}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.IPNS.html

+       # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        #~ ## IPFS GET ONLINE SECTORNS
+        mkdir ~/.zen/tmp/${MOATS}/${REGION}
+        ipfs get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${REGIONNS}/
+        # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${CLAT}*_${CLON}*/RSS/*.rss.json 2>/dev/null))
+        NL=${#RSSNODE[@]}
+        RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${CLAT}*_${CLON}*/RSS/*.rss.json 2>/dev/null))
+        NS=${#RSSWARM[@]}
+        TOTL=$((${NL}+${NS}))
+
+echo "Number of RSS : "${TOTL}
+        echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/${TOTL}
+        IPFSPOP=$(ipfs add -q ~/.zen/tmp/${MOATS}/${REGION}/${TOTL})
+
+        ipfs name publish -k ${REGIONG1PUB} /ipfs/${IPFSPOP}
+
+ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1

 exit 0
--- a/RUNTIME/SECTOR.refresh.sh
+++ b/RUNTIME/SECTOR.refresh.sh
@ -19,37 +19,54 @@ LAT=$1
 LON=$2
 MOATS=$3
 UMAP=$4
+SECTORNODE=$5

 [[ ! $(ls ~/.zen/tmp/${MOATS-undefined}/${UMAP-undefined}) ]] && echo "MISSING UMAP CONTEXT" && exit 1

 SLAT=$(echo ${LAT} | xargs printf '%.1f\n' | sed s~,~.~g)
 SLON=$(echo ${LON} | xargs printf '%.1f\n' | sed s~,~.~g)
 SECTOR="_${SLAT}_${SLON}"
-echo "WELCOME IN SECTOR${SECTOR}"
+echo "SECTOR ${SECTOR}"

 SECTORMAPGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Umap.html?southWestLat=${SLAT}&southWestLon=${SLON}&deg=0.1"
 SECTORSATGEN="/ipfs/QmRG3ZAiXWvKBccPFbv4eUTZFPMsfXG25PiZQD6N8M8MMM/Usat.html?southWestLat=${SLAT}&southWestLon=${SLON}&deg=0.1"
 echo "<meta http-equiv=\"refresh\" content=\"0; url='${SECTORMAPGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Map.html
 echo "<meta http-equiv=\"refresh\" content=\"0; url='${SECTORSATGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Sat.html
+##############################################################
+
+[[ "${REGIONNODE}" == "${IPFSNODEID}" ]] && echo ">> MANAGING SECTOR PUBLICATION" || exit 0
+
 ##############################################################
 SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${SECTOR}" "${SECTOR}")
 [[ ! ${SECTORG1PUB} ]] && echo "ERROR generating SECTOR WALLET" && exit 1
-echo "ACTUAL SECTOR WALLET : ${SECTORG1PUB}"
+echo "${SECTOR} WALLET : ${SECTORG1PUB}"
+
 ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SECTOR.priv "${SECTOR}" "${SECTOR}"
 ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
 SECTORNS=$(ipfs key import ${SECTORG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SECTOR.priv)
-##############################################################
+
+echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${SECTORNS}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.IPNS.html
+
       # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
        # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-        ## IPFS GET ONLINE SECTORNS
-        #~ mkdir ~/.zen/tmp/${MOATS}/${SECTOR}
-        #~ ipfs get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${SECTORNS}/
-        #~ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-        #~ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-        #~ UREFRESH="${HOME}/.zen/tmp/${MOATS}/${SECTOR}/SECTOR.refresh"
+        #~ ## IPFS GET ONLINE SECTORNS
+        mkdir ~/.zen/tmp/${MOATS}/${SECTOR}
+        ipfs get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${SECTORNS}/
+        # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${SLAT}*_${SLON}*/RSS/*.rss.json 2>/dev/null))
+        NL=${#RSSNODE[@]}
+        RSSWARM=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${SLAT}*_${SLON}*/RSS/*.rss.json 2>/dev/null))
+        NS=${#RSSWARM[@]}
+        TOTL=$((${NL}+${NS}))

-## KEY SHARING
-echo ""
+echo "Number of RSS : "${TOTL}
+        echo ${TOTL} > ~/.zen/tmp/${MOATS}/${SECTOR}/${TOTL}
+        IPFSPOP=$(ipfs add -q ~/.zen/tmp/${MOATS}/${SECTOR}/${TOTL})
+
+        ipfs name publish -k ${SECTORG1PUB} /ipfs/${IPFSPOP}
+
+ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1


 exit 0
--- a/RUNTIME/UPLANET.refresh.sh
+++ b/RUNTIME/UPLANET.refresh.sh
@ -53,6 +53,30 @@ mkdir ~/.zen/tmp/${MOATS}
        # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
        # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

+        ## FORMAT CONTROL WARNING
+        [[ ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB} || ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} ]] \
+            && echo ">>> WARNING - UMAP IS BAD FORMAT - PLEASE MONITOR KEY -" \
+            && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} \
+            && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}
+
+        mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/RSS
+        mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/TW
+
+ # ++++++++++++++++++++ - - - - ADAPT TO NODE TREATMENT TIME
+                ZMOATS=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}/_moats 2>/dev/null)
+                # ZMOATS SHOULD BE MORE THAT 20 HOURS.
+                MOATS_SECONDS=$(date -d "$MOATS" +%s)
+                ZMOATS_SECONDS=$(date -d "$ZMOATS" +%s)
+                DIFF_SECONDS=$((MOATS_SECONDS - ZMOATS_SECONDS))
+                    echo "UMAP DATA is ${DIFF_SECONDS} seconds "
+                # IF LESS.
+                if [ ${DIFF_SECONDS} -lt 72000 ]; then
+                    echo "GETTING YESTERDAY UMAP.refresh"
+                    ZCHAIN=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}/_chain | rev | cut -d ':' -f 1 | rev 2>/dev/null)
+                    ## GET UMAP.refresh from PREVIOUS _chain ...
+                    ipfs cat /ipfs/${ZCHAIN}/${LAT}_${LON}/UMAP.refresh > ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/UMAP.refresh
+                fi
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        ########################################################
        ## NODE  SELECTION in UMAP.refresh
@ -68,6 +92,18 @@ mkdir ~/.zen/tmp/${MOATS}
        fi

        ACTINGNODE=${ALLNODES[-1]} ## LAST NODE IN UMAP.refresh
+        SECTORNODE=${ALLNODES[-2]}
+        REGIONNODE=${ALLNODES[-3]}
+
+        echo "* ACTINGNODE=${ACTINGNODE}"
+        echo "* SECTORNODE=${SECTORNODE}"
+        echo "* REGIONNODE=${REGIONNODE}"
+
+### SECTOR = 0.1° Planet Slice
+        ${MY_PATH}/SECTOR.refresh.sh "${LAT}" "${LON}" "${MOATS}" "${UMAP}" "${SECTORNODE}"
+
+ ### REGION = 1° Planet Slice
+       ${MY_PATH}/REGION.refresh.sh "${LAT}" "${LON}" "${MOATS}" "${UMAP}" "${REGIONNODE}"

        [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \
            && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \
@ -89,15 +125,6 @@ mkdir ~/.zen/tmp/${MOATS}
        ######################################################## # NODE  SELECTION in UMAP.refresh


-        ## FORMAT CONTROL WARNING
-        [[ ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB} || ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} ]] \
-            && echo ">>> WARNING - UMAP IS BAD FORMAT - PLEASE MONITOR KEY -" \
-            && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} \
-            && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}
-
-        mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/RSS
-        mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/TW
-
 ## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY
        cp ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS/*.rss.json ~/.zen/tmp/${MOATS}/${UMAP}/RSS/
        RSSFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/RSS/*.rss.json 2>/dev/null))
@ -122,13 +149,6 @@ mkdir ~/.zen/tmp/${MOATS}
        echo "<meta http-equiv=\"refresh\" content=\"0; url='${UMAPGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/Umap.html
        echo "<meta http-equiv=\"refresh\" content=\"0; url='${USATGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/Usat.html

-### SECTOR = 0.1° Planet Slice
-        ${MY_PATH}/SECTOR.refresh.sh "${LAT}" "${LON}" "${MOATS}" "${UMAP}"
-
- ### REGION = 1° Planet Slice
-        ${MY_PATH}/REGION.refresh.sh "${LAT}" "${LON}" "${MOATS}" "${UMAP}"
-
-
 ## ¤$£€
        ## # GET SCREENSHOT UMAP SECTOR & REGION JPG
        ## PROBLEM ON LIBRA ... MORE TEST NEEDED ... TODO