Muse
ceca96571d
Per user decision 2026-10-21 (reverses the 2026-10-20 drop-Telegram call): port the upstream 3x-ui v3.7.0-generation Telegram bot wholesale instead of rewriting a minimal set, adapted to this fork. - new internal/web/service/tgbot package (telego): bot lifecycle, commands, reports, callback router, send helpers; token validation via telego; custom API server URL passes the fork's SSRF sanitizer (loopback/private bases fall back to the default endpoint, logged) - settings: full upstream key set (tgBotEnable/Token/Proxy/APIServer/ ChatId, tgRunTime, tgBotBackup, tgCpu/tgMemory, tgLang, tgEnabledEvents) with getters/setters; settings page gains a Telegram tab + sidebar entry; token shown masked, clearTgBotToken honored - wiring (web.go): stats-notify cron registered from tgRunTime when the bot is enabled; CheckHashStorage job; CPU/memory alarm jobs gated on tgEnabledEvents + thresholds; login notifications via event bus; POST /panel/api/setting/testTgBot and /panel/api/backuptotgbot - lite adaptation: StatsNotifyJob no longer gates on a local Xray core (this panel never runs one) so the periodic report and the scheduled DB backup (sendDocument) can actually fire - translations: upstream TG keys restored across all locales End-to-end smoke (real binary + fake Telegram API over HTTPS at a public-looking address, browser form wire format): bot starts on settings change (getMe), testTgBot delivers, panel restart re-arms the bot, tgRunTime='@every 1m' cron really fires sendDocument carrying the panel SQLite DB (magic verified) plus the report sendMessage, login notification delivered, dead-endpoint failure is logged not silent. 13/13 PASS — see P9-REPORT.md.
68 lines
2.2 KiB
Go
68 lines
2.2 KiB
Go
package service
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
|
)
|
|
|
|
// TestGetClientTrafficTgBot_SettingsSerializationStyles guards against the
|
|
// prefilter regressing into a formatting-sensitive string match (#5805): the
|
|
// lookup must find clients whether inbounds.settings stores compact JSON
|
|
// ("tgId":N, as written by node sync/import) or indented JSON ("tgId": N, as
|
|
// written by the panel's MarshalIndent).
|
|
func TestGetClientTrafficTgBot_SettingsSerializationStyles(t *testing.T) {
|
|
dbDir := t.TempDir()
|
|
t.Setenv("XUI_DB_FOLDER", dbDir)
|
|
if err := database.InitDB(filepath.Join(dbDir, "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
|
|
db := database.GetDB()
|
|
|
|
const tgId int64 = 123456789
|
|
cases := []struct {
|
|
name string
|
|
settings string
|
|
email string
|
|
port int
|
|
}{
|
|
{"compact", `{"clients":[{"id":"u1","email":"compact-user","tgId":123456789}]}`, "compact-user", 41001},
|
|
{"spaced", `{"clients": [{"id": "u2", "email": "spaced-user", "tgId": 123456789}]}`, "spaced-user", 41002},
|
|
}
|
|
for _, c := range cases {
|
|
inbound := &model.Inbound{UserId: 1, Tag: "tg-" + c.name, Enable: true, Port: c.port, Protocol: model.VLESS, Settings: c.settings}
|
|
if err := db.Create(inbound).Error; err != nil {
|
|
t.Fatalf("create %s inbound: %v", c.name, err)
|
|
}
|
|
if err := db.Create(&xray.ClientTraffic{InboundId: inbound.Id, Email: c.email, Enable: true, Up: 10, Down: 20}).Error; err != nil {
|
|
t.Fatalf("create %s client_traffics: %v", c.name, err)
|
|
}
|
|
}
|
|
|
|
svc := InboundService{}
|
|
traffics, err := svc.GetClientTrafficTgBot(tgId)
|
|
if err != nil {
|
|
t.Fatalf("GetClientTrafficTgBot: %v", err)
|
|
}
|
|
got := make(map[string]bool, len(traffics))
|
|
for _, tr := range traffics {
|
|
got[tr.Email] = true
|
|
}
|
|
if len(traffics) != 2 || !got["compact-user"] || !got["spaced-user"] {
|
|
t.Fatalf("expected traffic for compact-user and spaced-user, got %v", got)
|
|
}
|
|
|
|
other, err := svc.GetClientTrafficTgBot(42)
|
|
if err != nil {
|
|
t.Fatalf("GetClientTrafficTgBot(42): %v", err)
|
|
}
|
|
if len(other) != 0 {
|
|
t.Fatalf("expected no traffic for unknown tgId, got %d rows", len(other))
|
|
}
|
|
}
|