mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-18 20:05:03 +03:00
Roman Chesnakov
bd01f923fb
* fix(tgbot): unstick the add-client wizard's inbound picker Tapping "➕ Новый клиент" always sent the "choose inbound" message, even when the button list ended up empty after protocol filtering. getInboundsAddClient checked len(inbounds)==0 before filtering but never re-checked after, so an admin whose every inbound was excluded got a message with nothing to tap and no further feedback. WireGuard and AmneziaWG were excluded outright too, a holdover from the wizard's original 2025 implementation, before defaultWireguardClients and defaultAmneziaWGClients existed. Both now auto-generate a keypair + AllowedIPs for a client with none set, and the subscription server already emits wireguard:// and vpn:// share links for them, so both inbound types flow through the same generic Create path as VLESS/Trojan already used by the bot. Mixed/HTTP/Tunnel stay excluded: they have no per-client model in this codebase. - getInboundsAddClient now returns getInboundsFailed when the button list is empty after filtering, instead of sending an unusable keyboard - WireGuard/AmneziaWG removed from the exclusion list in both getInboundsAddClient and getInboundsAttachPicker - the previously duplicated excludedProtocols map is now a single package-level addClientExcludedProtocols shared by both functions * test(tgbot): pin which inbounds the add-client picker offers The picker change had no test. One drives a database holding WireGuard, AmneziaWG, VLESS and Mixed inbounds and wants the first three offered; the other holds only Mixed, HTTP and Tunnel and wants getInboundsFailed instead of an empty keyboard. Both fail on the previous picker. --------- Co-authored-by: MHSanaei <ho3ein.sanaei@gmail.com>
67 lines
2.2 KiB
Go
67 lines
2.2 KiB
Go
package tgbot
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"slices"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
|
|
"github.com/mymmrac/telego"
|
|
"github.com/nicksnyder/go-i18n/v2/i18n"
|
|
)
|
|
|
|
func seedPickerInbounds(t *testing.T, protocols ...model.Protocol) {
|
|
t.Helper()
|
|
if err := database.InitDB(filepath.Join(t.TempDir(), "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
for i, protocol := range protocols {
|
|
port := 20000 + i
|
|
ib := &model.Inbound{Remark: string(protocol), Enable: true, Port: port, Protocol: protocol, Tag: fmt.Sprintf("inbound-%d", port), Settings: `{}`}
|
|
if err := database.GetDB().Create(ib).Error; err != nil {
|
|
t.Fatalf("seed %s inbound: %v", protocol, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func pickerLabels(keyboard *telego.InlineKeyboardMarkup) []string {
|
|
var labels []string
|
|
for _, row := range keyboard.InlineKeyboard {
|
|
for _, button := range row {
|
|
labels = append(labels, button.Text)
|
|
}
|
|
}
|
|
slices.Sort(labels)
|
|
return labels
|
|
}
|
|
|
|
// WireGuard and AmneziaWG clients get a generated keypair and address on Create,
|
|
// so the wizard offers them; Mixed authenticates per inbound and has no clients.
|
|
func TestAddClientPickerOffersWireGuardAndAmneziaWG(t *testing.T) {
|
|
seedPickerInbounds(t, model.VLESS, model.WireGuard, model.AmneziaWG, model.Mixed)
|
|
|
|
keyboard, err := (&Tgbot{}).getInboundsAddClient()
|
|
if err != nil {
|
|
t.Fatalf("getInboundsAddClient: %v", err)
|
|
}
|
|
want := []string{"amneziawg - ✅", "vless - ✅", "wireguard - ✅"}
|
|
if got := pickerLabels(keyboard); !slices.Equal(got, want) {
|
|
t.Fatalf("picker buttons = %q, want %q", got, want)
|
|
}
|
|
}
|
|
|
|
// An empty keyboard sent the admin a "choose inbound" prompt with nothing to tap.
|
|
func TestAddClientPickerFailsWhenNoInboundTakesClients(t *testing.T) {
|
|
draftLocalizer(t, &i18n.Message{ID: "tgbot.answers.getInboundsFailed", Other: "Failed to get inbounds."})
|
|
seedPickerInbounds(t, model.Mixed, model.HTTP, model.Tunnel)
|
|
|
|
keyboard, err := (&Tgbot{}).getInboundsAddClient()
|
|
if err == nil || err.Error() != "Failed to get inbounds." {
|
|
t.Fatalf("getInboundsAddClient = (%v, %v), want the getInboundsFailed error", keyboard, err)
|
|
}
|
|
}
|