refactor to a single peer, refuse via 409 on handshake (#1233)

tests/test_api_stream.py

@@ -156,7 +156,16 @@ def test_delete_stream_video(test_client : TestClient) -> None:
 		'Content-Type': 'application/sdp'
 	})
 
-	assert rtc_store.get_peers(session_id)
+	assert rtc_store.has_peer(session_id) is True
+
+	post_response = test_client.post('/stream', content = sdp_offer, headers =
+	{
+		'Authorization': 'Bearer ' + access_token,
+		'Content-Type': 'application/sdp'
+	})
+
+	assert post_response.status_code == 409
+	assert rtc_store.has_peer(session_id) is True
 
 	delete_response = test_client.delete('/stream', headers =
 	{
@@ -164,4 +173,12 @@ def test_delete_stream_video(test_client : TestClient) -> None:
 	})
 
 	assert delete_response.status_code == 200
-	assert rtc_store.get_peers(session_id) is None
+	assert rtc_store.has_peer(session_id) is False
+
+	post_response = test_client.post('/stream', content = 'invalid', headers =
+	{
+		'Authorization': 'Bearer ' + access_token,
+		'Content-Type': 'application/sdp'
+	})
+
+	assert post_response.status_code == 404

tests/test_api_stream_manager.py

@@ -114,18 +114,18 @@ def test_process_video(video_codec : VideoCodec, session_id : str) -> None:
 	assert 'a=recvonly' in sdp_answer
 	assert 'a=sendonly' in sdp_answer
 
-	for peer in rtc_store.get_peers(session_id):
-		sender_bitrate = peer.get('sender_bitrate')
-		receiver_bitrate = peer.get('receiver_bitrate')
+	rtc_peer = rtc_store.get_peer(session_id)
+	sender_bitrate = rtc_peer.get('sender_bitrate')
+	receiver_bitrate = rtc_peer.get('receiver_bitrate')
 
-		assert sender_bitrate.value == 0
-		assert receiver_bitrate.value == 8000
+	assert sender_bitrate.value == 0
+	assert receiver_bitrate.value == 8000
 
-		rtc.handle_sender_bitrate(0, 8000000, ctypes.addressof(sender_bitrate))
-		assert sender_bitrate.value == 8000
+	rtc.handle_sender_bitrate(0, 8000000, ctypes.addressof(sender_bitrate))
+	assert sender_bitrate.value == 8000
 
-		rtc.adapt_receiver_bitrate(peer, 4000)
-		assert receiver_bitrate.value == 4000
+	rtc.adapt_receiver_bitrate(rtc_peer, 4000)
+	assert receiver_bitrate.value == 4000
 
 
 @pytest.mark.parametrize('video_codec, payload_type, session_id', [ ('av1', 35, 'test-run-peer-loop-av1'), ('vp8', 96, 'test-run-peer-loop-vp8') ])
@@ -146,10 +146,9 @@ def test_run_peer_loop(video_codec : VideoCodec, payload_type : int, session_id
 		'receiver_bitrate': ctypes.c_uint(0)
 	}
 
-	rtc_store.init_peers(session_id)
-	rtc_store.get_peers(session_id).append(rtc_peer)
+	rtc_store.set_peer(session_id, rtc_peer)
 
-	assert rtc_store.has_peers(session_id) is True
+	assert rtc_store.has_peer(session_id) is True
 
 	with patch('facefusion.apis.stream_manager.receive_video_frames'):
 		with patch('facefusion.apis.stream_manager.run_video_encode_loop'):
@@ -157,7 +156,7 @@ def test_run_peer_loop(video_codec : VideoCodec, payload_type : int, session_id
 			thread.start()
 			thread.join(timeout = 5.0)
 
-	assert rtc_store.has_peers(session_id) is False
+	assert rtc_store.has_peer(session_id) is False
 
 
 def test_destroy_stream() -> None:
@@ -177,10 +176,9 @@ def test_destroy_stream() -> None:
 	}
 	session_id = 'test-destroy-stream'
 
-	rtc_store.init_peers(session_id)
-	rtc_store.get_peers(session_id).append(rtc_peer)
+	rtc_store.set_peer(session_id, rtc_peer)
 
 	assert destroy_stream(session_id) is True
-	assert rtc_store.get_peers(session_id) is None
+	assert rtc_store.get_peer(session_id) is None
 
 	assert destroy_stream(session_id) is False

tests/test_rtc.py

@@ -1,11 +1,10 @@
 import ctypes
-from typing import List
 
 import pytest
 
 from facefusion import state_manager
 from facefusion.libraries import datachannel as datachannel_module, opus as opus_module, vpx as vpx_module
-from facefusion.rtc import adapt_receiver_bitrate, add_audio_track, add_video_track, create_peer_connection, create_sdp_answer, create_sdp_offer, delete_peers, get_payload_type, handle_sender_bitrate, send_audio, send_video, set_remote_description, wire_sender_bitrate
+from facefusion.rtc import adapt_receiver_bitrate, add_audio_track, add_video_track, create_peer_connection, create_sdp_answer, create_sdp_offer, delete_peer, get_payload_type, handle_sender_bitrate, send_audio, send_video, set_remote_description, wire_sender_bitrate
 from facefusion.types import RtcPeer, VideoCodec
 
 
@@ -116,25 +115,23 @@ def test_send_audio() -> None:
 	datachannel_library.rtcDeletePeerConnection(peer_connection)
 
 
-def test_delete_peers() -> None:
+def test_delete_peer() -> None:
 	datachannel_library = datachannel_module.create_static_library()
 	peer_connection = create_peer_connection()
-	rtc_peers : List[RtcPeer] =\
-	[
+	rtc_peer : RtcPeer =\
+	{
+		'peer_connection': peer_connection,
+		'video':
 		{
-			'peer_connection': peer_connection,
-			'video':
-			{
-				'sender_track': 0,
-				'receiver_track': 0,
-				'codec': 'vp8'
-			},
-			'sender_bitrate': ctypes.c_uint(0),
-			'receiver_bitrate': ctypes.c_uint(0)
-		}
-	]
+			'sender_track': 0,
+			'receiver_track': 0,
+			'codec': 'vp8'
+		},
+		'sender_bitrate': ctypes.c_uint(0),
+		'receiver_bitrate': ctypes.c_uint(0)
+	}
 
-	delete_peers(rtc_peers)
+	delete_peer(rtc_peer)
 
 	assert datachannel_library.rtcDeletePeerConnection(peer_connection) == -1