Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on api

Browse Source
This commit is contained in:
Pascal
2024-08-15 15:51:23 +02:00
parent c24b460a0d
commit f57aef5f4f
6 changed files with 112 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Pilz.Networking/Api/ApiClient.cs
View File

@@ -1,9 +1,41 @@
namespace Pilz.Networking.Api;
public class ApiClient : IApiClient
public class ApiClient(string apiUrl) : IApiClient
{
public void MakeRequest<T>(string url, T message) where T : ApiMessage
protected readonly HttpClient httpClient = new();
public string ApiUrl { get; } = apiUrl;
public IMessageSerializer Serializer { get; set; } = new DefaultMessageSerializer();
public virtual async Task<ApiResponse> SendMessage<TResponse>(string url, ApiMessage message, IMessageSerializer? serializer)
{
// ...
serializer ??= Serializer;
//message.AuthSecret = AuthSecret;
var res = await Send(url, message, serializer);
return new(res.StatusCode);
}
public virtual async Task<ApiResponse<TResponse>> SendRequest<TResponse>(string url, ApiMessage message, IMessageSerializer? serializer) where TResponse : ApiMessage
{
serializer ??= Serializer;
//message.AuthSecret = AuthSecret;
var res = await Send(url, message, serializer);
TResponse? result = null;
if (res.IsSuccessStatusCode)
result = serializer.Deserialize(await res.Content.ReadAsStringAsync(), typeof(TResponse)) as TResponse;
return new(res.StatusCode, result);
}
protected virtual async Task<HttpResponseMessage> Send(string url, ApiMessage message, IMessageSerializer serializer)
{
var fullRequestUrl = ApiUrl + url;
var content = new StringContent(serializer.Serialize(message)!, null, "application/json");
return await httpClient.PostAsync(fullRequestUrl, content);
}
}

13
Pilz.Networking/Api/ApiResponse.cs Normal file
View File

@@ -0,0 +1,13 @@
using System.Net;
namespace Pilz.Networking.Api;
public record class ApiResponse(
HttpStatusCode StatusCode)
{
public void EnsureOk()
{
if (StatusCode != HttpStatusCode.OK)
throw new Exception("Api return is not ok!");
}
}

15
Pilz.Networking/Api/ApiResponseT.cs Normal file
View File

@@ -0,0 +1,15 @@
using System.Net;
namespace Pilz.Networking.Api;
public record class ApiResponse<T>(
HttpStatusCode StatusCode,
T? Message)
where T : ApiMessage
{
public void EnsureOk()
{
if (StatusCode != HttpStatusCode.OK)
throw new Exception("Api return is not ok!");
}
}

3
Pilz.Networking/Api/ApiResult.cs
View File

@@ -4,8 +4,7 @@ namespace Pilz.Networking.Api;
public record class ApiResult(
HttpStatusCode StatusCode,
ApiMessage? Message = null,
string? StatusDescription = null)
ApiMessage? Message = null)
{
public static ApiResult Ok()
{

87
Pilz.Networking/Api/ApiServer.cs
View File

@@ -50,50 +50,55 @@ public class ApiServer(string apiUrl) : ApiClient, IApiServer
protected virtual void Listen()
{
while (httpListener.IsListening)
CheckContext();
}
protected virtual void CheckContext()
{
var context = httpListener.GetContext();
void close() => context.Response.OutputStream.Close();
if (context.Request.HttpMethod != HttpMethod.Post.Method
|| context.Request.ContentType is not string contentType
|| !contentType.Contains("application/json"))
{
var context = httpListener.GetContext();
if (context.Request.HttpMethod != HttpMethod.Post.Method
|| context.Request.ContentType is not string contentType
|| contentType.Contains("application/json")
|| context.Request.AcceptTypes is null
|| context.Request.AcceptTypes.Contains("application/json"))
{
close();
continue;
}
// Parse url
var path = context.Request.Url?.PathAndQuery.Replace(ApiUrl, string.Empty);
if (string.IsNullOrWhiteSpace(path) || context.Request.ContentLength64 <= 0)
{
close();
continue;
}
// Read input content
using StreamReader input = new(context.Request.InputStream);
var contentJson = input.ReadToEnd();
// Handle message
if (HandleMessage(path, contentJson) is not string resultJson)
{
close();
continue;
}
// Set response parameters
context.Response.StatusCode = (int)args.ResponseStatusCode;
context.Response.StatusDescription = args.ResponseStatusDescription;
// Write response content
context.Response.ContentType = ContentTypes.CONTENT_TYPE_JSON;
using StreamWriter output = new(context.Response.OutputStream);
output.Write(resultJson);
close();
void close() => context.Response.OutputStream.Close();
return;
}
// Parse url
var path = context.Request.Url?.PathAndQuery.Replace(ApiUrl, string.Empty);
if (string.IsNullOrWhiteSpace(path) || context.Request.ContentLength64 <= 0)
{
close();
return;
}
// Read input content
using StreamReader input = new(context.Request.InputStream);
var contentJson = input.ReadToEnd();
// Handle message
if (HandleMessage(path, contentJson) is not PrivateApiResult result)
{
close();
return;
}
// Set response parameters
context.Response.StatusCode = (int)result.Original.StatusCode;
if (result.Original.StatusDescription is not null)
context.Response.StatusDescription = result.Original.StatusDescription;
// Write response content
if (result.ResultJson is not null)
{
context.Response.ContentType = "application/json";
using StreamWriter output = new(context.Response.OutputStream);
output.Write(result);
}
close();
}
protected virtual PrivateApiResult? HandleMessage(string url, string json)

3
Pilz.Networking/Api/IApiClient.cs
View File

@@ -2,5 +2,6 @@
public interface IApiClient
{
void MakeRequest<T>(string url, T message) where T : ApiMessage;
Task<ApiResponse> SendMessage<TResponse>(string url, ApiMessage message, IMessageSerializer? serializer = null);
Task<ApiResponse<TResponse>> SendRequest<TResponse>(string url, ApiMessage message, IMessageSerializer? serializer = null) where TResponse : ApiMessage;
}