From 21cf3d8998b15bcec48ec10c0a9f928ff5f6a5cd Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 14 Apr 2023 17:42:58 +0200 Subject: [PATCH] LOW MODE detection --- 20h12.process.sh | 6 +++--- README.md | 40 +++++++++++++++++++++++++--------------- ajouter_media.sh | 9 ++++++++- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/20h12.process.sh b/20h12.process.sh index 3aae45a6..ca68d865 100755 --- a/20h12.process.sh +++ b/20h12.process.sh @@ -14,9 +14,9 @@ espeak "Ding" > /dev/null 2>&1 rm -Rf ~/.zen/tmp/* ## RESTART IPFS DAEMON -STOPPED=$(sudo systemctl status ipfs | grep disabled) ## IPFS DISABLED - START ONLY FOR SYNC - +LOWMODE=$(sudo systemctl status ipfs | grep disabled) ## IPFS DISABLED - START ONLY FOR SYNC - # echo "$USER ALL=(ALL) NOPASSWD:/bin/systemctl" | (sudo su -c 'EDITOR="tee" visudo -f /etc/sudoers.d/systemctl') -if [[ $STOPPED != "" ]]; then +if [[ $LOWMODE != "" ]]; then sudo systemctl start ipfs && sleep 10 else sudo systemctl restart ipfs && sleep 10 @@ -87,6 +87,6 @@ else fi ## IPFS DISABLED : STOP IT -[[ $STOPPED != "" ]] && sleep 360 && sudo systemctl stop ipfs +[[ $LOWMODE != "" ]] && sleep 360 && sudo systemctl stop ipfs exit 0 diff --git a/README.md b/README.md index 8584ab59..65a11f21 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ Nous utilisons "astro.js" dans l'Application DEMO ## ➤ PRIVATE ZONE (fonctionne sur toutes les Stations.) ### ```/?salt=${SALT}&pepper=${PEPPER}&${APPNAME}=${WHAT}&${OBJ}=${VAL}...``` -### Créer un PLAYER TW <3BOX +### Créer (ou téléporter) un PLAYER TW : OFFICIAL <3BOX : ```http GET /?salt=${SALT}&pepper=${PEPPER}&g1pub=${URLENCODEDURL}&email=${PLAYER} ``` @@ -133,8 +133,8 @@ GET /?salt=${SALT}&pepper=${PEPPER}&g1pub=${URLENCODEDURL}&email=${PLAYER} | :-------- | :------- | :-------------------------------- | | `salt` | `string` | **Required**. Your passphrase one token | | `pepper` | `string` | **Required**. Your passphrase two token | -| `g1pub` | `string` | **Required**. Your prefered _URL_ | -| `email` | `email` | **Required**. Your email one token | +| `g1pub` | `string` | **Required**. Your prefered _URL_ to copy video from | +| `email` | `email` | **Required**. Your email token | ### LOGOUT PLAYER (remove IPNS keys from Station) ```http @@ -145,7 +145,7 @@ GET /?salt=${SALT}&pepper=${PEPPER}&logout=${PLAYER} | :-------- | :------- | :-------------------------------- | | `salt` | `string` | **Required**. Your passphrase one token | | `pepper` | `string` | **Required**. Your passphrase two token | -| `logout` | `string` | **Required**. Your email one token | +| `logout` | `string` | **Required**. Your email token | ### LOGIN PLAYER (Activate IPNS keys on Station) ```http @@ -156,7 +156,7 @@ GET /?salt=${SALT}&pepper=${PEPPER}&login=${PLAYER} | :-------- | :------- | :-------------------------------- | | `salt` | `string` | **Required**. Your passphrase one token | | `pepper` | `string` | **Required**. Your passphrase two token | -| `login` | `string` | **Required**. Your email one token | +| `login` | `string` | **Required**. Your email token | ### Définir le niveau ★ accordé à un "g1friend" ```http @@ -171,7 +171,7 @@ GET /?salt=${SALT}&pepper=${PEPPER}&friend=${G1PUB}&stars=${1:5} | `stars` | `number` | **Required**. Number between 1 to 5 | -### Lire Messagerie Gchange +### Lire Messagerie de la base "GChange" ```http GET /?salt=${SALT}&pepper=${PEPPER}&messaging=on ``` @@ -205,6 +205,14 @@ GET /?salt=${SALT}&pepper=${PEPPER}&testcraft=json&nodeid=_&dataid=$QRHASH | `testcraft` | `string` | **Required** AppNAME subcommand | | `${OBJ}` | `${VAL}` | depends on App | +This IPFS object transfer needs that the client is using well configured WebRTC/IPFS relays +Look for example in ```www/upload_to_astroport.html``` + +``` + '/dns4/wrtc-star1.par.dwebops.pub/tcp/443/wss/p2p-webrtc-star', + '/dns4/wrtc-star2.sjc.dwebops.pub/tcp/443/wss/p2p-webrtc-star' +``` + ### Redirections * vers Gchange @@ -214,7 +222,7 @@ GET /?salt=${SALT}&pepper=${PEPPER}&testcraft=json&nodeid=_&dataid=$QRHASH ```/?salt=${SALT}&pepper=${PEPPER}&g1pub=astro``` -### Déclencher un Payement de 1 Ğ1 à Fred +### Déclencher un Payement de Ğ1 à une G1PUB ```http GET /?salt=${SALT}&pepper=${PEPPER}&pay=1&g1pub=DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech ``` @@ -241,7 +249,7 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube | `tag` | `${VAL}` | TW filtering default G1CopierYoutube | -### Modifier URL ♥BOX - CopierYoutube du PLAYER +### Modifier URL du G1Voeu "G1CopierYoutube" du PLAYER ```http GET /?player=${PLAYER}&youtube=URLENCODED ``` @@ -251,7 +259,7 @@ GET /?player=${PLAYER}&youtube=URLENCODED | `player` | `string` | **Required**. Your EMAIL token | | `youtube` | `string` | **Required** URL = Video URL | - +MORE TEST NEEDED ### QRCODE (API SandBox) ```http @@ -263,9 +271,11 @@ GET /?qrcode=${G1PUB} > Look for details & extend as you like in ~/.zen/Astroport.ONE/API/QRCODE.sh -If is IPNS & local PLAYER ? Redirect to G1BILLET +ACTUAL BEHAVIOUR IS TO RECEIVE QRCODE VALUES -If is G1*? Redirect to G1WishApp / Export Tags from TW +1) Is IPNS key & PLAYER is local ? Redirect to G1BILLET + +2) Is G1*? Redirect to G1WishApp / Export Tags from TW http://astroport.localhost:1234/?qrcode=G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3hd7a1488nzymky1edz8j779jov7sbemc0 redirect to @@ -274,12 +284,12 @@ http://ipfs.localhost:8080/ipns/k51qzi5uqu5din47zmnzk6tmk1tjqaeaj9pbb3qilmstbsf9 http://astroport.localhost:1234/?qrcode=G1G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3hd7a1488nzymky1edz8j779jov7sbemc0&json redirect to pure "tag=" result json +3) Is G1PUB ... -If is G1PUB ? G1BILLET adventure with GCHANGE and CESIUM - -### HOW TO REFRESH SLOW IPFS STATION +### LOW RESSOURCE STATION CAN ACTIVATE LOW MODE (disable ipfs daemon) ``` -sudo systemctl restart ipfs +~/.zen/Astroport.ONE/tools/cron_VRFY.sh LOW + sudo systemctl restart astroport.service sudo systemctl restart g1billet.service diff --git a/ajouter_media.sh b/ajouter_media.sh index 2f7c4e0b..c7f902ee 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -22,8 +22,16 @@ MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized . "${MY_PATH}/tools/my.sh" +LOWMODE=$(sudo systemctl status ipfs | grep disabled) ## IPFS DISABLED - START ONLY FOR SYNC - +# echo "$USER ALL=(ALL) NOPASSWD:/bin/systemctl" | (sudo su -c 'EDITOR="tee" visudo -f /etc/sudoers.d/systemctl') +if [[ $LOWMODE != "" ]]; then + espeak "Low Mode" + sudo systemctl start ipfs +fi + [[ $IPFSNODEID == "" ]] && echo "IPFSNODEID manquant" && espeak "IPFS NODE ID Missing" && exit 1 + start=`date +%s` # REMOVE GtkDialog errors for zenity shopt -s expand_aliases @@ -57,7 +65,6 @@ PLAYER=$OUTPUT && . "${MY_PATH}/tools/my.sh" [[ $OUTPUT == "" ]] \ -&& ${MY_PATH}/start.sh \ && espeak "Astronaut. Please register." \ && xdg-open "http://astroport.localhost:1234" \ && exit 1 \