.gitea/workflows/release.yaml

@@ -1,9 +1,9 @@
-name: Release Rai.PacketMediator
+name: Release Rai.PacketMediator
 run-name: ${{ gitea.actor }} is building the Server application
 on:
   push:
     tags:
-    - v*.*.*
+      - 'v*.*.*'
     paths-ignore:
       - .run/**
 
@@ -33,7 +33,7 @@ jobs:
           dotnet build RaiNote.PacketMediator.csproj -c Release
 
   publish:
-    needs: [build]
+    needs: [ build ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -60,7 +60,7 @@ jobs:
           dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://forge.rainote.dev/api/packages/rainote/nuget/index.json
 
   generate-licences:
-    needs: [build, preprocess]
+    needs: [ build, preprocess ]
     runs-on: ubuntu-latest
     container: catthehacker/ubuntu:act-latest@sha256:efe7d859ca6f98a21b3b0471ab48455af597a064d719f65332d0f105aadcad65
     steps:

.pre-commit-config.yaml

@@ -1,19 +1,19 @@
 repos:
-- repo: local
+  - repo: local
     hooks:
       #Use dotnet format already installed on your machine
       - id: dotnet-format
         name: dotnet-format
         language: system
         entry: dotnet format --include
-    types_or: [c#, vb]
+        types_or: [ c#, vb ]
-- repo: https://github.com/Mateusz-Grzelinski/actionlint-py
+  - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
-  rev: v1.7.1.15
+    rev: v1.6.26.11
     hooks:
       - id: actionlint
-    additional_dependencies: [pyflakes>=3.0.1, shellcheck-py>=0.9.0.5]
+        additional_dependencies: [ pyflakes>=3.0.1, shellcheck-py>=0.9.0.5 ]
-- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.14.0
+    rev: v2.12.0
     hooks:
       - id: pretty-format-yaml
-    args: [--autofix, --indent, '2']
+        args: [ --autofix, --indent, '2' ]

PacketMediator.Samples/Program.cs

@@ -1,3 +1,3 @@
-// Licensed to Timothy Schenk under the Apache 2.0 License.
+// Licensed to Timothy Schenk under the Apache 2.0 License.
 
 Console.WriteLine("Hello World!");

PacketMediator.Samples/Sample.cs

@@ -1,4 +1,4 @@
-// Licensed to Timothy Schenk under the Apache 2.0 License.
+// Licensed to Timothy Schenk under the Apache 2.0 License.
 
 namespace PacketMediator.Samples;
 

RaiNote.PacketMediator/PacketDistributor.cs

@@ -23,14 +23,12 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
     public PacketDistributor(IServiceProvider serviceProvider,
         IEnumerable<Assembly> sourcesContainingPackets, IEnumerable<Assembly> sourcesContainingPacketHandlers)
     {
-        _channel = Channel.CreateUnbounded<ValueTuple<byte[], TPacketIdEnum, TSession>>(
+        _channel = Channel.CreateUnbounded<ValueTuple<byte[], TPacketIdEnum, TSession>>(new UnboundedChannelOptions
-            new UnboundedChannelOptions
         {
             AllowSynchronousContinuations = false,
             SingleReader = false,
             SingleWriter = false
-            }
+        });
-        );
         var containingPackets = sourcesContainingPackets as Assembly[] ?? sourcesContainingPackets.ToArray();
         var allIncomingPackets = GetAllPackets(containingPackets, typeof(IIncomingPacket));
         var allOutgoingPackets = GetAllPackets(containingPackets, typeof(IOutgoingPacket));
@@ -47,11 +45,9 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
         {
             var packetHandler =
                 ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider,
-                        packetHandlerPair.Value
+                    packetHandlerPair.Value);
-                    );
             _packetHandlersInstantiation.TryAdd(packetHandlerPair.Key, packetHandler as IPacketHandler<TSession>);
-            }
+        });
-        );
         allIncomingPackets.ForEach(packetsType =>
         {
             var lambda = CodeGenerator.Lambda<Func<byte[], IIncomingPacket>>(fun =>
@@ -64,12 +60,9 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
                 CodeGenerator.Call(packetVariable, nameof(IIncomingPacket.Deserialize), argPacketData);
 
                 CodeGenerator.Return(packetVariable);
-                        }
+            }).Compile();
-                    )
-                    .Compile();
             tempDeserializationMap.TryAdd(packetsType.Key, lambda);
-            }
+        });
-        );
 
         _deserializationMap = tempDeserializationMap.ToImmutableDictionary();
     }
@@ -81,13 +74,11 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
     {
         var packetsWithId = sourcesContainingPackets.SelectMany(a => a.GetTypes()
                 .Where(type => type is { IsInterface: false, IsAbstract: false } &&
-                               type.GetInterfaces().Contains(packetType) &&
+                               type.GetInterfaces().Contains(packetType)
-                               type.GetCustomAttributes<PacketIdAttribute<TPacketIdEnum>>().Any()
+                               && type.GetCustomAttributes<PacketIdAttribute<TPacketIdEnum>>().Any()
-                )
+                ))
-            )
             .Select(type =>
-                new { Type = type, Attribute = type.GetCustomAttribute<PacketIdAttribute<TPacketIdEnum>>() }
+                new { Type = type, Attribute = type.GetCustomAttribute<PacketIdAttribute<TPacketIdEnum>>() })
-            )
             .Select(x => new KeyValuePair<TPacketIdEnum, Type>(x.Attribute!.Code, x.Type));
 
         return packetsWithId;
@@ -98,32 +89,20 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
     {
         var packetHandlersWithId = sourcesContainingPacketHandlers.SelectMany(assembly => assembly.GetTypes()
                 .Where(t =>
-                    t is { IsClass: true, IsAbstract: false } &&
+                    t is { IsClass: true, IsAbstract: false } && Array.Exists(t
-                    Array.Exists(t
+                        .GetInterfaces(), i =>
-                            .GetInterfaces(),
+                        i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)))
-                        i =>
-                            i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)
-                    )
-                )
                 .Select(packetHandlerType => new
                 {
                     Type = packetHandlerType,
                     PacketId = packetHandlerType
-                            .GetInterfaces()
+                        .GetInterfaces().First(t1 =>
-                            .First(t1 =>
                             t1 is { IsGenericType: true } &&
-                                t1.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)
+                            t1.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)).GetGenericArguments()
-                            )
+                        .First(genericType => genericType.GetInterfaces().Any(packetType =>
-                            .GetGenericArguments()
+                            packetType == typeof(IPacket)))
-                            .First(genericType => genericType.GetInterfaces()
-                                .Any(packetType =>
-                                    packetType == typeof(IPacket)
-                                )
-                            )
                         .GetCustomAttribute<PacketIdAttribute<TPacketIdEnum>>()
-                }
+                }))
-                )
-            )
             .Where(x => x.PacketId != null)
             .Select(x => new KeyValuePair<TPacketIdEnum, Type>(x.PacketId!.Code, x.Type));