From 4a29bcb249cebcd13f691a9db525375c08daee49 Mon Sep 17 00:00:00 2001 From: mrlee <470349233@qq.com> Date: Mon, 28 Sep 2026 14:24:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(agent):=20=E5=90=8C=E6=AD=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20transport=20URL=20=E5=B9=B6=E5=8F=91=E5=B8=83=20v1.?= =?UTF-8?q?4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 16 ++++++++++++++++ VERSION | 2 +- docs/README.md | 2 +- docs/system-upgrade.md | 8 ++++---- internal/frp/service.go | 20 +++++++++++++++----- internal/frp/store.go | 6 +++--- web/package-lock.json | 4 ++-- web/package.json | 2 +- web/src/views/ExampleView.vue | 16 ++++++++-------- 9 files changed, 51 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f5c162..cca29a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,22 @@ All notable changes to this project will be documented in this file. +## [v1.4.2] - 2026-09-28 + +### 修复 + +- **切换 HTTPS 后 Agent URL 未更新**：启用 HTTPS 直连时只更新了 transport 和证书 pin，数据库里的 `agent_url` 仍保留旧的 `http://127.0.0.1:17701`。隧道关闭后仍访问旧本地地址，导致 `connect: connection refused`。现在 transport、URL、端口和 pin 同批更新，并在切换后清理旧 AgentClient 缓存 +- **切回 SSH 隧道时同步恢复本地 URL**：恢复隧道会重新写入 `http://127.0.0.1:`，避免残留 HTTPS 地址影响后续状态读取 + +### 变更 + +- 版本号提升到 1.4.2；`web/package.json` 与 `web/package-lock.json` 同步对齐 +- `AgentVersion` 保持 0.13.0 + +### 测试 + +- `internal/frp`：transport 切换与缓存失效编译验证 + ## [v1.4.1] - 2026-09-28 ### 修复 diff --git a/VERSION b/VERSION index 347f583..9df886c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.1 +1.4.2 diff --git a/docs/README.md b/docs/README.md index 9319ee9..66af479 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,7 +1,7 @@ # Fonu 文档索引 > 维护约定：新增方案 / 审查文档时在下方登记；方案落地后在「状态」列标注实施结果，并给已被推翻的描述加时效说明。 -> 最近更新：2026-09-28（v1.4.1） +> 最近更新：2026-09-28（v1.4.2） ## 方案与设计（本目录） diff --git a/docs/system-upgrade.md b/docs/system-upgrade.md index 3a8bb20..1537f67 100644 --- a/docs/system-upgrade.md +++ b/docs/system-upgrade.md @@ -238,16 +238,16 @@ FONU_VERSION=<旧版本> docker compose up -d --no-deps --force-recreate fonu ## 10. 在线升级验证 -示例页面用于验证升级结果。v1.4.1 的验证流程： +示例页面用于验证升级结果。v1.4.2 的验证流程： 1. 确认当前线上实例为 v1.3.0，且 `fonu-updater` sidecar 已运行。 -2. 确认远端 `main` 分支的 `VERSION` 为 `1.4.1`。 +2. 确认远端 `main` 分支的 `VERSION` 为 `1.4.2`。 3. 在侧栏看到「一键升级」后点击并确认。 4. 等待升级弹窗显示成功，页面自动刷新。 5. 打开侧栏「示例页面」，确认： - 页面路由为 `/example`； - - 页面显示的版本为 `1.4.1`； - - 页面显示验证标识 `v1.4.1-example-page`； + - 页面显示的版本为 `1.4.2`； + - 页面显示验证标识 `v1.4.2-example-page`； - 页面显示独立的「本次升级验证」区块； - 「升级验证」显示为「通过」。 diff --git a/internal/frp/service.go b/internal/frp/service.go index 064f8da..bc95350 100644 --- a/internal/frp/service.go +++ b/internal/frp/service.go @@ -780,11 +780,12 @@ func (s *Service) AgentInstall(ctx context.Context, serverID int64) (Server, err } s.tunnels[serverID] = tunnel s.tunnelMu.Unlock() - if err := s.store.SetAgentTransport(ctx, serverID, "tunnel", localPort, "", "127.0.0.1:7700", "connected", ""); err != nil { + if err := s.store.SetAgentTransport(ctx, serverID, baseURL, "tunnel", localPort, "", "127.0.0.1:7700", "connected", ""); err != nil { tunnel.Stop() _ = (AgentInstaller{SSH: installer}).RestorePreviousConfig(ctx) return Server{}, err } + s.invalidateAgentClient(serverID) return updated, nil } @@ -861,10 +862,12 @@ func (s *Service) ensureAgentTunnel(ctx context.Context, serverID int64) (*agent } s.tunnels[serverID] = tunnel s.tunnelMu.Unlock() - if err := s.store.SetAgentTransport(ctx, serverID, "tunnel", localPort, server.AgentTLSPin, "127.0.0.1:7700", "connected", ""); err != nil { + baseURL := fmt.Sprintf("http://127.0.0.1:%d", localPort) + if err := s.store.SetAgentTransport(ctx, serverID, baseURL, "tunnel", localPort, "", "127.0.0.1:7700", "connected", ""); err != nil { tunnel.Stop() return nil, err } + s.invalidateAgentClient(serverID) return tunnel, nil } @@ -926,7 +929,7 @@ func (s *Service) RestartAgentTunnel(ctx context.Context, serverID int64) (Serve } s.stopAgentTunnel(serverID) if _, err := s.ensureAgentTunnel(ctx, serverID); err != nil { - _ = s.store.SetAgentTransport(ctx, serverID, "tunnel", current.AgentLocalPort, current.AgentTLSPin, current.AgentListenAddr, "failed", err.Error()) + _ = s.store.SetAgentTransport(ctx, serverID, current.AgentURL, "tunnel", current.AgentLocalPort, current.AgentTLSPin, current.AgentListenAddr, "failed", err.Error()) return Server{}, err } server, err := s.store.GetServer(ctx, serverID) @@ -984,9 +987,10 @@ func (s *Service) EnableAgentHTTPS(ctx context.Context, serverID int64, port int _ = currentClient.DisableHTTPS(ctx) return Server{}, fmt.Errorf("HTTPS 直连验证失败: %w", err) } - if err := s.store.SetAgentTransport(ctx, serverID, "https-pin", server.AgentLocalPort, cert.Pin, fmt.Sprintf("0.0.0.0:%d", port), "connected", ""); err != nil { + if err := s.store.SetAgentTransport(ctx, serverID, baseURL, "https-pin", server.AgentLocalPort, cert.Pin, fmt.Sprintf("0.0.0.0:%d", port), "connected", ""); err != nil { return Server{}, err } + s.invalidateAgentClient(serverID) s.stopAgentTunnel(serverID) updated, err := s.store.GetServer(ctx, serverID) if err != nil { @@ -1029,7 +1033,7 @@ func (s *Service) AgentUninstall(ctx context.Context, serverID int64, keepData b output, err := AgentInstaller{SSH: installer}.Uninstall(ctx, keepData) if err == nil { s.stopAgentTunnel(serverID) - _ = s.store.SetAgentTransport(ctx, serverID, "tunnel", 0, "", "", "stopped", "") + _ = s.store.SetAgentTransport(ctx, serverID, "", "tunnel", 0, "", "", "stopped", "") } return output, err } @@ -1585,6 +1589,12 @@ type cachedAgentClient struct { client *AgentClient } +func (s *Service) invalidateAgentClient(serverID int64) { + s.agentMu.Lock() + delete(s.agentClients, serverID) + s.agentMu.Unlock() +} + func (s *Service) agentClient(ctx context.Context, serverID int64) (*AgentClient, bool) { server, err := s.store.GetServer(ctx, serverID) if err != nil || !server.MgmtEnabled || !server.AgentConfigured { diff --git a/internal/frp/store.go b/internal/frp/store.go index 63982d8..045b799 100644 --- a/internal/frp/store.go +++ b/internal/frp/store.go @@ -279,14 +279,14 @@ func (s *Store) AgentToken(ctx context.Context, id int64) (string, error) { return token, err } -func (s *Store) SetAgentTransport(ctx context.Context, id int64, transport string, localPort int, tlsPin, listenAddr, state, lastError string) error { +func (s *Store) SetAgentTransport(ctx context.Context, id int64, agentURL, transport string, localPort int, tlsPin, listenAddr, state, lastError string) error { result, err := s.db.ExecContext(ctx, ` UPDATE frp_servers - SET agent_transport = ?, agent_local_port = ?, agent_tls_pin = ?, + SET agent_url = ?, agent_transport = ?, agent_local_port = ?, agent_tls_pin = ?, agent_listen_addr = ?, agent_transport_state = ?, agent_transport_error = ?, updated_at = datetime('now') WHERE id = ? - `, transport, localPort, tlsPin, listenAddr, state, lastError, id) + `, agentURL, transport, localPort, tlsPin, listenAddr, state, lastError, id) if err != nil { return err } diff --git a/web/package-lock.json b/web/package-lock.json index bab7de2..ae1e75b 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "fonu-web", - "version": "1.4.1", + "version": "1.4.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "fonu-web", - "version": "1.4.1", + "version": "1.4.2", "dependencies": { "@codemirror/commands": "^6.11.1", "@codemirror/lang-javascript": "^6.2.5", diff --git a/web/package.json b/web/package.json index 02e783d..c82f4db 100644 --- a/web/package.json +++ b/web/package.json @@ -1,7 +1,7 @@ { "name": "fonu-web", "private": true, - "version": "1.4.1", + "version": "1.4.2", "packageManager": "npm@10.9.4", "type": "module", "scripts": { diff --git a/web/src/views/ExampleView.vue b/web/src/views/ExampleView.vue index aab2950..b86a824 100644 --- a/web/src/views/ExampleView.vue +++ b/web/src/views/ExampleView.vue @@ -8,7 +8,7 @@ - + 当前页面由 v{{ version }} 提供，验证标识为 {{ verificationMarker }}。 如果你是在升级后首次看到这行内容，说明前端构建、镜像重建和服务重启均已成功。 @@ -19,7 +19,7 @@ {{ verificationRound }}
- 看到这个新区块，说明前端资源已经从旧版本切换到 v1.4.1。 + 看到这个新区块，说明前端资源已经从旧版本切换到 v1.4.2。
@@ -33,16 +33,16 @@ - +
    -
  • 页面版本提示更新为 v1.4.1。
    • -
  • 「本次升级验证」区块和页面状态同步更新为 v1.4.1。
    • -
  • 验证标识更新为 v1.4.1-example-page。
    • +
  • 页面版本提示更新为 v1.4.2。
    • +
  • 「本次升级验证」区块和页面状态同步更新为 v1.4.2。
    • +
  • 验证标识更新为 v1.4.2-example-page。
 @@ -87,8 +87,8 @@ const message = useMessage() const version = ref(__APP_VERSION__) const checkedAt = ref('') const refreshing = ref(false) -const verificationRound = 'v1.4.1' -const verificationMarker = 'v1.4.1-example-page' +const verificationRound = 'v1.4.2' +const verificationMarker = 'v1.4.2-example-page' async function refreshVersion() { refreshing.value = true