nikdoof/hapz2m
1
0
Fork 0
mirror of https://github.com/nikdoof/hapz2m.git synced 2026-01-30 18:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable TCP keepalives explicitly

Browse Source 
It looks like Go has adopted 15s TCP keepalives as a default for _all_
TCP connections, which is quite dumb if you ask me.
https://github.com/golang/go/issues/48622

For the HAP server's side, it degrades iOS battery life significantly by
waking the device every 15s to respond to these packets. In the case as
a normal MQTT client, it increases traffic on top of the 60s keepalive
we've already set at the application layer. In both cases, the solution
is to just explicitly disable TCP keepalives.

Upgrade hap to the latest version that contains the fix brutella/hap#36.
This commit is contained in:
Darell Tan
2023-08-09 01:38:50 +08:00
parent 4eac1ba2a9
commit fe5d0ce14c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridge.go
View File

@@ -15,6 +15,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"log" "log"
"net"
"net/http" "net/http"
"reflect" "reflect"
"strings" "strings"
@@ -163,6 +164,7 @@ func (br *Bridge) ConnectMQTT() error {
SetUsername(br.Username). SetUsername(br.Username).
SetPassword(br.Password). SetPassword(br.Password).
SetClientID("hap-z2m"). SetClientID("hap-z2m").
SetDialer(&net.Dialer{KeepAlive: -1}).
SetKeepAlive(60 * time.Second). SetKeepAlive(60 * time.Second).
SetPingTimeout(2 * time.Second). SetPingTimeout(2 * time.Second).
SetConnectRetry(true) SetConnectRetry(true)

2
go.mod
View File

@@ -3,7 +3,7 @@ module hapz2m
go 1.20 go 1.20
require ( require (
github.com/brutella/hap v0.0.27-0.20230522083132-4ea1de40019c github.com/brutella/hap v0.0.27-0.20230808074808-04622f35422f
github.com/eclipse/paho.mqtt.golang v1.4.2 github.com/eclipse/paho.mqtt.golang v1.4.2
) )

4
go.sum
View File

@@ -1,7 +1,7 @@
github.com/brutella/dnssd v1.2.7 h1:Uq2NgLzlUz5JWIzcug9xRU6v0UApHrlxbsREA5B1RrY= github.com/brutella/dnssd v1.2.7 h1:Uq2NgLzlUz5JWIzcug9xRU6v0UApHrlxbsREA5B1RrY=
github.com/brutella/dnssd v1.2.7/go.mod h1:JoW2sJUrmVIef25G6lrLj7HS6Xdwh6q8WUIvMkkBYXs= github.com/brutella/dnssd v1.2.7/go.mod h1:JoW2sJUrmVIef25G6lrLj7HS6Xdwh6q8WUIvMkkBYXs=
github.com/brutella/hap v0.0.27-0.20230522083132-4ea1de40019c h1:gLVgwrHzMZUn0d1SfAFvsCfHWF12pstyS1erpUE/GZ0= github.com/brutella/hap v0.0.27-0.20230808074808-04622f35422f h1:VTlmSBBN6+H1WojP55rLxvpivr/Fdm/0PmmvIk5dVF8=
github.com/brutella/hap v0.0.27-0.20230522083132-4ea1de40019c/go.mod h1:ilKzdnapk5SjRrhedSW1+IMlMCt5P4hR91jlIap33x4= github.com/brutella/hap v0.0.27-0.20230808074808-04622f35422f/go.mod h1:ilKzdnapk5SjRrhedSW1+IMlMCt5P4hR91jlIap33x4=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4= github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4=