add service label service and hap protocol version service. fix Mute characteristic

Signed-off-by: Eugen Freiter <freiter@gmx.de>

Author: Eugen Freiter

README.md

@@ -9,6 +9,7 @@ This library would not have been possible without [Tian Zhang](https://github.co
 Usage
 =========
 Include HAP-Java in your project using maven:
+
 ```
 <dependency>
 	<groupId>io.github.hap-java</groupId>
@@ -23,9 +24,9 @@ Supported HomeKit Accessories
 =========
 
 Current implementation is based on HAP specification Release R2 (published 2019-07-26) and
-fully supports 31 out of 48 HomeKit accessories defined there.
+fully supports 33 out of 45 HomeKit accessory services defined there.
 
-| HomeKit Accessory | Supported by Java-HAP |
+| HomeKit Accessory & Service type | Supported by Java-HAP |
 |--------------------|--------------------|
 |  Accessory Information            |     :white_check_mark:    |
 |  Air Purifier                     |     :white_check_mark:    |
@@ -43,7 +44,7 @@ fully supports 31 out of 48 HomeKit accessories defined there.
 |  Faucet                           |     :x:                   |
 |  Filter Maintenance               |     :x:                   |
 |  Garage Door Opener               |     :white_check_mark:    |
-|  HAP Protocol Information         |     :x:                   |
+|  HAP Protocol Information         |     :white_check_mark:    |
 |  Heater Cooler                    |     :x:                   |
 |  Humidifier Dehumidifier          |     :x:                   |
 |  Humidity Sensor                  |     :white_check_mark:    |
@@ -58,7 +59,7 @@ fully supports 31 out of 48 HomeKit accessories defined there.
 |  Occupancy Sensor                 |     :white_check_mark:    |
 |  Outlet                           |     :white_check_mark:    |
 |  Security System                  |     :white_check_mark:    |
-|  Service Label                    |     :x:                   |
+|  Service Label                    |     :white_check_mark:    |
 |  Siri                             |     :x:                   |
 |  Slat                             |     :white_check_mark:    |
 |  Smoke Sensor                     |     :white_check_mark:    |
@@ -69,6 +70,6 @@ fully supports 31 out of 48 HomeKit accessories defined there.
 |  Target Control Management        |     :x:                   |
 |  Temperature Sensor               |     :white_check_mark:    |
 |  Thermostat                       |     :white_check_mark:    |
-|  Valve                            |      :white_check_mark:   |
-|  Window                           |      :white_check_mark:   |
-|  Window Covering                  |      :white_check_mark:   |
+|  Valve                            |     :white_check_mark:   |
+|  Window                           |     :white_check_mark:   |
+|  Window Covering                  |     :white_check_mark:   |

src/main/java/io/github/hapjava/characteristics/impl/audio/MuteCharacteristic.java

@@ -2,23 +2,22 @@
 
 import io.github.hapjava.characteristics.ExceptionalConsumer;
 import io.github.hapjava.characteristics.HomekitCharacteristicChangeCallback;
-import io.github.hapjava.characteristics.impl.base.EnumCharacteristic;
+import io.github.hapjava.characteristics.impl.base.BooleanCharacteristic;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /** A Mute characteristic allows the control of audio input or output accessory respectively. */
-public class MuteCharacteristic extends EnumCharacteristic<MuteEnum> {
+public class MuteCharacteristic extends BooleanCharacteristic {
   public MuteCharacteristic(
-      Supplier<CompletableFuture<MuteEnum>> getter,
-      ExceptionalConsumer<MuteEnum> setter,
+      Supplier<CompletableFuture<Boolean>> getter,
+      ExceptionalConsumer<Boolean> setter,
       Consumer<HomekitCharacteristicChangeCallback> subscriber,
       Runnable unsubscriber) {
     super(
         "0000011A-0000-1000-8000-0026BB765291",
         "Mute",
-        1,
         Optional.of(getter),
         Optional.of(setter),
         Optional.of(subscriber),

src/main/java/io/github/hapjava/characteristics/impl/audio/MuteEnum.java

@@ -0,0 +1,19 @@
+package io.github.hapjava.characteristics.impl.common;
+
+import io.github.hapjava.characteristics.impl.base.StaticStringCharacteristic;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
+
+/** This characteristic describes a name and must not be a null value. */
+public class VersionCharacteristic extends StaticStringCharacteristic {
+
+  public VersionCharacteristic(Supplier<CompletableFuture<String>> getter) {
+    super(
+        "00000023-0000-1000-8000-0026BB765291",
+        "HAP version",
+        Optional.of(getter),
+        Optional.empty(),
+        Optional.empty());
+  }
+}

src/main/java/io/github/hapjava/characteristics/impl/common/VersionCharacteristic.java

@@ -6,7 +6,6 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageCodec;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,7 +24,6 @@ public BinaryHandler(HomekitClientConnection connection) {
   @Override
   protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) throws Exception {
     if (started) {
-      debugData("Sending data", msg, ctx);
       byte[] b = new byte[msg.readableBytes()];
       msg.readBytes(b);
       out.writeBytes(connection.encryptResponse(b));
@@ -40,7 +38,6 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) t
     in.readBytes(b);
     byte[] decrypted = connection.decryptRequest(b);
     ByteBuf outBuf = Unpooled.copiedBuffer(decrypted);
-    debugData("Received data", outBuf, ctx);
     out.add(outBuf);
     started = true;
   }
@@ -55,13 +52,4 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
     }
     super.exceptionCaught(ctx, cause);
   }
-
-  private void debugData(String msg, ByteBuf b, ChannelHandlerContext ctx) throws Exception {
-    if (logger.isTraceEnabled()) {
-      logger.trace(
-          String.format(
-              "%s [%s]:%n%s",
-              msg, ctx.channel().remoteAddress().toString(), b.toString(StandardCharsets.UTF_8)));
-    }
-  }
 }

src/main/java/io/github/hapjava/server/impl/http/impl/BinaryHandler.java

@@ -0,0 +1,12 @@
+package io.github.hapjava.services.impl;
+
+import io.github.hapjava.characteristics.impl.common.VersionCharacteristic;
+
+/** This service describes label scheme. */
+public class HAPProtocolInformationService extends AbstractServiceImpl {
+
+  public HAPProtocolInformationService(VersionCharacteristic versionCharacteristic) {
+    super("000000A2-0000-1000-8000-0026BB765291");
+    addCharacteristic(versionCharacteristic);
+  }
+}

src/main/java/io/github/hapjava/services/impl/HAPProtocolInformationService.java

@@ -4,7 +4,6 @@
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithName;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithVolume;
 import io.github.hapjava.characteristics.impl.audio.MuteCharacteristic;
-import io.github.hapjava.characteristics.impl.audio.MuteEnum;
 import io.github.hapjava.characteristics.impl.audio.VolumeCharacteristic;
 import io.github.hapjava.characteristics.impl.common.NameCharacteristic;
 
@@ -22,8 +21,8 @@ public MicrophoneService(MuteCharacteristic muteCharacteristic) {
   public MicrophoneService(MicrophoneAccessory accessory) {
     this(
         new MuteCharacteristic(
-            () -> accessory.isMuted().thenApply(s -> s ? MuteEnum.ON : MuteEnum.OFF),
-            (v) -> accessory.setMute(v == MuteEnum.ON),
+            accessory::isMuted,
+            accessory::setMute,
             accessory::subscribeMuteState,
             accessory::unsubscribeMuteState));
     if (accessory instanceof AccessoryWithName) {

src/main/java/io/github/hapjava/services/impl/MicrophoneService.java

@@ -0,0 +1,13 @@
+package io.github.hapjava.services.impl;
+
+import io.github.hapjava.characteristics.impl.common.ServiceLabelNamespaceCharacteristic;
+
+/** This service describes label scheme. */
+public class ServiceLabelService extends AbstractServiceImpl {
+
+  public ServiceLabelService(
+      ServiceLabelNamespaceCharacteristic serviceLabelNamespaceCharacteristic) {
+    super("000000CC-0000-1000-8000-0026BB765291");
+    addCharacteristic(serviceLabelNamespaceCharacteristic);
+  }
+}

src/main/java/io/github/hapjava/services/impl/ServiceLabelService.java

@@ -4,7 +4,6 @@
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithName;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithVolume;
 import io.github.hapjava.characteristics.impl.audio.MuteCharacteristic;
-import io.github.hapjava.characteristics.impl.audio.MuteEnum;
 import io.github.hapjava.characteristics.impl.audio.VolumeCharacteristic;
 import io.github.hapjava.characteristics.impl.common.NameCharacteristic;
 
@@ -19,8 +18,8 @@ public SpeakerService(MuteCharacteristic muteCharacteristic) {
   public SpeakerService(SpeakerAccessory accessory) {
     this(
         new MuteCharacteristic(
-            () -> accessory.isMuted().thenApply(s -> s ? MuteEnum.ON : MuteEnum.OFF),
-            (v) -> accessory.setMute(v == MuteEnum.ON),
+            accessory::isMuted,
+            accessory::setMute,
             accessory::subscribeMuteState,
             accessory::unsubscribeMuteState));
     if (accessory instanceof AccessoryWithName) {