Use file-scoped namespaces in Jellyfin.Networking

src/Jellyfin.Networking/Udp/SocketFactory.cs

@@ -3,37 +3,36 @@ using System.Net;
 using System.Net.Sockets;
 using MediaBrowser.Model.Net;
 
-namespace Jellyfin.Networking.Udp
+namespace Jellyfin.Networking.Udp;
+
+/// <summary>
+/// Factory class to create different kinds of sockets.
+/// </summary>
+public class SocketFactory : ISocketFactory
 {
-    /// <summary>
-    /// Factory class to create different kinds of sockets.
-    /// </summary>
-    public class SocketFactory : ISocketFactory
+    /// <inheritdoc />
+    public Socket CreateUdpBroadcastSocket(int localPort)
     {
-        /// <inheritdoc />
-        public Socket CreateUdpBroadcastSocket(int localPort)
+        if (localPort < 0)
         {
-            if (localPort < 0)
-            {
-                throw new ArgumentException("localPort cannot be less than zero.", nameof(localPort));
-            }
+            throw new ArgumentException("localPort cannot be less than zero.", nameof(localPort));
+        }
 
-            var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-            try
-            {
-                socket.EnableBroadcast = true;
-                socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-                socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, 1);
-                socket.Bind(new IPEndPoint(IPAddress.Any, localPort));
+        var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+        try
+        {
+            socket.EnableBroadcast = true;
+            socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+            socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, 1);
+            socket.Bind(new IPEndPoint(IPAddress.Any, localPort));
 
-                return socket;
-            }
-            catch
-            {
-                socket.Dispose();
+            return socket;
+        }
+        catch
+        {
+            socket.Dispose();
 
-                throw;
-            }
+            throw;
         }
     }
 }

src/Jellyfin.Networking/Udp/UdpServer.cs

@@ -11,127 +11,126 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using static MediaBrowser.Controller.Extensions.ConfigurationExtensions;
 
-namespace Jellyfin.Networking.Udp
+namespace Jellyfin.Networking.Udp;
+
+/// <summary>
+/// Provides a Udp Server.
+/// </summary>
+public sealed class UdpServer : IDisposable
 {
     /// <summary>
-    /// Provides a Udp Server.
+    /// The _logger.
     /// </summary>
-    public sealed class UdpServer : IDisposable
+    private readonly ILogger _logger;
+    private readonly IServerApplicationHost _appHost;
+    private readonly IConfiguration _config;
+
+    private readonly byte[] _receiveBuffer = new byte[8192];
+
+    private readonly Socket _udpSocket;
+    private readonly IPEndPoint _endpoint;
+    private bool _disposed;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UdpServer" /> class.
+    /// </summary>
+    /// <param name="logger">The logger.</param>
+    /// <param name="appHost">The application host.</param>
+    /// <param name="configuration">The configuration manager.</param>
+    /// <param name="bindAddress"> The bind address.</param>
+    /// <param name="port">The port.</param>
+    public UdpServer(
+        ILogger logger,
+        IServerApplicationHost appHost,
+        IConfiguration configuration,
+        IPAddress bindAddress,
+        int port)
     {
-        /// <summary>
-        /// The _logger.
-        /// </summary>
-        private readonly ILogger _logger;
-        private readonly IServerApplicationHost _appHost;
-        private readonly IConfiguration _config;
+        _logger = logger;
+        _appHost = appHost;
+        _config = configuration;
 
-        private readonly byte[] _receiveBuffer = new byte[8192];
+        _endpoint = new IPEndPoint(bindAddress, port);
 
-        private readonly Socket _udpSocket;
-        private readonly IPEndPoint _endpoint;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UdpServer" /> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="appHost">The application host.</param>
-        /// <param name="configuration">The configuration manager.</param>
-        /// <param name="bindAddress"> The bind address.</param>
-        /// <param name="port">The port.</param>
-        public UdpServer(
-            ILogger logger,
-            IServerApplicationHost appHost,
-            IConfiguration configuration,
-            IPAddress bindAddress,
-            int port)
+        _udpSocket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
         {
-            _logger = logger;
-            _appHost = appHost;
-            _config = configuration;
+            MulticastLoopback = false,
+        };
+        _udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+    }
 
-            _endpoint = new IPEndPoint(bindAddress, port);
-
-            _udpSocket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
-            {
-                MulticastLoopback = false,
-            };
-            _udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+    private async Task RespondToV2Message(EndPoint endpoint, CancellationToken cancellationToken)
+    {
+        string? localUrl = _config[AddressOverrideKey];
+        if (string.IsNullOrEmpty(localUrl))
+        {
+            localUrl = _appHost.GetSmartApiUrl(((IPEndPoint)endpoint).Address);
         }
 
-        private async Task RespondToV2Message(EndPoint endpoint, CancellationToken cancellationToken)
+        if (string.IsNullOrEmpty(localUrl))
         {
-            string? localUrl = _config[AddressOverrideKey];
-            if (string.IsNullOrEmpty(localUrl))
-            {
-                localUrl = _appHost.GetSmartApiUrl(((IPEndPoint)endpoint).Address);
-            }
+            _logger.LogWarning("Unable to respond to server discovery request because the local ip address could not be determined.");
+            return;
+        }
 
-            if (string.IsNullOrEmpty(localUrl))
-            {
-                _logger.LogWarning("Unable to respond to server discovery request because the local ip address could not be determined.");
-                return;
-            }
+        var response = new ServerDiscoveryInfo(localUrl, _appHost.SystemId, _appHost.FriendlyName);
 
-            var response = new ServerDiscoveryInfo(localUrl, _appHost.SystemId, _appHost.FriendlyName);
+        try
+        {
+            _logger.LogDebug("Sending AutoDiscovery response");
+            await _udpSocket.SendToAsync(JsonSerializer.SerializeToUtf8Bytes(response), SocketFlags.None, endpoint, cancellationToken).ConfigureAwait(false);
+        }
+        catch (SocketException ex)
+        {
+            _logger.LogError(ex, "Error sending response message");
+        }
+    }
 
+    /// <summary>
+    /// Starts the specified port.
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
+    public void Start(CancellationToken cancellationToken)
+    {
+        _udpSocket.Bind(_endpoint);
+
+        _ = Task.Run(async () => await BeginReceiveAsync(cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task BeginReceiveAsync(CancellationToken cancellationToken)
+    {
+        while (!cancellationToken.IsCancellationRequested)
+        {
             try
             {
-                _logger.LogDebug("Sending AutoDiscovery response");
-                await _udpSocket.SendToAsync(JsonSerializer.SerializeToUtf8Bytes(response), SocketFlags.None, endpoint, cancellationToken).ConfigureAwait(false);
+                var endpoint = (EndPoint)new IPEndPoint(IPAddress.Any, 0);
+                var result = await _udpSocket.ReceiveFromAsync(_receiveBuffer, endpoint, cancellationToken).ConfigureAwait(false);
+                var text = Encoding.UTF8.GetString(_receiveBuffer, 0, result.ReceivedBytes);
+                if (text.Contains("who is JellyfinServer?", StringComparison.OrdinalIgnoreCase))
+                {
+                    await RespondToV2Message(result.RemoteEndPoint, cancellationToken).ConfigureAwait(false);
+                }
             }
             catch (SocketException ex)
             {
-                _logger.LogError(ex, "Error sending response message");
+                _logger.LogError(ex, "Failed to receive data from socket");
             }
-        }
-
-        /// <summary>
-        /// Starts the specified port.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public void Start(CancellationToken cancellationToken)
-        {
-            _udpSocket.Bind(_endpoint);
-
-            _ = Task.Run(async () => await BeginReceiveAsync(cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-        }
-
-        private async Task BeginReceiveAsync(CancellationToken cancellationToken)
-        {
-            while (!cancellationToken.IsCancellationRequested)
+            catch (OperationCanceledException)
             {
-                try
-                {
-                    var endpoint = (EndPoint)new IPEndPoint(IPAddress.Any, 0);
-                    var result = await _udpSocket.ReceiveFromAsync(_receiveBuffer, endpoint, cancellationToken).ConfigureAwait(false);
-                    var text = Encoding.UTF8.GetString(_receiveBuffer, 0, result.ReceivedBytes);
-                    if (text.Contains("who is JellyfinServer?", StringComparison.OrdinalIgnoreCase))
-                    {
-                        await RespondToV2Message(result.RemoteEndPoint, cancellationToken).ConfigureAwait(false);
-                    }
-                }
-                catch (SocketException ex)
-                {
-                    _logger.LogError(ex, "Failed to receive data from socket");
-                }
-                catch (OperationCanceledException)
-                {
-                    _logger.LogDebug("Broadcast socket operation cancelled");
-                }
+                _logger.LogDebug("Broadcast socket operation cancelled");
             }
         }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _udpSocket.Dispose();
-            _disposed = true;
-        }
+    }
+
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _udpSocket.Dispose();
+        _disposed = true;
     }
 }