Merge pull request #524 from sebastian-heinz/develop

New release

.editorconfig

@@ -9,7 +9,7 @@ root = true
 indent_style = space
 
 # Code files
-[*.cs]
+[*.{cs,sql}]
 indent_size = 4
 insert_final_newline = true
-charset = utf-8
+charset = utf-8

.github/workflows/build.yaml

@@ -4,10 +4,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.200
-      - name: Build Project
-        run: dotnet build --configuration Release
+          dotnet-version: 6.x
+      - name: Build
+        run: dotnet build --configuration Release
+      - name: Test
+        run: dotnet test --configuration Release --no-restore --no-build

.vscode/ddon.code-snippets

@@ -151,15 +151,15 @@
 			"",
 			"namespace Arrowgene.Ddon.GameServer.Handler",
 			"{",
-			"\tpublic class $1 : GameStructurePacketHandler<C2S$2>",
+			"\tpublic class $1Handler : GameRequestPacketHandler<C2S$1Req, S2C$1Res>",
 			"\t{",
-			"\t\tprivate static readonly ServerLogger Logger = LogProvider.Logger<ServerLogger>(typeof($1));",
+			"\t\tprivate static readonly ServerLogger Logger = LogProvider.Logger<ServerLogger>(typeof($1Handler));",
 			"\t\t",
-			"\t\tpublic $1(DdonGameServer server) : base(server)",
+			"\t\tpublic $1Handler(DdonGameServer server) : base(server)",
 			"\t\t{",
 			"\t\t}",
 			"",
-			"\t\tpublic override void Handle(GameClient client, StructurePacket<C2S$2> packet)",
+			"\t\tpublic override S2C$1Res Handle(GameClient client, C2S$1Req request)",
 			"\t\t{",
 			"\t\t\t$0",
 			"\t\t}",

.vscode/extensions.json

@@ -1,6 +1,5 @@
 {
     "recommendations": [
-        "fudge.auto-using",
         "jeff-hykin.better-cpp-syntax",
         "ms-dotnettools.csharp",
         "notblank00.hexeditor",

.vscode/launch.json

@@ -42,6 +42,25 @@
                 "moduleLoad": false
             }
         },
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+            "name": "DDOn Migrate Database",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/Arrowgene.Ddon.Cli/bin/Debug/net6.0/Arrowgene.Ddon.Cli.dll",
+            "args": ["dbmigration"],
+            "cwd": "${workspaceFolder}/Arrowgene.Ddon.Cli",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "integratedTerminal",
+            "stopAtEntry": false,
+            "logging": {
+                "moduleLoad": false
+            }
+        },
         {
             // Use IntelliSense to find out which attributes exist for C# debugging
             // Use hover for the description of the existing attributes
@@ -52,7 +71,26 @@
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
             "program": "${workspaceFolder}/Arrowgene.Ddon.Cli/bin/Debug/net6.0/Arrowgene.Ddon.Cli.dll",
-            "args": ["client", "J:\\Juegos\\Dragon's Dogma Online\\nativePC\\rom"],
+            "args": ["client", "D:\\Juegos\\DDOn\\Dragon's Dogma Online\\nativePC\\rom"],
+            "cwd": "${workspaceFolder}/Arrowgene.Ddon.Cli",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "integratedTerminal",
+            "stopAtEntry": false,
+            "logging": {
+                "moduleLoad": false
+            }
+        },
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+            "name": "DDOn Client Translation Patch",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/Arrowgene.Ddon.Cli/bin/Debug/net6.0/Arrowgene.Ddon.Cli.dll",
+            "args": ["client", "packGmd", "gmdCsv=C:\\Users\\GAMER\\Downloads\\gmd.csv", "romDir=D:\\Juegos\\DDOn\\Dragon's Dogma Online\\nativePC\\rom", "romLang=English"],
             "cwd": "${workspaceFolder}/Arrowgene.Ddon.Cli",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
             "console": "integratedTerminal",

Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj

@@ -9,6 +9,12 @@
         <Version>$(Version)</Version>
         <Copyright>Copyright © 2019-2022 DDON Team</Copyright>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+      <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+      <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    </PropertyGroup>
     <Import Project="./../SetSourceRevision.targets" />
     <ItemGroup>
         <ProjectReference Include="..\Arrowgene.Ddon.Client\Arrowgene.Ddon.Client.csproj" />

Arrowgene.Ddon.Cli/Command/ClientCommand.cs

@@ -260,7 +260,7 @@ public CommandResultType Run(CommandParameter parameter)
 
                             if (string.IsNullOrEmpty(newMsg))
                             {
-                                Logger.Error(
+                                Logger.Info(
                                     $"csv message is empty, skipping (ArcPath:{arcPath}, GmdPath:{gmdPath}, Key:{entry.Key}. Msg:{entry.Msg})");
                                 continue;
                             }

Arrowgene.Ddon.Cli/Command/DbMigrationCommand.cs

@@ -0,0 +1,98 @@
+using Arrowgene.Ddon.Database;
+using Arrowgene.Ddon.Database.Sql.Core.Migration;
+using Arrowgene.Ddon.Shared;
+using Arrowgene.Logging;
+using System.Linq;
+using System.IO;
+using System.Reflection;
+using System;
+using System.Collections.Generic;
+
+namespace Arrowgene.Ddon.Cli.Command
+{
+    public class DbMigrationCommand : ICommand
+    {
+        private static readonly ILogger Logger = LogProvider.Logger<Logger>(typeof(ServerCommand));
+
+        public string Key => "dbmigration";
+
+        public string Description => $"Commandline tool to update the database\n\n" +
+                                     $"usage:\n" +
+                                     $"{Key}\n";
+
+        public CommandResultType Run(CommandParameter parameter)
+        {
+
+            string settingPath = Path.Combine(Util.ExecutingDirectory(), "Files/Arrowgene.Ddon.config.json");
+            Setting settings = Setting.LoadFromFile(settingPath);
+            if (settings == null)
+            {
+                return CommandResultType.Exit;
+            }
+
+            DatabaseSetting dbSettings = settings.DatabaseSetting;
+            if (dbSettings == null)
+            {
+                return CommandResultType.Exit;
+            }
+
+            IDatabase database = DdonDatabaseBuilder.Build(dbSettings);
+            if (database == null)
+            {
+                return CommandResultType.Exit;
+            }
+
+            // Instance all implementations of IMigrationStrategy located in the Migration namespace
+            // supplying the adequate arguments to the constructor
+            DatabaseMigrator migrator = new DatabaseMigrator(typeof(IMigrationStrategy).Assembly.GetTypes()
+                .Where(type => type != typeof(IMigrationStrategy) && typeof(IMigrationStrategy).IsAssignableFrom(type) && type.Namespace == typeof(IMigrationStrategy).Namespace)
+                .Select(type => InstanceMigrationStrategy(type, dbSettings))
+                .ToList());
+
+            // TODO: Warn that migration is destructive
+            bool result = database.MigrateDatabase(migrator, DdonDatabaseBuilder.Version);
+
+            // TODO: Better logging
+            if(result)
+            {
+                Logger.Info($"Successfully migrated the database to version '{DdonDatabaseBuilder.Version}'.");
+            }
+            else
+            {
+                Logger.Error("Failed to migrate the database.");
+            }
+
+            return CommandResultType.Exit;
+        }
+
+        public void Shutdown()
+        {
+        }
+
+        private IMigrationStrategy InstanceMigrationStrategy(Type type, DatabaseSetting databaseSetting)
+        {
+            foreach(ConstructorInfo constructorInfo in type.GetConstructors())
+            {
+                List<object> parameters = new List<object>();
+                foreach (var constructorParam in constructorInfo.GetParameters())
+                {
+                    if(constructorParam.ParameterType == typeof(DatabaseSetting))
+                    {
+                        parameters.Add(databaseSetting);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                if(parameters.Count == constructorInfo.GetParameters().Length)
+                {
+                    return (IMigrationStrategy) constructorInfo.Invoke(parameters.ToArray());
+                }
+            }
+
+            throw new MissingMethodException("No suitable constructor found in "+type.Name);
+        }
+    }
+}

Arrowgene.Ddon.Cli/Command/Packet/PacketCommandException.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Arrowgene.Ddon.Cli.Command.Packet;
+
+public class PacketCommandException : Exception
+{
+    public PacketCommandException(string message) : base(message)
+    {
+    }
+
+    public PacketCommandException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}

Arrowgene.Ddon.Cli/Command/Packet/PacketCommandOptions.cs

@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+
+namespace Arrowgene.Ddon.Cli.Command.Packet;
+
+public class PacketCommandOptions
+{
+    private static string ByteDumpSwitch => "--byte-dump";
+    private static string ByteDumpHeaderSwitch => "--byte-dump-header";
+    private static string ByteDumpPrefixSwitch => "--byte-dump-prefix";
+    private static string Utf8StringDumpSwitch => "--utf8-dump";
+    private static string StructureDumpSwitch => "--structure-dump";
+    private static string PacketIncludeFilterSwitch => "--packet-include-filter";
+    private static string ExportDecryptedPacketsSwitch => "--export-decrypted-packets";
+
+    public bool AddByteDump { get; }
+    public bool AddByteDumpHeader { get; }
+    public string ByteDumpSeparator { get; }
+    public string ByteDumpPrefix { get; }
+    public bool AddUtf8StringDump { get; }
+    public bool AddStructureDump { get; }
+    public string StructureDumpFormat { get; }
+    public string PacketIncludeFilter { get; }
+    public bool ExportDecryptedPackets { get; }
+
+    public PacketCommandOptions(bool addByteDump = false, bool addByteDumpHeader = false, string byteDumpSeparator = "", string byteDumpPrefix = "", bool addUtf8StringDump = false,
+        bool addStructureDump = false, string structureDumpFormat = "", string packetIncludeFilter = "", bool exportDecryptedPackets = false)
+    {
+        AddByteDump = addByteDump;
+        AddByteDumpHeader = addByteDumpHeader;
+        ByteDumpSeparator = byteDumpSeparator;
+        ByteDumpPrefix = byteDumpPrefix;
+        AddUtf8StringDump = addUtf8StringDump;
+        AddStructureDump = addStructureDump;
+        StructureDumpFormat = structureDumpFormat;
+        PacketIncludeFilter = packetIncludeFilter;
+        ExportDecryptedPackets = exportDecryptedPackets;
+    }
+
+    public PacketCommandOptions(CommandParameter parameters) : this(parameters.Switches, parameters.SwitchMap)
+    {
+    }
+
+    private PacketCommandOptions(List<string> parameterSwitches, Dictionary<string, string> parameterSwitchMap)
+    {
+        AddByteDump = parameterSwitches.Contains(ByteDumpSwitch) || parameterSwitchMap.ContainsKey(ByteDumpSwitch);
+        AddByteDumpHeader = parameterSwitches.Contains(ByteDumpHeaderSwitch) || parameterSwitchMap.ContainsKey(ByteDumpHeaderSwitch);
+        ByteDumpSeparator = parameterSwitchMap.GetValueOrDefault(ByteDumpSwitch, "");
+        ByteDumpPrefix = parameterSwitchMap.GetValueOrDefault(ByteDumpPrefixSwitch, "");
+        AddUtf8StringDump = parameterSwitches.Contains(Utf8StringDumpSwitch) || parameterSwitchMap.ContainsKey(Utf8StringDumpSwitch);
+        AddStructureDump = parameterSwitches.Contains(StructureDumpSwitch) || parameterSwitchMap.ContainsKey(StructureDumpSwitch);
+        StructureDumpFormat = parameterSwitchMap.GetValueOrDefault(StructureDumpSwitch, "JSON").ToLowerInvariant();
+        PacketIncludeFilter = parameterSwitchMap.GetValueOrDefault(PacketIncludeFilterSwitch, "");
+        ExportDecryptedPackets = parameterSwitches.Contains(ExportDecryptedPacketsSwitch) || parameterSwitchMap.ContainsKey(ExportDecryptedPacketsSwitch);
+    }
+
+    public static string GetUsage()
+    {
+        return
+            $"[{ByteDumpSwitch}[=,]] [{ByteDumpHeaderSwitch}] [{ByteDumpPrefixSwitch}=0x] [{Utf8StringDumpSwitch}] [{StructureDumpSwitch}[=JSON|YAML]] [{PacketIncludeFilterSwitch}=11.21.2,S2C_QUEST_QUEST_PROGRESS_RES,...]";
+    }
+}

Arrowgene.Ddon.Cli/Command/Packet/PacketServerType.cs

@@ -0,0 +1,8 @@
+namespace Arrowgene.Ddon.Cli.Command.Packet
+{
+    public enum PacketServerType : ushort
+    {
+        Login = 52100,
+        Game = 52000
+    }
+}

Arrowgene.Ddon.Cli/Command/Packet/PcapPacket.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Arrowgene.Ddon.Shared.Network;
+
+namespace Arrowgene.Ddon.Cli.Command.Packet;
+
+public class PcapPacket
+{
+    public PacketServerType PacketServerType { get; set; }
+    public PacketSource Source { get; set; }
+    public string TimeStamp { get; set; }
+    public uint Index { get; set; }
+    public uint Packet { get; set; }
+    public byte[] Data { get; set; }
+    public List<IPacket> ResolvedPackets { get; set; }
+}

Arrowgene.Ddon.Cli/Command/Packet/YamlFile.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Arrowgene.Ddon.Cli.Command.Packet;
+
+public class YamlFile
+{
+    public List<YamlPeer> peers;
+    public List<YamlPacket> packets;
+}

Arrowgene.Ddon.Cli/Command/Packet/YamlPacket.cs

@@ -0,0 +1,10 @@
+namespace Arrowgene.Ddon.Cli.Command.Packet;
+
+public class YamlPacket
+{
+    public uint packet;
+    public uint peer;
+    public uint index;
+    public string timestamp;
+    public string data;
+}

Arrowgene.Ddon.Cli/Command/Packet/YamlPeer.cs

@@ -0,0 +1,8 @@
+namespace Arrowgene.Ddon.Cli.Command.Packet;
+
+public class YamlPeer
+{
+    public uint peer;
+    public string host;
+    public ushort port;
+}