fix build, enaled libre and ookla

Reviewed-on: #1

.build/Dockerfile

@@ -2,11 +2,14 @@ FROM archlinux
 
 WORKDIR /root
 
+# update all
+RUN pacman -Syu --noconfirm
+
 # Basic
-RUN pacman -Sy --noconfirm mpv jq curl bc
+RUN pacman -S --noconfirm mpv jq curl bc
 
 # Ookla Speedtest
-RUN pacman -Sy --noconfirm speedtest-cli
+RUN pacman -S --noconfirm speedtest-cli
 
 # LibreSpeed
 RUN curl -LOJ https://github.com/librespeed/speedtest-cli/releases/download/v1.0.10/librespeed-cli_1.0.10_linux_amd64.tar.gz \
@@ -18,6 +21,9 @@ RUN curl -LOJ https://github.com/librespeed/speedtest-cli/releases/download/v1.0
 RUN pacman -S --noconfirm atk cups libxcomposite nodejs npm nss \
  && npm install --global fast-cli
 
+# Image Magic
+RUN pacman -S --noconfirm imagemagick
+
 COPY . .
 
 CMD ./bot.sh

.gitignore

@@ -1 +1,2 @@
 .env
+tmp/

bot.sh

@@ -2,6 +2,11 @@
 
 source .env
 
+download_meter=resources/download_meter.png
+upload_meter=resources/upload_meter.png
+needle=resources/needle.png
+font=resources/CODE_Bold.otf
+
 while true; do
 
 date=$(date "+%Y%m%d_%H%M%S")
@@ -10,9 +15,12 @@ satellite_image=data/satellite_image_$date.png
 speedtest_ookla=data/speedtest_ookla_$date.json
 speedtest_libre=data/speedtest_libre_$date.json
 speedtest_fast=data/speedtest_fast_$date.json
+speedtest_download_meter=data/speedtest_download_meter_$date.png
+speedtest_upload_meter=data/speedtest_upload_meter_$date.png
+speedtest_meter_image=data/speedtest_meter_image_$date.png
 weather_file=data/weather_$date.json
 edited_image=data/edited_image_$date.png
-
+tg_log=data/tg_log_$date.json
 #################################################################################
 latency(){
 	echo $(ping -c 1 $1) | \
@@ -41,7 +49,7 @@ echo Satellite Image grabbed
 #################################################################################
 echo Doing speedtest by Ookla
 # Run speedtest and output to a file
-speedtest --json > $speedtest_ookla
+speedtest --json | tee $speedtest_ookla
 # Extract information from the speedtest output
 
 # Parsing JSON data
@@ -54,6 +62,13 @@ ookla_upload=$(jq '.upload' "$speedtest_ookla")
 ookla_bytes_received=$(jq '.bytes_received' "$speedtest_ookla")
 ookla_bytes_sent=$(jq '.bytes_sent' "$speedtest_ookla")
 
+# replacing null values
+[ -z "$ookla_ping" ] && ookla_ping="-"
+[ -z "$ookla_download" ] && ookla_download=0
+[ -z "$ookla_upload" ] && ookla_upload=0
+[ -z "$ookla_bytes_received" ] && ookla_bytes_received=0
+[ -z "$ookla_bytes_sent" ] && ookla_bytes_sent=0
+
 # Converting to human readable units
 ookla_download_mbps=$(echo "scale=2; $ookla_download / 1000000" | bc)
 ookla_upload_mbps=$(echo "scale=2; $ookla_upload / 1000000" | bc)
@@ -62,34 +77,51 @@ ookla_bytes_sent_mb=$(echo "scale=2; $ookla_bytes_sent / 1048576" | bc)
 
 ookla_total=$(echo $ookla_bytes_sent_mb+$ookla_bytes_received_mb | bc)
 
-#echo Starting LibreSpeed
-#librespeed-cli --json > $speedtest_libre
+echo Starting LibreSpeed
+librespeed-cli --json | tee $speedtest_libre
 
 # Parsing JSON data
-#libre_bytes_sent=$(jq '.[0].bytes_sent' "$speedtest_libre")
-#libre_bytes_received=$(jq '.[0].bytes_received' "$speedtest_libre")
-#libre_ping=$(jq '.[0].ping' "$speedtest_libre")
-#libre_upload=$(jq '.[0].upload' "$speedtest_libre")
-#libre_download=$(jq '.[0].download' "$speedtest_libre")
-#libre_server_name=$(jq -r '.[0].server.name' "$speedtest_libre")
+libre_bytes_sent=$(jq '.[0].bytes_sent' "$speedtest_libre")
+libre_bytes_received=$(jq '.[0].bytes_received' "$speedtest_libre")
+libre_ping=$(jq '.[0].ping' "$speedtest_libre")
+libre_upload=$(jq '.[0].upload' "$speedtest_libre")
+libre_download=$(jq '.[0].download' "$speedtest_libre")
+libre_server_name=$(jq -r '.[0].server.name' "$speedtest_libre")
 
-# Converting to human readable units
-#libre_bytes_sent_mb=$(echo "scale=2; $libre_bytes_sent / 1048576" | bc)
-#libre_bytes_received_mb=$(echo "scale=2; $libre_bytes_received / 1048576" | bc)
+# replacing null values
+[ "$libre_ping" = "null" ] || [ -z "$libre_ping" ] && libre_ping="-"
+[ "$libre_download" = "null" ] || [ -z "$libre_download" ] && libre_download=0
+[ "$libre_upload" = "null" ] || [ -z "$libre_upload" ] && libre_upload=0
+[ "$libre_bytes_received" = "null" ] || [ -z "$libre_bytes_received" ] && libre_bytes_received=0
+[ "$libre_bytes_sent" = "null" ] || [ -z "$libre_bytes_sent" ] && libre_bytes_sent=0
 
-#libre_total=$(echo $libre_bytes_sent_mb+$libre_bytes_received_mb | bc)
+# Converting to human readable units and replacing null values with 0
+libre_bytes_sent_mb=$(echo "scale=2; $libre_bytes_sent / 1048576" | bc)
+libre_bytes_received_mb=$(echo "scale=2; $libre_bytes_received / 1048576" | bc)
 
-#echo Starting Fast
-#fast --upload --json > $speedtest_fast
-#fast_download_speed=$(jq '.downloadSpeed' "$speedtest_fast")
-#fast_upload_speed=$(jq '.uploadSpeed' "$speedtest_fast")
-#fast_latency=$(jq '.latency' "$speedtest_fast")
-#fast_downloaded=$(jq '.downloaded' "$speedtest_fast")
-#fast_uploaded=$(jq '.uploaded' "$speedtest_fast")
+libre_total=$(echo $libre_bytes_sent_mb+$libre_bytes_received_mb | bc)
 
-#fast_total=$(echo $fast_downloaded+$fast_uploaded | bc)
+echo Starting Fast
+fast --upload --json | tee $speedtest_fast
+fast_download_speed=$(jq '.downloadSpeed' "$speedtest_fast")
+fast_upload_speed=$(jq '.uploadSpeed' "$speedtest_fast")
+fast_latency=$(jq '.latency' "$speedtest_fast")
+fast_downloaded=$(jq '.downloaded' "$speedtest_fast")
+fast_uploaded=$(jq '.uploaded' "$speedtest_fast")
 
-total_wasted=$ookla_total
+[ -z "$fast_latency" ] && fast_latency="-"
+[ -z "$fast_download_speed" ] && fast_download_speed=0
+[ -z "$fast_upload_speed" ] && fast_upload_speed=0
+[ -z "$fast_downloaded" ] && fast_downloaded=0
+[ -z "$fast_uploaded" ] && fast_uploaded=0
+
+fast_total=$(echo $fast_downloaded+$fast_uploaded | bc)
+
+average_download=$(echo $ookla_download_mbps+$libre_download+$fast_download_speed/3 | bc)
+average_upload=$(echo $ookla_upload_mbps+$libre_upload+$fast_upload_speed/3| bc)
+highest_download=$(echo $ookla_download_mbps $libre_download $fast_download_speed | tr ' ' '\n' | sort -nr | head -n1)
+highest_upload=$(echo $ookla_upload_mbps $libre_upload $fast_upload_speed | tr ' ' '\n' | sort -nr | head -n1)
+total_wasted=$(echo $ookla_total+$libre_total+$fast_total | bc)
 
 echo Speedtests complete
 #################################################################################
@@ -98,32 +130,21 @@ echo Speedtests complete
 valorant_ping=$(latency dynamodb.ap-southeast-1.amazonaws.com)
 cfdns_ping=$(latency 1.1.1.1)
 googledns_ping=$(latency 8.8.8.8)
+[ -z "$valorant_ping" ] && valorant_ping="-"
+[ -z "$cfdns_ping" ] && cfdns_ping="-"
+[ -z "$googledns_ping" ] && googledns_ping="-"
 #################################################################################
 
 #################################################################################
 echo Checking weather
 # Make the API request
-curl -s "https://api.open-meteo.com/v1/forecast?latitude=${LATITUDE}&longitude=${LONGITUDE}&current_weather=true" > $weather_file
+curl -s "https://api.open-meteo.com/v1/forecast?latitude=${LATITUDE}&longitude=${LONGITUDE}&current_weather=true" | tee $weather_file
 # Extract Weather Condition and day or not
 weather_condition=$(jq '.current_weather.weathercode' "$weather_file")
 is_day=$(jq '.current_weather.is_day' "$weather_file")
 case $weather_condition in
-    0)
-       if [ "$is_day" = "1" ]
-       then
-           current_weather="☀️  Clear Sky"
-       else
-           current_weather="🌙 Clear Sky"
-       fi
-       ;;
-    1)
-       if [ "$is_day" = "1" ]
-       then
-           current_weather="☀️  Mainly Clear"
-       else
-           current_weather="🌙 Mainly Clear"
-       fi
-       ;;
+    0) current_weather="$([ "$is_day" = "1" ] && echo "☀️" || echo "🌙") Clear Sky";;
+    1) current_weather="$([ "$is_day" = "1" ] && echo "☀️" || echo "🌙") Mainly Clear";;
     2) current_weather="⛅ Partly Cloudy" ;;
     3) current_weather="☁️  Overcast" ;;
     45) current_weather="🌫️  Fog" ;;
@@ -155,6 +176,51 @@ esac
 echo Weather checked
 #################################################################################
 
+#################################################################################
+
+download_angle=$(echo "scale=2; -118 + ($highest_download - 0) / ($MAX_DOWNLOAD_SPEED - 0) * (118 - -118)" | bc)
+upload_angle=$(echo "scale=2; -118 + ($highest_upload - 0) / ($MAX_UPLOAD_SPEED - 0) * (118 - -118)" | bc)
+
+convert $download_meter \
+    \( $needle -background none \
+               -rotate $download_angle \) \
+    -gravity center \
+    -compose over \
+    -composite \
+    -pointsize 41 \
+    -font $font \
+    -fill white \
+    -annotate +0+-15 $highest_download \
+    -annotate +120+85 $MAX_DOWNLOAD_SPEED \
+    $speedtest_download_meter
+
+convert $upload_meter \
+    \( $needle -background none \
+               -rotate $upload_angle \) \
+    -gravity center \
+    -compose over \
+    -composite \
+    -pointsize 41 \
+    -font $font \
+    -fill white \
+    -annotate +0+-15 $highest_upload \
+    -annotate +120+85 $MAX_UPLOAD_SPEED \
+    $speedtest_upload_meter
+
+convert $camera_image \
+    \( $speedtest_download_meter \
+       -resize $METER_SCALE% \
+       -gravity southwest \
+       -geometry +10+0 \) \
+    -composite \
+    \( $speedtest_upload_meter \
+       -resize $METER_SCALE% \
+       -gravity southwest \
+       -geometry +$UPLOAD_METER_LOCATION+0 \) \
+    -composite \
+    $speedtest_meter_image
+#################################################################################
+
 #################################################################################
 caption="
 $current_weather
@@ -169,27 +235,28 @@ $current_weather
 ⬇️  *Download*: $ookla_download_mbps Mbit/s, Used: $ookla_bytes_received_mb MB
 ⬆️  *Upload*: $ookla_upload_mbps Mbit/s, Used: $ookla_bytes_sent_mb MB
 
+*LibreSpeed*:
+🌐 *Server*: $libre_server_name
+🏓 *Latency*: $libre_ping ms
+⬇️  *Download*: $libre_download Mbit/s, Used: $libre_bytes_received_mb MB
+⬆️  *Upload*: $libre_upload Mbit/s, Used $libre_bytes_sent_mb MB
+
+*Fast Powered by Netflix*:
+🏓 *Latency*: $fast_latency ms
+⬇️  *Download*: $fast_download_speed Mbit/s, Used: $fast_downloaded MB
+⬆️  *Upload*: $fast_upload_speed Mbit/s, Used: $fast_uploaded MB
 
 Total data wasted: $total_wasted MB
 "
 #################################################################################
 
-#################################################################################
-#convert "$camera_image" \
-#    -gravity South \
-#    -font $PWD/JoyPixels.ttf \
-#    -pointsize 20 \
-#    -annotate +0+10 "$caption" \
-#    $edited_image
-#################################################################################
-
 #################################################################################
 echo Uploading to Telegram
 curl -X POST https://api.telegram.org/bot$TG_BOT_TOKEN/sendMediaGroup \
     -F chat_id=$TG_CHATID \
     -F media='[{"type": "photo", "media": "attach://photo1", "caption": "'"$caption"'", "parse_mode": "Markdown"}, {"type": "photo", "media": "attach://photo2"}]' \
-    -F photo1=@$camera_image \
-    -F photo2=@$satellite_image >> /dev/null
+    -F photo1=@$speedtest_meter_image \
+    -F photo2=@$satellite_image | tee $tg_log
 #################################################################################
 
 echo Ok done, Sleeping for $DELAY

env.example

@@ -15,3 +15,12 @@ RTSP_URL=rtsp://
 # Use some maps service to fetch this, this is used to fetch weather from API. (Default is Male', Maldives)
 LATITUDE="4.1752"
 LONGITUDE="73.5092"
+
+
+# Change these as you see fit based on RTSP image resolution
+UPLOAD_METER_LOCATION=510 # in px starting from download meter start
+METER_SCALE=100 # in percentage
+
+# Change meter scale in Mbps
+MAX_DOWNLOAD_SPEED=300
+MAX_UPLOAD_SPEED=50