Skip to content

Commit 937e559

Browse files
author
Wayfarer
committed
sync back
2 parents cffa163 + 5031ada commit 937e559

40 files changed

Lines changed: 950 additions & 324 deletions

‎Common.ExtendedObject.Tests/BiMapTests.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public class BiMapTests
2222
[TestMethod]
2323
public void Add_ValidPair_AddsToBothSides()
2424
{
25-
var map = new BiMap<string>();
26-
map.Add("Key", "Value");
25+
var map = new BiMap<string> { { "Key", "Value" } };
2726

2827
Assert.AreEqual("Value", map.GetForward("Key"));
2928
Assert.AreEqual("Key", map.GetReverse("Value"));
@@ -36,9 +35,8 @@ public void Add_ValidPair_AddsToBothSides()
3635
[ExpectedException(typeof(ArgumentException))]
3736
public void Add_DuplicateValue_ThrowsException()
3837
{
39-
var map = new BiMap<string>();
40-
map.Add("A", "Shared");
41-
map.Add("B", "Shared"); // This should trigger your duplicate check
38+
var map = new BiMap<string> { { "A", "Shared" }, { "B", "Shared" } // This should trigger your duplicate check
39+
};
4240
}
4341

4442
/// <summary>
@@ -47,8 +45,7 @@ public void Add_DuplicateValue_ThrowsException()
4745
[TestMethod]
4846
public void Remove_RemovesFromBothSides()
4947
{
50-
var map = new BiMap<int>();
51-
map.Add(1, 100);
48+
var map = new BiMap<int> { { 1, 100 } };
5249
map.RemoveByLeft(1);
5350

5451
Assert.IsFalse(map.Contains(1));

‎CommonLibraryGuiTests/Image/example Polaris.png‎

189 Bytes
Loading

‎CommonLibraryGuiTests/Image/example.png‎

48 Bytes
Loading

‎Communication/HttpClientManager.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,18 @@ namespace Communication
2222
/// </summary>
2323
public static class HttpClientManager
2424
{
25+
/// <summary>
26+
/// The tracing handler
27+
/// </summary>
28+
private static readonly HttpWireTracingHandler TracingHandler = new()
29+
{
30+
InnerHandler = new HttpClientHandler()
31+
};
32+
2533
/// <summary>
2634
/// Singleton pattern is correct here
2735
/// </summary>
28-
private static readonly HttpClient HttpClient = new();
36+
private static readonly HttpClient HttpClient = new(TracingHandler);
2937

3038
/// <summary>
3139
/// Calls a SOAP service asynchronously.

‎Communication/HttpWireTracingHandler.cs‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
/*
2+
* COPYRIGHT: See COPYING in the top level directory
3+
* PROJECT: Communication
4+
* FILE: HttpWireTracingHandler.cs
5+
* PURPOSE: HTTP Message Handler middleware for Insomnia-like wire tracing with Trace/String toggle
6+
* PROGRAMMER: Peter Geinitz (Wayfarer)
7+
*/
8+
9+
using System;
10+
using System.Diagnostics;
11+
using System.Net.Http;
12+
using System.Text;
13+
using System.Threading;
14+
using System.Threading.Tasks;
15+
16+
namespace Communication
17+
{
18+
/// <summary>
19+
/// Intercept Http messages and trace results. Supports toggling between System.Diagnostics.Trace and String output.
20+
/// </summary>
21+
/// <seealso cref="DelegatingHandler" />
22+
public class HttpWireTracingHandler : DelegatingHandler
23+
{
24+
private readonly object _lockObj = new object();
25+
private string _lastTrace = string.Empty;
26+
27+
/// <summary>
28+
/// Gets or sets a value indicating whether the log should be written to <see cref="System.Diagnostics.Trace"/>.
29+
/// Default is true.
30+
/// </summary>
31+
public bool LogToTrace { get; set; } = true;
32+
33+
/// <summary>
34+
/// Optional callback that triggers whenever a new full wire trace string is generated.
35+
/// Perfect for UI bindings (e.g., updating a Blazor log terminal).
36+
/// </summary>
37+
public Action<string>? OnTraceCaptured { get; set; }
38+
39+
/// <summary>
40+
/// Holds the exact string content of the very last captured HTTP wire trace.
41+
/// </summary>
42+
public string LastTrace
43+
{
44+
get
45+
{
46+
lock (_lockObj) { return _lastTrace; }
47+
}
48+
private set
49+
{
50+
lock (_lockObj) { _lastTrace = value; }
51+
}
52+
}
53+
54+
/// <summary>
55+
/// Sends an HTTP request to the inner handler to send to the server as an asynchronous operation.
56+
/// </summary>
57+
/// <param name="request">The HTTP request message to send to the server.</param>
58+
/// <param name="cancellationToken">A cancellation token to cancel operation.</param>
59+
/// <returns>
60+
/// The task object representing the asynchronous operation.
61+
/// </returns>
62+
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
63+
{
64+
// Lokaler Speicher für diese spezifische Anfrage (Thread-Safety!)
65+
var sb = new StringBuilder();
66+
67+
sb.AppendLine("\n* ------------------ WIRE TRACE START ------------------ *");
68+
69+
// 1. REQUEST LOGGING (>)
70+
sb.AppendLine($"\n> {request.Method} {request.RequestUri.PathAndQuery} HTTP/{request.Version}");
71+
sb.AppendLine($"> Host: {request.RequestUri.Host}");
72+
73+
foreach (var header in request.Headers)
74+
{
75+
sb.AppendLine($"> {header.Key}: {string.Join(", ", header.Value)}");
76+
}
77+
78+
if (request.Content != null)
79+
{
80+
foreach (var header in request.Content.Headers)
81+
{
82+
sb.AppendLine($"> {header.Key}: {string.Join(", ", header.Value)}");
83+
}
84+
85+
// Buffer content safely so we don't disrupt the stream
86+
await request.Content.LoadIntoBufferAsync();
87+
var reqBody = await request.Content.ReadAsStringAsync();
88+
if (!string.IsNullOrEmpty(reqBody))
89+
{
90+
sb.AppendLine("> ");
91+
sb.AppendLine(reqBody.Length > 1000 ? reqBody.Substring(0, 1000) + "... [TRUNCATED]" : reqBody);
92+
}
93+
}
94+
95+
sb.AppendLine("\n* Technical upload complete, awaiting response...");
96+
97+
// Execute the actual HTTP Call
98+
var response = await base.SendAsync(request, cancellationToken);
99+
100+
// 2. RESPONSE LOGGING (<)
101+
sb.AppendLine($"\n< HTTP/{response.Version} {(int)response.StatusCode} {response.StatusCode}");
102+
103+
foreach (var header in response.Headers)
104+
{
105+
sb.AppendLine($"< {header.Key}: {string.Join(", ", header.Value)}");
106+
}
107+
if (response.Content != null)
108+
{
109+
foreach (var header in response.Content.Headers)
110+
{
111+
sb.AppendLine($"< {header.Key}: {string.Join(", ", header.Value)}");
112+
}
113+
114+
var resBody = await response.Content.ReadAsStringAsync();
115+
if (!string.IsNullOrEmpty(resBody))
116+
{
117+
sb.AppendLine("< ");
118+
sb.AppendLine(resBody);
119+
}
120+
}
121+
122+
sb.AppendLine("\n* ------------------- WIRE TRACE END ------------------- *\n");
123+
124+
// --- AUSWERTUNG DES WECHSELSCHALTERS ---
125+
string finalTraceLog = sb.ToString();
126+
LastTrace = finalTraceLog;
127+
128+
// Schalter 1: Standard System.Diagnostics.Trace
129+
if (LogToTrace)
130+
{
131+
Trace.Write(finalTraceLog);
132+
}
133+
134+
// Schalter 2: Event/Callback für String-Verarbeitung abfeuern
135+
OnTraceCaptured?.Invoke(finalTraceLog);
136+
137+
return response;
138+
}
139+
}
140+
}

‎Communication/Listener.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ public void StopListening()
9393
}
9494

9595
/// <summary>
96-
/// Handles the client.
96+
/// Handles the client.
9797
/// </summary>
98-
/// <param name="obj">The object.</param>
98+
/// <param name="client">The client.</param>
9999
private static async Task HandleClientAsync(TcpClient client)
100100
{
101101
try

‎Communication/NetCom.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ public Task<bool> SaveFile(string filePath, string url, IProgress<int>? progress
3838
}
3939

4040
/// <inheritdoc />
41-
/// <summary>
42-
/// Saves the file.
43-
/// </summary>
44-
/// <param name="filePath">The file path.</param>
4541
public Task SaveFile(string filePath, IEnumerable<string> urls, IProgress<int>? progress = null,
4642
CancellationToken cancellationToken = default)
4743
{

‎CommunicationTests/HttpWireTracingHandlerTests.cs‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
/*
2+
* COPYRIGHT: See COPYING in the top level directory
3+
* PROJECT: CommunicationTests
4+
* FILE: HttpWireTracingHandlerTests.cs
5+
* PURPOSE: Unit tests for HttpWireTracingHandler ensuring correct request/response interception and tracing
6+
* PROGRAMMER: Peter Geinitz (Wayfarer)
7+
*/
8+
9+
using System.Diagnostics;
10+
using System.Net;
11+
using System.Text;
12+
using Communication;
13+
14+
namespace CommunicationTests
15+
{
16+
/// <summary>
17+
/// Test our new Http wire tracer.
18+
/// </summary>
19+
[TestClass]
20+
public class HttpWireTracingHandlerTests
21+
{
22+
/// <summary>
23+
/// The test URL
24+
/// </summary>
25+
private const string TestUrl = "https://localhost/test/api/endpoint";
26+
27+
/// <summary>
28+
/// Sends the asynchronous should log request and response to trace and return correct response.
29+
/// </summary>
30+
[TestMethod]
31+
public async Task SendAsync_ShouldLogRequestAndResponseToTrace_AndReturnCorrectResponse()
32+
{
33+
// Arrange
34+
using var stringWriter = new StringWriter();
35+
using var traceListener = new TextWriterTraceListener(stringWriter);
36+
Trace.Listeners.Add(traceListener);
37+
38+
var expectedResponseBody = "{\"status\":\"success\",\"message\":\"f81dcbd2\"}";
39+
var innerHandler = new MockHttpMessageHandler(HttpStatusCode.OK, expectedResponseBody);
40+
41+
var tracingHandler = new HttpWireTracingHandler
42+
{
43+
//switch Trace one and off
44+
LogToTrace = true,
45+
InnerHandler = innerHandler
46+
};
47+
48+
using var client = new HttpClient(tracingHandler);
49+
var requestContent = new StringContent("{\"input\":\"data_from_riesa\"}", Encoding.UTF8, "application/json");
50+
51+
try
52+
{
53+
// Act
54+
var response = await client.PostAsync(TestUrl, requestContent);
55+
var actualResponseBody = await response.Content.ReadAsStringAsync();
56+
57+
// Erzwinge das Schreiben aller gepufferten Trace-Daten
58+
Trace.Flush();
59+
var traceOutput = stringWriter.ToString();
60+
61+
// Assert 1: Überprüfung der echten HTTP-Funktionalität
62+
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
63+
Assert.AreEqual(expectedResponseBody, actualResponseBody);
64+
65+
// Assert 2: Überprüfung der Wire-Trace Struktur (Insomnia Layout)
66+
Assert.IsTrue(traceOutput.Contains("WIRE TRACE START"), "Trace missing start boundary.");
67+
Assert.IsTrue(traceOutput.Contains("WIRE TRACE END"), "Trace missing end boundary.");
68+
69+
// Assert 3: Validierung der Request-Daten (>)
70+
Assert.IsTrue(traceOutput.Contains("> POST /test/api/endpoint"), "Request method or path path not traced correctly.");
71+
Assert.IsTrue(traceOutput.Contains("> Host: localhost"), "Request host header missing in trace.");
72+
Assert.IsTrue(traceOutput.Contains("Content-Type: application/json"), "Content-Type header missing in request trace.");
73+
Assert.IsTrue(traceOutput.Contains("{\"input\":\"data_from_riesa\"}"), "Request body payload missing in trace.");
74+
75+
// Assert 4: Validierung der Response-Daten (<)
76+
Assert.IsTrue(traceOutput.Contains("< HTTP/1.1 200 OK"), "Response status code line missing or incorrect in trace.");
77+
Assert.IsTrue(traceOutput.Contains(expectedResponseBody), "Response body payload missing in trace.");
78+
}
79+
finally
80+
{
81+
// Berebereinigung des Trace-Listeners, um Seiteneffekte auf andere Tests zu verhindern
82+
Trace.Listeners.Remove(traceListener);
83+
}
84+
}
85+
86+
/// <summary>
87+
/// A local HTTP mock handler for simulating network traffic without using the physical connection.
88+
/// </summary>
89+
/// <seealso cref="HttpMessageHandler" />
90+
private class MockHttpMessageHandler : HttpMessageHandler
91+
{
92+
private readonly HttpStatusCode _statusCode;
93+
private readonly string _content;
94+
95+
public MockHttpMessageHandler(HttpStatusCode statusCode, string content)
96+
{
97+
_statusCode = statusCode;
98+
_content = content;
99+
}
100+
101+
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
102+
{
103+
var response = new HttpResponseMessage(_statusCode)
104+
{
105+
Content = new StringContent(_content, Encoding.UTF8, "application/json"),
106+
Version = request.Version
107+
};
108+
109+
return Task.FromResult(response);
110+
}
111+
}
112+
}
113+
}

‎Core.Apps/CommandFactory.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public static IReadOnlyList<ICommand> GetCommands(Weave? weave = null)
4848
new HotPathAnalyzer(), new LicenseHeaderAnalyzer(), new UnusedClassAnalyzer(),
4949
new UnusedConstantAnalyzer(), new UnusedLocalVariableAnalyzer(), new UnusedParameterAnalyzer(),
5050
new UnusedPrivateFieldAnalyzer(), new DocCommentCoverageCommand(), new DeadReferenceAnalyzer(),
51-
new ApiExplorerCommand(), new LogTailCommand(), new SmartPingPro(), new Tree()
51+
new ApiExplorerCommand(), new LogTailCommand(), new SmartPingPro(), new Tree(),
52+
new StructPaddingAnalyzer(), new UnusedMemberAnalyzer(), new MagicNumberAnalyzer()
5253
});
5354

5455
// --- PRODUCERS (Require Registry) ---
@@ -106,7 +107,8 @@ public static IReadOnlyList<ICodeAnalyzer> GetAllAnalyzers()
106107
new DuplicateStringLiteralAnalyzer(), new EventHandlerAnalyzer(), new HotPathAnalyzer(),
107108
new LicenseHeaderAnalyzer(), new UnusedClassAnalyzer(), new UnusedConstantAnalyzer(),
108109
new UnusedLocalVariableAnalyzer(), new UnusedParameterAnalyzer(), new UnusedPrivateFieldAnalyzer(),
109-
new DocCommentCoverageCommand(), new DeadReferenceAnalyzer()
110+
new DocCommentCoverageCommand(), new DeadReferenceAnalyzer(), new StructPaddingAnalyzer(),
111+
new UnusedMemberAnalyzer(), new MagicNumberAnalyzer()
110112
};
111113

112114
return modules;

0 commit comments

Comments
 (0)