Refactoring webrtc sync handler

cmd/webrtc/webrtc.go

@@ -15,11 +15,6 @@ import (
 	"net/http"
 )
 
-type jsonSdp struct {
-	Type string `json:"type"`
-	Sdp  string `json:"sdp"`
-}
-
 func Init() {
 	var cfg struct {
 		Mod struct {
@@ -145,6 +140,12 @@ func asyncHandler(tr *api.Transport, msg *api.Message) error {
 	return nil
 }
 
+type SDP struct {
+	Type string `json:"type"`
+	Sdp  string `json:"sdp"`
+}
+
+// syncHandler
 func syncHandler(w http.ResponseWriter, r *http.Request) {
 	url := r.URL.Query().Get("src")
 	stream := streams.Get(url)
@@ -152,74 +153,52 @@ func syncHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	mediaType, err := DetermineMediaType(r)
+	var offer string
-	if err != nil {
+
-		log.Error().Err(err).Caller().Msg("DetermineMediaType")
+	ct := r.Header.Get("Content-Type")
-		return
+	if ct != "" {
+		ct, _, _ = mime.ParseMediaType(ct)
 	}
 
-	// get offer
+	if ct == "application/json" {
+		var v SDP
+		if err := json.NewDecoder(r.Body).Decode(&v); err != nil {
+			log.Error().Err(err).Caller().Send()
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+		offer = v.Sdp
+	} else {
 		body, err := io.ReadAll(r.Body)
 		if err != nil {
-		log.Error().Err(err).Caller().Msg("ioutil.ReadAll")
+			log.Error().Err(err).Caller().Send()
+			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-
+		offer = string(body)
-	offer, err := DeserializeOffer(mediaType, body)
-	if err != nil {
-		log.Error().Err(err).Caller().Msg("DeserializeOffer")
-		return
 	}
 
 	answer, err := ExchangeSDP(stream, offer, r.UserAgent())
 	if err != nil {
-		log.Error().Err(err).Caller().Msg("ExchangeSDP")
+		log.Error().Err(err).Caller().Send()
-		return
+		http.Error(w, err.Error(), http.StatusInternalServerError)
-	}
-
-	response, err := SerializeAnswer(mediaType, answer)
-	if err != nil {
-		log.Error().Err(err).Caller().Msg("SerializeAnswer")
 		return
 	}
 
 	// send SDP to client
-	if _, err = w.Write(response); err != nil {
+	if ct == "application/json" {
-		log.Error().Err(err).Caller().Msg("w.Write")
+		w.Header().Set("Content-Type", ct)
-	}
-}
 
-func DetermineMediaType(r *http.Request) (mediaType string, err error) {
+		v := SDP{Sdp: answer, Type: "answer"}
-	contentType := r.Header.Get("Content-Type")
+		if err = json.NewEncoder(w).Encode(v); err != nil {
-	if contentType != "" {
+			log.Error().Err(err).Caller().Send()
-		mediaType, _, err = mime.ParseMediaType(contentType)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
-		if err != nil {
-			log.Error().Err(err).Caller().Msg("mime.ParseMediaType")
-			return
 		}
 	} else {
-		mediaType = "text/plain"
+		if _, err = w.Write([]byte(answer)); err != nil {
+			log.Error().Err(err).Caller().Send()
 		}
-	return
-}
-
-func DeserializeOffer(mediaType string, body []byte) (offer string, err error) {
-	switch mediaType {
-	case "application/json":
-		var jsonOffer jsonSdp
-		err = json.Unmarshal(body, &jsonOffer)
-		if err != nil {
-			log.Error().Err(err).Caller().Msg("json.Unmarshal")
-			return
 	}
-
-		offer = jsonOffer.Sdp
-		break
-	default:
-		offer = string(body)
-		break
-	}
-	return
 }
 
 func ExchangeSDP(
@@ -274,23 +253,3 @@ func ExchangeSDP(
 
 	return
 }
-
-func SerializeAnswer(mediaType string, answer string) (response []byte, err error) {
-	switch mediaType {
-	case "application/json":
-		jsonAnswer := jsonSdp{
-			Sdp:  answer,
-			Type: "answer",
-		}
-		response, err = json.Marshal(jsonAnswer)
-		if err != nil {
-			log.Error().Err(err).Caller().Msg("json.Marshal")
-			return
-		}
-		break
-	default:
-		response = []byte(answer)
-		break
-	}
-	return
-}