@annadata/capacitor-mqtt-quic 0.1.0

package/ios/Sources/MqttQuicPlugin/MQTT/MQTT5Properties.swift

@@ -0,0 +1,280 @@
+//
+// MQTT5Properties.swift
+// MqttQuicPlugin
+//
+// MQTT 5.0 Properties encoder/decoder. Matches MQTTD mqttd/properties.py.
+//
+
+import Foundation
+
+public enum MQTT5PropertyType: UInt8 {
+    case payloadFormatIndicator = 0x01
+    case messageExpiryInterval = 0x02
+    case contentType = 0x03
+    case responseTopic = 0x08
+    case correlationData = 0x09
+    case subscriptionIdentifier = 0x0B
+    case sessionExpiryInterval = 0x11
+    case assignedClientIdentifier = 0x12
+    case serverKeepAlive = 0x13
+    case authenticationMethod = 0x15
+    case authenticationData = 0x16
+    case requestProblemInformation = 0x17
+    case willDelayInterval = 0x18
+    case requestResponseInformation = 0x19
+    case responseInformation = 0x1A
+    case serverReference = 0x1C
+    case reasonString = 0x1F
+    case receiveMaximum = 0x21
+    case topicAliasMaximum = 0x22
+    case topicAlias = 0x23
+    case maximumQoS = 0x24
+    case retainAvailable = 0x25
+    case userProperty = 0x26
+    case maximumPacketSize = 0x27
+    case wildcardSubscriptionAvailable = 0x28
+    case subscriptionIdentifierAvailable = 0x29
+    case sharedSubscriptionAvailable = 0x2A
+}
+
+public struct MQTT5Properties {
+    public var properties: [UInt8: Any] = [:]
+    
+    public init() {}
+    
+    public mutating func set(_ type: MQTT5PropertyType, _ value: Any) {
+        properties[type.rawValue] = value
+    }
+    
+    public func get(_ type: MQTT5PropertyType) -> Any? {
+        return properties[type.rawValue]
+    }
+}
+
+public final class MQTT5PropertyEncoder {
+    
+    public static func encodeProperties(_ props: [UInt8: Any]) throws -> Data {
+        var result = Data()
+        let sorted = props.sorted { $0.key < $1.key }
+        
+        for (propId, value) in sorted {
+            // Handle subscription identifier list specially
+            if propId == MQTT5PropertyType.subscriptionIdentifier.rawValue, let list = value as? [Int] {
+                for subId in list {
+                    result.append(propId)
+                    result.append(contentsOf: try encodeVariableByteInteger(subId))
+                }
+                continue
+            }
+            
+            result.append(propId)
+            
+            switch propId {
+            case MQTT5PropertyType.payloadFormatIndicator.rawValue:
+                result.append((value as? Int ?? 0) & 0xFF)
+                
+            case MQTT5PropertyType.messageExpiryInterval.rawValue,
+                 MQTT5PropertyType.sessionExpiryInterval.rawValue,
+                 MQTT5PropertyType.willDelayInterval.rawValue,
+                 MQTT5PropertyType.maximumPacketSize.rawValue:
+                let v = (value as? UInt32 ?? 0)
+                result.append(UInt8((v >> 24) & 0xFF))
+                result.append(UInt8((v >> 16) & 0xFF))
+                result.append(UInt8((v >> 8) & 0xFF))
+                result.append(UInt8(v & 0xFF))
+                
+            case MQTT5PropertyType.contentType.rawValue,
+                 MQTT5PropertyType.responseTopic.rawValue,
+                 MQTT5PropertyType.assignedClientIdentifier.rawValue,
+                 MQTT5PropertyType.authenticationMethod.rawValue,
+                 MQTT5PropertyType.responseInformation.rawValue,
+                 MQTT5PropertyType.serverReference.rawValue,
+                 MQTT5PropertyType.reasonString.rawValue:
+                result.append(try encodeString(value as? String ?? ""))
+                
+            case MQTT5PropertyType.correlationData.rawValue,
+                 MQTT5PropertyType.authenticationData.rawValue:
+                let data = value as? Data ?? Data()
+                result.append(UInt8((data.count >> 8) & 0xFF))
+                result.append(UInt8(data.count & 0xFF))
+                result.append(data)
+                
+            case MQTT5PropertyType.subscriptionIdentifier.rawValue:
+                result.append(contentsOf: try encodeVariableByteInteger(value as? Int ?? 0))
+                
+            case MQTT5PropertyType.serverKeepAlive.rawValue,
+                 MQTT5PropertyType.receiveMaximum.rawValue,
+                 MQTT5PropertyType.topicAliasMaximum.rawValue,
+                 MQTT5PropertyType.topicAlias.rawValue:
+                let v = (value as? UInt16 ?? 0)
+                result.append(UInt8((v >> 8) & 0xFF))
+                result.append(UInt8(v & 0xFF))
+                
+            case MQTT5PropertyType.maximumQoS.rawValue,
+                 MQTT5PropertyType.retainAvailable.rawValue,
+                 MQTT5PropertyType.requestProblemInformation.rawValue,
+                 MQTT5PropertyType.requestResponseInformation.rawValue,
+                 MQTT5PropertyType.wildcardSubscriptionAvailable.rawValue,
+                 MQTT5PropertyType.subscriptionIdentifierAvailable.rawValue,
+                 MQTT5PropertyType.sharedSubscriptionAvailable.rawValue:
+                result.append((value as? Int ?? 0) & 0xFF)
+                
+            case MQTT5PropertyType.userProperty.rawValue:
+                if let pair = value as? (String, String) {
+                    result.append(try encodeString(pair.0))
+                    result.append(try encodeString(pair.1))
+                } else {
+                    throw MQTTProtocolError.insufficientData("USER_PROPERTY must be (String, String)")
+                }
+                
+            default:
+                throw MQTTProtocolError.insufficientData("Unknown property type: \(propId)")
+            }
+        }
+        
+        return result
+    }
+    
+    public static func decodeProperties(_ data: Data, offset: Int = 0) throws -> ([UInt8: Any], Int) {
+        var props: [UInt8: Any] = [:]
+        var pos = offset
+        
+        while pos < data.count {
+            let propId = data[pos]
+            pos += 1
+            
+            switch propId {
+            case MQTT5PropertyType.payloadFormatIndicator.rawValue:
+                props[propId] = Int(data[pos] & 0xFF)
+                pos += 1
+                
+            case MQTT5PropertyType.messageExpiryInterval.rawValue,
+                 MQTT5PropertyType.sessionExpiryInterval.rawValue,
+                 MQTT5PropertyType.willDelayInterval.rawValue,
+                 MQTT5PropertyType.maximumPacketSize.rawValue:
+                let v = (UInt32(data[pos] & 0xFF) << 24) |
+                        (UInt32(data[pos + 1] & 0xFF) << 16) |
+                        (UInt32(data[pos + 2] & 0xFF) << 8) |
+                        UInt32(data[pos + 3] & 0xFF)
+                props[propId] = v
+                pos += 4
+                
+            case MQTT5PropertyType.contentType.rawValue,
+                 MQTT5PropertyType.responseTopic.rawValue,
+                 MQTT5PropertyType.assignedClientIdentifier.rawValue,
+                 MQTT5PropertyType.authenticationMethod.rawValue,
+                 MQTT5PropertyType.responseInformation.rawValue,
+                 MQTT5PropertyType.serverReference.rawValue,
+                 MQTT5PropertyType.reasonString.rawValue:
+                let (s, next) = try decodeString(data, offset: pos)
+                props[propId] = s
+                pos = next
+                
+            case MQTT5PropertyType.correlationData.rawValue,
+                 MQTT5PropertyType.authenticationData.rawValue:
+                let len = (Int(data[pos] & 0xFF) << 8) | Int(data[pos + 1] & 0xFF)
+                pos += 2
+                props[propId] = data.subdata(in: pos..<(pos + len))
+                pos += len
+                
+            case MQTT5PropertyType.subscriptionIdentifier.rawValue:
+                let (v, consumed) = try decodeVariableByteInteger(data, offset: pos)
+                if props[propId] == nil {
+                    props[propId] = [v]
+                } else if var list = props[propId] as? [Int] {
+                    list.append(v)
+                    props[propId] = list
+                } else {
+                    props[propId] = [v]
+                }
+                pos += consumed
+                
+            case MQTT5PropertyType.serverKeepAlive.rawValue,
+                 MQTT5PropertyType.receiveMaximum.rawValue,
+                 MQTT5PropertyType.topicAliasMaximum.rawValue,
+                 MQTT5PropertyType.topicAlias.rawValue:
+                let v = (UInt16(data[pos] & 0xFF) << 8) | UInt16(data[pos + 1] & 0xFF)
+                props[propId] = v
+                pos += 2
+                
+            case MQTT5PropertyType.maximumQoS.rawValue,
+                 MQTT5PropertyType.retainAvailable.rawValue,
+                 MQTT5PropertyType.requestProblemInformation.rawValue,
+                 MQTT5PropertyType.requestResponseInformation.rawValue,
+                 MQTT5PropertyType.wildcardSubscriptionAvailable.rawValue,
+                 MQTT5PropertyType.subscriptionIdentifierAvailable.rawValue,
+                 MQTT5PropertyType.sharedSubscriptionAvailable.rawValue:
+                props[propId] = Int(data[pos] & 0xFF)
+                pos += 1
+                
+            case MQTT5PropertyType.userProperty.rawValue:
+                let (name, next1) = try decodeString(data, offset: pos)
+                pos = next1
+                let (value, next2) = try decodeString(data, offset: pos)
+                pos = next2
+                if props[propId] == nil {
+                    props[propId] = [(name, value)]
+                } else if var list = props[propId] as? [(String, String)] {
+                    list.append((name, value))
+                    props[propId] = list
+                } else {
+                    props[propId] = [(name, value)]
+                }
+                
+            default:
+                // Unknown property - skip (per spec)
+                break
+            }
+        }
+        
+        return (props, pos - offset)
+    }
+    
+    private static func encodeString(_ s: String) throws -> Data {
+        guard let utf8 = s.data(using: .utf8) else { throw MQTTProtocolError.invalidUTF8 }
+        if utf8.count > 0xFFFF { throw MQTTProtocolError.insufficientData("string too long") }
+        var out = Data()
+        out.append(UInt8((utf8.count >> 8) & 0xFF))
+        out.append(UInt8(utf8.count & 0xFF))
+        out.append(utf8)
+        return out
+    }
+    
+    private static func decodeString(_ data: Data, offset: Int) throws -> (String, Int) {
+        if offset + 2 > data.count { throw MQTTProtocolError.insufficientData("string length") }
+        let len = (Int(data[offset] & 0xFF) << 8) | Int(data[offset + 1] & 0xFF)
+        let start = offset + 2
+        if start + len > data.count { throw MQTTProtocolError.insufficientData("string content") }
+        let sub = data.subdata(in: start..<(start + len))
+        guard let s = String(data: sub, encoding: .utf8) else { throw MQTTProtocolError.invalidUTF8 }
+        return (s, start + len)
+    }
+    
+    private static func encodeVariableByteInteger(_ value: Int) throws -> Data {
+        if value < 0 || value > 268_435_455 { throw MQTTProtocolError.invalidRemainingLength(value) }
+        var enc: [UInt8] = []
+        var n = value
+        repeat {
+            var b = UInt8(n % 128)
+            n /= 128
+            if n > 0 { b |= 0x80 }
+            enc.append(b)
+        } while n > 0
+        return Data(enc)
+    }
+    
+    private static func decodeVariableByteInteger(_ data: Data, offset: Int) throws -> (Int, Int) {
+        var mul = 1
+        var val = 0
+        var i = offset
+        for _ in 0..<4 {
+            if i >= data.count { throw MQTTProtocolError.insufficientData("variable byte integer") }
+            let b = data[i]
+            val += Int(b & 0x7F) * mul
+            i += 1
+            if (b & 0x80) == 0 { break }
+            mul *= 128
+        }
+        return (val, i - offset)
+    }
+}

package/ios/Sources/MqttQuicPlugin/MQTT/MQTT5Protocol.swift

@@ -0,0 +1,333 @@
+//
+// MQTT5Protocol.swift
+// MqttQuicPlugin
+//
+// MQTT 5.0 Protocol implementation. Matches MQTTD mqttd/protocol_v5.py.
+//
+
+import Foundation
+
+public final class MQTT5Protocol {
+    
+    public static func buildConnectV5(
+        clientId: String,
+        username: String? = nil,
+        password: String? = nil,
+        keepalive: UInt16 = 60,
+        cleanStart: Bool = true,
+        sessionExpiryInterval: UInt32? = nil,
+        receiveMaximum: UInt16? = nil,
+        maximumPacketSize: UInt32? = nil,
+        topicAliasMaximum: UInt16? = nil,
+        requestResponseInformation: UInt8? = nil,
+        requestProblemInformation: UInt8? = nil,
+        authenticationMethod: String? = nil,
+        authenticationData: Data? = nil,
+        properties: [UInt8: Any]? = nil
+    ) throws -> Data {
+        var variableHeader = Data()
+        variableHeader.append(try MQTTProtocol.encodeString("MQTT"))
+        variableHeader.append(MQTTProtocolLevel.v5)
+        
+        var flags: UInt8 = 0
+        if cleanStart { flags |= 0x02 }
+        if username != nil { flags |= MQTTConnectFlags.username }
+        if password != nil { flags |= MQTTConnectFlags.password }
+        variableHeader.append(flags)
+        variableHeader.append(UInt8((keepalive >> 8) & 0xFF))
+        variableHeader.append(UInt8(keepalive & 0xFF))
+        
+        var connectProps: [UInt8: Any] = [:]
+        if let sei = sessionExpiryInterval {
+            connectProps[MQTT5PropertyType.sessionExpiryInterval.rawValue] = sei
+        }
+        if let rm = receiveMaximum {
+            connectProps[MQTT5PropertyType.receiveMaximum.rawValue] = rm
+        }
+        if let mps = maximumPacketSize {
+            connectProps[MQTT5PropertyType.maximumPacketSize.rawValue] = mps
+        }
+        if let tam = topicAliasMaximum {
+            connectProps[MQTT5PropertyType.topicAliasMaximum.rawValue] = tam
+        }
+        if let rri = requestResponseInformation {
+            connectProps[MQTT5PropertyType.requestResponseInformation.rawValue] = rri
+        }
+        if let rpi = requestProblemInformation {
+            connectProps[MQTT5PropertyType.requestProblemInformation.rawValue] = rpi
+        }
+        if let am = authenticationMethod {
+            connectProps[MQTT5PropertyType.authenticationMethod.rawValue] = am
+        }
+        if let ad = authenticationData {
+            connectProps[MQTT5PropertyType.authenticationData.rawValue] = ad
+        }
+        if let props = properties {
+            connectProps.merge(props) { (_, new) in new }
+        }
+        
+        let propsBytes = try MQTT5PropertyEncoder.encodeProperties(connectProps)
+        let propsLen = try MQTTProtocol.encodeRemainingLength(propsBytes.count)
+        variableHeader.append(contentsOf: propsLen)
+        variableHeader.append(propsBytes)
+        
+        var payload = Data()
+        payload.append(try MQTTProtocol.encodeString(clientId))
+        payload.append(0x00) // Will Properties length = 0 (no will for now)
+        if let u = username { payload.append(try MQTTProtocol.encodeString(u)) }
+        if let p = password { payload.append(try MQTTProtocol.encodeString(p)) }
+        
+        let remLen = variableHeader.count + payload.count
+        var fixed = Data()
+        fixed.append(MQTTMessageType.CONNECT.rawValue)
+        fixed.append(contentsOf: try MQTTProtocol.encodeRemainingLength(remLen))
+        
+        var out = Data()
+        out.append(fixed)
+        out.append(variableHeader)
+        out.append(payload)
+        return out
+    }
+    
+    public static func buildConnackV5(
+        reasonCode: MQTT5ReasonCode = .success,
+        sessionPresent: Bool = false,
+        properties: [UInt8: Any]? = nil
+    ) throws -> Data {
+        var variableHeader = Data()
+        variableHeader.append(sessionPresent ? 0x01 : 0x00)
+        variableHeader.append(reasonCode.rawValue)
+        
+        var props: [UInt8: Any] = [:]
+        if let p = properties { props = p }
+        let propsBytes = try MQTT5PropertyEncoder.encodeProperties(props)
+        let propsLen = try MQTTProtocol.encodeRemainingLength(propsBytes.count)
+        variableHeader.append(contentsOf: propsLen)
+        variableHeader.append(propsBytes)
+        
+        let remLen = variableHeader.count
+        var out = Data()
+        out.append(MQTTMessageType.CONNACK.rawValue)
+        out.append(contentsOf: try MQTTProtocol.encodeRemainingLength(remLen))
+        out.append(variableHeader)
+        return out
+    }
+    
+    public static func parseConnackV5(_ data: Data, offset: Int = 0) throws -> (Bool, MQTT5ReasonCode, [UInt8: Any], Int) {
+        if offset + 2 > data.count { throw MQTTProtocolError.insufficientData("CONNACK") }
+        let sessionPresent = (data[offset] & 0x01) != 0
+        let reasonCode = MQTT5ReasonCode(rawValue: data[offset + 1]) ?? .unspecifiedError
+        var pos = offset + 2
+        
+        let (propLen, propLenBytes) = try MQTTProtocol.decodeRemainingLength(data, offset: pos)
+        pos += propLenBytes
+        let (props, _) = try MQTT5PropertyEncoder.decodeProperties(data.subdata(in: pos..<(pos + propLen)), offset: 0)
+        pos += propLen
+        
+        return (sessionPresent, reasonCode, props, pos)
+    }
+    
+    public static func buildPublishV5(
+        topic: String,
+        payload: Data,
+        packetId: UInt16? = nil,
+        qos: UInt8 = 0,
+        retain: Bool = false,
+        properties: [UInt8: Any]? = nil
+    ) throws -> Data {
+        var msgType = MQTTMessageType.PUBLISH.rawValue
+        if qos > 0 { msgType |= (qos << 1) }
+        if retain { msgType |= 0x01 }
+        
+        var vh = Data()
+        vh.append(try MQTTProtocol.encodeString(topic))
+        if qos > 0, let pid = packetId {
+            vh.append(UInt8((pid >> 8) & 0xFF))
+            vh.append(UInt8(pid & 0xFF))
+        }
+        
+        var props: [UInt8: Any] = [:]
+        if let p = properties { props = p }
+        let propsBytes = try MQTT5PropertyEncoder.encodeProperties(props)
+        let propsLen = try MQTTProtocol.encodeRemainingLength(propsBytes.count)
+        vh.append(contentsOf: propsLen)
+        vh.append(propsBytes)
+        
+        let pl = vh + payload
+        let remLen = pl.count
+        var out = Data()
+        out.append(msgType)
+        out.append(contentsOf: try MQTTProtocol.encodeRemainingLength(remLen))
+        out.append(pl)
+        return out
+    }
+    
+    public static func buildSubscribeV5(
+        packetId: UInt16,
+        topic: String,
+        qos: UInt8 = 0,
+        subscriptionIdentifier: Int? = nil,
+        properties: [UInt8: Any]? = nil
+    ) throws -> Data {
+        var vh = Data()
+        vh.append(UInt8((packetId >> 8) & 0xFF))
+        vh.append(UInt8(packetId & 0xFF))
+        
+        var props: [UInt8: Any] = [:]
+        if let si = subscriptionIdentifier {
+            props[MQTT5PropertyType.subscriptionIdentifier.rawValue] = si
+        }
+        if let p = properties { props.merge(p) { (_, new) in new } }
+        let propsBytes = try MQTT5PropertyEncoder.encodeProperties(props)
+        let propsLen = try MQTTProtocol.encodeRemainingLength(propsBytes.count)
+        vh.append(contentsOf: propsLen)
+        vh.append(propsBytes)
+        
+        var pl = Data()
+        pl.append(try MQTTProtocol.encodeString(topic))
+        pl.append(qos & 0x03)
+        
+        let rem = vh.count + pl.count
+        var out = Data()
+        out.append(MQTTMessageType.SUBSCRIBE.rawValue | 0x02)
+        out.append(contentsOf: try MQTTProtocol.encodeRemainingLength(rem))
+        out.append(vh)
+        out.append(pl)
+        return out
+    }
+    
+    public static func buildSubackV5(
+        packetId: UInt16,
+        reasonCodes: [MQTT5ReasonCode],
+        properties: [UInt8: Any]? = nil
+    ) throws -> Data {
+        var vh = Data()
+        vh.append(UInt8((packetId >> 8) & 0xFF))
+        vh.append(UInt8(packetId & 0xFF))
+        
+        var props: [UInt8: Any] = [:]
+        if let p = properties { props = p }
+        let propsBytes = try MQTT5PropertyEncoder.encodeProperties(props)
+        let propsLen = try MQTTProtocol.encodeRemainingLength(propsBytes.count)
+        vh.append(contentsOf: propsLen)
+        vh.append(propsBytes)
+        
+        var pl = Data()
+        for rc in reasonCodes {
+            pl.append(rc.rawValue)
+        }
+        
+        let rem = vh.count + pl.count
+        var out = Data()
+        out.append(MQTTMessageType.SUBACK.rawValue)
+        out.append(contentsOf: try MQTTProtocol.encodeRemainingLength(rem))
+        out.append(vh)
+        out.append(pl)
+        return out
+    }
+    
+    public static func parseSubackV5(_ data: Data, offset: Int = 0) throws -> (UInt16, [MQTT5ReasonCode], [UInt8: Any], Int) {
+        if offset + 2 > data.count { throw MQTTProtocolError.insufficientData("SUBACK packet ID") }
+        let pid = (UInt16(data[offset] & 0xFF) << 8) | UInt16(data[offset + 1] & 0xFF)
+        var pos = offset + 2
+        
+        let (propLen, propLenBytes) = try MQTTProtocol.decodeRemainingLength(data, offset: pos)
+        pos += propLenBytes
+        let (props, _) = try MQTT5PropertyEncoder.decodeProperties(data.subdata(in: pos..<(pos + propLen)), offset: 0)
+        pos += propLen
+        
+        var reasonCodes: [MQTT5ReasonCode] = []
+        while pos < data.count {
+            if let rc = MQTT5ReasonCode(rawValue: data[pos]) {
+                reasonCodes.append(rc)
+            }
+            pos += 1
+        }
+        
+        return (pid, reasonCodes, props, pos)
+    }
+    
+    public static func buildUnsubscribeV5(
+        packetId: UInt16,
+        topics: [String],
+        properties: [UInt8: Any]? = nil
+    ) throws -> Data {
+        var vh = Data()
+        vh.append(UInt8((packetId >> 8) & 0xFF))
+        vh.append(UInt8(packetId & 0xFF))
+        
+        var props: [UInt8: Any] = [:]
+        if let p = properties { props = p }
+        let propsBytes = try MQTT5PropertyEncoder.encodeProperties(props)
+        let propsLen = try MQTTProtocol.encodeRemainingLength(propsBytes.count)
+        vh.append(contentsOf: propsLen)
+        vh.append(propsBytes)
+        
+        var pl = Data()
+        for t in topics {
+            pl.append(try MQTTProtocol.encodeString(t))
+        }
+        
+        let rem = vh.count + pl.count
+        var out = Data()
+        out.append(MQTTMessageType.UNSUBSCRIBE.rawValue | 0x02)
+        out.append(contentsOf: try MQTTProtocol.encodeRemainingLength(rem))
+        out.append(vh)
+        out.append(pl)
+        return out
+    }
+    
+    public static func buildUnsubackV5(
+        packetId: UInt16,
+        reasonCodes: [MQTT5ReasonCode]? = nil,
+        properties: [UInt8: Any]? = nil
+    ) throws -> Data {
+        var vh = Data()
+        vh.append(UInt8((packetId >> 8) & 0xFF))
+        vh.append(UInt8(packetId & 0xFF))
+        
+        var props: [UInt8: Any] = [:]
+        if let p = properties { props = p }
+        let propsBytes = try MQTT5PropertyEncoder.encodeProperties(props)
+        let propsLen = try MQTTProtocol.encodeRemainingLength(propsBytes.count)
+        vh.append(contentsOf: propsLen)
+        vh.append(propsBytes)
+        
+        var pl = Data()
+        if let rcs = reasonCodes {
+            for rc in rcs {
+                pl.append(rc.rawValue)
+            }
+        }
+        
+        let rem = vh.count + pl.count
+        var out = Data()
+        out.append(MQTTMessageType.UNSUBACK.rawValue)
+        out.append(contentsOf: try MQTTProtocol.encodeRemainingLength(rem))
+        out.append(vh)
+        out.append(pl)
+        return out
+    }
+    
+    public static func buildDisconnectV5(
+        reasonCode: MQTT5ReasonCode = .normalDisconnectionDisc,
+        properties: [UInt8: Any]? = nil
+    ) throws -> Data {
+        var vh = Data()
+        vh.append(reasonCode.rawValue)
+        
+        var props: [UInt8: Any] = [:]
+        if let p = properties { props = p }
+        let propsBytes = try MQTT5PropertyEncoder.encodeProperties(props)
+        let propsLen = try MQTTProtocol.encodeRemainingLength(propsBytes.count)
+        vh.append(contentsOf: propsLen)
+        vh.append(propsBytes)
+        
+        let remLen = vh.count
+        var out = Data()
+        out.append(MQTTMessageType.DISCONNECT.rawValue)
+        out.append(contentsOf: try MQTTProtocol.encodeRemainingLength(remLen))
+        out.append(vh)
+        return out
+    }
+}