diff --git a/12345.sh b/12345.sh index 6ee1fab5..8c31d1e3 100755 --- a/12345.sh +++ b/12345.sh @@ -133,7 +133,7 @@ while true; do ( nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo " (‿/‿) $PORT CONSUMED in "`expr $(date +%s) - $start`" seconds." ) & else mySalt | \ - sed "s~http://127.0.0.1:12345~${myASTROPORT}:${PORT}~g" | \ + sed "s~http://127.0.0.1:12345~http://${myASTROPORT}:${PORT}~g" | \ sed "s~https://qo-op.com~${myUPLANET}~g" | \ ( nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo " (‿/‿) $PORT CONSUMED in "`expr $(date +%s) - $start`" seconds." ) & fi diff --git a/API/QRCODE.sh b/API/QRCODE.sh index d263a11f..b4f13267 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -87,11 +87,6 @@ fi ############################################################################### if [[ ${QRCODE} == "station" ]]; then - #~ # Keep 2nd try of the day - #~ [[ ! -s ~/.zen/tmp/_ISTATION ]] \ - #~ && mv ~/.zen/tmp/ISTATION ~/.zen/tmp/_ISTATION \ - #~ || cp ~/.zen/tmp/_ISTATION ~/.zen/tmp/ISTATION - if [[ ! -s ~/.zen/tmp/ISTATION ]]; then ## GENERATE PLAYER G1 TO ZEN ACCOUNTING ISTATION=$($MY_PATH/../tools/make_image_ipfs_index_carousel.sh | tail -n 1) @@ -99,19 +94,22 @@ if [[ ${QRCODE} == "station" ]]; then else ISTATION=$(cat ~/.zen/tmp/ISTATION) fi - ## SHOW G1PALPAY FRONT (IFRAME) - sed "s~_STATION_~${myIPFSW}${ISTATION}/~g" $MY_PATH/../templates/ZenStation/index.html > ~/.zen/tmp/${MOATS}/index.htm - [[ ! $isLAN ]] && sed -i "s~MENU~HOSTING~g" ~/.zen/tmp/${MOATS}/index.htm - sed -i "s~http://127.0.0.1:8080~${myIPFSW}~g" ~/.zen/tmp/${MOATS}/index.htm - sed -i "s~http://127.0.0.1:33101~${myG1BILLET}~g" ~/.zen/tmp/${MOATS}/index.htm - sed -i "s~http://astroport.localhost:1234~${myASTROPORT}~g" ~/.zen/tmp/${MOATS}/index.htm - WSTATION="/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/index.htm)" - echo $WSTATION > ~/.zen/tmp/WSTATION - end=`date +%s` - echo "NEW WSTATION ${myIPFSW}${WSTATION} Execution time was "`expr $end - $start` seconds. - ## SEND TO WSTATION PAGE - sed "s~_TWLINK_~${myIPFSW}${WSTATION}/~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect + ## SHOW ZenStation FRONT + sed "s~_STATION_~${myIPFS}${ISTATION}/~g" $MY_PATH/../templates/ZenStation/index.html > ~/.zen/tmp/${MOATS}/index.htm + [[ ! $isLAN ]] && sed -i "s~MENU~HOSTING~g" ~/.zen/tmp/${MOATS}/index.htm + sed -i "s~http://127.0.0.1:8080~${myIPFS}~g" ~/.zen/tmp/${MOATS}/index.htm + sed -i "s~http://127.0.0.1:33101~${myG1BILLET}~g" ~/.zen/tmp/${MOATS}/index.htm + sed -i "s~http://astroport.localhost:1234~${myASTROPORT}~g" ~/.zen/tmp/${MOATS}/index.htm + + WSTATION="/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/index.htm)" + echo $WSTATION > ~/.zen/tmp/WSTATION + + end=`date +%s` + echo "NEW WSTATION ${myIPFS}${WSTATION} Execution time was "`expr $end - $start` seconds. + + ##302 REDIRECT TO WSTATION IPFS + sed "s~_TWLINK_~${myIPFS}${WSTATION}/~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect echo "url='"${myIPFSW}${WSTATION}"'" >> ~/.zen/tmp/${MOATS}/index.redirect ( diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index 75da4832..3a975020 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -83,7 +83,7 @@ for REGION in ${REGIONS[@]}; do TODATEREGIONNS=$(ipfs key import ${TODATE}${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv) ############################################################## ## GET from IPNS - ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${YESTERDATEREGIONNS}/ + ipfs --timeout 240s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${YESTERDATEREGIONNS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> mkdir -p ~/.zen/tmp/${MOATS}/${REGION}/RSS @@ -125,8 +125,6 @@ for REGION in ${REGIONS[@]}; do cp ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL \ ~/.zen/tmp/${IPFSNODEID}/REGIONS/_${REGLAT}_${REGLON}.JOURNAL.md - rm ~/.zen/tmp/${IPFSNODEID}/REGIONS/_${REGLAT}_${REGLON}.week.cid 2>/dev/null ## TODO REMOVE - ## DEMO : PREPARE Ask.IA link - PROD will be launched during RUNTIME. echo "" \ > ~/.zen/tmp/${MOATS}/${REGION}/Ask.IA._${REGLAT}_${REGLON}.redir.html @@ -134,13 +132,12 @@ for REGION in ${REGIONS[@]}; do TOTL=$((${NL}+${NS})) # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - echo "Numbers of REGION WEEK RSS : ${NL} + ${NS} : "${TOTL} + echo "Numbers of REGION WEEK RSS : ${NL} + ${NS} : "${TOTL} - echo "SHOW TROPHY" > ~/.zen/tmp/${MOATS}/${REGION}/TODO + rm ~/.zen/tmp/${MOATS}/${REGION}/TODO + rm ~/.zen/tmp/${MOATS}/${REGION}/N_* -rm ~/.zen/tmp/${MOATS}/${REGION}/RWEEKCID 2>/dev/null ## TODO REMOVE - - echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N + echo ${TOTL} > ~/.zen/tmp/${MOATS}/${REGION}/N_${TOTL} echo "" \ > ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.redir.html diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 9ecb4b6f..8bfe2a6b 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -86,7 +86,7 @@ for SECTOR in ${SECTORS[@]}; do start=`date +%s` # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> #~ ## IPFS GET ONLINE YESTERDATE SECTORNS - ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${YESTERDATENS}/ + ipfs --timeout 240s get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${YESTERDATENS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> end=`date +%s` echo "_____SECTOR${SECTOR} GET time was "`expr $end - $start` seconds. @@ -105,14 +105,7 @@ for SECTOR in ${SECTORS[@]}; do minutes=$(( (DIFF_SECONDS % 3600) / 60 )) seconds=$((DIFF_SECONDS % 60)) echo "SECTOR DATA is ${hours} hours ${minutes} minutes ${seconds} seconds OLD" - if [ ${DIFF_SECONDS} -lt $(( 5 * 60 * 60 )) ]; then - echo "GETTING YESTERDAY SECTOR.refresher" - YESTERDAY=$(ipfs cat /ipfs/${ZCHAIN}/CHAIN/SECTOR.refresher | head -n 1) - ## GET UMAP.refresher from PREVIOUS _chain ... - echo "TODAY : $(cat ~/.zen/tmp/${MOATS}/${SECTOR}/CHAIN/SECTOR.refresher | head -n 1)" - echo "YESTERDAY : ${YESTERDAY}" - continue - fi + # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ## CONTROL ACTINGNODE SWAPPING UREFRESH="${HOME}/.zen/tmp/${MOATS}/${SECTOR}/CHAIN/SECTOR.refresher" @@ -131,9 +124,9 @@ for SECTOR in ${SECTORS[@]}; do ## IN CASE OLD BOOSTRAP IS STILL IN CHARGE - CHOOSE 1ST STRAP - [[ ! $(echo ${STRAPS[@]} | grep ${ACTINGNODE}) ]] && ACTINGNODE=${STRAPS[0]} - ## IF NOT UPDATED FOR TOO LONG - [ ${DIFF_SECONDS} -gt $(( 24 * 60 * 60 )) ] \ - && echo "More than 24H update" \ + ## IF NOT UPDATED FOR TOO LONG : STRAPS[0] get key control + [ ${DIFF_SECONDS} -gt $(( 26 * 60 * 60 )) ] \ + && echo "More than 26H update" \ && ACTINGNODE=${STRAPS[0]} [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \ diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index 60161ea2..9f500b0a 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -78,7 +78,7 @@ mkdir ~/.zen/tmp/${MOATS} # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ## IPFS GET YESTERDATENS mkdir ~/.zen/tmp/${MOATS}/${UMAP} - ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${YESTERDATENS}/ + ipfs --timeout 240s get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${YESTERDATENS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -86,7 +86,8 @@ mkdir ~/.zen/tmp/${MOATS} [[ ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN || ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} ]] \ && echo ">>> INFO - INTIALIZE UMAP FORMAT - NEW UMAP KEY -" \ && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} \ - && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN + && mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN \ + && echo ${MOATS} > ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_moats mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/RSS mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/TW @@ -98,7 +99,6 @@ rm -f ~/.zen/tmp/${MOATS}/${UMAP}/z*.html 2>/dev/null ZCHAIN=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_chain | rev | cut -d ':' -f 1 | rev 2>/dev/null) echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/z$(date +%A-%d_%m_%Y).html - # ++++++++++++++++++++ - - - - ADAPT TO NODE TREATMENT TIME ZMOATS=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_moats 2>/dev/null) # ZMOATS SHOULD BE MORE THAT 5 HOURS. @@ -109,19 +109,6 @@ echo "" > ~/ minutes=$(( (DIFF_SECONDS % 3600) / 60 )) seconds=$((DIFF_SECONDS % 60)) echo "UMAP DATA is ${hours} hours ${minutes} minutes ${seconds} seconds " - - # IF LESS THAN 5 HOURS - if [ ${DIFF_SECONDS} -lt $(( 5 * 60 * 60 )) ]; then - echo "GETTING YESTERDAY UMAP.refresher" - YESTERDAY=$(ipfs cat /ipfs/${ZCHAIN}/${LAT}_${LON}/UMAP.refresher | head -n 1) - ## GET UMAP.refresher from PREVIOUS _chain ... - TODAY=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/UMAP.refresher | head -n 1) - echo "TODAY : ${TODAY}" - echo "YESTERDAY : ${YESTERDAY}" - echo "------------------------------------------------->>>>>>>>>>>>>>>>" - continue - fi - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ######################################################## ## NODE SELECTION in UMAP.refresher @@ -142,8 +129,8 @@ echo "" > ~/ [[ ! $(echo ${STRAPS[@]} | grep ${ACTINGNODE}) ]] && ACTINGNODE=${STRAPS[0]} ## IF NOT UPDATED FOR TOO LONG - [ ${DIFF_SECONDS} -gt 100800 ] \ - && echo "More than 28H update" \ + [ ${DIFF_SECONDS} -gt $(( 26 * 60 * 60 )) ] \ + && echo "More than 26H update - BOOSTRAP 0 ACTION -" \ && ACTINGNODE=${STRAPS[0]} echo "* ACTINGNODE=${ACTINGNODE}" diff --git a/tools/my.sh b/tools/my.sh index 0170c52b..f0809168 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -121,8 +121,8 @@ myHName() { } zIp() { - zip=$(cat ~/.zen/♥Box 2>/dev/null | head -n 1 ) - [ -n "$zip" ] && echo "$zip" || false + zipit=$(cat ~/.zen/♥Box 2>/dev/null | head -n 1 ) + [ -n "$zipit" ] && echo "$zipit" || false } UPlanetSharedSecret() {