Implement Disconnect

Author: mickel8

client.go

@@ -11,8 +11,9 @@ import (
 )
 
 var (
-	ErrFailedToConnect  = errors.New("Failed to connect")
-	ErrNoLocationHeader = errors.New("No location header in the response")
+	ErrFailedToConnect    = errors.New("Failed to connect")
+	ErrNoLocationHeader   = errors.New("No location header in the response")
+	ErrFailedToDisconnect = errors.New("Failed to remove server resource")
 )
 
 type Client struct {
@@ -87,6 +88,7 @@ func (client *Client) Connect() error {
 	if err != nil {
 		return err
 	}
+	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
@@ -109,6 +111,29 @@ func (client *Client) Connect() error {
 	return nil
 }
 
-func (client *Client) Disconnect() {
+func (client *Client) Disconnect() error {
+	err := client.Pc.Close()
+	if err != nil {
+		// What should we do when Close returns an error?
+		// Should this ever happen?
+		return err
+	}
+
+	req, err := http.NewRequest("DELETE", client.location, nil)
+	if err != nil {
+		return ErrFailedToDisconnect
+	}
 
+	httpClient := &http.Client{}
+	resp, err := httpClient.Do(req)
+	if err != nil {
+		return ErrFailedToDisconnect
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return ErrFailedToDisconnect
+	}
+
+	return nil
 }

client_test.go

@@ -19,61 +19,101 @@ func TestNew(t *testing.T) {
 }
 
 func TestConnect(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "POST" {
-			panic(fmt.Sprintf("Invalid request method. Expected POST, got: %s\n", r.Method))
-		}
+	ts := newWHEPMockServer()
+	defer ts.Close()
 
-		contentType := r.Header.Get("Content-Type")
-		if contentType != "application/SDP" {
-			panic(fmt.Sprintf("Content-Type has to be application/SDP, got: %s\n", contentType))
-		}
+	client, err := New(ts.URL, webrtc.Configuration{})
+	if err != nil {
+		t.Fatal(err)
+	}
 
-		body, err := io.ReadAll(r.Body)
-		if err != nil {
-			panic(err)
-		}
+	err = client.Connect()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
 
-		resourceId := generateResourceId(8)
-		pc, err := webrtc.NewPeerConnection(webrtc.Configuration{})
-		if err != nil {
-			panic(err)
-		}
+func TestDisconnect(t *testing.T) {
+	ts := newWHEPMockServer()
+	defer ts.Close()
 
-		err = pc.SetRemoteDescription(webrtc.SessionDescription{Type: webrtc.SDPTypeOffer, SDP: string(body)})
-		if err != nil {
-			panic(err)
-		}
+	client, err := New(ts.URL, webrtc.Configuration{})
+	if err != nil {
+		t.Fatal(err)
+	}
 
-		answer, err := pc.CreateAnswer(nil)
-		if err != nil {
-			panic(err)
-		}
+	err = client.Connect()
+	if err != nil {
+		t.Fatal(err)
+	}
 
-		w.Header().Add("location", "http://"+r.Host+"/resource/"+resourceId)
-		w.Header().Add("Content-Type", "application/SDP")
-		w.Header().Add("Status Code", "201")
-		w.WriteHeader(http.StatusCreated)
-		sent, err := w.Write([]byte(answer.SDP))
-		if err != nil {
-			panic(err)
-		}
+	err = client.Disconnect()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
 
-		if sent != len(answer.SDP) {
-			panic(fmt.Sprintf("Could not write entire answer in response. Answer length: %v, wrote: %v", len(answer.SDP), sent))
+func newWHEPMockServer() *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == "POST" {
+			handleSDPOfferRequest(w, r)
+		} else if r.Method == "DELETE" {
+			handleTerminateRequest(w, r)
 		}
 	}))
-	defer ts.Close()
+}
 
-	client, err := New(ts.URL, webrtc.Configuration{})
+func handleSDPOfferRequest(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		panic(fmt.Sprintf("SDP offer has to be a POST request, got: %s\n", r.Method))
+	}
+
+	contentType := r.Header.Get("Content-Type")
+	if contentType != "application/SDP" {
+		panic(fmt.Sprintf("Content-Type has to be application/SDP, got: %s\n", contentType))
+	}
+
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
-		t.Fatal(err)
+		panic(err)
 	}
 
-	err = client.Connect()
+	resourceId := generateResourceId(8)
+	pc, err := webrtc.NewPeerConnection(webrtc.Configuration{})
 	if err != nil {
-		t.Fatal(err)
+		panic(err)
 	}
+
+	err = pc.SetRemoteDescription(webrtc.SessionDescription{Type: webrtc.SDPTypeOffer, SDP: string(body)})
+	if err != nil {
+		panic(err)
+	}
+
+	answer, err := pc.CreateAnswer(nil)
+	if err != nil {
+		panic(err)
+	}
+
+	w.Header().Add("location", "http://"+r.Host+"/resource/"+resourceId)
+	w.Header().Add("Content-Type", "application/SDP")
+	w.Header().Add("Status Code", "201")
+	w.WriteHeader(http.StatusCreated)
+	sent, err := w.Write([]byte(answer.SDP))
+	if err != nil {
+		panic(err)
+	}
+
+	if sent != len(answer.SDP) {
+		panic(fmt.Sprintf("Could not write entire answer in response. Answer length: %v, wrote: %v", len(answer.SDP), sent))
+	}
+}
+
+func handleTerminateRequest(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "DELETE" {
+		panic(fmt.Sprintf("Terminate session has to be a DELETE request, got: %s\n", r.Method))
+	}
+
+	w.WriteHeader(http.StatusOK)
 }
 
 func generateResourceId(n int) string {