.gitea/workflows/release.yaml

@@ -1,11 +1,11 @@
-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/**
+      - .run/**
 
 jobs:
   preprocess:
@@ -13,75 +13,75 @@ jobs:
     outputs:
       sanitized_branch_name: ${{ steps.sanitize.outputs.sanitized_branch_name }}
     steps:
-    - name: Sanitize branch name
+      - name: Sanitize branch name
-      id: sanitize
+        id: sanitize
-      run: echo "::set-output name=sanitized_branch_name::$(echo ${{ github.ref_name }} | sed 's/\//-/g')"
+        run: echo "::set-output name=sanitized_branch_name::$(echo ${{ github.ref_name }} | sed 's/\//-/g')"
 
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - name: Setup dotnet
+      - name: Setup dotnet
-      uses: https://github.com/actions/setup-dotnet@v3
+        uses: https://github.com/actions/setup-dotnet@v3
-      with:
+        with:
-        global-json-file: global.json
+          global-json-file: global.json
-    - name: Install dependencies
+      - name: Install dependencies
-      run: dotnet restore
+        run: dotnet restore
-    - name: Build
+      - name: Build
-      run: |
+        run: |
-        cd RaiNote.PacketMediator
+          cd RaiNote.PacketMediator
-        dotnet build RaiNote.PacketMediator.csproj -c Release
+          dotnet build RaiNote.PacketMediator.csproj -c Release
 
   publish:
-    needs: [build]
+    needs: [ build ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - name: Setup dotnet
+      - name: Setup dotnet
-      uses: https://github.com/actions/setup-dotnet@v3
+        uses: https://github.com/actions/setup-dotnet@v3
-      with:
+        with:
-        global-json-file: global.json
+          global-json-file: global.json
-    - name: Install dependencies
+      - name: Install dependencies
-      run: dotnet restore
+        run: dotnet restore
-    - name: Extract Version
+      - name: Extract Version
-      run: |
+        run: |
-        VERSION=${GITHUB_REF#refs/tags/v}
+          VERSION=${GITHUB_REF#refs/tags/v}
-        echo "Extracted version is $VERSION"
+          echo "Extracted version is $VERSION"
-        echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
-      shell: bash
+        shell: bash
-    - name: Pack nuget package
+      - name: Pack nuget package
-      run: |
+        run: |
-        cd RaiNote.PacketMediator
+          cd RaiNote.PacketMediator
-        dotnet build RaiNote.PacketMediator.csproj -c Release -p:PackageVersion=${{env.VERSION}}
+          dotnet build RaiNote.PacketMediator.csproj -c Release -p:PackageVersion=${{env.VERSION}}
-        dotnet pack -c Release -p:PackageVersion=${{env.VERSION}} --output .
+          dotnet pack -c Release -p:PackageVersion=${{env.VERSION}} --output .
-    - name: Push to NuGet
+      - name: Push to NuGet
-      run: |
+        run: |
-        cd RaiNote.PacketMediator
+          cd RaiNote.PacketMediator
-        dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://forge.rainote.dev/api/packages/rainote/nuget/index.json
+          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:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - name: Setup dotnet
+      - name: Setup dotnet
-      uses: https://github.com/actions/setup-dotnet@v3
+        uses: https://github.com/actions/setup-dotnet@v3
-      with:
+        with:
-        dotnet-version: |
+          dotnet-version: |
-          7.0
+            7.0
-          8.0
+            8.0
-    - name: Install dependencies
+      - name: Install dependencies
-      run: |
+        run: |
-        dotnet restore
+          dotnet restore
-        echo "::add-path::$HOME/.dotnet/tools"
+          echo "::add-path::$HOME/.dotnet/tools"
-    - name: Install nuget-license
+      - name: Install nuget-license
-      run: dotnet tool install --global dotnet-project-licenses
+        run: dotnet tool install --global dotnet-project-licenses
-    - name: Export licenses
+      - name: Export licenses
-      run: dotnet-project-licenses -i . -u --projects-filter projects_ignore_licenses.json -m -j -e -f licenses
+        run: dotnet-project-licenses -i . -u --projects-filter projects_ignore_licenses.json -m -j -e -f licenses
-    - name: Upload licenses
+      - name: Upload licenses
-      uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v3
-      with:
+        with:
-        name: licenses
+          name: licenses
-        path: licenses
+          path: licenses
-        retention-days: 31
+          retention-days: 31

.pre-commit-config.yaml

@@ -1,19 +1,19 @@
 repos:
-- repo: local
+  - repo: local
-  hooks:
+    hooks:
       #Use dotnet format already installed on your machine
-  - id: dotnet-format
+      - id: dotnet-format
-    name: dotnet-format
+        name: dotnet-format
-    language: system
+        language: system
-    entry: dotnet format --include
+        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:
+    hooks:
-  - id: actionlint
+      - 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:
+    hooks:
-  - id: pretty-format-yaml
+      - 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,8 +1,8 @@
-// Licensed to Timothy Schenk under the Apache 2.0 License.
+// Licensed to Timothy Schenk under the Apache 2.0 License.
 
 namespace PacketMediator.Samples;
 
 public class Sample
 {
-
+    
 }

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,
-                AllowSynchronousContinuations = false,
+            SingleReader = false,
-                SingleReader = false,
+            SingleWriter = false
-                SingleWriter = false
+        });
-            }
-        );
         var containingPackets = sourcesContainingPackets as Assembly[] ?? sourcesContainingPackets.ToArray();
         var allIncomingPackets = GetAllPackets(containingPackets, typeof(IIncomingPacket));
         var allOutgoingPackets = GetAllPackets(containingPackets, typeof(IOutgoingPacket));
@@ -44,32 +42,27 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
             new ConcurrentDictionary<TPacketIdEnum, Func<byte[], IIncomingPacket>>();
         _packetHandlersInstantiation = new ConcurrentDictionary<TPacketIdEnum, IPacketHandler<TSession>?>();
         packetHandlers.ForEach(packetHandlerPair =>
-            {
+        {
-                var packetHandler =
+            var packetHandler =
-                    ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider,
+                ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider,
-                        packetHandlerPair.Value
+                    packetHandlerPair.Value);
-                    );
+            _packetHandlersInstantiation.TryAdd(packetHandlerPair.Key, packetHandler as IPacketHandler<TSession>);
-                _packetHandlersInstantiation.TryAdd(packetHandlerPair.Key, packetHandler as IPacketHandler<TSession>);
+        });
-            }
-        );
         allIncomingPackets.ForEach(packetsType =>
+        {
+            var lambda = CodeGenerator.Lambda<Func<byte[], IIncomingPacket>>(fun =>
             {
-                var lambda = CodeGenerator.Lambda<Func<byte[], IIncomingPacket>>(fun =>
+                var argPacketData = fun[0];
-                        {
+                var newPacket = packetsType.Value.New();
-                            var argPacketData = fun[0];
-                            var newPacket = packetsType.Value.New();
 
-                            var packetVariable = CodeGenerator.DeclareVariable(packetsType.Value, "packet");
+                var packetVariable = CodeGenerator.DeclareVariable(packetsType.Value, "packet");
-                            CodeGenerator.Assign(packetVariable, newPacket);
+                CodeGenerator.Assign(packetVariable, newPacket);
-                            CodeGenerator.Call(packetVariable, nameof(IIncomingPacket.Deserialize), argPacketData);
+                CodeGenerator.Call(packetVariable, nameof(IIncomingPacket.Deserialize), argPacketData);
 
-                            CodeGenerator.Return(packetVariable);
+                CodeGenerator.Return(packetVariable);
-                        }
+            }).Compile();
-                    )
+            tempDeserializationMap.TryAdd(packetsType.Key, lambda);
-                    .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 is { IsGenericType: true } &&
+                            t1.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)).GetGenericArguments()
-                                t1.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)
+                        .First(genericType => genericType.GetInterfaces().Any(packetType =>
-                            )
+                            packetType == typeof(IPacket)))
-                            .GetGenericArguments()
+                        .GetCustomAttribute<PacketIdAttribute<TPacketIdEnum>>()
-                            .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));