Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion DevBase.Net/DevBase.Net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageProjectUrl>https://github.com/AlexanderDotH/DevBase.git</PackageProjectUrl>
<RepositoryUrl>https://github.com/AlexanderDotH/DevBase.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Version>1.4.6</Version>
<Version>1.4.8</Version>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageTags>http;client;requests;proxy;socks5;jwt;authentication;fluent-api;async;retry;rate-limiting;json;html-parsing</PackageTags>
Expand Down
42 changes: 37 additions & 5 deletions DevBase.Net/Proxy/ProxyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,38 @@ public sealed class ProxyInfo
{
private static readonly ConcurrentDictionary<string, IWebProxy> ProxyCache = new();

public string Host { get; }
public int Port { get; }
public EnumProxyType Type { get; }
public NetworkCredential? Credentials { get; }
public string Host { get; set; } = string.Empty;
public int Port { get; set; }
public EnumProxyType Type { get; set; } = EnumProxyType.Http;
public NetworkCredential? Credentials { get; set; }

public string? Username
{
get => Credentials?.UserName;
set
{
if (value != null)
{
Credentials = new NetworkCredential(value, Credentials?.Password ?? string.Empty);
}
}
}

public string? Password
{
get => Credentials?.Password;
set
{
if (Credentials != null)
{
Credentials = new NetworkCredential(Credentials.UserName, value ?? string.Empty);
}
else if (value != null)
{
Credentials = new NetworkCredential(string.Empty, value);
}
}
}

public bool BypassLocalAddresses { get; init; }
public string[]? BypassList { get; init; }
Expand All @@ -22,7 +50,11 @@ public sealed class ProxyInfo
public int InternalServerPort { get; init; }

public string Key => $"{this.Type}://{this.Host}:{this.Port}";
public bool HasAuthentication => Credentials != null;
public bool HasAuthentication => Credentials != null && !string.IsNullOrEmpty(Credentials.UserName);

public ProxyInfo()
{
}

public ProxyInfo(string host, int port, EnumProxyType type = EnumProxyType.Http, NetworkCredential? credentials = null)
{
Expand Down
22 changes: 11 additions & 11 deletions DevBase.Net/Proxy/TrackedProxyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

namespace DevBase.Net.Proxy;

public sealed class TrackedProxyInfo
public class TrackedProxyInfo
{
private readonly object _lock = new();

public ProxyInfo Proxy { get; }
public int FailureCount { get; private set; }
public DateTime? LastFailure { get; private set; }
public bool IsTimedOut { get; private set; }
public DateTime? TimeoutUntil { get; private set; }
public int TotalTimeouts { get; private set; }
public int FailureCount { get; protected set; }
public DateTime? LastFailure { get; protected set; }
public bool IsTimedOut { get; protected set; }
public DateTime? TimeoutUntil { get; protected set; }
public int TotalTimeouts { get; protected set; }
public int MaxFailures { get; }
public TimeSpan TimeoutDuration { get; }

Expand Down Expand Up @@ -41,7 +41,7 @@ public TrackedProxyInfo(ProxyInfo proxy, int maxFailures = 3, TimeSpan? timeoutD
IsTimedOut = false;
}

public bool ReportFailure()
public virtual bool ReportFailure()
{
lock (_lock)
{
Expand All @@ -60,7 +60,7 @@ public bool ReportFailure()
}
}

public void ReportSuccess()
public virtual void ReportSuccess()
{
lock (_lock)
{
Expand All @@ -69,7 +69,7 @@ public void ReportSuccess()
}
}

public bool IsAvailable()
public virtual bool IsAvailable()
{
lock (_lock)
{
Expand All @@ -86,7 +86,7 @@ public bool IsAvailable()
}
}

public void ResetTimeout()
public virtual void ResetTimeout()
{
lock (_lock)
{
Expand All @@ -96,7 +96,7 @@ public void ResetTimeout()
}
}

public IWebProxy ToWebProxy() => Proxy.ToWebProxy();
public virtual IWebProxy ToWebProxy() => Proxy.ToWebProxy();

public override string ToString() =>
$"{Key} [Failures: {FailureCount}/{MaxFailures}, TimedOut: {IsTimedOut}]";
Expand Down
203 changes: 203 additions & 0 deletions DevBase.Test/DevBase/Async/TaskRegisterTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
using DevBase.Async.Task;

namespace DevBase.Test.DevBase.Async;

/// <summary>
/// Tests for the TaskRegister class.
/// Verifies task registration, suspension, resumption, and token management.
/// </summary>
public class TaskRegisterTests
{
/// <summary>
/// Tests that GenerateNewToken creates a valid token for a type.
/// </summary>
[Test]
public void GenerateNewToken_CreatesValidToken()
{
var register = new TaskRegister();

var token = register.GenerateNewToken("TestType");

Assert.That(token, Is.Not.Null);
Assert.That(token, Is.InstanceOf<TaskSuspensionToken>());
}

/// <summary>
/// Tests that GenerateNewToken returns the same token for the same type.
/// </summary>
[Test]
public void GenerateNewToken_ReturnsSameTokenForSameType()
{
var register = new TaskRegister();

var token1 = register.GenerateNewToken("TestType");
var token2 = register.GenerateNewToken("TestType");

Assert.That(token1, Is.SameAs(token2));
}

/// <summary>
/// Tests that GenerateNewToken returns different tokens for different types.
/// </summary>
[Test]
public void GenerateNewToken_ReturnsDifferentTokensForDifferentTypes()
{
var register = new TaskRegister();

var token1 = register.GenerateNewToken("Type1");
var token2 = register.GenerateNewToken("Type2");

Assert.That(token1, Is.Not.SameAs(token2));
}

/// <summary>
/// Tests that GetTokenByType returns the correct token.
/// </summary>
[Test]
public void GetTokenByType_ReturnsCorrectToken()
{
var register = new TaskRegister();
var generatedToken = register.GenerateNewToken("TestType");

var retrievedToken = register.GetTokenByType("TestType");

Assert.That(retrievedToken, Is.SameAs(generatedToken));
}

/// <summary>
/// Tests that Suspend suspends the token for a type.
/// </summary>
[Test]
public void Suspend_SuspendsToken()
{
var register = new TaskRegister();
var token = register.GenerateNewToken("TestType");

register.Suspend("TestType");

Assert.That(token.IsSuspended, Is.True);
}

/// <summary>
/// Tests that Resume resumes a suspended token.
/// </summary>
[Test]
public void Resume_ResumesToken()
{
var register = new TaskRegister();
var token = register.GenerateNewToken("TestType");

register.Suspend("TestType");
Assert.That(token.IsSuspended, Is.True);

register.Resume("TestType");
Assert.That(token.IsSuspended, Is.False);
}

/// <summary>
/// Tests that Suspend with multiple types suspends all of them.
/// </summary>
[Test]
public void Suspend_MultipleTypes_SuspendsAll()
{
var register = new TaskRegister();
var token1 = register.GenerateNewToken("Type1");
var token2 = register.GenerateNewToken("Type2");
var token3 = register.GenerateNewToken("Type3");

register.Suspend("Type1", "Type2", "Type3");

Assert.That(token1.IsSuspended, Is.True);
Assert.That(token2.IsSuspended, Is.True);
Assert.That(token3.IsSuspended, Is.True);
}

/// <summary>
/// Tests that RegisterTask with action creates and starts a task.
/// </summary>
[Test]
public async Task RegisterTask_WithAction_CreatesAndStartsTask()
{
var register = new TaskRegister();
var executed = false;

register.RegisterTask(() => { executed = true; }, "TestTask", startAfterCreation: true);

// Wait for task to execute
await Task.Delay(100);

Assert.That(executed, Is.True);
}

/// <summary>
/// Tests that RegisterTask with startAfterCreation=false does not start immediately.
/// </summary>
[Test]
public async Task RegisterTask_WithStartAfterCreationFalse_DoesNotStartImmediately()
{
var register = new TaskRegister();
var executed = false;
var task = new Task(() => { executed = true; });

register.RegisterTask(task, "TestTask", startAfterCreation: false);

await Task.Delay(100);

Assert.That(executed, Is.False);
}

/// <summary>
/// Tests that tokens work with integer type identifiers.
/// </summary>
[Test]
public void GenerateNewToken_WorksWithIntegerTypes()
{
var register = new TaskRegister();

var token1 = register.GenerateNewToken(1);
var token2 = register.GenerateNewToken(2);
var token1Again = register.GenerateNewToken(1);

Assert.That(token1, Is.Not.SameAs(token2));
Assert.That(token1, Is.SameAs(token1Again));
}

/// <summary>
/// Tests that tokens work with custom object type identifiers.
/// </summary>
[Test]
public void GenerateNewToken_WorksWithCustomObjects()
{
var register = new TaskRegister();
var key1 = new TestKey("key1");
var key2 = new TestKey("key2");
var key1Duplicate = new TestKey("key1");

var token1 = register.GenerateNewToken(key1);
var token2 = register.GenerateNewToken(key2);
var token1Again = register.GenerateNewToken(key1Duplicate);

Assert.That(token1, Is.Not.SameAs(token2));
Assert.That(token1, Is.SameAs(token1Again)); // Same because Equals returns true
}

private class TestKey
{
private readonly string _value;

public TestKey(string value)
{
_value = value;
}

public override bool Equals(object? obj)
{
return obj is TestKey other && _value == other._value;
}

public override int GetHashCode()
{
return _value.GetHashCode();
}
}
}
5 changes: 5 additions & 0 deletions DevBase/Async/Task/TaskSuspensionToken.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ public class TaskSuspensionToken
private bool _suspended;
private TaskCompletionSource<bool> _resumeRequestTcs;

/// <summary>
/// Gets whether the token is currently suspended.
/// </summary>
public bool IsSuspended => _suspended;

/// <summary>
/// Initializes a new instance of the <see cref="TaskSuspensionToken"/> class.
/// </summary>
Expand Down
4 changes: 3 additions & 1 deletion DevBase/DevBase.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
<PackageProjectUrl>https://github.com/AlexanderDotH/DevBase.git</PackageProjectUrl>
<RepositoryUrl>https://github.com/AlexanderDotH/DevBase.git</RepositoryUrl>
<RepositoryType>Public</RepositoryType>
<Version>1.3.5</Version>
<Version>1.4.1</Version>
<AssemblyVersion>1.4.1.0</AssemblyVersion>
<FileVersion>1.4.1.0</FileVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
Expand Down
9 changes: 7 additions & 2 deletions DevBase/Globals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@

public class Globals
{
public static bool ALLOW_SERIALIZATION { get; set; } = true;
}
/// <summary>
/// Controls whether BinaryFormatter serialization is allowed for size measurement.
/// Disabled by default for .NET 9+ compatibility where BinaryFormatter is removed.
/// When disabled, object size estimation uses reflection-based calculation.
/// </summary>
public static bool AllowSerialization { get; set; } = false;
}
Loading
Loading