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

ApiStreamMessage

Browse Source
This commit is contained in:
Pilzinsel64
2025-10-31 11:36:28 +01:00
parent d8b89379cc
commit ba59f7df79
6 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Pilz.Net/Api/ApiClient.cs
View File

@@ -66,8 +66,10 @@ public class ApiClient(string apiUrl) : IApiClient
{
if (mediaType == "application/json" && context.Serializer != null)
result = context.Serializer.Deserialize(await context.HttpResponse.Content.ReadAsStringAsync(), typeof(TResponse)) as TResponse;
else if (typeof(TResponse).IsAssignableTo(typeof(ApiRawMessage)) && mediaType == "application/octet-stream")
result = (TResponse)(object)new ApiRawMessage(await context.HttpResponse.Content.ReadAsByteArrayAsync());
else if (typeof(TResponse).IsAssignableTo(typeof(ApiRawByteMessage)) && mediaType == "application/octet-stream")
result = (TResponse)(object)new ApiRawByteMessage(await context.HttpResponse.Content.ReadAsByteArrayAsync());
else if (typeof(TResponse).IsAssignableTo(typeof(ApiRawStreamMessage)) && mediaType == "application/octet-stream")
result = (TResponse)(object)new ApiRawStreamMessage(await context.HttpResponse.Content.ReadAsStreamAsync());
}
}

6
Pilz.Net/Api/ApiRawByteMessage.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Pilz.Net.Api;
public class ApiRawByteMessage(byte[] data) : ApiRawMessage
{
public byte[] Data { get; } = data;
}

4
Pilz.Net/Api/ApiRawMessage.cs
View File

@@ -1,6 +1,6 @@
namespace Pilz.Net.Api;
public class ApiRawMessage(byte[] data) : ApiMessage
public abstract class ApiRawMessage : ApiMessage
{
public byte[] Data { get; } = data;
public string? FileName { get; set; }
}

6
Pilz.Net/Api/ApiRawStreamMessage.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Pilz.Net.Api;
public class ApiRawStreamMessage(Stream data) : ApiRawMessage
{
public Stream Data { get; } = data;
}

14
Pilz.Net/Api/ApiServer.cs
View File

@@ -464,6 +464,8 @@ public class ApiServer : IApiServer
// Set response header
Log.Debug("Set response headers");
context.Response.AppendHeader("API-VERSION", ApiVersion.ToString());
if (result.Original.Message is ApiRawMessage apiRawMessage && !string.IsNullOrWhiteSpace(apiRawMessage.FileName))
context.Response.AppendHeader("Content-Disposition", $"filename=\"{apiRawMessage.FileName}\"");
// Set response parameters
Log.Debug("Set response parameters");
@@ -486,6 +488,14 @@ public class ApiServer : IApiServer
context.Response.OutputStream.Write(resultBytes, 0, resultBytes.Length);
context.Response.OutputStream.Flush();
}
else if (result.ResultContent is Stream resultStream)
{
Log.Info("Sending stream response for " + context.Request.RawUrl);
context.Response.ContentType = "application/octet-stream";
resultStream.CopyTo(context.Response.OutputStream);
context.Response.OutputStream.Flush();
resultStream.Close();
}
Log.Debug("Finish response");
close(false);
@@ -528,8 +538,10 @@ public class ApiServer : IApiServer
return new(result, null);
// Return result with raw data
if (result.Message is ApiRawMessage dataMsg)
if (result.Message is ApiRawByteMessage dataMsg)
return new(result, dataMsg.Data);
if (result.Message is ApiRawStreamMessage streamMsg)
return new(result, streamMsg.Data);
// Serializer
Log.Debug("Serialize message");

2
Pilz.Net/Pilz.Net.csproj
View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<PropertyGroup>
<Version>2.9.2</Version>
<Version>2.9.3</Version>
</PropertyGroup>
<ItemGroup>