Refactor session message handling

lib/ShortDev.Microsoft.ConnectedDevices.NearShare/Apps/NearShareApp.cs

@@ -67,7 +67,7 @@ void HandleStartTransfer(CdpMessage msg, ValueSet payload)
                     }
                     _fileTransferToken = new()
                     {
-                        DeviceName = Channel.Session.DeviceName,
+                        DeviceName = Channel.Session.DeviceInfo?.Name ?? "UNKNOWM",
                         TotalBytes = bytesToSend,
                         Files = files
                     };
@@ -88,7 +88,7 @@ void HandleStartTransfer(CdpMessage msg, ValueSet payload)
 
                     NearShareReceiver.OnReceivedUri(new()
                     {
-                        DeviceName = Channel.Session.DeviceName,
+                        DeviceName = Channel.Session.DeviceInfo?.Name ?? "UNKNOWM",
                         Uri = uri
                     });
 

lib/ShortDev.Microsoft.ConnectedDevices.NearShare/NearShareSender.cs

@@ -25,7 +25,7 @@ async Task<SenderStateMachine> PrepareTransferInternalAsync(EndpointInfo endpoin
         // var cv = handshakeResultMsg.Header.TryGetCorrelationVector() ?? throw new InvalidDataException("No Correlation Vector");
 
         SenderStateMachine senderStateMachine = new(Platform);
-        var channel = await session.StartClientChannelAsync(operationId.ToString("D").ToUpper(), NearShareApp.Name, senderStateMachine, handShakeChannel.Socket, cancellationToken);
+        var channel = await session.StartClientChannelAsync(operationId.ToString("D").ToUpper(), NearShareApp.Name, senderStateMachine, cancellationToken);
         return senderStateMachine;
     }
 

lib/ShortDev.Microsoft.ConnectedDevices/CdpChannel.cs

@@ -1,6 +1,7 @@
 using ShortDev.Microsoft.ConnectedDevices.Messages;
 using ShortDev.Microsoft.ConnectedDevices.Messages.Control;
 using ShortDev.Microsoft.ConnectedDevices.Messages.Session;
+using ShortDev.Microsoft.ConnectedDevices.Session.Channels;
 using ShortDev.Microsoft.ConnectedDevices.Transports;
 
 namespace ShortDev.Microsoft.ConnectedDevices;
@@ -10,9 +11,12 @@
 /// </summary>
 public sealed class CdpChannel : IDisposable
 {
-    private CdpChannel(CdpSession session, ulong channelId, CdpSocket socket, CdpAppBase app)
+    readonly ChannelHandler _handler;
+    private CdpChannel(ChannelHandler handler, ulong channelId, CdpSocket socket, CdpAppBase app)
     {
-        Session = session;
+        _handler = handler;
+
+        Session = handler.Session;
         ChannelId = channelId;
         Socket = socket;
         App = app;
@@ -66,29 +70,29 @@
         Session.SendMessage(Socket, header, writer);
     }
 
     void IDisposable.Dispose()
         => Dispose();
 
     public void Dispose(bool closeSession = false, bool closeSocket = false)
     {
-        Session.UnregisterChannel(this);
+        _handler.UnregisterChannel(this);
         if (closeSocket)
             Socket.Dispose(); // ToDo: Heartbeat!
         if (closeSession)
             Session.Dispose(); // ToDo: Heartbeat!
     }
 
-    internal static CdpChannel CreateServerChannel(CdpSession session, ulong channelId, CdpSocket socket, StartChannelRequest request)
+    internal static CdpChannel CreateServerChannel(ChannelHandler handler, CdpSocket socket, StartChannelRequest request, ulong channelId)
     {
-        var app = CdpAppRegistration.InstantiateApp(request.Id, request.Name, session.Platform);
-        CdpChannel channel = new(session, channelId, socket, app);
+        var app = CdpAppRegistration.InstantiateApp(request.Id, request.Name, handler.Session.Platform);
+        CdpChannel channel = new(handler, channelId, socket, app);
         app.Initialize(channel);
         return channel;
     }
 
-    internal static CdpChannel CreateClientChannel(CdpSession session, CdpSocket socket, StartChannelResponse response, CdpAppBase app)
+    internal static CdpChannel CreateClientChannel(ChannelHandler handler, CdpSocket socket, StartChannelResponse response, CdpAppBase app)
     {
-        CdpChannel channel = new(session, response.ChannelId, socket, app);
+        CdpChannel channel = new(handler, response.ChannelId, socket, app);
         app.Initialize(channel);
         return channel;
     }

lib/ShortDev.Microsoft.ConnectedDevices/CdpLog.cs

@@ -2,32 +2,48 @@
 using ShortDev.Microsoft.ConnectedDevices.Messages.Connection;
 using ShortDev.Microsoft.ConnectedDevices.Messages.Control;
 using ShortDev.Microsoft.ConnectedDevices.Transports;
-using System;
-using System.Collections.Generic;
 
 namespace ShortDev.Microsoft.ConnectedDevices;
 
 internal static partial class CdpLog
 {
+    #region Advertising
     [LoggerMessage(EventId = 101, Level = LogLevel.Information, Message = "Advertising started")]
     public static partial void AdvertisingStarted(this ILogger logger);
 
     [LoggerMessage(EventId = 102, Level = LogLevel.Information, Message = "Advertising stopped")]
     public static partial void AdvertisingStopped(this ILogger logger);
 
+    [LoggerMessage(EventId = 106, Level = LogLevel.Information, Message = "Error while advertising")]
+    public static partial void AdvertisingError(this ILogger logger, Exception ex);
+    #endregion
 
+    #region Listening
     [LoggerMessage(EventId = 103, Level = LogLevel.Information, Message = "Listening started")]
     public static partial void ListeningStarted(this ILogger logger);
 
     [LoggerMessage(EventId = 104, Level = LogLevel.Information, Message = "Listening stopped")]
     public static partial void ListeningStopped(this ILogger logger);
 
+    [LoggerMessage(EventId = 107, Level = LogLevel.Information, Message = "Error while listening")]
+    public static partial void ListeningError(this ILogger logger, Exception ex);
+    #endregion
+
+    #region Discovery
+    [LoggerMessage(EventId = 108, Level = LogLevel.Information, Message = "Discovery started on {TransportTypes}")]
+    public static partial void DiscoveryStarted(this ILogger logger, IEnumerable<CdpTransportType> transportTypes);
+
+    [LoggerMessage(EventId = 109, Level = LogLevel.Information, Message = "Discovery stopped")]
+    public static partial void DiscoveryStopped(this ILogger logger);
+
+    [LoggerMessage(EventId = 110, Level = LogLevel.Information, Message = "Error during discovery")]
+    public static partial void DiscoveryError(this ILogger logger, Exception ex);
+    #endregion
 
     [LoggerMessage(EventId = 105, Level = LogLevel.Information, Message = "New socket from endpoint {Endpoint}")]
     public static partial void NewSocket(this ILogger logger, EndpointInfo endpoint);
 
 
-
     [LoggerMessage(EventId = 201, Level = LogLevel.Error, Message = "Exception in session {SessionId:X}")]
     public static partial void ExceptionInSession(this ILogger logger, Exception ex, ulong sessionId);