Merge pull request #21 from cayque10/correcoes-conexao-android

Correção de erros e Warnings
mateusvicente100 · May 20, 2024 · 996e2ec · 996e2ec
2 parents dceebf4 + a8df54f
commit 996e2ec
Showing 1 changed file with 38 additions and 17 deletions.
diff --git a/src/Bird.Socket.Client.pas b/src/Bird.Socket.Client.pas
@@ -45,7 +45,7 @@   TBirdSocketClient = class(TIdTCPClient)
     function GenerateWebSocketKey: string;
     function IsValidWebSocket: Boolean;
     function IsValidHeaders(const AHeaders: TStrings): Boolean;
-    function EncodeFrame(const AMessage: RawByteString; const AOperationCode: TOperationCode = TOperationCode.TEXT_FRAME): TIdBytes;
+    function EncodeFrame(const AMessage: String; const AOperationCode: TOperationCode = TOperationCode.TEXT_FRAME): TIdBytes;
     function GetBit(const AValue: Cardinal; const AByte: Byte): Boolean;
     function SetBit(const AValue: Cardinal; const AByte: Byte): Cardinal;
     function ClearBit(const AValue: Cardinal; const AByte: Byte): Cardinal;
@@ -56,6 +56,8 @@   TBirdSocketClient = class(TIdTCPClient)
     procedure StartHeartBeat;
     procedure Close;
     constructor Create(const AURL: string); reintroduce;
+    procedure TriggerOnMessage(const AMsg: string);
+    function BytesToString(const ABytes: TBytes; AEncoding: TEncoding = nil): string;
   protected
     property OnMessage: TEventListener read FOnMessage write FOnMessage;
     property OnOpen: TEventListener read FOnOpen write FOnOpen;
@@ -75,7 +77,7 @@   TBirdSocketClient = class(TIdTCPClient)
     procedure AddEventListener(const AEventType: TEventType; const AEvent: TNotifyEvent); overload;
     procedure SetSubProtocol(const AValue: string);
     procedure Send(const AMessage: string); overload;
-    procedure Send(const AMessage: RawByteString); overload;
+    procedure Send(const AMessage: TBytes; AEncoding: TEncoding = nil); overload;
     procedure Send(const AJSONObject: TJSONObject; const AOwns: Boolean = True); overload;
     destructor Destroy; override;
   end;
@@ -114,6 +116,14 @@ procedure TBirdSocketClient.AddEventListener(const AEventType: TEventType; const
   end;
 end;
 
+function TBirdSocketClient.BytesToString(const ABytes: TBytes; AEncoding: TEncoding): string;
+begin
+  // Use a codificação padrao UTF-8
+  if AEncoding = nil then
+    AEncoding := TEncoding.UTF8;
+  Result := AEncoding.GetString(ABytes);
+end;
+
 procedure TBirdSocketClient.AddEventListener(const AEventType: TEventType; const AEvent: TEventListenerError);
 begin
   if (AEventType <> TEventType.ERROR) then
@@ -264,10 +274,11 @@ destructor TBirdSocketClient.Destroy;
   if FAutoCreateHandler and Assigned(FIOHandler) then
     FIOHandler.Free;
   FInternalLock.Free;
+  FHeader.Free;
   inherited;
 end;
 
-function TBirdSocketClient.EncodeFrame(const AMessage: RawByteString; const AOperationCode: TOperationCode): TIdBytes;
+function TBirdSocketClient.EncodeFrame(const AMessage: String; const AOperationCode: TOperationCode): TIdBytes;
 var
   LFin, LMask: Cardinal;
   LMaskingKey: array[0..3] of Cardinal;
@@ -276,16 +287,16 @@ function TBirdSocketClient.EncodeFrame(const AMessage: RawByteString; const AOpe
   I: Integer;
   LXorOne, LXorTwo: Char;
   LExtendedPayloadLength: Integer;
-  LMessage: RawByteString;
+  LMessage: TBytes;
 begin
   LFin := 0;
   if AOperationCode <> TOperationCode.BINARY_FRAME then
   begin
-    LMessage := UTF8Encode(AMessage);
+    LMessage := TEncoding.UTF8.GetBytes(AMessage);
   end
   else
   begin
-    LMessage := AMessage;
+    LMessage := TEncoding.ANSI.GetBytes(AMessage);
   end;
   LFin := SetBit(LFin, 7) or AOperationCode.ToByte;
   LMask := SetBit(0, 7);
@@ -321,11 +332,7 @@ function TBirdSocketClient.EncodeFrame(const AMessage: RawByteString; const AOpe
     LBuffer[1 + 1 + LExtendedPayloadLength + I] := LMaskingKey[I];
   for I := 0 to Pred(Length(LMessage)) do
   begin
-{$IF DEFINED(iOS) or DEFINED(ANDROID)}
     LXorOne := Char(LMessage[I]);
-{$ELSE}
-    LXorOne := Char(LMessage[Succ(I)]);
-{$ENDIF}
     LXorTwo := Chr(LMaskingKey[((I) mod 4)]);
     LXorTwo := Chr(ord(LXorOne) xor ord(LXorTwo));
     LBuffer[1 + 1 + LExtendedPayloadLength + 4 + I] := ord(LXorTwo);
@@ -434,7 +441,7 @@ procedure TBirdSocketClient.ReadFromWebSocket;
 var
   LOperationCode: Byte;
   LSpool: TIdBytes;
-  RawStr: RawByteString;
+  LRawStr: String;
 begin
   if not IsValidWebSocket then
     Exit;
@@ -522,18 +529,18 @@ procedure TBirdSocketClient.ReadFromWebSocket;
                     // check binary frame
                     if LOperationCode = TOperationCode.BINARY_FRAME.ToByte then
                     begin
-                      SetString(RawStr, PAnsiChar(@LSpool[0]), Length(LSpool));
-                      FOnMessage(RawStr);
+                      SetString(LRawStr, PAnsiChar(@LSpool[0]), Length(LSpool));
+                      TriggerOnMessage(LRawStr);
                     end
                     // check text frame
                     else if LOperationCode = TOperationCode.TEXT_FRAME.ToByte then
                     begin
-                      FOnMessage(IndyTextEncoding_UTF8.GetString(LSpool));
+                      TriggerOnMessage(IndyTextEncoding_UTF8.GetString(LSpool));
                     end;
                   end;
                 end;
               finally
-                SetLength(RawStr, 0);
+                SetLength(LRawStr, 0);
                 SetLength(LSpool, 0);
               end;
             end;
@@ -552,19 +559,23 @@ procedure TBirdSocketClient.ReadFromWebSocket;
 
 procedure TBirdSocketClient.Send(const AMessage: string);
 begin
+  if not Assigned(FSocket) then
+    Exit;
+
   try
     FInternalLock.Enter;
+
     FSocket.Write(EncodeFrame(AMessage));
   finally
     FInternalLock.Leave;
   end;
 end;
 
-procedure TBirdSocketClient.Send(const AMessage: RawByteString);
+procedure TBirdSocketClient.Send(const AMessage: TBytes; AEncoding: TEncoding);
 begin
   try
     FInternalLock.Enter;
-    FSocket.Write(EncodeFrame(AMessage, TOperationCode.BINARY_FRAME));
+    FSocket.Write(EncodeFrame(BytesToString(AMessage, AEncoding), TOperationCode.BINARY_FRAME));
   finally
     FInternalLock.Leave;
   end;
@@ -630,6 +641,16 @@ procedure TBirdSocketClient.StartHeartBeat;
     end);
 end;
 
+procedure TBirdSocketClient.TriggerOnMessage(const AMsg: string);
+begin
+  TThread.Queue(nil,
+    procedure
+    begin
+      if Assigned(FOnMessage) then
+        FOnMessage(AMsg);
+    end);
+end;
+
 function TBirdSocketClient.SetBit(const AValue: Cardinal; const AByte: Byte): Cardinal;
 begin
   Result := AValue or (1 shl AByte);