Compare commits

..

No commits in common. "main" and "b98fbe7afd2f40fd879a7ff7cfaad304bc733f21" have entirely different histories.

2 changed files with 13 additions and 72 deletions

View File

@ -1,12 +1,12 @@
// swift-tools-version: 5.6
// swift-tools-version: 5.5
import PackageDescription
let package = Package(
name: "PushMessageDefinitions",
platforms: [
.macOS(.v12),
.iOS(.v15)
.macOS(.v10_15),
.iOS(.v13)
],
products: [
.library(
@ -14,15 +14,11 @@ let package = Package(
targets: ["PushMessageDefinitions"]),
],
dependencies: [
.package(url: "https://github.com/swift-server-community/APNSwift.git", from: "5.0.0-alpha.4"),
.package(url: "https://github.com/christophhagen/BinaryCodable.git", from: "1.0.0"),
.package(url: "https://github.com/swift-server-community/APNSwift.git", from: "3.0.0"),
],
targets: [
.target(
name: "PushMessageDefinitions",
dependencies: [
.product(name: "APNSwift", package: "APNSwift"),
.product(name: "BinaryCodable", package: "BinaryCodable"),
])
dependencies: [.product(name: "APNSwift", package: "APNSwift")])
]
)

View File

@ -15,7 +15,7 @@ public struct PushMessage: Codable {
/**
The notification content.
*/
public let payload: APNSPayload
public let payload: APNSwiftPayload
/**
The value of this header must accurately reflect the contents of your notifications payload.
@ -23,7 +23,7 @@ public struct PushMessage: Codable {
If theres a mismatch, or if the header is missing on required systems, APNs may return an error, delay the delivery of the notification, or drop it altogether.
- Note: Required for watchOS 6 and later; recommended for macOS, iOS, tvOS, and iPadOS
*/
public let pushType: APNSClient.PushType
public let pushType: APNSwiftConnection.PushType
/**
The date at which the notification is no longer valid.
@ -61,8 +61,8 @@ public struct PushMessage: Codable {
- Parameter collapseIdentifier: An optional identifier to group push notifications
*/
public init(recipients: [PushToken],
payload: APNSPayload,
pushType: APNSClient.PushType,
payload: APNSwiftPayload,
pushType: APNSwiftConnection.PushType,
expiration: Date? = nil,
lowPriority: Bool = false,
collapseIdentifier: String? = nil) {
@ -75,63 +75,11 @@ public struct PushMessage: Codable {
}
}
extension APNSClient.PushType: Codable {
struct PushTypeDecodingError: Error {
extension APNSwiftConnection.PushType: Codable {
}
public func encode(to encoder: Encoder) throws {
var container = encoder.singleValueContainer()
try container.encode(rawValue)
}
public init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()
let raw = try container.decode(UInt8.self)
switch raw {
case 1:
self = .alert
case 2:
self = .background
case 3:
self = .mdm
case 4:
self = .voip
case 5:
self = .fileprovider
case 6:
self = .complication
default:
throw PushTypeDecodingError()
}
}
private var rawValue: UInt8 {
switch self {
case .alert:
return 1
case .background:
return 2
case .mdm:
return 3
case .voip:
return 4
case .fileprovider:
return 5
case .complication:
return 6
//case .location:
// return ".location-query"
default:
return 0
}
}
}
extension APNSClient.PushType {
extension APNSwiftConnection.PushType {
/// The extension to add to the push topic depending on the notification type
public var topicExtension: String {
@ -146,11 +94,8 @@ extension APNSClient.PushType {
return ".pushkit.fileprovider"
//case .location:
// return ".location-query"
case .complication:
return ".complication"
default:
return ""
//case .complication:
// return ".complication"
}
}
}