Update version.txt

Accounts created using methods other than email address login will no longer be accessible.
(This is a necessary step when implementing multiplayer in the future.)

Common/Data/Excel/HouseFurniturePosData.cs

@@ -0,0 +1,18 @@
+namespace MikuSB.Data.Excel;
+
+[ResourceEntity("house/FurniturePos.json")]
+public class HouseFurniturePosExcel : ExcelResource
+{
+    public uint AreaId { get; set; }
+    public uint GroupId { get; set; }
+
+    public override uint GetId()
+    {
+        return (AreaId << 48) | (GroupId << 32);
+    }
+
+    public override void Loaded()
+    {
+        GameData.HouseFurniturePosData.TryAdd(GetId(), this);
+    }
+}

Common/Data/GameData.cs

@@ -31,6 +31,7 @@ public static class GameData
     public static Dictionary<uint, WeaponPartsExcel> WeaponPartsData { get; private set; } = [];
     public static Dictionary<uint, GuideExcel> GuideData { get; private set; } = [];
     public static Dictionary<uint, DormGiftExcel> DormGiftData { get; private set; } = [];
+    public static Dictionary<uint, HouseFurniturePosExcel> HouseFurniturePosData { get; private set; } = [];
 }
 
 public static class GameResourceTemplateId

Common/Util/PatchDownloadService.cs

@@ -0,0 +1,46 @@
+using System.Net.Http.Headers;
+
+namespace MikuSB.Util;
+
+public static class PatchDownloadService
+{
+    private static readonly Logger Logger = new("PatchDownloader");
+    private const string PatchRelativePath = @"Patch\MikuSB-Patch.dll";
+    private const string PatchDownloadUrl = "https://github.com/Kei-Luna/MikuSB-Patch/releases/download/MikuSB-Patch/MikuSB-Patch.dll";
+    private const int DownloadTimeoutSeconds = 60;
+
+    public static void EnsurePatchPresent()
+    {
+        var patchPath = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, PatchRelativePath));
+        if (File.Exists(patchPath))
+            return;
+
+        Directory.CreateDirectory(Path.GetDirectoryName(patchPath)!);
+        Logger.Warn($"Patch DLL not found. Downloading to {patchPath}.");
+
+        using var client = CreateHttpClient();
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(DownloadTimeoutSeconds));
+        using var response = client.GetAsync(PatchDownloadUrl, HttpCompletionOption.ResponseHeadersRead, cts.Token)
+            .GetAwaiter().GetResult();
+        response.EnsureSuccessStatusCode();
+
+        using var source = response.Content.ReadAsStreamAsync(cts.Token).GetAwaiter().GetResult();
+        using var destination = File.Create(patchPath);
+        source.CopyTo(destination);
+
+        Logger.Info("Patch DLL download completed.");
+    }
+
+    private static HttpClient CreateHttpClient()
+    {
+        var client = new HttpClient
+        {
+            Timeout = Timeout.InfiniteTimeSpan
+        };
+
+        client.DefaultRequestHeaders.UserAgent.Add(
+            new ProductInfoHeaderValue("MikuSB-PatchDownloader", BuildVersion.Current));
+
+        return client;
+    }
+}

GameServer/Command/Commands/CommandAccount.cs

@@ -1,6 +1,8 @@
+using MikuSB.Database;
 using MikuSB.Database.Account;
 using MikuSB.Enums.Player;
 using MikuSB.Internationalization;
+using System.Text;
 
 namespace MikuSB.GameServer.Command.Commands;
 
@@ -34,4 +36,25 @@ public class CommandAccount : ICommands
             await arg.SendMsg(I18NManager.Translate("Game.Command.Account.CreateFailed", ex.Message));
         }
     }
+
+    [CommandMethod("list")]
+    public async ValueTask List(CommandArg arg)
+    {
+        var accounts = DatabaseHelper.GetAllInstance<AccountData>()?
+            .OrderBy(account => account.Uid)
+            .ToList();
+
+        if (accounts == null || accounts.Count == 0)
+        {
+            await arg.SendMsg("No accounts found.");
+            return;
+        }
+
+        var builder = new StringBuilder();
+        builder.AppendLine("Accounts:");
+        foreach (var account in accounts)
+            builder.AppendLine($"{account.Username} -> UID {account.Uid}");
+
+        await arg.SendMsg(builder.ToString().TrimEnd());
+    }
 }

GameServer/Command/Commands/CommandGiveAll.cs

@@ -1,4 +1,5 @@
 using MikuSB.Data;
+using MikuSB.Database;
 using MikuSB.Database.Inventory;
 using MikuSB.Enums.Item;
 using MikuSB.Enums.Player;
@@ -42,6 +43,7 @@ public class CommandGiveAll : ICommands
             weapons.Add(weapon);
         }
         if (weapons.Count > 0) await player.SendPacket(new PacketNtfCallScript(weapons));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.Weapon"), weapons.Count.ToString()));
     }
@@ -77,6 +79,7 @@ public class CommandGiveAll : ICommands
             supportCards.Add(supportCard);
         }
         if (supportCards.Count > 0) await player.SendPacket(new PacketNtfCallScript(supportCards));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.SupportCard"), supportCards.Count.ToString()));
     }
@@ -111,6 +114,7 @@ public class CommandGiveAll : ICommands
             weaponSkins.Add(weaponSkin);
         }
         if (weaponSkins.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponSkins));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.WeaponSkin"), weaponSkins.Count.ToString()));
     }
@@ -147,6 +151,7 @@ public class CommandGiveAll : ICommands
             profileItems.Add(profile);
         }
         if (profileItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(profileItems));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.Profile"), profileItems.Count.ToString()));
     }
@@ -183,6 +188,7 @@ public class CommandGiveAll : ICommands
             skinPartItems.Add(skinPart);
         }
         if (skinPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinPartItems));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.SkinPart"), skinPartItems.Count.ToString()));
     }
@@ -219,6 +225,7 @@ public class CommandGiveAll : ICommands
             callItems.Add(callItem);
         }
         if (callItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(callItems));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.CallItem"), callItems.Count.ToString()));
     }
@@ -255,6 +262,7 @@ public class CommandGiveAll : ICommands
             weaponPartItems.Add(weaponPart);
         }
         if (weaponPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponPartItems));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.WeaponPart"), weaponPartItems.Count.ToString()));
     }
@@ -291,6 +299,7 @@ public class CommandGiveAll : ICommands
             skinItems.Add(skin);
         }
         if (skinItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinItems));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.Skin"), skinItems.Count.ToString()));
     }
@@ -327,6 +336,7 @@ public class CommandGiveAll : ICommands
             furnitureItems.Add(furniture);
         }
         if (furnitureItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(furnitureItems));
+        DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.Furniture"), furnitureItems.Count.ToString()));
     }

GameServer/Game/Player/PlayerInstance.cs

@@ -214,6 +214,10 @@ public class PlayerInstance(PlayerGameData data)
         };
 
         foreach (var chara in CharacterManager.CharacterData.Characters) proto.Items.Add(chara.ToProto());
+        foreach (var item in InventoryManager.InventoryData.Items.Values) proto.Items.Add(item.ToProto());
+        foreach (var skin in InventoryManager.InventoryData.Skins.Values) proto.Items.Add(skin.ToProto());
+        foreach (var weapon in InventoryManager.InventoryData.Weapons.Values) proto.Items.Add(weapon.ToProto());
+        foreach (var card in InventoryManager.InventoryData.SupportCards.Values) proto.Items.Add(card.ToProto());
         foreach (var x in Data.Attrs)
         {
             uint gid = x.Gid;
@@ -226,9 +230,7 @@ public class PlayerInstance(PlayerGameData data)
                 continue;
             }
 
-            //ToDo
-            //Temporary fix for login issues(need to handle LoginRsp properly with zlib.)
-            //proto.Attrs[ToPackedAttrKey(gid, sid)] = val;   
+            proto.Attrs[ToPackedAttrKey(gid, sid)] = val;   
             proto.Attrs[ToShiftedAttrKey(gid, sid)] = val;
         }
 
@@ -325,20 +327,49 @@ public class PlayerInstance(PlayerGameData data)
 
     private static IEnumerable<(uint Gid, uint Sid, uint Value)> BuildGirlFurnitureAttrs()
     {
-        // Unlock some furniture slots for every girl
-        // Each furniture attr int stores 10 slots using 3 bits per slot
-        // Value below means slot 0..9 = 1
         const uint furnitureUnlockedValue = 153391689;
+        var groupFurnitureByArea = new Dictionary<uint, uint>();
+        foreach (var pos in GameData.HouseFurniturePosData.Values)
+        {
+            var areaId = pos.AreaId;
+            var groupId = pos.GroupId;
+            uint selectedIndex = 1;
+            var shift = (groupId - 1) * 3;
+            if (!groupFurnitureByArea.TryGetValue(areaId, out var packed)) packed = 0;
+            packed |= (selectedIndex << (int)shift);
+            groupFurnitureByArea[areaId] = packed;
+        }
 
         for (uint girlId = 0; girlId <= 50; girlId++)
         {
-            // FurnitureStart..FurnitureEnd = 10..19
+            var baseSid = girlId * 50;
             for (uint offset = 10; offset <= 19; offset++)
-            {
-                uint sid = (girlId * 50) + offset;
-                yield return (101, sid, furnitureUnlockedValue);
-            }
+                yield return (101, baseSid + offset, furnitureUnlockedValue);
+
+            if (groupFurnitureByArea.TryGetValue(girlId, out var groupValue))
+                yield return (101, baseSid + 20, groupValue);
         }
+
+        // Massage room furniture
+        // 10010..10019
+        for (uint sid = 10010; sid <= 10019; sid++)
+            yield return (101, sid, furnitureUnlockedValue);
+
+        // Massage room group state
+        yield return (101, 10020, 1);
+
+        // Hot spring furniture
+        // 15001..15010
+        for (uint sid = 15001; sid <= 15010; sid++)
+            yield return (101, sid, furnitureUnlockedValue);
+
+        // Beach furniture
+        // 17101..17110
+        for (uint sid = 17101; sid <= 17110; sid++)
+            yield return (101, sid, furnitureUnlockedValue);
+
+        for (uint sid = 30000; sid < 31000; sid++)
+            yield return (101, sid, furnitureUnlockedValue);
     }
 
     private static IEnumerable<(uint Gid, uint Sid, uint Value)> BuildLobbyBootstrapAttrs()

GameServer/Server/CallGS/Handlers/Misc/ZoneTime_ReqTime.cs

@@ -1,16 +1,14 @@
-using MikuSB.Util.Extensions;
-
 namespace MikuSB.GameServer.Server.CallGS.Handlers.Misc;
 
 // Client requests server time to calculate timezone offset.
-// nTime1/nTime2 are DST transition reference timestamps; returning the same value means no offset.
+// In the client, ZoneTime.lua hardcodes sTime1/sTime2; if nTime1/nTime2 are false, the client ignores this update.
+// Otherwise, offset = nTimeX - ParseTimeNative(sTimeX).
 [CallGSApi("ZoneTime_ReqTime")]
 public class ZoneTime_ReqTime : ICallGSHandler
 {
     public async Task Handle(Connection connection, string param, ushort seqNo)
     {
-        var now = Extensions.GetUnixSec();
-        var arg = $"{{\"nTime1\":{now},\"nTime2\":{now}}}";
+        var arg = $"{{\"nTime1\":false,\"nTime2\":false}}";
         await CallGSRouter.SendScript(connection, "ZoneTime_ChangeTime", arg);
     }
 }

GameServer/Server/Packet/Recv/Login/HandlerReqLogin.cs

@@ -11,6 +11,8 @@ using MikuSB.GameServer.Server.Packet.Send.Misc;
 using MikuSB.Proto;
 using MikuSB.TcpSharp;
 using MikuSB.Util;
+using System.Text;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 
 namespace MikuSB.GameServer.Server.Packet.Recv.Login;
@@ -18,21 +20,45 @@ namespace MikuSB.GameServer.Server.Packet.Recv.Login;
 [Opcode(CmdIds.ReqLogin)]
 public class HandlerReqLogin : Handler
 {
+    private static readonly Logger Logger = new("ReqLogin");
+
+    private static string? ExtractSdkAuthToken(string? token)
+    {
+        if (string.IsNullOrWhiteSpace(token))
+            return null;
+
+        try
+        {
+            var normalized = Uri.UnescapeDataString(token).Trim();
+            var padding = normalized.Length % 4;
+            if (padding > 0)
+                normalized = normalized.PadRight(normalized.Length + (4 - padding), '=');
+
+            var json = Encoding.UTF8.GetString(Convert.FromBase64String(normalized));
+            using var document = JsonDocument.Parse(json);
+            return document.RootElement.TryGetProperty("authToken", out var authToken)
+                ? authToken.GetString()
+                : null;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
     public override async Task OnHandle(Connection connection, byte[] data, ushort seqNo)
     {
         var req = ReqLogin.Parser.ParseFrom(data);
+        var sdkAuthToken = ExtractSdkAuthToken(req.Token);
         var account = AccountData.GetAccountByComboToken(req.Token)
                       ?? AccountData.GetAccountByDispatchToken(req.Token)
-                      ?? AccountData.GetAccountByUid(10001)
-                      ?? AccountData.GetAccountByUid(1);
+                      ?? AccountData.GetAccountByComboToken(sdkAuthToken ?? "")
+                      ?? AccountData.GetAccountByDispatchToken(sdkAuthToken ?? "");
         if (account == null)
         {
-            account = AccountData.CreateAccount("default@mikusb.local", 10001, "");
-            if (account == null)
-            {
-                await connection.SendPacket(CmdIds.NtfLogout);
-                return;
-            }
+            Logger.Warn($"Rejected login: provider={req.Provider}, token={req.Token}, authToken={sdkAuthToken}");
+            await connection.SendPacket(CmdIds.NtfLogout);
+            return;
         }
         if (!ResourceManager.IsLoaded)
             // resource manager not loaded, return
@@ -61,7 +87,6 @@ public class HandlerReqLogin : Handler
         await connection.Player.OnHeartBeat();
         await connection.SendPacket(new PacketNtfUpdateFriend(connection.Player!));
         ApplySavedGirlSkinTypes(connection.Player!);
-        await connection.SendPacket(new PacketNtfCallScript(connection.Player!.InventoryManager.InventoryData));
         await SendGirlSkinTypeOnLogin(connection);
     }
 

GameServer/Server/Packet/Send/Login/PacketRspLogin.cs

@@ -22,7 +22,7 @@ public class PacketRspLogin : BasePacket
         };
 
         var bytes = Google.Protobuf.MessageExtensions.ToByteArray(proto);
-        Logger.Info($"RspLogin proto size: {bytes.Length} bytes (limit: 65535)");
+        Logger.Info($"RspLogin proto size: {bytes.Length} bytes");
 
         SetData(bytes);
     }

MikuSB.Loader/GameLaunchService.cs

@@ -11,6 +11,7 @@ public static class GameLaunchService
     public static int Launch(params string[] extraGameArguments)
     {
         ConfigManager.LoadConfig();
+        PatchDownloadService.EnsurePatchPresent();
         var options = LaunchOptions.FromConfig(extraGameArguments);
         return Launch(options);
     }

README.md

@@ -42,7 +42,8 @@ dotnet build
 ```
 2. Set `GamePath` in `Config.json` to the path of your game executable.
 3. Start the server and run the `game` command.
-4. Enjoy.
+4. Create an account in the server console.  
+5. Enjoy.
 
 ## Feature List
 

README_jp.md

@@ -42,7 +42,8 @@ dotnet build
 ```
 2. Config.json の`GamePath`にあなたのゲームの実行ファイルのパスを書き込みます  
 3. サーバーを起動し`game`コマンドを入力します  
-4. 楽しむ
+4. サーバーコンソールでアカウントを作成する  
+5. 楽しむ
 
 ## 機能一覧
 

SdkServer/Handlers/RouteController.cs

@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using MikuSB.Configuration;
 using MikuSB.Database.Account;
@@ -13,8 +14,6 @@ public class RouteController : ControllerBase
 {
     public static ConfigContainer Config = ConfigManager.Config;
 
-    private const int DefaultAccountUid = 10001;
-
     public static object BuildServerList(string version = "")
     {
         return new
@@ -129,29 +128,15 @@ public class RouteController : ControllerBase
         return Ok(rsp);
     }
 
-    private static AccountData EnsureDefaultAccount()
-    {
-        var account = AccountData.GetAccountByUid(DefaultAccountUid)
-                      ?? AccountData.GetAccountByEmail("default@mikusb.local");
-        if (account != null)
-            return account;
-
-        return AccountData.CreateAccount("default@mikusb.local", DefaultAccountUid, "");
-    }
-
-    private static AccountData ResolveAccountByUid(string? uid)
+    private static AccountData? ResolveAccountByUid(string? uid)
     {
         if (int.TryParse(uid, out var parsedUid))
-        {
-            var accountByUid = AccountData.GetAccountByUid(parsedUid);
-            if (accountByUid != null)
-                return accountByUid;
-        }
+            return AccountData.GetAccountByUid(parsedUid);
 
-        return EnsureDefaultAccount();
+        return null;
     }
 
-    private static AccountData ResolveAccountForSdkLogin(string? email, string? uid, string? token)
+    private static AccountData? ResolveAccountForSdkLogin(string? email, string? uid, string? token)
     {
         if (!string.IsNullOrWhiteSpace(token))
         {
@@ -174,18 +159,78 @@ public class RouteController : ControllerBase
         return ResolveAccountByUid(uid);
     }
 
+    private async Task<string?> GetJsonBodyValue(string propertyName)
+    {
+        if (!Request.HasJsonContentType())
+            return null;
+
+        Request.EnableBuffering();
+        Request.Body.Position = 0;
+
+        using var reader = new StreamReader(Request.Body, Encoding.UTF8, leaveOpen: true);
+        var body = await reader.ReadToEndAsync();
+        Request.Body.Position = 0;
+
+        if (string.IsNullOrWhiteSpace(body))
+            return null;
+
+        try
+        {
+            using var document = JsonDocument.Parse(body);
+            if (document.RootElement.ValueKind != JsonValueKind.Object)
+                return null;
+
+            return document.RootElement.TryGetProperty(propertyName, out var value)
+                ? value.GetString()
+                : null;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    private IActionResult BuildLoginFailedResponse(string message)
+    {
+        object rsp = new
+        {
+            code = 1001,
+            data = (object?)null,
+            msg = message
+        };
+
+        return Ok(rsp);
+    }
+
+    private IActionResult BuildNotFoundResponse(string message)
+    {
+        object rsp = new
+        {
+            code = 1001,
+            data = (object?)null,
+            msg = message
+        };
+
+        return Ok(rsp);
+    }
+
     [HttpGet("/seasun/loginByToken")]
     [HttpPost("/seasun/loginByToken")]
-    public IActionResult LoginByToken(
+    public async Task<IActionResult> LoginByToken(
         [FromQuery] string? uid,
         [FromQuery] string? token,
         [FromForm] string? form_uid,
         [FromForm] string? form_token
     )
     {
-        var account = ResolveAccountForSdkLogin(null, uid ?? form_uid, token ?? form_token);
-        var finalUid = account.Uid.ToString();
-        var finalToken = account.GenerateComboToken();
+        var finalUid = uid ?? form_uid ?? await GetJsonBodyValue("uid");
+        var finalToken = token ?? form_token ?? await GetJsonBodyValue("token");
+        var account = ResolveAccountForSdkLogin(null, finalUid, finalToken);
+        if (account == null)
+            return BuildLoginFailedResponse("Account not found.");
+
+        var responseUid = account.Uid.ToString();
+        var responseToken = account.GenerateComboToken();
 
         object rsp = new
         {
@@ -195,13 +240,13 @@ public class RouteController : ControllerBase
                 associatedAccounts = Array.Empty<string>(),
                 isFirstLogin = false,
                 isNeedKoreaSciAuth = false,
-                ksOpenId = $"ks_{finalUid}",
+                ksOpenId = $"ks_{responseUid}",
                 nickname = account.Username,
-                passportId = finalUid,
+                passportId = responseUid,
                 playerFillAgeUrl = "",
                 status = 0,
                 thirdPartyUid = "",
-                token = finalToken,
+                token = responseToken,
                 type = "guest",
                 uid = account.Uid
             },
@@ -213,7 +258,7 @@ public class RouteController : ControllerBase
 
     [HttpGet("/seasun/login")]
     [HttpPost("/seasun/login")]
-    public IActionResult Login(
+    public async Task<IActionResult> Login(
         [FromQuery] string? uid,
         [FromQuery] string? token,
         [FromQuery] string? email,
@@ -222,10 +267,53 @@ public class RouteController : ControllerBase
         [FromForm] string? form_email
     )
     {
-        var finalEmail = email ?? form_email;
-        var account = ResolveAccountForSdkLogin(finalEmail, uid ?? form_uid, token ?? form_token);
-        var finalUid = account.Uid.ToString();
-        var finalToken = account.GenerateComboToken();
+        var finalEmail = email ?? form_email ?? await GetJsonBodyValue("email");
+        if (!string.IsNullOrWhiteSpace(finalEmail))
+        {
+            var username = finalEmail.Split('@')[0];
+            var accountData = AccountData.GetAccountByUserName(username);
+            if (accountData == null)
+            {
+                if (!ConfigManager.Config.ServerOption.AutoCreateUser) return BuildLoginFailedResponse("Account not found.");
+                AccountData.CreateAccount(username, 0, "123456");
+                accountData = AccountData.GetAccountByUserName(username)!;
+            }
+
+            var finalUidValue = accountData.Uid.ToString();
+            var finalTokenValue = accountData.GenerateComboToken();
+
+            object emailLoginRsp = new
+            {
+                code = 0,
+                data = new
+                {
+                    associatedAccounts = Array.Empty<string>(),
+                    isFirstLogin = false,
+                    isNeedKoreaSciAuth = false,
+                    ksOpenId = $"ks_{finalUidValue}",
+                    nickname = accountData.Username,
+                    passportId = finalUidValue,
+                    playerFillAgeUrl = "",
+                    status = 0,
+                    thirdPartyUid = "",
+                    token = finalTokenValue,
+                    type = "guest",
+                    uid = accountData.Uid
+                },
+                msg = "操作成功"
+            };
+
+            return Ok(emailLoginRsp);
+        }
+
+        var finalUid = uid ?? form_uid ?? await GetJsonBodyValue("uid");
+        var finalToken = token ?? form_token ?? await GetJsonBodyValue("token");
+        var account = ResolveAccountForSdkLogin(finalEmail, finalUid, finalToken);
+        if (account == null)
+            return BuildLoginFailedResponse("Account not found.");
+
+        var responseUid = account.Uid.ToString();
+        var responseToken = account.GenerateComboToken();
 
         object rsp = new
         {
@@ -235,13 +323,13 @@ public class RouteController : ControllerBase
                 associatedAccounts = Array.Empty<string>(),
                 isFirstLogin = false,
                 isNeedKoreaSciAuth = false,
-                ksOpenId = $"ks_{finalUid}",
+                ksOpenId = $"ks_{responseUid}",
                 nickname = account.Username,
-                passportId = finalUid,
+                passportId = responseUid,
                 playerFillAgeUrl = "",
                 status = 0,
                 thirdPartyUid = "",
-                token = finalToken,
+                token = responseToken,
                 type = "guest",
                 uid = account.Uid
             },
@@ -259,6 +347,9 @@ public class RouteController : ControllerBase
     )
     {
         var account = ResolveAccountByUid(uid ?? form_uid);
+        if (account == null)
+            return BuildNotFoundResponse("Account not found.");
+
         var uidString = account.Uid.ToString();
 
         object rsp = new
@@ -338,7 +429,11 @@ public class RouteController : ControllerBase
     [HttpGet("/account/query-uid/{appId}")]
     public IActionResult QueryUid(string appId, [FromQuery] string authInfo)
     {
-        var uid = ResolveAccountByUid(ExtractUid(authInfo)).Uid.ToString();
+        var account = ResolveAccountByUid(ExtractUid(authInfo));
+        if (account == null)
+            return BuildNotFoundResponse("Account not found.");
+
+        var uid = account.Uid.ToString();
 
         object rsp = new
         {

SdkServer/Utils/LoggingMiddleware.cs

@@ -1,34 +1,108 @@
 using Microsoft.AspNetCore.Http;
 using MikuSB.Util;
+using System.Text;
 
 namespace MikuSB.SdkServer.Utils;
 
 public class RequestLoggingMiddleware(RequestDelegate next)
 {
+    private const long MaxLoggedBodyBytes = 1024 * 1024;
+
+    private static bool ShouldSkip(string path)
+        => path.StartsWith("/report") || path.Contains("/log/") || path == "/alive";
+
+    private static bool ShouldLogBody(HttpRequest request)
+    {
+        if (request.ContentLength is null or 0)
+            return false;
+
+        if (request.ContentLength > MaxLoggedBodyBytes)
+            return false;
+
+        if (string.IsNullOrWhiteSpace(request.ContentType))
+            return false;
+
+        return request.ContentType.Contains("json", StringComparison.OrdinalIgnoreCase)
+            || request.ContentType.Contains("text", StringComparison.OrdinalIgnoreCase)
+            || request.ContentType.Contains("xml", StringComparison.OrdinalIgnoreCase)
+            || request.ContentType.Contains("x-www-form-urlencoded", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static string SanitizeForLog(string value)
+    {
+        var builder = new StringBuilder(value.Length);
+        foreach (var ch in value)
+        {
+            if (ch == '\r')
+            {
+                builder.Append(@"\r");
+                continue;
+            }
+
+            if (ch == '\n')
+            {
+                builder.Append(@"\n");
+                continue;
+            }
+
+            if (char.IsControl(ch))
+            {
+                builder.Append(@"\u");
+                builder.Append(((int)ch).ToString("x4"));
+                continue;
+            }
+
+            builder.Append(ch);
+        }
+
+        return builder.ToString();
+    }
+
+    private static async Task<string> ReadBodyAsString(HttpRequest request)
+    {
+        request.EnableBuffering();
+        request.Body.Position = 0;
+
+        using var reader = new StreamReader(request.Body, Encoding.UTF8, leaveOpen: true);
+        var body = await reader.ReadToEndAsync();
+
+        request.Body.Position = 0;
+        return body;
+    }
+
     public async Task InvokeAsync(HttpContext context, Logger logger)
     {
         var request = context.Request;
         var method = request.Method;
-        var path = request.Path + request.QueryString;
+        var path = request.Path.ToString();
+        var pathWithQuery = path + request.QueryString;
+
+        if (ConfigManager.Config.HttpServer.EnableLog && !ShouldSkip(path))
+        {
+            var body = ShouldLogBody(request)
+                ? SanitizeForLog(await ReadBodyAsString(request))
+                : "<omitted>";
+            logger.Info($"REQ {method} {pathWithQuery} body={body}");
+        }
 
         await next(context);
 
         var statusCode = context.Response.StatusCode;
 
-        if (path.StartsWith("/report") || path.Contains("/log/") || path == "/alive")
+        if (ShouldSkip(path))
             return;
         if (!ConfigManager.Config.HttpServer.EnableLog) return;
         if (statusCode == 200)
         {
-            logger.Info($"{method} {path} => {statusCode}");
+            logger.Info($"{method} {pathWithQuery} => {statusCode}");
         }
         else if (statusCode == 404)
         {
-            logger.Warn($"{method} {path} => {statusCode}");
+            logger.Warn($"{method} {pathWithQuery} => {statusCode}");
         }
         else
         {
-            logger.Error($"{method} {path} => {statusCode}");
+            logger.Error($"{method} {pathWithQuery} => {statusCode}");
         }
     }
 }

TcpSharp/BasePacket.cs

@@ -12,6 +12,7 @@ public class BasePacket
     public long Timestamp { get; set; }
     public IMessage? Message { get; set; }
     public PacketFraming Framing { get; set; }
+    public int UncompressedBodySize { get; set; }
 
     public BasePacket(ushort cmdId)
     {

TcpSharp/PacketCodec.cs

@@ -2,6 +2,7 @@
 using MikuSB.Enums.Packet;
 using MikuSB.Util;
 using System.Buffers.Binary;
+using System.IO.Compression;
 using System.Net.Sockets;
 
 namespace MikuSB.TcpSharp
@@ -63,11 +64,11 @@ namespace MikuSB.TcpSharp
             }
         }
 
-        public byte[] Encode(ushort packetId, byte[] payload, PacketFraming framing = PacketFraming.FourByteLittleEndianLength)
+        public byte[] Encode(ushort packetId, byte[] payload, PacketFraming framing = PacketFraming.FourByteLittleEndianLength, int uncompressedSize = 0)
         {
             return framing switch
             {
-                PacketFraming.TwoByteBigEndianLength => EncodeTwoByteFrame(packetId, payload),
+                PacketFraming.TwoByteBigEndianLength => EncodeTwoByteFrame(packetId, payload, uncompressedSize),
                 PacketFraming.FourByteLittleEndianLength => EncodeFourByteFrame(packetId, payload),
                 _ => EncodeFourByteFrame(packetId, payload)
             };
@@ -220,8 +221,20 @@ namespace MikuSB.TcpSharp
             return payload;
         }
 
-        private byte[] EncodeTwoByteFrame(ushort packetId, byte[] payload)
+        private const int CompressionThreshold = 60000;
+
+        private static byte[] ZlibCompress(byte[] data)
         {
+            using var ms = new MemoryStream();
+            using (var zlib = new ZLibStream(ms, CompressionLevel.Optimal, leaveOpen: true))
+                zlib.Write(data, 0, data.Length);
+            return ms.ToArray();
+        }
+
+        private byte[] EncodeTwoByteFrame(ushort packetId, byte[] payload, int uncompressedSize = 0)
+        {
+            if (payload.Length > CompressionThreshold)
+                payload = ZlibCompress(payload);
             var wrappedPayload = WrapPayload(payload);
             var buffer = new byte[HeaderSize4Byte + wrappedPayload.Length];
 
@@ -246,7 +259,9 @@ namespace MikuSB.TcpSharp
             const int wrapperHeaderSize = 35;
             var wrapped = new byte[wrapperHeaderSize + payload.Length];
             BinaryPrimitives.WriteUInt16LittleEndian(wrapped.AsSpan(6, 2), (ushort)payload.Length);
-            wrapped[11] = 1;
+            if (payload.Length >= 2 && payload[0] == 0x78 &&
+                (payload[1] == 0x01 || payload[1] == 0x5E || payload[1] == 0x9C || payload[1] == 0xDA))
+                wrapped[10] = 2;
             payload.CopyTo(wrapped.AsSpan(wrapperHeaderSize));
 
             return wrapped;

version.txt

@@ -1 +1 @@
-v=2.4
+v=2.9