Skip to content

Commit fe43676

Browse files
committed
Merge branch 'main' into dl/preconnect
2 parents d0b65cc + 1b7124f commit fe43676

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+141
-133
lines changed

.github/banner_dark.png

-140 Bytes
Loading

.github/banner_light.png

494 Bytes
Loading

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,9 @@ Apache License 2.0
423423
<br/><table>
424424
<thead><tr><th colspan="2">LiveKit Ecosystem</th></tr></thead>
425425
<tbody>
426-
<tr><td>LiveKit SDKs</td><td><a href="https://github.com/livekit/client-sdk-js">Browser</a> · <a href="https://github.com/livekit/client-sdk-swift">iOS/macOS/visionOS</a> · <a href="https://github.com/livekit/client-sdk-android">Android</a> · <a href="https://github.com/livekit/client-sdk-flutter">Flutter</a> · <b>React Native</b> · <a href="https://github.com/livekit/rust-sdks">Rust</a> · <a href="https://github.com/livekit/node-sdks">Node.js</a> · <a href="https://github.com/livekit/python-sdks">Python</a> · <a href="https://github.com/livekit/client-sdk-unity">Unity</a> · <a href="https://github.com/livekit/client-sdk-unity-web">Unity (WebGL)</a></td></tr><tr></tr>
426+
<tr><td>LiveKit SDKs</td><td><a href="https://github.com/livekit/client-sdk-js">Browser</a> · <a href="https://github.com/livekit/client-sdk-swift">iOS/macOS/visionOS</a> · <a href="https://github.com/livekit/client-sdk-android">Android</a> · <a href="https://github.com/livekit/client-sdk-flutter">Flutter</a> · <b>React Native</b> · <a href="https://github.com/livekit/rust-sdks">Rust</a> · <a href="https://github.com/livekit/node-sdks">Node.js</a> · <a href="https://github.com/livekit/python-sdks">Python</a> · <a href="https://github.com/livekit/client-sdk-unity">Unity</a> · <a href="https://github.com/livekit/client-sdk-unity-web">Unity (WebGL)</a> · <a href="https://github.com/livekit/client-sdk-esp32">ESP32</a></td></tr><tr></tr>
427427
<tr><td>Server APIs</td><td><a href="https://github.com/livekit/node-sdks">Node.js</a> · <a href="https://github.com/livekit/server-sdk-go">Golang</a> · <a href="https://github.com/livekit/server-sdk-ruby">Ruby</a> · <a href="https://github.com/livekit/server-sdk-kotlin">Java/Kotlin</a> · <a href="https://github.com/livekit/python-sdks">Python</a> · <a href="https://github.com/livekit/rust-sdks">Rust</a> · <a href="https://github.com/agence104/livekit-server-sdk-php">PHP (community)</a> · <a href="https://github.com/pabloFuente/livekit-server-sdk-dotnet">.NET (community)</a></td></tr><tr></tr>
428-
<tr><td>UI Components</td><td><a href="https://github.com/livekit/components-js">React</a> · <a href="https://github.com/livekit/components-android">Android Compose</a> · <a href="https://github.com/livekit/components-swift">SwiftUI</a></td></tr><tr></tr>
428+
<tr><td>UI Components</td><td><a href="https://github.com/livekit/components-js">React</a> · <a href="https://github.com/livekit/components-android">Android Compose</a> · <a href="https://github.com/livekit/components-swift">SwiftUI</a> · <a href="https://github.com/livekit/components-flutter">Flutter</a></td></tr><tr></tr>
429429
<tr><td>Agents Frameworks</td><td><a href="https://github.com/livekit/agents">Python</a> · <a href="https://github.com/livekit/agents-js">Node.js</a> · <a href="https://github.com/livekit/agent-playground">Playground</a></td></tr><tr></tr>
430430
<tr><td>Services</td><td><a href="https://github.com/livekit/livekit">LiveKit server</a> · <a href="https://github.com/livekit/egress">Egress</a> · <a href="https://github.com/livekit/ingress">Ingress</a> · <a href="https://github.com/livekit/sip">SIP</a></td></tr><tr></tr>
431431
<tr><td>Resources</td><td><a href="https://docs.livekit.io">Docs</a> · <a href="https://github.com/livekit-examples">Example apps</a> · <a href="https://livekit.io/cloud">Cloud</a> · <a href="https://docs.livekit.io/home/self-hosting/deployment">Self-hosting</a> · <a href="https://github.com/livekit/livekit-cli">CLI</a></td></tr>

android/src/main/java/com/livekit/reactnative/LivekitReactNativeModule.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ import java.lang.Thread.sleep
2323
import kotlin.concurrent.thread
2424
import kotlin.time.Duration.Companion.milliseconds
2525

26+
// NOTE: As of 0.80 react-native new architecture requires all
27+
// @ReactMethod(isBlockingSynchronousMethod = true)
28+
// annotated methods to be non-void.
2629

2730
class LivekitReactNativeModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
2831

@@ -164,9 +167,10 @@ class LivekitReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
164167
}
165168

166169
@ReactMethod(isBlockingSynchronousMethod = true)
167-
fun deleteVolumeProcessor(reactTag: String, pcId: Int, trackId: String) {
170+
fun deleteVolumeProcessor(reactTag: String, pcId: Int, trackId: String): Boolean {
168171
audioSinkManager.detachSinkFromTrack(reactTag, pcId, trackId)
169172
audioSinkManager.unregisterSink(reactTag)
173+
return true
170174
}
171175

172176
@ReactMethod(isBlockingSynchronousMethod = true)
@@ -193,7 +197,7 @@ class LivekitReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
193197
}
194198

195199
@ReactMethod(isBlockingSynchronousMethod = true)
196-
fun deleteMultibandVolumeProcessor(reactTag: String, pcId: Int, trackId: String) {
200+
fun deleteMultibandVolumeProcessor(reactTag: String, pcId: Int, trackId: String): Boolean {
197201
val volumeProcessor =
198202
audioSinkManager.getSink(reactTag) ?: throw IllegalArgumentException("Can't find volume processor for $reactTag")
199203
audioSinkManager.detachSinkFromTrack(volumeProcessor, pcId, trackId)
@@ -204,7 +208,10 @@ class LivekitReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
204208
multibandVolumeProcessor.release()
205209
} else {
206210
Log.w(name, "deleteMultibandVolumeProcessor called, but non-MultibandVolumeProcessor found?!")
211+
return false
207212
}
213+
214+
return true
208215
}
209216

210217
@ReactMethod

ci/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"@livekit/react-native": "*",
15-
"@livekit/react-native-webrtc": "^125.0.10",
15+
"@livekit/react-native-webrtc": "^125.0.12",
1616
"livekit-client": "^2.15.4",
1717
"react": "18.2.0",
1818
"react-native": "0.74.2"

ci/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2174,16 +2174,16 @@ __metadata:
21742174
languageName: node
21752175
linkType: hard
21762176

2177-
"@livekit/react-native-webrtc@npm:^125.0.10":
2178-
version: 125.0.10
2179-
resolution: "@livekit/react-native-webrtc@npm:125.0.10"
2177+
"@livekit/react-native-webrtc@npm:^125.0.12":
2178+
version: 125.0.12
2179+
resolution: "@livekit/react-native-webrtc@npm:125.0.12"
21802180
dependencies:
21812181
base64-js: 1.5.1
21822182
debug: 4.3.4
21832183
event-target-shim: 6.0.2
21842184
peerDependencies:
21852185
react-native: ">=0.60.0"
2186-
checksum: e40d4742e8b2819653b96979309b167c753f77b953b6ca29b0c48a5aa3169706e36981e95da78c90ec5c1c9b22f225c31fb1d5ed531295e6c996bbbdb64a9a72
2186+
checksum: 42219d63e39cf7a7b76489d4bb800de996cd345f239d0df888568ad134e7b3a1a75630a84750ac52577562e749942071ef147186f2d56cc4b65d4a9187e0415b
21872187
languageName: node
21882188
linkType: hard
21892189

@@ -3872,7 +3872,7 @@ __metadata:
38723872
"@babel/preset-env": ^7.20.0
38733873
"@babel/runtime": ^7.20.0
38743874
"@livekit/react-native": "*"
3875-
"@livekit/react-native-webrtc": ^125.0.10
3875+
"@livekit/react-native-webrtc": ^125.0.12
38763876
"@react-native/babel-preset": 0.74.84
38773877
"@react-native/eslint-config": 0.74.84
38783878
"@react-native/metro-config": 0.74.84

0 commit comments

Comments
 (0)