Merge branch 'master' into transparent-bundle-conversion

LucHeart · web-flow · commit b85cbc39566e · 2025-06-09T18:28:23.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+version: 2
+updates:
+  # Weekly checks for nuget package updates
+  - package-ecosystem: 'nuget'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+      day: 'monday'
+      time: '06:00'
+    groups:
+      npm-dependencies:
+        patterns:
+          - '*' # Group all updates together
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -0,0 +1,51 @@
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - master
+      - develop
+    types: [opened, reopened, synchronize]
+  workflow_call:
+  workflow_dispatch:
+
+name: ci-build
+
+env:
+  DOTNET_VERSION: 8.0.x
+  REGISTRY: ghcr.io
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET SDK ${{ env.DOTNET_VERSION }}
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
+
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+
+      - name: Test
+        run: dotnet test --no-restore --verbosity normal
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Package
+          path: |
+            ./CoreOSC/bin/Release/*.nupkg
+            ./CoreOSC/bin/Release/*.snupkg
+            
+          retention-days: 7
+          if-no-files-found: error
diff --git a/CoreOSC.RecieverExample/CoreOSC.RecieverExample.csproj b/CoreOSC.RecieverExample/CoreOSC.RecieverExample.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>LucHeart.CoreOSC.RecieverExample</AssemblyName>
     <RootNamespace>LucHeart.CoreOSC.RecieverExample</RootNamespace>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <Company>LucHeart</Company>
diff --git a/CoreOSC.Tests/CoreOSC.Tests.csproj b/CoreOSC.Tests/CoreOSC.Tests.csproj
@@ -5,20 +5,20 @@
     <GenerateProgramFile>false</GenerateProgramFile>
     <AssemblyName>LucHeart.CoreOSC.Tests</AssemblyName>
     <RootNamespace>LucHeart.CoreOSC.Tests</RootNamespace>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <Nullable>enable</Nullable>
     <Company>LucHeart</Company>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/CoreOSC.Tests/ListenerTest.cs b/CoreOSC.Tests/ListenerTest.cs
@@ -1,6 +1,7 @@
 ﻿using System.Net.Sockets;
 using System.Threading.Tasks;
 using Xunit;
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
 
 namespace LucHeart.CoreOSC.Tests;
 
@@ -11,7 +12,7 @@ public class ListenerTest
     /// Opening the second listener will fail unless the first one has been properly closed.
     /// </summary>
     [Fact(Timeout = 5000)]
-    public void CloseListener()
+    public async Task CloseListener()
     {
         var endpoint = TestUtils.GetNextEndpoint();
         using (new OscListener(endpoint))
@@ -25,7 +26,7 @@ public void CloseListener()
     /// Tries to open two listeners on the same port, results in an exception
     /// </summary>
     [Fact(Timeout = 5000)]
-    public void CloseListenerException()
+    public async Task CloseListenerException()
     {
         var endpoint = TestUtils.GetNextEndpoint();
         Assert.Throws<SocketException>(() =>
diff --git a/CoreOSC.Tests/TimetagTest.cs b/CoreOSC.Tests/TimetagTest.cs
@@ -8,12 +8,14 @@ public class TimetagTest
     [Fact]
     public void TestTimetag()
     {
-        var time = (ulong) 60 * 60 * 24 * 365 * 108;
-        time <<= 32;
-        time += (ulong)(Math.Pow(2, 32) / 2);
-        var date = Utils.TimeTagToDateTime(time);
+        ulong tag = 0;
 
-        Assert.Equal(DateTime.Parse("2007-12-06 00:00:00.500"), date);
+        tag |= (ulong)3424309443 << 32; // https://www.timeanddate.com/date/durationresult.html?d1=1&m1=1&y1=1900&d2=6&m2=7&y2=2008&h1=0&i1=0&s1=0&h2=5&i2=4&s2=3
+        tag |= (ulong)(0xFFFFFFFF / 10); // 100ms
+
+        var date = Utils.TimeTagToDateTime(tag);
+
+        Assert.Equal(DateTime.Parse("2008-7-06 05:04:03.100"), date);
     }
 
     [Fact]
@@ -29,5 +31,6 @@ public void TestDateTimeToTimetag()
         Assert.Equal(dt.Minute, dtBack.Minute);
         Assert.Equal(dt.Second, dtBack.Second);
         Assert.Equal(dt.Millisecond, dtBack.Millisecond);
+        Assert.Equal(dt.Microsecond, dtBack.Microsecond);
     }
 }
diff --git a/CoreOSC/CoreOSC.csproj b/CoreOSC/CoreOSC.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <AssemblyName>LucHeart.CoreOSC</AssemblyName>
         <RootNamespace>LucHeart.CoreOSC</RootNamespace>
-        <TargetFrameworks>net7.0;netstandard2.1</TargetFrameworks>
-        <LangVersion>11</LangVersion>
+        <TargetFrameworks>net7.0;netstandard2.1;net8.0</TargetFrameworks>
+        <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageId>LucHeart.CoreOSC</PackageId>
@@ -13,17 +13,19 @@
         <RepositoryUrl>https://github.com/LucHeart/CoreOSC-UTF8-ASYNC</RepositoryUrl>
         <PackageTags>osc async</PackageTags>
         <Company>LucHeart</Company>
-        <AssemblyVersion>1.2.1.0</AssemblyVersion>
-        <FileVersion>1.2.1.0</FileVersion>
+        <AssemblyVersion>1.4.0.0</AssemblyVersion>
+        <FileVersion>1.4.0.0</FileVersion>
         <NeutralLanguage>en</NeutralLanguage>
-        <Version>1.2.1</Version>
+        <Version>1.4.0</Version>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryType>git</RepositoryType>
         <PackageReadmeFile>README.md</PackageReadmeFile>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\README.md" Pack="true" PackagePath="\"/>
+        <None Include="..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
 
 
diff --git a/CoreOSC/IOscListener.cs b/CoreOSC/IOscListener.cs
@@ -1,9 +1,15 @@
-﻿using System.Threading.Tasks;
+﻿using System.Net;
+using System.Threading.Tasks;
 
 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();
+}
diff --git a/CoreOSC/IOscSender.cs b/CoreOSC/IOscSender.cs
@@ -1,9 +1,15 @@
-﻿using System.Threading.Tasks;
+﻿using System.Net;
+using System.Threading.Tasks;
 
 namespace LucHeart.CoreOSC;
 
 public interface IOscSender
 {
     public Task SendAsync(byte[] message);
+
     public Task SendAsync(IOscPacket packet);
+
+    public Task SendAsync(IPEndPoint endPoint, byte[] message);
+
+    public Task SendAsync(IPEndPoint endPoint, IOscPacket packet);
 }
diff --git a/CoreOSC/OscDuplex.cs b/CoreOSC/OscDuplex.cs
@@ -11,8 +11,12 @@ public OscDuplex(IPEndPoint listenerEndpoint, IPEndPoint remoteEndpoint) : base(
     {
         _remoteEndPoint = remoteEndpoint;
     }
-    
+
     public Task SendAsync(byte[] message) => UdpClient.SendAsync(message, message.Length, _remoteEndPoint);
+
     public Task SendAsync(IOscPacket packet) => SendAsync(packet.GetBytes());
-    
+
+    public Task SendAsync(IPEndPoint endPoint, byte[] message) => UdpClient.SendAsync(message, message.Length, endPoint);
+
+    public Task SendAsync(IPEndPoint endPoint, IOscPacket packet) => SendAsync(endPoint, packet.GetBytes());
 }
diff --git a/CoreOSC/OscListener.cs b/CoreOSC/OscListener.cs
@@ -17,6 +17,29 @@ public OscListener(IPEndPoint listenerEndPoint)
     {
         UdpClient = new UdpClient(listenerEndPoint);
         MessageQueue = new Queue<OscMessage>();
+        
+        // Set the SIO_UDP_CONNRESET ioctl to true for this UDP socket. If this UDP socket
+        // ever sends a UDP packet to a remote destination that exists but there is
+        // no socket to receive the packet, an ICMP port unreachable message is returned
+        // to the sender. By default, when this is received the next operation on the
+        // UDP socket that send the packet will receive a SocketException. The native
+        // (Winsock) error that is received is WSAECONNRESET (10054). Since we don't want
+        // to wrap each UDP socket operation in a try/except, we'll disable this error
+        // for the socket with this ioctl call.
+        try
+        {
+            uint IOC_IN = 0x80000000;
+            uint IOC_VENDOR = 0x18000000;
+            uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12;
+
+            byte[] optionInValue = { Convert.ToByte(false) };
+            byte[] optionOutValue = new byte[4];
+            UdpClient.Client.IOControl((int)SIO_UDP_CONNRESET, optionInValue, optionOutValue);
+        }
+        catch
+        {
+            // Unable to set SIO_UDP_CONNRESET, maybe not supported
+        }
     }
 
     public async Task<OscMessage> ReceiveMessageAsync()
@@ -44,12 +67,24 @@ public async Task<OscMessage> ReceiveMessageAsync()
         }
     }
 
+    public async Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync()
+    {
+        var receiveResult = await UdpClient.ReceiveAsync();
+        return (OscMessage.ParseMessage(receiveResult.Buffer), receiveResult.RemoteEndPoint);
+    }
+
     public async Task<OscBundle> ReceiveBundleAsync()
     {
         var receiveResult = await UdpClient.ReceiveAsync();
         return OscBundle.ParseBundle(receiveResult.Buffer);
     }
 
+    public async Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync()
+    {
+        var receiveResult = await UdpClient.ReceiveAsync();
+        return (OscBundle.ParseBundle(receiveResult.Buffer), receiveResult.RemoteEndPoint);
+    }
+
     public void Dispose()
     {
         UdpClient.Dispose();
diff --git a/CoreOSC/OscSender.cs b/CoreOSC/OscSender.cs
@@ -20,7 +20,11 @@ public OscSender(IPEndPoint remoteIpEndPoint)
     public Task SendAsync(byte[] message) => _sock.SendToAsync(message, SocketFlags.None, _remoteIpEndPoint);
 
     public Task SendAsync(IOscPacket packet) => SendAsync(packet.GetBytes());
-    
+
+    public Task SendAsync(IPEndPoint endPoint, byte[] message) => _sock.SendToAsync(message, SocketFlags.None, endPoint);
+
+    public Task SendAsync(IPEndPoint endPoint, IOscPacket packet) => SendAsync(endPoint, packet.GetBytes());
+
     public void Dispose()
     {
         _sock.Dispose();
diff --git a/CoreOSC/TimeTag.cs b/CoreOSC/TimeTag.cs
@@ -4,22 +4,38 @@ namespace LucHeart.CoreOSC;
 
 public struct TimeTag
 {
+    public static TimeTag Immediate => new(1);
+
     public ulong Tag;
 
+    /// <summary>
+    /// Gets or sets the timestamp from a DateTime. DateTime has an accuracy down to 100 nanoseconds (100'000
+    /// picoseconds)
+    /// </summary>
     public DateTime Timestamp
     {
         get => Utils.TimeTagToDateTime(Tag);
         set => Tag = Utils.DateTimeToTimeTag(value);
     }
 
+    /// <summary>
+    /// Gets or sets the total seconds in the timestamp. the double precision number is multiplied by 2^32
+    /// giving an accuracy down to about 230 picoseconds ( 1/(2^32) of a second)
+    /// </summary>
+    public double Seconds
+    {
+        get => Utils.TimeTagToSeconds(Tag);
+        set => Tag = Utils.SecondsToTimeTag(value);
+    }
+
     /// <summary>
     /// Gets or sets the fraction of a second in the timestamp. the double precision number is multiplied by 2^32
     /// giving an accuracy down to about 230 picoseconds ( 1/(2^32) of a second)
     /// </summary>
     public double Fraction
     {
         get => Utils.TimeTagToFraction(Tag);
-        set => Tag = (Tag & 0xFFFFFFFF00000000) + (uint)(value * 0xFFFFFFFF);
+        set => Tag = Utils.SecondsToTimeTag(value);
     }
 
     public TimeTag(ulong value)
diff --git a/CoreOSC/Utils.cs b/CoreOSC/Utils.cs
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,14 @@ public class TimetagTest`
`8`	`8`	`[Fact]`
`9`	`9`	`public void TestTimetag()`
`10`	`10`	`{`
`11`		`- var time = (ulong) 60 * 60 * 24 * 365 * 108;`
`12`		`- time <<= 32;`
`13`		`- time += (ulong)(Math.Pow(2, 32) / 2);`
`14`		`- var date = Utils.TimeTagToDateTime(time);`
	`11`	`+ ulong tag = 0;`
`15`	`12`
`16`		`- Assert.Equal(DateTime.Parse("2007-12-06 00:00:00.500"), date);`
	`13`	`+ tag \|= (ulong)3424309443 << 32; // https://www.timeanddate.com/date/durationresult.html?d1=1&m1=1&y1=1900&d2=6&m2=7&y2=2008&h1=0&i1=0&s1=0&h2=5&i2=4&s2=3`
	`14`	`+ tag \|= (ulong)(0xFFFFFFFF / 10); // 100ms`
	`15`	`+`
	`16`	`+ var date = Utils.TimeTagToDateTime(tag);`
	`17`	`+`
	`18`	`+ Assert.Equal(DateTime.Parse("2008-7-06 05:04:03.100"), date);`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`[Fact]`
`@@ -29,5 +31,6 @@ public void TestDateTimeToTimetag()`
`29`	`31`	`Assert.Equal(dt.Minute, dtBack.Minute);`
`30`	`32`	`Assert.Equal(dt.Second, dtBack.Second);`
`31`	`33`	`Assert.Equal(dt.Millisecond, dtBack.Millisecond);`
	`34`	`+ Assert.Equal(dt.Microsecond, dtBack.Microsecond);`
`32`	`35`	`}`
`33`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,12 @@ public OscDuplex(IPEndPoint listenerEndpoint, IPEndPoint remoteEndpoint) : base(`
`11`	`11`	`{`
`12`	`12`	`_remoteEndPoint = remoteEndpoint;`
`13`	`13`	`}`
`14`		`-`
	`14`	`+`
`15`	`15`	`public Task SendAsync(byte[] message) => UdpClient.SendAsync(message, message.Length, _remoteEndPoint);`
	`16`	`+`
`16`	`17`	`public Task SendAsync(IOscPacket packet) => SendAsync(packet.GetBytes());`
`17`		`-`
	`18`	`+`
	`19`	`+ public Task SendAsync(IPEndPoint endPoint, byte[] message) => UdpClient.SendAsync(message, message.Length, endPoint);`
	`20`	`+`
	`21`	`+ public Task SendAsync(IPEndPoint endPoint, IOscPacket packet) => SendAsync(endPoint, packet.GetBytes());`
`18`	`22`	`}`