Timerix/ParadoxSaveParser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API methods reimplemented for DTLib.Web

Browse Source
This commit is contained in:
Timerix 2025-03-23 02:49:02 +05:00
parent e3b82d7de5
commit 5d88ad49c0
7 changed files with 79 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ParadoxSaveParser.Lib/BufferedEnumerator.cs
View File

@ -23,7 +23,7 @@ namespace ParadoxSaveParser.Lib;
///
/// Console.Write($"| {cur.Value} |");
///
/// for (var next = cur.Next; next != null; next = next.Next)
/// for (var next = cur.Next; next is not null; next = next.Next)
/// Console.Write($" {next.Value}");
/// Console.WriteLine();
/// }
@ -64,8 +64,8 @@ public class BufferedEnumerator<T> : IEnumerator<LinkedListNode<T>>
return false;
_currentNodeIndex++;
_currentNode = _currentNode == null ? _llist.First : _currentNode.Next;
return _currentNode != null;
_currentNode = _currentNode is null ? _llist.First : _currentNode.Next;
return _currentNode is not null;
}
public void Reset()

6
ParadoxSaveParser.Lib/Parser.cs
View File

@ -1,7 +1,7 @@
global using System;
global using System.Collections.Generic;
global using System.IO;
global using System.Text;
global using System.Collections.Generic;
namespace ParadoxSaveParser.Lib;
@ -217,7 +217,7 @@ public class Parser
if(!_tokens.MoveNext())
throw new Exception("Unexpected end of file");
object? value = ParseValue();
if (value == null)
if (value is null)
break;
list.Add(value);
}
@ -277,7 +277,7 @@ public class Parser
throw new UnexpectedTokenException(tok);
object? value = ParseValue();
if (value == null)
if (value is null)
throw new UnexpectedTokenException(_tokens.Current.Value);
if(!dict.TryGetValue(key, out List<object>? list))

2
ParadoxSaveParser.WebAPI/Config.cs
View File

@ -7,7 +7,7 @@ public class Config
public const int ActualVersion = 1;
public int Version = ActualVersion;
public string BaseUrl = "http://127.0.0.1:8080/";
public string BaseUrl = "http://127.0.0.1:5226/";
public static Config FromDtsod(DtsodV23 d)
{

2
ParadoxSaveParser.WebAPI/ParadoxSaveParser.WebAPI.csproj
View File

@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="DTLib.Web" Version="1.1.2" />
<PackageReference Include="DTLib.Web" Version="1.2.1" />
</ItemGroup>
<ItemGroup>

141
ParadoxSaveParser.WebAPI/Program.cs
View File

@ -4,7 +4,6 @@ global using System.Text;
global using System.Text.Json;
global using System.Threading;
global using System.Threading.Tasks;
global using DTLib;
global using DTLib.Demystifier;
global using DTLib.Filesystem;
global using DTLib.Logging;
@ -30,6 +29,7 @@ public class Program
private static readonly IOPath _configPath = "./config.dtsod";
private static Config _config = new();
private static readonly ILogger _loggerRoot = new ConsoleLogger();
private static readonly CancellationTokenSource _mainCancel = new();
private static ConcurrentDictionary<string, SaveFileMetadata> _saveMetadataStorage = new();
private static JsonSerializerOptions _saveSerializerOptions = new()
@ -39,16 +39,16 @@ public class Program
MaxDepth = 1024,
};
public static void Main(string[] args)
{
Console.InputEncoding = Encoding.UTF8;
Console.OutputEncoding = Encoding.UTF8;
ContextLogger logger = new ContextLogger(nameof(Main), _loggerRoot);
CancellationTokenSource mainCancel = new();
Console.CancelKeyPress += (_, _) =>
{
logger.LogInfo("stopping server...");
mainCancel.Cancel();
logger.LogInfo("Ctrl+C Pressed");
_mainCancel.Cancel();
};
try
@ -67,26 +67,11 @@ public class Program
// http server
var router = new SimpleRouter(_loggerRoot);
router.DefaultRoute = new ServeFilesRouteHandler("public");
router.MapRoute("/aaa", async ctx =>
{
byte[] buffer =
"""
<!DOCTYPE html>
<html>
<body>
<h1>aaa</h1>
</body>
</html>
""".ToBytes();
ctx.Response.ContentLength64 = buffer.Length;
await ctx.Response.OutputStream.WriteAsync(buffer);
return HttpStatusCode.OK;
});
// router.MapGet("/getSaveStatus", GetSaveStatusHandler);
// router.MapPost("/uploadSave/eu4", UploadSaveHandler);
// app.MapPost("/parseSave/eu4", ParseSaveEU4Handler);
router.MapRoute("/getSaveStatus", HttpMethod.GET, GetSaveStatusHandler);
router.MapRoute("/uploadSave/eu4", HttpMethod.POST, UploadSaveHandler);
router.MapRoute("/parseSave/eu4", HttpMethod.POST, ParseSaveEU4Handler);
var app = new WebApp(_config.BaseUrl, _loggerRoot, router, mainCancel.Token);
var app = new WebApp(_config.BaseUrl, _loggerRoot, router, _mainCancel.Token);
app.Run().GetAwaiter().GetResult();
}
catch (OperationCanceledException ex)
@ -108,7 +93,8 @@ public class Program
SearchOption.TopDirectoryOnly))
{
using var metaFile = File.OpenRead(metaFilePath);
var meta = JsonSerializer.Deserialize<SaveFileMetadata>(metaFile) ?? throw new NullReferenceException(metaFilePath);
var meta = JsonSerializer.Deserialize<SaveFileMetadata>(metaFile) ??
throw new NullReferenceException(metaFilePath);
if (meta.status != SaveFileProcessingStatus.Done)
{
_loggerRoot.LogWarn(nameof(PrepareLocalFiles), $"metadata file '{metaFilePath}' status has invalid status {meta.status}");
@ -119,84 +105,87 @@ public class Program
}
}
/*
private static async Task UploadSaveHandler(HttpContext httpContext)
public record ErrorMessage(string errorMessage);
private static async Task<HttpStatusCode>ReturnResponse(HttpListenerContext ctx, HttpStatusCode statusCode, object response)
{
var remoteFile = httpContext.Request.Form.Files.FirstOrDefault();
if (remoteFile is null || !remoteFile.FileName.EndsWith(".eu4"))
{
throw new BadHttpRequestException($"Invalid file format: {remoteFile?.FileName}",
StatusCodes.Status400BadRequest);
}
await JsonSerializer.SerializeAsync(ctx.Response.OutputStream, response, response.GetType(),
JsonSerializerOptions.Default, _mainCancel.Token);
ctx.Response.StatusCode = (int)statusCode;
return statusCode;
}
private static async Task<HttpStatusCode>ReturnResponse(HttpListenerContext ctx, HttpStatusCode statusCode, string response)
{
await ctx.Response.OutputStream.WriteAsync(response.ToBytes(), _mainCancel.Token);
ctx.Response.StatusCode = (int)statusCode;
return statusCode;
}
private static async Task<HttpStatusCode>UploadSaveHandler(HttpListenerContext ctx)
{
string? contentType = ctx.Request.Headers.GetValues("Content-Type")?.FirstOrDefault();
if (contentType != "application/octet-stream")
return await ReturnResponse(ctx, HttpStatusCode.BadRequest,
new ErrorMessage($"Invalid request Content-Type: '{contentType}'"));
string saveId = Guid.NewGuid().ToString();
IOPath metaFilePath = PathHelper.GetMetaFilePath(saveId);
if (File.Exists(metaFilePath))
{
httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
throw new BadHttpRequestException($"Guid collision! file {metaFilePath} already exists.", StatusCodes.Status500InternalServerError);
}
return await ReturnResponse(ctx, HttpStatusCode.InternalServerError,
new ErrorMessage($"Guid collision! file' {metaFilePath}' already exists."));
var meta = new SaveFileMetadata { id = saveId, game = Game.EU4, status = SaveFileProcessingStatus.Initialized, };
if (!_saveMetadataStorage.TryAdd(saveId, meta))
{
throw new BadHttpRequestException($"Guid collision! Can't create metadata with id {saveId}", StatusCodes.Status500InternalServerError);
}
return await ReturnResponse(ctx, HttpStatusCode.InternalServerError,
new ErrorMessage($"Guid collision! Can't create metadata with id {saveId}"));
meta.status = SaveFileProcessingStatus.Uploading;
IOPath saveFilePath = PathHelper.GetSaveFilePath(meta.id);
await using var saveFile = File.OpenWrite(saveFilePath);
await using var remoteStream = remoteFile.OpenReadStream();
await remoteStream.CopyToAsync(saveFile);
await using var remoteStream = ctx.Request.InputStream;
await remoteStream.CopyToAsync(saveFile, _mainCancel.Token);
meta.status = SaveFileProcessingStatus.Uploaded;
await httpContext.Response.WriteAsJsonAsync(meta);
return await ReturnResponse(ctx, HttpStatusCode.OK, saveId);
}
private static SaveFileMetadata GetMetaFromRequestId(HttpContext httpContext, string requestParamName)
private static (SaveFileMetadata? meta, ErrorMessage? errorMesage) GetMetaFromRequestId(HttpListenerContext ctx, string requestParamName)
{
httpContext.Request.Query.TryGetValue(requestParamName, out var ids);
string? id = ids.FirstOrDefault();
var ids = ctx.Request.QueryString.GetValues(requestParamName);
string? id = ids?.FirstOrDefault();
if (string.IsNullOrEmpty(id))
{
throw new BadHttpRequestException($"No request parameter '{requestParamName}' provided",
StatusCodes.Status400BadRequest);
}
return (null, new ErrorMessage($"No request parameter '{requestParamName}' provided"));
if (!_saveMetadataStorage.TryGetValue(id, out var meta))
{
throw new BadHttpRequestException($"Save with {id} not found",
StatusCodes.Status400BadRequest);
}
return (null,new ErrorMessage($"Save with {id} not found"));
return meta;
return (meta, null);
}
private static async Task GetSaveStatusHandler(HttpContext httpContext)
private static async Task<HttpStatusCode>GetSaveStatusHandler(HttpListenerContext ctx)
{
var meta = GetMetaFromRequestId(httpContext, "id");
await httpContext.Response.WriteAsJsonAsync(meta);
var (meta, errorMessage) = GetMetaFromRequestId(ctx, "id");
if(errorMessage is not null)
return await ReturnResponse(ctx, HttpStatusCode.InternalServerError, errorMessage);
return await ReturnResponse(ctx, HttpStatusCode.OK, meta!);
}
private static async Task ParseSaveEU4Handler(HttpContext httpContext)
private static async Task<HttpStatusCode>ParseSaveEU4Handler(HttpListenerContext ctx)
{
var meta = GetMetaFromRequestId(httpContext, "id");
if (meta.status == SaveFileProcessingStatus.Error)
{
httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
await httpContext.Response.WriteAsJsonAsync(meta);
return;
}
var (meta, errorMessage) = GetMetaFromRequestId(ctx, "id");
if(errorMessage is not null)
return await ReturnResponse(ctx, HttpStatusCode.InternalServerError, errorMessage);
try
{
if (meta.status != SaveFileProcessingStatus.Uploaded)
throw new Exception($"Invalid save processing status: {meta.status}");
using var zipArchive = ZipFile.Open(PathHelper.GetSaveFilePath(meta.id).Str, ZipArchiveMode.Read);
using var zipArchive = ZipFile.Open(PathHelper.GetSaveFilePath(meta!.id).Str, ZipArchiveMode.Read);
var zipEntry = zipArchive.Entries.FirstOrDefault(e => e.Name == "gamestate");
if (zipEntry is null)
throw new Exception("Invalid save format: no gamestate file found");
return await ReturnResponse(ctx, HttpStatusCode.BadRequest,
new ErrorMessage("Invalid save format: no 'gamestate' file found"));
string extractedGamestatePath = PathHelper.GetSaveFilePath(meta.id) + ".gamestate";
zipEntry.ExtractToFile(extractedGamestatePath);
var gamestateStream = File.OpenRead(extractedGamestatePath);
@ -208,20 +197,18 @@ public class Program
meta.status = SaveFileProcessingStatus.SavingResults;
IOPath resultFilePath = PathHelper.GetParsedSaveFilePath(meta.id);
await using var resultFile = File.OpenWrite(resultFilePath);
await JsonSerializer.SerializeAsync(resultFile, result, _saveSerializerOptions);
await JsonSerializer.SerializeAsync(resultFile, result, _saveSerializerOptions, _mainCancel.Token);
meta.status = SaveFileProcessingStatus.Done;
meta.SaveToFile();
}
catch (Exception ex)
{
meta.status = SaveFileProcessingStatus.Error;
string errorMesage = ex.ToStringDemystified();
meta.errorMesage = errorMesage;
httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
_app.Logger.Log(LogLevel.Error, "ParseSaveEU4 Error: {errorMesage}", errorMesage);
_loggerRoot.LogWarn(nameof(ParseSaveEU4Handler), errorMesage);
return await ReturnResponse(ctx, HttpStatusCode.BadRequest,
new ErrorMessage(errorMesage));
}
await httpContext.Response.WriteAsJsonAsync(meta);
return await ReturnResponse(ctx, HttpStatusCode.OK, meta);
}
*/
}

3
ParadoxSaveParser.WebAPI/SaveFileMetadata.cs
View File

@ -4,7 +4,7 @@ namespace ParadoxSaveParser.WebAPI;
public enum SaveFileProcessingStatus
{
Initialized, Uploading, Uploaded, Parsing, SavingResults, Done, Error
Initialized, Uploading, Uploaded, Parsing, SavingResults, Done
}
public enum Game
@ -22,7 +22,6 @@ public class SaveFileMetadata
[JsonConverter(typeof(JsonStringEnumConverter))]
public required SaveFileProcessingStatus status { get; set; }
public string? errorMesage { get; set; }
private static readonly JsonSerializerOptions _jsonOptions = new() { WriteIndented = true };
public void SaveToFile()

6
TODO.txt
View File

@ -1,10 +1,12 @@
DTLib.Web:
Add elapsed time to response status log message: `responded 200 (OK) in 0.03 s`
Main:
Move from asp.net to my own http server
Add temporary files deletion
ParseSaveHandler:
Separate status and error message from metadata
Make this method run as background task instead of POST query
Add debug log
Parser:
Add query support to parse only needed information