Added more trace logging to log pre-pairing requests

Author: andylintner

src/main/java/com/beowulfe/hap/impl/http/impl/LoggingHandler.java

@@ -1,36 +1,51 @@
 package com.beowulfe.hap.impl.http.impl;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
 
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-public class LoggingHandler extends ChannelInboundHandlerAdapter {
-	
-	private final FileOutputStream fos;
+import org.apache.commons.io.HexDump;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoggingHandler extends ChannelDuplexHandler {
 
-	public LoggingHandler() throws IOException {
-		File file = File.createTempFile("hap", "log");
-		fos = new FileOutputStream(file);
-		System.out.println("Logging to "+file.getCanonicalPath());
-	}
+	private final static Logger logger = LoggerFactory.getLogger(NettyHomekitHttpService.class);
 
 	@Override
 	public void channelRead(ChannelHandlerContext ctx, Object msg)
 			throws Exception {
-		if (msg instanceof ByteBuf) {
-			ByteBuf buf = (ByteBuf) msg;
-			buf.getBytes(0, fos, buf.readableBytes());
-			fos.flush();
+		if (logger.isTraceEnabled()) {
+			if (msg instanceof ByteBuf) {
+				logBytes("READ", (ByteBuf) msg, ctx);
+			}
 		}
 		super.channelRead(ctx, msg);
 	}
 
 	@Override
-	public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-		fos.close();
+	public void write(ChannelHandlerContext ctx, Object msg,
+			ChannelPromise promise) throws Exception {
+		if (logger.isTraceEnabled()) {
+			if (msg instanceof ByteBuf) {
+				logBytes("WRITE", (ByteBuf) msg, ctx);
+			}
+		}
+		super.write(ctx, msg, promise);
+	}
+	
+	private void logBytes(String type, ByteBuf buf, ChannelHandlerContext ctx) throws IOException {
+		try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+			byte[] bytes = new byte[buf.readableBytes()];
+			buf.getBytes(0, bytes, 0, bytes.length);
+			HexDump.dump(bytes, 0, stream, 0);
+			stream.flush();
+			logger.trace(String.format("%s %s [%s]:\n%s\n", type, buf, ctx.channel().remoteAddress().toString(),
+					stream.toString()));
+		}
 	}
 }

src/main/java/com/beowulfe/hap/impl/http/impl/ServerInitializer.java

@@ -30,8 +30,7 @@ public ServerInitializer(HomekitClientConnectionFactory homekit, ChannelGroup al
 	@Override
 	protected void initChannel(SocketChannel ch) throws Exception {
 		ChannelPipeline pipeline = ch.pipeline();
-		// Useful for debugging:
-		//pipeline.addLast(new LoggingHandler()); 
+		pipeline.addLast(new LoggingHandler()); 
 		pipeline.addLast(HTTP_HANDLER_NAME, new HttpResponseEncoderAggregate());
 		pipeline.addLast(new HttpRequestDecoder());
 		pipeline.addLast(new HttpObjectAggregator(MAX_POST));