Add chatbox variable for device name

Closes #1

Author: WentTheFox

BluetoothHeartrateModule/BluetoothHeartrateModule.cs

@@ -40,6 +40,8 @@ protected override void CreateAttributes()
             CreateSetting(BluetoothHeartrateSetting.WebsocketServerEnabled, @"Websocket Server Enabled", @"Broadcast the heartrate data over a local Websocket server", false);
             CreateSetting(BluetoothHeartrateSetting.WebsocketServerHost, @"Websocket Server Hostname", @"Hostname (IP address) for the Websocket server", "127.0.0.1", () => GetSetting<bool>(BluetoothHeartrateSetting.WebsocketServerEnabled));
             CreateSetting(BluetoothHeartrateSetting.WebsocketServerPort, @"Websocket Server Port", @"Port for the Websocket server", 36210, () => GetSetting<bool>(BluetoothHeartrateSetting.WebsocketServerEnabled));
+
+            CreateVariable(BluetoothHeartratevariable.DeviceName, @"Device Name", "device");
         }
 
         protected override async void OnModuleStart()
@@ -72,6 +74,17 @@ internal int GetWebocketPortSetting()
         {
             return GetSetting<int>(BluetoothHeartrateSetting.WebsocketServerPort);
         }
+
+        internal void StopWatcher()
+        {
+            watcher?.Stop();
+        }
+
+        internal void SetDeviceName(string deviceName)
+        {
+            SetVariableValue(BluetoothHeartratevariable.DeviceName, deviceName);
+        }
+
         private async void SendWebcoketHeartrate(int heartrate)
         {
             await wsServer.SendIntMessage(heartrate);
@@ -86,17 +99,17 @@ private void ResetWatcher()
             }
         }
 
-        internal void StopWatcher()
-        {
-            watcher?.Stop();
-        }
-
         internal enum BluetoothHeartrateSetting
         {
             DeviceMac,
             WebsocketServerEnabled,
             WebsocketServerHost,
             WebsocketServerPort
         }
+
+        internal enum BluetoothHeartratevariable
+        {
+            DeviceName
+        }
     }
 }

BluetoothHeartrateModule/BluetoothHeartrateModule.csproj

@@ -4,8 +4,8 @@
 		<TargetFramework>net6.0-windows10.0.22621.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<AssemblyVersion>1.2.0.0</AssemblyVersion>
-		<FileVersion>1.2.0.0</FileVersion>
+		<AssemblyVersion>1.3.0</AssemblyVersion>
+		<FileVersion>1.3.0</FileVersion>
 		<Authors>DJDavid98</Authors>
 		<Product>Bluetooth Heartrate</Product>
 		<ApplicationIcon>logo\logo.ico</ApplicationIcon>
@@ -15,4 +15,8 @@
 		<PackageReference Include="VolcanicArts.VRCOSC.SDK" Version="2023.601.0" />
 	</ItemGroup>
 
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+	  <Exec Command="copy /Y &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%25appdata%25\VRCOSC\assemblies\$(TargetName).dll&quot;" />
+	</Target>
+
 </Project>

BluetoothHeartrateModule/BluetoothHeartrateProvider.cs

@@ -8,7 +8,7 @@ namespace BluetoothHeartrateModule
 {
     public class BluetoothHeartrateProvider : HeartrateProvider
     {
-        private Dictionary<string, string?> potentialDevices = new();
+        private Dictionary<string, string?> deviceNames = new();
         private GattCharacteristic? heartRateCharacteristic;
         private HashSet<string> missingCharacteristicDevices = new();
         private bool processingData = false;
@@ -61,7 +61,7 @@ private void Reset()
                 module.watcher.Received -= Watcher_Received;
                 module.watcher.Stopped -= Watcher_Stopped;
             }
-            potentialDevices.Clear();
+            deviceNames.Clear();
             missingCharacteristicDevices.Clear();
             ResetDevice();
             processingData = false;
@@ -87,19 +87,26 @@ private async void Watcher_Received(BluetoothLEAdvertisementWatcher sender, Blue
 
             var advertisementMac = Converter.FormatAsMac(args.BluetoothAddress);
             var deviceMacSetting = module.GetDeviceMacSetting();
-            if (deviceMacSetting == string.Empty)
+            var isConfiguredDevice = advertisementMac == deviceMacSetting;
+            if (deviceMacSetting == string.Empty || isConfiguredDevice)
             {
-                var potentialDevicesValue = potentialDevices.GetValueOrDefault(advertisementMac, null);
-                if (potentialDevicesValue == null)
+                var deviceNamesValue = deviceNames.GetValueOrDefault(advertisementMac, null);
+                if (deviceNamesValue == null)
                 {
                     var advertisementDeviceName = await DeviceNameResolver.GetDeviceNameAsync(args.Advertisement, args.BluetoothAddress);
-                    potentialDevices[advertisementMac] = advertisementDeviceName;
-                    Log($"Discovered device: {advertisementDeviceName} (MAC: {advertisementMac})");
+                    deviceNames[advertisementMac] = advertisementDeviceName;
+                    if (!isConfiguredDevice)
+                    {
+                        Log($"Discovered device: {advertisementDeviceName} (MAC: {advertisementMac})");
+                    }
+                }
+                if (!isConfiguredDevice)
+                {
+                    return;
                 }
-                return;
             }
 
-            if (advertisementMac != deviceMacSetting)
+            if (!isConfiguredDevice)
             {
                 // Not the droid we're looking for
                 return;
@@ -117,7 +124,9 @@ private async void Watcher_Received(BluetoothLEAdvertisementWatcher sender, Blue
                 if (currentDevice == null)
                 {
                     currentDevice = await BluetoothLEDevice.FromBluetoothAddressAsync(args.BluetoothAddress);
-                    Log($"Found device for MAC {advertisementMac}");
+                    var currentDeviceName = deviceNames[advertisementMac] ?? "Unknown";
+                    Log($"Found device named {currentDeviceName} for MAC {advertisementMac}");
+                    module.SetDeviceName(currentDeviceName);
                 }
 
                 var missungUnknown = !missingCharacteristicDevices.Contains(deviceMacSetting);