P7: restore agent node type, agent heartbeat expiry, build-version injection, remove log/history/xray-metrics modules, optional sub port
- nodes: port node-type (traditional/agent) picker back from web-src into the embedded frontend; backend annotates NodeView.nodeType from agent_nodes bindings; fix agent-node update path (skip reachability probe and apiToken requirement for agent-managed nodes); restore i18n keys in all 13 locales; install command now uses the Gitea mirror - jobs: expire agent-bound nodes whose agent_nodes.last_seen is older than max(3x heartbeat interval, 120s) = 180s; last_seen=0 (never registered) is left untouched; transitions reuse UpdateHeartbeat + node event broadcast - config: GetBaseVersion honors ldflags-injected buildVersion; release builds inject 3.7.0-agent.1 so the panel no longer reports a phantom update against the Gitea release tag - logger/server: remove the three log viewers (panel/xray/amneziawg), their API endpoints and the 10240-entry in-memory log buffer; file logging via lumberjack unchanged; tests assert via a new optional logger hook instead of the removed buffer - server: remove system history and xray metrics modules end to end (endpoints, sampling appends in RefreshStatus, per-minute persist cron, gob snapshot/restore, XrayMetricsService); realtime status and per-node history are untouched - settings: subPort may be 0/unset - subscription links are generated without a port while the subscription service keeps binding the default 2096; the settings form declares the cleared state via onNumber's new onClear option instead of snapping back to 1
This commit is contained in:
@@ -24,9 +24,17 @@ var name string
|
||||
// CI per-commit (dev channel) builds; see .github/workflows/release.yml. They
|
||||
// stay empty for a plain `go build` and for stable tagged releases, which is how
|
||||
// IsDevBuild tells a rolling dev build apart from a stable/local one.
|
||||
//
|
||||
// buildVersion is injected the same way by this fork's release builds
|
||||
// (e.g. "3.7.0-agent.1", matching the Gitea release tag) so the binary reports
|
||||
// the fork release it was built from — the embedded version file always names
|
||||
// the upstream base release, which made the update check compare "3.7.0"
|
||||
// against the fork's "v3.7.0-agent.1" tag and report a phantom update forever.
|
||||
// It stays empty for a plain `go build`, which falls back to the embedded file.
|
||||
var (
|
||||
buildCommit string
|
||||
buildDate string
|
||||
buildCommit string
|
||||
buildDate string
|
||||
buildVersion string
|
||||
)
|
||||
|
||||
// LogLevel represents the logging level for the application.
|
||||
@@ -41,11 +49,19 @@ const (
|
||||
Error LogLevel = "error"
|
||||
)
|
||||
|
||||
// GetBaseVersion returns the raw embedded release version of the 3x-ui panel
|
||||
// GetBaseVersion returns the release version of the 3x-ui panel
|
||||
// (e.g. "3.4.0"). This is the panel's own version, not the Xray version. For the
|
||||
// version a panel advertises/displays (which adds a "dev+<sha>" label on dev
|
||||
// builds), use GetPanelVersion.
|
||||
//
|
||||
// A fork release build injects buildVersion via `-ldflags -X`, which wins over
|
||||
// the embedded version file; every version consumer (UI display, update check,
|
||||
// panel-version advertisement to a master) reads through here, so the injected
|
||||
// value is the single source of truth for the running binary.
|
||||
func GetBaseVersion() string {
|
||||
if v := strings.TrimSpace(buildVersion); v != "" {
|
||||
return v
|
||||
}
|
||||
return strings.TrimSpace(version)
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,34 @@ func TestGetPanelVersion(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetBaseVersionBuildVersionOverride(t *testing.T) {
|
||||
orig := buildVersion
|
||||
t.Cleanup(func() { buildVersion = orig })
|
||||
|
||||
// No injection (plain `go build`): the embedded version file wins.
|
||||
buildVersion = ""
|
||||
embedded := GetBaseVersion()
|
||||
if embedded == "" {
|
||||
t.Fatal("embedded version file must not be empty")
|
||||
}
|
||||
|
||||
// Injected fork release version wins over the embedded file and flows
|
||||
// into GetPanelVersion untouched (stable channel, no dev label).
|
||||
buildVersion = "3.7.0-agent.1"
|
||||
if got := GetBaseVersion(); got != "3.7.0-agent.1" {
|
||||
t.Fatalf("injected build: GetBaseVersion = %q, want %q", got, "3.7.0-agent.1")
|
||||
}
|
||||
if got := GetPanelVersion(); got != "3.7.0-agent.1" {
|
||||
t.Fatalf("injected build: GetPanelVersion = %q, want %q", got, "3.7.0-agent.1")
|
||||
}
|
||||
|
||||
// Whitespace-only injection counts as unset.
|
||||
buildVersion = " "
|
||||
if got := GetBaseVersion(); got != embedded {
|
||||
t.Fatalf("blank injection: GetBaseVersion = %q, want embedded %q", got, embedded)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetPortOverride(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
|
||||
Reference in New Issue
Block a user