diff --git a/ISOconfig.sh b/ISOconfig.sh index 827e562..dce2527 100755 --- a/ISOconfig.sh +++ b/ISOconfig.sh @@ -172,7 +172,7 @@ sed -i "s/_PROFIL_/$XZUID/g" ~/.kodi/addons/plugin.video.vstream/resources/sites sed -i "s/_LOGIN_/$salt/g" ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py sed -i "s/_MDP_/$pepper/g" ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py -~/.zen/astrXbian/zen/cesium_IPFS_swarm.sh +~/.zen/astrXbian/zen/gchange_IPFS_swarm.sh ~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh ######################################################################## @@ -184,6 +184,7 @@ do isLAN=$(echo $tryme | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") [[ ! $isLAN && $tryme != "" ]] && echo "$tryme" >> ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr && echo "$tryme" done +~/.zen/astrXbian/zen/tools/add_externIP_to_ipfstryme.sh echo 'SEND ipfstryme to A_boostrap_nodes.txt listed PUBs' # Add your bootstrap Pub here for g1node in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remove comments @@ -228,6 +229,27 @@ echo "IPFS_SYNC_DIR=$IPFS_sync_directory" > ~/.zen/ipfs.sync # RESIZING / partition # sudo btrfs filesystem resize max / +# DHT PUBSUB mode +ipfs config Pubsub.Router gossipsub +# MAXSTORAGE = 1/2 available +availableDiskSize=$(df -P ~/ | awk 'NR>1{sum+=$4}END{print sum}') +diskSize="$((availableDiskSize / 2))" +ipfs config Datastore.StorageMax $diskSize +## Activate Rapid "ipfs p2p" +ipfs config --json Experimental.Libp2pStreamMounting true +ipfs config --json Experimental.P2pHttpProxy true + +######### MAKE DEFAULT BOOTSTRAP TO oasis.astroport.com 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS ########### +ipfs bootstrap rm --all +ipfs bootstrap add /dnsaddr/oasis.astroport.com/tcp/4001/ipfs/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN +ipfs bootstrap add /ip4/51.15.166.54/tcp/4001/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN +ipfs bootstrap add /ip4/51.15.166.54/udp/4001/quic/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN +ipfs bootstrap add /ip6/fe80::208:a2ff:fe0c:20d8/tcp/4001/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN +########################################### +# TODO: ADD some other bootstrap NODES +########################################### +# AVOID CONFLICT WITH KODI REMOTE +ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/8181" ######################################################################## echo 'REBOOT NOW...' diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 0e7263a..e7e6983 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -1,6 +1,7 @@ #!/bin/bash ######################################################################## # Author: Fred (support@qo-op.com) +# Armust Blegde release # Version: 0.3 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) ######################################################################## @@ -83,20 +84,14 @@ fi # __ _| |__ (_) __ _ _ __ # \ \/ / '_ \| |/ _` | '_ \ # > <| |_) | | (_| | | | | -# /_/\_\_.__/|_|\__,_|_| |_| +# /_/\_\_.__/|_|\__,_|_| |_| ASTROPORT youtube mp3 # # Transfert ~/astroport/*/files to IPFS and make Vstream/ASTROPORT indexes on IPNS -# OPTION 1 : NOT DELETING SOURCE -# NB: Index published in ~/.zen/ipfs/xbian is the same as files in ~/astroport/*/ -# [[ $(($minute % 30 )) == 0 ]] && $MY_PATH/zen/xbian_vstream.sh & - -# OPTION 2: DELETING SOURCE -# NB: INDEX published in ~/.zen/ipfs/xbian IS ONLY GROWING... -# Must manualy run "ipfs unpin" + "ipfs rm" to clean bad files from ~/.zen/ipfs/xbian/INDEXFILES !!! if [[ ! $isinotifywaitRunning ]]; then mkdir -p /home/$YOU/astroport - /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/xbian_vstream.sh "$dir" "$file"; done & + [[ $YOU == "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/xbian_vstream.sh "$dir" "$file"; done & + [[ $YOU != "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/mint_youtube.sh "$dir" "$file"; done & fi # restart inotifywait (may be useless) diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh index 58ba947..fe6e23e 100755 --- a/zen/gchange_INIT.sh +++ b/zen/gchange_INIT.sh @@ -36,6 +36,7 @@ do isLAN=$(echo $tryme | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") [[ ! $isLAN ]] && echo "$tryme" >> ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr done +~/.zen/astrXbian/zen/tools/add_externIP_to_ipfstryme.sh cat ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr @@ -112,6 +113,15 @@ do echo "Sending IPFSTRYME message to $liking_me" [[ $friend_of_mine != null ]] && ./jaklis.py send -d $liking_me -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr done +echo 'SEND ipfstryme to A_boostrap_nodes.txt listed PUBs' # Add your bootstrap Pub here +for g1node in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remove comments +do +if [[ $g1node != "" ]]; then + echo "LIKING my BOOTSTRAP node : $g1node" +# ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.le-sou.org" send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr + ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr +fi +done cd - # SHOW RESULT diff --git a/zen/jaklis/lib/__pycache__/cesium.cpython-38.pyc b/zen/jaklis/lib/__pycache__/cesium.cpython-38.pyc new file mode 100644 index 0000000..87af3c1 Binary files /dev/null and b/zen/jaklis/lib/__pycache__/cesium.cpython-38.pyc differ diff --git a/zen/jaklis/lib/__pycache__/cesiumCommon.cpython-38.pyc b/zen/jaklis/lib/__pycache__/cesiumCommon.cpython-38.pyc new file mode 100644 index 0000000..cc67099 Binary files /dev/null and b/zen/jaklis/lib/__pycache__/cesiumCommon.cpython-38.pyc differ diff --git a/zen/jaklis/lib/__pycache__/likes.cpython-38.pyc b/zen/jaklis/lib/__pycache__/likes.cpython-38.pyc new file mode 100644 index 0000000..107a43b Binary files /dev/null and b/zen/jaklis/lib/__pycache__/likes.cpython-38.pyc differ diff --git a/zen/jaklis/lib/__pycache__/messaging.cpython-38.pyc b/zen/jaklis/lib/__pycache__/messaging.cpython-38.pyc new file mode 100644 index 0000000..ecd1ba0 Binary files /dev/null and b/zen/jaklis/lib/__pycache__/messaging.cpython-38.pyc differ diff --git a/zen/jaklis/lib/__pycache__/natools.cpython-38.pyc b/zen/jaklis/lib/__pycache__/natools.cpython-38.pyc new file mode 100644 index 0000000..043f078 Binary files /dev/null and b/zen/jaklis/lib/__pycache__/natools.cpython-38.pyc differ diff --git a/zen/jaklis/lib/__pycache__/profiles.cpython-38.pyc b/zen/jaklis/lib/__pycache__/profiles.cpython-38.pyc new file mode 100644 index 0000000..1ab12f7 Binary files /dev/null and b/zen/jaklis/lib/__pycache__/profiles.cpython-38.pyc differ diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh new file mode 100755 index 0000000..7eb85b7 --- /dev/null +++ b/zen/mint_youtube.sh @@ -0,0 +1,93 @@ +#!/bin/bash +######################################################################## +# Author: Fred (support@qo-op.com) +# Version: 2020.12.15 +# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) +######################################################################## +# Transfert ~/astroport/youtube and mp3 files to IPFS +# Create index in ~/.zen/ipfs/xbian/Y$XZUID +######## #### ### ## # + +# ipfs add new file +# create ASTRXBIAN indexes in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} +# unify swarm indexes in /var/www/astrxbian/${PREFIX}ASTRXBIAN +# Vstream/Astroport reads ${PREFIX}ASTRXBIAN through http://localhost:10021/ +# Using Vstream/Pastebin file format +# https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films +######################################################################## +## ACTUAL inotifywait ~/astroport/ FILESYSTEM STRUCTURE +mkdir -p ~/astroport/youtube +mkdir -p ~/astroport/mp3 +######################################################################## +path="$1" +file="$2" +echo "~/.zen/astrXbian/zen/mint_youtube.sh \"$path\" \"$file\"" +[[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameters missing. xbian_vstream.sh file=$file? path=$path?" +extension="${file##*.}" +TITLE="${file%.*}" + + +# GET XZUID +[[ -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID="$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)" || XZUID="$(hostname)" +# TODO use ~/.zen/ipfs/.$IPFSNODEID/ + +TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: youtube, mp3 +PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: Y, M + +# file is placed in ROOT ~/astroport +[[ $PREFIX != "Y" || $PREFIX != "Y" ]] && echo "WARNING. $TYPE unrecognize, please add code for it ${path}${file}" && exit 1 + + +echo "ADDING ${path}${file} IPFS INDEX to ~/.zen/ipfs/xbian/${PREFIX}${XZUID}" +echo "-----------------------------------------------------------------" + +NEWSHARE=$(ipfs add -wq "${path}${file}" | tail -n 1) +[[ $NEWSHARE == "" ]] && echo "ipfs add ERROR" && exit 1 +echo "-----------------------------------------------------------------" +echo "CHECK IPFS $file : ipfs ls /ipfs/$NEWSHARE" +echo "-----------------------------------------------------------------" +echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} " +mkdir -p ~/.zen/ipfs/xbian + +# Init ${PREFIX}${XZUID} header +#[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TITLE;URLS" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID} +[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://localhost:10021" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID} + +rm ~/.zen/ipfs/xbian/${PREFIX}${XZUID} +## CHECK IF $NEWSHARE is NEW, or an already existing file to upgrade? +isFILEinINDEX=$(grep "$file" ~/.zen/ipfs/xbian/${PREFIX}${XZUID}) +isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID}) + +# Is it a new file? Add it to INDEX +if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then + echo "ipfs get -o ~/astroport/$TYPE/ \"/ipfs/$NEWSHARE/$file\"" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID} +else + if [[ $isFILEinINDEX ]]; then + echo "$file already in index" ## File was updated => Change OLDLINK + OLDLINK=$(echo $isFILEinINDEX | cut -d "/" -f 5 | tail -n 1) + sed -i "s/$OLDLINK/$NEWSHARE/g" ~/.zen/ipfs/xbian/${PREFIX}${XZUID} + fi + [[ $isLINKinINDEX ]] && echo "$NEWSHARE already in index. DO NOTHING" ## should not happen +fi + + +######################################################################## +echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING" +echo "-----------------------------------------------------------------" +MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1) +NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS) + +echo "NOW SYNCing ALL SWARM..." +echo "-----------------------------------------------------------------" +~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh + +echo "CREATE my local ${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm found indexes" +echo "-----------------------------------------------------------------" +mkdir -p /tmp/xbian/ +echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://localhost:10021" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER +cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' | cut -d ';' -f 9 >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET ipfs get commands +cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE INDEX +mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN + +echo "NEW $TYPE ($file) ADDED." +echo "INDEX UPDATED : http://localhost:10021/${PREFIX}ASTRXBIAN" diff --git a/zen/tools/add_externIP_to_ipfstryme.sh b/zen/tools/add_externIP_to_ipfstryme.sh new file mode 100755 index 0000000..cb980ba --- /dev/null +++ b/zen/tools/add_externIP_to_ipfstryme.sh @@ -0,0 +1,22 @@ +#!/bin/bash +######################################################################## +# Author: Armust (support@qo-op.com) +# Version: 2020.12.24 +# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) +######################################################################## +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized +ME="${0##*/}" + +YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1); +IPFSNODEID=$(ipfs id -f='\n') + +EXTERNIP=$(curl -s http://whatismyip.akamai.com/) +######################################################################## +echo "ADD $EXTERNIP to /home/$YOU/.zen/ipfs/.${IPFSNODEID}/tryme.addr" +######################################################################## +mkdir -p ~/.zen/ipfs/.${IPFSNODEID} +echo "/ip4/$EXTERNIP/udp/4001/astro/p2p/${IPFSNODEID}" >> /home/$YOU/.zen/ipfs/.${IPFSNODEID}/tryme.addr + + +exit 0