Deduplication

Author: PaciStardust

CoreOSC/IOscListener.cs

@@ -6,21 +6,11 @@ namespace LucHeart.CoreOSC;
 
 public interface IOscListener
 {
-    public Task<OscMessage> ReceiveMessageAsync();
-
-    public Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync();
-
-    public Task<OscBundle> ReceiveBundleAsync();
-
-    public Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync();
-
-#if !NETSTANDARD
     public Task<OscMessage> ReceiveMessageAsync(CancellationToken ct);
 
     public Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync(CancellationToken ct);
 
     public Task<OscBundle> ReceiveBundleAsync(CancellationToken ct);
 
     public Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync(CancellationToken ct);
-#endif
 }

CoreOSC/OscListener.cs

@@ -43,39 +43,18 @@ public OscListener(IPEndPoint listenerEndPoint)
         }
     }
 
-    public async Task<OscMessage> ReceiveMessageAsync()
+    public async Task<OscMessage> ReceiveMessageAsync(CancellationToken ct = default)
     {
         if (EnableTransparentBundleToMessageConversion)
         {
             if (MessageQueue.Count > 0)
                 return MessageQueue.Dequeue();
 
-            var receiveResult = await UdpClient.ReceiveAsync();
-
-            if (!OscBundle.IsBundle(receiveResult.Buffer))
-                return OscMessage.ParseMessage(receiveResult.Buffer);
-            
-            var bundle = OscBundle.ParseBundle(receiveResult.Buffer);
-            foreach (var bundleMessage in bundle.Messages)
-                MessageQueue.Enqueue(bundleMessage);
-            
-            return MessageQueue.Dequeue();
-        }
-        else
-        {
-            var receiveResult = await UdpClient.ReceiveAsync();
-            return OscMessage.ParseMessage(receiveResult.Buffer);
-        }
-    }
 #if !NETSTANDARD
-    public async Task<OscMessage> ReceiveMessageAsync(CancellationToken ct)
-    {
-        if (EnableTransparentBundleToMessageConversion)
-        {
-            if (MessageQueue.Count > 0)
-                return MessageQueue.Dequeue();
-            
             var receiveResult = await UdpClient.ReceiveAsync(ct);
+#else
+            var receiveResult = await UdpClient.ReceiveAsync();
+#endif
 
             if (!OscBundle.IsBundle(receiveResult.Buffer))
                 return OscMessage.ParseMessage(receiveResult.Buffer);
@@ -88,51 +67,44 @@ public async Task<OscMessage> ReceiveMessageAsync(CancellationToken ct)
         }
         else
         {
+#if !NETSTANDARD
             var receiveResult = await UdpClient.ReceiveAsync(ct);
+#else
+            var receiveResult = await UdpClient.ReceiveAsync();
+#endif
             return OscMessage.ParseMessage(receiveResult.Buffer);
         }
     }
-#endif
 
-    public async Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync()
+    public async Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync(CancellationToken ct = default)
     {
-        var receiveResult = await UdpClient.ReceiveAsync();
-        return (OscMessage.ParseMessage(receiveResult.Buffer), receiveResult.RemoteEndPoint);
-    }
 #if !NETSTANDARD
-    public async Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync(CancellationToken ct)
-    {
         var receiveResult = await UdpClient.ReceiveAsync(ct);
+#else
+        var receiveResult = await UdpClient.ReceiveAsync();
+#endif
         return (OscMessage.ParseMessage(receiveResult.Buffer), receiveResult.RemoteEndPoint);
     }
-#endif
 
-    public async Task<OscBundle> ReceiveBundleAsync()
+    public async Task<OscBundle> ReceiveBundleAsync(CancellationToken ct = default)
     {
-        var receiveResult = await UdpClient.ReceiveAsync();
-        return OscBundle.ParseBundle(receiveResult.Buffer);
-    }
 #if !NETSTANDARD
-    public async Task<OscBundle> ReceiveBundleAsync(CancellationToken ct)
-    {
         var receiveResult = await UdpClient.ReceiveAsync(ct);
+#else
+        var receiveResult = await UdpClient.ReceiveAsync();
+#endif
         return OscBundle.ParseBundle(receiveResult.Buffer);
     }
-#endif
 
-    public async Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync()
+    public async Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync(CancellationToken ct = default)
     {
-        var receiveResult = await UdpClient.ReceiveAsync();
-        return (OscBundle.ParseBundle(receiveResult.Buffer), receiveResult.RemoteEndPoint);
-    }
 #if !NETSTANDARD
-    public async Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync(CancellationToken ct)
-    {
         var receiveResult = await UdpClient.ReceiveAsync(ct);
+#else
+        var receiveResult = await UdpClient.ReceiveAsync();
+#endif
         return (OscBundle.ParseBundle(receiveResult.Buffer), receiveResult.RemoteEndPoint);
     }
-#endif
-
     public void Dispose()
     {
         UdpClient.Dispose();