More refactoring, now depends on vsoft.uri project

Author: vincentparrett

Source/VSoft.HttpClient.WinHttpClient.pas

@@ -10,6 +10,7 @@ interface
   System.Classes,
   WinApi.Windows,
   VSoft.CancellationToken,
+  VSoft.URI,
   VSoft.HttpClient,
   VSoft.WinHttp.Api,
   VSoft.HttpClient.Response;
@@ -18,8 +19,9 @@ interface
 type
   THttpClient = class(TInterfacedObject, IHttpClient, IHttpClientInternal)
   private
+    FUri : IUri;
+
     FSession : HINTERNET;
-    FBaseUri : string;
     FUserAgent : string;
     FRequests : TList<TRequest>;
     FAuthTyp : THttpAuthType;
@@ -64,6 +66,7 @@   THttpClient = class(TInterfacedObject, IHttpClient, IHttpClientInternal)
     procedure SetBaseUri(const value : string);
     function GetUserAgent : string;
     procedure SetUserAgent(const value : string);
+    function GetUri : IUri;
 
     procedure SetAuthType(const value : THttpAuthType);
     function GetAuthType : THttpAuthType;
@@ -76,7 +79,9 @@   THttpClient = class(TInterfacedObject, IHttpClient, IHttpClientInternal)
     procedure SetUseHttp2(const value : boolean);
 
 
-    function CreateRequest(const resource : string) : TRequest;
+    function CreateRequest(const resource : string) : TRequest;overload;
+    function CreateRequest(const uri : IUri) : TRequest;overload;
+
 
     procedure UseSerializer(const useFunc : TUseSerializerFunc);overload;
     procedure UseSerializer(const serializer : IRestSerializer);overload;
@@ -91,7 +96,7 @@   THttpClient = class(TInterfacedObject, IHttpClient, IHttpClientInternal)
 
 
   public
-    constructor Create(const baseUri : string);
+    constructor Create(const uri : IUri);
     destructor Destroy;override;
   end;
 
@@ -123,10 +128,20 @@ procedure _HTTPCallback(hInternet: HINTERNET; dwContext: Pointer; dwInternetStat
 
 function THttpClient.CreateRequest(const resource: string): TRequest;
 begin
-  result := TRequest.Create(Self, resource);
+  if resource = '' then
+    result := TRequest.Create(Self, FUri)
+  else
+    result := TRequest.Create(Self, resource);
   FRequests.Add(result); //track requests to ensure they get freed.
 end;
 
+function THttpClient.CreateRequest(const uri: IUri): TRequest;
+begin
+  result := TRequest.Create(Self, uri);
+  FRequests.Add(result); //track requests to ensure they get freed.
+
+end;
+
 
 { THttpClient }
 
@@ -178,15 +193,16 @@ function THttpClient.ConfigureWinHttpRequest(hRequest: HINTERNET; const request:
   end;
 end;
 
-constructor THttpClient.Create(const baseUri : string);
+constructor THttpClient.Create(const uri : IUri);
 begin
   FRequests := TList<TRequest>.Create;
-  FBaseUri := baseUri;
+  FUri := uri;
   FUserAgent := 'VSoft.HttpClient';
   FWaitEvent := TEvent.Create(nil,false, false,'');
 end;
 
 
+
 destructor THttpClient.Destroy;
 var
   i : integer;
@@ -226,7 +242,7 @@ function THttpClient.GetAuthType: THttpAuthType;
 
 function THttpClient.GetBaseUri: string;
 begin
-  result := FBaseUri;
+  result := FUri.BaseUriString;
 end;
 
 
@@ -264,6 +280,11 @@ function THttpClient.GetResourceFromRequest(const request: TRequest): string;
   end;
 end;
 
+function THttpClient.GetUri: IUri;
+begin
+  result := FUri;
+end;
+
 function THttpClient.GetUseHttp2: boolean;
 begin
   result := FUseHttp2;
@@ -631,7 +652,7 @@ function THttpClient.Send(const request: TRequest; const cancellationToken: ICan
     urlComp.dwUrlPathLength   := DWORD(-1);
     urlComp.dwExtraInfoLength := DWORD(-1);
 
-    if not WinHttpCrackUrl(PWideChar(FBaseUri), 0, 0, urlComp ) then
+    if not WinHttpCrackUrl(PWideChar(FUri.BaseUriString), 0, 0, urlComp ) then
     begin
       FClientError := GetLastError;
       raise EHttpClientException.Create(ClientErrorToString(FClientError), FClientError);
@@ -656,7 +677,7 @@ function THttpClient.Send(const request: TRequest; const cancellationToken: ICan
       raise EHttpClientException.Create(ClientErrorToString(FClientError), FClientError);
     end;
 
-    dwOpenRequestFlags := WINHTTP_FLAG_REFRESH;
+    dwOpenRequestFlags := WINHTTP_FLAG_REFRESH + WINHTTP_FLAG_ESCAPE_PERCENT;
     if urlComp.nScheme = INTERNET_SCHEME_HTTPS then
       dwOpenRequestFlags := dwOpenRequestFlags + WINHTTP_FLAG_SECURE;
 
@@ -768,7 +789,7 @@ procedure THttpClient.SetAuthType(const value: THttpAuthType);
 
 procedure THttpClient.SetBaseUri(const value: string);
 begin
-  FBaseUri := value;
+  FUri.BaseUriString := value;
 end;
 
 procedure THttpClient.SetPassword(const value: string);
@@ -842,9 +863,7 @@ function THttpClient.WriteHeaders(hRequest: HINTERNET; const headers: TStrings):
       sHeaders := sHeaders + cContentTypeHeader + ': ' +headers.ValueFromIndex[i] + '; charset=' + sCharSet
     else
       sHeaders := sHeaders + headers.Names[i] + ': ' +headers.ValueFromIndex[i];
-
-//    if i < headers.count -1 then
-      sHeaders := sHeaders + #13#10;
+    sHeaders := sHeaders + #13#10;
   end;
 
   if not WinHttpAddRequestHeaders(hRequest, PWideChar(sHeaders), $ffffffff, WINHTTP_ADDREQ_FLAG_ADD) then

Source/VSoft.HttpClient.pas

@@ -6,7 +6,8 @@ interface
   System.Classes,
   System.SysUtils,
   System.Typinfo,
-  VSoft.CancellationToken;
+  VSoft.CancellationToken,
+  VSoft.Uri;
 
 
 type
@@ -68,6 +69,8 @@   TRequest = class;
   ['{1F09A9A8-A32E-41F3-811B-BA7D5B352185}']
     function Send(const request : TRequest; const cancellationToken : ICancellationToken = nil) : IHttpResponse;overload;
     procedure ReleaseRequest(const request : TRequest);
+    function GetBaseUri: string;
+    function GetUri : IUri;
   end;
 
 
@@ -79,7 +82,6 @@   TRequest = class
     FRequestParams : TStringList;
     FFiles : TStringList;
     FUrlSegments : TStringList;
-    FResource : string;
     FContent : TStream;
     FOwnsContent : boolean;
     FSaveAsFile : string;
@@ -90,6 +92,8 @@   TRequest = class
     FPassword : string;
     FProxyUserName : string;
     FProxyPassword : string;
+
+    FURI : IUri;
   protected
     function GetHeaders : TStrings;
     function GetParameters : TStrings;
@@ -116,7 +120,8 @@   TRequest = class
     function Client : IHttpClientInternal;
 
   public
-    constructor Create(const client : TObject; const resource : string);
+    constructor Create(const client : TObject; const resource : string);overload;
+    constructor Create(const client : TObject; const uri : IUri);overload;
     destructor Destroy; override;
 
 
@@ -187,7 +192,7 @@   TRequest = class
 
     property FollowRedirects : boolean read FFollowRedirects write FFollowRedirects;
     property HtttpMethod : THttpMethod read FHttpMethod;
-    property Resource    : string read FResource write FResource;
+    property Resource    : string read GetResource write SetResource;
     property ContentLength : Int64 read GetContentLength;
     property SaveAsFile  : string read FSaveAsFile write FSaveAsFile;
     property UserName  : string read FUserName write FUserName;
@@ -224,7 +229,8 @@   TRequest = class
     function GetPassword : string;
     procedure SetPassword(const value : string);
 
-    function CreateRequest(const resource : string) : TRequest;
+    function CreateRequest(const resource : string) : TRequest;overload;
+    function CreateRequest(const uri : IUri) : TRequest;overload;
 
     procedure UseSerializer(const useFunc : TUseSerializerFunc);overload;
     procedure UseSerializer(const serializer : IRestSerializer);overload;
@@ -240,7 +246,9 @@   TRequest = class
   end;
 
   THttpClientFactory = class
-   class function CreateClient(const baseUri: string = ''): IHttpClient;
+   class function CreateClient(const uri: string): IHttpClient;overload;
+   class function CreateClient(const uri: IUri): IHttpClient;overload;
+
   end;
 
   EHttpClientException = class(Exception)
@@ -372,15 +380,46 @@ function TRequest.Client: IHttpClientInternal;
   FClient.GetInterface(IHttpClientInternal, result)
 end;
 
-constructor TRequest.Create(const client: TObject;  const resource: string);
+constructor TRequest.Create(const client: TObject; const uri: IUri);
+var
+  queryParam : TQueryParam;
 begin
   FClient := client;
-  FResource := resource;
+  FURI := uri;
   FFiles := TStringlist.Create;
   FHeaders := TStringList.Create;
   FRequestParams := TStringList.Create;
   FUrlSegments := TStringList.Create;
   FFollowRedirects := true;
+
+  if Length(uri.QueryParams) > 0 then
+  begin
+    for queryParam in uri.QueryParams do
+      WithParameter(queryParam.Name, queryParam.Value);
+  end;
+end;
+
+constructor TRequest.Create(const client: TObject;  const resource: string);
+var
+  uri : IUri;
+  error : string;
+  clientInf : IHttpClientInternal;
+  sBaseUri : string;
+begin
+  if not client.GetInterface(IHttpClientInternal, clientInf) then
+    raise Exception.Create('Client does not implement interface!');
+  sBaseUri := clientInf.GetBaseUri;
+
+  if sBaseUri <> '' then
+     sBaseUri := sBaseUri + '/' + resource
+  else
+    sBaseUri := resource;
+
+  if not TUriFactory.TryParseWithError(sBaseUri, true, uri, error) then
+    raise EArgumentException.Create('Invalid Uri : ' + error);
+
+  Create(client, uri);
+
 end;
 
 function TRequest.Delete(const cancellationToken: ICancellationToken): IHttpResponse;
@@ -553,7 +592,7 @@ function TRequest.GetParameters: TStrings;
 
 function TRequest.GetResource: string;
 begin
-  result := FResource;
+  result := FURI.AbsolutePath;
 end;
 
 function TRequest.GetUrlSegments: TStrings;
@@ -695,7 +734,7 @@ procedure TRequest.SetContentType(const value: string);
 
 procedure TRequest.SetResource(const value: string);
 begin
-  FResource := value;
+ FURI.Path := value;
 end;
 
 
@@ -812,9 +851,20 @@ function TRequest.AddUrlSegement(const name, value: string): TRequest;
 
 { THttpClientFactory }
 
-class function THttpClientFactory.CreateClient( const baseUri: string): IHttpClient;
+class function THttpClientFactory.CreateClient(const uri : string): IHttpClient;
+var
+  theUri : IUri;
+  error : string;
+begin
+  if not TUriFactory.TryParseWithError(uri, true, theUri, error)  then
+    raise EArgumentOutOfRangeException.Create('Invalid Uri : ' + error );
+
+  result := THttpClient.Create(theUri);
+end;
+
+class function THttpClientFactory.CreateClient(const uri: IUri): IHttpClient;
 begin
-  result := THttpClient.Create(baseUri);
+  result := THttpClient.Create(uri);
 end;
 
 { EHttpClientException }