PvE/TorchRemote
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update dependencies

Browse Source
This commit is contained in:
zznty
2023-01-24 18:34:13 +07:00
parent f66489ae9b
commit a73610c83b
6 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TorchRemote.Models/TorchRemote.Models.csproj
View File

@@ -18,6 +18,6 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="System.Text.Json" Version="7.0.0-rc.1.22426.10" /> <PackageReference Include="System.Text.Json" Version="7.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
TorchRemote.Plugin/Controllers/ChatController.cs
View File

@@ -34,7 +34,7 @@ public class ChatController : WebApiController, IChatController
private static readonly MethodInfo SingleTargetMethod = null!; private static readonly MethodInfo SingleTargetMethod = null!;
[Route(HttpVerbs.Post, $"{RootPath}/message")] [Route(HttpVerbs.Post, $"{RootPath}/message")]
public void SendMessage([JsonData] ChatMessageRequest request) public void SendMessage([JsonBody] ChatMessageRequest request)
{ {
if (MyMultiplayer.Static is null) if (MyMultiplayer.Static is null)
throw new HttpException(HttpStatusCode.ServiceUnavailable); throw new HttpException(HttpStatusCode.ServiceUnavailable);
@@ -84,7 +84,7 @@ public class ChatController : WebApiController, IChatController
} }
[Route(HttpVerbs.Post, $"{RootPath}/command")] [Route(HttpVerbs.Post, $"{RootPath}/command")]
public async Task InvokeCommand([JsonData] ChatCommandRequest request) public async Task InvokeCommand([JsonBody] ChatCommandRequest request)
{ {
if (Statics.CommandManager is null) if (Statics.CommandManager is null)
throw new HttpException(HttpStatusCode.ServiceUnavailable); throw new HttpException(HttpStatusCode.ServiceUnavailable);

4
TorchRemote.Plugin/Controllers/ServerController.cs
View File

@@ -35,7 +35,7 @@ public class ServerController : WebApiController, IServerController
} }
[Route(HttpVerbs.Post, $"{RootPath}/stop")] [Route(HttpVerbs.Post, $"{RootPath}/stop")]
public async Task Stop([JsonData] StopServerRequest request) public async Task Stop([JsonBody] StopServerRequest request)
{ {
if (!Statics.Torch.IsRunning) if (!Statics.Torch.IsRunning)
throw HttpException.BadRequest($"Server can't stop in state {Statics.Torch.State}", Statics.Torch.State); throw HttpException.BadRequest($"Server can't stop in state {Statics.Torch.State}", Statics.Torch.State);
@@ -60,7 +60,7 @@ public class ServerController : WebApiController, IServerController
} }
[Route(HttpVerbs.Post, $"{RootPath}/settings")] [Route(HttpVerbs.Post, $"{RootPath}/settings")]
public async Task SetSettings([JsonData] ServerSettings request) public async Task SetSettings([JsonBody] ServerSettings request)
{ {
var settings = Statics.Torch.DedicatedInstance.DedicatedConfig; var settings = Statics.Torch.DedicatedInstance.DedicatedConfig;

4
TorchRemote.Plugin/Controllers/SettingsController.cs
View File

@@ -33,7 +33,7 @@ public class SettingsController : WebApiController, ISettingsController
} }
[Route(HttpVerbs.Get, $"{RootPath}/{{fullName}}/values")] [Route(HttpVerbs.Get, $"{RootPath}/{{fullName}}/values")]
public IEnumerable<PropertyBase> GetValues(string fullName, [JsonData] IEnumerable<string> propertyNames) public IEnumerable<PropertyBase> GetValues(string fullName, [JsonBody] IEnumerable<string> propertyNames)
{ {
if (!Statics.SettingManager.Settings.TryGetValue(fullName, out var setting)) if (!Statics.SettingManager.Settings.TryGetValue(fullName, out var setting))
throw HttpException.NotFound($"Setting with fullName {fullName} not found", fullName); throw HttpException.NotFound($"Setting with fullName {fullName} not found", fullName);
@@ -76,7 +76,7 @@ public class SettingsController : WebApiController, ISettingsController
} }
[Route(HttpVerbs.Patch, $"{RootPath}/{{fullName}}/values")] [Route(HttpVerbs.Patch, $"{RootPath}/{{fullName}}/values")]
public int Patch(string fullName, [JsonData] IEnumerable<PropertyBase> properties) public int Patch(string fullName, [JsonBody] IEnumerable<PropertyBase> properties)
{ {
if (!Statics.SettingManager.Settings.TryGetValue(fullName, out var setting)) if (!Statics.SettingManager.Settings.TryGetValue(fullName, out var setting))
throw HttpException.NotFound($"Setting with fullName {fullName} not found", fullName); throw HttpException.NotFound($"Setting with fullName {fullName} not found", fullName);

11
TorchRemote.Plugin/TorchRemote.Plugin.csproj
View File

@@ -19,8 +19,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EmbedIO" Version="3.4.3" /> <PackageReference Include="EmbedIO" Version="3.5.2" />
<PackageReference Include="HttpMultipartParser" Version="7.0.0" /> <PackageReference Include="HttpMultipartParser" Version="8.0.0" />
<PackageReference Include="Json.More.Net" Version="1.7.1" /> <PackageReference Include="Json.More.Net" Version="1.7.1" />
<PackageReference Include="JsonPointer.Net" Version="2.2.2" /> <PackageReference Include="JsonPointer.Net" Version="2.2.2" />
<PackageReference Include="JsonSchema.Net" Version="3.2.2" /> <PackageReference Include="JsonSchema.Net" Version="3.2.2" />
@@ -29,10 +29,9 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody" Version="4.0.3" PrivateAssets="all" /> <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
<PackageReference Include="Torch.Server.ReferenceAssemblies" Version="1.3.1.207-master" PrivateAssets="all" IncludeAssets="compile" /> <PackageReference Include="Torch.Server.ReferenceAssemblies" Version="1.3.1.221-master" PrivateAssets="all" IncludeAssets="compile" />
<PackageReference Include="System.Text.Json" Version="7.0.0-rc.1.22426.10" /> <PackageReference Include="System.Text.Json" Version="7.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" ExcludeAssets="all" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
TorchRemote.Plugin/Utils/JsonDataAttribute.cs → TorchRemote.Plugin/Utils/JsonBodyAttribute.cs
View File

@@ -16,7 +16,7 @@ namespace TorchRemote.Plugin.Utils;
/// <seealso cref="Attribute" /> /// <seealso cref="Attribute" />
/// <seealso cref="IRequestDataAttribute{TController}" /> /// <seealso cref="IRequestDataAttribute{TController}" />
[AttributeUsage(AttributeTargets.Parameter)] [AttributeUsage(AttributeTargets.Parameter)]
public class JsonDataAttribute : Attribute, IRequestDataAttribute<WebApiController> public class JsonBodyAttribute : Attribute, IRequestDataAttribute<WebApiController>
{ {
/// <inheritdoc /> /// <inheritdoc />
public async Task<object?> GetRequestDataAsync(WebApiController controller, Type type, string parameterName) public async Task<object?> GetRequestDataAsync(WebApiController controller, Type type, string parameterName)