Merge pull request #9 from nabto/signaling-event-handler

change event handler interface

Author: Quarken

Demo/Demo/ViewController.swift

@@ -26,6 +26,7 @@ class ViewController: UIViewController {
     // Nabto Signaling
     var signalingClient: SignalingClient? = nil
     var messageTransport: MessageTransport? = nil
+    var signalingEventHandler: SignalingEventHandler? = nil
     let signer = JWTMessageSigner(sharedSecret: sharedSecret, keyId: "default")
 
     func initPeerConnectionFactory() {
@@ -93,7 +94,7 @@ class ViewController: UIViewController {
         container.layoutIfNeeded()
     }
 
-    private func setupPeerConnection(_ iceServers: [SignalingIceServer]) {
+    private func setupPeerConnection(_ iceServers: [SignalingIceServer]) async {
         let constraints = RTCMediaConstraints(mandatoryConstraints: nil, optionalConstraints: nil)
         let config = RTCConfiguration()
         config.iceServers = iceServers.map { iceServer in
@@ -106,6 +107,8 @@ class ViewController: UIViewController {
 
         peerConnection = factory.peerConnection(with: config, constraints: constraints, delegate: self)
         perfectNegotiation = PerfectNegotiation(peerConnection: peerConnection, messageTransport: messageTransport!)
+        signalingEventHandler = SignalingEventHandler(peerConnection: peerConnection, client: signalingClient!)
+        await signalingClient?.addObserver(signalingEventHandler!)
     }
 }
 
@@ -119,7 +122,7 @@ extension ViewController: MessageTransportObserver {
     }
 
     func messageTransport(_ transport: any MessageTransport, didFinishSetup iceServers: [SignalingIceServer]) async {
-        setupPeerConnection(iceServers)
+        await setupPeerConnection(iceServers)
     }
 }
 

Sources/NabtoWebRTCUtilPerfectNegotiation/SignalingEventHandler.swift

@@ -10,12 +10,12 @@ public class SignalingEventHandler {
     weak var peerConnection: RTCPeerConnection?
     weak var client: SignalingClient?
 
-    init(peerConnection: RTCPeerConnection, client: SignalingClient) {
+    public init(peerConnection: RTCPeerConnection, client: SignalingClient) {
         self.peerConnection = peerConnection
         self.client = client
     }
 
-    func handlePeerConnectionStateChange() async {
+    public func handlePeerConnectionStateChange() async {
         guard let peerConnection = peerConnection else {
             return
         }
@@ -28,8 +28,31 @@ public class SignalingEventHandler {
             peerConnection.restartIce()
         }
     }
-    
-    func handleSignalingConnectionReconnect() {
+
+    private func handleSignalingConnectionReconnect() {
         peerConnection?.restartIce()
     }
 }
+
+
+extension SignalingEventHandler: SignalingClientObserver {
+    public func signalingClient(_ client: any SignalingClient, didConnectionStateChange connectionState: SignalingConnectionState) async {
+        
+    }
+
+    public func signalingClient(_ client: any SignalingClient, didGetMessage message: JSONValue) async {
+
+    }
+
+    public func signalingClient(_ client: any SignalingClient, didChannelStateChange channelState: SignalingChannelState) async {
+        
+    }
+
+    public func signalingClient(_ client: any SignalingClient, didError error: any Error) async {
+        
+    }
+
+    public func signalingClientDidConnectionReconnect(_ client: any SignalingClient) async {
+        self.handleSignalingConnectionReconnect()
+    }
+}