Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enrich http handler 18 #19

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enrich http handler 18 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d302acb
[Issue-18] Adding an enricher to manipulate the http-handler
Dec 11, 2019
cc469ea
[Issue-18] fixed simplier assigning default-values
Dec 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Innovator.Client/ConnectionPreferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ public class ConnectionPreferences
/// </summary>
public string Url { get; set; }

/// <summary>
/// An Action that is called on the httpHandler of the DefaultHttpClient
/// </summary>
public Action<HttpClientHandler> HttpClientHandlerEnricher { get; set; } = h => { };


/// <summary>
/// Initializes a new instance of the <see cref="ConnectionPreferences"/> class.
/// </summary>
Expand Down
65 changes: 34 additions & 31 deletions src/Innovator.Client/Factory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public static class Factory
{
private static Action<int, string, IEnumerable<KeyValuePair<string, object>>> _logListener;
private static MemoryCache<string, byte[]> _imageCache = new MemoryCache<string, byte[]>();
private static ConnectionPreferences _preferences;

internal static Func<HttpClient> DefaultService { get; set; }

Expand Down Expand Up @@ -60,6 +61,7 @@ static Factory()
{
CookieContainer = new CookieContainer()
};
_preferences.HttpClientHandlerEnricher(handler);
var infinite = TimeSpan.FromMilliseconds(-1);
return new SyncHttpClient(handler) { Timeout = infinite };
};
Expand Down Expand Up @@ -116,12 +118,12 @@ public static IRemoteConnection GetConnection(ConnectionPreferences preferences)
/// </example>
public static IRemoteConnection GetConnection(string url, string userAgent)
{
var prefs = new ConnectionPreferences
_preferences = new ConnectionPreferences
{
Url = url
};
prefs.Headers.UserAgent = userAgent;
return GetConnection(prefs, false).Value;
_preferences.Headers.UserAgent = userAgent;
return GetConnection(_preferences, false).Value;
}

/// <summary>
Expand All @@ -132,9 +134,9 @@ public static IRemoteConnection GetConnection(string url, string userAgent)
/// <returns>A connection object</returns>
public static IRemoteConnection GetConnection(string url, ConnectionPreferences preferences)
{
preferences = preferences ?? new ConnectionPreferences();
preferences.Url = url;
return GetConnection(preferences, false).Value;
_preferences = preferences ?? new ConnectionPreferences();
_preferences.Url = url;
return GetConnection(_preferences, false).Value;
}

/// <summary>
Expand All @@ -148,9 +150,9 @@ public static IRemoteConnection GetConnection(string url, ConnectionPreferences
public static IPromise<IRemoteConnection> GetConnection(string url
, ConnectionPreferences preferences, bool async)
{
preferences = preferences ?? new ConnectionPreferences();
preferences.Url = url;
return GetConnection(preferences, async);
_preferences = preferences ?? new ConnectionPreferences();
_preferences.Url = url;
return GetConnection(_preferences, async);
}

/// <summary>
Expand All @@ -162,17 +164,17 @@ public static IPromise<IRemoteConnection> GetConnection(string url
/// <returns>A promise to return a connection object</returns>
public static IPromise<IRemoteConnection> GetConnection(ConnectionPreferences preferences, bool async)
{
preferences = preferences ?? new ConnectionPreferences();
var url = preferences.Url;
_preferences = preferences ?? new ConnectionPreferences();
var url = _preferences.Url;

url = (url ?? "").TrimEnd('/');
if (url.EndsWith("Server/InnovatorServer.aspx", StringComparison.OrdinalIgnoreCase))
url = url.Substring(0, url.Length - 21);
if (!url.EndsWith("/server", StringComparison.OrdinalIgnoreCase)) url += "/Server";
var configUrl = url + "/mapping.xml";

var masterService = preferences.HttpService ?? DefaultService.Invoke();
var arasSerice = preferences.HttpService ?? DefaultService.Invoke();
var masterService = _preferences.HttpService ?? DefaultService.Invoke();
var arasSerice = _preferences.HttpService ?? DefaultService.Invoke();
Func<ServerMapping, IRemoteConnection> connFactory = m =>
{
var uri = (m.Url ?? "").TrimEnd('/');
Expand All @@ -182,17 +184,17 @@ public static IPromise<IRemoteConnection> GetConnection(ConnectionPreferences pr
case ServerType.Proxy:
throw new NotSupportedException();
default:
return ArasConn(arasSerice, uri, preferences);
return ArasConn(arasSerice, uri, _preferences);
}
};

var result = new Promise<IRemoteConnection>();
var req = new HttpRequest
{
UserAgent = preferences.Headers.UserAgent
UserAgent = _preferences.Headers.UserAgent
};
req.SetHeader("Accept", "text/xml");
foreach (var header in preferences.Headers.NonUserAgentHeaders())
foreach (var header in _preferences.Headers.NonUserAgentHeaders())
{
req.SetHeader(header.Key, header.Value);
}
Expand All @@ -208,7 +210,7 @@ public static IPromise<IRemoteConnection> GetConnection(ConnectionPreferences pr
var data = r.AsString();
if (string.IsNullOrEmpty(data))
{
result.Resolve(ArasConn(arasSerice, url, preferences));
result.Resolve(ArasConn(arasSerice, url, _preferences));
}
else
{
Expand All @@ -217,7 +219,7 @@ public static IPromise<IRemoteConnection> GetConnection(ConnectionPreferences pr
var servers = ServerMapping.FromXml(data).ToArray();
if (servers.Length < 1)
{
result.Resolve(ArasConn(arasSerice, url, preferences));
result.Resolve(ArasConn(arasSerice, url, _preferences));
}
else if (servers.Length == 1)
{
Expand All @@ -229,49 +231,50 @@ public static IPromise<IRemoteConnection> GetConnection(ConnectionPreferences pr
{
server.Factory = connFactory;
}
result.Resolve(new MappedConnection(servers, preferences.AuthCallback));
result.Resolve(new MappedConnection(servers, _preferences.AuthCallback));
}
}
catch (XmlException)
{
result.Resolve(ArasConn(arasSerice, url, preferences));
result.Resolve(ArasConn(arasSerice, url, _preferences));
}
}
}).Fail(ex =>
{
result.Resolve(ArasConn(arasSerice, url, preferences));
result.Resolve(ArasConn(arasSerice, url, _preferences));
})).Always(trace.Dispose);


if (preferences.Credentials != null)
if (_preferences.Credentials != null)
{
IRemoteConnection conn = null;
return result
.Continue(c =>
{
conn = c;
return c.Login(preferences.Credentials, async);
return c.Login(_preferences.Credentials, async);
})
.Convert(u => conn);
}

return result;
}

private static IRemoteConnection ArasConn(HttpClient arasService, string url, ConnectionPreferences preferences)
private static IRemoteConnection ArasConn(HttpClient arasService, string url, ConnectionPreferences pref)
{
var result = new Connection.ArasHttpConnection(arasService, url, preferences.ItemFactory);
if (preferences.Headers.Any() || preferences.DefaultTimeout.HasValue)
_preferences = pref;
var result = new Connection.ArasHttpConnection(arasService, url, _preferences.ItemFactory);
if (_preferences.Headers.Any() || _preferences.DefaultTimeout.HasValue)
{
result.DefaultSettings(r =>
{
if (preferences.DefaultTimeout.HasValue)
r.Timeout = TimeSpan.FromMilliseconds(preferences.DefaultTimeout.Value);
if (_preferences.DefaultTimeout.HasValue)
r.Timeout = TimeSpan.FromMilliseconds(_preferences.DefaultTimeout.Value);

if (!string.IsNullOrEmpty(preferences.Headers.UserAgent))
r.UserAgent = preferences.Headers.UserAgent;
if (!string.IsNullOrEmpty(_preferences.Headers.UserAgent))
r.UserAgent = _preferences.Headers.UserAgent;

foreach (var header in preferences.Headers.NonUserAgentHeaders())
foreach (var header in _preferences.Headers.NonUserAgentHeaders())
{
r.SetHeader(header.Key, header.Value);
}
Expand Down