Move PingreqHandler into its own file

Author: adam-fowler

Sources/MQTTNIO/MQTTChannelHandlers.swift

@@ -1,5 +1,6 @@
 import NIO
 
+/// Handler encoding MQTT Messages into ByteBuffers
 final class MQTTEncodeHandler: ChannelOutboundHandler {
     public typealias OutboundIn = MQTTOutboundMessage
     public typealias OutboundOut = ByteBuffer
@@ -19,6 +20,7 @@ final class MQTTEncodeHandler: ChannelOutboundHandler {
     }
 }
 
+/// Decode ByteBuffers into MQTT Messages
 struct ByteToMQTTMessageDecoder: ByteToMessageDecoder {
     typealias InboundOut = MQTTInboundMessage
 
@@ -90,79 +92,3 @@ struct ByteToMQTTMessageDecoder: ByteToMessageDecoder {
     }
 }
 
-/// Channel handler for sending PINGREQ messages to keep connect alive
-final class PingreqHandler: ChannelDuplexHandler {
-    typealias OutboundIn = MQTTOutboundMessage
-    typealias OutboundOut = MQTTOutboundMessage
-    typealias InboundIn = MQTTInboundMessage
-    typealias InboundOut = MQTTInboundMessage
-
-    let client: MQTTClient
-    let timeout: TimeAmount
-    var lastEventTime: NIODeadline
-    var task: Scheduled<Void>?
-
-    init(client: MQTTClient, timeout: TimeAmount) {
-        self.client = client
-        self.timeout = timeout
-        self.lastEventTime = .now()
-        self.task = nil
-    }
-
-    public func handlerAdded(context: ChannelHandlerContext) {
-        if context.channel.isActive {
-            scheduleTask(context)
-        }
-    }
-
-    public func handlerRemoved(context: ChannelHandlerContext) {
-        cancelTask()
-    }
-
-    public func channelActive(context: ChannelHandlerContext) {
-        if self.task == nil {
-            scheduleTask(context)
-        }
-        context.fireChannelActive()
-    }
-
-    func channelRead(context: ChannelHandlerContext, data: NIOAny) {
-        self.lastEventTime = .now()
-        context.fireChannelRead(data)
-    }
-
-    func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {
-        self.lastEventTime = .now()
-        context.write(data, promise: promise)
-    }
-
-    func scheduleTask(_ context: ChannelHandlerContext) {
-        guard context.channel.isActive else { return }
-
-        self.task = context.eventLoop.scheduleTask(deadline: lastEventTime + timeout) {
-            // if lastEventTime plus the timeout is less than now send PINGREQ
-            // otherwise reschedule task
-            if self.lastEventTime + self.timeout <= .now() {
-                guard context.channel.isActive else { return }
-
-                self.client.pingreq().whenComplete { result in
-                    switch result {
-                    case .failure(let error):
-                        context.fireErrorCaught(error)
-                    case .success:
-                        break
-                    }
-                    self.lastEventTime = .now()
-                    self.scheduleTask(context)
-                }
-            } else {
-                self.scheduleTask(context)
-            }
-        }
-    }
-
-    func cancelTask() {
-        self.task?.cancel()
-        self.task = nil
-    }
-}

Sources/MQTTNIO/PingreqHandler.swift

@@ -0,0 +1,78 @@
+import NIO
+
+/// Channel handler for sending PINGREQ messages to keep connect alive
+final class PingreqHandler: ChannelDuplexHandler {
+    typealias OutboundIn = MQTTOutboundMessage
+    typealias OutboundOut = MQTTOutboundMessage
+    typealias InboundIn = MQTTInboundMessage
+    typealias InboundOut = MQTTInboundMessage
+
+    let client: MQTTClient
+    let timeout: TimeAmount
+    var lastEventTime: NIODeadline
+    var task: Scheduled<Void>?
+
+    init(client: MQTTClient, timeout: TimeAmount) {
+        self.client = client
+        self.timeout = timeout
+        self.lastEventTime = .now()
+        self.task = nil
+    }
+
+    public func handlerAdded(context: ChannelHandlerContext) {
+        if context.channel.isActive {
+            scheduleTask(context)
+        }
+    }
+
+    public func handlerRemoved(context: ChannelHandlerContext) {
+        cancelTask()
+    }
+
+    public func channelActive(context: ChannelHandlerContext) {
+        if self.task == nil {
+            scheduleTask(context)
+        }
+        context.fireChannelActive()
+    }
+
+    func channelRead(context: ChannelHandlerContext, data: NIOAny) {
+        self.lastEventTime = .now()
+        context.fireChannelRead(data)
+    }
+
+    func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {
+        self.lastEventTime = .now()
+        context.write(data, promise: promise)
+    }
+
+    func scheduleTask(_ context: ChannelHandlerContext) {
+        guard context.channel.isActive else { return }
+
+        self.task = context.eventLoop.scheduleTask(deadline: lastEventTime + timeout) {
+            // if lastEventTime plus the timeout is less than now send PINGREQ
+            // otherwise reschedule task
+            if self.lastEventTime + self.timeout <= .now() {
+                guard context.channel.isActive else { return }
+
+                self.client.pingreq().whenComplete { result in
+                    switch result {
+                    case .failure(let error):
+                        context.fireErrorCaught(error)
+                    case .success:
+                        break
+                    }
+                    self.lastEventTime = .now()
+                    self.scheduleTask(context)
+                }
+            } else {
+                self.scheduleTask(context)
+            }
+        }
+    }
+
+    func cancelTask() {
+        self.task?.cancel()
+        self.task = nil
+    }
+}