Fix /pairings handler rejecting ListPairings with "tlv8: EOF"

README.md

@@ -3,7 +3,7 @@
 [![GoDoc Widget]][GoDoc] [![Travis Widget]][Travis]
 
 `hap` (previously [hc](https://github.com/brutella/hc)) is a lightweight library to develop HomeKit accessories in Go.
-It abstracts the **H**omeKit **A**ccessory **P**rotocol (HAP) and makes it easy to work with [services](service/README.md) and [characteristics](characteristic/README.md).
+It abstracts the **H**omeKit **A**ccessory **P**rotocol (HAP) and makes it easy to work with [services](service/README.md) and [characteristics](characteristic).
 
 `hap` handles the underlying communication between HomeKit accessories and clients.
 You can focus on implementing the business logic for your accessory, without having to worry about the protocol.

accessory/air_purifier.go

@@ -13,6 +13,7 @@ type AirPurifier struct {
 func NewAirPurifier(info Info) *AirPurifier {
 	a := AirPurifier{}
 	a.A = New(info, TypeAirPurifier)
+
 	a.AirPurifier = service.NewAirPurifier()
 	a.AddS(a.AirPurifier.S)
 

accessory/camera.go

@@ -16,6 +16,7 @@ type Camera struct {
 func NewCamera(info Info) *Camera {
 	a := Camera{}
 	a.A = New(info, TypeIPCamera)
+
 	a.Control = service.NewCameraControl()
 	a.AddS(a.Control.S)
 

accessory/colored_lightbulb.go

@@ -11,13 +11,11 @@ type ColoredLightbulb struct {
 
 // NewLightbulb returns an light bulb accessory.
 func NewColoredLightbulb(info Info) *ColoredLightbulb {
-	a := New(info, TypeLightbulb)
+	a := ColoredLightbulb{}
+	a.A = New(info, TypeLightbulb)
 
-	l := service.NewColoredLightbulb()
-	a.Ss = append(a.Ss, l.S)
+	a.Lightbulb = service.NewColoredLightbulb()
+	a.AddS(a.Lightbulb.S)
 
-	return &ColoredLightbulb{
-		A:         a,
-		Lightbulb: l,
-	}
+	return &a
 }

accessory/contact_sensor.go

@@ -0,0 +1,19 @@
+package accessory
+
+import "github.com/brutella/hap/service"
+
+type ContactSensor struct {
+	*A
+	ContactSensor *service.ContactSensor
+}
+
+// NewContactSensor implements a contact sensor.
+func NewContactSensor(info Info) *ContactSensor {
+	a := ContactSensor{}
+	a.A = New(info, TypeSensor)
+
+	a.ContactSensor = service.NewContactSensor()
+	a.AddS(a.ContactSensor.S)
+
+	return &a
+}

accessory/cooler.go

@@ -13,6 +13,7 @@ type Cooler struct {
 func NewCooler(info Info) *Cooler {
 	a := Cooler{}
 	a.A = New(info, TypeAirConditioner)
+
 	a.Cooler = service.NewCooler()
 	a.AddS(a.Cooler.S)
 

accessory/dehumidifier.go

@@ -6,19 +6,16 @@ import (
 
 type Dehumidifier struct {
 	*A
-
 	Dehumidifier *service.Dehumidifier
 }
 
 // NewDehumidifier returns an outlet accessory.
 func NewDehumidifier(info Info) *Dehumidifier {
-	a := New(info, TypeDehumidifier)
+	a := Dehumidifier{}
+	a.A = New(info, TypeDehumidifier)
 
-	d := service.NewDehumidifier()
-	a.Ss = append(a.Ss, d.S)
+	a.Dehumidifier = service.NewDehumidifier()
+	a.AddS(a.Dehumidifier.S)
 
-	return &Dehumidifier{
-		A:            a,
-		Dehumidifier: d,
-	}
+	return &a
 }

accessory/door.go

@@ -6,19 +6,16 @@ import (
 
 type Door struct {
 	*A
-
 	Door *service.Door
 }
 
 // NewDoor returns a door accessory.
 func NewDoor(info Info) *Door {
-	a := New(info, TypeDoor)
+	a := Door{}
+	a.A = New(info, TypeDoor)
 
-	door := service.NewDoor()
-	a.Ss = append(a.Ss, door.S)
+	a.Door = service.NewDoor()
+	a.AddS(a.Door.S)
 
-	return &Door{
-		A:    a,
-		Door: door,
-	}
+	return &a
 }

accessory/fan.go

@@ -6,19 +6,16 @@ import (
 
 type Fan struct {
 	*A
-
 	Fan *service.Fan
 }
 
 // NewFan returns a fan accessory.
 func NewFan(info Info) *Fan {
-	a := New(info, TypeFan)
+	a := Fan{}
+	a.A = New(info, TypeFan)
 
-	fan := service.NewFan()
-	a.Ss = append(a.Ss, fan.S)
+	a.Fan = service.NewFan()
+	a.AddS(a.Fan.S)
 
-	return &Fan{
-		A:   a,
-		Fan: fan,
-	}
+	return &a
 }

accessory/faucet.go

@@ -6,19 +6,16 @@ import (
 
 type Faucet struct {
 	*A
-
 	Faucet *service.Faucet
 }
 
 // NewFaucet returns an outlet accessory.
 func NewFaucet(info Info) *Faucet {
-	a := New(info, TypeFaucet)
+	a := Faucet{}
+	a.A = New(info, TypeFaucet)
 
-	faucet := service.NewFaucet()
-	a.Ss = append(a.Ss, faucet.S)
+	a.Faucet = service.NewFaucet()
+	a.AddS(a.Faucet.S)
 
-	return &Faucet{
-		A:      a,
-		Faucet: faucet,
-	}
+	return &a
 }

accessory/garage_door_opener.go

@@ -6,19 +6,16 @@ import (
 
 type GarageDoorOpener struct {
 	*A
-
 	GarageDoorOpener *service.GarageDoorOpener
 }
 
 // NewGarageDoorOpener returns a garage door opener accessory.
 func NewGarageDoorOpener(info Info) *GarageDoorOpener {
-	a := New(info, TypeGarageDoorOpener)
+	a := GarageDoorOpener{}
+	a.A = New(info, TypeGarageDoorOpener)
 
-	garage := service.NewGarageDoorOpener()
-	a.Ss = append(a.Ss, garage.S)
+	a.GarageDoorOpener = service.NewGarageDoorOpener()
+	a.AddS(a.GarageDoorOpener.S)
 
-	return &GarageDoorOpener{
-		A:                a,
-		GarageDoorOpener: garage,
-	}
+	return &a
 }

accessory/heater.go

@@ -13,6 +13,7 @@ type Heater struct {
 func NewHeater(info Info) *Heater {
 	a := Heater{}
 	a.A = New(info, TypeHeater)
+
 	a.Heater = service.NewHeater()
 	a.AddS(a.Heater.S)
 

accessory/humidifier.go

@@ -6,19 +6,16 @@ import (
 
 type Humidifier struct {
 	*A
-
 	Humidifier *service.Humidifier
 }
 
 // NewHumidifier returns an outlet accessory.
 func NewHumidifier(info Info) *Humidifier {
-	a := New(info, TypeHumidifier)
+	a := Humidifier{}
+	a.A = New(info, TypeHumidifier)
 
-	h := service.NewHumidifier()
-	a.Ss = append(a.Ss, h.S)
+	a.Humidifier = service.NewHumidifier()
+	a.AddS(a.Humidifier.S)
 
-	return &Humidifier{
-		A:          a,
-		Humidifier: h,
-	}
+	return &a
 }

accessory/lightbulb.go

@@ -11,13 +11,11 @@ type Lightbulb struct {
 
 // NewLightbulb returns an light bulb accessory.
 func NewLightbulb(info Info) *Lightbulb {
-	a := New(info, TypeLightbulb)
+	a := Lightbulb{}
+	a.A = New(info, TypeLightbulb)
 
-	l := service.NewLightbulb()
-	a.AddS(l.S)
+	a.Lightbulb = service.NewLightbulb()
+	a.AddS(a.Lightbulb.S)
 
-	return &Lightbulb{
-		A:         a,
-		Lightbulb: l,
-	}
+	return &a
 }

accessory/motion_sensor.go

@@ -0,0 +1,19 @@
+package accessory
+
+import "github.com/brutella/hap/service"
+
+type MotionSensor struct {
+	*A
+	MotionSensor *service.MotionSensor
+}
+
+// NewMotionSensor returns a motion sensor.
+func NewMotionSensor(info Info) *MotionSensor {
+	a := MotionSensor{}
+	a.A = New(info, TypeSensor)
+
+	a.MotionSensor = service.NewMotionSensor()
+	a.AddS(a.MotionSensor.S)
+
+	return &a
+}

accessory/outlet.go

@@ -6,19 +6,16 @@ import (
 
 type Outlet struct {
 	*A
-
 	Outlet *service.Outlet
 }
 
 // NewOutlet returns an outlet accessory.
 func NewOutlet(info Info) *Outlet {
-	a := New(info, TypeOutlet)
+	a := Outlet{}
+	a.A = New(info, TypeOutlet)
 
-	outlet := service.NewOutlet()
-	a.Ss = append(a.Ss, outlet.S)
+	a.Outlet = service.NewOutlet()
+	a.AddS(a.Outlet.S)
 
-	return &Outlet{
-		A:      a,
-		Outlet: outlet,
-	}
+	return &a
 }

accessory/security_system.go

@@ -6,19 +6,16 @@ import (
 
 type SecuritySystem struct {
 	*A
-
 	SecuritySystem *service.SecuritySystem
 }
 
 // NewSecuritySystem returns a security system accessory.
 func NewSecuritySystem(info Info) *SecuritySystem {
-	a := New(info, TypeSecuritySystem)
+	a := SecuritySystem{}
+	a.A = New(info, TypeSecuritySystem)
 
-	garage := service.NewSecuritySystem()
-	a.Ss = append(a.Ss, garage.S)
+	a.SecuritySystem = service.NewSecuritySystem()
+	a.AddS(a.SecuritySystem.S)
 
-	return &SecuritySystem{
-		A:              a,
-		SecuritySystem: garage,
-	}
+	return &a
 }

accessory/switch.go

@@ -13,6 +13,7 @@ type Switch struct {
 func NewSwitch(info Info) *Switch {
 	a := Switch{}
 	a.A = New(info, TypeSwitch)
+
 	a.Switch = service.NewSwitch()
 	a.AddS(a.Switch.S)
 

accessory/television.go

@@ -14,10 +14,11 @@ type Television struct {
 func NewTelevision(info Info) *Television {
 	a := Television{}
 	a.A = New(info, TypeTelevision)
-	a.Television = service.NewTelevision()
-	a.Speaker = service.NewSpeaker()
 
+	a.Television = service.NewTelevision()
 	a.AddS(a.Television.S)
+
+	a.Speaker = service.NewSpeaker()
 	a.AddS(a.Speaker.S)
 
 	return &a

accessory/thermometer.go

@@ -6,16 +6,15 @@ import (
 
 type Thermometer struct {
 	*A
-
 	TempSensor *service.TemperatureSensor
 }
 
 // NewTemperatureSensor returns a Thermometer which implements model.Thermometer.
 func NewTemperatureSensor(info Info) *Thermometer {
 	a := Thermometer{}
 	a.A = New(info, TypeThermostat)
-	a.TempSensor = service.NewTemperatureSensor()
 
+	a.TempSensor = service.NewTemperatureSensor()
 	a.AddS(a.TempSensor.S)
 
 	return &a

accessory/thermostat.go

@@ -6,16 +6,15 @@ import (
 
 type Thermostat struct {
 	*A
-
 	Thermostat *service.Thermostat
 }
 
 // NewThermostat returns a Thermostat accessory.
 func NewThermostat(info Info) *Thermostat {
 	a := Thermostat{}
 	a.A = New(info, TypeThermostat)
-	a.Thermostat = service.NewThermostat()
 
+	a.Thermostat = service.NewThermostat()
 	a.AddS(a.Thermostat.S)
 
 	return &a

accessory/window.go

@@ -13,6 +13,7 @@ type Window struct {
 func NewWindow(info Info) *Window {
 	a := Window{}
 	a.A = New(info, TypeWindow)
+
 	a.Window = service.NewWindow()
 	a.AddS(a.Window.S)
 

accessory/window_covering.go

@@ -13,6 +13,7 @@ type WindowCovering struct {
 func NewWindowCovering(info Info) *WindowCovering {
 	a := WindowCovering{}
 	a.A = New(info, TypeWindowCovering)
+
 	a.WindowCovering = service.NewWindowCovering()
 	a.AddS(a.WindowCovering.S)