rogue/3x-ui-agent
1
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases 5 Wiki Activity

修复: mixed 协议可部署到节点: 后端 nodeEligibleProtocols 放开 Mixed(inbound.go 两处校验点), 前端 NODE_ELIGIBLE_PROTOCOLS 同步; 重建前端 dist(含 Swagger 页/分组页裁剪)

Browse Source
This commit is contained in:
Muse
2026-10-20 10:24:28 +00:00
parent b9e1345b23
commit 4149a162b8
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/lib/xray/node-protocols.ts
+5 -1
View File
@@ -2,7 +2,10 @@ import { Protocols } from '@/schemas/primitives';
/* /*
* Protocols whose inbounds can live on a sub-node (the "Deploy To" set). * Protocols whose inbounds can live on a sub-node (the "Deploy To" set).
* Everything else (http, mixed, tunnel, tun, mtproto) is panel-local only. * Everything else (http, tunnel, tun, mtproto) is panel-local only. Mixed
* is eligible: it is a plain xray inbound, and node-local mixed inbounds
* already sync back to the panel — hiding the picker only blocked creating
* them from the master.
* Shared by the inbound form's Deploy To selector and the clone dialog's * Shared by the inbound form's Deploy To selector and the clone dialog's
* target picker so the two surfaces can never drift apart. * target picker so the two surfaces can never drift apart.
*/ */
@@ -13,4 +16,5 @@ export const NODE_ELIGIBLE_PROTOCOLS: Readonly<Record<string, true>> = {
[Protocols.SHADOWSOCKS]: true, [Protocols.SHADOWSOCKS]: true,
[Protocols.HYSTERIA]: true, [Protocols.HYSTERIA]: true,
[Protocols.WIREGUARD]: true, [Protocols.WIREGUARD]: true,
[Protocols.MIXED]: true,
}; };
internal/web/service/inbound_protocol.go
+3
View File
@@ -57,6 +57,8 @@ func inboundCanEnableTlsFlow(protocol, streamSettings, settings string) bool {
// sidecar-managed protocols are absent because their reconcile loops only query // sidecar-managed protocols are absent because their reconcile loops only query
// NodeID IS NULL rows, so a node-assigned one would never be reconciled at all. // NodeID IS NULL rows, so a node-assigned one would never be reconciled at all.
// A new protocol defaults to ineligible until added here, as on the frontend. // A new protocol defaults to ineligible until added here, as on the frontend.
// Mixed is a plain xray inbound (not sidecar-managed): node-local mixed
// inbounds already sync back and are managed by the panel, so it is eligible.
var nodeEligibleProtocols = map[model.Protocol]bool{ var nodeEligibleProtocols = map[model.Protocol]bool{
model.VLESS: true, model.VLESS: true,
model.VMESS: true, model.VMESS: true,
@@ -64,6 +66,7 @@ var nodeEligibleProtocols = map[model.Protocol]bool{
model.Shadowsocks: true, model.Shadowsocks: true,
model.Hysteria: true, model.Hysteria: true,
model.WireGuard: true, model.WireGuard: true,
model.Mixed: true,
} }
// isNodeEligibleProtocol reports whether protocol may be assigned to a node. // isNodeEligibleProtocol reports whether protocol may be assigned to a node.
internal/web/service/inbound_protocol_test.go
+2 -2
View File
@@ -93,13 +93,13 @@ func TestInboundCanHostFallbacks_StaysTcpOnly(t *testing.T) {
// frontend/src/pages/inbounds/form/InboundFormModal.tsx -- keep both lists // frontend/src/pages/inbounds/form/InboundFormModal.tsx -- keep both lists
// in sync if a protocol's node-eligibility ever changes. // in sync if a protocol's node-eligibility ever changes.
func TestIsNodeEligibleProtocol(t *testing.T) { func TestIsNodeEligibleProtocol(t *testing.T) {
eligible := []model.Protocol{model.VLESS, model.VMESS, model.Trojan, model.Shadowsocks, model.Hysteria, model.WireGuard} eligible := []model.Protocol{model.VLESS, model.VMESS, model.Trojan, model.Shadowsocks, model.Hysteria, model.WireGuard, model.Mixed}
for _, p := range eligible { for _, p := range eligible {
if !isNodeEligibleProtocol(p) { if !isNodeEligibleProtocol(p) {
t.Errorf("isNodeEligibleProtocol(%q) = false, want true", p) t.Errorf("isNodeEligibleProtocol(%q) = false, want true", p)
} }
} }
ineligible := []model.Protocol{model.MTProto, model.AmneziaWG, model.Mixed, model.HTTP, model.Tunnel} ineligible := []model.Protocol{model.MTProto, model.AmneziaWG, model.HTTP, model.Tunnel}
for _, p := range ineligible { for _, p := range ineligible {
if isNodeEligibleProtocol(p) { if isNodeEligibleProtocol(p) {
t.Errorf("isNodeEligibleProtocol(%q) = true, want false", p) t.Errorf("isNodeEligibleProtocol(%q) = true, want false", p)