Improved hidden service handling and event management

.github/workflows/codeql-analysis.yml

@@ -54,7 +54,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,7 +65,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -79,4 +79,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/dotnet.yml

@@ -24,7 +24,7 @@ jobs:
           - os: ${{ !contains(github.event.head_commit.message, 'windows') && !github.event.pull_request && 'windows-latest' }}
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 20
+    timeout-minutes: 30
 
     steps:
     - name: Checkout source
@@ -38,6 +38,8 @@ jobs:
         dotnet-version: | 
           8.0.x
           9.0.x
+        cache: true
+        cache-dependency-path: '**/*.csproj'
 
     - name: Install libmsquic (Linux)
       if: runner.os == 'Linux'
@@ -53,7 +55,18 @@ jobs:
       run: dotnet build --no-restore
 
     - name: Test
-      run: dotnet test --no-build --verbosity normal --logger "trx;LogFileName=test-results.trx"
+      run: dotnet test --no-build --verbosity normal --logger "trx;LogFileName=test-results.trx" --blame-hang-timeout 180s --blame-hang-dump-type mini
+
+    - name: Upload test artifacts
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-results-${{ matrix.os }}
+        path: |
+          **/TestResults/**/*.trx
+          **/TestResults/**/*.dmp
+        retention-days: 3
+        if-no-files-found: warn
 
     - name: Update Pantry badge
       if: always() && github.event_name == 'push'

CoreRemoting.Tests/CoreRemoting.Tests.csproj

@@ -11,8 +11,6 @@
     <!-- WatsonTcp is the default channel, WebSocketSharp is optional, BinaryFormatter is .net8 only, Quic is .net9 only -->
     <ItemGroup>
         <Compile Remove="BinarySerializationTests.cs" />
-        <Compile Remove="InvokerTests.cs" />
-        <Compile Remove="InvokerTestsSafe.cs" />
         <Compile Remove="RpcTests_Quic.cs" />
         <Compile Remove="RpcTests_WatsonTcp.cs" />
         <Compile Remove="RpcTests_WebsocketSharp.cs" />
@@ -24,6 +22,7 @@
     <!-- .NET 8.0 only: include BinaryFormatter and a small bunch of other tests -->
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
         <Compile Remove="*.cs" />
+        <Compile Remove="RemoteDelegates/EventDispatcherTests*.cs" />
         <Compile Include="BinarySerializationTests.cs" />
         <Compile Include="SourceGeneratorTests.cs" />
     </ItemGroup>
@@ -79,6 +78,9 @@
       <Compile Update="DicTests_*.cs">
         <DependentUpon>DicTests.cs</DependentUpon>
       </Compile>
+      <Compile Update="EventDispatcherTests_*.cs">
+        <DependentUpon>EventDispatcherTests.cs</DependentUpon>
+      </Compile>
       <Compile Update="RpcTests_*.cs">
         <DependentUpon>RpcTests.cs</DependentUpon>
       </Compile>

CoreRemoting.Tests/InvokerTests.cs → CoreRemoting.Tests/DelegateInvokerTests.cs

@@ -15,14 +15,14 @@
 namespace CoreRemoting.Tests;
 
 [Collection("CoreRemoting")]
-public class InvokerTests : IClassFixture<ServerFixture>, IDisposable
+public class DelegateInvokerTests : IClassFixture<ServerFixture>, IDisposable
 {
     private readonly ServerFixture _serverFixture;
     private readonly ITestOutputHelper _testOutputHelper;
 
-    public InvokerTests(ServerFixture serverFixture, ITestOutputHelper testOutputHelper)
+    public DelegateInvokerTests(ServerFixture serverFixture, ITestOutputHelper testOutputHelper)
     {
-        EventStub.DelegateInvoker = DelegateInvoker;
+        ServiceEventHub.DelegateInvoker = DelegateInvoker;
 
         _serverFixture = serverFixture;
         _testOutputHelper = testOutputHelper;
@@ -102,6 +102,6 @@ public async Task Event_order_depends_on_the_delegate_invoker()
     public void Dispose()
     {
         // reset the invoker to default
-        EventStub.DelegateInvoker = null;
+        ServiceEventHub.DelegateInvoker = null;
     }
 }

CoreRemoting.Tests/InvokerTestsSafe.cs → CoreRemoting.Tests/DelegateInvokerTestsSafe.cs

@@ -1,12 +1,11 @@
 using CoreRemoting.RemoteDelegates;
-using CoreRemoting.Threading;
 using Xunit.Abstractions;
 
 namespace CoreRemoting.Tests;
 
-public class InvokerTestsSafe : InvokerTests
+public class DelegateInvokerTestsSafe : DelegateInvokerTests
 {
-    public InvokerTestsSafe(ServerFixture serverFixture, ITestOutputHelper testOutputHelper) : base(serverFixture, testOutputHelper)
+    public DelegateInvokerTestsSafe(ServerFixture serverFixture, ITestOutputHelper testOutputHelper) : base(serverFixture, testOutputHelper)
     {
     }
 

CoreRemoting.Tests/DicTests.cs

@@ -198,4 +198,52 @@ void RegisterFactory()
         Console.WriteLine($"Registration threads: {t.Keys.Count}");
         Assert.True(t.Count > 1);
     }
+
+    [Fact]
+    public void Container_resolves_itself()
+    {
+        var c = Container;
+
+        var resolved = c.GetService<IDependencyInjectionContainer>();
+        Assert.NotNull(resolved);
+        Assert.Same(c, resolved);
+    }
+
+    [Fact]
+    public void Container_can_be_injected_into_service()
+    {
+        var c = Container;
+        c.RegisterService<IServiceWithContainer, ServiceWithContainer>(ServiceLifetime.SingleCall);
+
+        var svc = c.GetService<IServiceWithContainer>();
+        Assert.NotNull(svc);
+        Assert.Same(c, svc.Container);
+    }
+
+    [Fact]
+    public void Injected_container_exposes_service_registrations()
+    {
+        var c = Container;
+        c.RegisterService<ITestService, TestService>(ServiceLifetime.Singleton);
+        c.RegisterService<IServiceWithContainer, ServiceWithContainer>(ServiceLifetime.SingleCall);
+
+        Assert.True(c.IsRegistered<ITestService>());
+        Assert.True(c.IsRegistered<IServiceWithContainer>());
+
+        var svc = c.GetService<IServiceWithContainer>();
+        Assert.NotNull(svc);
+        Assert.Same(c, svc.Container);
+
+        // verify that injected container can resolve other service registration
+        Assert.True(svc.Container.IsRegistered<ITestService>());
+
+        var registration = svc.Container.GetServiceRegistration(typeof(ITestService).FullName);
+        Assert.NotNull(registration);
+
+        var ifaceType = svc.Container.GetServiceInterfaceType(typeof(ITestService).FullName);
+        Assert.Equal(typeof(ITestService), ifaceType);
+
+        var all = svc.Container.GetServiceRegistrations().ToList();
+        Assert.Contains(all, r => r.ServiceName == typeof(ITestService).FullName);
+    }
 }

CoreRemoting.Tests/Encryption/HkdfTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Text;
+using CoreRemoting.Encryption;
 using Xunit;
 
 namespace CoreRemoting.Tests.Encryption;