fix: tasker errors in stateless mode

Author: moomiji

src/MaaFramework.Binding.Native/MaaContext.cs

@@ -22,6 +22,9 @@ public MaaContext(MaaContextHandle contextHandle)
         if (contextHandle == MaaContextHandle.Zero)
             throw new ArgumentException($"Value cannot be {MaaContextHandle.Zero}.", nameof(contextHandle));
         Handle = contextHandle;
+
+        var taskerHandle = MaaContextGetTasker(Handle);
+        Tasker = NativeBindingContext.IsStatelessMode ? new MaaTasker(taskerHandle) : MaaTasker.Instances[taskerHandle];
     }
 
     /// <inheritdoc/>
@@ -97,17 +100,7 @@ public bool OverrideNext(string nodeName, IEnumerable<string> nextList)
     /// <remarks>
     ///     Wrapper of <see cref="MaaContextGetTasker"/>.
     /// </remarks>
-    public MaaTasker Tasker
-    {
-        get
-        {
-            var taskerHandle = MaaContextGetTasker(Handle);
-            if (NativeBindingContext.IsStatelessMode)
-                return new MaaTasker(taskerHandle);
-            else
-                return MaaTasker.Instances[taskerHandle];
-        }
-    }
+    public MaaTasker Tasker { get; }
 
     object ICloneable.Clone()
         => Clone();

src/MaaFramework.Binding.Native/MaaTasker.cs

@@ -28,16 +28,18 @@ public class MaaTasker : MaaCommon, IMaaTasker<MaaTaskerHandle>
     /// </remarks>
     protected internal static ConcurrentDictionary<MaaTaskerHandle, MaaTasker> Instances { get; } = [];
 
+#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑添加 "required" 修饰符或声明为可为 null。
     [SetsRequiredMembers]
     internal MaaTasker(MaaTaskerHandle handle)
     {
         SetHandle(handle, needReleased: false);
-        Resource = new MaaResource(MaaTaskerGetResource(handle));
-        Controller = new MaaController(MaaTaskerGetController(handle));
+        _resource = new MaaResource(MaaTaskerGetResource(handle));
+        _controller = new MaaController(MaaTaskerGetController(handle));
         DisposeOptions = DisposeOptions.None;
         Toolkit = MaaToolkit.Shared;
         Utility = MaaUtility.Shared;
     }
+#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑添加 "required" 修饰符或声明为可为 null。
 
     /// <summary>
     ///     Creates a <see cref="MaaTasker"/> instance.
@@ -80,18 +82,13 @@ public MaaTasker(MaaController controller, MaaResource resource, DisposeOptions
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)
     {
-        // Cannot destroy Instance before disposing Controller and Resource.
-
         if (DisposeOptions.HasFlag(DisposeOptions.Controller))
-        {
             Controller.Dispose();
-        }
 
         if (DisposeOptions.HasFlag(DisposeOptions.Resource))
-        {
             Resource.Dispose();
-        }
 
+        _ = Instances.TryRemove(new KeyValuePair<MaaTaskerHandle, MaaTasker>(Handle, this));
         base.Dispose(disposing);
     }
 
@@ -122,6 +119,9 @@ public bool SetOption<T>(TaskerOption opt, T value)
 #pragma warning restore
     }
 
+    private MaaResource _resource = null!;
+    private MaaController _controller = null!;
+
     IMaaResource IMaaTasker.Resource
     {
         get => Resource;
@@ -143,14 +143,14 @@ public required MaaResource Resource
         get
         {
             if (!IsInvalid)
-                _ = MaaTaskerGetResource(Handle).ThrowIfNotEquals(field.Handle, MaaInteroperationException.ResourceModifiedMessage);
-            return field;
+                _ = MaaTaskerGetResource(Handle).ThrowIfNotEquals(_resource.Handle, MaaInteroperationException.ResourceModifiedMessage);
+            return _resource;
         }
         set
         {
             ArgumentNullException.ThrowIfNull(value);
             _ = MaaTaskerBindResource(Handle, value.Handle).ThrowIfFalse(MaaInteroperationException.ResourceBindingFailedMessage);
-            field = value;
+            _resource = value;
         }
     }
 
@@ -163,14 +163,14 @@ public required MaaController Controller
         get
         {
             if (!IsInvalid)
-                _ = MaaTaskerGetController(Handle).ThrowIfNotEquals(field.Handle, MaaInteroperationException.ControllerModifiedMessage);
-            return field;
+                _ = MaaTaskerGetController(Handle).ThrowIfNotEquals(_controller.Handle, MaaInteroperationException.ControllerModifiedMessage);
+            return _controller;
         }
         set
         {
             ArgumentNullException.ThrowIfNull(value);
             _ = MaaTaskerBindController(Handle, value.Handle).ThrowIfFalse(MaaInteroperationException.ControllerBindingFailedMessage);
-            field = value;
+            _controller = value;
         }
     }
 

src/MaaFramework.Binding.UnitTests/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "MaaFramework.Binding.UnitTests": {
+      "commandName": "Project",
+      "commandLineArgs": "CurrentDirectory CurrentDirectory 6CDC213A-085C-40C8-8665-635820D10425"
+    }
+  }
+}

src/MaaFramework.Binding.UnitTests/Test_Custom.cs

@@ -47,8 +47,12 @@ public bool Analyze(in IMaaContext context, in AnalyzeArgs args, in AnalyzeResul
             Assert.IsNotNull(cloneContext);
             Assert.IsNull(
                 cloneContext.RunRecognition(DiffEntry, "{}", (IMaaImageBuffer<nint>)args.Image));
-            Assert.AreSame(
-                context.Tasker, cloneContext.Tasker);
+            if (!context.Tasker.IsStateless)
+            {
+                Assert.AreSame(
+                    context.Tasker, cloneContext.Tasker);
+            }
+
             Assert.AreEqual(
                 context.TaskJob.Id, cloneContext.TaskJob.Id);
 
@@ -142,7 +146,7 @@ public bool PressKey(int keycode)
 
         public bool RequestResolution(out int width, out int height)
         {
-#if MAA_NATIVE           
+#if MAA_NATIVE
             using var image = new MaaImageBuffer();
 #endif
             if (Screencap(image))

src/MaaFramework.Binding.UnitTests/Test_IMaaAgentClient.cs

@@ -62,21 +62,7 @@ public void Interface_LinkStart_LinkStop_AgentServerProcess(MaaTypes type, IMaaA
     {
         _ = Assert.ThrowsException<InvalidOperationException>(() =>
             maaAgentClient.AgentServerProcess);
-        var ret = maaAgentClient.LinkStart((socketId, nativeAssemblyDirectory) =>
-        {
-            string[] arguments =
-            [
-                typeof(Test_IMaaAgentServer).Assembly.Location,
-                nativeAssemblyDirectory,
-                Environment.CurrentDirectory,
-                socketId
-            ];
-
-            return Process.Start(new ProcessStartInfo("dotnet", string.Join(' ', arguments))
-            {
-                UseShellExecute = false,
-            });
-        });
+        var ret = maaAgentClient.LinkStart(StartupAgentServer);
         Assert.IsTrue(
             ret);
         Assert.IsTrue( // double start
@@ -92,4 +78,44 @@ public void Interface_LinkStart_LinkStop_AgentServerProcess(MaaTypes type, IMaaA
         Assert.IsTrue(
             maaAgentClient.AgentServerProcess.HasExited);
     }
+
+    [TestMethod]
+    [MaaData(MaaTypes.All, nameof(Data))]
+    public void RunTask(MaaTypes type, IMaaAgentClient maaAgentClient)
+    {
+        using var maa = new MaaTasker
+        {
+            Controller = new MaaAdbController(Common.AdbPath, Common.Address, AdbScreencapMethods.Encode, AdbInputMethods.AdbShell, Common.AdbConfig, Common.AgentPath),
+            Resource = new MaaResource(),
+            DisposeOptions = DisposeOptions.All,
+        };
+        Assert.IsTrue(
+            maa.IsInitialized);
+
+        using var agent = MaaAgentClient.Create("6CDC213A-085C-40C8-8665-635820D10425", maa.Resource);
+        using (var cts = new CancellationTokenSource(10000))
+        {
+            Assert.IsTrue(
+            // agent.LinkStart());
+               agent.LinkStart(StartupAgentServer, cts.Token));
+        }
+        var status = maa
+            .AppendTask(Custom.NodeName, Custom.Param)
+            .Wait();
+
+        Assert.AreEqual(MaaJobStatus.Succeeded,
+            status);
+        Assert.IsTrue(
+            agent.LinkStop());
+
+    }
+
+    private static Process? StartupAgentServer(string identifier, string nativeAssemblyDirectory)
+    {
+        return Process.Start(new ProcessStartInfo(
+            "dotnet", $"{typeof(Test_IMaaAgentServer).Assembly.Location} {nativeAssemblyDirectory} {Environment.CurrentDirectory} {identifier}")
+        {
+            UseShellExecute = false,
+        });
+    }
 }