🎨 support cancellationToken, steamService fixs

BeyondDimension · Dec 26, 2023 · 942bd98 · 942bd98
1 parent 8f6db14
commit 942bd98
Show file tree

Hide file tree

Showing 28 changed files with 719 additions and 539 deletions.
diff --git a/src/BD.SteamClient8.Impl/PInvoke/SteamServiceImpl.Abstract.cs b/src/BD.SteamClient8.Impl/PInvoke/SteamServiceImpl.Abstract.cs
@@ -8,7 +8,7 @@ public abstract partial class SteamServiceImpl
     public abstract ISteamConnectService Conn { get; }
 
     /// <inheritdoc/>
-    public virtual void StartSteamWithParameter() => StartSteam(StratSteamDefaultParameter);
+    public virtual Task<ApiRspImpl> StartSteamWithParameter(CancellationToken cancellationToken = default) => StartSteam(StratSteamDefaultParameter, cancellationToken);
 
     /// <summary>
     /// 以正常权限启动进程
@@ -165,18 +165,20 @@ public abstract partial class SteamServiceImpl
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static string GetLastSteamLoginUserName()
+    internal static string GetLastSteamLoginUserName(CancellationToken cancellationToken = default)
     {
+        if (cancellationToken.IsCancellationRequested)
+            throw new OperationCanceledException();
 #if WINDOWS
         return Registry.CurrentUser.Read(SteamRegistryPath, "AutoLoginUser");
 #else
         return "";
 #endif
     }
 
-    /// <inheritdoc cref="ISteamService.SetSteamCurrentUserAsync(string)"/>
+    /// <inheritdoc cref="ISteamService.SetSteamCurrentUserAsync(string, CancellationToken)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public virtual ValueTask SetSteamCurrentUserAsync(string userName)
+    public virtual async ValueTask<ApiRspImpl> SetSteamCurrentUserAsync(string userName, CancellationToken cancellationToken = default)
     {
         // override BD.WTTS.Services.Implementation.SteamServiceImpl2.SetSteamCurrentUser
 #if WINDOWS
@@ -217,7 +219,8 @@ public virtual ValueTask SetSteamCurrentUserAsync(string userName)
             Log.Error(TAG, e, "SetSteamCurrentUser fail(0).");
         }
 #endif
-        return ValueTask.CompletedTask;
+        await ValueTask.CompletedTask;
+        return ApiRspHelper.Ok();
     }
 
 #endif