Add HomeKit QR code to WebUI #1138 by @mnakada

internal/homekit/homekit.go

@@ -65,10 +65,12 @@ func Init() {
 
 		deviceID := calcDeviceID(conf.DeviceID, id) // random MAC-address
 		name := calcName(conf.Name, deviceID)
+		setupID := calcSetupID(id)
 
 		srv := &server{
 			stream:   id,
 			pairings: conf.Pairings,
+			setupID:  setupID,
 		}
 
 		srv.hap = &hap.Server{
@@ -90,7 +92,7 @@ func Init() {
 				hap.TXTStateNumber:  "1",
 				hap.TXTStatusFlags:  hap.StatusNotPaired,
 				hap.TXTCategory:     calcCategoryID(conf.CategoryID),
-				hap.TXTSetupHash:    srv.hap.SetupHash(),
+				hap.TXTSetupHash:    hap.SetupHash(setupID, deviceID),
 			},
 		}
 		entries = append(entries, srv.mdns)

internal/homekit/server.go

@@ -40,20 +40,29 @@ type server struct {
 	accessory *hap.Accessory // HAP accessory
 	consumer  *homekit.Consumer
 	proxyURL  string
+	setupID   string
 	stream    string // stream name from YAML
 }
 
 func (s *server) MarshalJSON() ([]byte, error) {
 	v := struct {
-		Name     string `json:"name"`
-		DeviceID string `json:"device_id"`
-		Paired   int    `json:"paired"`
-		Conns    []any  `json:"connections"`
+		Name       string `json:"name"`
+		DeviceID   string `json:"device_id"`
+		Paired     int    `json:"paired,omitempty"`
+		CategoryID string `json:"category_id,omitempty"`
+		SetupCode  string `json:"setup_code,omitempty"`
+		SetupID    string `json:"setup_id,omitempty"`
+		Conns      []any  `json:"connections,omitempty"`
 	}{
-		Name:     s.mdns.Name,
-		DeviceID: s.mdns.Info[hap.TXTDeviceID],
-		Paired:   len(s.pairings),
-		Conns:    s.conns,
+		Name:       s.mdns.Name,
+		DeviceID:   s.mdns.Info[hap.TXTDeviceID],
+		CategoryID: s.mdns.Info[hap.TXTCategory],
+		Paired:     len(s.pairings),
+		Conns:      s.conns,
+	}
+	if v.Paired == 0 {
+		v.SetupCode = s.hap.Pin
+		v.SetupID = s.setupID
 	}
 	return json.Marshal(v)
 }
@@ -377,6 +386,11 @@ func calcDevicePrivate(private, seed string) []byte {
 	return ed25519.NewKeyFromSeed(b[:ed25519.SeedSize])
 }
 
+func calcSetupID(seed string) string {
+	b := sha512.Sum512([]byte(seed))
+	return fmt.Sprintf("%02X%02X", b[44], b[46])
+}
+
 func calcCategoryID(categoryID string) string {
 	switch categoryID {
 	case "bridge":