Fix for issue 325. Ensure that rpc messages get processed sequentially and avoid phantom and repeated key presses

This commit is contained in:
Alex Ballas 2025-08-21 21:00:57 +03:00
parent 8527b1eff1
commit df6c97263b
1 changed files with 14 additions and 1 deletions

View File

@ -23,6 +23,7 @@ type Session struct {
HidChannel *webrtc.DataChannel HidChannel *webrtc.DataChannel
DiskChannel *webrtc.DataChannel DiskChannel *webrtc.DataChannel
shouldUmountVirtualMedia bool shouldUmountVirtualMedia bool
rpcQueue chan webrtc.DataChannelMessage
} }
type SessionConfig struct { type SessionConfig struct {
@ -105,6 +106,12 @@ func newSession(config SessionConfig) (*Session, error) {
return nil, err return nil, err
} }
session := &Session{peerConnection: peerConnection} session := &Session{peerConnection: peerConnection}
session.rpcQueue = make(chan webrtc.DataChannelMessage, 256)
go func() {
for msg := range session.rpcQueue {
onRPCMessage(msg, session)
}
}()
peerConnection.OnDataChannel(func(d *webrtc.DataChannel) { peerConnection.OnDataChannel(func(d *webrtc.DataChannel) {
scopedLogger.Info().Str("label", d.Label()).Uint16("id", *d.ID()).Msg("New DataChannel") scopedLogger.Info().Str("label", d.Label()).Uint16("id", *d.ID()).Msg("New DataChannel")
@ -112,7 +119,8 @@ func newSession(config SessionConfig) (*Session, error) {
case "rpc": case "rpc":
session.RPCChannel = d session.RPCChannel = d
d.OnMessage(func(msg webrtc.DataChannelMessage) { d.OnMessage(func(msg webrtc.DataChannelMessage) {
go onRPCMessage(msg, session) // Enqueue to ensure ordered processing
session.rpcQueue <- msg
}) })
triggerOTAStateUpdate() triggerOTAStateUpdate()
triggerVideoStateUpdate() triggerVideoStateUpdate()
@ -186,6 +194,11 @@ func newSession(config SessionConfig) (*Session, error) {
if session == currentSession { if session == currentSession {
currentSession = nil currentSession = nil
} }
// Stop RPC processor
if session.rpcQueue != nil {
close(session.rpcQueue)
session.rpcQueue = nil
}
if session.shouldUmountVirtualMedia { if session.shouldUmountVirtualMedia {
err := rpcUnmountImage() err := rpcUnmountImage()
scopedLogger.Warn().Err(err).Msg("unmount image failed on connection close") scopedLogger.Warn().Err(err).Msg("unmount image failed on connection close")