Add auto formatter for .swift

.githooks/pre-commit

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-git diff --diff-filter=d --staged --name-only | grep -e '\(.*\).swift$' | while read line; do
-    swift-format format -i "${line}" --configuration swift-format-config.json;
-    git add "$line";
-done
-
-git diff --diff-filter=d --staged --name-only | grep -e '\(.*\).swift$' | while read line; do
-    swift-format lint -s "${line}" --configuration swift-format-config.json || exit 1;
-done
+swift-format --version 1>/dev/null 2>&1
+if [ $? -eq 0 ]; then
+      git diff --diff-filter=d --staged --name-only | grep -e '\(.*\).swift$' | while read line; do
+        echo "${line}"
+        swift-format -i "${line}"
+        git add "$line"
+    done
+fi

MembraneRTCTest/PeerConnectionManagerTest.swift

@@ -15,7 +15,9 @@ class PeerConnectionManagerTest: XCTestCase {
                 self.test = test
                 super.init(encoder: encoder)
             }
-            override func createPeerConnection(_ configuration: RTCConfiguration, constraints: RTCMediaConstraints)
+            override func createPeerConnection(
+                _ configuration: RTCConfiguration, constraints: RTCMediaConstraints
+            )
                 -> RTCPeerConnection?
             {
                 test.peerConnection = super.createPeerConnection(configuration, constraints: constraints)
@@ -33,11 +35,13 @@ class PeerConnectionManagerTest: XCTestCase {
 
         let listener = ListenerImpl()
         manager = PeerConnectionManager(
-            config: config, peerConnectionFactory: peerConnectionFactory, peerConnectionListener: listener)
+            config: config, peerConnectionFactory: peerConnectionFactory, peerConnectionListener: listener
+        )
 
         let expectation = XCTestExpectation(description: "Create sdp offer.")
 
-        manager.getSdpOffer(integratedTurnServers: [], tracksTypes: [:], localTracks: []) { sdp, midToTrackId, error in
+        manager.getSdpOffer(integratedTurnServers: [], tracksTypes: [:], localTracks: []) {
+            sdp, midToTrackId, error in
             XCTAssertNotNil(sdp, "Sdp offer wasn't created")
             expectation.fulfill()
         }
@@ -56,7 +60,8 @@ class PeerConnectionManagerTest: XCTestCase {
 
     func testAddVideoTrack() throws {
         let videoTrack = LocalVideoTrack.create(
-            for: .camera, videoParameters: .presetHD43, peerConnectionFactoryWrapper: peerConnectionFactory)
+            for: .camera, videoParameters: .presetHD43,
+            peerConnectionFactoryWrapper: peerConnectionFactory)
 
         manager.addTrack(track: videoTrack, localStreamId: "id")
         XCTAssertFalse(peerConnection.transceivers.isEmpty, "No track added")
@@ -65,9 +70,11 @@ class PeerConnectionManagerTest: XCTestCase {
     func testSimulcastConfig() throws {
         let preset: VideoParameters = .presetHD43
         let videoParameters = VideoParameters(
-            dimensions: preset.dimensions, simulcastConfig: SimulcastConfig(enabled: true, activeEncodings: [.h, .l]))
+            dimensions: preset.dimensions,
+            simulcastConfig: SimulcastConfig(enabled: true, activeEncodings: [.h, .l]))
         let videoTrack = LocalVideoTrack.create(
-            for: .camera, videoParameters: videoParameters, peerConnectionFactoryWrapper: peerConnectionFactory)
+            for: .camera, videoParameters: videoParameters,
+            peerConnectionFactoryWrapper: peerConnectionFactory)
 
         manager.addTrack(track: videoTrack, localStreamId: "id")
         let encodings = peerConnection.transceivers[0].sender.parameters.encodings
@@ -94,7 +101,8 @@ class PeerConnectionManagerTest: XCTestCase {
             simulcastConfig: SimulcastConfig(enabled: true, activeEncodings: [.h, .m, .l])
         )
         let videoTrack = LocalVideoTrack.create(
-            for: .camera, videoParameters: videoParameters, peerConnectionFactoryWrapper: peerConnectionFactory)
+            for: .camera, videoParameters: videoParameters,
+            peerConnectionFactoryWrapper: peerConnectionFactory)
 
         manager.addTrack(track: videoTrack, localStreamId: "id")
 
@@ -112,12 +120,14 @@ class PeerConnectionManagerTest: XCTestCase {
             simulcastConfig: SimulcastConfig(enabled: true, activeEncodings: [.h, .m, .l])
         )
         let videoTrack = LocalVideoTrack.create(
-            for: .camera, videoParameters: videoParameters, peerConnectionFactoryWrapper: peerConnectionFactory)
+            for: .camera, videoParameters: videoParameters,
+            peerConnectionFactoryWrapper: peerConnectionFactory)
 
         manager.addTrack(track: videoTrack, localStreamId: "id")
 
         let encodings = peerConnection.transceivers[0].sender.parameters.encodings
-        XCTAssertEqual(1_536_000, encodings[2].maxBitrateBps, "h layer should have correct maxBitrateBps")
+        XCTAssertEqual(
+            1_536_000, encodings[2].maxBitrateBps, "h layer should have correct maxBitrateBps")
         XCTAssertEqual(512000, encodings[1].maxBitrateBps, "m layer should have correct maxBitrateBps")
         XCTAssertEqual(153600, encodings[0].maxBitrateBps, "l layer should have correct maxBitrateBps")
     }

MembraneVideoroomDemo/Controllers/App.swift

@@ -22,7 +22,8 @@ final class AppController: ObservableObject {
 
     public func connect(room: String, displayName: String) {
         self.displayName = displayName
-        let engineUrl = Constants.getRtcEngineUrl().trimmingCharacters(in: CharacterSet(charactersIn: "/"))
+        let engineUrl = Constants.getRtcEngineUrl().trimmingCharacters(
+            in: CharacterSet(charactersIn: "/"))
 
         let transportUrl = "\(engineUrl)"
 

MembraneVideoroomDemo/Controllers/RoomController.swift

@@ -18,7 +18,8 @@ class ParticipantVideo: Identifiable, ObservableObject {
     @Published var vadStatus: VadStatus
 
     init(
-        id: String, participant: Participant, videoTrack: VideoTrack? = nil, isScreensharing: Bool = false,
+        id: String, participant: Participant, videoTrack: VideoTrack? = nil,
+        isScreensharing: Bool = false,
         isActive: Bool = false,
         mirror: Bool = false
     ) {
@@ -264,7 +265,9 @@ class RoomController: ObservableObject {
             // set the current primary video
             self.primaryVideo = video
 
-            if video.participant.id != self.localParticipantId && self.primaryVideo?.isScreensharing == false {
+            if video.participant.id != self.localParticipantId
+                && self.primaryVideo?.isScreensharing == false
+            {
                 self.room?.setTargetTrackEncoding(trackId: video.id, encoding: TrackEncoding.h)
             }
         }
@@ -325,7 +328,9 @@ class RoomController: ObservableObject {
         return participantVideos.first(where: { $0.id == id })
     }
 
-    func findParticipantVideoByOwner(participantId: String, isScreencast: Bool = false) -> ParticipantVideo? {
+    func findParticipantVideoByOwner(participantId: String, isScreencast: Bool = false)
+        -> ParticipantVideo?
+    {
         if let primaryVideo = self.primaryVideo, primaryVideo.participant.id == participantId,
             primaryVideo.isScreensharing == isScreencast
         {
@@ -438,9 +443,11 @@ extension RoomController: MembraneRTCDelegate {
         let isScreensharing = ctx.metadata["type"] as? String == "screensharing"
         let video = ParticipantVideo(
             id: ctx.trackId, participant: participant, videoTrack: videoTrack,
-            isScreensharing: isScreensharing, isActive: ctx.metadata["active"] as? Bool == true || isScreensharing)
+            isScreensharing: isScreensharing,
+            isActive: ctx.metadata["active"] as? Bool == true || isScreensharing)
 
-        guard let existingVideo = self.findParticipantVideoByOwner(participantId: ctx.endpoint.id) else {
+        guard let existingVideo = self.findParticipantVideoByOwner(participantId: ctx.endpoint.id)
+        else {
             add(video: video)
 
             if isScreensharing {
@@ -505,7 +512,8 @@ extension RoomController: MembraneRTCDelegate {
                 if ctx.endpoint.id == self.primaryVideo?.participant.id {
                     self.primaryVideo?.participant = p
                 } else {
-                    self.participantVideos.first(where: { $0.participant.id == ctx.endpoint.id })?.participant = p
+                    self.participantVideos.first(where: { $0.participant.id == ctx.endpoint.id })?
+                        .participant = p
                 }
             }
 
@@ -514,9 +522,11 @@ extension RoomController: MembraneRTCDelegate {
 
     func onEndpointAdded(endpoint: Endpoint) {
         self.participants[endpoint.id] = Participant(
-            id: endpoint.id, displayName: endpoint.metadata["displayName"] as? String ?? "", isAudioTrackActive: false)
+            id: endpoint.id, displayName: endpoint.metadata["displayName"] as? String ?? "",
+            isAudioTrackActive: false)
         let pv =
-            ParticipantVideo(id: endpoint.id, participant: participants[endpoint.id]!, videoTrack: nil, isActive: false)
+            ParticipantVideo(
+                id: endpoint.id, participant: participants[endpoint.id]!, videoTrack: nil, isActive: false)
         add(video: pv)
 
     }

MembraneVideoroomDemo/Utilities/Constants.swift

@@ -3,7 +3,8 @@ import Foundation
 /// A bunch of application specific constants
 struct Constants {
     static func getRtcEngineUrl() -> String {
-        return (Bundle.main.infoDictionary?["videoroom_url"] as! String).replacingOccurrences(of: "\\", with: "")
+        return (Bundle.main.infoDictionary?["videoroom_url"] as! String).replacingOccurrences(
+            of: "\\", with: "")
     }
 
     /// App Group used for communicating with `Broadcast Upload Extension`

MembraneVideoroomDemo/Views/ParticipantVideoView.swift

@@ -41,7 +41,8 @@ struct ParticipantVideoView: View {
         ZStack(alignment: .topLeading) {
             if self.participantVideo.isActive {
                 SwiftUIVideoView(
-                    (self.participantVideo.videoTrack)!, layout: self.layout, mirror: self.participantVideo.mirror,
+                    (self.participantVideo.videoTrack)!, layout: self.layout,
+                    mirror: self.participantVideo.mirror,
                     dimensions: $localDimensions
                 )
                 .onChange(of: localDimensions) { value in

MembraneVideoroomDemo/Views/RoomView.swift

@@ -237,8 +237,10 @@ struct RoomView: View {
                         } else {
                             AdaptiveStack(orientation: self.orientationReceiver.orientation) {
                                 if let primaryVideo = room.primaryVideo {
-                                    ParticipantVideoView(primaryVideo, height: videoFrameHeight, width: videoFrameWidth)
-                                        .padding(.bottom)
+                                    ParticipantVideoView(
+                                        primaryVideo, height: videoFrameHeight, width: videoFrameWidth
+                                    )
+                                    .padding(.bottom)
                                 }
 
                                 VStack {

Sources/MembraneRTC/IPC/IPC.swift

@@ -70,7 +70,9 @@ public class IPCServer: IPC {
         port = CFMessagePortCreateLocal(
             nil, name as CFString,
             {
-                (port: CFMessagePort?, id: Int32, data: CFData?, _: UnsafeMutableRawPointer?) -> Unmanaged<CFData>? in
+                (port: CFMessagePort?, id: Int32, data: CFData?, _: UnsafeMutableRawPointer?) -> Unmanaged<
+                    CFData
+                >? in
                 guard let selfObj = port?.associatedSelf() as? IPCServer,
                     let data = data as Data?
                 else {

Sources/MembraneRTC/Media/Tracks/LocalScreenBroadcastTrack.swift

@@ -14,10 +14,12 @@ public class LocalScreenBroadcastTrack: LocalVideoTrack, ScreenBroadcastCapturer
 
     internal init(
         appGroup: String, videoParameters: VideoParameters,
-        delegate _: LocalScreenBroadcastTrackDelegate? = nil, peerConnectionFactoryWrapper: PeerConnectionFactoryWrapper
+        delegate _: LocalScreenBroadcastTrackDelegate? = nil,
+        peerConnectionFactoryWrapper: PeerConnectionFactoryWrapper
     ) {
         self.appGroup = appGroup
-        super.init(parameters: videoParameters, peerConnectionFactoryWrapper: peerConnectionFactoryWrapper)
+        super.init(
+            parameters: videoParameters, peerConnectionFactoryWrapper: peerConnectionFactoryWrapper)
     }
 
     internal func started() {

Sources/MembraneRTC/Media/Tracks/LocalVideoTrack.swift

@@ -11,7 +11,9 @@ public class LocalVideoTrack: VideoTrack, LocalTrack {
         case camera, file
     }
 
-    internal init(parameters: VideoParameters, peerConnectionFactoryWrapper: PeerConnectionFactoryWrapper) {
+    internal init(
+        parameters: VideoParameters, peerConnectionFactoryWrapper: PeerConnectionFactoryWrapper
+    ) {
         let source = peerConnectionFactoryWrapper.createVideoSource()
 
         videoSource = source

Sources/MembraneRTC/MembraneRTC.swift

@@ -25,7 +25,8 @@ internal let pcLogPrefix = "[PeerConnection]"
 /// Once the user created the MembraneRTC client and connected to the server transport layer they can call the `connect` method to initialize joining the session.
 /// After receiving `onConnected` a user will receive notification about various peers joining/leaving the session, new tracks being published and ready for playback
 /// or going inactive.
-public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObject, RTCEngineListener,
+public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObject,
+    RTCEngineListener,
     PeerConnectionListener
 {
     enum State {
@@ -58,7 +59,8 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
     private var localTracks: [LocalTrack] = []
 
-    private var localEndpoint = Endpoint(id: "", type: "webrtc", metadata: .init([:]), trackIdToMetadata: [:])
+    private var localEndpoint = Endpoint(
+        id: "", type: "webrtc", metadata: .init([:]), trackIdToMetadata: [:])
 
     // mapping from peer's id to itself
     private var remoteEndpoints: [String: Endpoint] = [:]
@@ -73,7 +75,8 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
     private lazy var peerConnectionManager: PeerConnectionManager = {
         return PeerConnectionManager(
-            config: self.config, peerConnectionFactory: self.peerConnectionFactoryWrapper, peerConnectionListener: self)
+            config: self.config, peerConnectionFactory: self.peerConnectionFactoryWrapper,
+            peerConnectionListener: self)
     }()
 
     internal init(config: RTCConfiguration, encoder: Encoder) {
@@ -101,7 +104,9 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
      -  Returns: `MembraneRTC` client instance
      */
-    public static func create(with options: CreateOptions = CreateOptions(), delegate: MembraneRTCDelegate)
+    public static func create(
+        with options: CreateOptions = CreateOptions(), delegate: MembraneRTCDelegate
+    )
         -> MembraneRTC
     {
         DispatchQueue.webRTC.sync {
@@ -173,7 +178,9 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
    - Returns: `LocalCameraVideoTrack` instance that user then can use for things such as front / back camera switch.
    */
-    public func createVideoTrack(videoParameters: VideoParameters, metadata: Metadata, captureDeviceId: String? = nil)
+    public func createVideoTrack(
+        videoParameters: VideoParameters, metadata: Metadata, captureDeviceId: String? = nil
+    )
         -> LocalVideoTrack
     {
         DispatchQueue.webRTC.sync {
@@ -183,15 +190,18 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
             peerConnectionManager.addTrack(track: videoTrack, localStreamId: localStreamId)
 
-            if let captureDeviceId = captureDeviceId, let videoTrack = videoTrack as? LocalCameraVideoTrack {
+            if let captureDeviceId = captureDeviceId,
+                let videoTrack = videoTrack as? LocalCameraVideoTrack
+            {
                 videoTrack.switchCamera(deviceId: captureDeviceId)
             }
 
             videoTrack.start()
 
             localTracks.append(videoTrack)
 
-            localEndpoint = localEndpoint.withTrack(trackId: videoTrack.rtcTrack().trackId, metadata: metadata)
+            localEndpoint = localEndpoint.withTrack(
+                trackId: videoTrack.rtcTrack().trackId, metadata: metadata)
 
             engineCommunication.renegotiateTracks()
 
@@ -219,7 +229,8 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
             localTracks.append(audioTrack)
 
-            localEndpoint = localEndpoint.withTrack(trackId: audioTrack.rtcTrack().trackId, metadata: metadata)
+            localEndpoint = localEndpoint.withTrack(
+                trackId: audioTrack.rtcTrack().trackId, metadata: metadata)
 
             engineCommunication.renegotiateTracks()
 
@@ -398,7 +409,8 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
      */
     public func setEncodingBandwidth(trackId: String, encoding: String, bandwidth: BandwidthLimit) {
         DispatchQueue.webRTC.sync {
-            peerConnectionManager.setEncodingBandwidth(trackId: trackId, encoding: encoding, bandwidth: bandwidth)
+            peerConnectionManager.setEncodingBandwidth(
+                trackId: trackId, encoding: encoding, bandwidth: bandwidth)
         }
     }
 
@@ -470,7 +482,8 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
             // initialize peer's track contexts
             endpoint.trackIdToMetadata?.forEach { trackId, metadata in
-                let context = TrackContext(track: nil, enpoint: endpoint, trackId: trackId, metadata: metadata)
+                let context = TrackContext(
+                    track: nil, enpoint: endpoint, trackId: trackId, metadata: metadata)
 
                 self.trackContexts[trackId] = context
 
@@ -551,7 +564,8 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
     func onOfferData(integratedTurnServers: [OfferDataEvent.TurnServer], tracksTypes: [String: Int]) {
         peerConnectionManager.getSdpOffer(
-            integratedTurnServers: integratedTurnServers, tracksTypes: tracksTypes, localTracks: localTracks
+            integratedTurnServers: integratedTurnServers, tracksTypes: tracksTypes,
+            localTracks: localTracks
         ) { sdp, midToTrackId, error in
             if let err = error {
                 sdkLogger.error("Failed to create sdp offer: \(err)")
@@ -568,7 +582,8 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
     }
 
     func onSdpAnswer(type: String, sdp: String, midToTrackId: [String: String?]) {
-        peerConnectionManager.onSdpAnswer(sdp: sdp, midToTrackId: midToTrackId, localTracks: localTracks)
+        peerConnectionManager.onSdpAnswer(
+            sdp: sdp, midToTrackId: midToTrackId, localTracks: localTracks)
     }
 
     func onRemoteCandidate(candidate: String, sdpMLineIndex: Int32, sdpMid: String?) {
@@ -594,7 +609,8 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
 
         // for each track create a corresponding track context
         endpoint.trackIdToMetadata?.forEach { trackId, metadata in
-            let context = TrackContext(track: nil, enpoint: endpoint, trackId: trackId, metadata: metadata)
+            let context = TrackContext(
+                track: nil, enpoint: endpoint, trackId: trackId, metadata: metadata)
 
             self.trackContexts[trackId] = context
 
@@ -638,7 +654,9 @@ public class MembraneRTC: MulticastDelegate<MembraneRTCDelegate>, ObservableObje
         }
     }
 
-    func onTrackEncodingChanged(endpointId: String, trackId: String, encoding: String, encodingReason: String) {
+    func onTrackEncodingChanged(
+        endpointId: String, trackId: String, encoding: String, encodingReason: String
+    ) {
         if let trackEncoding = TrackEncoding.fromString(encoding),
             let trackContext = self.trackContexts[trackId],
             let encodingReasonEnum = EncodingReason(rawValue: encodingReason)