fixes

Author: erwan-joly

src/NosCore.Networking/BroadcastableExtension.cs

@@ -51,23 +51,33 @@ public static async Task SendPacketsAsync(this IBroadcastable channelGroup, IEnu
             ISessionMatcher? matcher)
         {
             var packetDefinitions = (packets as IPacket[] ?? packets).Where(c => c != null).ToArray();
-            if (packetDefinitions.Any())
+            if (packetDefinitions.Length == 0)
             {
-                Parallel.ForEach(packets, packet => channelGroup.LastPackets.Enqueue(packet));
-                Parallel.For(0, channelGroup.LastPackets.Count - channelGroup.MaxPacketsBuffer, (_, __) => channelGroup.LastPackets.TryDequeue(out var ___));
-                if (channelGroup.Sessions == null!)
-                {
-                    return;
-                }
+                return;
+            }
+
+            foreach (var packet in packetDefinitions)
+            {
+                channelGroup.LastPackets.Enqueue(packet);
+            }
+
+            while (channelGroup.LastPackets.Count > channelGroup.MaxPacketsBuffer)
+            {
+                channelGroup.LastPackets.TryDequeue(out _);
+            }
 
-                if (matcher == null)
-                {
-                    await channelGroup.Sessions.Broadcast(packetDefinitions).ConfigureAwait(false);
-                }
-                else
-                {
-                    await channelGroup.Sessions.Broadcast(packetDefinitions, matcher).ConfigureAwait(false);
-                }
+            if (channelGroup.Sessions == null!)
+            {
+                return;
+            }
+
+            if (matcher == null)
+            {
+                await channelGroup.Sessions.Broadcast(packetDefinitions).ConfigureAwait(false);
+            }
+            else
+            {
+                await channelGroup.Sessions.Broadcast(packetDefinitions, matcher).ConfigureAwait(false);
             }
         }
 

src/NosCore.Networking/NetworkClient.cs

@@ -140,8 +140,15 @@ public async Task SendPacketsAsync(IEnumerable<IPacket?> packets)
                 return;
             }
 
-            var encoded = _encoder.Encode(SessionKey, packetList);
-            await _channel.SendAsync(new ReadOnlyMemory<byte>(encoded));
+            try
+            {
+                var encoded = _encoder.Encode(SessionKey, packetList);
+                await _channel.SendAsync(new ReadOnlyMemory<byte>(encoded));
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, _logLanguage[LogLanguageKey.ENCODE_ERROR], SessionId);
+            }
         }
     }
 }

src/NosCore.Networking/PipelineFactory.cs

@@ -7,11 +7,14 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 using NosCore.Networking.Encoding;
 using NosCore.Networking.Encoding.Filter;
 using NosCore.Networking.Filters;
+using NosCore.Networking.Resource;
 using NosCore.Networking.SessionRef;
 using NosCore.Shared.Enumerations;
+using NosCore.Shared.I18N;
 using SuperSocket.ProtoBase;
 using SuperSocket.Server.Abstractions.Session;
 
@@ -29,6 +32,8 @@ public class PipelineFactory : IPipelineFilterFactory<NosPackageInfo>
         private readonly Func<INetworkClient> _clientFactory;
         private readonly Action<NosPackageInfo, INetworkClient> _packetHandler;
         private readonly Action<INetworkClient>? _disconnectHandler;
+        private readonly ILogger<PipelineFactory>? _logger;
+        private readonly ILogLanguageLocalizer<LogLanguageKey>? _logLanguage;
 
         private readonly ConcurrentDictionary<object, PipelineFilter> _filtersByConnection = new();
         private readonly ConcurrentDictionary<string, INetworkClient> _clientsBySession = new();
@@ -43,10 +48,13 @@ public class PipelineFactory : IPipelineFilterFactory<NosPackageInfo>
         /// <param name="clientFactory">Factory function to create network client instances.</param>
         /// <param name="packetHandler">Handler for processing received packets.</param>
         /// <param name="disconnectHandler">Handler for processing client disconnections.</param>
+        /// <param name="logger">The logger instance.</param>
+        /// <param name="logLanguage">The localized log language provider.</param>
         public PipelineFactory(IDecoder decoder, ISessionRefHolder sessionRefHolder,
             IEnumerable<IRequestFilter> requestFilters, IPipelineConfiguration pipelineConfiguration,
             Func<INetworkClient> clientFactory, Action<NosPackageInfo, INetworkClient> packetHandler,
-            Action<INetworkClient>? disconnectHandler = null)
+            Action<INetworkClient>? disconnectHandler = null,
+            ILogger<PipelineFactory>? logger = null, ILogLanguageLocalizer<LogLanguageKey>? logLanguage = null)
         {
             _decoder = decoder;
             _sessionRefHolder = sessionRefHolder;
@@ -55,6 +63,8 @@ public PipelineFactory(IDecoder decoder, ISessionRefHolder sessionRefHolder,
             _clientFactory = clientFactory;
             _packetHandler = packetHandler;
             _disconnectHandler = disconnectHandler;
+            _logger = logger;
+            _logLanguage = logLanguage;
         }
 
         /// <summary>
@@ -115,6 +125,10 @@ public void HandlePackage(IAppSession session, NosPackageInfo package)
             {
                 _packetHandler(package, client);
             }
+            else if (_logger != null && _logLanguage != null)
+            {
+                _logger.LogWarning(_logLanguage[LogLanguageKey.ERROR_SESSIONID], session.SessionID);
+            }
         }
     }
 }

src/NosCore.Networking/SessionRef/SessionRefHolder.cs

@@ -5,6 +5,7 @@
 // -----------------------------------
 
 using System.Collections.Concurrent;
+using System.Threading;
 
 namespace NosCore.Networking.SessionRef;
 
@@ -21,8 +22,7 @@ public class SessionRefHolder : ConcurrentDictionary<string, RegionTypeMapping>,
     /// <returns>A new session identifier incremented by 2.</returns>
     public int GenerateSessionId()
     {
-        _sessionCounter += 2;
-        return _sessionCounter;
+        return Interlocked.Add(ref _sessionCounter, 2);
     }
 
     /// <summary>