Changeset 365 for trunk/Network/UNetworkServer.pas

Timestamp:

Apr 13, 2021, 9:57:36 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved unfinished network client data handling.

File:

• trunk/Network/UNetworkServer.pas (modified) (9 diffs)

trunk/Network/UNetworkServer.pas

@@ -24 +24 @@
   private
     DataAvailableHandle: Pointer;
+    ReceiveBuffer: TMemoryStream;
     procedure DisconnectExecute(Sender: TObject);
+    procedure DataAvailableSync;
+    procedure DataAvailableExecute(Sender: TObject);
   public
     NetworkServer: TNetworkServer;
@@ -31 +34 @@
     Player: TNetworkServerPlayer;
     Connected: Boolean;
-    procedure DataAvailableExecute(Sender: TObject);
     procedure Run;
     constructor Create;
@@ -84 +86 @@
 
 uses
-  Global;
+  Global, UNetworkCommon;
 
 procedure Client(Command, Player: integer; var Data);
@@ -159 +161 @@
 procedure TNetworkServerConnection.DisconnectExecute(Sender: TObject);
 begin
-  Connected := False;
+  {Connected := False;
   if Assigned(Player) then begin
     Player.Connection := nil;
     Player := nil;
   end;
-end;
-
-procedure TNetworkServerConnection.DataAvailableExecute(Sender: TObject);
+  }
+end;
+
+procedure TNetworkServerConnection.DataAvailableSync;
 var
   Data: array of Byte;
@@ -174 +177 @@
   Command: TCommand;
 begin
-  if not Connected then Exit;
-  Command := TCommand(Socket.ReadDWord);
-  PlayerIndex := Socket.ReadDWord;
-  Subject := Socket.ReadDWord;
-  SetLength(Data, GetCommandDataSize(TCommand(Command)));
-  if Length(Data) > 0 then begin
-    ReadCount := Socket.Read(Data[0], Length(Data));
-    SetLength(Data, ReadCount);
-  end;
-  if Assigned(Player) then begin
-    if Length(Data) > 0 then
-      Player.Server(Command, PlayerIndex, Subject, Data[0])
-      else Player.Server(Command, PlayerIndex, Subject, nil^);
-  end;
-
-  NetworkServer.TCPServer.EventLoop.ClearDataAvailableNotify(DataAvailableHandle);
-  DataAvailableHandle := NetworkServer.TCPServer.EventLoop.SetDataAvailableNotify(Socket.Handle, DataAvailableExecute, nil);
+  StreamAppend(ReceiveBuffer, Socket);
+  while ReceiveBuffer.Size >= 3 * SizeOf(Integer) do begin
+    ReceiveBuffer.Position := 0;
+
+    Command := TCommand(ReceiveBuffer.ReadDWord);
+    PlayerIndex := ReceiveBuffer.ReadDWord;
+    Subject := ReceiveBuffer.ReadDWord;
+    SetLength(Data, GetCommandDataSize(TCommand(Command)));
+    if Length(Data) > 0 then begin
+      ReadCount := ReceiveBuffer.Read(Data[0], Length(Data));
+      SetLength(Data, ReadCount);
+    end;
+    if Assigned(Player) then begin
+      if Length(Data) > 0 then
+        Player.Server(Command, PlayerIndex, Subject, Data[0])
+        else Player.Server(Command, PlayerIndex, Subject, nil^);
+    end;
+    StreamRemoveRead(ReceiveBuffer);
+  end;
+end;
+
+procedure TNetworkServerConnection.DataAvailableExecute(Sender: TObject);
+begin
+  NetworkServer.TCPServerThread.Synchronize(NetworkServer.TCPServerThread, DataAvailableSync);
+  Sleep(10); // TODO: How to reset this event
 end;
 
@@ -202 +213 @@
 constructor TNetworkServerConnection.Create;
 begin
+  ReceiveBuffer := TMemoryStream.Create;
 end;
 
@@ -207 +219 @@
 begin
   if Assigned(Player) then Player.Connection := nil;
-  NetworkServer.TCPServer.EventLoop.ClearDataAvailableNotify(DataAvailableHandle);
+  if Assigned(DataAvailableHandle) then
+    NetworkServer.TCPServer.EventLoop.ClearDataAvailableNotify(DataAvailableHandle);
   FreeAndNil(Socket);
   NetworkServer.Connections.Remove(Self);
+  FreeAndNil(ReceiveBuffer);
   inherited;
 end;
@@ -221 +235 @@
   Player: TNetworkServerPlayer;
   I: Integer;
+  InitModuleData: TInitModuleData;
 begin
   NewConnection := TNetworkServerConnection.Create;;
@@ -239 +254 @@
     NewConnection.Player := Player;
     Player.Connection := NewConnection;
-    Player.Client(cmInitModule, -1, nil^);
+    Player.Client(cmInitModule, Player.Id, InitModuleData);
   end else AStream.Free;
 end;