MSRP/MRP: remove application event handlers

Author: lhoward

Sources/MRP/Applications/MSRP/MSRPApplication.swift

@@ -137,8 +137,7 @@ struct MSRPPortState<P: AVBPort>: Sendable {
 }
 
 public final class MSRPApplication<P: AVBPort>: BaseApplication, BaseApplicationEventObserver,
-  BaseApplicationContextObserver,
-  ApplicationEventHandler, CustomStringConvertible, @unchecked Sendable where P == P
+  BaseApplicationContextObserver, CustomStringConvertible, @unchecked Sendable where P == P
 {
   private typealias TalkerRegistration = (Participant<MSRPApplication>, any MSRPTalkerValue)
 
@@ -397,49 +396,6 @@ public final class MSRPApplication<P: AVBPort>: BaseApplication, BaseApplication
     .normalParticipant
   }
 
-  // If an MSRP message is received from a Port with an event value specifying
-  // the JoinIn or JoinMt message, and if the StreamID (35.2.2.8.2,
-  // 35.2.2.10.2), and Direction (35.2.1.2) all match those of an attribute
-  // already registered on that Port, and the Attribute Type (35.2.2.4) or
-  // FourPackedEvent (35.2.2.7.2) has changed, then the Bridge should behave as
-  // though an rLv! event (with immediate leavetimer expiration in the
-  // Registrar state table) was generated for the MAD in the Received MSRP
-  // Attribute Declarations before the rJoinIn! or rJoinMt! event for the
-  // attribute in the received message is processed
-  public func willHandleEvent(
-    context: EventContext<MSRPApplication>
-  ) async throws {
-    guard context.eventSource != .application else { return } // don't recurse
-    guard context.event == .rJoinIn || context.event == .rJoinMt else { return }
-
-    let contextAttributeType = MSRPAttributeType(rawValue: context.attributeType)!
-    guard let contextDirection = contextAttributeType.direction else { return }
-
-    let contextStreamID = (context.attributeValue as! MSRPStreamIDRepresentable).streamID
-
-    try await context.participant.leaveNow { attributeType, attributeSubtype, attributeValue in
-      let attributeType = MSRPAttributeType(rawValue: attributeType)!
-      guard let direction = attributeType.direction else { return false }
-      let streamID = (attributeValue as! MSRPStreamIDRepresentable).streamID
-
-      // force immediate leave if the streamID and direction match and the
-      // attribute type has changed
-      let isIncluded = contextStreamID == streamID &&
-        contextDirection == direction &&
-        (contextAttributeType != attributeType || context.attributeSubtype != attributeSubtype)
-
-      if isIncluded {
-        _logger
-          .debug(
-            "MSRP: forcing immediate leave for stream \(streamID) owing to attribute change: \(attributeType)->\(contextAttributeType)"
-          )
-      }
-      return isIncluded
-    }
-  }
-
-  public func didHandleEvent(context: EventContext<MSRPApplication>) {}
-
   // On receipt of a REGISTER_STREAM.request the MSRP Participant shall issue a
   // MAD_Join.request service primitive (10.2, 10.3). The attribute_type (10.2)
   // parameter of the request shall carry the appropriate Talker Attribute Type
@@ -904,12 +860,12 @@ extension MSRPApplication {
 
       // Leave the opposite talker declaration type to ensure mutual exclusion
       // (per spec, only one talker declaration type should exist per stream)
-      try await participant.leaveNow { attributeType, _, attributeValue in
-        let attributeType = MSRPAttributeType(rawValue: attributeType)!
-        return attributeType.direction == .talker && attributeType != declarationType
-          .attributeType &&
-          (attributeValue as! MSRPStreamIDRepresentable).streamID == talkerValue.streamID
-      }
+      let oppositeType: MSRPAttributeType = declarationType == .talkerAdvertise ? .talkerFailed : .talkerAdvertise
+      try? await participant.leave(
+        attributeType: oppositeType.rawValue,
+        attributeValue: talkerValue,
+        eventSource: eventSource
+      )
 
       if declarationType == .talkerAdvertise {
         do {

Sources/MRP/Model/Application.swift

@@ -214,10 +214,3 @@ extension Application {
     try await apply(for: contextIdentifier) { try await $0.redeclare() }
   }
 }
-
-public protocol ApplicationEventHandler<A>: Application {
-  associatedtype A: Application
-
-  func willHandleEvent(context: EventContext<A>) async throws
-  func didHandleEvent(context: EventContext<A>)
-}

Sources/MRP/Model/Participant.swift

@@ -951,12 +951,9 @@ Sendable, Hashable, Equatable,
     isolation participant: isolated P
   ) async throws {
     let context = try _getEventContext(for: event, eventSource: eventSource, isolation: participant)
-    let applicationEventHandler = context.participant.application as? any ApplicationEventHandler<A>
 
-    try await applicationEventHandler?.willHandleEvent(context: context)
     try await _handleRegistrar(context: context, isolation: context.participant)
     try await _handleApplicant(context: context, isolation: context.participant)
-    applicationEventHandler?.didHandleEvent(context: context)
 
     // remove attribute entirely if it is no longer declared or registered
     if canGC { participant._gcAttributeValue(self) }