Add cancellation tokens for characteristic read/write

Author: jdomnitz

HomeKitDotNet/Models/BinaryCharacteristic.cs

@@ -13,22 +13,22 @@ protected BinaryCharacteristic(Service service, CharacteristicJSON json) : base(
             LastValue = MapValue(json.Value);
         }
 
-        protected async Task<bool> Write(byte[] value)
+        protected async Task<bool> Write(byte[] value, CancellationToken token = default)
         {
             if (!CanWrite)
                 throw new InvalidOperationException("Writing is prohibited");
             CharacteristicValueJSON write = new CharacteristicValueJSON(service.Accessory.ID, InstanceID);
             write.Value = JsonSerializer.SerializeToElement(Convert.ToBase64String(value));
             Dictionary<string, CharacteristicValueJSON[]> dict = new Dictionary<string, CharacteristicValueJSON[]>();
             dict.Add("characteristics", [write]);
-            return (await service.Accessory.EndPoint.Connection.Put("/characteristics", JsonSerializer.SerializeToUtf8Bytes(dict))).StatusCode == System.Net.HttpStatusCode.NoContent;
+            return (await service.Accessory.EndPoint.Connection.Put("/characteristics", JsonSerializer.SerializeToUtf8Bytes(dict), token)).StatusCode == System.Net.HttpStatusCode.NoContent;
         }
 
-        protected async Task<byte[]> Read()
+        protected async Task<byte[]> Read(CancellationToken token = default)
         {
             if (!CanRead)
                 throw new InvalidOperationException("Reading is prohibited");
-            HttpResponseMessage msg = await service.Accessory.EndPoint.Connection.Get($"/characteristics?id={service.Accessory.ID}.{InstanceID}");
+            HttpResponseMessage msg = await service.Accessory.EndPoint.Connection.Get($"/characteristics?id={service.Accessory.ID}.{InstanceID}", token);
             if (!msg.IsSuccessStatusCode)
                 return Array.Empty<byte>();
             CharacteristicsJSON? chars = JsonSerializer.Deserialize<CharacteristicsJSON>(msg.Content.ReadAsStream());

HomeKitDotNet/Models/Characteristic.cs

@@ -24,22 +24,22 @@ protected Characteristic(Service service, CharacteristicJSON json) : base(servic
             this.LastValue = MapValue(json.Value);
         }
 
-        protected async Task<bool> Write(T value)
+        protected async Task<bool> Write(T value, CancellationToken token = default)
         {
             if (!CanWrite)
                 throw new InvalidOperationException("Writing is prohibited");
             CharacteristicValueJSON write = new CharacteristicValueJSON(service.Accessory.ID, InstanceID);
             write.Value = JsonSerializer.SerializeToElement(value);
             Dictionary<string, CharacteristicValueJSON[]> dict = new Dictionary<string, CharacteristicValueJSON[]>();
             dict.Add("characteristics", [write]);
-            return (await service.Accessory.EndPoint.Connection.Put("/characteristics", JsonSerializer.SerializeToUtf8Bytes(dict))).StatusCode == System.Net.HttpStatusCode.NoContent;
+            return (await service.Accessory.EndPoint.Connection.Put("/characteristics", JsonSerializer.SerializeToUtf8Bytes(dict), token)).StatusCode == System.Net.HttpStatusCode.NoContent;
         }
 
-        protected async Task<T?> Read()
+        protected async Task<T?> Read(CancellationToken token = default)
         {
             if (!CanRead)
                 throw new InvalidOperationException("Reading is prohibited");
-            HttpResponseMessage msg = await service.Accessory.EndPoint.Connection.Get($"/characteristics?id={service.Accessory.ID}.{InstanceID}");
+            HttpResponseMessage msg = await service.Accessory.EndPoint.Connection.Get($"/characteristics?id={service.Accessory.ID}.{InstanceID}", token);
             if (!msg.IsSuccessStatusCode)
                 return null;
             CharacteristicsJSON? chars = JsonSerializer.Deserialize<CharacteristicsJSON>(msg.Content.ReadAsStream());

HomeKitDotNet/Models/CharacteristicBase.cs

@@ -15,15 +15,15 @@ public CharacteristicBase(Service service, CharacteristicJSON json)
             this.service = service;
         }
 
-        protected async Task<bool> Events(bool subscribe)
+        protected async Task<bool> Events(bool subscribe, CancellationToken token = default)
         {
             if (!CanSubscribe)
                 throw new InvalidOperationException("Subscriptions are prohibited");
             CharacteristicNotificationsJSON write = new CharacteristicNotificationsJSON(service.Accessory.ID, InstanceID);
             write.EventNotifications = subscribe;
             Dictionary<string, CharacteristicNotificationsJSON[]> dict = new Dictionary<string, CharacteristicNotificationsJSON[]>();
             dict.Add("characteristics", [write]);
-            return (await service.Accessory.EndPoint.Connection.Put("/characteristics", JsonSerializer.SerializeToUtf8Bytes(dict))).StatusCode == System.Net.HttpStatusCode.NoContent;
+            return (await service.Accessory.EndPoint.Connection.Put("/characteristics", JsonSerializer.SerializeToUtf8Bytes(dict), token)).StatusCode == System.Net.HttpStatusCode.NoContent;
         }
 
         internal abstract void FireUpdate(JsonElement? value);

HomeKitDotNet/Models/StringCharacteristic.cs

@@ -12,22 +12,22 @@ protected StringCharacteristic(Service service, CharacteristicJSON json) : base(
             LastValue = MapValue(json.Value);
         }
 
-        protected async Task<bool> Write(string value)
+        protected async Task<bool> Write(string value, CancellationToken token = default)
         {
             if (!CanWrite)
                 throw new InvalidOperationException("Writing is prohibited");
             CharacteristicValueJSON write = new CharacteristicValueJSON(service.Accessory.ID, InstanceID);
             write.Value = JsonSerializer.SerializeToElement(value);
             Dictionary<string, CharacteristicValueJSON[]> dict = new Dictionary<string, CharacteristicValueJSON[]>();
             dict.Add("characteristics", [write]);
-            return (await service.Accessory.EndPoint.Connection.Put("/characteristics", JsonSerializer.SerializeToUtf8Bytes(dict))).StatusCode == System.Net.HttpStatusCode.NoContent;
+            return (await service.Accessory.EndPoint.Connection.Put("/characteristics", JsonSerializer.SerializeToUtf8Bytes(dict), token)).StatusCode == System.Net.HttpStatusCode.NoContent;
         }
 
-        protected async Task<string?> Read()
+        protected async Task<string?> Read(CancellationToken token = default)
         {
             if (!CanRead)
                 throw new InvalidOperationException("Reading is prohibited");
-            HttpResponseMessage msg = await service.Accessory.EndPoint.Connection.Get($"/characteristics?id={service.Accessory.ID}.{InstanceID}");
+            HttpResponseMessage msg = await service.Accessory.EndPoint.Connection.Get($"/characteristics?id={service.Accessory.ID}.{InstanceID}", token);
             if (!msg.IsSuccessStatusCode)
                 return null;
             CharacteristicsJSON? chars = JsonSerializer.Deserialize<CharacteristicsJSON>(msg.Content.ReadAsStream());