feat: migration to client-sdk-js v2 (#125)

* feat: migration to client-sdk-js v2

* chore: update livekit-client to 2.0.0

Author: davidliu

package.json

@@ -44,7 +44,7 @@
   "dependencies": {
     "array.prototype.at": "^1.1.1",
     "fastestsmallesttextencoderdecoder": "^1.0.22",
-    "livekit-client": "^1.15.0",
+    "livekit-client": "^2.0.0",
     "loglevel": "^1.8.0",
     "promise.allsettled": "^1.0.5",
     "react-native-url-polyfill": "^1.3.0",

src/audio/AudioManager.ts

@@ -116,13 +116,13 @@ function computeAudioTrackState(
 }
 
 function getLocalAudioTrackCount(room: Room): number {
-  return room.localParticipant.audioTracks.size;
+  return room.localParticipant.audioTrackPublications.size;
 }
 
 function getRemoteAudioTrackCount(room: Room): number {
   var audioTracks = 0;
-  room.participants.forEach((participant) => {
-    audioTracks += participant.audioTracks.size;
+  room.remoteParticipants.forEach((participant) => {
+    audioTracks += participant.audioTrackPublications.size;
   });
 
   return audioTracks;

src/useParticipant.ts

@@ -34,22 +34,28 @@ export function useParticipant(participant: Participant): ParticipantState {
   );
 
   const [cameraPublication, setCameraPublication] = useState(
-    participant.getTrack(Track.Source.Camera)
+    participant.getTrackPublication(Track.Source.Camera)
   );
   const [microphonePublication, setMicrophonePublication] = useState(
-    participant.getTrack(Track.Source.Microphone)
+    participant.getTrackPublication(Track.Source.Microphone)
   );
   const [screenSharePublication, setScreenSharePublication] = useState(
-    participant.getTrack(Track.Source.ScreenShare)
+    participant.getTrackPublication(Track.Source.ScreenShare)
   );
   useEffect(() => {
     const onPublicationsChanged = () => {
-      setPublications(Array.from(participant.tracks.values()));
-      setCameraPublication(participant.getTrack(Track.Source.Camera));
-      setMicrophonePublication(participant.getTrack(Track.Source.Microphone));
-      setScreenSharePublication(participant.getTrack(Track.Source.ScreenShare));
+      setPublications(Array.from(participant.trackPublications.values()));
+      setCameraPublication(
+        participant.getTrackPublication(Track.Source.Camera)
+      );
+      setMicrophonePublication(
+        participant.getTrackPublication(Track.Source.Microphone)
+      );
+      setScreenSharePublication(
+        participant.getTrackPublication(Track.Source.ScreenShare)
+      );
       setSubscribedTracks(
-        Array.from(participant.tracks.values()).filter((pub) => {
+        Array.from(participant.trackPublications.values()).filter((pub) => {
           return pub.isSubscribed && pub.track !== undefined;
         })
       );
@@ -120,7 +126,7 @@ export function useParticipant(participant: Participant): ParticipantState {
   }, [participant]);
 
   let muted: boolean | undefined;
-  participant.audioTracks.forEach((pub) => {
+  participant.audioTrackPublications.forEach((pub) => {
     muted = pub.isMuted;
   });
   if (muted === undefined) {

src/useRoom.ts

@@ -32,7 +32,7 @@ export function useRoom(room: Room, options?: RoomOptions): RoomState {
 
   useEffect(() => {
     const onParticipantsChanged = () => {
-      const remotes = Array.from(room.participants.values());
+      const remotes = Array.from(room.remoteParticipants.values());
       const newParticipants: Participant[] = [room.localParticipant];
       newParticipants.push(...remotes);
       sortFunc(newParticipants, room.localParticipant);
@@ -45,8 +45,8 @@ export function useRoom(room: Room, options?: RoomOptions): RoomState {
         return;
       }
       const tracks: AudioTrack[] = [];
-      room.participants.forEach((p) => {
-        p.audioTracks.forEach((pub) => {
+      room.remoteParticipants.forEach((p) => {
+        p.audioTrackPublications.forEach((pub) => {
           if (pub.audioTrack) {
             tracks.push(pub.audioTrack);
           }
@@ -135,8 +135,8 @@ export function sortParticipants(
     }
 
     // video on
-    const aVideo = a.videoTracks.size > 0;
-    const bVideo = b.videoTracks.size > 0;
+    const aVideo = a.videoTrackPublications.size > 0;
+    const bVideo = b.videoTrackPublications.size > 0;
     if (aVideo !== bVideo) {
       if (aVideo) {
         return -1;

yarn.lock

@@ -7506,10 +7506,10 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-livekit-client@^1.15.0:
-  version "1.15.10"
-  resolved "https://registry.yarnpkg.com/livekit-client/-/livekit-client-1.15.10.tgz#8772927a55ee9ee57616b90d1d8bcbc9152e9ce7"
-  integrity sha512-fNiXakeJyoaInt8Yo2i7kzsEG5YtlvqVqgXX1OPv7U7Y6D5TVwJc7dR1sIPpMxsAGMEIwbvsIweRXlObpp2mxA==
+livekit-client@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/livekit-client/-/livekit-client-2.0.0.tgz#60c48904a2d451a14a5f8f213cae97257ac8c4f3"
+  integrity sha512-pMv8AFiF+4xOh77Xo/MfoDlwttPrnVVUjMPFdk30kH3cBZ7KTWUGuO6sood9edmnIc0U4cvz2wh16Di+WFUojg==
   dependencies:
     "@bufbuild/protobuf" "^1.3.0"
     events "^3.3.0"