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

fixes for capabilities

Browse Source
This commit is contained in:
Pilzinsel64
2025-06-13 10:26:33 +02:00
parent b9e633a0ff
commit d7e592180b
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,13 +183,9 @@ public class ApiServer : IApiServer
semaphore.Release(); semaphore.Release();
} }
public virtual IEnumerable<string> GetEndpoints() public virtual Dictionary<string, string[]> GetEndpoints()
{ {
return handlers.SelectMany(n => n.Attribute.Methods.Select(m => new return handlers.GroupBy(n => n.Attribute.Route).ToDictionary(n => n.Key, n => n.SelectMany(n => n.Attribute.Methods).ToArray());
{
n.Attribute.Route,
Method = m,
})).OrderBy(n => n.Route).ThenBy(n => n.Method).Select(n => $"{n.Method} {n.Route}");
} }
public virtual void RegisterHandler<T>(T instance) where T : class public virtual void RegisterHandler<T>(T instance) where T : class

2
Pilz.Net/Api/IApiServer.cs
View File

@@ -27,7 +27,7 @@ public interface IApiServer
void RegisterHandler(Delegate handler); void RegisterHandler(Delegate handler);
void RegisterHandler(Delegate handler, bool throwOnError); void RegisterHandler(Delegate handler, bool throwOnError);
void RegisterHandler(Delegate handler, ApiMessageHandlerAttribute attribute, bool throwOnError); void RegisterHandler(Delegate handler, ApiMessageHandlerAttribute attribute, bool throwOnError);
IEnumerable<string> GetEndpoints(); Dictionary<string, string[]> GetEndpoints();
void Stop(bool graceful); void Stop(bool graceful);
void Restart(bool graceful); void Restart(bool graceful);
} }

4
Pilz.Net/Api/Messages/ServerCapabilitiesMessage.cs
View File

@@ -1,6 +1,6 @@
namespace Pilz.Net.Api.Messages; namespace Pilz.Net.Api.Messages;
public class ServerCapabilitiesMessage : ApiMessage public class ServerCapabilitiesMessage(Dictionary<string, string[]> endpoints) : ApiMessage
{ {
public List<string> Endpoints { get; } = []; public Dictionary<string, string[]> Endpoints { get; } = endpoints;
} }

7
Pilz.Net/Api/Server/ServerCapabilitiesHandler.cs
View File

@@ -18,14 +18,11 @@ public class ServerCapabilitiesHandler : IApiHandlerInitializer
public virtual ApiResult GetCapabilities(ApiRequestInfo req) public virtual ApiResult GetCapabilities(ApiRequestInfo req)
{ {
var msg = BuildMessage(req); return ApiResult.Ok(BuildMessage(req));
if (server is ServerCapabilitiesMessage message)
message.Endpoints.AddRange(server.GetEndpoints());
return ApiResult.Ok(msg);
} }
protected virtual ApiMessage? BuildMessage(ApiRequestInfo req) protected virtual ApiMessage? BuildMessage(ApiRequestInfo req)
{ {
return new ServerCapabilitiesMessage(); return new ServerCapabilitiesMessage(server?.GetEndpoints() ?? []);
} }
} }