v1.0.0

livekit · May 17, 2022 · 4f815a3 · 4f815a3
1 parent 509e76a
commit 4f815a3
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 92 deletions.
diff --git a/Bridge~/package-lock.json b/Bridge~/package-lock.json
diff --git a/Bridge~/package.json b/Bridge~/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@livekit/livekit-unity",
-  "version": "0.2.1",
+  "version": "1.0.0",
   "description": "LiveKit Unity Bridge for WebGL",
   "main": "dist/index.js",
   "source": "src/index.ts",
@@ -16,7 +16,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "livekit-client": "^0.18.2",
+    "livekit-client": "^1.0.0",
     "typed-emitter": "^2.1.0"
   },
   "devDependencies": {

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This package only works on the WebGL platform of Unity
 ## Docs
 Docs and guides at https://docs.livekit.io
 
-As this package is a bridge to [client-sdk-js](https://github.com/livekit/client-sdk-js), you can use its [SDK reference](https://docs.livekit.io/client-sdk-js/)
+[SDK reference](https://livekit.github.io/client-sdk-unity-web/)
 
 ## Installation :
 Follow this [unity tutorial](https://docs.unity3d.com/Manual/upm-ui-giturl.html) using the `https://github.com/livekit/client-sdk-unity-web.git` link.

diff --git a/Runtime/Plugins/livekit-client.jspre b/Runtime/Plugins/livekit-client.jspre
diff --git a/Runtime/Scripts/Client.cs b/Runtime/Scripts/Client.cs
@@ -42,17 +42,5 @@ public static JSPromise<JSArray<LocalTrack>> CreateLocalScreenTracks(ScreenShare
 
             return JSRef.Acquire<JSPromise<JSArray<LocalTrack>>>(JSNative.CallMethod(JSNative.LiveKit, "createLocalScreenTracks"));
         }
-
-        [Obsolete("Use room.connect() instead")]
-        public static ConnectOperation Connect(string url, string token, ConnectOptions? options)
-        {
-            JSNative.PushString(url);
-            JSNative.PushString(token);
-
-            if (options != null)
-                JSNative.PushStruct(JsonConvert.SerializeObject(options, JSNative.JsonSettings));
-
-            return JSRef.Acquire<ConnectOperation>(JSNative.CallMethod(JSNative.LiveKit, "connect"));
-        }
     }
 }
diff --git a/Runtime/Scripts/Options.cs b/Runtime/Scripts/Options.cs
@@ -49,48 +49,4 @@ public struct RoomConnectOptions
         [JsonProperty("publishOnly")]
         public string PublishOnly;
     }
-
-    [Obsolete("Use new Room(RoomOptions) and room.connect(RoomConnectOptions) instead")]
-    public struct ConnectOptions
-    {
-        [JsonProperty("autoSubscribe")]
-        public bool? AutoSubscribe;
-        [JsonProperty("adaptiveStream")]
-        public bool? AdaptiveStream;
-        [JsonProperty("autoManageVideo")]
-        public bool? AutoManageVideo;
-        [JsonProperty("dynacast")]
-        public bool? Dynacast;
-        [JsonProperty("logLevel")]
-        public LogLevel? LogLevel;
-        [JsonProperty("iceServers")]
-        public RTCIceServer[] iceServers;
-        [JsonProperty("rtcConfig")]
-        public RTCConfiguration? RTCConfig;
-        [JsonProperty("audio")]
-        public bool? PublishAudio;
-        [JsonProperty("video")]
-        public bool? PublishVideo;
-        [JsonProperty("audioCaptureDefaults")]
-        public AudioCaptureOptions? AudioCaptureDefaults;
-        [JsonProperty("videoCaptureDefaults")]
-        public VideoCaptureOptions? VideoCaptureDefaults;
-        [JsonProperty("publishDefaults")]
-        public TrackPublishDefaults? PublishDefaults;
-        [JsonProperty("stopLocalTrackOnUnpublish")]
-        public bool? StopLocalTrackOnUnpublish;
-        [JsonProperty("expDisableLayerPause")]
-        public bool? ExpDisableLayerPause;
-
-        // CreateLocalTracksOptions TODO
-        /*[JsonProperty("audio")]
-        public bool? AudioEnabled;
-        [JsonProperty("audio")]
-        public AudioCaptureOptions? Audio;
-
-        [JsonProperty("video")]
-        public bool? VideoEnabled;
-        [JsonProperty("video")]
-        public VideoCaptureOptions? Video;*/
-    }
 }
diff --git a/Runtime/Scripts/Room/Room.cs b/Runtime/Scripts/Room/Room.cs
@@ -3,15 +3,16 @@
 using AOT;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using UnityEngine;
 using UnityEngine.Scripting;
 
 namespace LiveKit
 {
     [JsonConverter(typeof(StringEnumConverter))]
-    public enum RoomState {
+    public enum ConnectionState {
         [EnumMember(Value = "disconnected")]
         Disconnected,
+        [EnumMember(Value = "connecting")]
+        Connecting,
         [EnumMember(Value = "connected")]
         Connected,
         [EnumMember(Value = "reconnecting")]
@@ -23,7 +24,7 @@ public class Room : JSEventEmitter<RoomEvent>
         public delegate void ReconnectingDelegate();
         public delegate void ReconnectedDelegate();
         public delegate void DisconnectedDelegate();
-        public delegate void StateChangedDelegate(RoomState state);
+        public delegate void StateChangedDelegate(ConnectionState state);
         public delegate void MediaDevicesChangedDelegate();
         public delegate void ParticipantConnectedDelegate(RemoteParticipant participant);
         public delegate void ParticipantDisconnectedDelegate(RemoteParticipant participant);
@@ -100,7 +101,7 @@ private static void EventReceived(IntPtr iptr)
                         {
                             var str = JSNative.GetString(JSNative.ShiftStack());
                             Log.Debug($"Room: Received StateChanged(\"{str}\"");
-                            room.StateChanged?.Invoke(Utils.ToEnum<RoomState>(str));
+                            room.StateChanged?.Invoke(Utils.ToEnum<ConnectionState>(str));
                             break;
                         }
                     case RoomEvent.MediaDevicesChanged:
@@ -293,13 +294,22 @@ private static void EventReceived(IntPtr iptr)
                 throw;
             }
         }
+
+        public bool IsClosed
+        {
+            get
+            {
+                JSNative.PushString("isClosed");
+                return JSNative.GetBoolean(JSNative.GetProperty(NativeHandle));
+            }
+        }
 
-        public RoomState State
+        public ConnectionState State
         {
             get
             {
                 JSNative.PushString("state");
-                return Utils.ToEnum<RoomState>(JSNative.GetString(JSNative.GetProperty(NativeHandle)));
+                return Utils.ToEnum<ConnectionState>(JSNative.GetString(JSNative.GetProperty(NativeHandle)));
             }
         }
 

diff --git a/Runtime/Scripts/Room/Track/Options.cs b/Runtime/Scripts/Room/Track/Options.cs
@@ -239,15 +239,10 @@ public class VideoPresets
         public static readonly VideoPreset H216 = new VideoPreset(384, 216, 180_000, 15);
         public static readonly VideoPreset H360 = new VideoPreset(640, 360, 300_000, 20);
         public static readonly VideoPreset H540 = new VideoPreset(960, 540, 600_000, 25);
-        public static readonly VideoPreset H720 = new VideoPreset(1280, 720, 2_000_000, 30);
+        public static readonly VideoPreset H720 = new VideoPreset(1280, 720, 1_700_000, 30);
         public static readonly VideoPreset H1080 = new VideoPreset(1920, 1080, 3_000_000, 30);
         public static readonly VideoPreset H1440 = new VideoPreset(2560, 1440, 5_000_000, 30);
         public static readonly VideoPreset H2160 = new VideoPreset(3840, 2160, 8_000_000, 30);
-        [Obsolete] public static readonly VideoPreset QVGA = new VideoPreset(320, 180, 120_000, 10);
-        [Obsolete] public static readonly VideoPreset VGA = new VideoPreset(320, 180, 120_000, 10);
-        [Obsolete] public static readonly VideoPreset QHD = new VideoPreset(320, 180, 120_000, 10);
-        [Obsolete] public static readonly VideoPreset HD = new VideoPreset(320, 180, 120_000, 10);
-        [Obsolete] public static readonly VideoPreset FHD = new VideoPreset(320, 180, 120_000, 10);
     }
 
     public class VideoPresets43
@@ -261,11 +256,6 @@ public class VideoPresets43
         public static readonly VideoPreset H720 = new VideoPreset(960, 720, 1_500_000, 30);
         public static readonly VideoPreset H1080 = new VideoPreset(1440, 1080, 2_500_000, 30);
         public static readonly VideoPreset H1440 = new VideoPreset(1920, 1440, 3_500_000, 30);
-        [Obsolete] public static readonly VideoPreset QVGA = new VideoPreset(240, 180, 90_000, 10);
-        [Obsolete] public static readonly VideoPreset VGA = new VideoPreset(480, 360, 225_000, 20);
-        [Obsolete] public static readonly VideoPreset QHD = new VideoPreset(720, 540, 450_000, 25);
-        [Obsolete] public static readonly VideoPreset HD = new VideoPreset(960, 720, 1_500_000, 30);
-        [Obsolete] public static readonly VideoPreset FHD = new VideoPreset(1440, 1080, 2_800_000, 30);
     }
 
     public class ScreenSharePresets
@@ -275,10 +265,5 @@ public class ScreenSharePresets
         public static readonly VideoPreset H720_FPS15 = new VideoPreset(1280, 720, 1_000_000, 15);
         public static readonly VideoPreset H1080_FPS15 = new VideoPreset(1920, 1080, 1_500_000, 15);
         public static readonly VideoPreset H1080_FPS30 = new VideoPreset(1920, 1080, 3_000_000, 30);
-        [Obsolete] public static readonly VideoPreset VGA = new VideoPreset(640, 360, 200_000, 3);
-        [Obsolete] public static readonly VideoPreset HD_8 = new VideoPreset(1280, 720, 400_000, 5);
-        [Obsolete] public static readonly VideoPreset HD_15 = new VideoPreset(1280, 720, 1_000_000, 15);
-        [Obsolete] public static readonly VideoPreset FHD_15 = new VideoPreset(1920, 1080, 1_500_000, 15);
-        [Obsolete] public static readonly VideoPreset FHD_30 = new VideoPreset(1920, 1080, 3_000_000, 30);
     }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "io.livekit.unity",
-  "version": "0.2.1",
+  "version": "1.0.0",
   "displayName": "LiveKit WebGL SDK",
   "description": "LiveKit Unity Bridge for WebGL",
   "unity": "2021.3",