com.adrenak.univoice 4.10.2 → 4.10.4

package/Runtime/Impl/Networks/FishNet/FishNetClient.cs

@@ -44,7 +44,7 @@ namespace Adrenak.UniVoice.Networks
         
         public void Dispose()
         {
-            if (_networkManager)
+            if (_networkManager != null)
             {
                 _networkManager.ClientManager.OnClientConnectionState -= OnClientConnectionStateChanged;
                 _networkManager.ClientManager.OnAuthenticated -= OnClientAuthenticated;
@@ -183,9 +183,15 @@ namespace Adrenak.UniVoice.Networks
             writer.WriteIntArray(YourVoiceSettings.mutedPeers.ToArray());
             writer.WriteInt(YourVoiceSettings.deafenAll ? 1 : 0);
             writer.WriteIntArray(YourVoiceSettings.deafenedPeers.ToArray());
-            writer.WriteString(string.Join(",", YourVoiceSettings.myTags));
-            writer.WriteString(string.Join(",", YourVoiceSettings.mutedTags));
-            writer.WriteString(string.Join(",", YourVoiceSettings.deafenedTags));
+            
+            var myTags = YourVoiceSettings.myTags;
+            writer.WriteString(myTags.Count == 0 ? "," : string.Join(",", myTags));
+            
+            var mutedTags = YourVoiceSettings.mutedTags;
+            writer.WriteString(mutedTags.Count == 0 ? "," : string.Join(",", mutedTags));
+
+            var deafenedTags = YourVoiceSettings.deafenedTags;
+            writer.WriteString(deafenedTags.Count == 0 ? "," : string.Join(",", deafenedTags));
 
             var message = new FishNetBroadcast() {
                 data = writer.Bytes

package/Runtime/Impl/Networks/FishNet/FishNetServer.cs

@@ -97,7 +97,6 @@ namespace Adrenak.UniVoice.Networks
 
         private void OnClientConnectionStateChanged(ClientConnectionStateArgs args)
         {
-            // TODO - do we need to check if host or is this enough?
             if (args.ConnectionState == LocalConnectionState.Started)
             {
                 OnServerConnected(0);
@@ -150,7 +149,7 @@ namespace Adrenak.UniVoice.Networks
                         return true;
                     });
                 }
-                
+
                 // We iterate through each recipient peer that the sender wants to send audio to, checking if
                 // they have muted the sender, before forwarding the audio to them.
                 foreach (var recipient in peersToForwardAudioTo) {
@@ -179,9 +178,15 @@ namespace Adrenak.UniVoice.Networks
                 var mutedPeers = reader.ReadIntArray().ToList();
                 var deafenAll = reader.ReadInt() == 1;
                 var deafenedPeers = reader.ReadIntArray().ToList();
-                var myTags = reader.ReadString().Split(",").ToList();
-                var mutedTags = reader.ReadString().Split(",").ToList();
-                var deafenedTags = reader.ReadString().Split(",").ToList();
+                
+                var myTagsVal = reader.ReadString();
+                var myTags = myTagsVal.Equals(",") ? new List<string>() : myTagsVal.Split(",").ToList();
+                
+                var mutedTagsVal = reader.ReadString();
+                var mutedTags = mutedTagsVal.Equals(",") ? new List<string>() : mutedTagsVal.Split(",").ToList();
+                
+                var deafenedTagsVal = reader.ReadString();
+                var deafenedTags = deafenedTagsVal.Equals(",") ? new List<string>() : deafenedTagsVal.Split(",").ToList();
 
                 var voiceSettings = new VoiceSettings {
                     muteAll = muteAll,
@@ -199,14 +204,16 @@ namespace Adrenak.UniVoice.Networks
 
         private void OnServerConnected(int connId)
         {
-            Debug.unityLogger.Log(LogType.Log, TAG, $"Client {connId} connected");
+            if (ClientIDs.Contains(connId))
+                return;
             ClientIDs.Add(connId);
+            Debug.unityLogger.Log(LogType.Log, TAG, $"Client {connId} connected. IDs now: {string.Join(", ", ClientIDs)}");
         }
 
         private void OnServerDisconnected(int connId)
         {
             ClientIDs.Remove(connId);
-            Debug.unityLogger.Log(LogType.Log, TAG, $"Client {connId} disconnected");
+            Debug.unityLogger.Log(LogType.Log, TAG, $"Client {connId} disconnected. IDs now: {string.Join(", ", ClientIDs)}");
         }
 
         private void SendToClient(int clientConnId, byte[] bytes, Channel channel)

package/Runtime/Impl/Networks/Mirror/MirrorClient.cs

@@ -57,7 +57,7 @@ namespace Adrenak.UniVoice.Networks {
                 // If it was a Host that's now a ServerOnly, we still need the handler as it's used in MirrorServer
                 if (clientOnlyToOffline)
                     NetworkClient.UnregisterHandler<MirrorMessage>();
-                
+
                 OnClientDisconnected();
             }
         }
@@ -171,9 +171,15 @@ namespace Adrenak.UniVoice.Networks {
             writer.WriteIntArray(YourVoiceSettings.mutedPeers.ToArray());
             writer.WriteInt(YourVoiceSettings.deafenAll ? 1 : 0);
             writer.WriteIntArray(YourVoiceSettings.deafenedPeers.ToArray());
-            writer.WriteString(string.Join(",", YourVoiceSettings.myTags));
-            writer.WriteString(string.Join(",", YourVoiceSettings.mutedTags));
-            writer.WriteString(string.Join(",", YourVoiceSettings.deafenedTags));
+
+            var myTags = YourVoiceSettings.myTags;
+            writer.WriteString(myTags.Count == 0 ? "," : string.Join(",", myTags));
+            
+            var mutedTags = YourVoiceSettings.mutedTags;
+            writer.WriteString(mutedTags.Count == 0 ? "," : string.Join(",", mutedTags));
+
+            var deafenedTags = YourVoiceSettings.deafenedTags;
+            writer.WriteString(deafenedTags.Count == 0 ? "," : string.Join(",", deafenedTags));
 
             var message = new MirrorMessage {
                 data = writer.Bytes

package/Runtime/Impl/Networks/Mirror/MirrorServer.cs

@@ -45,7 +45,7 @@ namespace Adrenak.UniVoice.Networks {
 
             NetworkServer.RegisterHandler<MirrorMessage>(OnReceivedMessage, false);
         }
-        
+
         public void Dispose() {
             mirrorEvents.ModeChanged -= OnModeChanged;
             NetworkServer.UnregisterHandler<MirrorMessage>();
@@ -80,20 +80,20 @@ namespace Adrenak.UniVoice.Networks {
 
             // If in Host mode, the server and internal client have both started and the client connects immediately.
             // The host client seems to have ID 0 always, so we trigger a new client connection using id 0.
-            if(newMode == NetworkManagerMode.Host) {
+            if (newMode == NetworkManagerMode.Host) {
                 OnServerStarted();
                 OnServerConnected(0, "localhost");
             }
-            else if(newMode == NetworkManagerMode.ServerOnly) {
+            else if (newMode == NetworkManagerMode.ServerOnly) {
                 // If a Host changes to ServerOnly, we disconnect the internal client
                 if (oldMode == NetworkManagerMode.Host)
                     OnServerDisconnected(0);
                 // But if this machine is going from Offline to ServerOnly, only the server is starting
-                else if(oldMode == NetworkManagerMode.Offline)
+                else if (oldMode == NetworkManagerMode.Offline)
                     OnServerStarted();
             }
             // If a Host or ServerOnly goes offline 
-            else if(newMode == NetworkManagerMode.Offline && (oldMode == NetworkManagerMode.ServerOnly || oldMode == NetworkManagerMode.Host)) {
+            else if (newMode == NetworkManagerMode.Offline && (oldMode == NetworkManagerMode.ServerOnly || oldMode == NetworkManagerMode.Host)) {
                 // We check if it was a Host before and disconnect the internal client
                 if (oldMode == NetworkManagerMode.Host)
                     OnServerDisconnected(0);
@@ -164,17 +164,22 @@ namespace Adrenak.UniVoice.Networks {
                 }
             }
             else if (tag.Equals(MirrorMessageTags.VOICE_SETTINGS)) {
-                //Debug.unityLogger.Log(LogType.Log, TAG, "Mirror server stopped");
                 // We create the VoiceSettings object by reading from the reader
                 // and update the peer voice settings map
                 var muteAll = reader.ReadInt() == 1 ? true : false;
                 var mutedPeers = reader.ReadIntArray().ToList();
                 var deafenAll = reader.ReadInt() == 1 ? true : false;
                 var deafenedPeers = reader.ReadIntArray().ToList();
-                var myTags = reader.ReadString().Split(",").ToList();
-                var mutedTags = reader.ReadString().Split(",").ToList();
-                var deafenedTags = reader.ReadString().Split(",").ToList();
 
+                var myTagsVal = reader.ReadString();
+                var myTags = myTagsVal.Equals(",") ? new List<string>() : myTagsVal.Split(",").ToList();
+                
+                var mutedTagsVal = reader.ReadString();
+                var mutedTags = mutedTagsVal.Equals(",") ? new List<string>() : mutedTagsVal.Split(",").ToList();
+                
+                var deafenedTagsVal = reader.ReadString();
+                var deafenedTags = deafenedTagsVal.Equals(",") ? new List<string>() : deafenedTagsVal.Split(",").ToList();
+                
                 var voiceSettings = new VoiceSettings {
                     muteAll = muteAll,
                     mutedPeers = mutedPeers,
@@ -278,7 +283,7 @@ namespace Adrenak.UniVoice.Networks {
         }
 
         NetworkConnectionToClient GetConnectionToClient(int connId) {
-            foreach(var conn in NetworkServer.connections) 
+            foreach (var conn in NetworkServer.connections)
                 if (conn.Key == connId)
                     return conn.Value;
             return null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.adrenak.univoice",
-    "version": "4.10.2",
+    "version": "4.10.4",
     "displayName": "Adrenak.UniVoice",
     "description": "Voice chat/VoIP framework for Unity.",
     "unity": "2021.2",