mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-11-16 17:34:23 +08:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c05ff086e5 | |||
| ae370382d3 | |||
| e112d81697 |
+10
-1
@@ -64,6 +64,14 @@ curl -L https://raw.githubusercontent.com/Sagit-chu/flux-panel/main/panel_instal
|
|||||||
curl -L https://raw.githubusercontent.com/Sagit-chu/flux-panel/main/install.sh -o install.sh && chmod +x install.sh && ./install.sh
|
curl -L https://raw.githubusercontent.com/Sagit-chu/flux-panel/main/install.sh -o install.sh && chmod +x install.sh && ./install.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Alpine Linux 最小化安装若未包含 `curl`,可使用系统自带的 `wget` 下载:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
wget -O install.sh https://raw.githubusercontent.com/Sagit-chu/flux-panel/main/install.sh && chmod +x install.sh && ./install.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
脚本会在 Alpine 上自动安装 Bash,并使用 OpenRC 注册、启动和管理 `flux_agent` 服务;其他受支持的 Linux 发行版继续使用 systemd。
|
||||||
|
|
||||||
**安装过程中会提示输入:**
|
**安装过程中会提示输入:**
|
||||||
- **服务器地址**: 面板端的通信地址(通常是 `http://<面板IP>:<后端端口>`,例如 `http://1.2.3.4:6365`)。
|
- **服务器地址**: 面板端的通信地址(通常是 `http://<面板IP>:<后端端口>`,例如 `http://1.2.3.4:6365`)。
|
||||||
- **密钥**: 刚才在面板中获取的节点密钥。
|
- **密钥**: 刚才在面板中获取的节点密钥。
|
||||||
@@ -77,7 +85,8 @@ curl -L https://raw.githubusercontent.com/Sagit-chu/flux-panel/main/install.sh -
|
|||||||
|
|
||||||
### 3. 验证安装
|
### 3. 验证安装
|
||||||
安装完成后,服务会自动启动。
|
安装完成后,服务会自动启动。
|
||||||
- 查看状态: `systemctl status flux_agent`
|
- systemd 查看状态: `systemctl status flux_agent`
|
||||||
|
- Alpine/OpenRC 查看状态: `rc-service flux_agent status`
|
||||||
- 回到面板 **节点管理** 页面,该节点状态应显示为 **在线**。
|
- 回到面板 **节点管理** 页面,该节点状态应显示为 **在线**。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ type diagnosisWorkItem struct {
|
|||||||
type diagnosisExecOptions struct {
|
type diagnosisExecOptions struct {
|
||||||
commandTimeout time.Duration
|
commandTimeout time.Duration
|
||||||
pingTimeoutMS int
|
pingTimeoutMS int
|
||||||
|
pingCount int
|
||||||
timeoutMessage string
|
timeoutMessage string
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1596,10 +1597,14 @@ func (h *Handler) tcpPingViaNode(nodeID int64, ip string, port int, options diag
|
|||||||
if options.pingTimeoutMS <= 0 {
|
if options.pingTimeoutMS <= 0 {
|
||||||
options.pingTimeoutMS = int(diagnosisCommandTimeout / time.Millisecond)
|
options.pingTimeoutMS = int(diagnosisCommandTimeout / time.Millisecond)
|
||||||
}
|
}
|
||||||
|
pingCount := options.pingCount
|
||||||
|
if pingCount <= 0 {
|
||||||
|
pingCount = 4
|
||||||
|
}
|
||||||
res, err := h.sendNodeCommandWithTimeout(nodeID, "TcpPing", map[string]interface{}{
|
res, err := h.sendNodeCommandWithTimeout(nodeID, "TcpPing", map[string]interface{}{
|
||||||
"ip": ip,
|
"ip": ip,
|
||||||
"port": port,
|
"port": port,
|
||||||
"count": 4,
|
"count": pingCount,
|
||||||
"timeout": options.pingTimeoutMS,
|
"timeout": options.pingTimeoutMS,
|
||||||
}, options.commandTimeout, false, false)
|
}, options.commandTimeout, false, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -1626,12 +1631,16 @@ func (h *Handler) tcpPingViaRemoteNode(node *nodeRecord, ip string, port int, op
|
|||||||
if options.pingTimeoutMS <= 0 {
|
if options.pingTimeoutMS <= 0 {
|
||||||
options.pingTimeoutMS = int(diagnosisCommandTimeout / time.Millisecond)
|
options.pingTimeoutMS = int(diagnosisCommandTimeout / time.Millisecond)
|
||||||
}
|
}
|
||||||
|
pingCount := options.pingCount
|
||||||
|
if pingCount <= 0 {
|
||||||
|
pingCount = 4
|
||||||
|
}
|
||||||
|
|
||||||
fc := client.NewFederationClientWithTimeout(options.commandTimeout)
|
fc := client.NewFederationClientWithTimeout(options.commandTimeout)
|
||||||
return fc.Diagnose(remoteURL, remoteToken, h.federationLocalDomain(), client.RuntimeDiagnoseRequest{
|
return fc.Diagnose(remoteURL, remoteToken, h.federationLocalDomain(), client.RuntimeDiagnoseRequest{
|
||||||
IP: strings.TrimSpace(ip),
|
IP: strings.TrimSpace(ip),
|
||||||
Port: port,
|
Port: port,
|
||||||
Count: 4,
|
Count: pingCount,
|
||||||
Timeout: options.pingTimeoutMS,
|
Timeout: options.pingTimeoutMS,
|
||||||
Protocol: "tcp",
|
Protocol: "tcp",
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1015,6 +1015,7 @@ func (h *Handler) updateConfigs(w http.ResponseWriter, r *http.Request) {
|
|||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
response.WriteJSON(w, response.Err(-2, err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
h.notifyTunnelQualityConfigChanged(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
response.WriteJSON(w, response.OKEmpty())
|
response.WriteJSON(w, response.OKEmpty())
|
||||||
@@ -1062,6 +1063,7 @@ func (h *Handler) updateSingleConfig(w http.ResponseWriter, r *http.Request) {
|
|||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
response.WriteJSON(w, response.Err(-2, err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
h.notifyTunnelQualityConfigChanged(name)
|
||||||
|
|
||||||
response.WriteJSON(w, response.OKEmpty())
|
response.WriteJSON(w, response.OKEmpty())
|
||||||
}
|
}
|
||||||
@@ -1110,11 +1112,23 @@ func normalizeAndValidateConfigValue(key, value string) (string, error) {
|
|||||||
}
|
}
|
||||||
case monitoring.ConfigMonitorRetentionDays:
|
case monitoring.ConfigMonitorRetentionDays:
|
||||||
return monitoring.NormalizeMonitoringRetentionDays(value)
|
return monitoring.NormalizeMonitoringRetentionDays(value)
|
||||||
|
case monitoring.ConfigTunnelQualityProbeIntervalSec:
|
||||||
|
return monitoring.NormalizeTunnelQualityProbeIntervalSeconds(value)
|
||||||
default:
|
default:
|
||||||
return value, nil
|
return value, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) notifyTunnelQualityConfigChanged(key string) {
|
||||||
|
if h == nil || h.qualityProber == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
switch strings.TrimSpace(key) {
|
||||||
|
case monitorTunnelQualityEnabledConfigKey, monitoring.ConfigTunnelQualityProbeIntervalSec:
|
||||||
|
h.qualityProber.NotifyConfigChanged()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) isTunnelQualityMonitoringEnabled() bool {
|
func (h *Handler) isTunnelQualityMonitoringEnabled() bool {
|
||||||
if h == nil || h.repo == nil {
|
if h == nil || h.repo == nil {
|
||||||
return true
|
return true
|
||||||
|
|||||||
@@ -152,7 +152,11 @@ func evaluateBestExitOwner(owner chainNodeRecord, exits []chainNodeRecord, nodes
|
|||||||
ownerNode := nodes[owner.NodeID]
|
ownerNode := nodes[owner.NodeID]
|
||||||
for _, exit := range exits {
|
for _, exit := range exits {
|
||||||
exitNode := nodes[exit.NodeID]
|
exitNode := nodes[exit.NodeID]
|
||||||
if exitNode == nil {
|
if !isTunnelProbeNodeOnline(ownerNode) {
|
||||||
|
scores = append(scores, failedBestExitCandidate(owner.NodeID, exit, "owner node offline"))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !isTunnelProbeNodeOnline(exitNode) {
|
||||||
scores = append(scores, failedBestExitCandidate(owner.NodeID, exit, "exit node unavailable"))
|
scores = append(scores, failedBestExitCandidate(owner.NodeID, exit, "exit node unavailable"))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -358,9 +358,9 @@ func TestEvaluateBestExitOwnerScoresAllCandidates(t *testing.T) {
|
|||||||
{NodeID: 31, NodeName: "exit-b", Port: 30031},
|
{NodeID: 31, NodeName: "exit-b", Port: 30031},
|
||||||
}
|
}
|
||||||
nodes := map[int64]*nodeRecord{
|
nodes := map[int64]*nodeRecord{
|
||||||
10: {ID: 10, ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10", TCPListenAddr: "[::]"},
|
10: {ID: 10, Status: 1, ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10", TCPListenAddr: "[::]"},
|
||||||
30: {ID: 30, ServerIP: "10.0.0.30", ServerIPv4: "10.0.0.30", TCPListenAddr: "[::]"},
|
30: {ID: 30, Status: 1, ServerIP: "10.0.0.30", ServerIPv4: "10.0.0.30", TCPListenAddr: "[::]"},
|
||||||
31: {ID: 31, ServerIP: "10.0.0.31", ServerIPv4: "10.0.0.31", TCPListenAddr: "[::]"},
|
31: {ID: 31, Status: 1, ServerIP: "10.0.0.31", ServerIPv4: "10.0.0.31", TCPListenAddr: "[::]"},
|
||||||
}
|
}
|
||||||
pinger := func(nodeID int64, ip string, port int, _ diagnosisExecOptions) (float64, float64, error) {
|
pinger := func(nodeID int64, ip string, port int, _ diagnosisExecOptions) (float64, float64, error) {
|
||||||
switch {
|
switch {
|
||||||
@@ -387,12 +387,30 @@ func TestEvaluateBestExitOwnerScoresAllCandidates(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEvaluateBestExitOwnerSkipsOfflineCandidate(t *testing.T) {
|
||||||
|
owner := chainNodeRecord{NodeID: 10, NodeName: "entry"}
|
||||||
|
exits := []chainNodeRecord{{NodeID: 30, NodeName: "exit-a", Port: 30030}}
|
||||||
|
nodes := map[int64]*nodeRecord{
|
||||||
|
10: {ID: 10, Status: 1, ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10"},
|
||||||
|
30: {ID: 30, Status: 0, ServerIP: "10.0.0.30", ServerIPv4: "10.0.0.30"},
|
||||||
|
}
|
||||||
|
ping := func(nodeID int64, ip string, port int, options diagnosisExecOptions) (float64, float64, error) {
|
||||||
|
t.Fatalf("offline best-exit candidate should not be probed: node=%d target=%s:%d", nodeID, ip, port)
|
||||||
|
return 0, 100, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
scores := evaluateBestExitOwner(owner, exits, nodes, "", diagnosisExecOptions{}, defaultTunnelProbeTarget(), ping)
|
||||||
|
if len(scores) != 1 || scores[0].Success {
|
||||||
|
t.Fatalf("expected one failed offline candidate, got %+v", scores)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestEvaluateBestExitOwnerUsesConfiguredPublicProbeTarget(t *testing.T) {
|
func TestEvaluateBestExitOwnerUsesConfiguredPublicProbeTarget(t *testing.T) {
|
||||||
owner := chainNodeRecord{NodeID: 10, NodeName: "entry-a"}
|
owner := chainNodeRecord{NodeID: 10, NodeName: "entry-a"}
|
||||||
exits := []chainNodeRecord{{NodeID: 30, NodeName: "exit-a", Port: 30001}}
|
exits := []chainNodeRecord{{NodeID: 30, NodeName: "exit-a", Port: 30001}}
|
||||||
nodes := map[int64]*nodeRecord{
|
nodes := map[int64]*nodeRecord{
|
||||||
10: {ID: 10, Name: "entry-a", ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10"},
|
10: {ID: 10, Name: "entry-a", Status: 1, ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10"},
|
||||||
30: {ID: 30, Name: "exit-a", ServerIP: "10.0.0.30", ServerIPv4: "10.0.0.30"},
|
30: {ID: 30, Name: "exit-a", Status: 1, ServerIP: "10.0.0.30", ServerIPv4: "10.0.0.30"},
|
||||||
}
|
}
|
||||||
target := tunnelProbeTarget{Host: "speed.example.com", Port: 8443}
|
target := tunnelProbeTarget{Host: "speed.example.com", Port: 8443}
|
||||||
var calls []string
|
var calls []string
|
||||||
@@ -419,8 +437,8 @@ func TestEvaluateBestExitOwnerMarksCandidateFailedWhenOwnerToExitFails(t *testin
|
|||||||
owner := chainNodeRecord{NodeID: 10, NodeName: "entry"}
|
owner := chainNodeRecord{NodeID: 10, NodeName: "entry"}
|
||||||
exits := []chainNodeRecord{{NodeID: 30, NodeName: "exit-a", Port: 30030}}
|
exits := []chainNodeRecord{{NodeID: 30, NodeName: "exit-a", Port: 30030}}
|
||||||
nodes := map[int64]*nodeRecord{
|
nodes := map[int64]*nodeRecord{
|
||||||
10: {ID: 10, ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10", TCPListenAddr: "[::]"},
|
10: {ID: 10, Status: 1, ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10", TCPListenAddr: "[::]"},
|
||||||
30: {ID: 30, ServerIP: "10.0.0.30", ServerIPv4: "10.0.0.30", TCPListenAddr: "[::]"},
|
30: {ID: 30, Status: 1, ServerIP: "10.0.0.30", ServerIPv4: "10.0.0.30", TCPListenAddr: "[::]"},
|
||||||
}
|
}
|
||||||
pinger := func(nodeID int64, ip string, port int, _ diagnosisExecOptions) (float64, float64, error) {
|
pinger := func(nodeID int64, ip string, port int, _ diagnosisExecOptions) (float64, float64, error) {
|
||||||
return 0, 100, errBestExitProbeForTest
|
return 0, 100, errBestExitProbeForTest
|
||||||
@@ -436,8 +454,8 @@ func TestEvaluateBestExitOwnerMarksCandidateFailedWhenTargetResolutionFails(t *t
|
|||||||
owner := chainNodeRecord{NodeID: 10, NodeName: "entry"}
|
owner := chainNodeRecord{NodeID: 10, NodeName: "entry"}
|
||||||
exits := []chainNodeRecord{{NodeID: 30, NodeName: "exit-v6", Port: 30030}}
|
exits := []chainNodeRecord{{NodeID: 30, NodeName: "exit-v6", Port: 30030}}
|
||||||
nodes := map[int64]*nodeRecord{
|
nodes := map[int64]*nodeRecord{
|
||||||
10: {ID: 10, Name: "entry", ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10", TCPListenAddr: "[::]"},
|
10: {ID: 10, Name: "entry", Status: 1, ServerIP: "10.0.0.10", ServerIPv4: "10.0.0.10", TCPListenAddr: "[::]"},
|
||||||
30: {ID: 30, Name: "exit-v6", ServerIP: "2001:db8::30", ServerIPv6: "2001:db8::30", TCPListenAddr: "[::]"},
|
30: {ID: 30, Name: "exit-v6", Status: 1, ServerIP: "2001:db8::30", ServerIPv6: "2001:db8::30", TCPListenAddr: "[::]"},
|
||||||
}
|
}
|
||||||
pinger := func(nodeID int64, ip string, port int, _ diagnosisExecOptions) (float64, float64, error) {
|
pinger := func(nodeID int64, ip string, port int, _ diagnosisExecOptions) (float64, float64, error) {
|
||||||
t.Fatalf("ping should not be called when target resolution fails: node=%d ip=%s port=%d", nodeID, ip, port)
|
t.Fatalf("ping should not be called when target resolution fails: node=%d ip=%s port=%d", nodeID, ip, port)
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ package handler
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
@@ -13,7 +15,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
tunnelQualityProbeInterval = 1 * time.Second
|
|
||||||
tunnelQualityProbeTimeout = 8 * time.Second
|
tunnelQualityProbeTimeout = 8 * time.Second
|
||||||
tunnelQualityPingTimeoutMs = 5000
|
tunnelQualityPingTimeoutMs = 5000
|
||||||
tunnelQualityPruneInterval = 10 * time.Minute
|
tunnelQualityPruneInterval = 10 * time.Minute
|
||||||
@@ -31,6 +32,26 @@ type TunnelQualityHop struct {
|
|||||||
TargetPort int `json:"targetPort,omitempty"`
|
TargetPort int `json:"targetPort,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type TunnelQualityCandidateHop struct {
|
||||||
|
TunnelQualityHop
|
||||||
|
FromRole string `json:"fromRole"`
|
||||||
|
ToRole string `json:"toRole"`
|
||||||
|
HopIndex int `json:"hopIndex"`
|
||||||
|
Selected bool `json:"selected"`
|
||||||
|
ErrorMessage string `json:"errorMessage,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type tunnelQualityChainDetails struct {
|
||||||
|
PrimaryPath []TunnelQualityHop `json:"primaryPath,omitempty"`
|
||||||
|
CandidateHops []TunnelQualityCandidateHop `json:"candidateHops,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type tunnelQualityCandidateGroup struct {
|
||||||
|
role string
|
||||||
|
roleIndex int
|
||||||
|
nodes []chainNodeRecord
|
||||||
|
}
|
||||||
|
|
||||||
// tunnelQualitySnapshot is the in-memory latest probe result for a tunnel.
|
// tunnelQualitySnapshot is the in-memory latest probe result for a tunnel.
|
||||||
type tunnelQualitySnapshot struct {
|
type tunnelQualitySnapshot struct {
|
||||||
TunnelID int64 `json:"tunnelId"`
|
TunnelID int64 `json:"tunnelId"`
|
||||||
@@ -56,7 +77,7 @@ type tunnelQualityProber struct {
|
|||||||
cache sync.Map // tunnelID (int64) → *tunnelQualitySnapshot
|
cache sync.Map // tunnelID (int64) → *tunnelQualitySnapshot
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
cancel context.CancelFunc
|
cancel context.CancelFunc
|
||||||
interval time.Duration
|
wake chan struct{}
|
||||||
lastPrune int64
|
lastPrune int64
|
||||||
probing int32 // atomic flag: 1 = probeAll running, 0 = idle
|
probing int32 // atomic flag: 1 = probeAll running, 0 = idle
|
||||||
probeNode bestExitProbeFunc
|
probeNode bestExitProbeFunc
|
||||||
@@ -65,8 +86,8 @@ type tunnelQualityProber struct {
|
|||||||
// newTunnelQualityProber creates a new prober (not yet running).
|
// newTunnelQualityProber creates a new prober (not yet running).
|
||||||
func newTunnelQualityProber(h *Handler) *tunnelQualityProber {
|
func newTunnelQualityProber(h *Handler) *tunnelQualityProber {
|
||||||
return &tunnelQualityProber{
|
return &tunnelQualityProber{
|
||||||
handler: h,
|
handler: h,
|
||||||
interval: tunnelQualityProbeInterval,
|
wake: make(chan struct{}, 1),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,6 +107,16 @@ func (p *tunnelQualityProber) Stop() {
|
|||||||
p.cancel()
|
p.cancel()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *tunnelQualityProber) NotifyConfigChanged() {
|
||||||
|
if p == nil || p.wake == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case p.wake <- struct{}{}:
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// GetAll returns all cached quality snapshots (latest per tunnel).
|
// GetAll returns all cached quality snapshots (latest per tunnel).
|
||||||
func (p *tunnelQualityProber) GetAll() []tunnelQualitySnapshot {
|
func (p *tunnelQualityProber) GetAll() []tunnelQualitySnapshot {
|
||||||
var items []tunnelQualitySnapshot
|
var items []tunnelQualitySnapshot
|
||||||
@@ -109,20 +140,44 @@ func (p *tunnelQualityProber) loop() {
|
|||||||
// Run once immediately
|
// Run once immediately
|
||||||
p.probeAll()
|
p.probeAll()
|
||||||
|
|
||||||
ticker := time.NewTicker(p.interval)
|
|
||||||
defer ticker.Stop()
|
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
timer := time.NewTimer(p.probeInterval())
|
||||||
select {
|
select {
|
||||||
case <-p.ctx.Done():
|
case <-p.ctx.Done():
|
||||||
|
stopAndDrainTunnelQualityTimer(timer)
|
||||||
return
|
return
|
||||||
case <-ticker.C:
|
case <-p.wake:
|
||||||
|
stopAndDrainTunnelQualityTimer(timer)
|
||||||
|
continue
|
||||||
|
case <-timer.C:
|
||||||
p.probeAll()
|
p.probeAll()
|
||||||
p.maybePrune()
|
p.maybePrune()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func stopAndDrainTunnelQualityTimer(timer *time.Timer) {
|
||||||
|
if timer == nil || timer.Stop() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case <-timer.C:
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *tunnelQualityProber) probeInterval() time.Duration {
|
||||||
|
if p == nil || p.handler == nil || p.handler.repo == nil {
|
||||||
|
return time.Duration(monitoring.DefaultTunnelQualityProbeIntervalSec) * time.Second
|
||||||
|
}
|
||||||
|
cfg, err := p.handler.repo.GetConfigsByNames([]string{monitoring.ConfigTunnelQualityProbeIntervalSec})
|
||||||
|
if err != nil {
|
||||||
|
return time.Duration(monitoring.DefaultTunnelQualityProbeIntervalSec) * time.Second
|
||||||
|
}
|
||||||
|
seconds := monitoring.TunnelQualityProbeIntervalSecondsFromConfigMap(cfg)
|
||||||
|
return time.Duration(seconds) * time.Second
|
||||||
|
}
|
||||||
|
|
||||||
func (p *tunnelQualityProber) isEnabled() bool {
|
func (p *tunnelQualityProber) isEnabled() bool {
|
||||||
if p == nil || p.handler == nil {
|
if p == nil || p.handler == nil {
|
||||||
return true
|
return true
|
||||||
@@ -246,15 +301,28 @@ func (p *tunnelQualityProber) probeTunnel(tunnelID int64) {
|
|||||||
options := diagnosisExecOptions{
|
options := diagnosisExecOptions{
|
||||||
commandTimeout: tunnelQualityProbeTimeout,
|
commandTimeout: tunnelQualityProbeTimeout,
|
||||||
pingTimeoutMS: tunnelQualityPingTimeoutMs,
|
pingTimeoutMS: tunnelQualityPingTimeoutMs,
|
||||||
|
pingCount: 1,
|
||||||
timeoutMessage: "探测超时",
|
timeoutMessage: "探测超时",
|
||||||
}
|
}
|
||||||
p.probeBestExitOwners(tunnelID, inNodes, midNodesGrouped, outNodes, ipPreference, options, probeTarget)
|
roundPinger := newBestExitRoundPinger(p.pingNode)
|
||||||
|
p.probeBestExitOwners(tunnelID, inNodes, midNodesGrouped, outNodes, ipPreference, options, probeTarget, roundPinger)
|
||||||
|
|
||||||
|
entry, _, entryOnline := p.firstOnlineChainNode(inNodes)
|
||||||
|
exit, _, exitOnline := p.firstOnlineChainNode(outNodes)
|
||||||
|
selectedNodeIDs := make(map[string]int64, 2+len(midNodesGrouped))
|
||||||
|
if entryOnline {
|
||||||
|
selectedNodeIDs[tunnelQualityGroupKey("entry", 0)] = entry.NodeID
|
||||||
|
}
|
||||||
|
if exitOnline {
|
||||||
|
selectedNodeIDs[tunnelQualityGroupKey("exit", 0)] = exit.NodeID
|
||||||
|
}
|
||||||
|
var primaryHops []TunnelQualityHop
|
||||||
|
|
||||||
switch tunnel.Type {
|
switch tunnel.Type {
|
||||||
case 1:
|
case 1:
|
||||||
// Port forwarding: entry → public probe target only.
|
// Port forwarding: entry → public probe target only.
|
||||||
if len(inNodes) > 0 {
|
if entryOnline {
|
||||||
lat, loss, err := p.pingNode(inNodes[0].NodeID, probeTarget.Host, probeTarget.Port, options)
|
lat, loss, err := roundPinger(entry.NodeID, probeTarget.Host, probeTarget.Port, options)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
snap.ExitToBingLatency = lat
|
snap.ExitToBingLatency = lat
|
||||||
snap.ExitToBingLoss = loss
|
snap.ExitToBingLoss = loss
|
||||||
@@ -262,24 +330,42 @@ func (p *tunnelQualityProber) probeTunnel(tunnelID int64) {
|
|||||||
} else {
|
} else {
|
||||||
snap.ErrorMessage = err.Error()
|
snap.ErrorMessage = err.Error()
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
snap.ErrorMessage = "入口节点均不在线"
|
||||||
}
|
}
|
||||||
case 2:
|
case 2:
|
||||||
// Tunnel forwarding: entry → exit + exit → Bing
|
// Tunnel forwarding: entry → exit + exit → Bing
|
||||||
probeOK := true
|
probeOK := true
|
||||||
|
|
||||||
if len(inNodes) > 0 && len(outNodes) > 0 {
|
if !entryOnline {
|
||||||
var hops []TunnelQualityHop
|
probeOK = false
|
||||||
|
snap.ErrorMessage = "入口节点均不在线"
|
||||||
|
snap.EntryToExitLatency = -1
|
||||||
|
snap.EntryToExitLoss = 100
|
||||||
|
} else if !exitOnline {
|
||||||
|
probeOK = false
|
||||||
|
snap.ErrorMessage = "出口节点均不在线"
|
||||||
|
snap.EntryToExitLatency = -1
|
||||||
|
snap.EntryToExitLoss = 100
|
||||||
|
} else {
|
||||||
var totalLat float64
|
var totalLat float64
|
||||||
remainingSuccessProb := 1.0
|
remainingSuccessProb := 1.0
|
||||||
|
|
||||||
nodesInPath := make([]chainNodeRecord, 0, 2+len(midNodesGrouped))
|
nodesInPath := make([]chainNodeRecord, 0, 2+len(midNodesGrouped))
|
||||||
nodesInPath = append(nodesInPath, inNodes[0])
|
nodesInPath = append(nodesInPath, entry)
|
||||||
for _, midGroup := range midNodesGrouped {
|
for midIndex, midGroup := range midNodesGrouped {
|
||||||
if len(midGroup) > 0 {
|
mid, _, online := p.firstOnlineChainNode(midGroup)
|
||||||
nodesInPath = append(nodesInPath, midGroup[0])
|
if !online {
|
||||||
|
probeOK = false
|
||||||
|
snap.ErrorMessage = "中间节点组均不在线"
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
nodesInPath = append(nodesInPath, mid)
|
||||||
|
selectedNodeIDs[tunnelQualityGroupKey("middle", midIndex)] = mid.NodeID
|
||||||
|
}
|
||||||
|
if probeOK {
|
||||||
|
nodesInPath = append(nodesInPath, exit)
|
||||||
}
|
}
|
||||||
nodesInPath = append(nodesInPath, outNodes[0])
|
|
||||||
|
|
||||||
for i := 0; i < len(nodesInPath)-1; i++ {
|
for i := 0; i < len(nodesInPath)-1; i++ {
|
||||||
source := nodesInPath[i]
|
source := nodesInPath[i]
|
||||||
@@ -293,12 +379,12 @@ func (p *tunnelQualityProber) probeTunnel(tunnelID int64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
targetNode, nodeErr := h.getNodeRecord(target.NodeID)
|
targetNode, nodeErr := h.getNodeRecord(target.NodeID)
|
||||||
if nodeErr != nil || targetNode == nil {
|
if nodeErr != nil || !isTunnelProbeNodeOnline(targetNode) {
|
||||||
snap.ErrorMessage = "节点 " + target.NodeName + " 不可用"
|
snap.ErrorMessage = "节点 " + target.NodeName + " 不可用"
|
||||||
probeOK = false
|
probeOK = false
|
||||||
hop.Latency = -1
|
hop.Latency = -1
|
||||||
hop.Loss = 100
|
hop.Loss = 100
|
||||||
hops = append(hops, hop)
|
primaryHops = append(primaryHops, hop)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -309,25 +395,25 @@ func (p *tunnelQualityProber) probeTunnel(tunnelID int64) {
|
|||||||
probeOK = false
|
probeOK = false
|
||||||
hop.Latency = -1
|
hop.Latency = -1
|
||||||
hop.Loss = 100
|
hop.Loss = 100
|
||||||
hops = append(hops, hop)
|
primaryHops = append(primaryHops, hop)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
hop.TargetIP = targetIP
|
hop.TargetIP = targetIP
|
||||||
hop.TargetPort = targetPort
|
hop.TargetPort = targetPort
|
||||||
|
|
||||||
lat, loss, err := p.pingNode(source.NodeID, targetIP, targetPort, options)
|
lat, loss, err := roundPinger(source.NodeID, targetIP, targetPort, options)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
hop.Latency = lat
|
hop.Latency = lat
|
||||||
hop.Loss = loss
|
hop.Loss = loss
|
||||||
totalLat += lat
|
totalLat += lat
|
||||||
remainingSuccessProb *= (1.0 - loss/100.0)
|
remainingSuccessProb *= (1.0 - loss/100.0)
|
||||||
hops = append(hops, hop)
|
primaryHops = append(primaryHops, hop)
|
||||||
} else {
|
} else {
|
||||||
probeOK = false
|
probeOK = false
|
||||||
hop.Latency = -1
|
hop.Latency = -1
|
||||||
hop.Loss = 100
|
hop.Loss = 100
|
||||||
hops = append(hops, hop)
|
primaryHops = append(primaryHops, hop)
|
||||||
if snap.ErrorMessage == "" {
|
if snap.ErrorMessage == "" {
|
||||||
snap.ErrorMessage = err.Error()
|
snap.ErrorMessage = err.Error()
|
||||||
}
|
}
|
||||||
@@ -342,17 +428,11 @@ func (p *tunnelQualityProber) probeTunnel(tunnelID int64) {
|
|||||||
snap.EntryToExitLatency = -1
|
snap.EntryToExitLatency = -1
|
||||||
snap.EntryToExitLoss = 100
|
snap.EntryToExitLoss = 100
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(hops) > 0 {
|
|
||||||
if b, err := json.Marshal(hops); err == nil {
|
|
||||||
snap.ChainDetails = string(b)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Exit → Bing
|
// Exit → Bing
|
||||||
if len(outNodes) > 0 {
|
if exitOnline {
|
||||||
lat, loss, err := p.pingNode(outNodes[0].NodeID, probeTarget.Host, probeTarget.Port, options)
|
lat, loss, err := roundPinger(exit.NodeID, probeTarget.Host, probeTarget.Port, options)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
snap.ExitToBingLatency = lat
|
snap.ExitToBingLatency = lat
|
||||||
snap.ExitToBingLoss = loss
|
snap.ExitToBingLoss = loss
|
||||||
@@ -367,8 +447,8 @@ func (p *tunnelQualityProber) probeTunnel(tunnelID int64) {
|
|||||||
snap.Success = probeOK
|
snap.Success = probeOK
|
||||||
default:
|
default:
|
||||||
// Unknown type: entry → public probe target.
|
// Unknown type: entry → public probe target.
|
||||||
if len(inNodes) > 0 {
|
if entryOnline {
|
||||||
lat, loss, err := p.pingNode(inNodes[0].NodeID, probeTarget.Host, probeTarget.Port, options)
|
lat, loss, err := roundPinger(entry.NodeID, probeTarget.Host, probeTarget.Port, options)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
snap.ExitToBingLatency = lat
|
snap.ExitToBingLatency = lat
|
||||||
snap.ExitToBingLoss = loss
|
snap.ExitToBingLoss = loss
|
||||||
@@ -376,13 +456,215 @@ func (p *tunnelQualityProber) probeTunnel(tunnelID int64) {
|
|||||||
} else {
|
} else {
|
||||||
snap.ErrorMessage = err.Error()
|
snap.ErrorMessage = err.Error()
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
snap.ErrorMessage = "入口节点均不在线"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
candidateHops := p.probeTunnelCandidateHops(
|
||||||
|
tunnel.Type,
|
||||||
|
inNodes,
|
||||||
|
midNodesGrouped,
|
||||||
|
outNodes,
|
||||||
|
selectedNodeIDs,
|
||||||
|
ipPreference,
|
||||||
|
options,
|
||||||
|
probeTarget,
|
||||||
|
roundPinger,
|
||||||
|
)
|
||||||
|
if len(primaryHops) > 0 || len(candidateHops) > 0 {
|
||||||
|
details := tunnelQualityChainDetails{
|
||||||
|
PrimaryPath: primaryHops,
|
||||||
|
CandidateHops: candidateHops,
|
||||||
|
}
|
||||||
|
if b, err := json.Marshal(details); err == nil {
|
||||||
|
snap.ChainDetails = string(b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
p.storeResult(snap)
|
p.storeResult(snap)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *tunnelQualityProber) probeBestExitOwners(tunnelID int64, inNodes []chainNodeRecord, chainHops [][]chainNodeRecord, outNodes []chainNodeRecord, ipPreference string, options diagnosisExecOptions, probeTarget tunnelProbeTarget) {
|
func tunnelQualityGroupKey(role string, index int) string {
|
||||||
|
return fmt.Sprintf("%s:%d", role, index)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *tunnelQualityProber) probeTunnelCandidateHops(
|
||||||
|
tunnelType int,
|
||||||
|
inNodes []chainNodeRecord,
|
||||||
|
chainHops [][]chainNodeRecord,
|
||||||
|
outNodes []chainNodeRecord,
|
||||||
|
selectedNodeIDs map[string]int64,
|
||||||
|
ipPreference string,
|
||||||
|
options diagnosisExecOptions,
|
||||||
|
probeTarget tunnelProbeTarget,
|
||||||
|
ping bestExitProbeFunc,
|
||||||
|
) []TunnelQualityCandidateHop {
|
||||||
|
if p == nil || p.handler == nil || ping == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if tunnelType != 2 {
|
||||||
|
return p.probePublicTargetCandidates("entry", 0, inNodes, selectedNodeIDs, options, probeTarget, ping)
|
||||||
|
}
|
||||||
|
|
||||||
|
groups := make([]tunnelQualityCandidateGroup, 0, 2+len(chainHops))
|
||||||
|
groups = append(groups, tunnelQualityCandidateGroup{role: "entry", roleIndex: 0, nodes: inNodes})
|
||||||
|
for i, hop := range chainHops {
|
||||||
|
groups = append(groups, tunnelQualityCandidateGroup{role: "middle", roleIndex: i, nodes: hop})
|
||||||
|
}
|
||||||
|
groups = append(groups, tunnelQualityCandidateGroup{role: "exit", roleIndex: 0, nodes: outNodes})
|
||||||
|
|
||||||
|
var items []TunnelQualityCandidateHop
|
||||||
|
for i := 0; i < len(groups)-1; i++ {
|
||||||
|
items = append(items, p.probeCandidateGroupLinks(
|
||||||
|
groups[i],
|
||||||
|
groups[i+1],
|
||||||
|
i,
|
||||||
|
selectedNodeIDs,
|
||||||
|
ipPreference,
|
||||||
|
options,
|
||||||
|
ping,
|
||||||
|
)...)
|
||||||
|
}
|
||||||
|
items = append(items, p.probePublicTargetCandidates(
|
||||||
|
"exit",
|
||||||
|
0,
|
||||||
|
outNodes,
|
||||||
|
selectedNodeIDs,
|
||||||
|
options,
|
||||||
|
probeTarget,
|
||||||
|
ping,
|
||||||
|
)...)
|
||||||
|
return items
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *tunnelQualityProber) probeCandidateGroupLinks(
|
||||||
|
fromGroup tunnelQualityCandidateGroup,
|
||||||
|
toGroup tunnelQualityCandidateGroup,
|
||||||
|
hopIndex int,
|
||||||
|
selectedNodeIDs map[string]int64,
|
||||||
|
ipPreference string,
|
||||||
|
options diagnosisExecOptions,
|
||||||
|
ping bestExitProbeFunc,
|
||||||
|
) []TunnelQualityCandidateHop {
|
||||||
|
items := make([]TunnelQualityCandidateHop, 0, len(fromGroup.nodes)*len(toGroup.nodes))
|
||||||
|
for _, source := range fromGroup.nodes {
|
||||||
|
for _, target := range toGroup.nodes {
|
||||||
|
item := TunnelQualityCandidateHop{
|
||||||
|
TunnelQualityHop: TunnelQualityHop{
|
||||||
|
FromNodeID: source.NodeID,
|
||||||
|
FromNodeName: source.NodeName,
|
||||||
|
ToNodeID: target.NodeID,
|
||||||
|
ToNodeName: target.NodeName,
|
||||||
|
Latency: -1,
|
||||||
|
Loss: 100,
|
||||||
|
},
|
||||||
|
FromRole: fromGroup.role,
|
||||||
|
ToRole: toGroup.role,
|
||||||
|
HopIndex: hopIndex,
|
||||||
|
Selected: selectedNodeIDs[tunnelQualityGroupKey(fromGroup.role, fromGroup.roleIndex)] == source.NodeID &&
|
||||||
|
selectedNodeIDs[tunnelQualityGroupKey(toGroup.role, toGroup.roleIndex)] == target.NodeID,
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceNode, sourceErr := p.handler.getNodeRecord(source.NodeID)
|
||||||
|
if sourceErr != nil || !isTunnelProbeNodeOnline(sourceNode) {
|
||||||
|
item.ErrorMessage = "来源节点不在线"
|
||||||
|
items = append(items, item)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
targetNode, targetErr := p.handler.getNodeRecord(target.NodeID)
|
||||||
|
if targetErr != nil || !isTunnelProbeNodeOnline(targetNode) {
|
||||||
|
item.ErrorMessage = "目标节点不在线"
|
||||||
|
items = append(items, item)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
targetIP, targetPort, resolveErr := resolveChainProbeTarget(sourceNode, targetNode, target.Port, ipPreference, target.ConnectIP)
|
||||||
|
if resolveErr != nil {
|
||||||
|
item.ErrorMessage = resolveErr.Error()
|
||||||
|
items = append(items, item)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
item.TargetIP = targetIP
|
||||||
|
item.TargetPort = targetPort
|
||||||
|
latency, loss, probeErr := ping(source.NodeID, targetIP, targetPort, options)
|
||||||
|
if probeErr != nil {
|
||||||
|
item.ErrorMessage = probeErr.Error()
|
||||||
|
items = append(items, item)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
item.Latency = latency
|
||||||
|
item.Loss = loss
|
||||||
|
items = append(items, item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return items
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *tunnelQualityProber) probePublicTargetCandidates(
|
||||||
|
fromRole string,
|
||||||
|
fromIndex int,
|
||||||
|
nodes []chainNodeRecord,
|
||||||
|
selectedNodeIDs map[string]int64,
|
||||||
|
options diagnosisExecOptions,
|
||||||
|
probeTarget tunnelProbeTarget,
|
||||||
|
ping bestExitProbeFunc,
|
||||||
|
) []TunnelQualityCandidateHop {
|
||||||
|
items := make([]TunnelQualityCandidateHop, 0, len(nodes))
|
||||||
|
for _, source := range nodes {
|
||||||
|
item := TunnelQualityCandidateHop{
|
||||||
|
TunnelQualityHop: TunnelQualityHop{
|
||||||
|
FromNodeID: source.NodeID,
|
||||||
|
FromNodeName: source.NodeName,
|
||||||
|
ToNodeName: formatTunnelProbeTarget(probeTarget),
|
||||||
|
Latency: -1,
|
||||||
|
Loss: 100,
|
||||||
|
TargetIP: probeTarget.Host,
|
||||||
|
TargetPort: probeTarget.Port,
|
||||||
|
},
|
||||||
|
FromRole: fromRole,
|
||||||
|
ToRole: "target",
|
||||||
|
HopIndex: fromIndex,
|
||||||
|
Selected: selectedNodeIDs[tunnelQualityGroupKey(fromRole, fromIndex)] == source.NodeID,
|
||||||
|
}
|
||||||
|
sourceNode, sourceErr := p.handler.getNodeRecord(source.NodeID)
|
||||||
|
if sourceErr != nil || !isTunnelProbeNodeOnline(sourceNode) {
|
||||||
|
item.ErrorMessage = "来源节点不在线"
|
||||||
|
items = append(items, item)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
latency, loss, probeErr := ping(source.NodeID, probeTarget.Host, probeTarget.Port, options)
|
||||||
|
if probeErr != nil {
|
||||||
|
item.ErrorMessage = probeErr.Error()
|
||||||
|
items = append(items, item)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
item.Latency = latency
|
||||||
|
item.Loss = loss
|
||||||
|
items = append(items, item)
|
||||||
|
}
|
||||||
|
return items
|
||||||
|
}
|
||||||
|
|
||||||
|
func isTunnelProbeNodeOnline(node *nodeRecord) bool {
|
||||||
|
return node != nil && (node.IsRemote == 1 || node.Status == 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *tunnelQualityProber) firstOnlineChainNode(nodes []chainNodeRecord) (chainNodeRecord, *nodeRecord, bool) {
|
||||||
|
if p == nil || p.handler == nil {
|
||||||
|
return chainNodeRecord{}, nil, false
|
||||||
|
}
|
||||||
|
for _, candidate := range nodes {
|
||||||
|
node, err := p.handler.getNodeRecord(candidate.NodeID)
|
||||||
|
if err == nil && isTunnelProbeNodeOnline(node) {
|
||||||
|
return candidate, node, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return chainNodeRecord{}, nil, false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *tunnelQualityProber) probeBestExitOwners(tunnelID int64, inNodes []chainNodeRecord, chainHops [][]chainNodeRecord, outNodes []chainNodeRecord, ipPreference string, options diagnosisExecOptions, probeTarget tunnelProbeTarget, roundPinger bestExitProbeFunc) {
|
||||||
if p == nil || p.handler == nil || p.handler.bestExit == nil || len(outNodes) <= 1 {
|
if p == nil || p.handler == nil || p.handler.bestExit == nil || len(outNodes) <= 1 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -404,9 +686,6 @@ func (p *tunnelQualityProber) probeBestExitOwners(tunnelID int64, inNodes []chai
|
|||||||
nodeMap[exit.NodeID] = node
|
nodeMap[exit.NodeID] = node
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// This best-exit decision cache is per decision round; the display-oriented
|
|
||||||
// tunnel quality snapshot may still collect its own first-exit public probe.
|
|
||||||
roundPinger := newBestExitRoundPinger(p.pingNode)
|
|
||||||
for _, owner := range owners {
|
for _, owner := range owners {
|
||||||
if nodeMap[owner.NodeID] == nil {
|
if nodeMap[owner.NodeID] == nil {
|
||||||
continue
|
continue
|
||||||
@@ -444,6 +723,9 @@ func (p *tunnelQualityProber) tcpPingNode(nodeID int64, ip string, port int, opt
|
|||||||
if nodeErr != nil {
|
if nodeErr != nil {
|
||||||
return 0, 100, nodeErr
|
return 0, 100, nodeErr
|
||||||
}
|
}
|
||||||
|
if !isTunnelProbeNodeOnline(node) {
|
||||||
|
return 0, 100, errors.New("节点不在线")
|
||||||
|
}
|
||||||
|
|
||||||
var pingData map[string]interface{}
|
var pingData map[string]interface{}
|
||||||
var pingErr error
|
var pingErr error
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package handler
|
package handler
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"slices"
|
"slices"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -26,6 +27,9 @@ func TestTunnelQualityProberUsesConfiguredProbeTarget(t *testing.T) {
|
|||||||
p := newTunnelQualityProber(h)
|
p := newTunnelQualityProber(h)
|
||||||
var calls []string
|
var calls []string
|
||||||
p.probeNode = func(nodeID int64, ip string, port int, options diagnosisExecOptions) (float64, float64, error) {
|
p.probeNode = func(nodeID int64, ip string, port int, options diagnosisExecOptions) (float64, float64, error) {
|
||||||
|
if options.pingCount != 1 {
|
||||||
|
t.Fatalf("expected real-time quality probe count 1, got %d", options.pingCount)
|
||||||
|
}
|
||||||
calls = append(calls, fmt.Sprintf("%d|%s|%d", nodeID, ip, port))
|
calls = append(calls, fmt.Sprintf("%d|%s|%d", nodeID, ip, port))
|
||||||
return 10, 0, nil
|
return 10, 0, nil
|
||||||
}
|
}
|
||||||
@@ -46,6 +50,114 @@ func TestTunnelQualityProberUsesConfiguredProbeTarget(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestTunnelQualityProberSkipsAllOfflineExits(t *testing.T) {
|
||||||
|
h := setupProbeTargetTunnelHandler(t)
|
||||||
|
seedQualityForwardTunnel(t, h, 81, []int{0, 0, 0})
|
||||||
|
|
||||||
|
p := newTunnelQualityProber(h)
|
||||||
|
probeCalls := 0
|
||||||
|
p.probeNode = func(nodeID int64, ip string, port int, options diagnosisExecOptions) (float64, float64, error) {
|
||||||
|
probeCalls++
|
||||||
|
return 0, 100, fmt.Errorf("unexpected probe node=%d target=%s:%d", nodeID, ip, port)
|
||||||
|
}
|
||||||
|
p.probeTunnel(81)
|
||||||
|
|
||||||
|
if probeCalls != 0 {
|
||||||
|
t.Fatalf("expected no TCP probes when all exits are offline, got %d", probeCalls)
|
||||||
|
}
|
||||||
|
snaps := p.GetAll()
|
||||||
|
if len(snaps) != 1 {
|
||||||
|
t.Fatalf("expected one quality snapshot, got %+v", snaps)
|
||||||
|
}
|
||||||
|
if snaps[0].Success || snaps[0].ErrorMessage != "出口节点均不在线" {
|
||||||
|
t.Fatalf("expected offline exit snapshot, got %+v", snaps[0])
|
||||||
|
}
|
||||||
|
if snaps[0].EntryToExitLoss != 100 {
|
||||||
|
t.Fatalf("expected 100%% entry-to-exit loss, got %+v", snaps[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTunnelQualityProberUsesOnlineBackupExit(t *testing.T) {
|
||||||
|
h := setupProbeTargetTunnelHandler(t)
|
||||||
|
seedQualityForwardTunnel(t, h, 82, []int{0, 1})
|
||||||
|
|
||||||
|
p := newTunnelQualityProber(h)
|
||||||
|
var calls []string
|
||||||
|
p.probeNode = func(nodeID int64, ip string, port int, options diagnosisExecOptions) (float64, float64, error) {
|
||||||
|
if options.pingCount != 1 {
|
||||||
|
t.Fatalf("expected real-time quality probe count 1, got %d", options.pingCount)
|
||||||
|
}
|
||||||
|
calls = append(calls, fmt.Sprintf("%d|%s|%d", nodeID, ip, port))
|
||||||
|
return 10, 0, nil
|
||||||
|
}
|
||||||
|
p.probeTunnel(82)
|
||||||
|
|
||||||
|
if slices.Contains(calls, "10|10.0.0.30|30030") {
|
||||||
|
t.Fatalf("did not expect probe to offline primary exit, calls=%+v", calls)
|
||||||
|
}
|
||||||
|
if !slices.Contains(calls, "10|10.0.0.31|30031") {
|
||||||
|
t.Fatalf("expected entry probe to online backup exit, calls=%+v", calls)
|
||||||
|
}
|
||||||
|
if !slices.Contains(calls, "31|www.bing.com|443") {
|
||||||
|
t.Fatalf("expected public probe from online backup exit, calls=%+v", calls)
|
||||||
|
}
|
||||||
|
snaps := p.GetAll()
|
||||||
|
if len(snaps) != 1 || !snaps[0].Success {
|
||||||
|
t.Fatalf("expected successful backup exit snapshot, got %+v", snaps)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTunnelQualityProberReportsAllExitCandidateLatencies(t *testing.T) {
|
||||||
|
h := setupProbeTargetTunnelHandler(t)
|
||||||
|
seedQualityForwardTunnel(t, h, 83, []int{1, 1})
|
||||||
|
|
||||||
|
p := newTunnelQualityProber(h)
|
||||||
|
p.probeNode = func(nodeID int64, ip string, port int, options diagnosisExecOptions) (float64, float64, error) {
|
||||||
|
switch fmt.Sprintf("%d|%s|%d", nodeID, ip, port) {
|
||||||
|
case "10|10.0.0.30|30030":
|
||||||
|
return 20, 0, nil
|
||||||
|
case "10|10.0.0.31|30031":
|
||||||
|
return 35, 0, nil
|
||||||
|
case "30|www.bing.com|443":
|
||||||
|
return 50, 0, nil
|
||||||
|
case "31|www.bing.com|443":
|
||||||
|
return 65, 0, nil
|
||||||
|
default:
|
||||||
|
return 0, 100, fmt.Errorf("unexpected probe node=%d target=%s:%d", nodeID, ip, port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.probeTunnel(83)
|
||||||
|
|
||||||
|
snaps := p.GetAll()
|
||||||
|
if len(snaps) != 1 {
|
||||||
|
t.Fatalf("expected one quality snapshot, got %+v", snaps)
|
||||||
|
}
|
||||||
|
if snaps[0].EntryToExitLatency != 20 || snaps[0].ExitToBingLatency != 50 {
|
||||||
|
t.Fatalf("expected primary path metrics to remain unchanged, got %+v", snaps[0])
|
||||||
|
}
|
||||||
|
|
||||||
|
var details tunnelQualityChainDetails
|
||||||
|
if err := json.Unmarshal([]byte(snaps[0].ChainDetails), &details); err != nil {
|
||||||
|
t.Fatalf("decode chain details: %v", err)
|
||||||
|
}
|
||||||
|
assertCandidateHop := func(fromID, toID int64, latency float64, selected bool) {
|
||||||
|
t.Helper()
|
||||||
|
for _, hop := range details.CandidateHops {
|
||||||
|
if hop.FromNodeID == fromID && hop.ToNodeID == toID {
|
||||||
|
if hop.Latency != latency || hop.Selected != selected || hop.ErrorMessage != "" {
|
||||||
|
t.Fatalf("unexpected candidate hop: %+v", hop)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.Fatalf("candidate hop %d -> %d not found in %+v", fromID, toID, details.CandidateHops)
|
||||||
|
}
|
||||||
|
assertCandidateHop(10, 30, 20, true)
|
||||||
|
assertCandidateHop(10, 31, 35, false)
|
||||||
|
assertCandidateHop(30, 0, 50, true)
|
||||||
|
assertCandidateHop(31, 0, 65, false)
|
||||||
|
}
|
||||||
|
|
||||||
func TestTunnelQualityProberStoresProbeTargetWhenChainIncomplete(t *testing.T) {
|
func TestTunnelQualityProberStoresProbeTargetWhenChainIncomplete(t *testing.T) {
|
||||||
h := setupProbeTargetTunnelHandler(t)
|
h := setupProbeTargetTunnelHandler(t)
|
||||||
seedProbeTargetTunnel(t, h, 78, "quality-target-incomplete", "speed.example.com", 8443)
|
seedProbeTargetTunnel(t, h, 78, "quality-target-incomplete", "speed.example.com", 8443)
|
||||||
@@ -67,3 +179,69 @@ func TestTunnelQualityProberStoresProbeTargetWhenChainIncomplete(t *testing.T) {
|
|||||||
t.Fatalf("unexpected snapshot target metadata: %+v", snaps[0])
|
t.Fatalf("unexpected snapshot target metadata: %+v", snaps[0])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestTunnelQualityProberUsesConfiguredInterval(t *testing.T) {
|
||||||
|
h := setupProbeTargetTunnelHandler(t)
|
||||||
|
if err := h.repo.UpsertConfig("monitor_tunnel_quality_interval_sec", "15", time.Now().UnixMilli()); err != nil {
|
||||||
|
t.Fatalf("upsert interval config: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
p := newTunnelQualityProber(h)
|
||||||
|
if got := p.probeInterval(); got != 15*time.Second {
|
||||||
|
t.Fatalf("probe interval = %s, want 15s", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTunnelQualityProberConfigNotificationIsCoalesced(t *testing.T) {
|
||||||
|
p := newTunnelQualityProber(nil)
|
||||||
|
p.NotifyConfigChanged()
|
||||||
|
p.NotifyConfigChanged()
|
||||||
|
|
||||||
|
if got := len(p.wake); got != 1 {
|
||||||
|
t.Fatalf("wake notifications = %d, want 1", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNormalizeTunnelQualityProbeIntervalConfigValue(t *testing.T) {
|
||||||
|
got, err := normalizeAndValidateConfigValue("monitor_tunnel_quality_interval_sec", " 15 ")
|
||||||
|
if err != nil || got != "15" {
|
||||||
|
t.Fatalf("normalize interval = %q, %v", got, err)
|
||||||
|
}
|
||||||
|
if _, err := normalizeAndValidateConfigValue("monitor_tunnel_quality_interval_sec", "0"); err == nil {
|
||||||
|
t.Fatalf("expected invalid interval to be rejected")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func seedQualityForwardTunnel(t *testing.T, h *Handler, tunnelID int64, exitStatuses []int) {
|
||||||
|
t.Helper()
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
if err := h.repo.DB().Exec(`
|
||||||
|
INSERT INTO tunnel(id, name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, inx, ip_preference, probe_target_host, probe_target_port)
|
||||||
|
VALUES(?, ?, 1, 2, 'tls', 1, ?, ?, 1, ?, '', '', 0)
|
||||||
|
`, tunnelID, fmt.Sprintf("quality-forward-%d", tunnelID), now, now, tunnelID).Error; err != nil {
|
||||||
|
t.Fatalf("insert forwarding tunnel: %v", err)
|
||||||
|
}
|
||||||
|
if err := h.repo.DB().Exec(`
|
||||||
|
INSERT INTO chain_tunnel(tunnel_id, chain_type, node_id, port, strategy, inx, protocol)
|
||||||
|
VALUES(?, '1', 10, 30001, 'fifo', 1, 'tls')
|
||||||
|
`, tunnelID).Error; err != nil {
|
||||||
|
t.Fatalf("insert entry chain: %v", err)
|
||||||
|
}
|
||||||
|
for i, status := range exitStatuses {
|
||||||
|
nodeID := int64(30 + i)
|
||||||
|
port := 30030 + i
|
||||||
|
ip := fmt.Sprintf("10.0.0.%d", nodeID)
|
||||||
|
if err := h.repo.DB().Exec(`
|
||||||
|
INSERT INTO node(id, name, secret, server_ip, server_ip_v4, server_ip_v6, port, interface_name, version, http, tls, socks, created_time, updated_time, status, tcp_listen_addr, udp_listen_addr, inx)
|
||||||
|
VALUES(?, ?, ?, ?, ?, '', '30000-30100', '', 'v1', 1, 1, 1, ?, ?, ?, '[::]', '[::]', 0)
|
||||||
|
`, nodeID, fmt.Sprintf("exit-%d", i+1), fmt.Sprintf("exit-secret-%d", i+1), ip, ip, now, now, status).Error; err != nil {
|
||||||
|
t.Fatalf("insert exit node %d: %v", nodeID, err)
|
||||||
|
}
|
||||||
|
if err := h.repo.DB().Exec(`
|
||||||
|
INSERT INTO chain_tunnel(tunnel_id, chain_type, node_id, port, strategy, inx, protocol)
|
||||||
|
VALUES(?, '3', ?, ?, 'fifo', ?, 'tls')
|
||||||
|
`, tunnelID, nodeID, port, i+1).Error; err != nil {
|
||||||
|
t.Fatalf("insert exit chain %d: %v", nodeID, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package monitoring
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
ConfigTunnelQualityProbeIntervalSec = "monitor_tunnel_quality_interval_sec"
|
||||||
|
DefaultTunnelQualityProbeIntervalSec = 1
|
||||||
|
MinTunnelQualityProbeIntervalSec = 1
|
||||||
|
MaxTunnelQualityProbeIntervalSec = 3600
|
||||||
|
)
|
||||||
|
|
||||||
|
func TunnelQualityProbeIntervalSecondsFromConfigMap(cfg map[string]string) int {
|
||||||
|
if cfg == nil {
|
||||||
|
return DefaultTunnelQualityProbeIntervalSec
|
||||||
|
}
|
||||||
|
seconds, err := parseTunnelQualityProbeIntervalSeconds(cfg[ConfigTunnelQualityProbeIntervalSec])
|
||||||
|
if err != nil {
|
||||||
|
return DefaultTunnelQualityProbeIntervalSec
|
||||||
|
}
|
||||||
|
return seconds
|
||||||
|
}
|
||||||
|
|
||||||
|
func NormalizeTunnelQualityProbeIntervalSeconds(value string) (string, error) {
|
||||||
|
seconds, err := parseTunnelQualityProbeIntervalSeconds(value)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return strconv.Itoa(seconds), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseTunnelQualityProbeIntervalSeconds(value string) (int, error) {
|
||||||
|
trimmed := strings.TrimSpace(value)
|
||||||
|
if trimmed == "" {
|
||||||
|
return 0, fmt.Errorf("隧道质量探测间隔不能为空")
|
||||||
|
}
|
||||||
|
seconds, err := strconv.Atoi(trimmed)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("隧道质量探测间隔必须是整数")
|
||||||
|
}
|
||||||
|
if seconds < MinTunnelQualityProbeIntervalSec || seconds > MaxTunnelQualityProbeIntervalSec {
|
||||||
|
return 0, fmt.Errorf(
|
||||||
|
"隧道质量探测间隔必须在 %d 到 %d 秒之间",
|
||||||
|
MinTunnelQualityProbeIntervalSec,
|
||||||
|
MaxTunnelQualityProbeIntervalSec,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return seconds, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package monitoring
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestTunnelQualityProbeIntervalSecondsFromConfigMap(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
cfg map[string]string
|
||||||
|
want int
|
||||||
|
}{
|
||||||
|
{name: "missing config", cfg: nil, want: DefaultTunnelQualityProbeIntervalSec},
|
||||||
|
{name: "configured", cfg: map[string]string{ConfigTunnelQualityProbeIntervalSec: "15"}, want: 15},
|
||||||
|
{name: "invalid", cfg: map[string]string{ConfigTunnelQualityProbeIntervalSec: "0"}, want: DefaultTunnelQualityProbeIntervalSec},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
if got := TunnelQualityProbeIntervalSecondsFromConfigMap(tt.cfg); got != tt.want {
|
||||||
|
t.Fatalf("interval = %d, want %d", got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNormalizeTunnelQualityProbeIntervalSeconds(t *testing.T) {
|
||||||
|
for _, value := range []string{"1", "15", "3600"} {
|
||||||
|
if got, err := NormalizeTunnelQualityProbeIntervalSeconds(value); err != nil || got != value {
|
||||||
|
t.Fatalf("normalize %q = %q, %v", value, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, value := range []string{"", "0", "3601", "1.5", "abc"} {
|
||||||
|
if got, err := NormalizeTunnelQualityProbeIntervalSeconds(value); err == nil {
|
||||||
|
t.Fatalf("normalize %q unexpectedly succeeded with %q", value, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -132,3 +132,31 @@ func TestUpsertTunnelMetricBucketsIsSafeUnderConcurrency(t *testing.T) {
|
|||||||
t.Fatalf("expected bytesOut %d, got %d", wantOut, rows[0].BytesOut)
|
t.Fatalf("expected bytesOut %d, got %d", wantOut, rows[0].BytesOut)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetLatestTunnelQualitiesIncludesChainDetails(t *testing.T) {
|
||||||
|
r, err := Open(":memory:")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open repo: %v", err)
|
||||||
|
}
|
||||||
|
defer r.Close()
|
||||||
|
|
||||||
|
if err := r.InsertTunnelQuality(&model.TunnelQuality{
|
||||||
|
TunnelID: 7,
|
||||||
|
Timestamp: time.Now().UnixMilli(),
|
||||||
|
Success: 1,
|
||||||
|
ChainDetails: `{"primaryPath":[],"candidateHops":[{"fromNodeId":10,"toNodeId":31}]}`,
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("insert tunnel quality: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
items, err := r.GetLatestTunnelQualities()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get latest tunnel qualities: %v", err)
|
||||||
|
}
|
||||||
|
if len(items) != 1 {
|
||||||
|
t.Fatalf("expected one latest tunnel quality, got %+v", items)
|
||||||
|
}
|
||||||
|
if items[0].ChainDetails == "" {
|
||||||
|
t.Fatalf("expected chain details in latest quality row, got %+v", items[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -44,7 +44,8 @@ func (r *Repository) GetLatestTunnelQualities() ([]model.TunnelQuality, error) {
|
|||||||
// Use window function (works on modern SQLite 3.25+ and PostgreSQL).
|
// Use window function (works on modern SQLite 3.25+ and PostgreSQL).
|
||||||
q := `
|
q := `
|
||||||
SELECT id, tunnel_id, entry_to_exit_latency, exit_to_bing_latency,
|
SELECT id, tunnel_id, entry_to_exit_latency, exit_to_bing_latency,
|
||||||
entry_to_exit_loss, exit_to_bing_loss, success, error_message, timestamp
|
entry_to_exit_loss, exit_to_bing_loss, success, error_message, timestamp,
|
||||||
|
chain_details
|
||||||
FROM (
|
FROM (
|
||||||
SELECT *, ROW_NUMBER() OVER (PARTITION BY tunnel_id ORDER BY timestamp DESC, id DESC) AS rn
|
SELECT *, ROW_NUMBER() OVER (PARTITION BY tunnel_id ORDER BY timestamp DESC, id DESC) AS rn
|
||||||
FROM tunnel_quality
|
FROM tunnel_quality
|
||||||
|
|||||||
@@ -151,6 +151,7 @@ const (
|
|||||||
initialBackoff = 2 * time.Second // 重连初始退避
|
initialBackoff = 2 * time.Second // 重连初始退避
|
||||||
maxBackoff = 2 * time.Minute // 重连最大退避
|
maxBackoff = 2 * time.Minute // 重连最大退避
|
||||||
defaultMetricReportInterval = 5 * time.Second
|
defaultMetricReportInterval = 5 * time.Second
|
||||||
|
maxConcurrentTCPPings = 8
|
||||||
)
|
)
|
||||||
|
|
||||||
type WebSocketReporter struct {
|
type WebSocketReporter struct {
|
||||||
@@ -172,6 +173,7 @@ type WebSocketReporter struct {
|
|||||||
connecting bool // 正在连接状态
|
connecting bool // 正在连接状态
|
||||||
connMutex sync.Mutex // 连接状态锁
|
connMutex sync.Mutex // 连接状态锁
|
||||||
aesCrypto *crypto.AESCrypto // AES加密器
|
aesCrypto *crypto.AESCrypto // AES加密器
|
||||||
|
tcpPingSem chan struct{} // 限制诊断探测并发,避免离线目标耗尽连接
|
||||||
}
|
}
|
||||||
|
|
||||||
var wsDial = func(dialer *websocket.Dialer, rawURL string) (*websocket.Conn, *http.Response, error) {
|
var wsDial = func(dialer *websocket.Dialer, rawURL string) (*websocket.Conn, *http.Response, error) {
|
||||||
@@ -201,6 +203,29 @@ func NewWebSocketReporter(serverURL string, secret string) *WebSocketReporter {
|
|||||||
connected: false,
|
connected: false,
|
||||||
connecting: false,
|
connecting: false,
|
||||||
aesCrypto: aesCrypto,
|
aesCrypto: aesCrypto,
|
||||||
|
tcpPingSem: make(chan struct{}, maxConcurrentTCPPings),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) tryAcquireTCPPingSlot() bool {
|
||||||
|
if w == nil || w.tcpPingSem == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case w.tcpPingSem <- struct{}{}:
|
||||||
|
return true
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) releaseTCPPingSlot() {
|
||||||
|
if w == nil || w.tcpPingSem == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case <-w.tcpPingSem:
|
||||||
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -840,9 +865,14 @@ func (w *WebSocketReporter) routeCommand(cmd CommandMessage) {
|
|||||||
|
|
||||||
// TCP Ping 诊断命令(只读,不需要保存配置)
|
// TCP Ping 诊断命令(只读,不需要保存配置)
|
||||||
case "TcpPing":
|
case "TcpPing":
|
||||||
|
response.Type = "TcpPingResponse"
|
||||||
|
if !w.tryAcquireTCPPingSlot() {
|
||||||
|
err = fmt.Errorf("TCP探测任务过多,请稍后重试")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
defer w.releaseTCPPingSlot()
|
||||||
var tcpPingResult TcpPingResponse
|
var tcpPingResult TcpPingResponse
|
||||||
tcpPingResult, err = w.handleTcpPing(cmd.Data)
|
tcpPingResult, err = w.handleTcpPing(cmd.Data)
|
||||||
response.Type = "TcpPingResponse"
|
|
||||||
response.Data = tcpPingResult
|
response.Data = tcpPingResult
|
||||||
// needSaveConfig = false (默认值)
|
// needSaveConfig = false (默认值)
|
||||||
|
|
||||||
|
|||||||
@@ -148,6 +148,25 @@ func TestNewWebSocketReporterUsesReducedMetricInterval(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestWebSocketReporterLimitsConcurrentTCPPings(t *testing.T) {
|
||||||
|
reporter := &WebSocketReporter{tcpPingSem: make(chan struct{}, maxConcurrentTCPPings)}
|
||||||
|
for i := 0; i < maxConcurrentTCPPings; i++ {
|
||||||
|
if !reporter.tryAcquireTCPPingSlot() {
|
||||||
|
t.Fatalf("expected TCP ping slot %d to be available", i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if reporter.tryAcquireTCPPingSlot() {
|
||||||
|
t.Fatalf("expected TCP ping concurrency limit at %d", maxConcurrentTCPPings)
|
||||||
|
}
|
||||||
|
for i := 0; i < maxConcurrentTCPPings; i++ {
|
||||||
|
reporter.releaseTCPPingSlot()
|
||||||
|
}
|
||||||
|
if !reporter.tryAcquireTCPPingSlot() {
|
||||||
|
t.Fatalf("expected released TCP ping slot to be reusable")
|
||||||
|
}
|
||||||
|
reporter.releaseTCPPingSlot()
|
||||||
|
}
|
||||||
|
|
||||||
func TestFormatWebSocketDialErrorIncludesHTTPStatus(t *testing.T) {
|
func TestFormatWebSocketDialErrorIncludesHTTPStatus(t *testing.T) {
|
||||||
err := errors.New("websocket: bad handshake")
|
err := errors.New("websocket: bad handshake")
|
||||||
resp := &http.Response{
|
resp := &http.Response{
|
||||||
|
|||||||
+247
-40
@@ -1,4 +1,31 @@
|
|||||||
#!/bin/bash
|
#!/bin/sh
|
||||||
|
# shellcheck shell=bash
|
||||||
|
|
||||||
|
# Alpine 默认不带 Bash。先用系统自带的 /bin/sh 安装/切换到 Bash,
|
||||||
|
# 后续主体继续使用 Bash 语法,避免要求用户手动准备运行环境。
|
||||||
|
if [ -z "${BASH_VERSION:-}" ]; then
|
||||||
|
if command -v bash >/dev/null 2>&1; then
|
||||||
|
exec bash "$0" "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f /etc/alpine-release ] && command -v apk >/dev/null 2>&1; then
|
||||||
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
|
apk add --no-cache bash
|
||||||
|
elif command -v sudo >/dev/null 2>&1; then
|
||||||
|
sudo apk add --no-cache bash
|
||||||
|
elif command -v doas >/dev/null 2>&1; then
|
||||||
|
doas apk add --no-cache bash
|
||||||
|
else
|
||||||
|
echo "❌ Alpine 安装需要 root 权限,或已配置 sudo/doas。" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec bash "$0" "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "❌ 此安装脚本需要 Bash。" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# GitHub repo used for release downloads
|
# GitHub repo used for release downloads
|
||||||
REPO="Sagit-chu/flux-panel"
|
REPO="Sagit-chu/flux-panel"
|
||||||
@@ -24,11 +51,14 @@ get_architecture() {
|
|||||||
|
|
||||||
# 安装目录
|
# 安装目录
|
||||||
INSTALL_DIR="/etc/flux_agent"
|
INSTALL_DIR="/etc/flux_agent"
|
||||||
|
FLUX_AGENT_SYSTEMD_SERVICE_FILE="/etc/systemd/system/flux_agent.service"
|
||||||
|
FLUX_AGENT_OPENRC_SERVICE_FILE="/etc/init.d/flux_agent"
|
||||||
LEGACY_GOST_BINARY="/usr/local/bin/gost"
|
LEGACY_GOST_BINARY="/usr/local/bin/gost"
|
||||||
LEGACY_GOST_CONFIG_DIR="/etc/gost"
|
LEGACY_GOST_CONFIG_DIR="/etc/gost"
|
||||||
LEGACY_GOST_SERVICE_FILE_ETC="/etc/systemd/system/gost.service"
|
LEGACY_GOST_SERVICE_FILE_ETC="/etc/systemd/system/gost.service"
|
||||||
LEGACY_GOST_SERVICE_FILE_LIB="/lib/systemd/system/gost.service"
|
LEGACY_GOST_SERVICE_FILE_LIB="/lib/systemd/system/gost.service"
|
||||||
LEGACY_GOST_SERVICE_FILE_USR_LIB="/usr/lib/systemd/system/gost.service"
|
LEGACY_GOST_SERVICE_FILE_USR_LIB="/usr/lib/systemd/system/gost.service"
|
||||||
|
SERVICE_MANAGER="${SERVICE_MANAGER:-}"
|
||||||
|
|
||||||
# 镜像加速配置(可由面板传入或交互式询问)
|
# 镜像加速配置(可由面板传入或交互式询问)
|
||||||
PROXY_ENABLED="${PROXY_ENABLED:-}"
|
PROXY_ENABLED="${PROXY_ENABLED:-}"
|
||||||
@@ -256,6 +286,199 @@ write_flux_agent_config() {
|
|||||||
"$(json_escape "$SECRET")" > "$path"
|
"$(json_escape "$SECRET")" > "$path"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ensure_service_manager() {
|
||||||
|
if [[ -n "$SERVICE_MANAGER" ]]; then
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd|openrc)
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "❌ 不支持的服务管理器: $SERVICE_MANAGER" >&2
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
if command -v systemctl >/dev/null 2>&1 && [[ -d /run/systemd/system ]]; then
|
||||||
|
SERVICE_MANAGER="systemd"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
if command -v rc-service >/dev/null 2>&1 && command -v rc-update >/dev/null 2>&1; then
|
||||||
|
SERVICE_MANAGER="openrc"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "❌ 未检测到受支持的服务管理器(systemd 或 OpenRC)。" >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
flux_agent_service_exists() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
[[ -f "$FLUX_AGENT_SYSTEMD_SERVICE_FILE" ]] || \
|
||||||
|
systemctl list-units --full -all 2>/dev/null | grep -Fq "flux_agent.service"
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
[[ -f "$FLUX_AGENT_OPENRC_SERVICE_FILE" ]]
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
stop_flux_agent_service() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
systemctl stop flux_agent 2>/dev/null || true
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
rc-service flux_agent stop 2>/dev/null || true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
disable_flux_agent_service() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
systemctl disable flux_agent 2>/dev/null || true
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
rc-update del flux_agent default 2>/dev/null || true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
write_flux_agent_service() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
mkdir -p "$(dirname "$FLUX_AGENT_SYSTEMD_SERVICE_FILE")"
|
||||||
|
cat > "$FLUX_AGENT_SYSTEMD_SERVICE_FILE" <<EOF
|
||||||
|
[Unit]
|
||||||
|
Description=Flux_agent Proxy Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
WorkingDirectory=$INSTALL_DIR
|
||||||
|
ExecStart=$INSTALL_DIR/flux_agent
|
||||||
|
Restart=on-failure
|
||||||
|
StandardOutput=null
|
||||||
|
StandardError=null
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOF
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
mkdir -p "$(dirname "$FLUX_AGENT_OPENRC_SERVICE_FILE")"
|
||||||
|
cat > "$FLUX_AGENT_OPENRC_SERVICE_FILE" <<EOF
|
||||||
|
#!/sbin/openrc-run
|
||||||
|
|
||||||
|
name="flux_agent"
|
||||||
|
description="Flux_agent Proxy Service"
|
||||||
|
command="$INSTALL_DIR/flux_agent"
|
||||||
|
directory="$INSTALL_DIR"
|
||||||
|
command_background="yes"
|
||||||
|
pidfile="/run/\${RC_SVCNAME}.pid"
|
||||||
|
output_log="/dev/null"
|
||||||
|
error_log="/dev/null"
|
||||||
|
|
||||||
|
depend() {
|
||||||
|
need net
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
chmod +x "$FLUX_AGENT_OPENRC_SERVICE_FILE"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
enable_and_start_flux_agent_service() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl enable flux_agent
|
||||||
|
systemctl start flux_agent
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
rc-update add flux_agent default
|
||||||
|
rc-service flux_agent start
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
start_flux_agent_service() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
systemctl start flux_agent
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
rc-service flux_agent start
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
flux_agent_service_is_active() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
systemctl is-active --quiet flux_agent
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
rc-service flux_agent status >/dev/null 2>&1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
flux_agent_service_status() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
systemctl is-active flux_agent 2>/dev/null || true
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
rc-service flux_agent status 2>/dev/null || true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_flux_agent_service() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
rm -f "$FLUX_AGENT_SYSTEMD_SERVICE_FILE"
|
||||||
|
systemctl daemon-reload 2>/dev/null || true
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
rm -f "$FLUX_AGENT_OPENRC_SERVICE_FILE"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
flux_agent_service_status_hint() {
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
|
case "$SERVICE_MANAGER" in
|
||||||
|
systemd)
|
||||||
|
echo "systemctl status flux_agent --no-pager"
|
||||||
|
;;
|
||||||
|
openrc)
|
||||||
|
echo "rc-service flux_agent status"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
cleanup_legacy_gost_installation() {
|
cleanup_legacy_gost_installation() {
|
||||||
local matched_service_files=()
|
local matched_service_files=()
|
||||||
local service_file=""
|
local service_file=""
|
||||||
@@ -341,19 +564,21 @@ install_flux_agent() {
|
|||||||
|
|
||||||
get_config_params
|
get_config_params
|
||||||
|
|
||||||
# 检查并安装 tcpkill
|
# 检查并安装 tcpkill
|
||||||
check_and_install_tcpkill
|
check_and_install_tcpkill
|
||||||
|
ensure_service_manager || exit 1
|
||||||
|
|
||||||
mkdir -p "$INSTALL_DIR"
|
mkdir -p "$INSTALL_DIR"
|
||||||
|
|
||||||
local tmp_binary="$INSTALL_DIR/flux_agent.new"
|
local tmp_binary="$INSTALL_DIR/flux_agent.new"
|
||||||
|
|
||||||
# 停止并禁用已有服务
|
# 停止并禁用已有服务
|
||||||
if systemctl list-units --full -all | grep -Fq "flux_agent.service"; then
|
if flux_agent_service_exists; then
|
||||||
echo "🔍 检测到已存在的flux_agent服务"
|
echo "🔍 检测到已存在的flux_agent服务"
|
||||||
systemctl stop flux_agent 2>/dev/null && echo "🛑 停止服务"
|
stop_flux_agent_service
|
||||||
systemctl disable flux_agent 2>/dev/null && echo "🚫 禁用自启"
|
echo "🛑 停止服务"
|
||||||
|
disable_flux_agent_service
|
||||||
|
echo "🚫 禁用自启"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 下载 flux_agent
|
# 下载 flux_agent
|
||||||
@@ -392,38 +617,21 @@ EOF
|
|||||||
# 加强权限
|
# 加强权限
|
||||||
chmod 600 "$INSTALL_DIR"/*.json
|
chmod 600 "$INSTALL_DIR"/*.json
|
||||||
|
|
||||||
# 创建 systemd 服务
|
# 创建 systemd 或 OpenRC 服务
|
||||||
SERVICE_FILE="/etc/systemd/system/flux_agent.service"
|
write_flux_agent_service
|
||||||
cat > "$SERVICE_FILE" <<EOF
|
|
||||||
[Unit]
|
|
||||||
Description=Flux_agent Proxy Service
|
|
||||||
After=network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
WorkingDirectory=$INSTALL_DIR
|
|
||||||
ExecStart=$INSTALL_DIR/flux_agent
|
|
||||||
Restart=on-failure
|
|
||||||
StandardOutput=null
|
|
||||||
StandardError=null
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# 启动服务
|
# 启动服务
|
||||||
systemctl daemon-reload
|
enable_and_start_flux_agent_service
|
||||||
systemctl enable flux_agent
|
|
||||||
systemctl start flux_agent
|
|
||||||
|
|
||||||
# 检查状态
|
# 检查状态
|
||||||
echo "🔄 检查服务状态..."
|
echo "🔄 检查服务状态..."
|
||||||
if systemctl is-active --quiet flux_agent; then
|
if flux_agent_service_is_active; then
|
||||||
echo "✅ 安装完成,flux_agent服务已启动并设置为开机启动。"
|
echo "✅ 安装完成,flux_agent服务已启动并设置为开机启动。"
|
||||||
echo "📁 配置目录: $INSTALL_DIR"
|
echo "📁 配置目录: $INSTALL_DIR"
|
||||||
echo "🔧 服务状态: $(systemctl is-active flux_agent)"
|
echo "🔧 服务状态: $(flux_agent_service_status)"
|
||||||
else
|
else
|
||||||
echo "❌ flux_agent服务启动失败,请执行以下命令查看状态:"
|
echo "❌ flux_agent服务启动失败,请执行以下命令查看状态:"
|
||||||
echo "systemctl status flux_agent --no-pager"
|
flux_agent_service_status_hint
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -443,6 +651,7 @@ update_flux_agent() {
|
|||||||
|
|
||||||
# 检查并安装 tcpkill
|
# 检查并安装 tcpkill
|
||||||
check_and_install_tcpkill
|
check_and_install_tcpkill
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
# 先下载新版本
|
# 先下载新版本
|
||||||
echo "⬇️ 下载最新版本..."
|
echo "⬇️ 下载最新版本..."
|
||||||
@@ -455,9 +664,9 @@ update_flux_agent() {
|
|||||||
cleanup_legacy_gost_installation
|
cleanup_legacy_gost_installation
|
||||||
|
|
||||||
# 停止服务
|
# 停止服务
|
||||||
if systemctl list-units --full -all | grep -Fq "flux_agent.service"; then
|
if flux_agent_service_exists; then
|
||||||
echo "🛑 停止 flux_agent 服务..."
|
echo "🛑 停止 flux_agent 服务..."
|
||||||
systemctl stop flux_agent
|
stop_flux_agent_service
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 替换文件
|
# 替换文件
|
||||||
@@ -469,7 +678,7 @@ update_flux_agent() {
|
|||||||
|
|
||||||
# 重启服务
|
# 重启服务
|
||||||
echo "🔄 重启服务..."
|
echo "🔄 重启服务..."
|
||||||
systemctl start flux_agent
|
start_flux_agent_service
|
||||||
|
|
||||||
echo "✅ 更新完成,服务已重新启动。"
|
echo "✅ 更新完成,服务已重新启动。"
|
||||||
}
|
}
|
||||||
@@ -477,6 +686,7 @@ update_flux_agent() {
|
|||||||
# 卸载功能
|
# 卸载功能
|
||||||
uninstall_flux_agent() {
|
uninstall_flux_agent() {
|
||||||
echo "🗑️ 开始卸载 flux_agent..."
|
echo "🗑️ 开始卸载 flux_agent..."
|
||||||
|
ensure_service_manager || return 1
|
||||||
|
|
||||||
read -p "确认卸载 flux_agent 吗?此操作将删除所有相关文件 (y/N): " confirm
|
read -p "确认卸载 flux_agent 吗?此操作将删除所有相关文件 (y/N): " confirm
|
||||||
if [[ "$confirm" != "y" && "$confirm" != "Y" ]]; then
|
if [[ "$confirm" != "y" && "$confirm" != "Y" ]]; then
|
||||||
@@ -485,15 +695,15 @@ uninstall_flux_agent() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# 停止并禁用服务
|
# 停止并禁用服务
|
||||||
if systemctl list-units --full -all | grep -Fq "flux_agent.service"; then
|
if flux_agent_service_exists; then
|
||||||
echo "🛑 停止并禁用服务..."
|
echo "🛑 停止并禁用服务..."
|
||||||
systemctl stop flux_agent 2>/dev/null
|
stop_flux_agent_service
|
||||||
systemctl disable flux_agent 2>/dev/null
|
disable_flux_agent_service
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 删除服务文件
|
# 删除服务文件
|
||||||
if [[ -f "/etc/systemd/system/flux_agent.service" ]]; then
|
if [[ -f "$FLUX_AGENT_SYSTEMD_SERVICE_FILE" || -f "$FLUX_AGENT_OPENRC_SERVICE_FILE" ]]; then
|
||||||
rm -f "/etc/systemd/system/flux_agent.service"
|
remove_flux_agent_service
|
||||||
echo "🧹 删除服务文件"
|
echo "🧹 删除服务文件"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -503,9 +713,6 @@ uninstall_flux_agent() {
|
|||||||
echo "🧹 删除安装目录: $INSTALL_DIR"
|
echo "🧹 删除安装目录: $INSTALL_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 重载 systemd
|
|
||||||
systemctl daemon-reload
|
|
||||||
|
|
||||||
echo "✅ 卸载完成"
|
echo "✅ 卸载完成"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ test_update_flux_agent_asks_for_proxy_config() (
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
load_script_without_main "$ROOT_DIR/install.sh"
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
|
|
||||||
|
SERVICE_MANAGER="systemd"
|
||||||
INSTALL_DIR=$(mktemp -d)
|
INSTALL_DIR=$(mktemp -d)
|
||||||
cat > "$INSTALL_DIR/flux_agent" <<'EOF'
|
cat > "$INSTALL_DIR/flux_agent" <<'EOF'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
@@ -165,6 +166,7 @@ test_install_flux_agent_preserves_legacy_gost_when_download_fails() (
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
load_script_without_main "$ROOT_DIR/install.sh"
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
|
|
||||||
|
SERVICE_MANAGER="systemd"
|
||||||
INSTALL_DIR=$(mktemp -d)
|
INSTALL_DIR=$(mktemp -d)
|
||||||
cat > "$INSTALL_DIR/flux_agent" <<'EOF'
|
cat > "$INSTALL_DIR/flux_agent" <<'EOF'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
@@ -199,6 +201,7 @@ test_update_flux_agent_preserves_legacy_gost_when_download_fails() (
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
load_script_without_main "$ROOT_DIR/install.sh"
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
|
|
||||||
|
SERVICE_MANAGER="systemd"
|
||||||
INSTALL_DIR=$(mktemp -d)
|
INSTALL_DIR=$(mktemp -d)
|
||||||
cat > "$INSTALL_DIR/flux_agent" <<'EOF'
|
cat > "$INSTALL_DIR/flux_agent" <<'EOF'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
@@ -236,7 +239,9 @@ test_install_flux_agent_writes_json_safe_config() (
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
load_script_without_main "$ROOT_DIR/install.sh"
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
|
|
||||||
|
SERVICE_MANAGER="systemd"
|
||||||
INSTALL_DIR=$(mktemp -d)
|
INSTALL_DIR=$(mktemp -d)
|
||||||
|
FLUX_AGENT_SYSTEMD_SERVICE_FILE="$INSTALL_DIR/flux_agent.service"
|
||||||
SERVER_ADDR='panel"addr'
|
SERVER_ADDR='panel"addr'
|
||||||
SECRET='sec\ret"1'
|
SECRET='sec\ret"1'
|
||||||
DOWNLOAD_URL="https://example.com/gost"
|
DOWNLOAD_URL="https://example.com/gost"
|
||||||
@@ -274,6 +279,117 @@ EOF
|
|||||||
assert_equals "$expected" "$actual" "install_flux_agent should JSON-escape config values"
|
assert_equals "$expected" "$actual" "install_flux_agent should JSON-escape config values"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
test_install_script_bootstraps_bash_for_alpine() (
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
local shebang
|
||||||
|
shebang=$(head -n 1 "$ROOT_DIR/install.sh")
|
||||||
|
assert_equals "#!/bin/sh" "$shebang" "install.sh should start with Alpine's default shell"
|
||||||
|
|
||||||
|
grep -Fq 'apk add --no-cache bash' "$ROOT_DIR/install.sh" || \
|
||||||
|
fail "install.sh should bootstrap Bash through apk on Alpine"
|
||||||
|
)
|
||||||
|
|
||||||
|
test_install_flux_agent_uses_openrc() (
|
||||||
|
set -euo pipefail
|
||||||
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
|
|
||||||
|
local temp_root
|
||||||
|
temp_root=$(mktemp -d)
|
||||||
|
INSTALL_DIR="$temp_root/flux_agent"
|
||||||
|
FLUX_AGENT_OPENRC_SERVICE_FILE="$temp_root/init.d/flux_agent"
|
||||||
|
SERVICE_MANAGER="openrc"
|
||||||
|
SERVER_ADDR="panel.example.com:443"
|
||||||
|
SECRET="secret"
|
||||||
|
DOWNLOAD_URL="https://example.com/gost"
|
||||||
|
|
||||||
|
local rc_service_calls=""
|
||||||
|
local rc_update_calls=""
|
||||||
|
|
||||||
|
ask_proxy_config() { :; }
|
||||||
|
ensure_download_url_initialized() { :; }
|
||||||
|
get_config_params() { :; }
|
||||||
|
check_and_install_tcpkill() { :; }
|
||||||
|
cleanup_legacy_gost_installation() { :; }
|
||||||
|
curl() {
|
||||||
|
local output=""
|
||||||
|
while [[ $# -gt 0 ]]; do
|
||||||
|
if [[ "$1" == "-o" ]]; then
|
||||||
|
output="$2"
|
||||||
|
shift 2
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
cat > "$output" <<'EOF'
|
||||||
|
#!/bin/sh
|
||||||
|
echo "new version"
|
||||||
|
EOF
|
||||||
|
chmod +x "$output"
|
||||||
|
}
|
||||||
|
rc-service() {
|
||||||
|
rc_service_calls+=$'\n'"$*"
|
||||||
|
if [[ "$2" == "status" ]]; then
|
||||||
|
echo "status: started"
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
rc-update() {
|
||||||
|
rc_update_calls+=$'\n'"$*"
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
install_flux_agent >/dev/null
|
||||||
|
|
||||||
|
[[ -x "$FLUX_AGENT_OPENRC_SERVICE_FILE" ]] || fail "OpenRC service file should be executable"
|
||||||
|
grep -Fq '#!/sbin/openrc-run' "$FLUX_AGENT_OPENRC_SERVICE_FILE" || \
|
||||||
|
fail "OpenRC service should use openrc-run"
|
||||||
|
grep -Fq "command=\"$INSTALL_DIR/flux_agent\"" "$FLUX_AGENT_OPENRC_SERVICE_FILE" || \
|
||||||
|
fail "OpenRC service should launch the installed flux_agent binary"
|
||||||
|
grep -Fq 'command_background="yes"' "$FLUX_AGENT_OPENRC_SERVICE_FILE" || \
|
||||||
|
fail "OpenRC service should run flux_agent in the background"
|
||||||
|
if command -v openrc-run >/dev/null 2>&1; then
|
||||||
|
"$FLUX_AGENT_OPENRC_SERVICE_FILE" describe >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
[[ "$rc_update_calls" == *"add flux_agent default"* ]] || \
|
||||||
|
fail "OpenRC install should enable flux_agent in the default runlevel"
|
||||||
|
[[ "$rc_service_calls" == *"start"* ]] || fail "OpenRC install should start flux_agent"
|
||||||
|
[[ "$rc_service_calls" == *"status"* ]] || fail "OpenRC install should verify flux_agent status"
|
||||||
|
)
|
||||||
|
|
||||||
|
test_remove_flux_agent_service_uses_openrc() (
|
||||||
|
set -euo pipefail
|
||||||
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
|
|
||||||
|
local temp_root
|
||||||
|
temp_root=$(mktemp -d)
|
||||||
|
SERVICE_MANAGER="openrc"
|
||||||
|
FLUX_AGENT_OPENRC_SERVICE_FILE="$temp_root/init.d/flux_agent"
|
||||||
|
mkdir -p "$(dirname "$FLUX_AGENT_OPENRC_SERVICE_FILE")"
|
||||||
|
: > "$FLUX_AGENT_OPENRC_SERVICE_FILE"
|
||||||
|
|
||||||
|
local rc_service_calls=""
|
||||||
|
local rc_update_calls=""
|
||||||
|
rc-service() {
|
||||||
|
rc_service_calls+=$'\n'"$*"
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
rc-update() {
|
||||||
|
rc_update_calls+=$'\n'"$*"
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
stop_flux_agent_service
|
||||||
|
disable_flux_agent_service
|
||||||
|
remove_flux_agent_service
|
||||||
|
|
||||||
|
[[ "$rc_service_calls" == *"stop"* ]] || fail "OpenRC uninstall should stop flux_agent"
|
||||||
|
[[ "$rc_update_calls" == *"del flux_agent default"* ]] || \
|
||||||
|
fail "OpenRC uninstall should remove flux_agent from the default runlevel"
|
||||||
|
[[ ! -e "$FLUX_AGENT_OPENRC_SERVICE_FILE" ]] || fail "OpenRC uninstall should remove its service file"
|
||||||
|
)
|
||||||
|
|
||||||
test_cleanup_legacy_gost_installation_removes_service_and_binary() (
|
test_cleanup_legacy_gost_installation_removes_service_and_binary() (
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
load_script_without_main "$ROOT_DIR/install.sh"
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
@@ -504,6 +620,9 @@ test_update_flux_agent_skips_proxy_prompt_when_not_installed
|
|||||||
test_install_flux_agent_preserves_legacy_gost_when_download_fails
|
test_install_flux_agent_preserves_legacy_gost_when_download_fails
|
||||||
test_update_flux_agent_preserves_legacy_gost_when_download_fails
|
test_update_flux_agent_preserves_legacy_gost_when_download_fails
|
||||||
test_install_flux_agent_writes_json_safe_config
|
test_install_flux_agent_writes_json_safe_config
|
||||||
|
test_install_script_bootstraps_bash_for_alpine
|
||||||
|
test_install_flux_agent_uses_openrc
|
||||||
|
test_remove_flux_agent_service_uses_openrc
|
||||||
test_cleanup_legacy_gost_installation_removes_service_and_binary
|
test_cleanup_legacy_gost_installation_removes_service_and_binary
|
||||||
test_cleanup_legacy_gost_installation_preserves_unrelated_gost
|
test_cleanup_legacy_gost_installation_preserves_unrelated_gost
|
||||||
test_install_script_accepts_proxy_url_env_without_prompt
|
test_install_script_accepts_proxy_url_env_without_prompt
|
||||||
@@ -514,4 +633,4 @@ test_panel_install_script_uses_default_proxy
|
|||||||
test_panel_install_script_accepts_proxy_url_env_without_prompt
|
test_panel_install_script_accepts_proxy_url_env_without_prompt
|
||||||
test_panel_install_script_defaults_proxy_on_eof
|
test_panel_install_script_defaults_proxy_on_eof
|
||||||
|
|
||||||
echo "install script proxy tests passed"
|
echo "install script tests passed"
|
||||||
|
|||||||
@@ -595,6 +595,20 @@ export interface TunnelQualityHopApiItem {
|
|||||||
targetPort?: number;
|
targetPort?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface TunnelQualityCandidateHopApiItem
|
||||||
|
extends TunnelQualityHopApiItem {
|
||||||
|
fromRole: "entry" | "middle" | "exit";
|
||||||
|
toRole: "middle" | "exit" | "target";
|
||||||
|
hopIndex: number;
|
||||||
|
selected: boolean;
|
||||||
|
errorMessage?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TunnelQualityChainDetailsApiItem {
|
||||||
|
primaryPath?: TunnelQualityHopApiItem[];
|
||||||
|
candidateHops?: TunnelQualityCandidateHopApiItem[];
|
||||||
|
}
|
||||||
|
|
||||||
export interface TunnelQualityApiItem {
|
export interface TunnelQualityApiItem {
|
||||||
tunnelId: number;
|
tunnelId: number;
|
||||||
entryToExitLatency: number;
|
entryToExitLatency: number;
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
export const TUNNEL_QUALITY_INTERVAL_CONFIG_KEY =
|
||||||
|
"monitor_tunnel_quality_interval_sec";
|
||||||
|
export const DEFAULT_TUNNEL_QUALITY_INTERVAL_SEC = 1;
|
||||||
|
export const MIN_TUNNEL_QUALITY_INTERVAL_SEC = 1;
|
||||||
|
export const MAX_TUNNEL_QUALITY_INTERVAL_SEC = 3600;
|
||||||
|
|
||||||
|
export const parseTunnelQualityIntervalSeconds = (value: unknown): number => {
|
||||||
|
const seconds = Number(value);
|
||||||
|
|
||||||
|
return Number.isInteger(seconds) &&
|
||||||
|
seconds >= MIN_TUNNEL_QUALITY_INTERVAL_SEC &&
|
||||||
|
seconds <= MAX_TUNNEL_QUALITY_INTERVAL_SEC
|
||||||
|
? seconds
|
||||||
|
: DEFAULT_TUNNEL_QUALITY_INTERVAL_SEC;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const validateTunnelQualityInterval = (value: string): string | null => {
|
||||||
|
const normalized = value.trim();
|
||||||
|
|
||||||
|
if (!normalized) {
|
||||||
|
return "请输入探测间隔";
|
||||||
|
}
|
||||||
|
const seconds = Number(normalized);
|
||||||
|
|
||||||
|
if (!Number.isInteger(seconds)) {
|
||||||
|
return "探测间隔必须是整数";
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
seconds < MIN_TUNNEL_QUALITY_INTERVAL_SEC ||
|
||||||
|
seconds > MAX_TUNNEL_QUALITY_INTERVAL_SEC
|
||||||
|
) {
|
||||||
|
return `探测间隔必须在 ${MIN_TUNNEL_QUALITY_INTERVAL_SEC} 到 ${MAX_TUNNEL_QUALITY_INTERVAL_SEC} 秒之间`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const tunnelQualityIntervalLabel = (seconds: number): string =>
|
||||||
|
seconds === 1 ? "每秒" : `每 ${seconds} 秒`;
|
||||||
@@ -43,6 +43,14 @@ import { BackIcon, SettingsIcon } from "@/components/icons";
|
|||||||
import { ThemeSettings } from "@/components/theme-settings";
|
import { ThemeSettings } from "@/components/theme-settings";
|
||||||
import { isAdmin } from "@/utils/auth";
|
import { isAdmin } from "@/utils/auth";
|
||||||
import { getCachedConfigs, configCache, updateSiteConfig } from "@/config/site";
|
import { getCachedConfigs, configCache, updateSiteConfig } from "@/config/site";
|
||||||
|
import {
|
||||||
|
DEFAULT_TUNNEL_QUALITY_INTERVAL_SEC,
|
||||||
|
MAX_TUNNEL_QUALITY_INTERVAL_SEC,
|
||||||
|
MIN_TUNNEL_QUALITY_INTERVAL_SEC,
|
||||||
|
parseTunnelQualityIntervalSeconds,
|
||||||
|
TUNNEL_QUALITY_INTERVAL_CONFIG_KEY,
|
||||||
|
validateTunnelQualityInterval,
|
||||||
|
} from "@/config/tunnel-quality";
|
||||||
import {
|
import {
|
||||||
type UpdateReleaseChannel,
|
type UpdateReleaseChannel,
|
||||||
getUpdateReleaseChannel,
|
getUpdateReleaseChannel,
|
||||||
@@ -157,6 +165,16 @@ const CONFIG_ITEMS: ConfigItem[] = [
|
|||||||
"关闭后,前端停止自动刷新,后端停止实时隧道质量探测(全局配置)",
|
"关闭后,前端停止自动刷新,后端停止实时隧道质量探测(全局配置)",
|
||||||
type: "switch",
|
type: "switch",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: TUNNEL_QUALITY_INTERVAL_CONFIG_KEY,
|
||||||
|
label: "隧道质量探测间隔",
|
||||||
|
placeholder: String(DEFAULT_TUNNEL_QUALITY_INTERVAL_SEC),
|
||||||
|
description:
|
||||||
|
"设置实时隧道质量检测的执行频率,单位为秒;允许 1–3600 秒,默认 1 秒。",
|
||||||
|
type: "input",
|
||||||
|
dependsOn: "monitor_tunnel_quality_enabled",
|
||||||
|
dependsValue: "true",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: "monitor_retention_days",
|
key: "monitor_retention_days",
|
||||||
label: "监控数据保留天数",
|
label: "监控数据保留天数",
|
||||||
@@ -239,6 +257,7 @@ const getInitialConfigs = (): Record<string, string> => {
|
|||||||
"cloudflare_secret_key",
|
"cloudflare_secret_key",
|
||||||
"forward_compact_mode",
|
"forward_compact_mode",
|
||||||
"monitor_tunnel_quality_enabled",
|
"monitor_tunnel_quality_enabled",
|
||||||
|
TUNNEL_QUALITY_INTERVAL_CONFIG_KEY,
|
||||||
"monitor_retention_days",
|
"monitor_retention_days",
|
||||||
"ip",
|
"ip",
|
||||||
"panel_domain",
|
"panel_domain",
|
||||||
@@ -622,6 +641,19 @@ export default function ConfigPage() {
|
|||||||
|
|
||||||
// 保存配置
|
// 保存配置
|
||||||
const handleSave = async () => {
|
const handleSave = async () => {
|
||||||
|
const intervalValue = configs[TUNNEL_QUALITY_INTERVAL_CONFIG_KEY];
|
||||||
|
const intervalChanged =
|
||||||
|
intervalValue !== originalConfigs[TUNNEL_QUALITY_INTERVAL_CONFIG_KEY];
|
||||||
|
const intervalError = intervalChanged
|
||||||
|
? validateTunnelQualityInterval(intervalValue || "")
|
||||||
|
: null;
|
||||||
|
|
||||||
|
if (intervalError) {
|
||||||
|
toast.error(intervalError);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
setSaving(true);
|
setSaving(true);
|
||||||
try {
|
try {
|
||||||
const changedKeys = Object.keys(configs).filter(
|
const changedKeys = Object.keys(configs).filter(
|
||||||
@@ -667,12 +699,22 @@ export default function ConfigPage() {
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
// 如果隧道质量检测开关变更,通知 tunnel-monitor-view
|
// 如果隧道质量检测配置变更,通知 tunnel-monitor-view
|
||||||
if (changedKeys.includes("monitor_tunnel_quality_enabled")) {
|
if (
|
||||||
|
changedKeys.some((key) =>
|
||||||
|
[
|
||||||
|
"monitor_tunnel_quality_enabled",
|
||||||
|
TUNNEL_QUALITY_INTERVAL_CONFIG_KEY,
|
||||||
|
].includes(key),
|
||||||
|
)
|
||||||
|
) {
|
||||||
window.dispatchEvent(
|
window.dispatchEvent(
|
||||||
new CustomEvent("monitorTunnelQualityEnabledChanged", {
|
new CustomEvent("monitorTunnelQualityEnabledChanged", {
|
||||||
detail: {
|
detail: {
|
||||||
enabled: configs["monitor_tunnel_quality_enabled"] === "true",
|
enabled: configs["monitor_tunnel_quality_enabled"] === "true",
|
||||||
|
intervalSec: parseTunnelQualityIntervalSeconds(
|
||||||
|
configs[TUNNEL_QUALITY_INTERVAL_CONFIG_KEY],
|
||||||
|
),
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -1075,11 +1117,21 @@ export default function ConfigPage() {
|
|||||||
case "bg_image":
|
case "bg_image":
|
||||||
return renderBgImageUploader();
|
return renderBgImageUploader();
|
||||||
|
|
||||||
case "input":
|
case "input": {
|
||||||
if (isBrandPreviewKey(item.key)) {
|
if (isBrandPreviewKey(item.key)) {
|
||||||
return renderBrandAssetUploader(item.key, isChanged);
|
return renderBrandAssetUploader(item.key, isChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isTunnelQualityInterval =
|
||||||
|
item.key === TUNNEL_QUALITY_INTERVAL_CONFIG_KEY;
|
||||||
|
const intervalValue = isTunnelQualityInterval
|
||||||
|
? (configs[item.key] ?? String(DEFAULT_TUNNEL_QUALITY_INTERVAL_SEC))
|
||||||
|
: (configs[item.key] ?? "");
|
||||||
|
const intervalError =
|
||||||
|
isTunnelQualityInterval && configs[item.key] !== undefined
|
||||||
|
? validateTunnelQualityInterval(intervalValue)
|
||||||
|
: null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Input
|
<Input
|
||||||
classNames={{
|
classNames={{
|
||||||
@@ -1091,14 +1143,30 @@ export default function ConfigPage() {
|
|||||||
description={
|
description={
|
||||||
isCommercialDisabled ? "需商业版授权才能修改此项" : undefined
|
isCommercialDisabled ? "需商业版授权才能修改此项" : undefined
|
||||||
}
|
}
|
||||||
|
endContent={isTunnelQualityInterval ? "秒" : undefined}
|
||||||
|
errorMessage={intervalError || undefined}
|
||||||
isDisabled={isCommercialDisabled}
|
isDisabled={isCommercialDisabled}
|
||||||
|
isInvalid={Boolean(intervalError)}
|
||||||
|
max={
|
||||||
|
isTunnelQualityInterval
|
||||||
|
? MAX_TUNNEL_QUALITY_INTERVAL_SEC
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
|
min={
|
||||||
|
isTunnelQualityInterval
|
||||||
|
? MIN_TUNNEL_QUALITY_INTERVAL_SEC
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
placeholder={item.placeholder}
|
placeholder={item.placeholder}
|
||||||
size="md"
|
size="md"
|
||||||
value={configs[item.key] || ""}
|
step={isTunnelQualityInterval ? 1 : undefined}
|
||||||
|
type={isTunnelQualityInterval ? "number" : "text"}
|
||||||
|
value={intervalValue}
|
||||||
variant="bordered"
|
variant="bordered"
|
||||||
onChange={(e) => handleConfigChange(item.key, e.target.value)}
|
onChange={(e) => handleConfigChange(item.key, e.target.value)}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
case "switch":
|
case "switch":
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import type {
|
|||||||
MonitorTunnelApiItem,
|
MonitorTunnelApiItem,
|
||||||
TunnelMetricApiItem,
|
TunnelMetricApiItem,
|
||||||
TunnelQualityApiItem,
|
TunnelQualityApiItem,
|
||||||
|
TunnelQualityCandidateHopApiItem,
|
||||||
|
TunnelQualityChainDetailsApiItem,
|
||||||
TunnelQualityHopApiItem,
|
TunnelQualityHopApiItem,
|
||||||
} from "@/api/types";
|
} from "@/api/types";
|
||||||
|
|
||||||
@@ -53,12 +55,17 @@ import {
|
|||||||
TableRow,
|
TableRow,
|
||||||
TableCell,
|
TableCell,
|
||||||
} from "@/shadcn-bridge/heroui/table";
|
} from "@/shadcn-bridge/heroui/table";
|
||||||
|
import {
|
||||||
|
DEFAULT_TUNNEL_QUALITY_INTERVAL_SEC,
|
||||||
|
parseTunnelQualityIntervalSeconds,
|
||||||
|
TUNNEL_QUALITY_INTERVAL_CONFIG_KEY,
|
||||||
|
tunnelQualityIntervalLabel,
|
||||||
|
} from "@/config/tunnel-quality";
|
||||||
|
|
||||||
interface TunnelMonitorViewProps {
|
interface TunnelMonitorViewProps {
|
||||||
viewMode?: "list" | "grid";
|
viewMode?: "list" | "grid";
|
||||||
}
|
}
|
||||||
|
|
||||||
const QUALITY_POLL_INTERVAL = 1_000; // 1 second
|
|
||||||
const MONITOR_TUNNEL_QUALITY_ENABLED_CONFIG_KEY =
|
const MONITOR_TUNNEL_QUALITY_ENABLED_CONFIG_KEY =
|
||||||
"monitor_tunnel_quality_enabled";
|
"monitor_tunnel_quality_enabled";
|
||||||
const MONITOR_TUNNEL_QUALITY_ENABLED_EVENT =
|
const MONITOR_TUNNEL_QUALITY_ENABLED_EVENT =
|
||||||
@@ -463,18 +470,59 @@ const TrafficChartCard = React.memo(function TrafficChartCard({
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
function ForwardingChainTopology({ hopsStr }: { hopsStr?: string }) {
|
const parseTunnelQualityChainDetails = (
|
||||||
if (!hopsStr) return null;
|
raw?: string,
|
||||||
|
): TunnelQualityChainDetailsApiItem => {
|
||||||
let hops: TunnelQualityHopApiItem[] = [];
|
if (!raw) return {};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
hops = JSON.parse(hopsStr);
|
const parsed: unknown = JSON.parse(raw);
|
||||||
|
|
||||||
|
// Backward-compatible with historical rows that stored the primary path
|
||||||
|
// directly as a JSON array.
|
||||||
|
if (Array.isArray(parsed)) {
|
||||||
|
return { primaryPath: parsed as TunnelQualityHopApiItem[] };
|
||||||
|
}
|
||||||
|
if (parsed && typeof parsed === "object") {
|
||||||
|
return parsed as TunnelQualityChainDetailsApiItem;
|
||||||
|
}
|
||||||
} catch {
|
} catch {
|
||||||
return null;
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Array.isArray(hops) || hops.length === 0) return null;
|
return {};
|
||||||
|
};
|
||||||
|
|
||||||
|
const candidateRoleLabel = (role: string) => {
|
||||||
|
switch (role) {
|
||||||
|
case "entry":
|
||||||
|
return "入口";
|
||||||
|
case "middle":
|
||||||
|
return "中转";
|
||||||
|
case "exit":
|
||||||
|
return "出口";
|
||||||
|
case "target":
|
||||||
|
return "测试目标";
|
||||||
|
default:
|
||||||
|
return role;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const ForwardingChainTopology = React.memo(function ForwardingChainTopology({
|
||||||
|
hopsStr,
|
||||||
|
}: {
|
||||||
|
hopsStr?: string;
|
||||||
|
}) {
|
||||||
|
const details = useMemo(
|
||||||
|
() => parseTunnelQualityChainDetails(hopsStr),
|
||||||
|
[hopsStr],
|
||||||
|
);
|
||||||
|
const primaryHops = details.primaryPath ?? [];
|
||||||
|
const alternativeHops = useMemo(
|
||||||
|
() => (details.candidateHops ?? []).filter((hop) => !hop.selected),
|
||||||
|
[details.candidateHops],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (primaryHops.length === 0 && alternativeHops.length === 0) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="border border-divider/60 shadow-sm transition-shadow bg-gradient-to-br from-background to-default-50/50 mt-4">
|
<Card className="border border-divider/60 shadow-sm transition-shadow bg-gradient-to-br from-background to-default-50/50 mt-4">
|
||||||
@@ -485,61 +533,131 @@ function ForwardingChainTopology({ hopsStr }: { hopsStr?: string }) {
|
|||||||
</h3>
|
</h3>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardBody className="py-2 px-4 pb-4">
|
<CardBody className="py-2 px-4 pb-4">
|
||||||
<div className="flex items-center overflow-x-auto pb-2 py-2">
|
{primaryHops.length > 0 ? (
|
||||||
{hops.map((hop, index) => {
|
<div className="flex items-center overflow-x-auto pb-2 py-2">
|
||||||
const hasError = hop.latency < 0 || hop.loss > 0;
|
{primaryHops.map((hop, index) => {
|
||||||
const colorClass =
|
const hasError = hop.latency < 0 || hop.loss > 0;
|
||||||
hop.latency < 0
|
const colorClass =
|
||||||
? "text-danger"
|
hop.latency < 0
|
||||||
: hop.loss > 0
|
? "text-danger"
|
||||||
? "text-warning"
|
: hop.loss > 0
|
||||||
: "text-success";
|
? "text-warning"
|
||||||
const borderColor = hasError ? "border-danger" : "";
|
: "text-success";
|
||||||
|
const borderColor = hasError ? "border-danger" : "";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment key={index}>
|
<React.Fragment
|
||||||
{index === 0 && (
|
key={`${hop.fromNodeId}-${hop.toNodeId}-${index}`}
|
||||||
|
>
|
||||||
|
{index === 0 ? (
|
||||||
|
<Chip
|
||||||
|
className="shrink-0 font-mono shadow-sm"
|
||||||
|
size="sm"
|
||||||
|
variant="flat"
|
||||||
|
>
|
||||||
|
{hop.fromNodeName}
|
||||||
|
</Chip>
|
||||||
|
) : null}
|
||||||
|
<div className="flex flex-col items-center justify-center min-w-[70px] mx-1 shrink-0 relative">
|
||||||
|
<span
|
||||||
|
className={`text-[10px] font-mono leading-none mb-1 ${colorClass}`}
|
||||||
|
>
|
||||||
|
{hop.latency >= 0
|
||||||
|
? `${hop.latency.toFixed(0)}ms`
|
||||||
|
: "超时"}
|
||||||
|
</span>
|
||||||
|
<div
|
||||||
|
className={`h-[2px] w-full relative flex items-center justify-end bg-default-200 ${hop.latency < 0 ? "!bg-danger" : ""}`}
|
||||||
|
>
|
||||||
|
<ArrowRight
|
||||||
|
className={`w-3.5 h-3.5 absolute -right-2 ${colorClass} bg-background rounded-full p-[1px] z-10`}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
className={`text-[10px] font-mono leading-none mt-1.5 ${hop.loss > 0 ? "text-warning" : "text-default-400"}`}
|
||||||
|
>
|
||||||
|
{hop.loss.toFixed(0)}% 丢包
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
<Chip
|
<Chip
|
||||||
className="shrink-0 font-mono shadow-sm"
|
className={`shrink-0 font-mono shadow-sm ${borderColor}`}
|
||||||
size="sm"
|
size="sm"
|
||||||
variant="flat"
|
variant="flat"
|
||||||
>
|
>
|
||||||
{hop.fromNodeName}
|
{hop.toNodeName}
|
||||||
</Chip>
|
</Chip>
|
||||||
)}
|
</React.Fragment>
|
||||||
<div className="flex flex-col items-center justify-center min-w-[70px] mx-1 shrink-0 relative">
|
);
|
||||||
<span
|
})}
|
||||||
className={`text-[10px] font-mono leading-none mb-1 ${colorClass}`}
|
</div>
|
||||||
>
|
) : null}
|
||||||
{hop.latency >= 0 ? `${hop.latency.toFixed(0)}ms` : "超时"}
|
|
||||||
</span>
|
{alternativeHops.length > 0 ? (
|
||||||
<div
|
<div
|
||||||
className={`h-[2px] w-full relative flex items-center justify-end bg-default-200 ${hop.latency < 0 ? "!bg-danger" : ""}`}
|
className={`${primaryHops.length > 0 ? "mt-3 border-t border-divider/60 pt-3" : ""}`}
|
||||||
>
|
>
|
||||||
<ArrowRight
|
<div className="mb-2 flex items-center justify-between gap-2">
|
||||||
className={`w-3.5 h-3.5 absolute -right-2 ${colorClass} bg-background rounded-full p-[1px] z-10`}
|
<span className="text-xs font-semibold text-default-600">
|
||||||
/>
|
备选节点实时延迟
|
||||||
</div>
|
</span>
|
||||||
<span
|
<span className="text-[10px] text-default-400">
|
||||||
className={`text-[10px] font-mono leading-none mt-1.5 ${hop.loss > 0 ? "text-warning" : "text-default-400"}`}
|
{alternativeHops.length} 条候选链路
|
||||||
>
|
</span>
|
||||||
{hop.loss.toFixed(0)}% 丢包
|
</div>
|
||||||
</span>
|
<div className="grid max-h-72 grid-cols-1 gap-2 overflow-y-auto pr-1 md:grid-cols-2">
|
||||||
</div>
|
{alternativeHops.map((hop) => (
|
||||||
<Chip
|
<CandidateHopLatency
|
||||||
className={`shrink-0 font-mono shadow-sm ${borderColor}`}
|
key={`${hop.hopIndex}-${hop.fromNodeId}-${hop.toRole}-${hop.toNodeId || hop.toNodeName}`}
|
||||||
size="sm"
|
hop={hop}
|
||||||
variant="flat"
|
/>
|
||||||
>
|
))}
|
||||||
{hop.toNodeName}
|
</div>
|
||||||
</Chip>
|
</div>
|
||||||
</React.Fragment>
|
) : null}
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
</CardBody>
|
</CardBody>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
function CandidateHopLatency({
|
||||||
|
hop,
|
||||||
|
}: {
|
||||||
|
hop: TunnelQualityCandidateHopApiItem;
|
||||||
|
}) {
|
||||||
|
const hasError = Boolean(hop.errorMessage) || hop.latency < 0;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-divider/60 bg-default-50/50 px-3 py-2.5">
|
||||||
|
<div className="flex items-center gap-2 text-xs">
|
||||||
|
<span className="min-w-0 truncate font-medium text-foreground">
|
||||||
|
{hop.fromNodeName}
|
||||||
|
</span>
|
||||||
|
<ArrowRight className="h-3.5 w-3.5 shrink-0 text-default-400" />
|
||||||
|
<span className="min-w-0 truncate font-medium text-foreground">
|
||||||
|
{hop.toNodeName}
|
||||||
|
</span>
|
||||||
|
<span className="ml-auto shrink-0">
|
||||||
|
<LatencyDisplay value={hop.latency} />
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="mt-1.5 flex items-center gap-2 text-[10px] text-default-400">
|
||||||
|
<span>
|
||||||
|
{candidateRoleLabel(hop.fromRole)} → {candidateRoleLabel(hop.toRole)}
|
||||||
|
</span>
|
||||||
|
{hasError ? (
|
||||||
|
<span className="ml-auto truncate text-danger">
|
||||||
|
{hop.errorMessage || "探测失败"}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span
|
||||||
|
className={`ml-auto font-mono ${hop.loss > 0 ? "text-warning" : "text-default-500"}`}
|
||||||
|
>
|
||||||
|
{hop.loss.toFixed(0)}% 丢包
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function TunnelMonitorView({
|
export function TunnelMonitorView({
|
||||||
@@ -562,6 +680,9 @@ export function TunnelMonitorView({
|
|||||||
const qualityTimerRef = useRef<number | null>(null);
|
const qualityTimerRef = useRef<number | null>(null);
|
||||||
const [monitorTunnelQualityEnabled, setMonitorTunnelQualityEnabled] =
|
const [monitorTunnelQualityEnabled, setMonitorTunnelQualityEnabled] =
|
||||||
useState(true);
|
useState(true);
|
||||||
|
const [tunnelQualityIntervalSec, setTunnelQualityIntervalSec] = useState(
|
||||||
|
DEFAULT_TUNNEL_QUALITY_INTERVAL_SEC,
|
||||||
|
);
|
||||||
|
|
||||||
// Detail view state
|
// Detail view state
|
||||||
const [detailTunnelId, setDetailTunnelId] = useState<number | null>(null);
|
const [detailTunnelId, setDetailTunnelId] = useState<number | null>(null);
|
||||||
@@ -618,26 +739,28 @@ export function TunnelMonitorView({
|
|||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const loadMonitorTunnelQualityEnabled = useCallback(async () => {
|
const loadTunnelQualityConfig = useCallback(async () => {
|
||||||
try {
|
const [enabledResponse, intervalResponse] = await Promise.all([
|
||||||
const response = await getConfigByName(
|
getConfigByName(MONITOR_TUNNEL_QUALITY_ENABLED_CONFIG_KEY).catch(
|
||||||
MONITOR_TUNNEL_QUALITY_ENABLED_CONFIG_KEY,
|
() => null,
|
||||||
);
|
),
|
||||||
|
getConfigByName(TUNNEL_QUALITY_INTERVAL_CONFIG_KEY).catch(() => null),
|
||||||
|
]);
|
||||||
|
|
||||||
setMonitorTunnelQualityEnabled(
|
setMonitorTunnelQualityEnabled(
|
||||||
typeof response.data?.value === "string"
|
typeof enabledResponse?.data?.value === "string"
|
||||||
? response.data.value === "true"
|
? enabledResponse.data.value === "true"
|
||||||
: true,
|
: true,
|
||||||
);
|
);
|
||||||
} catch {
|
setTunnelQualityIntervalSec(
|
||||||
setMonitorTunnelQualityEnabled(true);
|
parseTunnelQualityIntervalSeconds(intervalResponse?.data?.value),
|
||||||
}
|
);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void loadTunnels();
|
void loadTunnels();
|
||||||
void loadMonitorTunnelQualityEnabled();
|
void loadTunnelQualityConfig();
|
||||||
}, [loadMonitorTunnelQualityEnabled, loadTunnels]);
|
}, [loadTunnelQualityConfig, loadTunnels]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const timer = window.setInterval(() => {
|
const timer = window.setInterval(() => {
|
||||||
@@ -649,8 +772,11 @@ export function TunnelMonitorView({
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleMonitorTunnelQualityEnabledChanged = (event: Event) => {
|
const handleMonitorTunnelQualityEnabledChanged = (event: Event) => {
|
||||||
const enabled = (event as CustomEvent<{ enabled?: boolean }>).detail
|
const detail = (
|
||||||
?.enabled;
|
event as CustomEvent<{ enabled?: boolean; intervalSec?: number }>
|
||||||
|
).detail;
|
||||||
|
const enabled = detail?.enabled;
|
||||||
|
const intervalSec = detail?.intervalSec;
|
||||||
|
|
||||||
if (typeof enabled === "boolean") {
|
if (typeof enabled === "boolean") {
|
||||||
setMonitorTunnelQualityEnabled(enabled);
|
setMonitorTunnelQualityEnabled(enabled);
|
||||||
@@ -658,7 +784,12 @@ export function TunnelMonitorView({
|
|||||||
setQualityLoading(false);
|
setQualityLoading(false);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
void loadMonitorTunnelQualityEnabled();
|
void loadTunnelQualityConfig();
|
||||||
|
}
|
||||||
|
if (typeof intervalSec === "number") {
|
||||||
|
setTunnelQualityIntervalSec(
|
||||||
|
parseTunnelQualityIntervalSeconds(String(intervalSec)),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -673,7 +804,7 @@ export function TunnelMonitorView({
|
|||||||
handleMonitorTunnelQualityEnabledChanged as EventListener,
|
handleMonitorTunnelQualityEnabledChanged as EventListener,
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
}, [loadMonitorTunnelQualityEnabled]);
|
}, [loadTunnelQualityConfig]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (tunnels.length > 0 && !initialHistoryFetched.current) {
|
if (tunnels.length > 0 && !initialHistoryFetched.current) {
|
||||||
@@ -726,7 +857,7 @@ export function TunnelMonitorView({
|
|||||||
}
|
}
|
||||||
}, [tunnels]);
|
}, [tunnels]);
|
||||||
|
|
||||||
// --- Load quality snapshots (auto-polling every 10s) ---
|
// --- Load quality snapshots using the configured probe interval ---
|
||||||
const loadQuality = useCallback(async (options?: { silent?: boolean }) => {
|
const loadQuality = useCallback(async (options?: { silent?: boolean }) => {
|
||||||
const silent = options?.silent ?? false;
|
const silent = options?.silent ?? false;
|
||||||
|
|
||||||
@@ -788,7 +919,7 @@ export function TunnelMonitorView({
|
|||||||
|
|
||||||
qualityTimerRef.current = window.setInterval(() => {
|
qualityTimerRef.current = window.setInterval(() => {
|
||||||
void loadQuality({ silent: true });
|
void loadQuality({ silent: true });
|
||||||
}, QUALITY_POLL_INTERVAL);
|
}, tunnelQualityIntervalSec * 1000);
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
if (qualityTimerRef.current) {
|
if (qualityTimerRef.current) {
|
||||||
@@ -796,7 +927,7 @@ export function TunnelMonitorView({
|
|||||||
qualityTimerRef.current = null;
|
qualityTimerRef.current = null;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}, [loadQuality, monitorTunnelQualityEnabled]);
|
}, [loadQuality, monitorTunnelQualityEnabled, tunnelQualityIntervalSec]);
|
||||||
|
|
||||||
// --- Load quality history for detail chart ---
|
// --- Load quality history for detail chart ---
|
||||||
const loadQualityHistory = useCallback(
|
const loadQualityHistory = useCallback(
|
||||||
@@ -1065,7 +1196,7 @@ export function TunnelMonitorView({
|
|||||||
{monitorTunnelQualityEnabled ? (
|
{monitorTunnelQualityEnabled ? (
|
||||||
<>
|
<>
|
||||||
<LiveDot />
|
<LiveDot />
|
||||||
<span>自动探测中(每秒测试,30秒上报)</span>
|
<span>{`自动探测中(${tunnelQualityIntervalLabel(tunnelQualityIntervalSec)}测试)`}</span>
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
@@ -1129,7 +1260,7 @@ export function TunnelMonitorView({
|
|||||||
{monitorTunnelQualityEnabled ? (
|
{monitorTunnelQualityEnabled ? (
|
||||||
<>
|
<>
|
||||||
<LiveDot />
|
<LiveDot />
|
||||||
<span>每秒探测 · 更新于 {lastQualityUpdate}</span>
|
<span>{`${tunnelQualityIntervalLabel(tunnelQualityIntervalSec)}探测 · 更新于 ${lastQualityUpdate}`}</span>
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
|
|||||||
Reference in New Issue
Block a user