feat: add Shared instance for toolkit & utility

Author: moomiji

src/MaaFramework.Binding.Native/MaaTasker.cs

@@ -35,8 +35,8 @@ internal MaaTasker(MaaTaskerHandle handle)
         Resource = new MaaResource(MaaTaskerGetResource(handle));
         Controller = new MaaController(MaaTaskerGetController(handle));
         DisposeOptions = DisposeOptions.None;
-        Toolkit = new MaaToolkit();
-        Utility = new MaaUtility();
+        Toolkit = MaaToolkit.Shared;
+        Utility = MaaUtility.Shared;
     }
 
     /// <summary>
@@ -54,8 +54,10 @@ public MaaTasker(bool toolkitInit = false)
             throw new InvalidOperationException($"This {nameof(MaaTasker)} already added to {nameof(Instances)}.");
         SetHandle(handle, needReleased: true);
 
-        Toolkit = new MaaToolkit(toolkitInit);
-        Utility = new MaaUtility();
+        Toolkit = MaaToolkit.Shared;
+        Utility = MaaUtility.Shared;
+        if (toolkitInit)
+            _ = Toolkit.Config.InitOption().ThrowIfFalse();
     }
 
     /// <param name="controller">The controller.</param>

src/MaaFramework.Binding.Native/MaaToolkit.cs

@@ -12,6 +12,11 @@ namespace MaaFramework.Binding;
 /// </summary>
 public class MaaToolkit : IMaaToolkit
 {
+    /// <summary>
+    ///    Gets the shared <see cref="MaaToolkit"/> instance.
+    /// </summary>
+    public static MaaToolkit Shared { get; } = new();
+
     /// <summary>
     ///     Creates a <see cref="MaaToolkit"/> instance.
     /// </summary>

src/MaaFramework.Binding.Native/MaaUtility.cs

@@ -8,6 +8,11 @@ namespace MaaFramework.Binding;
 /// </summary>
 public class MaaUtility : IMaaUtility
 {
+    /// <summary>
+    ///    Gets the shared <see cref="MaaUtility"/> instance.
+    /// </summary>
+    public static MaaUtility Shared { get; } = new();
+
     /// <inheritdoc/>
     /// <remarks>
     ///     Wrapper of <see cref="MaaVersion"/>.

src/MaaFramework.Binding.UnitTests/Test_Buffers.cs

@@ -22,9 +22,9 @@ public class Test_Buffers
                 new MaaStringBuffer(),
                 new MaaImageListBuffer(),
                 new MaaStringListBuffer(),
-                (AdbDeviceListBuffer)new MaaToolkit().AdbDevice.Find(),
+                (AdbDeviceListBuffer)MaaToolkit.Shared.AdbDevice.Find(),
 #if MAA_WIN32
-                (DesktopWindowListBuffer)new MaaToolkit().Desktop.Window.Find(),
+                (DesktopWindowListBuffer)MaaToolkit.Shared.Desktop.Window.Find(),
 #endif
             ]
         },

src/MaaFramework.Binding.UnitTests/Test_Common.cs

@@ -27,7 +27,7 @@ private static void InitializeInfo(TestContext testContext)
 #if GITHUB_ACTIONS // use environment "AdbPath"
         AdbDeviceInfo[] devices = [];
 #else
-        var devices = new MaaToolkit().AdbDevice.Find();
+        var devices = MaaToolkit.Shared.AdbDevice.Find();
 #endif
 
         // 请修改 TestParam.runsettings，并在测试资源管理器——设置——配置运行设置
@@ -52,8 +52,8 @@ public static void InitializeAssembly(TestContext testContext)
     {
         ArgumentNullException.ThrowIfNull(testContext);
 
-        _ = new MaaUtility().SetOption(GlobalOption.LogDir, DebugPath);
-        _ = new MaaUtility().SetOption(GlobalOption.StdoutLevel, LoggingLevel.Off);
+        _ = MaaUtility.Shared.SetOptionLogDir(DebugPath);
+        _ = MaaUtility.Shared.SetOptionStdoutLevel(LoggingLevel.Off);
 
         InitializeInfo(testContext);
     }

src/MaaFramework.Binding.UnitTests/Test_IMaaController.cs

@@ -112,8 +112,7 @@ public void CreateInstances()
 
 #if !GITHUB_ACTIONS
         #region MaaWin32Controller
-        var toolkit = new MaaToolkit();
-        var windowInfo = toolkit.Desktop.Window.Find().First(static x
+        var windowInfo = MaaToolkit.Shared.Desktop.Window.Find().First(static x
             => x.Name.Contains("Visual Studio", StringComparison.OrdinalIgnoreCase)
                || x.Name.Contains("Maa", StringComparison.OrdinalIgnoreCase));
 

src/MaaFramework.Binding.UnitTests/Test_IMaaToolkit.cs

@@ -12,7 +12,7 @@ public class Test_IMaaToolkit
     public static Dictionary<MaaTypes, object> NewData => new()
     {
 #if MAA_NATIVE
-        { MaaTypes.Native, new MaaToolkit() },
+        { MaaTypes.Native, MaaToolkit.Shared },
 #endif
     };
     public static Dictionary<MaaTypes, object> Data { get; private set; } = default!;

src/MaaFramework.Binding.UnitTests/Test_IMaaUtility.cs

@@ -10,7 +10,7 @@ public class Test_IMaaMaaUtility
     public static Dictionary<MaaTypes, object> NewData => new()
     {
 #if MAA_NATIVE
-        { MaaTypes.Native, new MaaUtility() },
+        { MaaTypes.Native, MaaUtility.Shared },
 #endif
     };
     public static Dictionary<MaaTypes, object> Data { get; private set; } = default!;