SamNet-dev/conduit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Telegram peer stats — scale to connected count with percentages

Browse Source 
Match the dashboard's estimation logic: use snapshot country distribution
proportionally scaled to the actual connected client count, instead of
showing raw snapshot counts that don't align with the connected total.
This commit is contained in:
SamNet-dev
2026-02-10 21:44:11 -06:00
parent 6a977a487a
commit 34dc53615b
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
conduit.sh
View File

@@ -6507,15 +6507,28 @@ telegram_build_report() {
local snap_file_peers="$INSTALL_DIR/traffic_stats/tracker_snapshot" local snap_file_peers="$INSTALL_DIR/traffic_stats/tracker_snapshot"
if [ -s "$snap_file_peers" ]; then if [ -s "$snap_file_peers" ]; then
local top_peers local all_peers
top_peers=$(awk -F'|' '{if($2!="" && $4!="" && !seen[$4]++) cnt[$2]++} END{for(c in cnt) print cnt[c]"|"c}' "$snap_file_peers" 2>/dev/null | sort -t'|' -k1 -nr | head -3) all_peers=$(awk -F'|' '{if($2!="" && $4!="" && !seen[$4]++) cnt[$2]++} END{for(c in cnt) print cnt[c]"|"c}' "$snap_file_peers" 2>/dev/null | sort -t'|' -k1 -nr)
if [ -n "$top_peers" ]; then if [ -n "$all_peers" ]; then
local snap_total=0
while IFS='|' read -r cnt co; do
snap_total=$((snap_total + cnt))
done <<< "$all_peers"
[ "$snap_total" -eq 0 ] && snap_total=1
local dash_clients=$((total_peers))
local top_peers=$(echo "$all_peers" | head -3)
report+="🗺 Top by peers:" report+="🗺 Top by peers:"
report+=$'\n' report+=$'\n'
while IFS='|' read -r cnt country; do while IFS='|' read -r cnt country; do
[ -z "$country" ] && continue [ -z "$country" ] && continue
local safe_c=$(escape_telegram_markdown "$country") local safe_c=$(escape_telegram_markdown "$country")
report+=" • ${safe_c}: ${cnt} clients" local pct=$((cnt * 100 / snap_total))
local est=$cnt
if [ "$dash_clients" -gt 0 ]; then
est=$(( (cnt * dash_clients) / snap_total ))
[ "$est" -eq 0 ] && [ "$cnt" -gt 0 ] && est=1
fi
report+=" • ${safe_c}: ${pct}% (${est} clients)"
report+=$'\n' report+=$'\n'
done <<< "$top_peers" done <<< "$top_peers"
fi fi
@@ -7922,15 +7935,28 @@ build_report() {
local snap_file="$INSTALL_DIR/traffic_stats/tracker_snapshot" local snap_file="$INSTALL_DIR/traffic_stats/tracker_snapshot"
if [ -s "$snap_file" ]; then if [ -s "$snap_file" ]; then
local top_peers local all_peers
top_peers=$(awk -F'|' '{if($2!="" && $4!="" && !seen[$4]++) cnt[$2]++} END{for(c in cnt) print cnt[c]"|"c}' "$snap_file" 2>/dev/null | sort -t'|' -k1 -nr | head -3) all_peers=$(awk -F'|' '{if($2!="" && $4!="" && !seen[$4]++) cnt[$2]++} END{for(c in cnt) print cnt[c]"|"c}' "$snap_file" 2>/dev/null | sort -t'|' -k1 -nr)
if [ -n "$top_peers" ]; then if [ -n "$all_peers" ]; then
local snap_total=0
while IFS='|' read -r cnt co; do
snap_total=$((snap_total + cnt))
done <<< "$all_peers"
[ "$snap_total" -eq 0 ] && snap_total=1
local dash_clients=$((total_peers))
local top_peers=$(echo "$all_peers" | head -3)
report+="🗺 Top by peers:" report+="🗺 Top by peers:"
report+=$'\n' report+=$'\n'
while IFS='|' read -r cnt country; do while IFS='|' read -r cnt country; do
[ -z "$country" ] && continue [ -z "$country" ] && continue
local safe_c=$(escape_md "$country") local safe_c=$(escape_md "$country")
report+=" • ${safe_c}: ${cnt} clients" local pct=$((cnt * 100 / snap_total))
local est=$cnt
if [ "$dash_clients" -gt 0 ]; then
est=$(( (cnt * dash_clients) / snap_total ))
[ "$est" -eq 0 ] && [ "$cnt" -gt 0 ] && est=1
fi
report+=" • ${safe_c}: ${pct}% (${est} clients)"
report+=$'\n' report+=$'\n'
done <<< "$top_peers" done <<< "$top_peers"
fi fi