add event details to alreadySubscribedToEvent error

Author: lhoward

Sources/SwiftOCA/OCC/ControlClasses/Root.swift

@@ -263,7 +263,7 @@ public extension OcaRoot {
       ) { [weak self] event, data in
         await self?.onPropertyEvent(event: event, eventData: data)
       }
-    } catch Ocp1Error.alreadySubscribedToEvent {
+    } catch Ocp1Error.alreadySubscribedToEvent(_) {
     } catch Ocp1Error.status(.invalidRequest) {
       // FIXME: in our device implementation not all properties can be subcribed to
     }

Sources/SwiftOCA/OCF/Errors.swift

@@ -19,7 +19,7 @@ public enum Ocp1Error: Error, Equatable {
   case status(OcaStatus)
   case exception(Ocp1Notification2ExceptionData)
   case alreadyConnected
-  case alreadySubscribedToEvent
+  case alreadySubscribedToEvent(OcaEvent)
   case arrayOrDataTooBig
   case bonjourRegistrationFailed
   case connectionAlreadyInProgress

Sources/SwiftOCA/OCP.1/Ocp1Connection+Subscribe.swift

@@ -86,7 +86,7 @@ public extension Ocp1Connection {
     if let eventSubscriptions = subscriptions[event] {
       precondition(!eventSubscriptions.subscriptions.isEmpty)
       if eventSubscriptions.subscriptions.contains(cancellable) {
-        throw Ocp1Error.alreadySubscribedToEvent
+        throw Ocp1Error.alreadySubscribedToEvent(event)
       }
       eventSubscriptions.subscriptions.insert(cancellable)
     } else {

Sources/SwiftOCADevice/OCA/ControllerDefaultSubscribing.swift

@@ -91,7 +91,7 @@ public extension OcaControllerDefaultSubscribing {
     _ subscription: OcaSubscriptionManagerSubscription
   ) async throws {
     guard !hasSubscription(subscription) else {
-      throw Ocp1Error.alreadySubscribedToEvent
+      throw Ocp1Error.alreadySubscribedToEvent(subscription.event)
     }
     guard self is OcaControllerLightweightNotifying ||
       subscription.notificationDeliveryMode == .normal

Sources/SwiftOCADevice/OCC/ControlClasses/Agents/Grouper.swift

@@ -756,7 +756,7 @@ private extension OcaGrouper.Enrollment {
           try await _forward(event: event, eventData: eventData, grouper: grouper)
         }
       )
-    } catch Ocp1Error.alreadySubscribedToEvent {
+    } catch Ocp1Error.alreadySubscribedToEvent(_) {
     } catch Ocp1Error.status(.invalidRequest) {}
   }
 

Sources/SwiftOCADevice/OCC/ControlClasses/Managers/SubscriptionManager.swift

@@ -145,7 +145,7 @@ public class OcaSubscriptionManager: OcaManager {
         )
         try await controller.addSubscription(.subscription2(subscription2))
         returnedStatus = .ok
-      } catch Ocp1Error.alreadySubscribedToEvent {
+      } catch Ocp1Error.alreadySubscribedToEvent(_) {
         returnedStatus = .invalidRequest
       } catch let Ocp1Error.status(status) {
         returnedStatus = status
@@ -200,7 +200,7 @@ public class OcaSubscriptionManager: OcaManager {
         try await controller
           .addSubscription(.propertyChangeSubscription2(propertyChangeSubscription2))
         returnedStatus = .ok
-      } catch Ocp1Error.alreadySubscribedToEvent {
+      } catch Ocp1Error.alreadySubscribedToEvent(_) {
         returnedStatus = .invalidRequest
       } catch let Ocp1Error.status(status) {
         returnedStatus = status