Merge pull request #39 from OpenIPC/feat/discovery-v2

feat: Discovery v2 foundation — model + source abstraction + aggregator

Author: keyldev

src/OpenIPC.Viewer.App/Services/DiscoveryDialogFactory.cs

@@ -1,26 +1,26 @@
 using Microsoft.Extensions.Logging;
 using OpenIPC.Viewer.App.ViewModels.Dialogs;
+using OpenIPC.Viewer.Core.Discovery;
 using OpenIPC.Viewer.Core.Onvif;
-using OpenIPC.Viewer.Core.Onvif.Discovery;
 
 namespace OpenIPC.Viewer.App.Services;
 
 public sealed class DiscoveryDialogFactory
 {
-    private readonly IDiscoveryService _discovery;
+    private readonly IDiscoveryAggregator _aggregator;
     private readonly OnvifProbeService _probe;
     private readonly ILoggerFactory _loggerFactory;
 
     public DiscoveryDialogFactory(
-        IDiscoveryService discovery,
+        IDiscoveryAggregator aggregator,
         OnvifProbeService probe,
         ILoggerFactory loggerFactory)
     {
-        _discovery = discovery;
+        _aggregator = aggregator;
         _probe = probe;
         _loggerFactory = loggerFactory;
     }
 
     public DiscoveryDialogViewModel Create() =>
-        new(_discovery, _probe, _loggerFactory.CreateLogger<DiscoveryDialogViewModel>());
+        new(_aggregator, _probe, _loggerFactory.CreateLogger<DiscoveryDialogViewModel>());
 }

src/OpenIPC.Viewer.App/Services/Localizer.cs

@@ -338,7 +338,7 @@ private static LangCode DetectSystem()
         ["Discovery.Header"] = "Discover ONVIF cameras",
         ["Discovery.Button.Scan"] = "Scan",
         ["Discovery.Button.AddSelected"] = "Add selected",
-        ["Discovery.Status.Initial"] = "Click Scan to find ONVIF cameras on the LAN.",
+        ["Discovery.Status.Initial"] = "Click Scan to find cameras on the LAN (ONVIF + mDNS; enable Deep scan for the rest).",
         ["Discovery.Status.Scanning"] = "Scanning…",
         ["Discovery.Status.NoResponse"] = "No cameras responded. Check multicast / firewall.",
         ["Discovery.Status.FoundFormat"] = "Found {0} camera(s).",
@@ -347,7 +347,12 @@ private static LangCode DetectSystem()
         ["Discovery.Status.ProbingFormat"] = "Probing {0}…",
         ["Discovery.Status.ProbeOkFormat"] = "OK — {0} {1}",
         ["Discovery.Status.ProbeFailedFormat"] = "Probe failed: {0}",
+        ["Discovery.Status.ManualAdd"] = "No ONVIF — review the stream URL in the editor.",
+        ["Discovery.DeepScan"] = "Deep scan (slower)",
         ["Discovery.UnknownModel"] = "(unknown model)",
+        ["Discovery.Confidence.Low"] = "low",
+        ["Discovery.Confidence.Medium"] = "medium",
+        ["Discovery.Confidence.High"] = "high",
 
         ["RawConfigEditor.Title"] = "Edit raw Majestic config",
         ["RawConfigEditor.InvalidJsonFormat"] = "Invalid JSON: {0}",
@@ -742,7 +747,7 @@ private static LangCode DetectSystem()
         ["Discovery.Header"] = "Поиск ONVIF-камер",
         ["Discovery.Button.Scan"] = "Сканировать",
         ["Discovery.Button.AddSelected"] = "Добавить выбранные",
-        ["Discovery.Status.Initial"] = "Нажмите «Сканировать», чтобы найти ONVIF-камеры в локальной сети.",
+        ["Discovery.Status.Initial"] = "Нажмите «Сканировать» для поиска камер в сети (ONVIF + mDNS; «Глубокое сканирование» — для остальных).",
         ["Discovery.Status.Scanning"] = "Сканирование…",
         ["Discovery.Status.NoResponse"] = "Камеры не ответили. Проверьте multicast / фаервол.",
         ["Discovery.Status.FoundFormat"] = "Найдено камер: {0}.",
@@ -751,7 +756,12 @@ private static LangCode DetectSystem()
         ["Discovery.Status.ProbingFormat"] = "Опрос {0}…",
         ["Discovery.Status.ProbeOkFormat"] = "OK — {0} {1}",
         ["Discovery.Status.ProbeFailedFormat"] = "Опрос не удался: {0}",
+        ["Discovery.Status.ManualAdd"] = "Без ONVIF — проверьте URL потока в редакторе.",
+        ["Discovery.DeepScan"] = "Глубокое сканирование (медленнее)",
         ["Discovery.UnknownModel"] = "(неизвестная модель)",
+        ["Discovery.Confidence.Low"] = "низкая",
+        ["Discovery.Confidence.Medium"] = "средняя",
+        ["Discovery.Confidence.High"] = "высокая",
 
         ["RawConfigEditor.Title"] = "Правка raw-конфига Majestic",
         ["RawConfigEditor.InvalidJsonFormat"] = "Невалидный JSON: {0}",

src/OpenIPC.Viewer.App/ViewModels/CameraLibraryPageViewModel.cs

@@ -324,10 +324,10 @@ private async Task DiscoverCameraAsync()
         // everything before saving (RTSP URI especially — phase-04 risks §"ONVIF
         // returns wrong RTSP URI behind NAT" applies).
         var editor = _editorFactory.CreateForNew();
-        editor.Name = found.Discovered.Model ?? found.Discovered.Name ?? found.Discovered.Host;
-        editor.Host = found.Discovered.Host;
-        editor.OnvifPortText = found.Discovered.OnvifPort.ToString(System.Globalization.CultureInfo.InvariantCulture);
-        editor.RtspMainText = found.Probe.RtspMainUri.ToString();
+        editor.Name = found.Device.Model ?? found.Device.Name ?? found.Device.Host;
+        editor.Host = found.Device.Host;
+        editor.OnvifPortText = (found.Device.OnvifServiceUri?.Port ?? 80).ToString(System.Globalization.CultureInfo.InvariantCulture);
+        editor.RtspMainText = found.RtspMainUri.ToString();
         editor.Username = found.Credentials?.Username ?? "";
         editor.Password = found.Credentials?.Password ?? "";
 
@@ -340,7 +340,9 @@ private async Task DiscoverCameraAsync()
             var id = await _directory.AddAsync(req, CancellationToken.None).ConfigureAwait(true);
             // Persist HasPtz / ProfileToken / manufacturer info from the probe so
             // SingleCameraPage knows whether to show the PTZ joystick (Phase 4c).
-            await _directory.SaveOnvifMetadataAsync(id, found.Probe, CancellationToken.None).ConfigureAwait(true);
+            // Non-ONVIF devices (sweep/mDNS) have no probe — nothing to persist.
+            if (found.Probe is { } probe)
+                await _directory.SaveOnvifMetadataAsync(id, probe, CancellationToken.None).ConfigureAwait(true);
             await LoadAsync(CancellationToken.None).ConfigureAwait(true);
         }
         catch (Exception ex)

src/OpenIPC.Viewer.App/ViewModels/Dialogs/DiscoveryDialogViewModel.cs

@@ -1,44 +1,56 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using OpenIPC.Viewer.App.Services;
+using OpenIPC.Viewer.Core.Discovery;
 using OpenIPC.Viewer.Core.Entities;
 using OpenIPC.Viewer.Core.Onvif;
-using OpenIPC.Viewer.Core.Onvif.Discovery;
 
 namespace OpenIPC.Viewer.App.ViewModels.Dialogs;
 
-// Two-step: (1) Scan multicast WS-Discovery -> list of cameras; (2) user
-// picks one, types credentials, we probe ONVIF (capabilities + profiles +
-// stream URI) to produce the full result the Library page hands to the
-// CameraEditor. Probe is here so failed creds fail fast inside the dialog
+// Two-step: (1) scan via the aggregator (ONVIF + later sweep/mDNS) -> merged
+// devices, upserted by host as signals arrive; (2) user picks one, types creds,
+// we ONVIF-probe (capabilities + profiles + stream URI) to produce the result
+// the Library hands to the CameraEditor. Probe fails fast inside the dialog
 // instead of pre-filling the editor with bad data.
 public sealed partial class DiscoveryDialogViewModel : ViewModelBase
 {
-    private readonly IDiscoveryService _discovery;
+    private readonly IDiscoveryAggregator _aggregator;
     private readonly OnvifProbeService _probe;
     private readonly ILogger<DiscoveryDialogViewModel> _logger;
 
     private CancellationTokenSource? _scanCts;
+    private readonly Dictionary<string, DiscoveredDeviceRowVm> _rowsByHost =
+        new(StringComparer.OrdinalIgnoreCase);
 
-    public ObservableCollection<DiscoveredCameraRowVm> Cameras { get; } = new();
+    public ObservableCollection<DiscoveredDeviceRowVm> Cameras { get; } = new();
 
     [ObservableProperty] private string _statusText = Localizer.Instance["Discovery.Status.Initial"];
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsRowSelected))]
     [NotifyPropertyChangedFor(nameof(CanAdd))]
-    private DiscoveredCameraRowVm? _selected;
+    private DiscoveredDeviceRowVm? _selected;
 
     public bool IsRowSelected => Selected is not null;
 
     [ObservableProperty] private string _username = "";
     [ObservableProperty] private string _password = "";
 
+    // 0..1 scan progress (mean across sources). Drives the progress bar; hidden
+    // when not scanning.
+    [ObservableProperty] private double _scanProgress;
+
+    // Opt-in active /24 sweep — finds OpenIPC cameras that answer neither ONVIF
+    // nor mDNS, at the cost of knocking on every host. Off by default.
+    [ObservableProperty] private bool _deepScan;
+
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(ScanCommand))]
     [NotifyPropertyChangedFor(nameof(CanAdd))]
@@ -52,11 +64,11 @@ public sealed partial class DiscoveryDialogViewModel : ViewModelBase
     public bool CanAdd => Selected is not null && !ScanInProgress && !AddInProgress;
 
     public DiscoveryDialogViewModel(
-        IDiscoveryService discovery,
+        IDiscoveryAggregator aggregator,
         OnvifProbeService probe,
         ILogger<DiscoveryDialogViewModel> logger)
     {
-        _discovery = discovery;
+        _aggregator = aggregator;
         _probe = probe;
         _logger = logger;
     }
@@ -65,7 +77,9 @@ public DiscoveryDialogViewModel(
     private async Task ScanAsync()
     {
         Cameras.Clear();
+        _rowsByHost.Clear();
         Selected = null;
+        ScanProgress = 0;
         StatusText = Localizer.Instance["Discovery.Status.Scanning"];
         ScanInProgress = true;
 
@@ -75,11 +89,12 @@ private async Task ScanAsync()
 
         try
         {
-            var timeout = TimeSpan.FromSeconds(6);
-            await foreach (var cam in _discovery.ScanAsync(timeout, ct).ConfigureAwait(true))
-            {
-                Cameras.Add(new DiscoveredCameraRowVm(cam));
-            }
+            var options = new DiscoveryOptions(TimeSpan.FromSeconds(6), DeepScan);
+            var progress = new Progress<double>(p => ScanProgress = p);
+
+            await foreach (var device in _aggregator.ScanAsync(options, progress, ct).ConfigureAwait(true))
+                Upsert(device);
+
             StatusText = Cameras.Count == 0
                 ? Localizer.Instance["Discovery.Status.NoResponse"]
                 : string.Format(Localizer.Instance["Discovery.Status.FoundFormat"], Cameras.Count);
@@ -96,6 +111,23 @@ private async Task ScanAsync()
         finally
         {
             ScanInProgress = false;
+            ScanProgress = 0;
+        }
+    }
+
+    // Merge-by-host upsert: a device can be yielded repeatedly as more sources
+    // confirm it, so update the existing row in place instead of duplicating.
+    private void Upsert(DiscoveredDevice device)
+    {
+        if (_rowsByHost.TryGetValue(device.Host, out var row))
+        {
+            row.Device = device;
+        }
+        else
+        {
+            row = new DiscoveredDeviceRowVm(device);
+            _rowsByHost[device.Host] = row;
+            Cameras.Add(row);
         }
     }
 
@@ -106,21 +138,31 @@ private async Task ScanAsync()
         var row = Selected;
         if (row is null) return null;
 
-        AddInProgress = true;
-        StatusText = string.Format(Localizer.Instance["Discovery.Status.ProbingFormat"], row.HostPort);
+        var creds = string.IsNullOrEmpty(Username) && string.IsNullOrEmpty(Password)
+            ? null
+            : new CameraCredentials(Username, Password);
 
+        AddInProgress = true;
         try
         {
-            var creds = string.IsNullOrEmpty(Username) && string.IsNullOrEmpty(Password)
-                ? null
-                : new CameraCredentials(Username, Password);
-            var endpoint = new OnvifEndpoint(row.Camera.DeviceServiceUri, creds);
+            // ONVIF device → probe for the real stream URI. Non-ONVIF (sweep/mDNS)
+            // → skip the probe and pre-fill a guessed RTSP URL from the open ports;
+            // the user reviews / tests it in the editor before saving.
+            var onvifUri = row.Device.OnvifServiceUri;
+            if (onvifUri is null)
+            {
+                StatusText = Localizer.Instance["Discovery.Status.ManualAdd"];
+                return new DiscoveryDialogResult(row.Device, GuessRtspUri(row.Device), null, creds);
+            }
+
+            StatusText = string.Format(Localizer.Instance["Discovery.Status.ProbingFormat"], row.HostPort);
+            var endpoint = new OnvifEndpoint(onvifUri, creds);
 
             using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
             var probeResult = await _probe.ProbeAsync(endpoint, cts.Token).ConfigureAwait(true);
 
             StatusText = string.Format(Localizer.Instance["Discovery.Status.ProbeOkFormat"], probeResult.Manufacturer ?? "?", probeResult.Model ?? "").TrimEnd();
-            return new DiscoveryDialogResult(row.Camera, probeResult, creds);
+            return new DiscoveryDialogResult(row.Device, probeResult.RtspMainUri, probeResult, creds);
         }
         catch (Exception ex)
         {
@@ -134,26 +176,73 @@ private async Task ScanAsync()
         }
     }
 
+    // OpenIPC/Majestic RTSP convention (matches CameraEditor): rtsp://host/ for
+    // the default 554, an explicit port otherwise. The user can refine it.
+    private static Uri GuessRtspUri(DiscoveredDevice device)
+    {
+        var port = device.Ports.Contains(8554) && !device.Ports.Contains(554) ? 8554 : 554;
+        return port == 554
+            ? new Uri($"rtsp://{device.Host}/")
+            : new Uri($"rtsp://{device.Host}:{port}/");
+    }
+
     public void Cancel()
     {
         _scanCts?.Cancel();
     }
 }
 
-public sealed class DiscoveredCameraRowVm
+public sealed partial class DiscoveredDeviceRowVm : ViewModelBase
 {
-    public DiscoveredCamera Camera { get; }
-    public string HostPort => Camera.OnvifPort == 80 ? Camera.Host : $"{Camera.Host}:{Camera.OnvifPort}";
-    public string DisplayName => Camera.Name ?? Camera.Model ?? Camera.Host;
-    public string Subtitle => Camera.Model ?? Localizer.Instance["Discovery.UnknownModel"];
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(DisplayName))]
+    [NotifyPropertyChangedFor(nameof(Subtitle))]
+    [NotifyPropertyChangedFor(nameof(HostPort))]
+    [NotifyPropertyChangedFor(nameof(ProtocolsText))]
+    [NotifyPropertyChangedFor(nameof(ConfidenceText))]
+    private DiscoveredDevice _device;
+
+    public DiscoveredDeviceRowVm(DiscoveredDevice device) => _device = device;
+
+    public string Host => Device.Host;
+    public string DisplayName => Device.Name ?? Device.Model ?? Device.Host;
+    public string Subtitle => Device.Model ?? Localizer.Instance["Discovery.UnknownModel"];
+
+    public string HostPort
+    {
+        get
+        {
+            var port = Device.OnvifServiceUri?.Port ?? (Device.Ports.Count > 0 ? Device.Ports.First() : 0);
+            return port is 0 or 80 ? Device.Host : $"{Device.Host}:{port}";
+        }
+    }
+
+    // e.g. "ONVIF · RTSP" — how the device was detected.
+    public string ProtocolsText => string.Join(" · ", DescribeProtocols(Device.Protocols));
+
+    public string ConfidenceText => Localizer.Instance[Device.Confidence switch
+    {
+        DiscoveryConfidence.High => "Discovery.Confidence.High",
+        DiscoveryConfidence.Medium => "Discovery.Confidence.Medium",
+        _ => "Discovery.Confidence.Low",
+    }];
 
-    public DiscoveredCameraRowVm(DiscoveredCamera camera)
+    private static IEnumerable<string> DescribeProtocols(DiscoveryProtocol p)
     {
-        Camera = camera;
+        if (p.HasFlag(DiscoveryProtocol.Onvif)) yield return "ONVIF";
+        if (p.HasFlag(DiscoveryProtocol.Mdns)) yield return "mDNS";
+        if (p.HasFlag(DiscoveryProtocol.Majestic)) yield return "Majestic";
+        if (p.HasFlag(DiscoveryProtocol.Rtsp)) yield return "RTSP";
+        if (p.HasFlag(DiscoveryProtocol.Http)) yield return "HTTP";
     }
 }
 
+// The dialog's output: the picked device, the RTSP URL to pre-fill (from the
+// ONVIF probe when available, otherwise a sensible guess for non-ONVIF devices),
+// the ONVIF probe result (null for non-ONVIF — no PTZ/profile metadata), and any
+// credentials the user typed.
 public sealed record DiscoveryDialogResult(
-    DiscoveredCamera Discovered,
-    OnvifProbeResult Probe,
+    DiscoveredDevice Device,
+    Uri RtspMainUri,
+    OnvifProbeResult? Probe,
     CameraCredentials? Credentials);