more link events

Void.slnx

@@ -0,0 +1,14 @@
+<Solution>
+  <Project Path="src\Void.NBT\Void.NBT.csproj" />
+  <Project Path="src\Void.Proxy-before\Void.Proxy-before.csproj" />
+  <Project Path="src\Void.Proxy.API\Void.Proxy.API.csproj" />
+  <Project Path="src\Void.Proxy.Plugins.ExamplePlugin\Void.Proxy.Plugins.ExamplePlugin.csproj" />
+  <Project Path="src\Void.Proxy.Plugins.ModsSupport.Forge\Void.Proxy.Plugins.ModsSupport.Forge.csproj" />
+  <Project Path="src\Void.Proxy.Plugins.ProtocolSupport.Java.v1_13_to_1_20_1\Void.Proxy.Plugins.ProtocolSupport.Java.v1_13_to_1_20_1.csproj" />
+  <Project Path="src\Void.Proxy.Plugins.ProtocolSupport.Java.v1_20_2_to_latest\Void.Proxy.Plugins.ProtocolSupport.Java.v1_20_2_to_latest.csproj" />
+  <Project Path="src\Void.Proxy.Plugins.ProtocolSupport.Java.v1_7_2_to_1_12_2\Void.Proxy.Plugins.ProtocolSupport.Java.v1_7_2_to_1_12_2.csproj" />
+  <Project Path="src\Void.Proxy\Void.Proxy.csproj" />
+  <Properties Name="Visual Studio">
+    <Property Name="OpenWith" Value="17" />
+  </Properties>
+</Solution>

src/Void.Proxy-before/Void.Proxy-before.csproj

@@ -23,9 +23,9 @@
 		<PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
 		<PackageReference Include="NET.Minecraft.Component" Version="1.0.5" />
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-		<PackageReference Include="Serilog" Version="3.1.2-dev-02097" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.1-dev-10370" />
-		<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
 		<PackageReference Include="Zlib.Portable.Signed" Version="1.11.0" />
 	</ItemGroup>
 

src/Void.Proxy.API/Events/Links/StartLinkEvent.cs → src/Void.Proxy.API/Events/Links/LinkStartedEvent.cs

@@ -2,7 +2,7 @@
 
 namespace Void.Proxy.API.Events.Links;
 
-public class StartLinkEvent : IEvent
+public class LinkStartedEvent : IEvent
 {
     public required ILink Link { get; init; }
 }

src/Void.Proxy.API/Events/Links/LinkStartingEvent.cs

@@ -0,0 +1,8 @@
+using Void.Proxy.API.Links;
+
+namespace Void.Proxy.API.Events.Links;
+
+public class LinkStartingEvent : IEvent
+{
+    public required ILink Link { get; init; }
+}

src/Void.Proxy.API/Events/Links/StopLinkEvent.cs → src/Void.Proxy.API/Events/Links/LinkStoppedEvent.cs

@@ -2,7 +2,7 @@
 
 namespace Void.Proxy.API.Events.Links;
 
-public class StopLinkEvent : IEvent
+public class LinkStoppedEvent : IEvent
 {
     public required ILink Link { get; init; }
 }

src/Void.Proxy.API/Events/Links/LinkStoppingEvent.cs

@@ -0,0 +1,8 @@
+using Void.Proxy.API.Links;
+
+namespace Void.Proxy.API.Events.Links;
+
+public class LinkStoppingEvent : IEvent
+{
+    public required ILink Link { get; init; }
+}

src/Void.Proxy.API/Links/ILink.cs

@@ -1,10 +1,11 @@
-using Void.Proxy.API.Network.IO.Channels;
+using Void.Proxy.API.Events;
+using Void.Proxy.API.Network.IO.Channels;
 using Void.Proxy.API.Players;
 using Void.Proxy.API.Servers;
 
 namespace Void.Proxy.API.Links;
 
-public interface ILink : IAsyncDisposable
+public interface ILink : IEventListener, IAsyncDisposable
 {
     public IPlayer Player { get; }
     public IServer Server { get; }

src/Void.Proxy.API/Void.Proxy.API.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.6.24327.7" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0-preview.6.24327.7" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageReference Include="Serilog" Version="4.0.1-dev-02205" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
   </ItemGroup>
 
 </Project>

src/Void.Proxy/Links/Link.cs

@@ -1,5 +1,4 @@
 using Nito.AsyncEx;
-using Void.Proxy.API.Events;
 using Void.Proxy.API.Events.Links;
 using Void.Proxy.API.Events.Services;
 using Void.Proxy.API.Links;
@@ -139,7 +138,7 @@ protected async Task ExecuteAsync(IMinecraftChannel sourceChannel, IMinecraftCha
             await PlayerChannel.FlushAsync();
             await ServerChannel.FlushAsync();
 
-            _ = _events.ThrowAsync(new StopLinkEvent { Link = this }, forceCancellationToken);
+            _ = _events.ThrowAsync(new LinkStoppingEvent { Link = this }, forceCancellationToken);
         }
     }
 }

src/Void.Proxy/Links/LinkService.cs

@@ -33,23 +33,27 @@ public async ValueTask ConnectPlayerAnywhereAsync(IPlayer player)
         var serverChannel = await player.BuildServerChannelAsync(server);
 
         var link = await CreateLinkAsync(player, server, playerChannel, serverChannel);
+
+        _events.RegisterListeners(link);
         _links.Add(link);
 
         _logger.LogInformation("Started forwarding {Link} traffic", link);
+        await _events.ThrowAsync(new LinkStartedEvent { Link = link });
     }
 
     [Subscribe]
-    public async ValueTask OnStopLinkEvent(StopLinkEvent @event)
+    public async ValueTask OnStopLinkEvent(LinkStoppingEvent @event)
     {
         if (!_links.Remove(@event.Link))
             return;
 
-        await using var _ = @event.Link;
+        await @event.Link.DisposeAsync();
 
         if (@event.Link.IsAlive)
             throw new Exception($"Link {@event.Link} is still alive");
 
         _logger.LogInformation("Stopped forwarding {Link} traffic", @event.Link);
+        await _events.ThrowAsync(new LinkStoppedEvent { Link = @event.Link });
     }
 
     private async ValueTask<ILink> CreateLinkAsync(IPlayer player, IServer server, IMinecraftChannel playerChannel, IMinecraftChannel serverChannel)
@@ -66,7 +70,7 @@ private async ValueTask<ILink> CreateLinkAsync(IPlayer player, IServer server, I
 
         var link = @event.Result ?? new Link(player, server, playerChannel, serverChannel, _events);
 
-        await _events.ThrowAsync(new StartLinkEvent { Link = link });
+        await _events.ThrowAsync(new LinkStartingEvent { Link = link });
 
         return link;
     }