Merge 57fbee1490 into 8527b1eff1

ui/src/components/JigglerSetting.tsx

@@ -30,7 +30,7 @@ export function JigglerSetting({
     },
   );
 
-  const { send } = useJsonRpc();
+  const [send] = useJsonRpc();
   const [timezones, setTimezones] = useState<string[]>([]);
 
   useEffect(() => {

webrtc.go

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