Merge branch 'main' into KV-Add-Sources-And-Mirrors

nats-io · Sep 27, 2024 · 225dfb6 · 225dfb6
2 parents 1b590c1 + 4a30725
commit 225dfb6
Show file tree

Hide file tree

Showing 76 changed files with 1,560 additions and 821 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,10 +20,10 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.x'
 

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.x'
 

diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
@@ -41,10 +41,10 @@ jobs:
           nats-server -v
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.x'
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - id: tag
         name: Determine tag

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,8 +7,8 @@ on:
     - main
 
 jobs:
-  dotnet:
-    name: dotnet
+  linux_test:
+    name: Linux
     strategy:
       fail-fast: false
       matrix:
@@ -35,36 +35,77 @@ jobs:
         run: nats-server -v
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.x'
 
       - name: Build
-        run: dotnet build -c Debug
+        run: dotnet build -c Release
 
       - name: Test Core
-        run: dotnet test -c Debug --no-build --logger:"console;verbosity=normal" tests/NATS.Client.Core.Tests/NATS.Client.Core.Tests.csproj
+        run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+          cd tests/NATS.Client.Core.Tests
+          dotnet test -c Release --no-build --logger:"console;verbosity=normal"
+
+      - name: Test Core2
+        run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+          cd tests/NATS.Client.Core2.Tests
+          dotnet test -c Release --no-build
+
+      - name: Test CoreUnit
+        run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+          cd tests/NATS.Client.CoreUnit.Tests
+          dotnet test -c Release --no-build
 
       - name: Test JetStream
-        run: dotnet test -c Debug --no-build --logger:"console;verbosity=normal" tests/NATS.Client.JetStream.Tests/NATS.Client.JetStream.Tests.csproj
+        run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+          cd tests/NATS.Client.JetStream.Tests
+          dotnet test -c Release --no-build
 
-      - name: Test Key/Value Store
-        run: dotnet test -c Debug --no-build --logger:"console;verbosity=normal" tests/NATS.Client.KeyValueStore.Tests/NATS.Client.KeyValueStore.Tests.csproj
+      - name: Test KeyValueStore
+        run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+          cd tests/NATS.Client.KeyValueStore.Tests
+          dotnet test -c Release --no-build
 
       - name: Test Object Store
-        run: dotnet test -c Debug --no-build --logger:"console;verbosity=normal" tests/NATS.Client.ObjectStore.Tests/NATS.Client.ObjectStore.Tests.csproj
+        run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+          cd tests/NATS.Client.ObjectStore.Tests
+          dotnet test -c Release --no-build
 
       - name: Test Services
-        run: dotnet test -c Debug --no-build --logger:"console;verbosity=normal" tests/NATS.Client.Services.Tests/NATS.Client.Services.Tests.csproj
+        run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+          cd tests/NATS.Client.Services.Tests
+          dotnet test -c Release --no-build
 
       - name: Test OpenTelemetry
-        run: dotnet test -c Debug --no-build --logger:"console;verbosity=normal" tests/NATS.Net.OpenTelemetry.Tests/NATS.Net.OpenTelemetry.Tests.csproj
+        run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+          cd tests/NATS.Net.OpenTelemetry.Tests
+          dotnet test -c Release --no-build
 
       - name: Check Native AOT
         run: |
+          killall nats-server 2> /dev/null | echo -n
+          nats-server -v
+
           cd tests/NATS.Client.CheckNativeAot
           rm -rf bin obj
           dotnet publish -r linux-x64 -c Release -o dist | tee output.txt
@@ -84,8 +125,8 @@ jobs:
 
           ./NATS.Client.CheckNativeAot
 
-  memory_test:
-    name: memory test
+  windows_test:
+    name: Windows
     strategy:
       fail-fast: false
       matrix:
@@ -98,14 +139,15 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
       NUGET_XMLDOC_MODE: skip
+      MSYS_NO_PATHCONV: 1
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.x'
 
@@ -114,11 +156,7 @@ jobs:
         run: |
           mkdir tools-nats-server && cd tools-nats-server
           branch=$(curl https://api.mtmk.dev/gh/v1/releases/tag/nats-io/nats-server/${{ matrix.config.branch }})
-          for i in 1 2 3
-          do
-            curl -sf https://binaries.nats.dev/nats-io/nats-server/v2@$branch | PREFIX=. sh && break || sleep 30
-          done
-          mv nats-server nats-server.exe
+          curl -sL -o nats-server.exe "https://binaries.nats.dev/binary/github.com/nats-io/nats-server/v2?os=windows&arch=amd64&version=$branch"
           cygpath -w "$(pwd)" | tee -a "$GITHUB_PATH"
 
       - name: Check nats-server
@@ -133,11 +171,39 @@ jobs:
           dotnet tool install --global NUnit.ConsoleRunner.NetCore
 
       - name: Build
-        run:  dotnet build -c Release
+        run: dotnet build -c Release
 
       - name: Memory Test (net6.0)
-        run: dotMemoryUnit $env:userprofile\.dotnet\tools\nunit.exe --propagate-exit-code -- .\tests\NATS.Client.Core.MemoryTests\bin\Release\net6.0\NATS.Client.Core.MemoryTests.dll
+        run: |
+          tasklist | grep -i nats-server && taskkill -F -IM nats-server.exe
+          nats-server.exe -v
+          dotMemoryUnit $env:userprofile\.dotnet\tools\nunit.exe --propagate-exit-code -- .\tests\NATS.Client.Core.MemoryTests\bin\Release\net6.0\NATS.Client.Core.MemoryTests.dll
 
-      - name: Platform Test (Windows net481)
-        run: dotnet test -c Release --no-build --logger:"console;verbosity=normal" -f net481 .\tests\NATS.Client.Platform.Windows.Tests\NATS.Client.Platform.Windows.Tests.csproj
+      - name: Platform Test
+        run: |
+          tasklist | grep -i nats-server && taskkill -F -IM nats-server.exe
+          nats-server.exe -v
+          cd tests\NATS.Client.Platform.Windows.Tests
+          dotnet test -c Release --no-build
+
+      # Not working on Windows reliably yet
+      #- name: Test Core
+      #  run: |
+      #      tasklist | grep -i nats-server && taskkill -F -IM nats-server.exe
+      #      nats-server.exe -v
+      #      cd tests/NATS.Client.Core.Tests
+      #      dotnet test -c Release --no-build
+
+      - name: Test Core2
+        run: |
+          tasklist | grep -i nats-server && taskkill -F -IM nats-server.exe
+          nats-server.exe -v
+          cd tests/NATS.Client.Core2.Tests
+          dotnet test -c Release --no-build
 
+      - name: Test CoreUnit
+        run: |
+          tasklist | grep -i nats-server && taskkill -F -IM nats-server.exe
+          nats-server.exe -v
+          cd tests/NATS.Client.CoreUnit.Tests
+          dotnet test -c Release --no-build
diff --git a/NATS.Client.sln b/NATS.Client.sln
@@ -17,12 +17,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NATS.Client.Core.Tests", "t
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroBenchmark", "sandbox\MicroBenchmark\MicroBenchmark.csproj", "{A10F0D89-13F3-49B3-ACF7-66E45DC95225}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{899BE3EA-C5CA-4394-9B62-C45CBFF3AF4E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".", ".", "{899BE3EA-C5CA-4394-9B62-C45CBFF3AF4E}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		.github\workflows\build-debug.yml = .github\workflows\build-debug.yml
-		.github\workflows\build-release.yml = .github\workflows\build-release.yml
 		Directory.Build.props = Directory.Build.props
+		README.md = README.md
+		version.txt = version.txt
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		CODE-OF-CONDUCT.md = CODE-OF-CONDUCT.md
+		CONTRIBUTING.md = CONTRIBUTING.md
+		dependencies.md = dependencies.md
+		global.json = global.json
+		Icon.png = Icon.png
+		LICENSE = LICENSE
+		REPO_RENAME.md = REPO_RENAME.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NATS.Client.Hosting", "src\NATS.Client.Hosting\NATS.Client.Hosting.csproj", "{D3F09B30-1ED5-48C2-81CD-A2AD88E751AC}"
@@ -115,6 +124,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Client.Simplified.Test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Client.Simplified", "src\NATS.Client.Simplified\NATS.Client.Simplified.csproj", "{227C88B1-0510-4010-B142-C44725578FCD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Client.Core2.Tests", "tests\NATS.Client.Core2.Tests\NATS.Client.Core2.Tests.csproj", "{8A676AAA-FEE3-4C18-870A-66E59AD9069F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Client.CoreUnit.Tests", "tests\NATS.Client.CoreUnit.Tests\NATS.Client.CoreUnit.Tests.csproj", "{9521D9E0-642A-4C7E-BD10-372DF235CF62}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{B9EF0111-6720-46DF-B11A-8F8C88C3F5C1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{0B7F1286-4426-45DE-82C2-FE7CF13CA0DA}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\docs.yml = .github\workflows\docs.yml
+		.github\workflows\format.yml = .github\workflows\format.yml
+		.github\workflows\perf.yml = .github\workflows\perf.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
+		.github\workflows\test.yml = .github\workflows\test.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -309,6 +333,14 @@ Global
 		{227C88B1-0510-4010-B142-C44725578FCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{227C88B1-0510-4010-B142-C44725578FCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{227C88B1-0510-4010-B142-C44725578FCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A676AAA-FEE3-4C18-870A-66E59AD9069F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A676AAA-FEE3-4C18-870A-66E59AD9069F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A676AAA-FEE3-4C18-870A-66E59AD9069F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A676AAA-FEE3-4C18-870A-66E59AD9069F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9521D9E0-642A-4C7E-BD10-372DF235CF62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9521D9E0-642A-4C7E-BD10-372DF235CF62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9521D9E0-642A-4C7E-BD10-372DF235CF62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9521D9E0-642A-4C7E-BD10-372DF235CF62}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -362,6 +394,10 @@ Global
 		{A15CCDD5-B707-4142-B99A-64F0AB62318A} = {95A69671-16CA-4133-981C-CC381B7AAA30}
 		{6DAAAA87-8DDF-4E60-81CE-D8900327DE33} = {C526E8AB-739A-48D7-8FC4-048978C9B650}
 		{227C88B1-0510-4010-B142-C44725578FCD} = {4827B3EC-73D8-436D-AE2A-5E29AC95FD0C}
+		{8A676AAA-FEE3-4C18-870A-66E59AD9069F} = {C526E8AB-739A-48D7-8FC4-048978C9B650}
+		{9521D9E0-642A-4C7E-BD10-372DF235CF62} = {C526E8AB-739A-48D7-8FC4-048978C9B650}
+		{B9EF0111-6720-46DF-B11A-8F8C88C3F5C1} = {899BE3EA-C5CA-4394-9B62-C45CBFF3AF4E}
+		{0B7F1286-4426-45DE-82C2-FE7CF13CA0DA} = {B9EF0111-6720-46DF-B11A-8F8C88C3F5C1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8CBB7278-D093-448E-B3DE-B5991209A1AA}

diff --git a/sandbox/BlazorWasm/Client/BlazorWasm.Client.csproj b/sandbox/BlazorWasm/Client/BlazorWasm.Client.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.33" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.33" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sandbox/BlazorWasm/Server/BlazorWasm.Server.csproj b/sandbox/BlazorWasm/Server/BlazorWasm.Server.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.33" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sandbox/Example.Client/Program.cs b/sandbox/Example.Client/Program.cs
@@ -1,6 +1,7 @@
 // See https://aka.ms/new-console-template for more information
 
 using System.Text;
+using NATS.Client.JetStream;
 using NATS.Net;
 
 CancellationTokenSource cts = new();
@@ -88,7 +89,12 @@
 }
 
 // Use JetStream by referencing NATS.Client.JetStream package
-// var js = client.GetJetStream();
+var js = client.CreateJetStreamContext();
+await foreach (var stream in js.ListStreamsAsync())
+{
+    Console.WriteLine($"JetStream Stream: {stream.Info.Config.Name}");
+}
+
 await cts.CancelAsync();
 
 await Task.WhenAll(tasks);

diff --git a/sandbox/MicroBenchmark/MicroBenchmark.csproj b/sandbox/MicroBenchmark/MicroBenchmark.csproj
@@ -14,6 +14,7 @@
         <PackageReference Include="StackExchange.Redis" Version="2.5.43" />
         <PackageReference Include="ZLogger" Version="1.6.1" />
         <PackageReference Include="NATS.Client" Version="0.14.5" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     </ItemGroup>
 
     <ItemGroup>