ButtplugWSClient now requests the device list on connect

This means that during Connect() any devices already connected to the buttplug server will cause DeviceAdded events to be fired. This will include any devices that may have already been seen in the case of a reconnect (if the connection has dropped anything could have happened to the server, therefore the device list is purged and all devices are readded from scratch). As this is now called for you, the RequestDeviceList() method has been removed.

The internal device list is now accessible via a C# style getter Devices rather than the previous getDevices() method.

The nextMsgId getter has also been renamed to NextMsgId for consistency.

Author: blackspherefollower

Buttplug.Apps.ExampleClientGUI/ExampleClientPanel.xaml.cs

@@ -68,9 +68,8 @@ private async void Connect()
                 if (_client != null)
                 {
                     await _client.Connect(new Uri(AdressTextBox.Text), true);
-                    await _client.RequestDeviceList();
 
-                    foreach (var dev in _client.getDevices())
+                    foreach (var dev in _client.Devices)
                     {
                         devControl.DeviceAdded(new ButtplugDeviceInfo(dev.Index, dev.Name, dev.AllowedMessages));
                     }
@@ -142,7 +141,7 @@ private void SendLinear_Click(object sender, RoutedEventArgs e)
                         new FleshlightLaunchFW12Cmd(dev.Index,
                             Convert.ToUInt32(LinearSpeed.Value),
                             Convert.ToUInt32(LinearPosition.Value),
-                            _client.nextMsgId));
+                            _client.NextMsgId));
                 }
             }
         }
@@ -168,7 +167,7 @@ private void SendVibrate_Click(object sender, RoutedEventArgs e)
                                 new VibrateCmd(dev.Index,
                                     new List<VibrateCmd.VibrateSubcommand>
                                     { new VibrateCmd.VibrateSubcommand(i, VibrateSpeed.Value) },
-                                    _client.nextMsgId));
+                                    _client.NextMsgId));
                         }
                     }
                     catch
@@ -200,7 +199,7 @@ private void SendRotate_Click(object sender, RoutedEventArgs e)
                                 new RotateCmd(dev.Index,
                                     new List<RotateCmd.RotateSubcommand>
                                             { new RotateCmd.RotateSubcommand(i, RotateSpeed.Value * (clockwise ? 1 : -1), clockwise) },
-                                    _client.nextMsgId));
+                                    _client.NextMsgId));
                         }
                     }
                     catch
@@ -227,7 +226,7 @@ private void SendLinear2_Click(object sender, RoutedEventArgs e)
                             new LinearCmd.VectorSubcommands(0,
                                 Convert.ToUInt32(LinearDuration.Text),
                                 Linear2Position.Value),
-                        }, _client.nextMsgId));
+                        }, _client.NextMsgId));
                 }
             }
         }

Buttplug.Client.Test/ButtPlugClientTests.cs

@@ -57,7 +57,7 @@ public void CleanUp()
         [Test]
         public void TestConnection()
         {
-            AutoResetEvent eEvent = new AutoResetEvent(false);
+            var eEvent = new AutoResetEvent(false);
 
             _subtypeMgr.AddDevice(new TestDevice(_logMgr, "A", "1"));
             _server = new ButtplugWebsocketServer();
@@ -66,7 +66,7 @@ public void TestConnection()
             _client = new ButtplugTestClient("Test client");
             _client.Connect(new Uri("ws://localhost:12345/buttplug")).Wait();
 
-            var msgId = _client.nextMsgId;
+            var msgId = _client.NextMsgId;
             var res = _client.SendMsg(new Core.Messages.Test("Test string", msgId)).GetAwaiter().GetResult();
             Assert.True(res != null);
             Assert.True(res is Core.Messages.Test);
@@ -76,7 +76,7 @@ public void TestConnection()
             // Check ping is working
             Thread.Sleep(400);
 
-            msgId = _client.nextMsgId;
+            msgId = _client.NextMsgId;
             res = _client.SendMsg(new Core.Messages.Test("Test string", msgId)).GetAwaiter().GetResult();
             Assert.True(res != null);
             Assert.True(res is Core.Messages.Test);
@@ -89,10 +89,10 @@ public void TestConnection()
             Assert.True(((Core.Messages.Test)res).TestString == "Test string");
             Assert.True(((Core.Messages.Test)res).Id > msgId);
 
-            Assert.True(_client.nextMsgId > 5);
+            Assert.True(_client.NextMsgId > 5);
 
             // Test that events are raised
-            bool scanningFinished = false;
+            var scanningFinished = false;
             ButtplugClientDevice lastAdded = null;
             ButtplugClientDevice lastRemoved = null;
             _client.ScanningFinished += (aSender, aArg) =>
@@ -126,12 +126,9 @@ public void TestConnection()
             eEvent.Reset();
             Assert.True(scanningFinished);
 
-            Assert.AreEqual(1, _client.getDevices().Length);
-            Assert.AreEqual("B", _client.getDevices()[0].Name);
-            _client.RequestDeviceList().Wait();
-            Assert.AreEqual(2, _client.getDevices().Length);
-            Assert.AreEqual("A", _client.getDevices()[0].Name);
-            Assert.AreEqual("B", _client.getDevices()[1].Name);
+            Assert.AreEqual(2, _client.Devices.Length);
+            Assert.AreEqual("A", _client.Devices[0].Name);
+            Assert.AreEqual("B", _client.Devices[1].Name);
 
             eEvent.Reset();
             Assert.Null(lastRemoved);
@@ -147,8 +144,8 @@ public void TestConnection()
             eEvent.Reset();
             Assert.NotNull(lastRemoved);
             Assert.AreEqual("B", lastRemoved.Name);
-            Assert.AreEqual(1, _client.getDevices().Length);
-            Assert.AreEqual("A", _client.getDevices()[0].Name);
+            Assert.AreEqual(1, _client.Devices.Length);
+            Assert.AreEqual("A", _client.Devices[0].Name);
 
             // Shut it down
             _client.Disconnect().Wait();
@@ -164,7 +161,7 @@ public void TestSSLConnection()
             _client = new ButtplugTestClient("Test client");
             _client.Connect(new Uri("wss://localhost:12346/buttplug"), true).Wait();
 
-            var msgId = _client.nextMsgId;
+            var msgId = _client.NextMsgId;
             var res = _client.SendMsg(new Core.Messages.Test("Test string", msgId)).GetAwaiter().GetResult();
             Assert.True(res != null);
             Assert.True(res is Core.Messages.Test);
@@ -174,16 +171,14 @@ public void TestSSLConnection()
             // Check ping is working
             Thread.Sleep(400);
 
-            msgId = _client.nextMsgId;
+            msgId = _client.NextMsgId;
             res = _client.SendMsg(new Core.Messages.Test("Test string", msgId)).GetAwaiter().GetResult();
             Assert.True(res != null);
             Assert.True(res is Core.Messages.Test);
             Assert.True(((Core.Messages.Test)res).TestString == "Test string");
             Assert.True(((Core.Messages.Test)res).Id > msgId);
 
-            Assert.True(_client.nextMsgId > 4);
-
-            _client.RequestDeviceList().Wait();
+            Assert.True(_client.NextMsgId > 4);
 
             // Shut it down
             _client.Disconnect().Wait();