Add events on TCP

src/core/UTCPIP.pas

@@ -51,9 +51,11 @@ type
   TTCPBlockSocket = TIdTCPConnection;
   {$ENDIF}
 
+  TNetTcpIpServer = Class;
+
   { TNetTcpIpClient }
 
-  TNetTcpIpClient = Class(TComponent)
+  TNetTcpIpClient = Class(TComponent) // TODO: Convert to TInterfacedObject
   private
     FTcpBlockSocket : TTCPBlockSocket;
     FBytesReceived, FBytesSent : Int64;
@@ -80,6 +82,8 @@ type
     procedure TCustomIpClient_OnError(Sender: TObject; ASocketError: Integer);
     {$ENDIF}
   protected
+    FNetTcpIpServer : TNetTcpIpServer;
+    Procedure DoOnDisconnect; Virtual;
     Procedure DoOnConnect; Virtual;
     function ReceiveBuf(var Buf; BufSize: Integer): Integer;
     Function SendStream(Stream : TStream) : Int64;
@@ -139,7 +143,6 @@ type
   End;
 
   {$IFDEF Synapse}
-  TNetTcpIpServer = Class;
   TTcpIpServerListenerThread = Class;
 
   TTcpIpSocketThread = Class(TPCThread)
@@ -167,7 +170,9 @@ type
 
   { TNetTcpIpServer }
 
-  TNetTcpIpServer = Class(TObject)
+  TOnClientUpdated = procedure(Sender : TNetTcpIpServer; AClient : TNetTcpIpClient) of object;
+
+  TNetTcpIpServer = Class(TInterfacedObject)
   private
     {$IFDEF DelphiSockets}
     FTcpIpServer : TIdTcpServer;
@@ -180,15 +185,21 @@ type
     FNetClients : TPCThreadList<TNetTcpIpClient>;
     FMaxConnections : Integer;
     FNetTcpIpClientClass : TNetTcpIpClientClass;
+    FOnConnectionsChanged: TNotifyEvent;
+    FOnClientFinalized: TOnClientUpdated;
+    FOnClientStarted: TOnClientUpdated;
     function GetActive: Boolean;
     procedure SetPort(const Value: Word);  // When a connection is established to a new client, a TNetConnection is created (p2p)
     function GetPort: Word;
     procedure OnTcpServerAccept({$IFDEF DelphiSockets}AContext: TIdContext{$ELSE}Sender: TObject; ClientSocket: TTCPBlockSocket{$ENDIF});
     procedure SetNetTcpIpClientClass(const Value: TNetTcpIpClientClass);
   protected
+    Procedure DoAddClient(AClient : TNetTcpIpClient); virtual;
+    Procedure DoRemoveClient(AClient : TNetTcpIpClient); virtual;
     Procedure OnNewIncommingConnection(Sender : TObject; Client : TNetTcpIpClient); virtual;
     procedure SetActive(const Value: Boolean); virtual;
     procedure SetMaxConnections(AValue: Integer); virtual;
+    function GetNewClient : TNetTcpIpClient; virtual;
   public
     Constructor Create; virtual;
     Destructor Destroy; override;
@@ -198,7 +209,11 @@ type
     Property NetTcpIpClientClass : TNetTcpIpClientClass read FNetTcpIpClientClass write SetNetTcpIpClientClass;
     Function NetTcpIpClientsLock : TList<TNetTcpIpClient>;
     Procedure NetTcpIpClientsUnlock;
+    Function NetTcpIpClientsCount : Integer;
     Procedure WaitUntilNetTcpIpClientsFinalized;
+    property OnClientStarted : TOnClientUpdated read FOnClientStarted write FOnClientStarted;
+    property OnClientFinalized : TOnClientUpdated read FOnClientFinalized write FOnClientFinalized;
+    Property OnConnectionsChanged : TNotifyEvent read FOnConnectionsChanged write FOnConnectionsChanged;
   End;
 
 
@@ -279,15 +294,16 @@ begin
   finally
     FLock.Release;
   end;
-  Result := FConnected;
   if FConnected then begin
     DoOnConnect;
   end;
+  Result := FConnected;
 end;
 
 constructor TNetTcpIpClient.Create(AOwner : TComponent);
 begin
   inherited;
+  FNetTcpIpServer := Nil;
   FOnConnect := Nil;
   FOnDisconnect := Nil;
   FTcpBlockSocket := Nil;
@@ -353,11 +369,11 @@ begin
       DebugStep := 'Relasing flock';
       FConnected := false;
       DebugStep := 'Calling OnDisconnect';
-      if Assigned(FOnDisconnect) then FOnDisconnect(Self);
       {$ENDIF}
     Finally
       FLock.Release;
     End;
+    DoOnDisconnect;
   Except
     On E:Exception do begin
       E.Message := 'Exception at TNetTcpIpClient.Discconnect step '+DebugStep+' - '+E.Message;
@@ -371,6 +387,11 @@ begin
   If (Assigned(FOnConnect)) then FOnConnect(Self);
 end;
 
+procedure TNetTcpIpClient.DoOnDisconnect;
+begin
+  if (Assigned(FOnDisconnect)) then FOnDisconnect(Self);
+end;
+
 procedure TNetTcpIpClient.DoWaitForData(WaitMilliseconds: Integer; var HasData: Boolean);
 Begin
   FLock.Acquire;
@@ -633,7 +654,7 @@ var SendBuffStream : TStream;
         end;
       until (last_bytes_read<sizeof(ReceiveBuffer)) Or (Terminated) Or (Not FBufferedNetTcpIpClient.Connected);
       {$IFDEF HIGHLOG}If total_read>0 then TLog.NewLog(ltdebug,ClassName,Format('Received %d bytes. Buffer length: %d bytes',[total_read,total_size]));{$ENDIF}
-      if (total_read>0) and (Not Terminated) and (FBufferedNetTcpIpClient.Connected) and (Assigned(FBufferedNetTcpIpClient.FOnReceivedData)) then begin
+      if (total_read>0) and (Not Terminated) and (FBufferedNetTcpIpClient.Connected) then begin
         FBufferedNetTcpIpClient.DoReceivedData;
       end;
     end else begin
@@ -762,6 +783,7 @@ end;
 
 constructor TNetTcpIpServer.Create;
 begin
+  FOnConnectionsChanged := Nil;
   FNetTcpIpClientClass := TNetTcpIpClient;
   FTcpIpServer := Nil;
   FMaxConnections := CT_MaxClientsConnected;
@@ -785,6 +807,20 @@ begin
   FreeAndNil(FNetClients);
 end;
 
+procedure TNetTcpIpServer.DoAddClient(AClient: TNetTcpIpClient);
+begin
+  FNetClients.Add(AClient);
+  if Assigned(FOnClientStarted) then FOnClientStarted(Self,AClient);
+  if Assigned(FOnConnectionsChanged) then FOnConnectionsChanged(Self);
+end;
+
+procedure TNetTcpIpServer.DoRemoveClient(AClient: TNetTcpIpClient);
+begin
+  FNetClients.Remove(AClient);
+  if Assigned(FOnClientFinalized) then FOnClientFinalized(Self,AClient);
+  if Assigned(FOnConnectionsChanged) then FOnConnectionsChanged(Self);
+end;
+
 function TNetTcpIpServer.GetActive: Boolean;
 begin
   {$IFDEF DelphiSockets}
@@ -794,6 +830,11 @@ begin
   {$ENDIF}
 end;
 
+function TNetTcpIpServer.GetNewClient: TNetTcpIpClient;
+begin
+  Result := FNetTcpIpClientClass.Create(Nil);
+end;
+
 procedure TNetTcpIpServer.SetMaxConnections(AValue: Integer);
 begin
   if FMaxConnections=AValue then Exit;
@@ -812,6 +853,11 @@ begin
   {$ENDIF}
 end;
 
+function TNetTcpIpServer.NetTcpIpClientsCount: Integer;
+begin
+  Result := FNetClients.Count;
+end;
+
 function TNetTcpIpServer.NetTcpIpClientsLock: TList<TNetTcpIpClient>;
 begin
   Result := FNetClients.LockList;
@@ -831,10 +877,11 @@ procedure TNetTcpIpServer.OnTcpServerAccept({$IFDEF DelphiSockets}AContext: TIdC
 Var n : TNetTcpIpClient;
   oldSocket : TTCPBlockSocket;
 begin
-  n := FNetTcpIpClientClass.Create(Nil);
+  n := GetNewClient;
   Try
     n.FLock.Acquire;
     try
+      n.FNetTcpIpServer := Self;
       oldSocket := n.FTcpBlockSocket;
       {$IFDEF DelphiSockets}
       n.FTcpBlockSocket := AContext.Connection;
@@ -851,11 +898,11 @@ begin
     finally
       n.FLock.Release;
     end;
-    FNetClients.Add(n);
+    DoAddClient(n);
     try
       OnNewIncommingConnection({$IFDEF DelphiSockets}Self{$ELSE}Sender{$ENDIF},n);
     finally
-      FNetClients.Remove(n);
+      DoRemoveClient(n);
     end;
   Finally
     n.FTcpBlockSocket := oldSocket;

src/core/UThread.pas

@@ -92,6 +92,7 @@ Type
     constructor Create(const AName : String);
     destructor Destroy; override;
     function Add(Item: T) : Integer;
+    function Count : Integer;
     procedure Clear;
     procedure Remove(Item: T); inline;
     function LockList: TList<T>;
@@ -384,6 +385,11 @@ begin
   FList := TList<T>.Create;
 end;
 
+function TPCThreadList<T>.Count : Integer;
+begin
+  Result := FList.Count;
+end;
+
 destructor TPCThreadList<T>.Destroy;
 begin
   LockList;