Adds apns-push-type for iOS 13 (#46)

* Adds apns-push-type for iOS 13

* Allow Topic and type to be nil.

* Use enum for push TYpe.

* Changes initlization to be non braking.

* Updates for non breaking.

* Function fix.

* Adds return statement.

* updates.

* Remove unused Generic.

Author: kylebrowning

Sources/APNSwift/APNSwiftConfiguration.swift

@@ -73,3 +73,10 @@ extension APNSwiftConfiguration {
         case sandbox
     }
 }
+
+extension APNSwiftConnection {
+    public enum PushType: String {
+        case alert
+        case background
+    }
+}

Sources/APNSwift/APNSwiftConnection.swift

@@ -94,13 +94,12 @@ public final class APNSwiftConnection {
      try apns.send(notification, bearerToken: bearerToken,to: "b27a07be2092c7fbb02ab5f62f3135c615e18acc0ddf39a30ffde34d41665276", with: JSONEncoder(), expiration: expiry, priority: 10, collapseIdentifier: "huro2").wait()
      ```
      */
-    public func send<Notification>(_ notification: Notification, bearerToken: APNSwiftBearerToken, to deviceToken: String, with encoder: JSONEncoder = JSONEncoder(), expiration: Date? = nil, priority: Int? = nil, collapseIdentifier: String? = nil, topic: String? = nil) -> EventLoopFuture<Void>
-        where Notification: APNSwiftNotification {
+    public func send<Notification: APNSwiftNotification>(_ notification: Notification, pushType: APNSwiftConnection.PushType, bearerToken: APNSwiftBearerToken, to deviceToken: String, with encoder: JSONEncoder = JSONEncoder(), expiration: Date? = nil, priority: Int? = nil, collapseIdentifier: String? = nil, topic: String? = nil) -> EventLoopFuture<Void> {
             let streamPromise = channel.eventLoop.makePromise(of: Channel.self)
             multiplexer.createStreamChannel(promise: streamPromise) { channel, streamID in
                 let handlers: [ChannelHandler] = [
                     HTTP2ToHTTP1ClientCodec(streamID: streamID, httpProtocol: .https),
-                    APNSwiftRequestEncoder<Notification>(deviceToken: deviceToken, configuration: self.configuration, bearerToken: bearerToken, expiration: expiration, priority: priority, collapseIdentifier: collapseIdentifier),
+                    APNSwiftRequestEncoder(deviceToken: deviceToken, configuration: self.configuration, bearerToken: bearerToken, pushType: pushType, expiration: expiration, priority: priority, collapseIdentifier: collapseIdentifier, topic: topic),
                     APNSwiftResponseDecoder(),
                     APNSwiftStreamHandler(),
                 ]
@@ -124,6 +123,9 @@ public final class APNSwiftConnection {
                 responsePromise.futureResult
             }
     }
+    public func send<Notification: APNSwiftNotification>(_ notification: Notification, bearerToken: APNSwiftBearerToken, to deviceToken: String, with encoder: JSONEncoder = JSONEncoder(), expiration: Date? = nil, priority: Int? = nil, collapseIdentifier: String? = nil, topic: String? = nil) -> EventLoopFuture<Void> {
+        return self.send(notification, pushType: .alert, bearerToken: bearerToken, to: deviceToken, with: encoder, expiration: expiration, priority: priority, collapseIdentifier: collapseIdentifier, topic: topic)
+    }
 
     var onClose: EventLoopFuture<Void> {
         return channel.closeFuture

Sources/APNSwift/APNSwiftRequestEncoder.swift

@@ -18,8 +18,7 @@ import NIOHTTP1
 import NIOHTTP2
 
 /// The class provides the HTTP2 interface to Swift NIO 2
-internal final class APNSwiftRequestEncoder<Notification>: ChannelOutboundHandler
-    where Notification: APNSwiftNotification {
+internal final class APNSwiftRequestEncoder: ChannelOutboundHandler {
     /// See `ChannelOutboundHandler.OutboundIn`.
     typealias OutboundIn = ByteBuffer
 
@@ -33,16 +32,23 @@ internal final class APNSwiftRequestEncoder<Notification>: ChannelOutboundHandle
     let expiration: Date?
     let collapseIdentifier: String?
     let topic: String?
+    let pushType: APNSwiftConnection.PushType?
 
 
-    init(deviceToken: String, configuration: APNSwiftConfiguration, bearerToken: APNSwiftBearerToken, expiration: Date?, priority: Int?, collapseIdentifier: String?, topic: String? = nil) {
+    init(deviceToken: String, configuration: APNSwiftConfiguration, bearerToken: APNSwiftBearerToken, pushType: APNSwiftConnection.PushType, expiration: Date?, priority: Int?, collapseIdentifier: String?, topic: String?) {
         self.configuration = configuration
         self.bearerToken = bearerToken
         self.deviceToken = deviceToken
         self.expiration = expiration
         self.priority = priority
         self.collapseIdentifier = collapseIdentifier
         self.topic = topic
+        self.pushType = pushType
+    }
+    
+    convenience init(deviceToken: String, configuration: APNSwiftConfiguration, bearerToken: APNSwiftBearerToken, expiration: Date?, priority: Int?, collapseIdentifier: String?, topic: String? = nil) {
+        self.init(deviceToken: deviceToken, configuration: configuration, bearerToken: bearerToken, pushType: .alert, expiration: expiration, priority: priority, collapseIdentifier: collapseIdentifier, topic: topic)
+        
     }
 
     /// See `ChannelOutboundHandler.write(context:data:promise:)`.
@@ -67,6 +73,9 @@ internal final class APNSwiftRequestEncoder<Notification>: ChannelOutboundHandle
         if let collapseId = self.collapseIdentifier {
             reqHead.headers.add(name: "apns-collapse-id", value: collapseId)
         }
+        if let pushType = self.pushType {
+            reqHead.headers.add(name: "apns-push-type", value: pushType.rawValue)
+        }
         reqHead.headers.add(name: "host", value: configuration.url.host!)
         guard let token = bearerToken.token else {
             promise?.fail(APNSwiftError.SigningError.invalidSignatureData)

Tests/APNSwiftTests/APNSwiftRequestTests.swift

@@ -23,13 +23,6 @@ import XCTest
 
 final class APNSwiftRequestTests: XCTestCase {
 
-    struct BasicNotification: APNSwiftNotification {
-        let aps: APNSwiftPayload
-
-        init(aps: APNSwiftPayload) {
-            self.aps = aps
-        }
-    }
     func testAlertEncoding() throws {
         let alert = APNSwiftPayload.APNSwiftAlert(title: "title", subtitle: "subtitle", body: "body", titleLocKey: "titlelockey",
                           titleLocArgs: ["titlelocarg1"], actionLocKey: "actionkey", locKey: "lockey", locArgs: ["locarg1"], launchImage: "launchImage")
@@ -178,6 +171,13 @@ final class APNSwiftRequestTests: XCTestCase {
     }
 
     func testInvalidAuthKey() throws {
+        struct BasicNotification: APNSwiftNotification {
+            let aps: APNSwiftPayload
+
+            init(aps: APNSwiftPayload) {
+                self.aps = aps
+            }
+        }
         let deviceToken = ""
         let allocator = ByteBufferAllocator()
         var signerBuffer = allocator.buffer(capacity: invalidAuthKey.count)
@@ -190,7 +190,8 @@ final class APNSwiftRequestTests: XCTestCase {
                                                topic: "com.grasscove.Fern",
                                                environment: .sandbox)
         let token = APNSwiftBearerToken(configuration: apnsConfig, timeout: 50.0)
-        let channel = EmbeddedChannel(handler: APNSwiftRequestEncoder<BasicNotification>(deviceToken: deviceToken, configuration: apnsConfig, bearerToken: token, expiration: nil, priority: nil, collapseIdentifier: nil))
+        let handler: APNSwiftRequestEncoder = .init(deviceToken: deviceToken, configuration: apnsConfig, bearerToken: token, pushType: .alert, expiration: nil, priority: nil, collapseIdentifier: nil, topic: nil)
+        let channel = EmbeddedChannel(handler: handler)
 
         // pretend to connect the connect (nothing real will happen)
         XCTAssertNoThrow(try channel.connect(to: .init(ipAddress: "1.2.3.4", port: 5)).wait())