mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-13 08:06:06 +00:00
MHSanaei
b6183271da
The Telegram-bot usage lookup prefiltered inbounds with settings LIKE '%"tgId": N%', which requires the exact space the panel's MarshalIndent happens to emit. Inbounds whose settings were serialized compactly (node sync, imports, external edits) never matched, so the bot reported no configuration even though the client and traffic rows exist. Replace the string match with the driver-portable JSON helpers already used by GetAllEmails, which read the actual clients array on SQLite and Postgres alike. Closes #5805
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))
|
|
}
|
|
}
|