fixed: windows server

Ragon.Common/Sources/RagonTarget.cs

@@ -4,6 +4,7 @@ namespace Ragon.Common
   {
     Owner,
     ExceptOwner,
+    ExceptInvoker,
     All,
   }
 }

Ragon.SimpleServer/config.json

@@ -1,5 +1,6 @@
 {
   "key": "defaultkey",
+  "socket": "udp",
   "protocol": "1.0.0",
   "statisticsInterval": 5,
   "sendRate": 50,

Ragon/Sources/Application.cs

@@ -30,7 +30,19 @@ namespace Ragon.Core
       var dispatcher = new Dispatcher();
       _dispatcher = dispatcher;
 
+      if (configuration.Socket == "udp")
+      {
         _socketServer = new ENetServer(this);
+      }
+      else if (configuration.Socket == "websocket")
+      {
+        _socketServer = new WebSocketServer(this);
+      }
+      else
+      {
+        _logger.Error($"Unknown socket type {configuration.Socket}");
+      }
+
       _deltaTime = 1000.0f / configuration.SendRate;
 
       _roomManager = new RoomManager(factory, this);
@@ -87,12 +99,12 @@ namespace Ragon.Core
 
     public void OnConnected(ushort peerId)
     {
-        _logger.Trace("Connected " + peerId);
+      // _logger.Trace("Connected " + peerId);
     }
 
     public void OnDisconnected(ushort peerId)
     {
-      _logger.Trace("Disconnected " + peerId);
+      // _logger.Trace("Disconnected " + peerId);
 
       var player = _lobby.AuthorizationManager.GetPlayer(peerId);
       if (player != null)

Ragon/Sources/Authorization.cs

@@ -42,6 +42,12 @@ public class AuthorizationManager
 
   public void Accepted(ushort peerId, string playerId, string playerName)
   {
+    if (_playersByPeers.ContainsKey(peerId))
+    {
+      _logger.Warn($"Connection already authorized {peerId}");
+      return;
+    }
+
     _serializer.Clear();
     _serializer.WriteOperation(RagonOperation.AUTHORIZED_SUCCESS);
     _serializer.WriteString(playerId);

Ragon/Sources/Configuration.cs

@@ -10,6 +10,7 @@ namespace Ragon.Core
   {
     public string Key;
     public string Protocol;
+    public string Socket;
     public int StatisticsInterval;
     public ushort SendRate;
     public ushort Port;
@@ -20,7 +21,7 @@ namespace Ragon.Core
     public int MaxRooms;
 
     private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
-    private static readonly string _serverVersion = "1.0.22-rc";
+    private static readonly string _serverVersion = "1.0.27-rc";
 
     private static void CopyrightInfo()
     {

Ragon/Sources/Entity/Entity.cs

@@ -81,7 +81,7 @@ public class Entity
     serializer.WriteData(ref payload);
 
     var sendData = serializer.ToArray();
-    Send(targetMode, sendData);
+    RouteEvent(peerId, targetMode, sendData);
   }
 
   public void ReadState(uint peerId, RagonSerializer serializer)
@@ -197,6 +197,7 @@ public class Entity
   public void Destroy(ReadOnlySpan<byte> payload)
   {
     var serializer = _room.GetSharedSerializer();
+    
     serializer.Clear();
     serializer.WriteOperation(RagonOperation.DESTROY_ENTITY);
     serializer.WriteInt(EntityId);
@@ -207,7 +208,7 @@ public class Entity
     _room.BroadcastToReady(sendData, DeliveryType.Reliable);
   }
 
-  void Send(RagonTarget targetMode, byte[] sendData)
+  void RouteEvent(ushort peerId, RagonTarget targetMode, byte[] sendData)
   {
     switch (targetMode)
     {
@@ -221,6 +222,11 @@ public class Entity
         _room.BroadcastToReady(sendData, new [] { OwnerId }, DeliveryType.Reliable);
         break;
       }
+      case RagonTarget.ExceptInvoker:
+      {
+        _room.BroadcastToReady(sendData, new[] {peerId}, DeliveryType.Reliable);
+        break;
+      }
       case RagonTarget.All:
       {
         _room.BroadcastToReady(sendData, DeliveryType.Reliable);
@@ -236,7 +242,7 @@ public class Entity
     var targetMode = (RagonTarget) reader.ReadByte();
     var payloadData = reader.ReadData(reader.Size);
 
-    Span<byte> payloadRaw = stackalloc byte[reader.Size];
+    Span<byte> payloadRaw = stackalloc byte[payloadData.Length];
     ReadOnlySpan<byte> payload = payloadRaw;
     payloadData.CopyTo(payloadRaw);
           

Ragon/Sources/GameRoom.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using NLog;
 using Ragon.Common;
@@ -129,7 +128,6 @@ namespace Ragon.Core
                 var propertySize = reader.ReadUShort();
                 entity.AddProperty(new EntityProperty(propertySize, propertyType));
               }
-
               player.AttachEntity(entity);
               AttachEntity(player, entity);
             }
@@ -219,8 +217,6 @@ namespace Ragon.Core
           var eventAuthority = (RagonAuthority) reader.ReadByte();
           var propertiesCount = reader.ReadUShort();
           
-          _logger.Trace($"[{peerId}] Create Entity {entityType}");
-
           var player = _players[peerId];
           var entity = new Entity(this, player.PeerId, entityType, 0, eventAuthority);
           for (var i = 0; i < propertiesCount; i++)
@@ -306,12 +302,17 @@ namespace Ragon.Core
       _writer.WriteOperation(RagonOperation.OWNERSHIP_CHANGED);
       _writer.WriteString(next.Id);
       _writer.WriteUShort((ushort) entitiesToUpdate.Length);
+      
       foreach (var entity in entitiesToUpdate)
       {
         _writer.WriteUShort(entity.EntityId);
-        entity.SetOwner((ushort) next.PeerId);
+        entity.SetOwner(next.PeerId);
+        
+        next.Entities.Add(entity);
       }
 
+      next.EntitiesIds = next.Entities.Select(e => e.EntityId).ToList();
+
       BroadcastToReady(_writer, DeliveryType.Reliable);
     }
 
@@ -345,6 +346,7 @@ namespace Ragon.Core
 
     void BroadcastSnapshot(ushort[] peersIds)
     {
+      _logger.Trace("Snapshot");
       _writer.Clear();
       _writer.WriteOperation(RagonOperation.SNAPSHOT);
       _writer.WriteUShort((ushort) _readyPlayers.Length);

Ragon/Sources/RoomManager.cs

@@ -74,7 +74,7 @@ public class RoomManager
       {
         if (existRoom.Map == map && existRoom.PlayersCount < existRoom.PlayersMax)
         {
-          _logger.Trace($"Player ({player.PlayerName}|{player.Id}) joined to room with Id {roomId}");
+          _logger.Trace($"Player ({player.PlayerName}|{player.Id}) joined to room with Id {existRoom.Id}");
           
           existRoom.AddPlayer(player, payload);
           _roomsBySocket.Add(player.PeerId, existRoom);

Ragon/Sources/Server/ENet/ENetServer.cs

@@ -27,6 +27,8 @@ namespace Ragon.Core
 
     public void Start(ushort port, int connections, uint protocol)
     {
+      Library.Initialize();
+      
       _address = default;
       _address.Port = port;
       _peers = new Peer[connections];
@@ -146,6 +148,8 @@ namespace Ragon.Core
     public void Stop()
     {
       _host?.Dispose();
+      
+      Library.Deinitialize();
     }
 
     private bool IsValidProtocol(uint protocol)

Ragon/Sources/Server/Http/WebSocketServer.cs

@@ -74,9 +74,16 @@ public class WebSocketServer : ISocketServer
     while (_events.TryDequeue(out var evnt))
     {
       if (_webSockets.TryGetValue(evnt.PeerId, out var ws) && ws.State == WebSocketState.Open)
+      {
+        try
         {
           await ws.SendAsync(evnt.Data, WebSocketMessageType.Binary, WebSocketMessageFlags.EndOfMessage, CancellationToken.None);
         }
+        catch (Exception ex)
+        {
+          _logger.Error(ex);
+        }
+      }
     }
   }
 

readme.md

@@ -16,8 +16,8 @@ Ragon is fully free, small and high perfomance room based game server with plugi
 - Simple matchmaking
 - Room based architecture
 - Сustomizable authorization
-- Сustomizable server-side logic via plugins with flexible API
+- Сustomizable server-side logic via plugins with flexible API*(2)
-- No CCU limitations*
+- No CCU limitations*(1)
 - No Room count limitations
 - Reliable UDP 
 
@@ -27,10 +27,11 @@ Ragon is fully free, small and high perfomance room based game server with plugi
 
 ### Dependencies
 * ENet-Sharp [v2.4.8]
-* NetStack [latest]
 
 ### License
 MIT
 
 ### Tips
-\* Limited to 4095 CCU by library ENet-Sharp
+\* Limited to 4095 CCU by library ENet-Sharp (1)
+
+\* Non finally (2)