Use device ID to distinguish remotes

Sesame/API/Message.swift

@@ -49,15 +49,18 @@ extension Message {
 
         /// The counter of the message (for freshness)
         let id: UInt32
+        
+        let deviceId: UInt8?
 
         /**
          Create new message content.
          - Parameter time: The time of message creation,
          - Parameter id: The counter of the message
          */
-        init(time: UInt32, id: UInt32) {
+        init(time: UInt32, id: UInt32, device: UInt8) {
             self.time = time
             self.id = id
+            self.deviceId = device
         }
 
         /**
@@ -69,26 +72,28 @@ extension Message {
          */
         init<T: Sequence>(decodeFrom data: T) where T.Element == UInt8 {
             self.time = UInt32(data: Data(data.prefix(MemoryLayout<UInt32>.size)))
-            self.id = UInt32(data: Data(data.dropFirst(MemoryLayout<UInt32>.size)))
+            self.id = UInt32(data: Data(data.dropLast().suffix(MemoryLayout<UInt32>.size)))
+            self.deviceId = data.suffix(1).last!
         }
 
         /// The byte length of an encoded message content
         static var length: Int {
-            MemoryLayout<UInt32>.size * 2
+            MemoryLayout<UInt32>.size * 2 + 1
         }
 
         /// The message content encoded to data
         var encoded: Data {
-            time.encoded + id.encoded
+            time.encoded + id.encoded + Data([deviceId ?? 0])
         }
     }
 }
 
 extension Message.Content: Codable {
-    
+
     enum CodingKeys: Int, CodingKey {
         case time = 1
         case id = 2
+        case deviceId = 3
     }
 }
 

Sesame/API/MessageResult.swift

@@ -25,6 +25,9 @@ enum MessageResult: UInt8 {
 
     /// The key was accepted by the device, and the door will be opened
     case messageAccepted = 7
+    
+    /// The device id is invalid
+    case messageDeviceInvalid = 8
 
 
     /// The request did not contain body data with the key
@@ -61,6 +64,8 @@ extension MessageResult: CustomStringConvertible {
             return "Message counter invalid"
         case .messageAccepted:
             return "Message accepted"
+        case .messageDeviceInvalid:
+            return "Invalid device ID"
         case .noBodyData:
             return "No body data included in the request"
         case .deviceNotConnected: