Skip to content

feat: end to end encryption for data channels option #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidliu merged 11 commits into from
Oct 13, 2025
Merged

feat: end to end encryption for data channels option #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d7b3b7d
feat: end to end encryption for data channels option
davidliu Sep 18, 2025
1112331
fixes and update react-native-webrtc
davidliu Sep 18, 2025
e024462
cleanup test token
davidliu Sep 23, 2025
d12bdc5
cleanup unused imports
davidliu Sep 23, 2025
97d7fcb
chore: update livekit-client dependency to 2.15.8
davidliu Oct 3, 2025
bedc5a0
fix: clean up handleEncryptedData return type
davidliu Oct 3, 2025
72cef41
chore: update ci pod.lock
davidliu Oct 3, 2025
dae8ee2
chore: cleanup debug logs
davidliu Oct 6, 2025
7a70e8b
setter method for isDataChannelEncryptionEnabled
davidliu Oct 6, 2025
0c9e924
chore: cleanup
davidliu Oct 7, 2025
6bbba2b
Merge branch 'main' into dl/dc_e2ee
davidliu Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ci/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PODS:
- hermes-engine (0.74.2):
- hermes-engine/Pre-built (= 0.74.2)
- hermes-engine/Pre-built (0.74.2)
- livekit-react-native (2.8.0):
- livekit-react-native (2.9.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -29,9 +29,9 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- livekit-react-native-webrtc (137.0.0):
- livekit-react-native-webrtc (137.0.2):
- React-Core
- WebRTC-SDK (= 137.7151.02)
- WebRTC-SDK (= 137.7151.04)
- RCT-Folly (2024.01.01.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -1190,7 +1190,7 @@ PODS:
- React-perflogger (= 0.74.2)
- React-utils (= 0.74.2)
- SocketRocket (0.7.0)
- WebRTC-SDK (137.7151.02)
- WebRTC-SDK (137.7151.04)
- Yoga (0.0.0)

DEPENDENCIES:
Expand Down Expand Up @@ -1380,8 +1380,8 @@ SPEC CHECKSUMS:
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
hermes-engine: 01d3e052018c2a13937aca1860fbedbccd4a41b7
livekit-react-native: f5555a11014ee4d00ff52e7d8d2148ac6c1eb3c5
livekit-react-native-webrtc: 323f7edcea8d64e5abf1455d8c552b69cd2599b1
livekit-react-native: 22180f283c63416a81f8765555fccc7a33f0a044
livekit-react-native-webrtc: 3bb1be767c4e489f69bca662eba1c5e7b1e1be0d
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
RCTDeprecation: b03c35057846b685b3ccadc9bfe43e349989cdb2
RCTRequired: 194626909cfa8d39ca6663138c417bc6c431648c
Expand Down Expand Up @@ -1430,7 +1430,7 @@ SPEC CHECKSUMS:
React-utils: 4476b7fcbbd95cfd002f3e778616155241d86e31
ReactCommon: ecad995f26e0d1e24061f60f4e5d74782f003f12
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
WebRTC-SDK: d20de357dcbf7c9696b124b39f3ff62125107e4b
WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e
Yoga: ae3c32c514802d30f687a04a6a35b348506d411f

PODFILE CHECKSUM: 7e787510e5e3fbe259a5a7507ea2e7e1b1ff65ef
Expand Down
4 changes: 2 additions & 2 deletions ci/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},
"dependencies": {
"@livekit/react-native": "*",
"@livekit/react-native-webrtc": "^137.0.1",
"livekit-client": "^2.15.4",
"@livekit/react-native-webrtc": "^137.0.2",
"livekit-client": "^2.15.8",
"react": "18.2.0",
"react-native": "0.74.2"
},
Expand Down
38 changes: 23 additions & 15 deletions ci/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2165,25 +2165,25 @@ __metadata:
languageName: node
linkType: hard

"@livekit/protocol@npm:1.39.3":
version: 1.39.3
resolution: "@livekit/protocol@npm:1.39.3"
"@livekit/protocol@npm:1.42.0":
version: 1.42.0
resolution: "@livekit/protocol@npm:1.42.0"
dependencies:
"@bufbuild/protobuf": ^1.10.0
checksum: 72aa3b9e82203ccec039047518d841d65b10dcc11ab9d661f269eab8a8672aed7b2d072f4f09cc6fb94a2579542b0a9216d7f66476d34cd1675c13e1ebcc119f
checksum: 6b1b194c69aa85c1d86b94eacc6ef163a85c56e66532c39737c2f9d1c6a2037c7fe499e474a823f4a332c7e87f4631be04e67bab57e12cdbba00bdcea202b7e9
languageName: node
linkType: hard

"@livekit/react-native-webrtc@npm:^137.0.1":
version: 137.0.1
resolution: "@livekit/react-native-webrtc@npm:137.0.1"
"@livekit/react-native-webrtc@npm:^137.0.2":
version: 137.0.2
resolution: "@livekit/react-native-webrtc@npm:137.0.2"
dependencies:
base64-js: 1.5.1
debug: 4.3.4
event-target-shim: 6.0.2
peerDependencies:
react-native: ">=0.60.0"
checksum: 3341aafe7d9d1deb345e47247faa020b2cb5f1adbded135a244f0f9285eed720c9f62325bbce0e21c1da755ae24ae6c69eb07728cece709560f615908bde43a9
checksum: c23467701c7dfb74e3b223dd955b20ba1586c2186383f5b2595fff9b65a36b2db0b660de9935e009b69bc5e0bbff047d0f598495f8464daae8db5f8d9f9b7c24
languageName: node
linkType: hard

Expand Down Expand Up @@ -3872,7 +3872,7 @@ __metadata:
"@babel/preset-env": ^7.20.0
"@babel/runtime": ^7.20.0
"@livekit/react-native": "*"
"@livekit/react-native-webrtc": ^137.0.1
"@livekit/react-native-webrtc": ^137.0.2
"@react-native/babel-preset": 0.74.84
"@react-native/eslint-config": 0.74.84
"@react-native/metro-config": 0.74.84
Expand All @@ -3883,7 +3883,7 @@ __metadata:
eslint: ^8.19.0
install-local: ^3.0.1
jest: ^29.6.3
livekit-client: ^2.15.4
livekit-client: ^2.15.8
prettier: 2.8.8
react: 18.2.0
react-native: 0.74.2
Expand Down Expand Up @@ -6715,6 +6715,13 @@ __metadata:
languageName: node
linkType: hard

"jose@npm:^6.1.0":
version: 6.1.0
resolution: "jose@npm:6.1.0"
checksum: f9596a3161b5dabfdd0b7d490f2710f2cc8d460b0a2e1f3262fd2f90652abbb535e4f80e80d3854e7264c9526dcdac5e28693b4d4b1803f622728d7dcde02010
languageName: node
linkType: hard

"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
version: 4.0.0
resolution: "js-tokens@npm:4.0.0"
Expand Down Expand Up @@ -6956,13 +6963,14 @@ __metadata:
languageName: node
linkType: hard

"livekit-client@npm:^2.15.4":
version: 2.15.4
resolution: "livekit-client@npm:2.15.4"
"livekit-client@npm:^2.15.8":
version: 2.15.8
resolution: "livekit-client@npm:2.15.8"
dependencies:
"@livekit/mutex": 1.1.1
"@livekit/protocol": 1.39.3
"@livekit/protocol": 1.42.0
events: ^3.3.0
jose: ^6.1.0
loglevel: ^1.9.2
sdp-transform: ^2.15.0
ts-debounce: ^4.0.0
Expand All @@ -6971,7 +6979,7 @@ __metadata:
webrtc-adapter: ^9.0.1
peerDependencies:
"@types/dom-mediacapture-record": ^1
checksum: 7ae2e2f5326c8f7925b359277fd12ddeefb0bc5069b0563a9e184f2b860351bf91733c1fa5fd7b65467b643776368058d485af888e2771fd68c61c409b950e05
checksum: d12b81ad5640dc383ab3eca241d0b064387e15df0e8cda616fa4a6aa3c0af46ac202f8cb8a4fd19bd3980531a852784f87d21d27062b95b8581ae110f933c744
languageName: node
linkType: hard

Expand Down
10 changes: 5 additions & 5 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- livekit-react-native-webrtc (137.0.1):
- livekit-react-native-webrtc (137.0.2):
- React-Core
- WebRTC-SDK (= 137.7151.02)
- WebRTC-SDK (= 137.7151.04)
- RCT-Folly (2024.01.01.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -1220,7 +1220,7 @@ PODS:
- ReactCommon/turbomodule/core
- Yoga
- SocketRocket (0.7.0)
- WebRTC-SDK (137.7151.02)
- WebRTC-SDK (137.7151.04)
- Yoga (0.0.0)

DEPENDENCIES:
Expand Down Expand Up @@ -1426,7 +1426,7 @@ SPEC CHECKSUMS:
glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
hermes-engine: 01d3e052018c2a13937aca1860fbedbccd4a41b7
livekit-react-native: 1320867758f718760eb868c537876ceb007d95ca
livekit-react-native-webrtc: 0ffe5a13d196f65d717f958a111399f4f6383102
livekit-react-native-webrtc: 3bb1be767c4e489f69bca662eba1c5e7b1e1be0d
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
RCTDeprecation: b03c35057846b685b3ccadc9bfe43e349989cdb2
RCTRequired: 194626909cfa8d39ca6663138c417bc6c431648c
Expand Down Expand Up @@ -1480,7 +1480,7 @@ SPEC CHECKSUMS:
RNCAsyncStorage: 0c357f3156fcb16c8589ede67cc036330b6698ca
RNScreens: b32a9ff15bea7fcdbe5dff6477bc503f792b1208
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
WebRTC-SDK: d20de357dcbf7c9696b124b39f3ff62125107e4b
WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e
Yoga: ae3c32c514802d30f687a04a6a35b348506d411f

PODFILE CHECKSUM: b5aad0c7d12b2ea501eb822f98f00ca01d154bd9
Expand Down
4 changes: 2 additions & 2 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"postinstall": "patch-package"
},
"dependencies": {
"@livekit/react-native-webrtc": "^137.0.1",
"@livekit/react-native-webrtc": "^137.0.2",
"@react-native-async-storage/async-storage": "^1.17.10",
"@react-navigation/native": "^6.0.8",
"@react-navigation/native-stack": "^6.5.0",
"@supersami/rn-foreground-service": "^2.2.5",
"livekit-client": "^2.15.4",
"livekit-client": "^2.15.8",
"react": "18.2.0",
"react-native": "0.74.2",
"react-native-callkeep": "^4.3.14",
Expand Down
33 changes: 14 additions & 19 deletions example/src/RoomPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ import {
AudioSession,
useLocalParticipant,
LiveKitRoom,
useDataChannel,
useRoomContext,
useVisualStableUpdate,
useTracks,
type TrackReferenceOrPlaceholder,
type ReceivedDataMessage,
AndroidAudioTypePresets,
useIOSAudioManagement,
useRNE2EEManager,
Expand Down Expand Up @@ -67,7 +65,9 @@ export const RoomPage = ({
};
}, []);

let { e2eeManager } = useRNE2EEManager({ sharedKey: e2eeKey });
let { e2eeManager } = useRNE2EEManager({
sharedKey: e2eeKey,
});
let e2eeOptions = e2ee ? { e2eeManager } : undefined;

return (
Expand All @@ -79,7 +79,7 @@ export const RoomPage = ({
adaptiveStream: { pixelDensity: 'screen' },
e2ee: e2eeOptions,
Copy link
Contributor

@lukasIO lukasIO Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the e2ee field will be deprecated, we should set this on the encryption field now

Copy link
Contributor

@lukasIO lukasIO Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidliu you marked this as resolved, but it's not updated.
I guess this depends on a release of the livekit-client exposing the new field?

Copy link
Contributor Author

@davidliu davidliu Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, figured I'd separate this part of the update for when it's available.

}}
audio={true}
audio={false}
video={true}
>
<RoomView navigation={navigation} e2ee={e2ee} />
Expand Down Expand Up @@ -107,24 +107,22 @@ const RoomView = ({ navigation, e2ee }: RoomViewProps) => {
}, [room, e2ee]);

useIOSAudioManagement(room, true);
// Setup room listeners
const { send } = useDataChannel(
(dataMessage: ReceivedDataMessage<string>) => {
//@ts-ignore
let decoder = new TextDecoder('utf-8');
let message = decoder.decode(dataMessage.payload);

// Setup room listeners
useEffect(() => {
room.registerTextStreamHandler('lk.chat', async (reader, participant) => {
let message = await reader.readAll();
let title = 'Received Message';
if (dataMessage.from != null) {
title = 'Received Message from ' + dataMessage.from?.identity;
if (participant != null) {
title = 'Received Message from ' + participant.identity;
}
Toast.show({
type: 'success',
text1: title,
text2: message,
});
}
);
});
}, [room]);

const tracks = useTracks(
[
Expand Down Expand Up @@ -229,17 +227,14 @@ const RoomView = ({ navigation, e2ee }: RoomViewProps) => {
localParticipant.setScreenShareEnabled(enabled);
}
}}
sendData={(message: string) => {
sendData={async (message: string) => {
Toast.show({
type: 'success',
text1: 'Sending Message',
text2: message,
});

//@ts-ignore
let encoder = new TextEncoder();
let encodedData = encoder.encode(message);
send(encodedData, { reliable: true });
room.localParticipant.sendText(message, { topic: 'lk.chat' });
}}
onSimulate={(scenario) => {
room.simulateScenario(scenario);
Expand Down
38 changes: 23 additions & 15 deletions example/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2163,25 +2163,25 @@ __metadata:
languageName: node
linkType: hard

"@livekit/protocol@npm:1.39.3":
version: 1.39.3
resolution: "@livekit/protocol@npm:1.39.3"
"@livekit/protocol@npm:1.42.0":
version: 1.42.0
resolution: "@livekit/protocol@npm:1.42.0"
dependencies:
"@bufbuild/protobuf": ^1.10.0
checksum: 72aa3b9e82203ccec039047518d841d65b10dcc11ab9d661f269eab8a8672aed7b2d072f4f09cc6fb94a2579542b0a9216d7f66476d34cd1675c13e1ebcc119f
checksum: 6b1b194c69aa85c1d86b94eacc6ef163a85c56e66532c39737c2f9d1c6a2037c7fe499e474a823f4a332c7e87f4631be04e67bab57e12cdbba00bdcea202b7e9
languageName: node
linkType: hard

"@livekit/react-native-webrtc@npm:^137.0.1":
version: 137.0.1
resolution: "@livekit/react-native-webrtc@npm:137.0.1"
"@livekit/react-native-webrtc@npm:^137.0.2":
version: 137.0.2
resolution: "@livekit/react-native-webrtc@npm:137.0.2"
dependencies:
base64-js: 1.5.1
debug: 4.3.4
event-target-shim: 6.0.2
peerDependencies:
react-native: ">=0.60.0"
checksum: 3341aafe7d9d1deb345e47247faa020b2cb5f1adbded135a244f0f9285eed720c9f62325bbce0e21c1da755ae24ae6c69eb07728cece709560f615908bde43a9
checksum: c23467701c7dfb74e3b223dd955b20ba1586c2186383f5b2595fff9b65a36b2db0b660de9935e009b69bc5e0bbff047d0f598495f8464daae8db5f8d9f9b7c24
languageName: node
linkType: hard

Expand Down Expand Up @@ -5892,6 +5892,13 @@ __metadata:
languageName: node
linkType: hard

"jose@npm:^6.1.0":
version: 6.1.0
resolution: "jose@npm:6.1.0"
checksum: f9596a3161b5dabfdd0b7d490f2710f2cc8d460b0a2e1f3262fd2f90652abbb535e4f80e80d3854e7264c9526dcdac5e28693b4d4b1803f622728d7dcde02010
languageName: node
linkType: hard

"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
version: 4.0.0
resolution: "js-tokens@npm:4.0.0"
Expand Down Expand Up @@ -6102,13 +6109,14 @@ __metadata:
languageName: node
linkType: hard

"livekit-client@npm:^2.15.4":
version: 2.15.4
resolution: "livekit-client@npm:2.15.4"
"livekit-client@npm:^2.15.8":
version: 2.15.8
resolution: "livekit-client@npm:2.15.8"
dependencies:
"@livekit/mutex": 1.1.1
"@livekit/protocol": 1.39.3
"@livekit/protocol": 1.42.0
events: ^3.3.0
jose: ^6.1.0
loglevel: ^1.9.2
sdp-transform: ^2.15.0
ts-debounce: ^4.0.0
Expand All @@ -6117,7 +6125,7 @@ __metadata:
webrtc-adapter: ^9.0.1
peerDependencies:
"@types/dom-mediacapture-record": ^1
checksum: 7ae2e2f5326c8f7925b359277fd12ddeefb0bc5069b0563a9e184f2b860351bf91733c1fa5fd7b65467b643776368058d485af888e2771fd68c61c409b950e05
checksum: d12b81ad5640dc383ab3eca241d0b064387e15df0e8cda616fa4a6aa3c0af46ac202f8cb8a4fd19bd3980531a852784f87d21d27062b95b8581ae110f933c744
languageName: node
linkType: hard

Expand All @@ -6128,7 +6136,7 @@ __metadata:
"@babel/core": ^7.20.0
"@babel/preset-env": ^7.20.0
"@babel/runtime": ^7.20.0
"@livekit/react-native-webrtc": ^137.0.1
"@livekit/react-native-webrtc": ^137.0.2
"@react-native-async-storage/async-storage": ^1.17.10
"@react-native/babel-preset": 0.74.84
"@react-native/eslint-config": 0.74.84
Expand All @@ -6140,7 +6148,7 @@ __metadata:
"@types/fastestsmallesttextencoderdecoder": ^1.0.0
"@types/react": ^18.2.6
babel-plugin-module-resolver: ^4.1.0
livekit-client: ^2.15.4
livekit-client: ^2.15.8
patch-package: ^8.0.0
react: 18.2.0
react-native: 0.74.2
Expand Down
Loading