From a3d2549028b53357b9bba30e8f5577a4ee772cd1 Mon Sep 17 00:00:00 2001 From: Sergy Stepanov Date: Sat, 31 Jul 2021 12:33:25 +0300 Subject: [PATCH] Remove old is_mobile init param --- pkg/cws/api/coordinator.go | 1 - pkg/webrtc/webrtc.go | 2 +- pkg/worker/internalhandlers.go | 15 +-------------- web/js/network/rtcp.js | 10 ++-------- web/js/network/socket.js | 1 - 5 files changed, 4 insertions(+), 25 deletions(-) diff --git a/pkg/cws/api/coordinator.go b/pkg/cws/api/coordinator.go index d2688cff..58a7780b 100644 --- a/pkg/cws/api/coordinator.go +++ b/pkg/cws/api/coordinator.go @@ -25,7 +25,6 @@ const ( type GameStartRequest struct { GameName string `json:"game_name"` - IsMobile bool `json:"is_mobile"` } func (packet *GameStartRequest) From(data string) error { return from(packet, data) } diff --git a/pkg/webrtc/webrtc.go b/pkg/webrtc/webrtc.go index bbde2c14..40a59873 100644 --- a/pkg/webrtc/webrtc.go +++ b/pkg/webrtc/webrtc.go @@ -100,7 +100,7 @@ func (w *WebRTC) WithConfig(conf webrtcConfig.Config) *WebRTC { } // StartClient start webrtc -func (w *WebRTC) StartClient(isMobile bool, iceCB OnIceCallback) (string, error) { +func (w *WebRTC) StartClient(iceCB OnIceCallback) (string, error) { defer func() { if err := recover(); err != nil { log.Println(err) diff --git a/pkg/worker/internalhandlers.go b/pkg/worker/internalhandlers.go index 9583276e..eb17c6a1 100644 --- a/pkg/worker/internalhandlers.go +++ b/pkg/worker/internalhandlers.go @@ -1,7 +1,6 @@ package worker import ( - "encoding/json" "log" "strconv" @@ -46,17 +45,8 @@ func (h *Handler) handleInitWebrtc() cws.PacketHandler { peerconnection := webrtc.NewWebRTC().WithConfig( webrtcConfig.Config{Encoder: h.cfg.Encoder, Webrtc: h.cfg.Webrtc}, ) - var initPacket struct { - IsMobile bool `json:"is_mobile"` - } - err := json.Unmarshal([]byte(resp.Data), &initPacket) - if err != nil { - log.Println("Error: Cannot decode json:", err) - return cws.EmptyPacket - } localSession, err := peerconnection.StartClient( - initPacket.IsMobile, // send back candidate string to browser func(cd string) { h.oClient.Send(api.IceCandidatePacket(cd, resp.SessionID), nil) }, ) @@ -76,10 +66,7 @@ func (h *Handler) handleInitWebrtc() cws.PacketHandler { return cws.EmptyPacket } - return cws.WSPacket{ - ID: "offer", - Data: localSession, - } + return cws.WSPacket{ID: "offer", Data: localSession} } } diff --git a/web/js/network/rtcp.js b/web/js/network/rtcp.js index 594e4d83..6dd48274 100644 --- a/web/js/network/rtcp.js +++ b/web/js/network/rtcp.js @@ -45,10 +45,7 @@ const rtcp = (() => { mediaStream.addTrack(event.track); } - socket.send({ - 'id': 'init_webrtc', - 'data': JSON.stringify({'is_mobile': env.isMobileDevice()}), - }); + socket.send({'id': 'init_webrtc'}); }; async function addVoiceStream(connection) { @@ -67,10 +64,7 @@ const rtcp = (() => { log.info(e) } finally { - socket.send({ - 'id': 'init_webrtc', - 'data': JSON.stringify({'is_mobile': env.isMobileDevice()}), - }); + socket.send({'id': 'init_webrtc'}); } } diff --git a/web/js/network/socket.js b/web/js/network/socket.js index afc72519..a11ffe1d 100644 --- a/web/js/network/socket.js +++ b/web/js/network/socket.js @@ -125,7 +125,6 @@ const socket = (() => { "id": "start", "data": JSON.stringify({ "game_name": gameName, - "is_mobile": isMobile }), "room_id": roomId != null ? roomId : '', "player_index": playerIndex