feat: 2.0 changes. (#60)

cloudwebrtc · lukasIO · web-flow · commit fd660d0fff0e · 2024-08-30T08:38:43.000+08:00
* feat: 2.0 changes.

* update js pkg.

* Update package.json

* Update Bridge~/package.json

Co-authored-by: lukasIO &lt;mail@lukasseiler.de&gt;

* update.

* fix.

---------

Co-authored-by: lukasIO &lt;mail@lukasseiler.de&gt;
diff --git a/Bridge~/package.json b/Bridge~/package.json
@@ -20,7 +20,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "livekit-client": "^1.15.13",
+    "livekit-client": "^2.5.0",
     "typed-emitter": "^2.1.0"
   },
   "devDependencies": {
diff --git a/Bridge~/pnpm-lock.yaml b/Bridge~/pnpm-lock.yaml
diff --git a/Bridge~/yarn.lock b/Bridge~/yarn.lock
diff --git a/Runtime/Scripts/Internal/Proto.cs b/Runtime/Scripts/Internal/Proto.cs
@@ -14,7 +14,6 @@ public enum VideoQuality
         LOW = 0,
         MEDIUM = 1,
         HIGH = 2,
-        OFF = 3,
         UNRECOGNIZED = -1,
     }
     
diff --git a/Runtime/Scripts/Options.cs b/Runtime/Scripts/Options.cs
@@ -46,8 +46,5 @@ public struct RoomConnectOptions
         public bool AutoSubscribe;
         [JsonProperty("rtcConfig")]
         public RTCConfiguration? RTCConfig;
-        [Obsolete]
-        [JsonProperty("publishOnly")]
-        public string PublishOnly;
     }
 }
diff --git a/Runtime/Scripts/Room/Participant/LocalParticipant.cs b/Runtime/Scripts/Room/Participant/LocalParticipant.cs
@@ -28,14 +28,19 @@ public JSError LastMicrophoneError()
             return Acquire<JSError>(ptr);
         }
 
-        public new LocalTrackPublication GetTrack(TrackSource source)
+        public new LocalTrackPublication GetTrackPublication(TrackSource source)
         {
-            return base.GetTrack(source) as LocalTrackPublication;
+            return base.GetTrackPublication(source) as LocalTrackPublication;
         }
 
-        public new LocalTrackPublication GetTrackByName(string name)
+        public new LocalTrackPublication GetTrackPublicationByName(string name)
         {
-            return base.GetTrackByName(name) as LocalTrackPublication;
+            return base.GetTrackPublicationByName(name) as LocalTrackPublication;
+        }
+
+        public new LocalTrackPublication GetTrackPublicationBySid(string sid)
+        {
+            return base.GetTrackPublicationBySid(sid) as LocalTrackPublication;
         }
 
         public JSPromise<LocalTrackPublication> SetCameraEnabled(bool enabled, VideoCaptureOptions? options = null,
@@ -153,27 +158,30 @@ public LocalTrackPublication UnpublishTrack(MediaStreamTrack track, bool? stopOn
             return Acquire<LocalTrackPublication>(ptr);
         }
 
-        // TODO Support unsafe ptr
-        public JSPromise PublishData(byte[] data, DataPacketKind kind, params RemoteParticipant[] participants)
+        public JSPromise PublishData(byte[] data, bool reliable, string[] destinationIdentities, string topic)
         {
-            return PublishData(data, 0, data.Length, kind, participants);
+            return PublishData(data, 0, data.Length, reliable, destinationIdentities, topic);
         }
 
-        public JSPromise PublishData(byte[] data, int offset, int size, DataPacketKind kind,
-            params RemoteParticipant[] participants)
+        public JSPromise PublishData(byte[] data, int offset, int size, bool reliable, string[] destinationIdentities, string topic)
         {
-            JSArray<RemoteParticipant> arr = null;
-            if (participants != null)
-                arr = new JSArray<RemoteParticipant>(participants);
+            JSArray<string> arr = null;
+            if (destinationIdentities != null)
+                arr = new JSArray<string>(destinationIdentities);
 
             JSNative.PushData(data, offset, size);
-            JSNative.PushNumber((double) kind);
+            JSNative.PushBoolean((bool)reliable);
 
-            if (participants == null)
+            if (destinationIdentities == null)
                 JSNative.PushUndefined();
             else
                 JSNative.PushObject(arr.NativeHandle);
 
+            if(topic == null)
+                JSNative.PushUndefined();
+            else
+                JSNative.PushString(topic);
+
             return Acquire<JSPromise>(JSNative.CallMethod(NativeHandle, "publishData"));
         }
 
diff --git a/Runtime/Scripts/Room/Participant/Participant.cs b/Runtime/Scripts/Room/Participant/Participant.cs
@@ -56,29 +56,29 @@ public class Participant : JSEventEmitter<ParticipantEvent>
         public event TrackStreamStateChangedDelegate TrackStreamStateChanged;
         public event TrackSubscriptionPermissionChangedDelegate TrackSubscriptionPermissionChanged;
         
-        public JSMap<string, TrackPublication> AudioTracks
+        public JSMap<string, TrackPublication> AudioTrackPublications
         {
             get
             {
-                JSNative.PushString("audioTracks");
+                JSNative.PushString("audioTrackPublications");
                 return Acquire<JSMap<string, TrackPublication>>(JSNative.GetProperty(NativeHandle));
             }
         }
 
-        public JSMap<string, TrackPublication> VideoTracks
+        public JSMap<string, TrackPublication> VideoTrackPublications
         {
             get
             {
-                JSNative.PushString("videoTracks");
+                JSNative.PushString("videoTrackPublications");
                 return Acquire<JSMap<string, TrackPublication>>(JSNative.GetProperty(NativeHandle));
             }
         }
 
-        public JSMap<string, TrackPublication> Tracks
+        public JSMap<string, TrackPublication> TrackPublications
         {
             get
             {
-                JSNative.PushString("tracks");
+                JSNative.PushString("trackPublications");
                 return Acquire<JSMap<string, TrackPublication>>(JSNative.GetProperty(NativeHandle));
             }
         }
@@ -344,31 +344,42 @@ private void RegisterEvents()
                 SetListener((ParticipantEvent) e, EventReceived);
         }
 
-        public JSArray<TrackPublication> GetTracks()
+        public JSArray<TrackPublication> GetTrackPublications()
         {
-            return Acquire<JSArray<TrackPublication>>(JSNative.CallMethod(NativeHandle, "getTracks"));
+            return Acquire<JSArray<TrackPublication>>(JSNative.CallMethod(NativeHandle, "getTrackPublications"));
         }
 
-        public TrackPublication GetTrack(TrackSource source)
+        public TrackPublication GetTrackPublication(TrackSource source)
         {
             JSNative.PushString(Utils.ToEnumString(source));
 
-            var ptr = JSNative.CallMethod(NativeHandle, "getTrack");
+            var ptr = JSNative.CallMethod(NativeHandle, "getTrackPublication");
             if (!JSNative.IsObject(ptr))
                 return null;
             
             return Acquire<TrackPublication>(ptr);
         }
 
-        public TrackPublication GetTrackByName(string name)
+        public TrackPublication GetTrackPublicationByName(string name)
         {
             JSNative.PushString(name);
 
-            var ptr = JSNative.CallMethod(NativeHandle, "getTrackByName");
+            var ptr = JSNative.CallMethod(NativeHandle, "getTrackPublicationByName");
             if (!JSNative.IsObject(ptr))
                 return null;
             
             return Acquire<TrackPublication>(ptr);
         }
+
+        public TrackPublication GetTrackPublicationBySid(string sid)
+        {
+            JSNative.PushString(sid);
+
+            var ptr = JSNative.CallMethod(NativeHandle, "getTrackPublicationBySid");
+            if (!JSNative.IsObject(ptr))
+                return null;
+
+            return Acquire<TrackPublication>(ptr);
+        }
     }
 }
diff --git a/Runtime/Scripts/Room/Participant/RemoteParticipant.cs b/Runtime/Scripts/Room/Participant/RemoteParticipant.cs
@@ -22,25 +22,29 @@ public float GetVolume()
             return (float) JSNative.GetNumber(JSNative.CallMethod(NativeHandle, "getVolume"));
         }
 
-        public new RemoteTrackPublication GetTrack(TrackSource source)
+        public new RemoteTrackPublication GetTrackPublication(TrackSource source)
         {
-            return base.GetTrack(source) as RemoteTrackPublication;
+            return base.GetTrackPublication(source) as RemoteTrackPublication;
         }
 
-        public new RemoteTrackPublication GetTrackByName(string name)
+        public new RemoteTrackPublication GetTrackPublicationByName(string name)
         {
-            return base.GetTrackByName(name) as RemoteTrackPublication;
+            return base.GetTrackPublicationByName(name) as RemoteTrackPublication;
         }
 
-        public RemoteTrackPublication GetTrackPublication(string sid)
+
+        public new RemoteTrackPublication GetTrackPublicationBySid(string sid)
         {
-            JSNative.PushString(sid);
+            return base.GetTrackPublicationBySid(sid) as RemoteTrackPublication;
+        }
 
-            var ptr = JSNative.CallMethod(NativeHandle, "getTrackPublication");
-            if (!JSNative.IsObject(ptr))
-                return null;
-            
-            return Acquire<RemoteTrackPublication>(ptr);
+        public JSMap<string, RemoteTrackPublication> RemotePublications
+        {
+            get
+            {
+                JSNative.PushString("trackPublications");
+                return Acquire<JSMap<string, RemoteTrackPublication>>(JSNative.GetProperty(NativeHandle));
+            }
         }
     }
 }
diff --git a/Runtime/Scripts/Room/Room.cs b/Runtime/Scripts/Room/Room.cs
@@ -25,7 +25,6 @@ public class Room : JSEventEmitter<RoomEvent>, IDisposable
         public delegate void ReconnectingDelegate();
         public delegate void ReconnectedDelegate();
         public delegate void DisconnectedDelegate(DisconnectReason? reason);
-        public delegate void StateChangedDelegate(ConnectionState state);
         public delegate void MediaDevicesChangedDelegate();
         public delegate void ParticipantConnectedDelegate(RemoteParticipant participant);
         public delegate void ParticipantDisconnectedDelegate(RemoteParticipant participant);
@@ -51,7 +50,6 @@ public class Room : JSEventEmitter<RoomEvent>, IDisposable
         public event ReconnectingDelegate Reconnecting;
         public event ReconnectedDelegate Reconnected;
         public event DisconnectedDelegate Disconnected;
-        public event StateChangedDelegate StateChanged;
         public event MediaDevicesChangedDelegate MediaDevicesChanged;
         public event ParticipantConnectedDelegate ParticipantConnected;
         public event ParticipantDisconnectedDelegate ParticipantDisconnected;
@@ -105,13 +103,6 @@ private static void EventReceived(IntPtr iptr)
                         room.Disconnected?.Invoke(reason);
                         break;
                     }
-                    case RoomEvent.StateChanged:
-                        {
-                            var str = JSNative.GetString(JSNative.ShiftStack());
-                            Log.Debug($"Room: Received StateChanged(\"{str}\"");
-                            room.StateChanged?.Invoke(Utils.ToEnum<ConnectionState>(str));
-                            break;
-                        }
                     case RoomEvent.MediaDevicesChanged:
                         Log.Debug($"Room: Received MediaDevicesChanged");
                         room.MediaDevicesChanged?.Invoke();
@@ -320,11 +311,11 @@ public ConnectionState State
             }
         }
 
-        public JSMap<string, RemoteParticipant> Participants
+        public JSMap<string, RemoteParticipant> RemoteParticipants
         {
             get
             {
-                JSNative.PushString("participants");
+                JSNative.PushString("remoteParticipants");
                 return Acquire<JSMap<string, RemoteParticipant>>(JSNative.GetProperty(NativeHandle));
             }
         }
@@ -338,13 +329,9 @@ public JSArray<Participant> ActiveSpeakers
             }
         }
 
-        public string Sid
+        public JSPromise<JSObject> GetSid()
         {
-            get
-            {
-                JSNative.PushString("sid");
-                return JSNative.GetString(JSNative.GetProperty(NativeHandle));
-            }
+            return Acquire<JSPromise<JSObject>>(JSNative.CallMethod(NativeHandle, "getSid"));
         }
 
         public string Name
diff --git a/Runtime/Scripts/Room/Track/Options.cs b/Runtime/Scripts/Room/Track/Options.cs
@@ -78,8 +78,8 @@ public struct TrackPublishDefaults
         public VideoEncoding? ScreenShareEncoding;
         [JsonProperty("videoCodec")]
         public VideoCodec? VideoCodec;
-        [JsonProperty("audioBitrate")]
-        public int? AudioBitrate;
+        [JsonProperty("maxBitrate")]
+        public int? MaxBitrate;
         [JsonProperty("dtx")]
         public bool? DTX;
         [JsonProperty("simulcast")]
@@ -106,8 +106,6 @@ public struct TrackPublishOptions
         public VideoEncoding? ScreenShareEncoding;
         [JsonProperty("videoCodec")]
         public VideoCodec? VideoCodec;
-        [JsonProperty("audioBitrate")]
-        public int? AudioBitrate;
         [JsonProperty("dtx")]
         public bool? DTX;
         [JsonProperty("simulcast")]

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ public enum VideoQuality`
`14`	`14`	`LOW = 0,`
`15`	`15`	`MEDIUM = 1,`
`16`	`16`	`HIGH = 2,`
`17`		`- OFF = 3,`
`18`	`17`	`UNRECOGNIZED = -1,`
`19`	`18`	`}`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,5 @@ public struct RoomConnectOptions`
`46`	`46`	`public bool AutoSubscribe;`
`47`	`47`	`[JsonProperty("rtcConfig")]`
`48`	`48`	`public RTCConfiguration? RTCConfig;`
`49`		`- [Obsolete]`
`50`		`- [JsonProperty("publishOnly")]`
`51`		`- public string PublishOnly;`
`52`	`49`	`}`
`53`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,29 +56,29 @@ public class Participant : JSEventEmitter<ParticipantEvent>`
`56`	`56`	`public event TrackStreamStateChangedDelegate TrackStreamStateChanged;`
`57`	`57`	`public event TrackSubscriptionPermissionChangedDelegate TrackSubscriptionPermissionChanged;`
`58`	`58`
`59`		`- public JSMap<string, TrackPublication> AudioTracks`
	`59`	`+ public JSMap<string, TrackPublication> AudioTrackPublications`
`60`	`60`	`{`
`61`	`61`	`get`
`62`	`62`	`{`
`63`		`- JSNative.PushString("audioTracks");`
	`63`	`+ JSNative.PushString("audioTrackPublications");`
`64`	`64`	`return Acquire<JSMap<string, TrackPublication>>(JSNative.GetProperty(NativeHandle));`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- public JSMap<string, TrackPublication> VideoTracks`
	`68`	`+ public JSMap<string, TrackPublication> VideoTrackPublications`
`69`	`69`	`{`
`70`	`70`	`get`
`71`	`71`	`{`
`72`		`- JSNative.PushString("videoTracks");`
	`72`	`+ JSNative.PushString("videoTrackPublications");`
`73`	`73`	`return Acquire<JSMap<string, TrackPublication>>(JSNative.GetProperty(NativeHandle));`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- public JSMap<string, TrackPublication> Tracks`
	`77`	`+ public JSMap<string, TrackPublication> TrackPublications`
`78`	`78`	`{`
`79`	`79`	`get`
`80`	`80`	`{`
`81`		`- JSNative.PushString("tracks");`
	`81`	`+ JSNative.PushString("trackPublications");`
`82`	`82`	`return Acquire<JSMap<string, TrackPublication>>(JSNative.GetProperty(NativeHandle));`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -344,31 +344,42 @@ private void RegisterEvents()`
`344`	`344`	`SetListener((ParticipantEvent) e, EventReceived);`
`345`	`345`	`}`
`346`	`346`
`347`		`- public JSArray<TrackPublication> GetTracks()`
	`347`	`+ public JSArray<TrackPublication> GetTrackPublications()`
`348`	`348`	`{`
`349`		`- return Acquire<JSArray<TrackPublication>>(JSNative.CallMethod(NativeHandle, "getTracks"));`
	`349`	`+ return Acquire<JSArray<TrackPublication>>(JSNative.CallMethod(NativeHandle, "getTrackPublications"));`
`350`	`350`	`}`
`351`	`351`
`352`		`- public TrackPublication GetTrack(TrackSource source)`
	`352`	`+ public TrackPublication GetTrackPublication(TrackSource source)`
`353`	`353`	`{`
`354`	`354`	`JSNative.PushString(Utils.ToEnumString(source));`
`355`	`355`
`356`		`- var ptr = JSNative.CallMethod(NativeHandle, "getTrack");`
	`356`	`+ var ptr = JSNative.CallMethod(NativeHandle, "getTrackPublication");`
`357`	`357`	`if (!JSNative.IsObject(ptr))`
`358`	`358`	`return null;`
`359`	`359`
`360`	`360`	`return Acquire<TrackPublication>(ptr);`
`361`	`361`	`}`
`362`	`362`
`363`		`- public TrackPublication GetTrackByName(string name)`
	`363`	`+ public TrackPublication GetTrackPublicationByName(string name)`
`364`	`364`	`{`
`365`	`365`	`JSNative.PushString(name);`
`366`	`366`
`367`		`- var ptr = JSNative.CallMethod(NativeHandle, "getTrackByName");`
	`367`	`+ var ptr = JSNative.CallMethod(NativeHandle, "getTrackPublicationByName");`
`368`	`368`	`if (!JSNative.IsObject(ptr))`
`369`	`369`	`return null;`
`370`	`370`
`371`	`371`	`return Acquire<TrackPublication>(ptr);`
`372`	`372`	`}`
	`373`	`+`
	`374`	`+ public TrackPublication GetTrackPublicationBySid(string sid)`
	`375`	`+ {`
	`376`	`+ JSNative.PushString(sid);`
	`377`	`+`
	`378`	`+ var ptr = JSNative.CallMethod(NativeHandle, "getTrackPublicationBySid");`
	`379`	`+ if (!JSNative.IsObject(ptr))`
	`380`	`+ return null;`
	`381`	`+`
	`382`	`+ return Acquire<TrackPublication>(ptr);`
	`383`	`+ }`
`373`	`384`	`}`
`374`	`385`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,25 +22,29 @@ public float GetVolume()`
`22`	`22`	`return (float) JSNative.GetNumber(JSNative.CallMethod(NativeHandle, "getVolume"));`
`23`	`23`	`}`
`24`	`24`
`25`		`- public new RemoteTrackPublication GetTrack(TrackSource source)`
	`25`	`+ public new RemoteTrackPublication GetTrackPublication(TrackSource source)`
`26`	`26`	`{`
`27`		`- return base.GetTrack(source) as RemoteTrackPublication;`
	`27`	`+ return base.GetTrackPublication(source) as RemoteTrackPublication;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public new RemoteTrackPublication GetTrackByName(string name)`
	`30`	`+ public new RemoteTrackPublication GetTrackPublicationByName(string name)`
`31`	`31`	`{`
`32`		`- return base.GetTrackByName(name) as RemoteTrackPublication;`
	`32`	`+ return base.GetTrackPublicationByName(name) as RemoteTrackPublication;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public RemoteTrackPublication GetTrackPublication(string sid)`
	`35`	`+`
	`36`	`+ public new RemoteTrackPublication GetTrackPublicationBySid(string sid)`
`36`	`37`	`{`
`37`		`- JSNative.PushString(sid);`
	`38`	`+ return base.GetTrackPublicationBySid(sid) as RemoteTrackPublication;`
	`39`	`+ }`
`38`	`40`
`39`		`- var ptr = JSNative.CallMethod(NativeHandle, "getTrackPublication");`
`40`		`- if (!JSNative.IsObject(ptr))`
`41`		`- return null;`
`42`		`-`
`43`		`- return Acquire<RemoteTrackPublication>(ptr);`
	`41`	`+ public JSMap<string, RemoteTrackPublication> RemotePublications`
	`42`	`+ {`
	`43`	`+ get`
	`44`	`+ {`
	`45`	`+ JSNative.PushString("trackPublications");`
	`46`	`+ return Acquire<JSMap<string, RemoteTrackPublication>>(JSNative.GetProperty(NativeHandle));`
	`47`	`+ }`
`44`	`48`	`}`
`45`	`49`	`}`
`46`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public class Room : JSEventEmitter<RoomEvent>, IDisposable`
`25`	`25`	`public delegate void ReconnectingDelegate();`
`26`	`26`	`public delegate void ReconnectedDelegate();`
`27`	`27`	`public delegate void DisconnectedDelegate(DisconnectReason? reason);`
`28`		`- public delegate void StateChangedDelegate(ConnectionState state);`
`29`	`28`	`public delegate void MediaDevicesChangedDelegate();`
`30`	`29`	`public delegate void ParticipantConnectedDelegate(RemoteParticipant participant);`
`31`	`30`	`public delegate void ParticipantDisconnectedDelegate(RemoteParticipant participant);`
`@@ -51,7 +50,6 @@ public class Room : JSEventEmitter<RoomEvent>, IDisposable`
`51`	`50`	`public event ReconnectingDelegate Reconnecting;`
`52`	`51`	`public event ReconnectedDelegate Reconnected;`
`53`	`52`	`public event DisconnectedDelegate Disconnected;`
`54`		`- public event StateChangedDelegate StateChanged;`
`55`	`53`	`public event MediaDevicesChangedDelegate MediaDevicesChanged;`
`56`	`54`	`public event ParticipantConnectedDelegate ParticipantConnected;`
`57`	`55`	`public event ParticipantDisconnectedDelegate ParticipantDisconnected;`
`@@ -105,13 +103,6 @@ private static void EventReceived(IntPtr iptr)`
`105`	`103`	`room.Disconnected?.Invoke(reason);`
`106`	`104`	`break;`
`107`	`105`	`}`
`108`		`- case RoomEvent.StateChanged:`
`109`		`- {`
`110`		`- var str = JSNative.GetString(JSNative.ShiftStack());`
`111`		`- Log.Debug($"Room: Received StateChanged(\"{str}\"");`
`112`		`- room.StateChanged?.Invoke(Utils.ToEnum<ConnectionState>(str));`
`113`		`- break;`
`114`		`- }`
`115`	`106`	`case RoomEvent.MediaDevicesChanged:`
`116`	`107`	`Log.Debug($"Room: Received MediaDevicesChanged");`
`117`	`108`	`room.MediaDevicesChanged?.Invoke();`
`@@ -320,11 +311,11 @@ public ConnectionState State`
`320`	`311`	`}`
`321`	`312`	`}`
`322`	`313`
`323`		`- public JSMap<string, RemoteParticipant> Participants`
	`314`	`+ public JSMap<string, RemoteParticipant> RemoteParticipants`
`324`	`315`	`{`
`325`	`316`	`get`
`326`	`317`	`{`
`327`		`- JSNative.PushString("participants");`
	`318`	`+ JSNative.PushString("remoteParticipants");`
`328`	`319`	`return Acquire<JSMap<string, RemoteParticipant>>(JSNative.GetProperty(NativeHandle));`
`329`	`320`	`}`
`330`	`321`	`}`
`@@ -338,13 +329,9 @@ public JSArray<Participant> ActiveSpeakers`
`338`	`329`	`}`
`339`	`330`	`}`
`340`	`331`
`341`		`- public string Sid`
	`332`	`+ public JSPromise<JSObject> GetSid()`
`342`	`333`	`{`
`343`		`- get`
`344`		`- {`
`345`		`- JSNative.PushString("sid");`
`346`		`- return JSNative.GetString(JSNative.GetProperty(NativeHandle));`
`347`		`- }`
	`334`	`+ return Acquire<JSPromise<JSObject>>(JSNative.CallMethod(NativeHandle, "getSid"));`
`348`	`335`	`}`
`349`	`336`
`350`	`337`	`public string Name`