Move APNSLiveActivityNotificationEvent back to a struct.

Author: nakajima

Sources/APNSCore/LiveActivity/APNSLiveActivityNotification.swift

@@ -49,25 +49,7 @@ public struct APNSLiveActivityNotification<ContentState: Encodable>: APNSMessage
     /// Event type e.g. update
     public var event: APNSLiveActivityNotificationEvent {
         get {
-            switch self.aps.event {
-            case "end":
-                return APNSLiveActivityNotificationEventEnd()
-            case "update":
-                return APNSLiveActivityNotificationEventUpdate()
-            default:
-                guard let attributesType = self.aps.attributesType,
-                    let state = self.aps.attributesContent,
-                    let alert = self.aps.alert
-                else {
-                    // Default to update
-                    return APNSLiveActivityNotificationEventUpdate()
-                }
-
-                return APNSLiveActivityNotificationEventStart(
-                    attributes: .init(type: attributesType, state: state),
-                    alert: alert
-                )
-            }
+						return APNSLiveActivityNotificationEvent(rawValue: self.aps.event)
         }
 
         set {
@@ -136,7 +118,8 @@ public struct APNSLiveActivityNotification<ContentState: Encodable>: APNSMessage
         priority: APNSPriority,
         appID: String,
         contentState: ContentState,
-        event: any APNSLiveActivityNotificationEvent,
+        event: APNSLiveActivityNotificationEvent,
+				startOptions: APNSLiveActivityNotificationEventStartOptions<ContentState>? = nil,
         timestamp: Int,
         dismissalDate: APNSLiveActivityDismissalDate = .none,
         apnsID: UUID? = nil
@@ -147,6 +130,7 @@ public struct APNSLiveActivityNotification<ContentState: Encodable>: APNSMessage
             topic: appID + ".push-type.liveactivity",
             contentState: contentState,
             event: event,
+						startOptions: startOptions,
             timestamp: timestamp,
             dismissalDate: dismissalDate
         )
@@ -173,18 +157,15 @@ public struct APNSLiveActivityNotification<ContentState: Encodable>: APNSMessage
         topic: String,
         apnsID: UUID? = nil,
         contentState: ContentState,
-        event: any APNSLiveActivityNotificationEvent,
+        event: APNSLiveActivityNotificationEvent,
+				startOptions: APNSLiveActivityNotificationEventStartOptions<ContentState>? = nil,
         timestamp: Int,
         dismissalDate: APNSLiveActivityDismissalDate = .none
     ) {
-        var attributes: APNSLiveActivityNotificationEventStart<ContentState>.Attributes?
-        if let event = event as? APNSLiveActivityNotificationEventStart<ContentState> {
-            attributes = event.attributes
-        }
-
         self.aps = APNSLiveActivityNotificationAPSStorage(
             timestamp: timestamp,
             event: event,
+						startOptions: startOptions,
             contentState: contentState,
             dismissalDate: dismissalDate.dismissal
         )

Sources/APNSCore/LiveActivity/APNSLiveActivityNotificationAPSStorage.swift

@@ -33,7 +33,8 @@ struct APNSLiveActivityNotificationAPSStorage<ContentState: Encodable>: Encodabl
 
     init(
         timestamp: Int,
-        event: any APNSLiveActivityNotificationEvent,
+        event: APNSLiveActivityNotificationEvent,
+				startOptions: APNSLiveActivityNotificationEventStartOptions<ContentState>?,
         contentState: ContentState,
         dismissalDate: Int?
     ) {
@@ -42,10 +43,10 @@ struct APNSLiveActivityNotificationAPSStorage<ContentState: Encodable>: Encodabl
         self.dismissalDate = dismissalDate
         self.event = event.rawValue
 
-        if let event = event as? APNSLiveActivityNotificationEventStart<ContentState> {
-            self.attributesType = event.attributes.type
-            self.attributesContent = event.attributes.state
-            self.alert = event.alert
+				if let startOptions {
+					self.attributesType = startOptions.attributeType
+					self.attributesContent = startOptions.attributes
+					self.alert = startOptions.alert
         }
     }
 }

Sources/APNSCore/LiveActivity/APNSLiveActivityNotificationEvent.swift

@@ -12,65 +12,30 @@
 //
 //===----------------------------------------------------------------------===//
 
-public protocol APNSLiveActivityNotificationEvent: Encodable {
-    var rawValue: String { get }
-}
-
-public struct APNSLiveActivityNotificationEventUpdate: APNSLiveActivityNotificationEvent {
-    public let rawValue = "update"
-}
-
-public struct APNSLiveActivityNotificationEventEnd: APNSLiveActivityNotificationEvent {
-    public let rawValue = "end"
-}
 
-public protocol APNSLiveActivityNotificationEventStartStateProtocol: Encodable
-{
-    associatedtype State: Encodable
-}
-
-public struct APNSLiveActivityNotificationEventStart<State: Encodable>:
-    APNSLiveActivityNotificationEvent, APNSLiveActivityNotificationEventStartStateProtocol
-{
-    public struct Attributes: Encodable {
-        public let type: String
-        public let state: State
+public struct APNSLiveActivityNotificationEvent: Encodable {
+			/// The underlying raw value that is send to APNs.
+			@usableFromInline
+			internal let rawValue: String
 
-        public init(type: String, state: State) {
-            self.type = type
-            self.state = state
-        }
-    }
+			/// Specifies that live activity should be updated
+			public static let update = Self(rawValue: "update")
 
-    public let rawValue = "start"
-    public let attributes: Attributes
-    public let alert: APNSAlertNotificationContent
+			/// Specifies that live activity should be ended
+			public static let end = Self(rawValue: "end")
 
-    public init(attributes: Attributes, alert: APNSAlertNotificationContent) {
-        self.attributes = attributes
-        self.alert = alert
-    }
+			/// The underlying raw value that is send to APNs.
+			public static let start = Self(rawValue: "start")
 }
 
-extension APNSLiveActivityNotificationEvent where Self == APNSLiveActivityNotificationEventUpdate {
-    public static var update: APNSLiveActivityNotificationEventUpdate {
-        APNSLiveActivityNotificationEventUpdate()
-    }
-}
-
-extension APNSLiveActivityNotificationEvent where Self == APNSLiveActivityNotificationEventEnd {
-    public static var end: APNSLiveActivityNotificationEventEnd {
-        APNSLiveActivityNotificationEventEnd()
-    }
-}
+public struct APNSLiveActivityNotificationEventStartOptions<State: Encodable> {
+	var attributeType: String
+	var attributes: State
+	var alert: APNSAlertNotificationContent
 
-extension APNSLiveActivityNotificationEvent
-where Self: APNSLiveActivityNotificationEventStartStateProtocol {
-    public static func start(type: String, state: State, alert: APNSAlertNotificationContent)
-        -> APNSLiveActivityNotificationEventStart<
-            State
-        >
-    {
-        .init(attributes: .init(type: type, state: state), alert: alert)
-    }
+	public init(attributeType: String, attributes: State, alert: APNSAlertNotificationContent) {
+		self.attributeType = attributeType
+		self.attributes = attributes
+		self.alert = alert
+	}
 }

Tests/APNSTests/LiveActivity/APNSLiveActivityNotificationTests.swift

@@ -51,11 +51,8 @@ final class APNSLiveActivityNotificationTests: XCTestCase {
             priority: .immediately,
             appID: "test.app.id",
             contentState: State(),
-            // Need the fully qualified name here
-            event: APNSLiveActivityNotificationEventStart(
-                attributes: .init(type: "State", state: State()),
-                alert: .init(title: .raw("Update"))
-            ),
+						event: .start,
+						startOptions: .init(attributeType: "State", attributes: State(), alert: .init(title: .raw("Update"))),
             timestamp: 1_672_680_658)
 
         let encoder = JSONEncoder()