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

fix: Telegram report — deduplicate peer counts, correct lifetime IPs source, add MTProxy status

Browse Source 
- Top by peers: count unique IPs instead of lines (was 2x inflated from FROM+TO entries)
- Total lifetime IPs: use cumulative_ips file instead of tracker_snapshot (was showing last 15s cycle count)
- Add MTProxy status + traffic to both Telegram report functions when enabled and running
This commit is contained in:
SamNet-dev
2026-02-10 21:11:30 -06:00
parent 4043d176ca
commit 3ce0903955
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
conduit.sh
View File

@@ -6481,6 +6481,16 @@ telegram_build_report() {
report+=$'\n' report+=$'\n'
fi fi
if [ "$MTPROTO_ENABLED" = "true" ] && is_mtproto_running; then
local _mt_t=$(get_mtproto_traffic)
local _mt_dl _mt_ul
read -r _mt_dl _mt_ul <<< "$_mt_t"
local mt_dl_fmt=$(format_bytes ${_mt_dl:-0})
local mt_ul_fmt=$(format_bytes ${_mt_ul:-0})
report+="📡 MTProxy: Running | ↓${mt_dl_fmt} ↑${mt_ul_fmt}"
report+=$'\n'
fi
local total_restarts=0 local total_restarts=0
local restart_details="" local restart_details=""
for i in $(seq 1 ${CONTAINER_COUNT:-1}); do for i in $(seq 1 ${CONTAINER_COUNT:-1}); do
@@ -6498,7 +6508,7 @@ 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 top_peers
top_peers=$(awk -F'|' '{if($2!="") cnt[$2]++} END{for(c in cnt) print cnt[c]"|"c}' "$snap_file_peers" 2>/dev/null | sort -t'|' -k1 -nr | head -3) 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)
if [ -n "$top_peers" ]; then if [ -n "$top_peers" ]; then
report+="🗺 Top by peers:" report+="🗺 Top by peers:"
report+=$'\n' report+=$'\n'
@@ -6528,11 +6538,11 @@ telegram_build_report() {
fi fi
fi fi
# Unique IPs from tracker_snapshot # Unique IPs from cumulative_ips (lifetime record)
local snapshot_file="$INSTALL_DIR/traffic_stats/tracker_snapshot" local ips_file="$INSTALL_DIR/traffic_stats/cumulative_ips"
if [ -s "$snapshot_file" ]; then if [ -s "$ips_file" ]; then
local active_clients=$(wc -l < "$snapshot_file" 2>/dev/null || echo 0) local lifetime_ips=$(wc -l < "$ips_file" 2>/dev/null || echo 0)
report+="📡 Total lifetime IPs served: ${active_clients}" report+="📡 Total lifetime IPs served: ${lifetime_ips}"
report+=$'\n' report+=$'\n'
fi fi
@@ -7715,11 +7725,11 @@ build_report() {
report+="👥 Clients: ${total_peers} connected, ${total_connecting} connecting" report+="👥 Clients: ${total_peers} connected, ${total_connecting} connecting"
report+=$'\n' report+=$'\n'
# Active unique clients # Unique IPs from cumulative_ips (lifetime record)
local snapshot_file="$INSTALL_DIR/traffic_stats/tracker_snapshot" local ips_file="$INSTALL_DIR/traffic_stats/cumulative_ips"
if [ -s "$snapshot_file" ]; then if [ -s "$ips_file" ]; then
local active_clients=$(wc -l < "$snapshot_file" 2>/dev/null || echo 0) local lifetime_ips=$(wc -l < "$ips_file" 2>/dev/null || echo 0)
report+="👤 Total lifetime IPs served: ${active_clients}" report+="👤 Total lifetime IPs served: ${lifetime_ips}"
report+=$'\n' report+=$'\n'
fi fi
@@ -7886,6 +7896,16 @@ build_report() {
fi fi
fi fi
if [ "$MTPROTO_ENABLED" = "true" ] && is_mtproto_running; then
local _mt_t=$(get_mtproto_traffic)
local _mt_dl _mt_ul
read -r _mt_dl _mt_ul <<< "$_mt_t"
local mt_dl_fmt=$(format_bytes ${_mt_dl:-0})
local mt_ul_fmt=$(format_bytes ${_mt_ul:-0})
report+="📡 MTProxy: Running | ↓${mt_dl_fmt} ↑${mt_ul_fmt}"
report+=$'\n'
fi
local total_restarts=0 local total_restarts=0
local restart_details="" local restart_details=""
for i in $(seq 1 ${CONTAINER_COUNT:-1}); do for i in $(seq 1 ${CONTAINER_COUNT:-1}); do
@@ -7903,7 +7923,7 @@ 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 top_peers
top_peers=$(awk -F'|' '{if($2!="") cnt[$2]++} END{for(c in cnt) print cnt[c]"|"c}' "$snap_file" 2>/dev/null | sort -t'|' -k1 -nr | head -3) 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)
if [ -n "$top_peers" ]; then if [ -n "$top_peers" ]; then
report+="🗺 Top by peers:" report+="🗺 Top by peers:"
report+=$'\n' report+=$'\n'