Merge branch 'main' into feat/qol

Author: AlisaAkiron

.github/workflows/build-test.yaml

@@ -3,10 +3,10 @@ name: build-test
 on:
   push:
     branches:
-      - dev
+      - "*"
   pull_request:
     branches:
-      - dev
+      - "*"
 
 defaults:
   run:

src/MaaCopilotServer.GameData/Constants/I18NConstants.cs

@@ -110,7 +110,7 @@ public static string GetZoneTypeI18NString(this ZoneTypes zoneTypes, ArkServerLa
         ZoneTypes.Weekly => "物资筹备 & 芯片搜索",
         ZoneTypes.Activity => "活动关卡",
         ZoneTypes.Campaign => "剿灭作战",
-        ZoneTypes.Memory => "悖論模擬",
+        ZoneTypes.Memory => "悖论模拟",
         _ => throw new ArgumentOutOfRangeException(nameof(zoneTypes), zoneTypes, null)
     };
 

src/MaaCopilotServer.Infrastructure/MaaCopilotServer.Infrastructure.csproj

@@ -25,10 +25,10 @@
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageReference Include="FluentEmail.Liquid" Version="3.0.2" />
     <PackageReference Include="FluentEmail.MailKit" Version="3.0.2" />
+    <PackageReference Include="JsonSchema.Net" Version="3.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-    <PackageReference Include="NJsonSchema" Version="10.7.2" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
   </ItemGroup>
 

src/MaaCopilotServer.Infrastructure/Services/OperationProcessService.cs

@@ -3,6 +3,7 @@
 // Licensed under the AGPL-3.0 license.
 
 using System.Text.Json;
+using Json.Schema;
 using System.Text.Json.Serialization;
 using MaaCopilotServer.Application.Common.Interfaces;
 using MaaCopilotServer.Application.Common.Models;
@@ -12,7 +13,6 @@
 using MaaCopilotServer.Resources;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using NJsonSchema;
 using Action = MaaCopilotServer.Application.Common.Operation.Model.Action;
 
 namespace MaaCopilotServer.Infrastructure.Services;
@@ -22,6 +22,7 @@ public class OperationProcessService : IOperationProcessService
     private readonly IMaaCopilotDbContext _dbContext;
     private readonly ValidationErrorMessage _validationErrorMessage;
     private readonly JsonSchema _schema;
+    private readonly ValidationOptions _validationOptions;
 
     private static readonly JsonSerializerOptions s_failedSerializerOptions = new()
     {
@@ -37,7 +38,9 @@ public OperationProcessService(
         _validationErrorMessage = validationErrorMessage;
 
         var schemaFile = Path.Combine(applicationOption.Value.AssemblyPath, SystemConstants.MaaCopilotSchemaPath);
-        _schema = JsonSchema.FromFileAsync(schemaFile).GetAwaiter().GetResult();
+        _schema = JsonSchema.FromFile(schemaFile);
+
+        _validationOptions = new ValidationOptions { ValidateAs = Draft.Draft7, OutputFormat = OutputFormat.Detailed };
     }
 
     public async Task<OperationValidationResult> Validate(string? operation)
@@ -53,15 +56,14 @@ public async Task<OperationValidationResult> Validate(string? operation)
             };
         }
 
-        var schemaValidationResult = _schema.Validate(operation);
-        if (schemaValidationResult.Any())
+        var schemaValidationResult = _schema.Validate(JsonDocument.Parse(operation).RootElement, _validationOptions);
+        if (schemaValidationResult.IsValid is false)
         {
-            var message = string.Join(";", schemaValidationResult);
             return new OperationValidationResult
             {
                 IsValid = false,
                 Operation = null,
-                ErrorMessages = message,
+                ErrorMessages = schemaValidationResult.Message ?? string.Empty,
                 ArkLevel = null
             };
         }

src/MaaCopilotServer.Resources/maa-copilot-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-06/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Maa Copilot Operation",
   "properties": {
     "stage_name": {