refactor: 增加 IOpcSubscription 接口

Author: ArgoZhang

src/extensions/BootstrapBlazor.OpcDa/Extensions/Extensions.cs

@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
+using Opc.Da;
+
 namespace BootstrapBlazor.OpcDa;
 
 /// <summary>
@@ -11,13 +13,15 @@ internal static class Extensions
 {
     public static Quality ToQuality(this Opc.Da.Quality quality)
     {
-        return quality.QualityBits == Opc.Da.qualityBits.good
+        return quality.QualityBits == qualityBits.good
             ? Quality.Good
             : Quality.Bad;
     }
 
-    public static ISubscription ToOpcSubscription(this Opc.Da.ISubscription subscription)
+    public static IOpcSubscription ToOpcSubscription(this ISubscription subscription)
     {
         return new OpcSubscription(subscription);
     }
+
+    public static ISubscription CreateSubscription(this Server server, string name, int updateRate = 1000, bool active = true) => server.CreateSubscription(new SubscriptionState { Name = name, Deadband = 0, UpdateRate = updateRate, Active = active });
 }

src/extensions/BootstrapBlazor.OpcDa/IOpcServer.cs

@@ -35,7 +35,7 @@ public interface IOpcServer : IDisposable
     /// 取消订阅方法
     /// </summary>
     /// <param name="subscription"></param>
-    void CancelSubscription(ISubscription subscription);
+    void CancelSubscription(IOpcSubscription subscription);
 
     /// <summary>
     /// 创建订阅方法
@@ -44,7 +44,7 @@ public interface IOpcServer : IDisposable
     /// <param name="updateRate">更新频率 默认 1000 毫秒</param>
     /// <param name="active">是否激活 默认 true</param>
     /// <returns></returns>
-    ISubscription CreateSubscription(string name, int updateRate = 1000, bool active = true);
+    IOpcSubscription CreateSubscription(string name, int updateRate = 1000, bool active = true);
 
     /// <summary>
     /// 读取 Item 值方法

…s/BootstrapBlazor.OpcDa/ISubscription.cs …ootstrapBlazor.OpcDa/IOpcSubscription.cssrc/extensions/BootstrapBlazor.OpcDa/ISubscription.cs renamed to src/extensions/BootstrapBlazor.OpcDa/IOpcSubscription.cs src/extensions/BootstrapBlazor.OpcDa/ISubscription.cs renamed to src/extensions/BootstrapBlazor.OpcDa/IOpcSubscription.cs

@@ -7,8 +7,13 @@ namespace BootstrapBlazor.OpcDa;
 /// <summary>
 /// 订阅接口定义
 /// </summary>
-public interface ISubscription
+public interface IOpcSubscription
 {
+    /// <summary>
+    /// 获得 订阅名称
+    /// </summary>
+    public string Name { get; }
+
     /// <summary>
     /// 获得/设置 是否保留最后一个值
     /// </summary>
@@ -19,12 +24,6 @@ public interface ISubscription
     /// </summary>
     Action<List<OpcReadItem>>? DataChanged { get; set; }
 
-    /// <summary>
-    /// 获得 <see cref="Opc.Da.ISubscription"/> 实例
-    /// </summary>
-    /// <returns></returns>
-    Opc.Da.ISubscription GetSubscription();
-
     /// <summary>
     /// 增加数据项
     /// </summary>

src/extensions/BootstrapBlazor.OpcDa/OpcServer.cs

@@ -28,6 +28,8 @@ sealed class OpcServer : IOpcServer
     /// </summary>
     public bool IsConnected => _server?.IsConnected ?? false;
 
+    private readonly Dictionary<string, ISubscription> _subscriptions = [];
+
     /// <summary>
     /// 连接到 OPCServer 方法
     /// </summary>
@@ -60,6 +62,7 @@ public void Disconnect()
             {
                 _server.CancelSubscription(sub);
             }
+
             _server.Disconnect();
             _server = null;
         }
@@ -72,28 +75,33 @@ public void Disconnect()
     /// <param name="updateRate">更新频率 默认 1000 毫秒</param>
     /// <param name="active">是否激活 默认 true</param>
     /// <returns></returns>
-    public ISubscription CreateSubscription(string name, int updateRate = 1000, bool active = true)
+    public IOpcSubscription CreateSubscription(string name, int updateRate = 1000, bool active = true)
     {
         var server = GetOpcServer();
-        var subscription = server.CreateSubscription(new SubscriptionState
+        if (_subscriptions.TryGetValue(name, out var subscription))
         {
-            Name = name,
-            Deadband = 0,
-            UpdateRate = updateRate,
-            Active = active
-        });
+            // 已经存在该订阅
+            server.CancelSubscription(subscription);
+        }
+
+        subscription = server.CreateSubscription(name, updateRate, active);
+        _subscriptions.Add(name, subscription);
         return subscription.ToOpcSubscription();
     }
 
     /// <summary>
     /// 取消订阅方法
     /// </summary>
-    /// <param name="subscription">订阅接口 <see cref="ISubscription"/> 实例</param>
+    /// <param name="subscription">订阅接口 <see cref="IOpcSubscription"/> 实例</param>
     /// <returns></returns>
-    public void CancelSubscription(ISubscription subscription)
+    public void CancelSubscription(IOpcSubscription subscription)
     {
         var server = GetOpcServer();
-        server.CancelSubscription(subscription.GetSubscription());
+        var name = subscription.Name;
+        if (_subscriptions.Remove(name, out var sub))
+        {
+            server.CancelSubscription(sub);
+        }
     }
 
     /// <summary>
@@ -121,16 +129,17 @@ public HashSet<OpcWriteItem> Write(params HashSet<OpcWriteItem> items)
         return items.Select(i =>
         {
             var item = results.FirstOrDefault(v => v.ItemName == i.Name);
-            return new OpcWriteItem(i.Name, i.Value) { Result = item != null && item.ResultID == ResultID.S_OK };
+            return i with { Result = item != null && item.ResultID == ResultID.S_OK };
         }).ToHashSet(OpcItemEqualityComparer<OpcWriteItem>.Default);
     }
 
     private Opc.Da.Server GetOpcServer()
     {
-        if (_server is not {  IsConnected: true })
+        if (_server is not { IsConnected: true })
         {
             throw new InvalidOperationException("OPC Server is not connected.");
         }
+
         return _server;
     }
 

src/extensions/BootstrapBlazor.OpcDa/OpcSubscription.cs

@@ -4,19 +4,20 @@
 
 namespace BootstrapBlazor.OpcDa;
 
-class OpcSubscription(Opc.Da.ISubscription subscription) : ISubscription
+class OpcSubscription(Opc.Da.ISubscription subscription) : IOpcSubscription
 {
     public Action<List<OpcReadItem>>? DataChanged { get; set; }
 
     public bool KeepLastValue { get; set; }
 
+    public string Name => subscription.GetState().Name;
+
     public Opc.Da.ISubscription GetSubscription() => subscription;
 
     private readonly List<OpcReadItem> _cache = [];
 
     public void AddItems(IEnumerable<string> items)
     {
-        var subscription = GetSubscription();
         subscription.AddItems([.. items.Select(i => new Opc.Da.Item { ItemName = i })]);
 
         subscription.DataChanged += (_, _, values) =>