[NativeAPI] 实现自定义签名地址及自定义 AppInfo (#77)

Author: kamenomi-dev

Lagrange.Core.NativeAPI.Test/NativeModel/BotConfigStruct.cs

@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
 namespace Lagrange.Core.NativeAPI.Test.NativeModel
 {
@@ -22,5 +22,7 @@ public BotConfigStruct()
         public uint HighwayConcurrent { get; set; } = 4;
 
         public bool AutoReLogin { get; set; } = true;
+
+        public ByteArrayNative addr { get; set; } = new();
     }
 }

Lagrange.Core.NativeAPI.Test/Program.cs

@@ -13,6 +13,8 @@ class Program
     static async Task Main(string[] args)
     {
         var botConfig = new BotConfigStruct { };
+        botConfig.addr  = Encoding.UTF8.GetBytes("");
+        
         IntPtr keystorePtr = IntPtr.Zero;
         IntPtr botConfigPtr = Marshal.AllocHGlobal(Marshal.SizeOf(botConfig));
         Marshal.StructureToPtr(botConfig, botConfigPtr, false);

Lagrange.Core.NativeAPI/NativeModel/Common/BotAppInfoStruct.cs

@@ -0,0 +1,114 @@
+using System.Runtime.InteropServices;
+using System.Text;
+using Lagrange.Core.Common;
+
+namespace Lagrange.Core.NativeAPI.NativeModel.Common
+{
+    [StructLayout(LayoutKind.Sequential)]
+    struct BotAppInfoStruct
+    {
+        public BotAppInfoStruct() { }
+
+        public ByteArrayNative Os = new();
+
+        public ByteArrayNative VendorOs = new();
+
+        public ByteArrayNative Kernel = new();
+
+        public ByteArrayNative CurrentVersion = new();
+
+        public ByteArrayNative PtVersion = new();
+
+        public int SsoVersion = 0;
+
+        public ByteArrayNative PackageName = new();
+
+        public ByteArrayNative ApkSignatureMd5 = new();
+
+        public WtLoginSdkInfoStruct SdkInfo = new();
+
+        public int AppId = 0;
+
+        public int SubAppId = 0;
+
+        public ushort AppClientVersion = 0;
+
+        public static implicit operator BotAppInfo(BotAppInfoStruct info)
+        {
+            return new BotAppInfo()
+            {
+                Os = Encoding.UTF8.GetString(info.Os.ToByteArrayWithoutFree()),
+                VendorOs = Encoding.UTF8.GetString(info.VendorOs.ToByteArrayWithoutFree()),
+                Kernel = Encoding.UTF8.GetString(info.Kernel.ToByteArrayWithoutFree()),
+                CurrentVersion = Encoding.UTF8.GetString(info.CurrentVersion.ToByteArrayWithoutFree()),
+                PtVersion = Encoding.UTF8.GetString(info.PtVersion.ToByteArrayWithoutFree()),
+                SsoVersion = info.SsoVersion,
+                PackageName = Encoding.UTF8.GetString(info.PackageName.ToByteArrayWithoutFree()),
+                ApkSignatureMd5 = info.ApkSignatureMd5.ToByteArrayWithoutFree(),
+                SdkInfo = info.SdkInfo,
+                AppId = info.AppId,
+                SubAppId = info.SubAppId,
+                AppClientVersion = info.AppClientVersion
+            };
+        }
+
+        public static implicit operator BotAppInfoStruct(BotAppInfo info)
+        {
+            return new BotAppInfoStruct()
+            {
+                Os = Encoding.UTF8.GetBytes(info.Os),
+                VendorOs = Encoding.UTF8.GetBytes(info.VendorOs),
+                Kernel = Encoding.UTF8.GetBytes(info.Kernel),
+                CurrentVersion = Encoding.UTF8.GetBytes(info.CurrentVersion),
+                PtVersion = Encoding.UTF8.GetBytes(info.PtVersion),
+                SsoVersion = info.SsoVersion,
+                PackageName = Encoding.UTF8.GetBytes(info.PackageName),
+                ApkSignatureMd5 = info.ApkSignatureMd5,
+                SdkInfo = info.SdkInfo,
+                AppId = info.AppId,
+                SubAppId = info.SubAppId,
+                AppClientVersion = info.AppClientVersion
+            };
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct WtLoginSdkInfoStruct
+    {
+        public WtLoginSdkInfoStruct() { }
+
+        public uint SdkBuildTime = 0;
+
+        public ByteArrayNative SdkVersion = new();
+
+        public uint MiscBitMap = 0;
+
+        public uint SubSigMap = 0;
+
+        public int MainSigMap = 0;
+
+        public static implicit operator WtLoginSdkInfo(WtLoginSdkInfoStruct info)
+        {
+            return new WtLoginSdkInfo()
+            {
+                SdkBuildTime = info.SdkBuildTime,
+                SdkVersion = Encoding.UTF8.GetString(info.SdkVersion.ToByteArrayWithoutFree()),
+                MiscBitMap = info.MiscBitMap,
+                SubSigMap = info.SubSigMap,
+                MainSigMap = (Sig)info.MainSigMap,
+            };
+        }
+
+        public static implicit operator WtLoginSdkInfoStruct(WtLoginSdkInfo info)
+        {
+            return new WtLoginSdkInfoStruct()
+            {
+                SdkBuildTime = info.SdkBuildTime,
+                SdkVersion = Encoding.UTF8.GetBytes(info.SdkVersion),
+                MiscBitMap = info.MiscBitMap,
+                SubSigMap = info.SubSigMap,
+                MainSigMap = (int)info.MainSigMap,
+            };
+        }
+    }
+}

Lagrange.Core.NativeAPI/NativeModel/Common/BotConfigStruct.cs

@@ -1,14 +1,13 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
+using System.Text;
 using Lagrange.Core.Common;
 
 namespace Lagrange.Core.NativeAPI.NativeModel.Common
 {
     [StructLayout(LayoutKind.Sequential)]
     public struct BotConfigStruct
     {
-        public BotConfigStruct()
-        {
-        }
+        public BotConfigStruct() { }
 
         public byte Protocol { get; set; } = 0b00000100;
 
@@ -23,7 +22,9 @@ public BotConfigStruct()
         public uint HighwayConcurrent { get; set; } = 4;
 
         public bool AutoReLogin { get; set; } = true;
-        
+
+        public ByteArrayNative SignAddress { get; set; } = new();
+
         public static implicit operator BotConfig(BotConfigStruct config)
         {
             return new BotConfig()
@@ -34,10 +35,19 @@ public static implicit operator BotConfig(BotConfigStruct config)
                 GetOptimumServer = config.GetOptimumServer,
                 HighwayChunkSize = config.HighwayChunkSize,
                 HighwayConcurrent = config.HighwayConcurrent,
-                AutoReLogin = config.AutoReLogin
+                AutoReLogin = config.AutoReLogin,
+                SignProvider = (Protocols)config.Protocol switch
+                {
+                    Protocols.Windows => throw new NotSupportedException("Windows is not supported"),
+                    Protocols.MacOs => throw new NotSupportedException("MacOs is not supported"),
+                    Protocols.Linux => new LinuxSignProvider(Encoding.UTF8.GetString(config.SignAddress.ToByteArrayWithoutFree())),
+                    Protocols.AndroidPhone => new AndroidSignProvider(Encoding.UTF8.GetString(config.SignAddress.ToByteArrayWithoutFree())),
+                    Protocols.AndroidPad => new AndroidSignProvider(Encoding.UTF8.GetString(config.SignAddress.ToByteArrayWithoutFree())),
+                    _ => throw new ArgumentOutOfRangeException()
+                }
             };
         }
-        
+
         public static implicit operator BotConfigStruct(BotConfig config)
         {
             return new BotConfigStruct()
@@ -48,7 +58,7 @@ public static implicit operator BotConfigStruct(BotConfig config)
                 GetOptimumServer = config.GetOptimumServer,
                 HighwayChunkSize = config.HighwayChunkSize,
                 HighwayConcurrent = config.HighwayConcurrent,
-                AutoReLogin = config.AutoReLogin
+                AutoReLogin = config.AutoReLogin,
             };
         }
     }