HeadlessTransport: Callback on track

Author: nevyn

Packages/AlloDataChannel

@@ -457,13 +457,6 @@ class UIWebRTCTransport: NSObject, Transport, LKRTCPeerConnectionDelegate, LKRTC
             micTrack?.isEnabled = newValue
         }
     }
-    
-    var outgoingStreamSender: LKRTCRtpSender?
-    public func addOutgoing(stream: LKRTCMediaStream)
-    {
-        outgoingStreamSender = peer.add(stream.audioTracks[0], streamIds: [stream.streamId])
-        print("Forwarding audio stream with sender \(outgoingStreamSender!)")
-    }
 }
 
 // MARK: - Wrapper classes
@@ -473,10 +466,10 @@ private class ClientDataChannel: DataChannel {
 
     init(channel: LKRTCDataChannel) {
         self.channel = channel
-        self.label = DataChannelLabel(rawValue: channel.label)!
+        self.alloLabel = DataChannelLabel(rawValue: channel.label)!
     }
 
-    var label: DataChannelLabel
+    var alloLabel: DataChannelLabel
     var isOpen: Bool { (channel?.readyState ?? .closed) == .open }
 }
 extension LKRTCDataChannel {
@@ -500,7 +493,7 @@ private class ClientMediaStream: MediaStream {
         self.stream = stream
     }
 
-    var streamId: String { stream.streamId }
+    var mediaId: String { stream.streamId }
 }
 extension LKRTCMediaStream {
     static var wrapperKey: Void = ()

Sources/alloclient/UIWebRTCTransport.swift

@@ -16,7 +16,7 @@ public class HeadlessWebRTCTransport: Transport
     public private(set) var clientId: ClientId?
 
     private var peer: AlloWebRTCPeer
-    private var channels: [String: ServerDataChannel] = [:] // track which channels are created
+    private var channels: [String: AlloWebRTCPeer.DataChannel] = [:] // track which channels are created
     private var connectionStatus: ConnectionStatus
     private var cancellables = Set<AnyCancellable>()
 
@@ -36,6 +36,12 @@ public class HeadlessWebRTCTransport: Transport
             }
         }.store(in: &cancellables)
 
+        peer.$tracks.sinkChanges(added: { track in
+            self.delegate?.transport(self, didReceiveMediaStream: track)
+        }, removed: { track in
+            // TODO: notify track removals too
+        }).store(in: &cancellables)
+        
         // TODO: subscribe to more callbacks and match UIWebRTCTransport's behavior
         // TODO: Populate connectionStatus
         // TODO: Manage renegotiation
@@ -51,6 +57,8 @@ public class HeadlessWebRTCTransport: Transport
     {
         Task { @MainActor in self.connectionStatus.signalling = .connecting }
 
+        
+        
         try peer.lockLocalDescription(type: .offer)
         let offerSdp = try peer.createOffer()
         print("Generated Offer: \(offerSdp)")
@@ -104,26 +112,26 @@ public class HeadlessWebRTCTransport: Transport
     {
         peer.close()
         clientId = nil
+        cancellables.forEach { $0.cancel() }
     }
 
     public func createDataChannel(label: DataChannelLabel, reliable: Bool) -> DataChannel?
     {
-        let achannel = try! peer.createDataChannel(label: label.rawValue, reliable: reliable, streamId: UInt16(label.channelId), negotiated: true)
-        let channel = ServerDataChannel(label: label, channel: achannel)
+        let channel = try! peer.createDataChannel(label: label.rawValue, reliable: reliable, streamId: UInt16(label.channelId), negotiated: true)
         channels[label.rawValue] = channel
 
-        achannel.$lastMessage.sink { [weak self] message in
+        channel.$lastMessage.sink { [weak self] message in
             guard let self = self, let message = message else { return }
             self.delegate?.transport(self, didReceiveData: message, on: channel)
         }.store(in: &cancellables)
-            
+        
         return channel
     }
 
     public func send(data: Data, on channelLabel: DataChannelLabel)
     {
         let ch = channels[channelLabel.rawValue]!
-        try! ch.channel.send(data: data)
+        try! ch.send(data: data)
     }
 
     // Media operations - server can forward but not create
@@ -149,28 +157,23 @@ public class HeadlessWebRTCTransport: Transport
     }
 }
 
-private class ServerDataChannel: DataChannel
+extension AlloWebRTCPeer.DataChannel : DataChannel
 {
-    let label: DataChannelLabel
-    let channel: AlloWebRTCPeer.Channel
-    var isOpen: Bool { return channel.open }
-    
-    init(label: DataChannelLabel, channel: AlloWebRTCPeer.Channel)
+    public var alloLabel: DataChannelLabel
     {
-        self.label = label
-        self.channel = channel
+        return DataChannelLabel(rawValue: self.label)!
     }
 }
 
-private class ServerMediaStream: MediaStream
+extension AlloWebRTCPeer.Track : MediaStream
 {
-    let streamId: String
-    
-    init(streamId: String) {
-        self.streamId = streamId
+    public var mediaId: String
+    {
+        "\(self.streamId).\(self.trackId)"
     }
 }
 
+
 extension SignallingPayload
 {
     public func adcCandidates() -> [AlloWebRTCPeer.ICECandidate]

Sources/alloheadless/HeadlessWebRTCTransport.swift

@@ -20,6 +20,8 @@ public protocol AlloSessionDelegate: AnyObject
     func session(_: AlloSession, didReceiveIntent intent: Intent)
 
     func session(_: AlloSession, didReceiveMediaStream: MediaStream)
+    // TODO: handle losing a media stream too
+    //func session(_: AlloSession, didRemoveMediaStream: MediaStream)
 }
 
 /// Wrapper of Transport, adding Alloverse-specific channels and data types
@@ -116,7 +118,7 @@ public class AlloSession : NSObject, TransportDelegate
     let decoder = BinaryDecoder()
     public func transport(_ transport: Transport, didReceiveData data: Data, on channel: DataChannel)
     {
-        switch channel.label
+        switch channel.alloLabel
         {
         case  .interactions:
             do {
@@ -233,7 +235,7 @@ public class AlloSession : NSObject, TransportDelegate
     // MARK: - Audio
     public func transport(_ transport: Transport, didReceiveMediaStream stream: MediaStream)
     {
-        incomingStreams[stream.streamId] = stream
+        incomingStreams[stream.mediaId] = stream
         delegate?.session(self, didReceiveMediaStream: stream)
     }
 }

Sources/allonet2/AlloSession.swift

@@ -87,12 +87,12 @@ extension DataChannelLabel
 }
 
 public protocol DataChannel {
-    var label: DataChannelLabel { get }
+    var alloLabel: DataChannelLabel { get }
     var isOpen: Bool { get }
 }
 
 public protocol MediaStream {
-    var streamId: String { get }
+    var mediaId: String { get }
 }
 
 public protocol AudioTrack {