🔧 Fix(Kscript): 修复 Device/Function/Plugin 服务类的可空引用类型编译警告

Author: StardustSeemsInk

KitX Script/Kscript.CSharp.Parser/CodeGen/MethodEmitter.cs

@@ -20,7 +20,7 @@ public CollectibleAssemblyLoadContext(string name) : base(name, isCollectible: t
     protected override Assembly Load(AssemblyName assemblyName)
     {
         // 让默认上下文处理核心程序集加载
-        return null;
+        return null!;
     }
 }
 

KitX Script/Kscript.CSharp.Parser/Kscript.CSharp.Parser.csproj

@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog" Version="4.2.0" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>

KitX Script/Kscript.CSharp/Services/Device.cs

@@ -22,10 +22,10 @@ public Device(DeviceInfo info, Connector? connector = null)
         public async Task<IPlugin> RequestPlugin(string Name)
         {
             var plugins = await GetPluginList();
-            var pluginInfo = plugins.FirstOrDefault(p => 
+            var pluginInfo = plugins.FirstOrDefault(p =>
                 p.Name.Equals(Name, StringComparison.OrdinalIgnoreCase));
-            
-            return pluginInfo != null ? await CreatePluginInstance(pluginInfo) : null;
+
+            return pluginInfo != null ? await CreatePluginInstance(pluginInfo) : null!;
         }
 
         public async Task<IEnumerable<PluginInfo>> GetPluginList()
@@ -50,15 +50,15 @@ void OnResponse(Request response)
 
                             // With the following code
                             var plugins = JsonSerializer.Deserialize<List<PluginInfo>>(content);
-                            
+
                             // Update cache
-                            _pluginCache = plugins.ToDictionary(
+                            _pluginCache = plugins!.ToDictionary(
                                 p => p.Name,
                                 p => p,
                                 StringComparer.OrdinalIgnoreCase
                             );
 
-                            tcs.SetResult(plugins);
+                            tcs.SetResult(plugins!);
                             return content;
                         }),
                         matchCommand: content =>
@@ -72,15 +72,15 @@ void OnResponse(Request response)
                             {
                                 var pluginListJson = content.Substring("PluginList:".Length);
                                 var plugins = JsonSerializer.Deserialize<List<PluginInfo>>(pluginListJson);
-                                
+
                                 // Update cache
-                                _pluginCache = plugins.ToDictionary(
+                                _pluginCache = plugins!.ToDictionary(
                                     p => p.Name,
                                     p => p,
                                     StringComparer.OrdinalIgnoreCase
                                 );
 
-                                tcs.SetResult(plugins);
+                                tcs.SetResult(plugins!);
                             }
                         }
                     );

KitX Script/Kscript.CSharp/Services/Function.cs

@@ -48,14 +48,14 @@ void OnResponse(Request response)
                         {
                             if (string.IsNullOrEmpty(content))
                             {
-                                tcs.SetResult(null);
+                                tcs.SetResult(null!);
                                 return content;
                             }
 
                             // Parse response based on return type
                             var returnType = GetReturnType();
                             var result = ParseResponse(content, returnType);
-                            tcs.SetResult(result);
+                            tcs.SetResult(result!);
                             return content;
                         }),
                         matchCommand: content =>
@@ -70,7 +70,7 @@ void OnResponse(Request response)
                                 var resultJson = content.Substring("Result:".Length);
                                 var returnType = GetReturnType();
                                 var result = ParseResponse(resultJson, returnType);
-                                tcs.SetResult(result);
+                                tcs.SetResult(result!);
                             }
                         }
                     );
@@ -120,7 +120,7 @@ public Type GetReturnType()
             }
         }
 
-        private object ParseResponse(string content, Type returnType)
+        private object? ParseResponse(string content, Type returnType)
         {
             if (string.IsNullOrEmpty(content))
                 return null;

KitX Script/Kscript.CSharp/Services/Plugin.cs

@@ -19,10 +19,10 @@ public Plugin(PluginInfo info, DeviceInfo deviceInfo, Connector? connector = nul
             _connector = connector ?? Connector.Instance;
         }
 
-        public async Task<IFunction> RequestFunction(string Name)
+        public async Task<IFunction?> RequestFunction(string Name)
         {
             var functions = await GetFunctionList();
-            var function = functions.FirstOrDefault(f => 
+            var function = functions.FirstOrDefault(f =>
                 f.Info.Name.Equals(Name, StringComparison.OrdinalIgnoreCase));
             return function;
         }
@@ -69,7 +69,7 @@ void OnResponse(Request response)
                         {
                             var returnType = GetFunctionReturnType(functionName);
                             var result = ParseFunctionResponse(content, returnType);
-                            tcs.SetResult(result);
+                            tcs.SetResult(result!);
                             return content;
                         }),
                         matchCommand: content =>
@@ -84,7 +84,7 @@ void OnResponse(Request response)
                                 var resultJson = content.Substring("Result:".Length);
                                 var returnType = GetFunctionReturnType(functionName);
                                 var result = ParseFunctionResponse(resultJson, returnType);
-                                tcs.SetResult(result);
+                                tcs.SetResult(result!);
                             }
                         }
                     );
@@ -140,7 +140,7 @@ private Type GetFunctionReturnType(string functionName)
             }
         }
 
-        private object ParseFunctionResponse(string content, Type returnType)
+        private object? ParseFunctionResponse(string content, Type returnType)
         {
             if (string.IsNullOrEmpty(content))
                 return null;

KitX Script/Kscript.CSharp/Utils/DeviceCache.cs

@@ -10,7 +10,7 @@ public class DeviceCache : IDisposable
     {
         private class CacheEntry<T>
         {
-            public T Value { get; set; }
+            public required T Value { get; set; }
             public DateTime Expiration { get; set; }
             public DateTime CreatedAt { get; } = DateTime.UtcNow;
             private int _accessCount;
@@ -72,8 +72,7 @@ public void Set(string key, IEnumerable<DeviceInfo> value, TimeSpan? expiration
         /// </summary>
         public IEnumerable<DeviceInfo>? Get(string key)
         {
-            var entry = _cache.GetOrAdd(key, _ => null);
-            if (entry == null || entry.IsExpired)
+            if (!_cache.TryGetValue(key, out var entry) || entry.IsExpired)
             {
                 _cache.TryRemove(key, out _);
                 return null;
@@ -88,8 +87,7 @@ public void Set(string key, IEnumerable<DeviceInfo> value, TimeSpan? expiration
         /// </summary>
         public bool IsValid(string key)
         {
-            var entry = _cache.GetOrAdd(key, _ => null);
-            return entry != null && !entry.IsExpired;
+            return _cache.TryGetValue(key, out var entry) && !entry.IsExpired;
         }
 
         /// <summary>

KitX Script/Kscript.CSharp/Utils/DeviceRequestBuilder.cs

@@ -127,7 +127,7 @@ public DeviceRequestBuilder Clone()
             clone._command = new Command
             {
                 FunctionName = _command.FunctionName,
-                FunctionArgs = _command.FunctionArgs?.ToList()
+                FunctionArgs = _command.FunctionArgs?.ToList() ?? new()
             };
             clone._request = new Request
             {

KitX Script/Kscript.CSharp/Utils/ResponseHandler.cs

@@ -37,7 +37,7 @@ public static async Task<T> HandleResponse<T>(
                             result = commandHandler(command);
                         }
                     );
-                    return result;
+                    return result!;
                 }
                 catch (Exception ex)
                 {