Skip to content

Commit 95b149c

Browse files
authored
Merge pull request #10 from Bandwidth/dev
Update signaling to use Result
2 parents 2fdde6f + d513893 commit 95b149c

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

Sources/BandwidthWebRTC/Signaling/Signaling.swift

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,43 +84,49 @@ class Signaling {
8484

8585
func setMediaPreferences(protocol: String, aggregationType: String, sendReceive: Bool, completion: @escaping (SetMediaPreferencesResult?) -> Void) {
8686
let parameters = SetMediaPreferencesParameters(protocol: `protocol`, aggregationType: aggregationType, sendReceive: sendReceive)
87-
do {
88-
try client.call(method: SignalingMethod.setMediaPreferences.rawValue, parameters: parameters, type: SetMediaPreferencesResult.self) { result in
87+
client.call(method: SignalingMethod.setMediaPreferences.rawValue, parameters: parameters, type: SetMediaPreferencesResult.self) { result in
88+
switch result {
89+
case .success(let result):
8990
completion(result)
91+
case .failure(let error):
92+
print(error)
9093
}
91-
} catch let error {
92-
debugPrint(error.localizedDescription)
9394
}
9495
}
9596

9697
func requestToPublish(mediaTypes: [MediaType], alias: String?, completion: @escaping (RequestToPublishResult?) -> Void) {
9798
let parameters = RequestToPublishParameters(mediaTypes: mediaTypes, alias: alias)
98-
do {
99-
try client.call(method: SignalingMethod.requestToPublish.rawValue, parameters: parameters, type: RequestToPublishResult.self) { result in
99+
client.call(method: SignalingMethod.requestToPublish.rawValue, parameters: parameters, type: RequestToPublishResult.self) { result in
100+
switch result {
101+
case .success(let result):
100102
completion(result)
103+
case .failure(let error):
104+
print(error)
101105
}
102-
} catch let error {
103-
debugPrint(error.localizedDescription)
104106
}
105107
}
106108

107109
func offer(endpointId: String, sdp: String, completion: @escaping (OfferSDPResult?) -> Void) {
108110
let parameters = OfferSDPParameters(endpointId: endpointId, sdpOffer: sdp)
109-
110-
try? client.call(method: "offerSdp", parameters: parameters, type: OfferSDPResult.self) { result in
111-
completion(result)
111+
client.call(method: SignalingMethod.offerSDP.rawValue, parameters: parameters, type: OfferSDPResult.self) { result in
112+
switch result {
113+
case .success(let result):
114+
completion(result)
115+
case .failure(let error):
116+
print(error)
117+
}
112118
}
113119
}
114120

115121
func sendIceCandidate(endpointId: String, sdp: String, sdpMLineIndex: Int, sdpMid: String, completion: @escaping (Result<(), Error>) -> Void) {
116-
let addICECandidateParameters = AddICECandidateSendParameters(
122+
let parameters = AddICECandidateSendParameters(
117123
endpointId: endpointId,
118124
candidate: sdp,
119125
sdpMLineIndex: sdpMLineIndex,
120126
sdpMid: sdpMid
121127
)
122128

123-
client.notify(method: SignalingMethod.addICECandidate.rawValue, parameters: addICECandidateParameters) { result in
129+
client.notify(method: SignalingMethod.addICECandidate.rawValue, parameters: parameters) { result in
124130
completion(result)
125131
}
126132
}

0 commit comments

Comments
 (0)