diff --git a/desktop/App.xaml.cs b/desktop/App.xaml.cs index 6d39fb5..352a509 100644 --- a/desktop/App.xaml.cs +++ b/desktop/App.xaml.cs @@ -137,7 +137,7 @@ public partial class App : Application _wsServer.Log += AppLog.Write; // 选路网关:局域网里有设备管理服务就统一交给它(共用 NVR 会话池),没有才本机直连 - _gateway = new StreamGateway(() => _settings.SubjectId); + _gateway = new StreamGateway(() => _settings.SubjectId, () => _settings.ServerBaseUrl); // 网页查件页的「下载录像」走这里:任何装了本机软件的电脑都能下,存到自己设置的目录 _server.PlaybackDownload = new PlaybackDownloadService( diff --git a/desktop/Services/Agent/HikWorker.cs b/desktop/Services/Agent/HikWorker.cs index 3bf248a..b557dec 100644 --- a/desktop/Services/Agent/HikWorker.cs +++ b/desktop/Services/Agent/HikWorker.cs @@ -377,12 +377,21 @@ public static class HikWorker try { - if (!TryParseQuery(received.Buffer, out var wantedSubject, out var targets)) continue; + if (!TryParseQuery(received.Buffer, out var wantedSubject, out var wantedServer, out var targets)) continue; var config = AgentFiles.LoadConfig(); if (config is null || config.SubjectId <= 0) continue; if (wantedSubject != config.SubjectId) continue; + // 主体相同还不够:主体 id 在各环境都从 1 开始,必须再比后端地址 + var ownServer = HikWorkerDiscovery.NormalizeServer(config.ServerBaseUrl); + if (ownServer.Length == 0) continue; + if (!string.Equals(wantedServer, ownServer, StringComparison.Ordinal)) + { + AppLog.Write($"[hik-worker] 询问来自别的环境({wantedServer}),本体 {ownServer},不应答"); + continue; + } + // 询问里带了 NVR:先实测本机能不能连上,连不上就不应答 // (让查询机继续走「本机直连 NVR」,而不是把活派给一条走不通的路) var reachable = new List(); @@ -408,6 +417,7 @@ public static class HikWorker type = HikWorkerDiscovery.ReplyType, sn = config.DeviceSn, subjectId = config.SubjectId, + server = ownServer, port = HikWorkerPorts.Http, reachable, version = typeof(HikWorker).Assembly.GetName().Version?.ToString() ?? "1.0.0", @@ -433,9 +443,11 @@ public static class HikWorker /// /// 解析询问报文。可选带 nvrHosts: [{host, port}] —— 带了就要先实测可达性再应答。 /// - private static bool TryParseQuery(byte[] buffer, out int subjectId, out List targets) + private static bool TryParseQuery(byte[] buffer, out int subjectId, out string server, + out List targets) { subjectId = 0; + server = string.Empty; targets = new List(); var text = Encoding.UTF8.GetString(buffer).TrimStart(); @@ -456,6 +468,12 @@ public static class HikWorker return false; } + if (subjectId <= 0) return false; + + // 不带 server 的询问也不答:光靠 subjectId 分不清是哪个环境的库 + server = HikWorkerDiscovery.NormalizeServer(GetString(root, "server")); + if (server.Length == 0) return false; + if (root.TryGetProperty("nvrHosts", out var hostsElement) && hostsElement.ValueKind == JsonValueKind.Array) { foreach (var item in hostsElement.EnumerateArray()) @@ -473,7 +491,7 @@ public static class HikWorker } } - return subjectId > 0; + return true; } catch { diff --git a/desktop/Services/Agent/HikWorkerProtocol.cs b/desktop/Services/Agent/HikWorkerProtocol.cs index ad15773..910b82f 100644 --- a/desktop/Services/Agent/HikWorkerProtocol.cs +++ b/desktop/Services/Agent/HikWorkerProtocol.cs @@ -150,5 +150,23 @@ public static class HikWorkerDiscovery { public const string QueryType = "edge.query"; public const string ReplyType = "edge.reply"; + + /// + /// 规范化后端地址,只保留「协议 + 主机 + 端口」用于比对。 + /// + /// 主体 id 在各个环境的库里都可能从 1 开始,光比 subjectId 挡不住跨环境串台 + /// (开发库和生产库的「测试仓库」都是 1),所以询问和应答都必须带上后端地址。 + /// + public static string NormalizeServer(string? raw) + { + if (string.IsNullOrWhiteSpace(raw)) return string.Empty; + + var text = raw.Trim(); + if (!text.Contains("://", StringComparison.Ordinal)) text = "http://" + text; + + return Uri.TryCreate(text, UriKind.Absolute, out var uri) + ? uri.Scheme.ToLowerInvariant() + "://" + uri.Host.ToLowerInvariant() + (uri.IsDefaultPort ? "" : ":" + uri.Port) + : string.Empty; + } } diff --git a/desktop/Services/Edge/EdgeDiscoveryClient.cs b/desktop/Services/Edge/EdgeDiscoveryClient.cs index dd5e8e8..87cddc2 100644 --- a/desktop/Services/Edge/EdgeDiscoveryClient.cs +++ b/desktop/Services/Edge/EdgeDiscoveryClient.cs @@ -48,18 +48,26 @@ public static class EdgeDiscoveryClient /// 找一台能处理这些 NVR 的取流服务。 /// /// 当前主体(对端只回同主体的询问) + /// 当前后端地址(对端只回同环境的询问) /// 要问的 NVR(host/port);传空表示只问「有没有服务」 - /// 多台应答时取第一台(同一 LAN 通常只有一台) - public static async Task FindAsync(int subjectId, + /// 多台应答时优先本机、再按 SN 取第一台 + public static async Task FindAsync(int subjectId, string? server, IReadOnlyList<(string Host, int Port)>? nvrs, CancellationToken ct = default) { if (subjectId <= 0) return null; + var ownServer = HikWorkerDiscovery.NormalizeServer(server); + if (ownServer.Length == 0) + { + AppLog.Write("[edge] 本机后端地址未知,跳过局域网询问"); + return null; + } + using var udp = new UdpClient(AddressFamily.InterNetwork); udp.EnableBroadcast = true; - var payload = BuildQuery(subjectId, nvrs); + var payload = BuildQuery(subjectId, ownServer, nvrs); var bytes = Encoding.UTF8.GetBytes(payload); foreach (var target in DeviceScanner.BroadcastTargets()) @@ -98,7 +106,7 @@ public static class EdgeDiscoveryClient break; } - var peer = TryParseReply(received.Buffer, received.RemoteEndPoint.Address, subjectId); + var peer = TryParseReply(received.Buffer, received.RemoteEndPoint.Address, subjectId, ownServer); if (peer is null) continue; // 带了 NVR 询问时,对端必须确认能连通其中至少一台(它已经自己筛过,这里再兜一层) @@ -109,7 +117,30 @@ public static class EdgeDiscoveryClient if (peers.Count == 0) return null; - return peers.OrderBy(item => item.Sn, StringComparer.Ordinal).First(); + // 同一台机器会因为我们发了「广播 + 各网段定向广播」而回多次,先按 (SN, 主机) 去重 + return peers + .GroupBy(item => item.Sn + "|" + item.Host, StringComparer.Ordinal) + .Select(group => group.First()) + // 多台都能服务时优先本机(自己就在这台机器上,省一次跨机转发) + .OrderByDescending(item => IsLocalAddress(item.Host)) + .ThenBy(item => item.Sn, StringComparer.Ordinal) + .First(); + } + + private static bool IsLocalAddress(string host) + { + if (IPAddress.TryParse(host, out var address) && IPAddress.IsLoopback(address)) return true; + + try + { + return System.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces() + .SelectMany(item => item.GetIPProperties().UnicastAddresses) + .Any(item => item.Address.Equals(address ?? IPAddress.None)); + } + catch + { + return false; + } } private static bool HasAnyReachable(EdgePeer peer, IReadOnlyList<(string Host, int Port)> nvrs) @@ -120,7 +151,7 @@ public static class EdgeDiscoveryClient return nvrs.Any(item => set.Contains(item.Host)); } - private static string BuildQuery(int subjectId, IReadOnlyList<(string Host, int Port)>? nvrs) + private static string BuildQuery(int subjectId, string server, IReadOnlyList<(string Host, int Port)>? nvrs) { if (nvrs is not { Count: > 0 }) { @@ -128,6 +159,7 @@ public static class EdgeDiscoveryClient { type = HikWorkerDiscovery.QueryType, subjectId, + server, }, HikWorkerJson.Options); } @@ -135,11 +167,12 @@ public static class EdgeDiscoveryClient { type = HikWorkerDiscovery.QueryType, subjectId, + server, nvrHosts = nvrs.Select(item => new { host = item.Host, port = item.Port }).ToArray(), }, HikWorkerJson.Options); } - private static EdgePeer? TryParseReply(byte[] buffer, IPAddress from, int expectedSubject) + private static EdgePeer? TryParseReply(byte[] buffer, IPAddress from, int expectedSubject, string expectedServer) { try { @@ -162,6 +195,12 @@ public static class EdgeDiscoveryClient return null; } + // 还要同环境:主体 id 在各环境都从 1 开始,光比主体会把别环境的机器招进来 + if (!string.Equals(GetString(root, "server"), expectedServer, StringComparison.Ordinal)) + { + return null; + } + var port = root.TryGetProperty("port", out var portElement) && portElement.TryGetInt32(out var p) ? p : HikWorkerPorts.Http; diff --git a/desktop/Services/Edge/StreamGateway.cs b/desktop/Services/Edge/StreamGateway.cs index 3087c33..5ed445a 100644 --- a/desktop/Services/Edge/StreamGateway.cs +++ b/desktop/Services/Edge/StreamGateway.cs @@ -21,6 +21,7 @@ public sealed class StreamGateway private static readonly TimeSpan CacheTtl = TimeSpan.FromSeconds(15); private readonly Func _subjectId; + private readonly Func _server; private readonly SemaphoreSlim _gate = new(1, 1); private string _cacheKey = ""; @@ -28,9 +29,11 @@ public sealed class StreamGateway private DateTime _cachedAt = DateTime.MinValue; /// 当前主体(探测只认同主体应答) - public StreamGateway(Func subjectIdProvider) + /// 当前后端地址(探测只认同环境应答) + public StreamGateway(Func subjectIdProvider, Func serverProvider) { _subjectId = subjectIdProvider; + _server = serverProvider; } /// 找一台能服务这些 NVR 的设备管理服务;没有返回 null(调用方走本机) @@ -48,7 +51,7 @@ public sealed class StreamGateway { if (TryGetCached(key, out cached)) return cached; - var peer = await EdgeDiscoveryClient.FindAsync(subjectId, nvrs, ct).ConfigureAwait(false); + var peer = await EdgeDiscoveryClient.FindAsync(subjectId, _server(), nvrs, ct).ConfigureAwait(false); if (peer is not null) { AppLog.Write($"[edge] 走设备管理服务 {peer.Display}" diff --git a/desktop/YuncangTrace.LocalService.csproj b/desktop/YuncangTrace.LocalService.csproj index 6ce2a4d..5ecd8c6 100644 --- a/desktop/YuncangTrace.LocalService.csproj +++ b/desktop/YuncangTrace.LocalService.csproj @@ -42,7 +42,7 @@ http://127.0.0.1:7300 https://packs.example.com - 1.0.75 + 1.0.105 云仓视频溯源软件 云仓 云仓视频溯源软件(本机服务)