fix(CaiBotLite): block unexpected netmodule packets (#1174)

* fix(CaiBotLite): block unexpected netmodule packet

* feat(CaiBotLite): 在主线程新增登录队列，以缓解背包还原失败

* 更改

* fix review issues

Author: ACaiCat

src/CaiBotLite/CaiBotLite.cs

@@ -13,7 +13,7 @@ namespace CaiBotLite;
 // ReSharper disable once ClassNeverInstantiated.Global
 public class CaiBotLite(Main game) : TerrariaPlugin(game)
 {
-    public static readonly Version VersionNum = new (2026, 06, 21, 0);
+    public static readonly Version VersionNum = new (2026, 07, 7, 0);
     internal static int InitCode = -1;
     internal static bool DebugMode = Program.LaunchParameters.ContainsKey("-caidebug");
     private const string CharacterInfoKey = "CaiBotLite.CharacterInfo";
@@ -45,6 +45,7 @@ public override void Initialize()
         ProgressControlSupport.Init();
         WebsocketManager.Init();
         Commands.ChatCommands.Add(new Command("caibotlite.admin", CaiBotCommand, "caibotlite", "cbl"));
+        ClearCharacterInfoForActivePlayers();
     }
 
     protected override void Dispose(bool disposing)
@@ -64,6 +65,7 @@ protected override void Dispose(bool disposing)
             PlayerHooks.PlayerPostLogin -= PlayerHooksOnPlayerPostLogin;
             GetDataHandlers.KillMe.UnRegister(KillMe);
             WebsocketManager.StopWebsocket();
+            ClearCharacterInfoForActivePlayers();
         }
 
         base.Dispose(disposing);
@@ -85,6 +87,7 @@ private static void OnGameUpdate(EventArgs args)
         }
 
         _timer++;
+        LoginHelper.ProcessLoginQueue();
     }
 
     private static void KillMe(object? sender, GetDataHandlers.KillMeEventArgs e)
@@ -300,6 +303,14 @@ public static void GenBindCode(EventArgs? args)
         InitCode = new Random().Next(10000000, 99999999);
         TShock.Log.ConsoleError($"[CaiBotLite]您的服务器绑定码为: {InitCode}");
     }
+    
+    private static void ClearCharacterInfoForActivePlayers()
+    {
+        foreach (var player in TShock.Players.Where(x => x is { Active: true }))
+        {
+            player.RemoveData(CharacterInfoKey);
+        }
+    }
 
 
     #region 加载前置
@@ -320,4 +331,4 @@ public static void GenBindCode(EventArgs? args)
     }
 
     #endregion
-}
+}

src/CaiBotLite/Common/CaiBotApi.cs

@@ -88,7 +88,7 @@ internal static void HandleMessage(string receivedData)
 
                     if (LoginHelper.CheckWhitelist(player, whitelistResult))
                     {
-                        LoginHelper.HandleLogin(player);
+                        LoginHelper.PostLoginQueue(player);
                     }
 
                     break;

src/CaiBotLite/Common/LoginHelper.cs

@@ -1,4 +1,5 @@
 using CaiBotLite.Enums;
+using System.Collections.Concurrent;
 using Terraria;
 using TerrariaApi.Server;
 using TShockAPI;
@@ -9,6 +10,26 @@ namespace CaiBotLite.Common;
 
 internal static class LoginHelper
 {
+    private static readonly ConcurrentQueue<TSPlayer> LoginQueue = new ();
+
+    internal static void PostLoginQueue(TSPlayer player)
+    {
+        LoginQueue.Enqueue(player);
+    }
+    
+    // 在主线程调用
+    internal static void ProcessLoginQueue()
+    {
+        while (LoginQueue.TryDequeue(out var player))
+        {
+            if (!player.ConnectionAlive)
+            {
+                continue;
+            }
+            HandleLogin(player);
+        }
+    }
+    
     internal static void On_MessageBufferOnGetData(On.Terraria.MessageBuffer.orig_GetData orig, MessageBuffer self,
         int start, int length, out int messageType)
     {
@@ -83,6 +104,17 @@ internal static void OnGetData(GetDataEventArgs args)
             return;
         }
 
+        if (type == PacketTypes.LoadNetModule)
+        {
+            var moduleId = (GetDataHandlers.NetModuleType)args.Msg.reader.ReadUInt16();
+            // 客户端疑似异常发送 CreativePowers
+            if (moduleId != GetDataHandlers.NetModuleType.CreativePowers)
+            {
+                args.Handled = true;
+                return;
+            }
+        }
+
         if (type != PacketTypes.ContinueConnecting2)
         {
             return;
@@ -119,9 +151,7 @@ private static void Login(TSPlayer player, UserAccount account)
                 player.PlayerData.CopyCharacter(player);
                 TShock.CharacterDB.InsertPlayerData(player);
             }
-
-            // 调用两次以确保SSC角色数据稳定还原
-            player.PlayerData.RestoreCharacter(player);
+            
             player.PlayerData.RestoreCharacter(player);
         }
 
@@ -153,7 +183,7 @@ private static UserAccount Register(TSPlayer player)
         return account;
     }
 
-    internal static void HandleLogin(TSPlayer player)
+    private static void HandleLogin(TSPlayer player)
     {
         if (player.Name == TSServerPlayer.AccountName)
         {

src/CaiBotLite/README.md

@@ -25,18 +25,29 @@ https://docs.terraria.ink/zh/caibot/CaiBotLite.html
 
 ```json5
 {
-  "白名单开关": true, //Cai白名单的开关
-  "密钥": "1145141919810", //由系统自动配置
-  "白名单拦截提示的群号": 991556763 //为0时不显示群号
+  "白名单开关": true,
+  //Cai白名单的开关
+  "密钥": "1145141919810",
+  //由系统自动配置
+  "白名单拦截提示的群号": 991556763
+  //为0时不显示群号
 }
 ```
 
 ## 更新日志
 
+### v2026.7.7
+
+- 新增登录队列，在主线程处理登录
+- 拦截非预期的NetModule包
+- 修复热重载导致CaiCharacterInfo报错
+
 ### v2026.3.11
+
 - 将SSC登录还原改为重复两次以提升稳定性
 
 ### v2026.3.8
+
 - 支持动态识别配置路径
 
 ### v2026.02.25.1