xevion/go-ha
1
0
Fork 0
mirror of https://github.com/Xevion/go-ha.git synced 2025-12-10 18:07:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix panics due to concurrent websocket writes

Browse Source
This commit is contained in:
Lubos Dolezel
2023-02-24 11:49:26 +01:00
parent 8bee96aeff
commit f27cbfb299
21 changed files with 131 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/services/alarm_control_panel.go
View File

@@ -3,14 +3,13 @@ package services
import (
"context"
"github.com/gorilla/websocket"
ws "saml.dev/gome-assistant/internal/websocket"
)
/* Structs */
type AlarmControlPanel struct {
conn *websocket.Conn
conn *ws.WebsocketWriter
ctx context.Context
}
@@ -27,7 +26,7 @@ func (acp AlarmControlPanel) ArmAway(entityId string, serviceData ...map[string]
req.ServiceData = serviceData[0]
}
ws.WriteMessage(req, acp.conn, acp.ctx)
acp.conn.WriteMessage(req, acp.ctx)
}
// Send the alarm the command for arm away.
@@ -41,7 +40,7 @@ func (acp AlarmControlPanel) ArmWithCustomBypass(entityId string, serviceData ..
req.ServiceData = serviceData[0]
}
ws.WriteMessage(req, acp.conn, acp.ctx)
acp.conn.WriteMessage(req, acp.ctx)
}
// Send the alarm the command for arm home.
@@ -55,7 +54,7 @@ func (acp AlarmControlPanel) ArmHome(entityId string, serviceData ...map[string]
req.ServiceData = serviceData[0]
}
ws.WriteMessage(req, acp.conn, acp.ctx)
acp.conn.WriteMessage(req, acp.ctx)
}
// Send the alarm the command for arm night.
@@ -69,7 +68,7 @@ func (acp AlarmControlPanel) ArmNight(entityId string, serviceData ...map[string
req.ServiceData = serviceData[0]
}
ws.WriteMessage(req, acp.conn, acp.ctx)
acp.conn.WriteMessage(req, acp.ctx)
}
// Send the alarm the command for arm vacation.
@@ -83,7 +82,7 @@ func (acp AlarmControlPanel) ArmVacation(entityId string, serviceData ...map[str
req.ServiceData = serviceData[0]
}
ws.WriteMessage(req, acp.conn, acp.ctx)
acp.conn.WriteMessage(req, acp.ctx)
}
// Send the alarm the command for disarm.
@@ -97,7 +96,7 @@ func (acp AlarmControlPanel) Disarm(entityId string, serviceData ...map[string]a
req.ServiceData = serviceData[0]
}
ws.WriteMessage(req, acp.conn, acp.ctx)
acp.conn.WriteMessage(req, acp.ctx)
}
// Send the alarm the command for trigger.
@@ -111,5 +110,5 @@ func (acp AlarmControlPanel) Trigger(entityId string, serviceData ...map[string]
req.ServiceData = serviceData[0]
}
ws.WriteMessage(req, acp.conn, acp.ctx)
acp.conn.WriteMessage(req, acp.ctx)
}