@100mslive/react-native-hms 0.9.5 → 0.9.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/.gradle/6.9/fileHashes/fileHashes.lock +0 -0
- package/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/android/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/android/.gradle/checksums/checksums.lock +0 -0
- package/android/build.gradle +1 -1
- package/android/src/main/java/com/reactnativehmssdk/{HmsDecoder.kt → HMSDecoder.kt} +38 -34
- package/android/src/main/java/com/reactnativehmssdk/{HmsHelper.kt → HMSHelper.kt} +38 -5
- package/android/src/main/java/com/reactnativehmssdk/{HmsModule.kt → HMSManager.kt} +51 -41
- package/android/src/main/java/com/reactnativehmssdk/{HmsSDK.kt → HMSRNSDK.kt} +171 -158
- package/android/src/main/java/com/reactnativehmssdk/{HmssdkViewManager.kt → HMSSDKViewManager.kt} +11 -11
- package/android/src/main/java/com/reactnativehmssdk/{HmsView.kt → HMSView.kt} +3 -3
- package/android/src/main/java/com/reactnativehmssdk/HmsScreenshareActivity.kt +17 -18
- package/android/src/main/java/com/reactnativehmssdk/HmssdkPackage.kt +2 -2
- package/ios/{HmsDecoder.swift → HMSDecoder.swift} +26 -25
- package/ios/{HmsHelper.swift → HMSHelper.swift} +13 -7
- package/ios/{HmsManager.m → HMSManager.m} +2 -1
- package/ios/{HmsManager.swift → HMSManager.swift} +46 -38
- package/ios/{HmsSDK.swift → HMSRNSDK.swift} +127 -127
- package/ios/{HmsView.m → HMSView.m} +1 -1
- package/ios/{HmsView.swift → HMSView.swift} +7 -6
- package/lib/commonjs/classes/HMSBrowserRecordingState.js.map +1 -1
- package/lib/commonjs/classes/HMSEncoder.js +1 -0
- package/lib/commonjs/classes/HMSEncoder.js.map +1 -1
- package/lib/commonjs/classes/HMSLocalAudioTrack.js +3 -3
- package/lib/commonjs/classes/HMSLocalAudioTrack.js.map +1 -1
- package/lib/commonjs/classes/HMSLocalVideoTrack.js +3 -3
- package/lib/commonjs/classes/HMSLocalVideoTrack.js.map +1 -1
- package/lib/commonjs/classes/HMSLogger.js.map +1 -1
- package/lib/commonjs/classes/HMSRemoteAudioTrack.js +3 -3
- package/lib/commonjs/classes/HMSRemoteAudioTrack.js.map +1 -1
- package/lib/commonjs/classes/HMSRemoteVideoTrack.js +3 -3
- package/lib/commonjs/classes/HMSRemoteVideoTrack.js.map +1 -1
- package/lib/commonjs/classes/HMSRoom.js +3 -0
- package/lib/commonjs/classes/HMSRoom.js.map +1 -1
- package/lib/commonjs/classes/HMSRoomUpdate.js +1 -3
- package/lib/commonjs/classes/HMSRoomUpdate.js.map +1 -1
- package/lib/commonjs/classes/HMSRtmpStreamingState.js.map +1 -1
- package/lib/commonjs/classes/HMSSDK.js +39 -33
- package/lib/commonjs/classes/HMSSDK.js.map +1 -1
- package/lib/commonjs/classes/HMSServerRecordingState.js.map +1 -1
- package/lib/commonjs/classes/HMSTrackSource.js +15 -0
- package/lib/commonjs/classes/HMSTrackSource.js.map +1 -0
- package/lib/commonjs/classes/HmsView.js +2 -2
- package/lib/commonjs/classes/HmsView.js.map +1 -1
- package/lib/commonjs/index.js +14 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/module/classes/HMSBrowserRecordingState.js.map +1 -1
- package/lib/module/classes/HMSEncoder.js +1 -0
- package/lib/module/classes/HMSEncoder.js.map +1 -1
- package/lib/module/classes/HMSLocalAudioTrack.js +3 -3
- package/lib/module/classes/HMSLocalAudioTrack.js.map +1 -1
- package/lib/module/classes/HMSLocalVideoTrack.js +3 -3
- package/lib/module/classes/HMSLocalVideoTrack.js.map +1 -1
- package/lib/module/classes/HMSRemoteAudioTrack.js +3 -3
- package/lib/module/classes/HMSRemoteAudioTrack.js.map +1 -1
- package/lib/module/classes/HMSRemoteVideoTrack.js +3 -3
- package/lib/module/classes/HMSRemoteVideoTrack.js.map +1 -1
- package/lib/module/classes/HMSRoom.js +3 -0
- package/lib/module/classes/HMSRoom.js.map +1 -1
- package/lib/module/classes/HMSRoomUpdate.js +1 -3
- package/lib/module/classes/HMSRoomUpdate.js.map +1 -1
- package/lib/module/classes/HMSRtmpStreamingState.js.map +1 -1
- package/lib/module/classes/HMSSDK.js +39 -33
- package/lib/module/classes/HMSSDK.js.map +1 -1
- package/lib/module/classes/HMSServerRecordingState.js.map +1 -1
- package/lib/module/classes/HMSTrackSource.js +8 -0
- package/lib/module/classes/HMSTrackSource.js.map +1 -0
- package/lib/module/classes/HmsView.js +2 -2
- package/lib/module/classes/HmsView.js.map +1 -1
- package/lib/module/index.js +1 -0
- package/lib/module/index.js.map +1 -1
- package/lib/typescript/classes/HMSBrowserRecordingState.d.ts +2 -2
- package/lib/typescript/classes/HMSRoom.d.ts +2 -0
- package/lib/typescript/classes/HMSRoomUpdate.d.ts +1 -3
- package/lib/typescript/classes/HMSRtmpStreamingState.d.ts +2 -2
- package/lib/typescript/classes/HMSSDK.d.ts +2 -2
- package/lib/typescript/classes/HMSServerRecordingState.d.ts +2 -2
- package/lib/typescript/classes/HMSTrackSource.d.ts +5 -0
- package/lib/typescript/index.d.ts +1 -0
- package/package.json +1 -1
- package/react-native-hms.podspec +2 -2
- package/src/classes/HMSBrowserRecordingState.ts +2 -2
- package/src/classes/HMSEncoder.ts +1 -0
- package/src/classes/HMSLocalAudioTrack.ts +3 -3
- package/src/classes/HMSLocalVideoTrack.ts +3 -3
- package/src/classes/HMSRemoteAudioTrack.ts +3 -3
- package/src/classes/HMSRemoteVideoTrack.ts +3 -3
- package/src/classes/HMSRoom.ts +3 -0
- package/src/classes/HMSRoomUpdate.ts +1 -3
- package/src/classes/HMSRtmpStreamingState.ts +2 -2
- package/src/classes/HMSSDK.tsx +35 -33
- package/src/classes/HMSServerRecordingState.ts +2 -2
- package/src/classes/HMSTrackSource.ts +5 -0
- package/src/classes/HmsView.tsx +2 -2
- package/src/index.ts +1 -0
|
@@ -8,12 +8,12 @@
|
|
|
8
8
|
import Foundation
|
|
9
9
|
import HMSSDK
|
|
10
10
|
|
|
11
|
-
class
|
|
11
|
+
class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
|
|
12
12
|
|
|
13
13
|
var hms: HMSSDK?
|
|
14
14
|
var config: HMSConfig?
|
|
15
15
|
var recentRoleChangeRequest: HMSRoleChangeRequest?
|
|
16
|
-
var delegate:
|
|
16
|
+
var delegate: HMSManager?
|
|
17
17
|
var id: String = "12345"
|
|
18
18
|
var rtcStatsAttached = false
|
|
19
19
|
var recentPreviewTracks: [HMSTrack]? = []
|
|
@@ -38,9 +38,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
38
38
|
|
|
39
39
|
// MARK: - Setup
|
|
40
40
|
|
|
41
|
-
init(data: NSDictionary?, delegate manager:
|
|
42
|
-
let videoSettings =
|
|
43
|
-
let audioSettings =
|
|
41
|
+
init(data: NSDictionary?, delegate manager: HMSManager?, uid id: String) {
|
|
42
|
+
let videoSettings = HMSHelper.getLocalVideoSettings(data?.value(forKey: "video") as? NSDictionary)
|
|
43
|
+
let audioSettings = HMSHelper.getLocalAudioSettings(data?.value(forKey: "audio") as? NSDictionary)
|
|
44
44
|
DispatchQueue.main.async { [weak self] in
|
|
45
45
|
let hmsTrackSettings = HMSTrackSettings(videoSettings: videoSettings, audioSettings: audioSettings)
|
|
46
46
|
self?.hms = HMSSDK.build { sdk in
|
|
@@ -67,7 +67,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
67
67
|
let user = credentials.value(forKey: "username") as? String
|
|
68
68
|
else {
|
|
69
69
|
let error = HMSError(id: "101", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
70
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
70
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
71
71
|
return
|
|
72
72
|
}
|
|
73
73
|
|
|
@@ -91,23 +91,23 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
91
91
|
guard let role = data.value(forKey: "role") as? String
|
|
92
92
|
else {
|
|
93
93
|
let error = HMSError(id: "111", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
94
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
94
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
95
95
|
reject?(error.message, "FAILED_TO_INITIATE_PREVIEW_FOR_ROLE",nil)
|
|
96
96
|
return
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
let roleObj =
|
|
99
|
+
let roleObj = HMSHelper.getRoleFromRoleName(role, roles: hms?.roles)
|
|
100
100
|
|
|
101
101
|
if let extractedRole = roleObj {
|
|
102
102
|
hms?.preview(role: extractedRole, completion: { tracks, error in
|
|
103
103
|
if (error != nil) {
|
|
104
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
104
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
105
105
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
106
106
|
return
|
|
107
107
|
}
|
|
108
108
|
self.recentPreviewTracks = tracks
|
|
109
109
|
|
|
110
|
-
let decodedTracks =
|
|
110
|
+
let decodedTracks = HMSDecoder.getAllTracks(tracks ?? [])
|
|
111
111
|
|
|
112
112
|
resolve?(["success": true, "tracks": decodedTracks])
|
|
113
113
|
return
|
|
@@ -132,7 +132,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
132
132
|
let user = credentials.value(forKey: "username") as? String
|
|
133
133
|
else {
|
|
134
134
|
let error = HMSError(id: "102", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
135
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
135
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
136
136
|
return
|
|
137
137
|
}
|
|
138
138
|
|
|
@@ -159,7 +159,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
159
159
|
guard let isMute = data.value(forKey: "isMute") as? Bool
|
|
160
160
|
else {
|
|
161
161
|
let error = HMSError(id: "106", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
162
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
162
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
163
163
|
return
|
|
164
164
|
}
|
|
165
165
|
|
|
@@ -172,7 +172,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
172
172
|
guard let isMute = data.value(forKey: "isMute") as? Bool
|
|
173
173
|
else {
|
|
174
174
|
let error = HMSError(id: "107", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
175
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
175
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
176
176
|
return
|
|
177
177
|
}
|
|
178
178
|
|
|
@@ -196,7 +196,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
196
196
|
if success {
|
|
197
197
|
resolve?("")
|
|
198
198
|
} else {
|
|
199
|
-
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error":
|
|
199
|
+
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error": HMSDecoder.getError(error), "id": strongSelf.id])
|
|
200
200
|
reject?(nil, "error in leave", nil)
|
|
201
201
|
}
|
|
202
202
|
})
|
|
@@ -207,7 +207,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
207
207
|
guard let message = data.value(forKey: "message") as? String
|
|
208
208
|
else {
|
|
209
209
|
let error = HMSError(id: "108", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
210
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
210
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
211
211
|
return
|
|
212
212
|
}
|
|
213
213
|
|
|
@@ -219,7 +219,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
219
219
|
resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]])
|
|
220
220
|
return
|
|
221
221
|
} else {
|
|
222
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error":
|
|
222
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
223
223
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
224
224
|
return
|
|
225
225
|
}
|
|
@@ -232,19 +232,19 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
232
232
|
let targetedRoles = data.value(forKey: "roles") as? [String]
|
|
233
233
|
else {
|
|
234
234
|
let error = HMSError(id: "109", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
235
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
235
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
236
236
|
return
|
|
237
237
|
}
|
|
238
238
|
|
|
239
239
|
let type = data.value(forKey: "type") as? String ?? "chat"
|
|
240
240
|
DispatchQueue.main.async { [weak self] in
|
|
241
|
-
let encodedTargetedRoles =
|
|
241
|
+
let encodedTargetedRoles = HMSHelper.getRolesFromRoleNames(targetedRoles, roles: self?.hms?.roles)
|
|
242
242
|
self?.hms?.sendGroupMessage(type: type, message: message, roles: encodedTargetedRoles, completion: { message, error in
|
|
243
243
|
if error == nil {
|
|
244
244
|
resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]])
|
|
245
245
|
return
|
|
246
246
|
} else {
|
|
247
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error":
|
|
247
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
248
248
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
249
249
|
return
|
|
250
250
|
}
|
|
@@ -257,19 +257,19 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
257
257
|
let peerId = data.value(forKey: "peerId") as? String
|
|
258
258
|
else {
|
|
259
259
|
let error = HMSError(id: "110", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
260
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
260
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
261
261
|
return
|
|
262
262
|
}
|
|
263
263
|
|
|
264
264
|
let type = data.value(forKey: "type") as? String ?? "chat"
|
|
265
265
|
DispatchQueue.main.async { [weak self] in
|
|
266
|
-
guard let peer =
|
|
266
|
+
guard let peer = HMSHelper.getRemotePeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers) else { return }
|
|
267
267
|
self?.hms?.sendDirectMessage(type: type, message: message, peer: peer, completion: { message, error in
|
|
268
268
|
if error == nil {
|
|
269
269
|
resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]])
|
|
270
270
|
return
|
|
271
271
|
} else {
|
|
272
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error":
|
|
272
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
273
273
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
274
274
|
return
|
|
275
275
|
}
|
|
@@ -287,7 +287,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
287
287
|
if success {
|
|
288
288
|
resolve?(["success": true])
|
|
289
289
|
} else {
|
|
290
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error":
|
|
290
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
291
291
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
292
292
|
}
|
|
293
293
|
})
|
|
@@ -302,22 +302,22 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
302
302
|
let role = data.value(forKey: "role") as? String
|
|
303
303
|
else {
|
|
304
304
|
let error = HMSError(id: "111", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
305
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
305
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
306
306
|
return
|
|
307
307
|
}
|
|
308
308
|
|
|
309
309
|
let force = data.value(forKey: "force") as? Bool ?? false
|
|
310
310
|
|
|
311
311
|
DispatchQueue.main.async { [weak self] in
|
|
312
|
-
guard let peer =
|
|
313
|
-
let role =
|
|
312
|
+
guard let peer = HMSHelper.getPeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers, localPeer: self?.hms?.localPeer),
|
|
313
|
+
let role = HMSHelper.getRoleFromRoleName(role, roles: self?.hms?.roles)
|
|
314
314
|
else { return }
|
|
315
315
|
|
|
316
316
|
self?.hms?.changeRole(for: peer, to: role, force: force, completion: { success, error in
|
|
317
317
|
if success {
|
|
318
318
|
resolve?(["success": true])
|
|
319
319
|
} else {
|
|
320
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error":
|
|
320
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
321
321
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
322
322
|
}
|
|
323
323
|
})
|
|
@@ -329,7 +329,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
329
329
|
guard let trackId = data.value(forKey: "trackId") as? String
|
|
330
330
|
else {
|
|
331
331
|
let error = HMSError(id: "112", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
332
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
332
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
333
333
|
return
|
|
334
334
|
}
|
|
335
335
|
|
|
@@ -337,14 +337,14 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
337
337
|
|
|
338
338
|
DispatchQueue.main.async { [weak self] in
|
|
339
339
|
guard let remotePeers = self?.hms?.remotePeers,
|
|
340
|
-
let track =
|
|
340
|
+
let track = HMSHelper.getTrackFromTrackId(trackId, remotePeers)
|
|
341
341
|
else { return }
|
|
342
342
|
|
|
343
343
|
self?.hms?.changeTrackState(for: track, mute: mute, completion: { success, error in
|
|
344
344
|
if success {
|
|
345
345
|
resolve?(["success": true])
|
|
346
346
|
} else {
|
|
347
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error":
|
|
347
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
348
348
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
349
349
|
}
|
|
350
350
|
})
|
|
@@ -356,7 +356,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
356
356
|
guard let mute = data.value(forKey: "mute") as? Bool
|
|
357
357
|
else {
|
|
358
358
|
let error = HMSError(id: "113", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
359
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
359
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
360
360
|
return
|
|
361
361
|
}
|
|
362
362
|
let source = data.value(forKey: "source") as? String
|
|
@@ -373,12 +373,12 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
373
373
|
}
|
|
374
374
|
|
|
375
375
|
DispatchQueue.main.async { [weak self] in
|
|
376
|
-
let encodedTargetedRoles =
|
|
376
|
+
let encodedTargetedRoles = HMSHelper.getRolesFromRoleNames(targetedRoles, roles: self?.hms?.roles)
|
|
377
377
|
self?.hms?.changeTrackState(mute: mute, for: decodeType, source: source, roles: encodedTargetedRoles, completion: { success, error in
|
|
378
378
|
if success {
|
|
379
379
|
resolve?(["success": true])
|
|
380
380
|
} else {
|
|
381
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error":
|
|
381
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
382
382
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
383
383
|
}
|
|
384
384
|
})
|
|
@@ -390,20 +390,20 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
390
390
|
else {
|
|
391
391
|
reject?(nil, "NO_SDK_ID", nil)
|
|
392
392
|
let error = HMSError(id: "114", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
393
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
393
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
394
394
|
return
|
|
395
395
|
}
|
|
396
396
|
|
|
397
397
|
DispatchQueue.main.async { [weak self] in
|
|
398
398
|
guard let strongSelf = self else { return }
|
|
399
399
|
guard let localPeer = self?.hms?.localPeer,
|
|
400
|
-
let localTrack =
|
|
400
|
+
let localTrack = HMSHelper.getLocalTrackFromTrackId(trackId, localPeer: localPeer)
|
|
401
401
|
else {
|
|
402
402
|
guard let remotePeers = self?.hms?.remotePeers,
|
|
403
|
-
let track =
|
|
403
|
+
let track = HMSHelper.getTrackFromTrackId(trackId, remotePeers)
|
|
404
404
|
else {
|
|
405
405
|
let error = HMSError(id: "120", code: HMSErrorCode.genericErrorUnknown, message: "NOT_FOUND")
|
|
406
|
-
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error":
|
|
406
|
+
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error": HMSDecoder.getError(error), "id": strongSelf.id])
|
|
407
407
|
reject?(nil, "NOT_FOUND", nil)
|
|
408
408
|
return
|
|
409
409
|
}
|
|
@@ -421,7 +421,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
421
421
|
guard let peerId = data.value(forKey: "peerId") as? String
|
|
422
422
|
else {
|
|
423
423
|
let error = HMSError(id: "115", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
424
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
424
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
425
425
|
return
|
|
426
426
|
}
|
|
427
427
|
|
|
@@ -430,14 +430,14 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
430
430
|
DispatchQueue.main.async { [weak self] in
|
|
431
431
|
|
|
432
432
|
guard let remotePeers = self?.hms?.remotePeers,
|
|
433
|
-
let peer =
|
|
433
|
+
let peer = HMSHelper.getRemotePeerFromPeerId(peerId, remotePeers: remotePeers)
|
|
434
434
|
else { return }
|
|
435
435
|
|
|
436
436
|
self?.hms?.removePeer(peer, reason: reason ?? "Removed from room", completion: { success, error in
|
|
437
437
|
if success {
|
|
438
438
|
resolve?(["success": true])
|
|
439
439
|
} else {
|
|
440
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error":
|
|
440
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
441
441
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
442
442
|
}
|
|
443
443
|
})
|
|
@@ -450,7 +450,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
450
450
|
let reason = data.value(forKey: "reason") as? String
|
|
451
451
|
else {
|
|
452
452
|
let error = HMSError(id: "116", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
453
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
453
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
454
454
|
return
|
|
455
455
|
}
|
|
456
456
|
|
|
@@ -459,7 +459,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
459
459
|
if success {
|
|
460
460
|
resolve?(["success": true])
|
|
461
461
|
} else {
|
|
462
|
-
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error":
|
|
462
|
+
self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
|
|
463
463
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
464
464
|
}
|
|
465
465
|
})
|
|
@@ -471,7 +471,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
471
471
|
else {
|
|
472
472
|
reject?(nil, "NOT_FOUND", nil)
|
|
473
473
|
let error = HMSError(id: "117", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
474
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
474
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
475
475
|
return
|
|
476
476
|
}
|
|
477
477
|
DispatchQueue.main.async { [weak self] in
|
|
@@ -479,12 +479,12 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
479
479
|
guard let remotePeers = self?.hms?.remotePeers
|
|
480
480
|
else {
|
|
481
481
|
let error = HMSError(id: "121", code: HMSErrorCode.genericErrorUnknown, message: "NOT_FOUND")
|
|
482
|
-
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error":
|
|
482
|
+
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error": HMSDecoder.getError(error), "id": strongSelf.id])
|
|
483
483
|
reject?(nil, "NOT_FOUND", nil)
|
|
484
484
|
return
|
|
485
485
|
}
|
|
486
|
-
let remoteAudioTrack =
|
|
487
|
-
let remoteVideoTrack =
|
|
486
|
+
let remoteAudioTrack = HMSHelper.getRemoteAudioTrackFromTrackId(trackId, remotePeers)
|
|
487
|
+
let remoteVideoTrack = HMSHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
|
|
488
488
|
if remoteAudioTrack != nil {
|
|
489
489
|
let isPlaybackAllowed = remoteAudioTrack?.isPlaybackAllowed()
|
|
490
490
|
resolve?(isPlaybackAllowed)
|
|
@@ -495,7 +495,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
495
495
|
return
|
|
496
496
|
} else {
|
|
497
497
|
let error = HMSError(id: "122", code: HMSErrorCode.genericErrorUnknown, message: "NOT_FOUND")
|
|
498
|
-
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error":
|
|
498
|
+
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error": HMSDecoder.getError(error), "id": strongSelf.id])
|
|
499
499
|
reject?(nil, "NOT_FOUND", nil)
|
|
500
500
|
return
|
|
501
501
|
}
|
|
@@ -503,7 +503,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
503
503
|
}
|
|
504
504
|
|
|
505
505
|
func getRoom(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
|
|
506
|
-
let roomData =
|
|
506
|
+
let roomData = HMSDecoder.getHmsRoom(hms?.room)
|
|
507
507
|
|
|
508
508
|
resolve?(roomData)
|
|
509
509
|
}
|
|
@@ -513,7 +513,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
513
513
|
let playbackAllowed = data.value(forKey: "playbackAllowed") as? Bool
|
|
514
514
|
else {
|
|
515
515
|
let error = HMSError(id: "118", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
516
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
516
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
517
517
|
return
|
|
518
518
|
}
|
|
519
519
|
DispatchQueue.main.async { [weak self] in
|
|
@@ -521,8 +521,8 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
521
521
|
else {
|
|
522
522
|
return
|
|
523
523
|
}
|
|
524
|
-
let remoteAudioTrack =
|
|
525
|
-
let remoteVideoTrack =
|
|
524
|
+
let remoteAudioTrack = HMSHelper.getRemoteAudioTrackFromTrackId(trackId, remotePeers)
|
|
525
|
+
let remoteVideoTrack = HMSHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
|
|
526
526
|
if remoteAudioTrack != nil {
|
|
527
527
|
if playbackAllowed {
|
|
528
528
|
remoteAudioTrack?.setPlaybackAllowed(playbackAllowed)
|
|
@@ -539,7 +539,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
539
539
|
guard let metadata = data.value(forKey: "metadata") as? String
|
|
540
540
|
else {
|
|
541
541
|
let error = HMSError(id: "123", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
542
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
542
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
543
543
|
reject?(nil, "REQUIRED_KEYS_NOT_FOUND", nil)
|
|
544
544
|
return
|
|
545
545
|
}
|
|
@@ -549,7 +549,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
549
549
|
resolve?(["success": success])
|
|
550
550
|
return
|
|
551
551
|
} else {
|
|
552
|
-
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error":
|
|
552
|
+
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error": HMSDecoder.getError(error), "id": self.id])
|
|
553
553
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
554
554
|
return
|
|
555
555
|
}
|
|
@@ -561,7 +561,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
561
561
|
let volume = data.value(forKey: "volume") as? Double
|
|
562
562
|
else {
|
|
563
563
|
let error = HMSError(id: "124", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
564
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
564
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
565
565
|
return
|
|
566
566
|
}
|
|
567
567
|
|
|
@@ -569,13 +569,13 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
569
569
|
guard let strongSelf = self else { return }
|
|
570
570
|
let remotePeers = self?.hms?.remotePeers
|
|
571
571
|
|
|
572
|
-
let remoteAudioTrack =
|
|
572
|
+
let remoteAudioTrack = HMSHelper.getRemoteAudioAuxiliaryTrackFromTrackId(trackId, remotePeers)
|
|
573
573
|
|
|
574
574
|
if remoteAudioTrack != nil {
|
|
575
575
|
remoteAudioTrack?.setVolume(volume)
|
|
576
576
|
} else {
|
|
577
577
|
let error = HMSError(id: "125", code: HMSErrorCode.genericErrorUnknown, message: "TRACK_ID_NOT_FOUND_IN_REMOTE_TRACKS")
|
|
578
|
-
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error":
|
|
578
|
+
strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["event": strongSelf.ON_ERROR, "error": HMSDecoder.getError(error), "id": strongSelf.id])
|
|
579
579
|
}
|
|
580
580
|
}
|
|
581
581
|
}
|
|
@@ -584,7 +584,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
584
584
|
guard let record = data.value(forKey: "record") as? Bool
|
|
585
585
|
else {
|
|
586
586
|
let error = HMSError(id: "126", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
587
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
587
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
588
588
|
return
|
|
589
589
|
}
|
|
590
590
|
|
|
@@ -596,24 +596,24 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
596
596
|
meetingUrl = URL(string: meetLink)
|
|
597
597
|
} else {
|
|
598
598
|
let error = HMSError(id: "127", code: HMSErrorCode.genericErrorUnknown, message: "INVALID_MEETING_URL_PASSED")
|
|
599
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
599
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
600
600
|
}
|
|
601
601
|
|
|
602
|
-
let URLs =
|
|
602
|
+
let URLs = HMSHelper.getRtmpUrls(rtmpStrings)
|
|
603
603
|
|
|
604
604
|
let config = HMSRTMPConfig(meetingURL: meetingUrl, rtmpURLs: URLs, record: record)
|
|
605
605
|
hms?.startRTMPOrRecording(config: config, completion: { success, error in
|
|
606
606
|
if success {
|
|
607
|
-
let roomData =
|
|
607
|
+
let roomData = HMSDecoder.getHmsRoom(self.hms?.room)
|
|
608
608
|
let type = self.getString(from: HMSRoomUpdate.browserRecordingStateUpdated)
|
|
609
609
|
|
|
610
|
-
let localPeerData =
|
|
611
|
-
let remotePeerData =
|
|
610
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(self.hms?.localPeer)
|
|
611
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(self.hms?.remotePeers)
|
|
612
612
|
self.delegate?.emitEvent(self.ON_ROOM_UPDATE, ["event": self.ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
|
|
613
613
|
resolve?(["success": success])
|
|
614
614
|
return
|
|
615
615
|
} else {
|
|
616
|
-
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error":
|
|
616
|
+
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error": HMSDecoder.getError(error), "id": self.id])
|
|
617
617
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
618
618
|
return
|
|
619
619
|
}
|
|
@@ -623,16 +623,16 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
623
623
|
func stopRtmpAndRecording(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
|
|
624
624
|
hms?.stopRTMPAndRecording(completion: { success, error in
|
|
625
625
|
if success {
|
|
626
|
-
let roomData =
|
|
626
|
+
let roomData = HMSDecoder.getHmsRoom(self.hms?.room)
|
|
627
627
|
let type = self.getString(from: HMSRoomUpdate.browserRecordingStateUpdated)
|
|
628
628
|
|
|
629
|
-
let localPeerData =
|
|
630
|
-
let remotePeerData =
|
|
629
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(self.hms?.localPeer)
|
|
630
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(self.hms?.remotePeers)
|
|
631
631
|
self.delegate?.emitEvent(self.ON_ROOM_UPDATE, ["event": self.ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
|
|
632
632
|
resolve?(["success": success])
|
|
633
633
|
return
|
|
634
634
|
} else {
|
|
635
|
-
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error":
|
|
635
|
+
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error": HMSDecoder.getError(error), "id": self.id])
|
|
636
636
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
637
637
|
return
|
|
638
638
|
}
|
|
@@ -643,26 +643,26 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
643
643
|
guard let meetingURLVariants = data.value(forKey: "meetingURLVariants") as? [[String: Any]]?
|
|
644
644
|
else {
|
|
645
645
|
let error = HMSError(id: "126", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
646
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
646
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
647
647
|
return
|
|
648
648
|
}
|
|
649
649
|
|
|
650
|
-
let recordConfig =
|
|
651
|
-
let hlsMeetingUrlVariant =
|
|
650
|
+
let recordConfig = HMSHelper.getHlsRecordingConfig(data)
|
|
651
|
+
let hlsMeetingUrlVariant = HMSHelper.getHMSHLSMeetingURLVariants(meetingURLVariants)
|
|
652
652
|
let config = HMSHLSConfig(variants: hlsMeetingUrlVariant, recording: recordConfig)
|
|
653
653
|
|
|
654
654
|
hms?.startHLSStreaming(config: config, completion: { success, error in
|
|
655
655
|
if success {
|
|
656
|
-
let roomData =
|
|
656
|
+
let roomData = HMSDecoder.getHmsRoom(self.hms?.room)
|
|
657
657
|
let type = self.getString(from: HMSRoomUpdate.hlsStreamingStateUpdated)
|
|
658
658
|
|
|
659
|
-
let localPeerData =
|
|
660
|
-
let remotePeerData =
|
|
659
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(self.hms?.localPeer)
|
|
660
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(self.hms?.remotePeers)
|
|
661
661
|
self.delegate?.emitEvent(self.ON_ROOM_UPDATE, ["event": self.ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
|
|
662
662
|
resolve?(["success": success])
|
|
663
663
|
return
|
|
664
664
|
} else {
|
|
665
|
-
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error":
|
|
665
|
+
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error": HMSDecoder.getError(error), "id": self.id])
|
|
666
666
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
667
667
|
return
|
|
668
668
|
}
|
|
@@ -672,16 +672,16 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
672
672
|
func stopHLSStreaming(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
|
|
673
673
|
hms?.stopHLSStreaming(config: nil, completion: { success, error in
|
|
674
674
|
if success {
|
|
675
|
-
let roomData =
|
|
675
|
+
let roomData = HMSDecoder.getHmsRoom(self.hms?.room)
|
|
676
676
|
let type = self.getString(from: HMSRoomUpdate.browserRecordingStateUpdated)
|
|
677
677
|
|
|
678
|
-
let localPeerData =
|
|
679
|
-
let remotePeerData =
|
|
678
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(self.hms?.localPeer)
|
|
679
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(self.hms?.remotePeers)
|
|
680
680
|
self.delegate?.emitEvent(self.ON_ROOM_UPDATE, ["event": self.ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
|
|
681
681
|
resolve?(["success": success])
|
|
682
682
|
return
|
|
683
683
|
} else {
|
|
684
|
-
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error":
|
|
684
|
+
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error": HMSDecoder.getError(error), "id": self.id])
|
|
685
685
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
686
686
|
return
|
|
687
687
|
}
|
|
@@ -692,7 +692,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
692
692
|
guard let name = data.value(forKey: "name") as? String
|
|
693
693
|
else {
|
|
694
694
|
let error = HMSError(id: "123", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
695
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
695
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
696
696
|
reject?(nil, "REQUIRED_KEYS_NOT_FOUND", nil)
|
|
697
697
|
return
|
|
698
698
|
}
|
|
@@ -701,7 +701,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
701
701
|
if success {
|
|
702
702
|
resolve?(["success": success])
|
|
703
703
|
} else {
|
|
704
|
-
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error":
|
|
704
|
+
self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error": HMSDecoder.getError(error), "id": self.id])
|
|
705
705
|
reject?(error?.message, error?.localizedDescription, nil)
|
|
706
706
|
}
|
|
707
707
|
}
|
|
@@ -733,7 +733,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
733
733
|
// func setLocalVideoSettings(_ data: NSDictionary) {
|
|
734
734
|
// let localVideoTrack = self.hms?.localPeer?.localVideoTrack()
|
|
735
735
|
//
|
|
736
|
-
// guard let settings =
|
|
736
|
+
// guard let settings = HMSHelper.getLocalVideoSettings(data)
|
|
737
737
|
// else {
|
|
738
738
|
// //TODO: throw an error for invalid arguements
|
|
739
739
|
// return
|
|
@@ -745,19 +745,19 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
745
745
|
|
|
746
746
|
func on(join room: HMSRoom) {
|
|
747
747
|
// Callback from join action
|
|
748
|
-
let roomData =
|
|
749
|
-
let localPeerData =
|
|
750
|
-
let remotePeerData =
|
|
748
|
+
let roomData = HMSDecoder.getHmsRoom(room)
|
|
749
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(hms?.localPeer)
|
|
750
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(hms?.remotePeers)
|
|
751
751
|
|
|
752
|
-
let decodedRoles =
|
|
752
|
+
let decodedRoles = HMSDecoder.getAllRoles(hms?.roles)
|
|
753
753
|
self.recentPreviewTracks = []
|
|
754
754
|
self.delegate?.emitEvent(ON_JOIN, ["event": ON_JOIN, "id": self.id, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData, "roles": decodedRoles])
|
|
755
755
|
}
|
|
756
756
|
|
|
757
757
|
func onPreview(room: HMSRoom, localTracks: [HMSTrack]) {
|
|
758
|
-
let previewTracks =
|
|
759
|
-
let hmsRoom =
|
|
760
|
-
let localPeerData =
|
|
758
|
+
let previewTracks = HMSDecoder.getPreviewTracks(localTracks)
|
|
759
|
+
let hmsRoom = HMSDecoder.getHmsRoom(room)
|
|
760
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(hms?.localPeer)
|
|
761
761
|
|
|
762
762
|
previewInProgress = false
|
|
763
763
|
self.delegate?.emitEvent(ON_PREVIEW, ["event": ON_PREVIEW, "id": self.id, "room": hmsRoom, "previewTracks": previewTracks, "localPeer": localPeerData])
|
|
@@ -765,53 +765,53 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
765
765
|
|
|
766
766
|
func on(room: HMSRoom, update: HMSRoomUpdate) {
|
|
767
767
|
// Listener for any updation in room
|
|
768
|
-
let roomData =
|
|
768
|
+
let roomData = HMSDecoder.getHmsRoom(room)
|
|
769
769
|
let type = getString(from: update)
|
|
770
770
|
|
|
771
|
-
let localPeerData =
|
|
772
|
-
let remotePeerData =
|
|
771
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(hms?.localPeer)
|
|
772
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(hms?.remotePeers)
|
|
773
773
|
|
|
774
774
|
self.delegate?.emitEvent(ON_ROOM_UPDATE, ["event": ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
|
|
775
775
|
}
|
|
776
776
|
|
|
777
777
|
func on(peer: HMSPeer, update: HMSPeerUpdate) {
|
|
778
778
|
// Listener for updates in Peers
|
|
779
|
-
let roomData =
|
|
779
|
+
let roomData = HMSDecoder.getHmsRoom(hms?.room)
|
|
780
780
|
let type = getString(from: update)
|
|
781
781
|
|
|
782
|
-
let localPeerData =
|
|
783
|
-
let remotePeerData =
|
|
784
|
-
let hmsPeer =
|
|
782
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(hms?.localPeer)
|
|
783
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(hms?.remotePeers)
|
|
784
|
+
let hmsPeer = HMSDecoder.getHmsPeer(peer)
|
|
785
785
|
|
|
786
786
|
self.delegate?.emitEvent(ON_PEER_UPDATE, ["event": ON_PEER_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData, "peer": hmsPeer])
|
|
787
787
|
}
|
|
788
788
|
|
|
789
789
|
func on(track: HMSTrack, update: HMSTrackUpdate, for peer: HMSPeer) {
|
|
790
790
|
// Listener for updates in Tracks
|
|
791
|
-
let roomData =
|
|
791
|
+
let roomData = HMSDecoder.getHmsRoom(hms?.room)
|
|
792
792
|
let type = getString(from: update)
|
|
793
793
|
|
|
794
|
-
let localPeerData =
|
|
795
|
-
let remotePeerData =
|
|
796
|
-
let hmsPeer =
|
|
797
|
-
let hmsTrack =
|
|
794
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(hms?.localPeer)
|
|
795
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(hms?.remotePeers)
|
|
796
|
+
let hmsPeer = HMSDecoder.getHmsPeer(peer)
|
|
797
|
+
let hmsTrack = HMSDecoder.getHmsTrack(track)
|
|
798
798
|
|
|
799
799
|
self.delegate?.emitEvent(ON_TRACK_UPDATE, ["event": ON_TRACK_UPDATE, "id": self.id, "room": roomData, "type": type, "localPeer": localPeerData, "remotePeers": remotePeerData, "peer": hmsPeer, "track": hmsTrack])
|
|
800
800
|
}
|
|
801
801
|
|
|
802
802
|
func on(error: HMSError) {
|
|
803
803
|
if previewInProgress { previewInProgress = false }
|
|
804
|
-
self.delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
804
|
+
self.delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
805
805
|
}
|
|
806
806
|
|
|
807
807
|
func on(message: HMSMessage) {
|
|
808
|
-
self.delegate?.emitEvent(ON_MESSAGE, ["event": ON_MESSAGE, "id": self.id, "sender":
|
|
808
|
+
self.delegate?.emitEvent(ON_MESSAGE, ["event": ON_MESSAGE, "id": self.id, "sender": HMSDecoder.getHmsPeer(message.sender), "recipient": HMSDecoder.getHmsMessageRecipient(message.recipient), "time": message.time.timeIntervalSince1970 * 1000, "message": message.message, "type": message.type])
|
|
809
809
|
}
|
|
810
810
|
|
|
811
811
|
func on(updated speakers: [HMSSpeaker]) {
|
|
812
812
|
var speakerPeerIds: [[String: Any]] = []
|
|
813
813
|
for speaker in speakers {
|
|
814
|
-
speakerPeerIds.append(["peer":
|
|
814
|
+
speakerPeerIds.append(["peer": HMSDecoder.getHmsPeer(speaker.peer), "level": speaker.level, "track": HMSDecoder.getHmsTrack(speaker.track)])
|
|
815
815
|
}
|
|
816
816
|
self.delegate?.emitEvent(ON_SPEAKER, ["event": ON_SPEAKER, "id": self.id, "count": speakers.count, "peers": speakerPeerIds])
|
|
817
817
|
}
|
|
@@ -825,13 +825,13 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
825
825
|
}
|
|
826
826
|
|
|
827
827
|
func on(roleChangeRequest: HMSRoleChangeRequest) {
|
|
828
|
-
let decodedRoleChangeRequest =
|
|
828
|
+
let decodedRoleChangeRequest = HMSDecoder.getHmsRoleChangeRequest(roleChangeRequest, self.id)
|
|
829
829
|
recentRoleChangeRequest = roleChangeRequest
|
|
830
830
|
self.delegate?.emitEvent(ON_ROLE_CHANGE_REQUEST, decodedRoleChangeRequest)
|
|
831
831
|
}
|
|
832
832
|
|
|
833
833
|
func on(changeTrackStateRequest: HMSChangeTrackStateRequest) {
|
|
834
|
-
let decodedChangeTrackStateRequest =
|
|
834
|
+
let decodedChangeTrackStateRequest = HMSDecoder.getHmsChangeTrackStateRequest(changeTrackStateRequest, id)
|
|
835
835
|
delegate?.emitEvent("ON_CHANGE_TRACK_STATE_REQUEST", decodedChangeTrackStateRequest)
|
|
836
836
|
}
|
|
837
837
|
|
|
@@ -839,7 +839,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
839
839
|
let requestedBy = notification.requestedBy as HMSPeer?
|
|
840
840
|
var decodedRequestedBy: [String: Any]?
|
|
841
841
|
if let requested = requestedBy {
|
|
842
|
-
decodedRequestedBy =
|
|
842
|
+
decodedRequestedBy = HMSDecoder.getHmsPeer(requested)
|
|
843
843
|
}
|
|
844
844
|
let reason = notification.reason
|
|
845
845
|
let roomEnded = notification.roomEnded
|
|
@@ -850,9 +850,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
850
850
|
if (!rtcStatsAttached) {
|
|
851
851
|
return
|
|
852
852
|
}
|
|
853
|
-
let video =
|
|
854
|
-
let audio =
|
|
855
|
-
let combined =
|
|
853
|
+
let video = HMSDecoder.getHMSRTCStats(rtcStats.video)
|
|
854
|
+
let audio = HMSDecoder.getHMSRTCStats(rtcStats.audio)
|
|
855
|
+
let combined = HMSDecoder.getHMSRTCStats(rtcStats.combined)
|
|
856
856
|
|
|
857
857
|
self.delegate?.emitEvent(ON_RTC_STATS, ["video": video, "audio": audio, "combined": combined, "id": self.id])
|
|
858
858
|
}
|
|
@@ -861,9 +861,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
861
861
|
if (!rtcStatsAttached) {
|
|
862
862
|
return
|
|
863
863
|
}
|
|
864
|
-
let localStats =
|
|
865
|
-
let localTrack =
|
|
866
|
-
let decodedPeer =
|
|
864
|
+
let localStats = HMSDecoder.getLocalAudioStats(localAudioStats)
|
|
865
|
+
let localTrack = HMSDecoder.getHmsLocalAudioTrack(track)
|
|
866
|
+
let decodedPeer = HMSDecoder.getHmsPeer(peer)
|
|
867
867
|
|
|
868
868
|
self.delegate?.emitEvent(ON_LOCAL_AUDIO_STATS, ["localAudioStats": localStats, "track": localTrack, "peer": decodedPeer, "id": self.id])
|
|
869
869
|
}
|
|
@@ -872,9 +872,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
872
872
|
if (!rtcStatsAttached) {
|
|
873
873
|
return
|
|
874
874
|
}
|
|
875
|
-
let localStats =
|
|
876
|
-
let decodedPeer =
|
|
877
|
-
let localTrack =
|
|
875
|
+
let localStats = HMSDecoder.getLocalVideoStats(localVideoStats)
|
|
876
|
+
let decodedPeer = HMSDecoder.getHmsPeer(peer)
|
|
877
|
+
let localTrack = HMSDecoder.getHmsLocalVideoTrack(track)
|
|
878
878
|
|
|
879
879
|
self.delegate?.emitEvent(ON_LOCAL_VIDEO_STATS, ["localVideoStats": localStats, "track": localTrack, "peer": decodedPeer, "id": self.id])
|
|
880
880
|
}
|
|
@@ -883,9 +883,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
883
883
|
if (!rtcStatsAttached) {
|
|
884
884
|
return
|
|
885
885
|
}
|
|
886
|
-
let remoteStats =
|
|
887
|
-
let remoteTrack =
|
|
888
|
-
let decodedPeer =
|
|
886
|
+
let remoteStats = HMSDecoder.getRemoteAudioStats(remoteAudioStats)
|
|
887
|
+
let remoteTrack = HMSDecoder.getHMSRemoteAudioTrack(track)
|
|
888
|
+
let decodedPeer = HMSDecoder.getHmsPeer(peer)
|
|
889
889
|
|
|
890
890
|
self.delegate?.emitEvent(ON_REMOTE_AUDIO_STATS, ["remoteAudioStats": remoteStats, "track": remoteTrack, "peer": decodedPeer, "id": self.id])
|
|
891
891
|
}
|
|
@@ -894,9 +894,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
894
894
|
if (!rtcStatsAttached) {
|
|
895
895
|
return
|
|
896
896
|
}
|
|
897
|
-
let remoteStats =
|
|
898
|
-
let decodedPeer =
|
|
899
|
-
let remoteTrack =
|
|
897
|
+
let remoteStats = HMSDecoder.getRemoteVideoStats(remoteVideoStats)
|
|
898
|
+
let decodedPeer = HMSDecoder.getHmsPeer(peer)
|
|
899
|
+
let remoteTrack = HMSDecoder.getHMSRemoteVideoTrack(track)
|
|
900
900
|
|
|
901
901
|
self.delegate?.emitEvent(ON_REMOTE_VIDEO_STATS, ["remoteVideoStats": remoteStats, "track": remoteTrack, "peer": decodedPeer, "id": self.id])
|
|
902
902
|
}
|
|
@@ -914,7 +914,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
914
914
|
})
|
|
915
915
|
}
|
|
916
916
|
if (customError != nil) {
|
|
917
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
917
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(customError), "id": id])
|
|
918
918
|
}
|
|
919
919
|
}
|
|
920
920
|
|
|
@@ -922,7 +922,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
922
922
|
guard let mute = data.value(forKey: "mute") as? Bool
|
|
923
923
|
else {
|
|
924
924
|
let error = HMSError(id: "119", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
|
|
925
|
-
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error":
|
|
925
|
+
delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HMSDecoder.getError(error), "id": id])
|
|
926
926
|
return
|
|
927
927
|
}
|
|
928
928
|
|
|
@@ -932,9 +932,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
932
932
|
peer.remoteAudioTrack()?.setPlaybackAllowed(!mute)
|
|
933
933
|
}
|
|
934
934
|
}
|
|
935
|
-
let roomData =
|
|
936
|
-
let localPeerData =
|
|
937
|
-
let remotePeerData =
|
|
935
|
+
let roomData = HMSDecoder.getHmsRoom(hms?.room)
|
|
936
|
+
let localPeerData = HMSDecoder.getHmsLocalPeer(hms?.localPeer)
|
|
937
|
+
let remotePeerData = HMSDecoder.getHmsRemotePeers(hms?.remotePeers)
|
|
938
938
|
|
|
939
939
|
self.delegate?.emitEvent(ON_PEER_UPDATE, ["event": ON_PEER_UPDATE, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
|
|
940
940
|
}
|
|
@@ -1001,7 +1001,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
|
|
|
1001
1001
|
}
|
|
1002
1002
|
}
|
|
1003
1003
|
|
|
1004
|
-
// extension
|
|
1004
|
+
// extension HMSRNSDK: HMSLogger {
|
|
1005
1005
|
// func log(_ message: String, _ level: HMSLogLevel) {
|
|
1006
1006
|
//
|
|
1007
1007
|
// }
|