release

UserInterface/UserInterface.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.8" />
     <PackageReference Include="Avalonia.Win32" Version="0.10.8" />
     <PackageReference Include="JKang.IpcServiceFramework.Client.NamedPipe" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\hass-workstation-service\hass-workstation-service.csproj" />

UserInterface/ViewModels/AddSensorViewModel.cs

@@ -13,6 +13,7 @@ namespace UserInterface.ViewModels
         private bool _showWindowNameInput;
         private string _moreInfoLink;
         private string _query;
+        private string _scope;
         private string _windowName;
 
         public AvailableSensors SelectedType { get => _selectedType; set => this.RaiseAndSetIfChanged(ref _selectedType, value); }
@@ -23,6 +24,7 @@ namespace UserInterface.ViewModels
         public bool ShowWindowNameInput { get => _showWindowNameInput; set => this.RaiseAndSetIfChanged(ref _showWindowNameInput, value); }
         public string MoreInfoLink { get => _moreInfoLink; set => this.RaiseAndSetIfChanged(ref _moreInfoLink, value); }
         public string Query { get => _query; set => this.RaiseAndSetIfChanged(ref _query, value); }
+        public string Scope { get => _scope; set => this.RaiseAndSetIfChanged(ref _scope, value); }
         public string WindowName { get => _windowName; set => this.RaiseAndSetIfChanged(ref _windowName, value); }
     }
 }

UserInterface/Views/AddSensorDialog.axaml

@@ -21,8 +21,10 @@
             <TextBox Text="{Binding UpdateInterval}" HorizontalAlignment="Right" MaxWidth="30"/>
         </StackPanel>
         <TextBlock Text="{Binding UpdateInterval, StringFormat= Update every {0} seconds}" HorizontalAlignment="Left" MinWidth="150"/>
-        <ContentControl IsVisible="{Binding ShowQueryInput}" Margin="0 20 0 10">Query</ContentControl>
-        <TextBox IsVisible="{Binding ShowQueryInput}" Text="{Binding Query}" Watermark="SELECT Name FROM Win32_Processor" HorizontalAlignment="Left" MinWidth="300"/>
+        <ContentControl IsVisible="{Binding ShowQueryInput}" Margin="0 20 0 10">Scope (optional)</ContentControl>
+        <TextBox IsVisible="{Binding ShowQueryInput}" Text="{Binding Scope}" Watermark="\\localhost\ROOT\StandardCimv2" HorizontalAlignment="Left" MinWidth="300"/>
+      <ContentControl IsVisible="{Binding ShowQueryInput}" Margin="0 20 0 10">Query</ContentControl>
+      <TextBox IsVisible="{Binding ShowQueryInput}" Text="{Binding Query}" Watermark="SELECT Name FROM Win32_Processor" HorizontalAlignment="Left" MinWidth="300"/>
         <ContentControl IsVisible="{Binding ShowWindowNameInput}" Margin="0 20 0 5">Window name</ContentControl>
         <TextBlock TextWrapping="Wrap" MaxWidth="300" FontStyle="Italic" IsVisible="{Binding ShowWindowNameInput}" Margin="0 0 0 10">This is case-insensitive and loosely matched. A window called "Spotify Premium" will match "spotify" or "premium".</TextBlock>
         <TextBox IsVisible="{Binding ShowWindowNameInput}" Text="{Binding WindowName}" Watermark="Visual Studio Code" HorizontalAlignment="Left" MinWidth="300"/>

UserInterface/Views/AddSensorDialog.axaml.cs

@@ -67,6 +67,7 @@ namespace UserInterface.Views
             item.Name = sensor.Name;
             item.UpdateInterval = sensor.UpdateInterval;
             item.Query = sensor.Query;
+            item.Scope = sensor.Scope;
             item.WindowName = sensor.WindowName;
 
             Title = $"Edit {sensor.Name}";
@@ -75,7 +76,7 @@ namespace UserInterface.Views
         public async void Save(object sender, RoutedEventArgs args)
         {
             var item = (AddSensorViewModel)DataContext;
-            dynamic model = new { item.Name, item.Query, item.UpdateInterval, item.WindowName };
+            dynamic model = new { item.Name, item.Query, item.UpdateInterval, item.WindowName, item.Scope };
             string json = JsonSerializer.Serialize(model);
             if (SensorId == Guid.Empty)
                 await _client.InvokeAsync(x => x.AddSensor(item.SelectedType, json));

UserInterface/Views/BrokerSettings.axaml

@@ -26,7 +26,7 @@
     <ContentControl  Margin="0 20 0 10">Password</ContentControl>
     <TextBox Text="{Binding Password}" MinWidth="150" PasswordChar="•"/>
 
-    <Expander Header="Advanced">
+    <Expander Header="Advanced" Margin="0 20 0 0">
       <StackPanel>
         <StackPanel>
           <StackPanel Margin="0 20 0 10" HorizontalAlignment="Left" Orientation="Horizontal">

documentation/WMIQuery.md

@@ -13,7 +13,7 @@ The command ```sql SELECT * FROM Win32_Processor``` cannot be used because it re
 
 
 You can use [WMI Explorer](https://github.com/vinaypamnani/wmie2/releases) to construct a query, or alternatively look at the user submitted sensors below
-
+If a class or value cannot be found in the default scope, you can use the "Scope" setting when adding or editing the sensor. 
 ---
 
 ## User Submitted Sensor Examples

hass-workstation-service/Communication/InterProcesCommunication/InterProcessApi.cs

@@ -173,7 +173,7 @@ namespace hass_workstation_service.Communication.InterProcesCommunication
                 AvailableSensors.DummySensor => new DummySensor(_publisher, (int)model.UpdateInterval, model.Name),
                 AvailableSensors.CurrentClockSpeedSensor => new CurrentClockSpeedSensor(_publisher, (int)model.UpdateInterval, model.Name),
                 AvailableSensors.CPULoadSensor => new CPULoadSensor(_publisher, (int)model.UpdateInterval, model.Name),
-                AvailableSensors.WMIQuerySensor => new WMIQuerySensor(_publisher, model.Query, (int)model.UpdateInterval, model.Name),
+                AvailableSensors.WMIQuerySensor => new WMIQuerySensor(_publisher, model.Query, (int)model.UpdateInterval, model.Name, scope: model.Scope),
                 AvailableSensors.MemoryUsageSensor => new MemoryUsageSensor(_publisher, (int)model.UpdateInterval, model.Name),
                 AvailableSensors.ActiveWindowSensor => new ActiveWindowSensor(_publisher, (int)model.UpdateInterval, model.Name),
                 AvailableSensors.WebcamActiveSensor => new WebcamActiveSensor(_publisher, (int)model.UpdateInterval, model.Name),

hass-workstation-service/Communication/InterProcesCommunication/ServiceContractModels.cs

@@ -30,6 +30,7 @@ namespace hass_workstation_service.Communication.InterProcesCommunication.Models
         public string Name { get; set; }
         public string Value { get; set; }
         public string Query { get; set; }
+        public string Scope { get; set; }
         public string WindowName { get; set; }
         public int UpdateInterval { get; set; }
         public string UnitOfMeasurement { get; set; }
@@ -44,6 +45,7 @@ namespace hass_workstation_service.Communication.InterProcesCommunication.Models
             if (sensor is WMIQuerySensor wMIQuerySensor)
             {
                 this.Query = wMIQuerySensor.Query;
+                this.Scope = wMIQuerySensor.Scope;
             }
             if (sensor is NamedWindowSensor namedWindowSensor)
             {

hass-workstation-service/Data/ConfigurationService.cs

@@ -157,7 +157,7 @@ namespace hass_workstation_service.Data
                         break;
                     // keep this one last!
                     case "WMIQuerySensor":
-                        sensor = new WMIQuerySensor(publisher, configuredSensor.Query, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.Id);
+                        sensor = new WMIQuerySensor(publisher, configuredSensor.Query, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.Id, configuredSensor.Scope);
                         break;
                     default:
                         Log.Logger.Error("unsupported sensor type in config");
@@ -210,22 +210,22 @@ namespace hass_workstation_service.Data
                     case "CustomCommand":
                         command = new CustomCommand(publisher, configuredCommand.Command, configuredCommand.Name, configuredCommand.Id);
                         break;
-                    case "MediaPlayPauseCommand":
+                    case "PlayPauseCommand":
                         command = new PlayPauseCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
-                    case "MediaNextCommand":
+                    case "NextCommand":
                         command = new NextCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
-                    case "MediaPreviousCommand":
+                    case "PreviousCommand":
                         command = new PreviousCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
-                    case "MediaVolumeUpCommand":
+                    case "VolumeUpCommand":
                         command = new VolumeUpCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
-                    case "MediaVolumeDownCommand":
+                    case "VolumeDownCommand":
                         command = new VolumeDownCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
-                    case "MediaMuteCommand":
+                    case "MuteCommand":
                         command = new MuteCommand(publisher, configuredCommand.Name, configuredCommand.Id);
                         break;
                     case "KeyCommand":
@@ -412,7 +412,7 @@ namespace hass_workstation_service.Data
                     if (sensor is WMIQuerySensor wmiSensor)
                     {
 #pragma warning disable CA1416 // Validate platform compatibility. We ignore it here because this would never happen. A cleaner solution may be implemented later.
-                        configuredSensorsToSave.Add(new ConfiguredSensor() { Id = wmiSensor.Id, Name = wmiSensor.Name, Type = wmiSensor.GetType().Name, UpdateInterval = wmiSensor.UpdateInterval, Query = wmiSensor.Query });
+                        configuredSensorsToSave.Add(new ConfiguredSensor() { Id = wmiSensor.Id, Name = wmiSensor.Name, Type = wmiSensor.GetType().Name, UpdateInterval = wmiSensor.UpdateInterval, Query = wmiSensor.Query, Scope = wmiSensor.Scope });
 #pragma warning restore CA1416 // Validate platform compatibility
                     }
                     else if (sensor is NamedWindowSensor namedWindowSensor)

hass-workstation-service/Data/ConfiguredSensor.cs

@@ -9,6 +9,7 @@ namespace hass_workstation_service.Data
         public Guid Id { get; set; }
         public string Name { get; set; }
         public string Query { get; set; }
+        public string Scope { get; set; }
         public int? UpdateInterval { get; set; }
         public string WindowName { get; set; }
     }

hass-workstation-service/Domain/Sensors/WMIQuerySensor.cs

@@ -12,13 +12,26 @@ namespace hass_workstation_service.Domain.Sensors
     public class WMIQuerySensor : AbstractSensor
     {
         public string Query { get; private set; }
+        public string Scope { get; private set; }
         protected readonly ObjectQuery _objectQuery;
         protected readonly ManagementObjectSearcher _searcher;
-        public WMIQuerySensor(MqttPublisher publisher, string query, int? updateInterval = null, string name = "WMIQuerySensor", Guid id = default) : base(publisher, name ?? "WMIQuerySensor", updateInterval ?? 10, id)
+        public WMIQuerySensor(MqttPublisher publisher, string query, int? updateInterval = null, string name = "WMIQuerySensor", Guid id = default, string scope = "") : base(publisher, name ?? "WMIQuerySensor", updateInterval ?? 10, id)
         {
             this.Query = query;
+            this.Scope = scope;
             _objectQuery = new ObjectQuery(this.Query);
-            _searcher = new ManagementObjectSearcher(query);
+            ManagementScope managementscope;
+            // if we have a custom scope, use that
+            if (!string.IsNullOrWhiteSpace(scope))
+            {
+                managementscope = new ManagementScope(scope);
+            }
+            // otherwise, use the default
+            else
+            {
+                managementscope = new ManagementScope(@"\\localhost\");
+            }
+            _searcher = new ManagementObjectSearcher(managementscope, _objectQuery);
         }
         public override SensorDiscoveryConfigModel GetAutoDiscoveryConfig()
         {

hass-workstation-service/Properties/PublishProfiles/AzureHosted.pubxml

@@ -4,11 +4,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ApplicationRevision>57</ApplicationRevision>
+    <ApplicationRevision>58</ApplicationRevision>
     <ApplicationVersion>1.0.0.*</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
+    <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
     <ErrorReportUrl>https://github.com/sleevezipper/hass-workstation-service</ErrorReportUrl>
     <GenerateManifests>True</GenerateManifests>
     <Install>true</Install>
@@ -16,8 +17,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <InstallUrl>https://hassworkstationstorage.z6.web.core.windows.net/publish/</InstallUrl>
     <IsRevisionIncremented>True</IsRevisionIncremented>
     <IsWebBootstrapper>True</IsWebBootstrapper>
-    <ManifestCertificateThumbprint>820B7EDF3E26E24BB4C25B177A05B3D0C77BF73A</ManifestCertificateThumbprint>
-    <ManifestKeyFile>hass-workstation-service_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestCertificateThumbprint>66F1CEE175B90B89AFD3AA8F5F649268BF4DFA9E</ManifestCertificateThumbprint>
+    <ManifestKeyFile>hass-workstation-service_1_TemporaryKey.pfx</ManifestKeyFile>
     <MapFileExtensions>true</MapFileExtensions>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <Platform>Any CPU</Platform>
@@ -37,12 +38,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TrustUrlParameters>True</TrustUrlParameters>
     <UpdateEnabled>True</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
-    <History>False|2021-11-14T15:44:38.1032015Z;</History>
+    <UpdateRequired>False</UpdateRequired>
+    <WebPageFileName>Publish.html</WebPageFileName>
   </PropertyGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.NetCore.CoreRuntime.5.0.x64">
-      <Install>true</Install>
-      <ProductName>.NET Runtime 5.0.1 (x64)</ProductName>
+      <Install>True</Install>
+      <ProductName>.NET Runtime 5.0.12 (x64)</ProductName>
     </BootstrapperPackage>
   </ItemGroup>
 </Project>

hass-workstation-service/hass-workstation-service.csproj

@@ -55,15 +55,15 @@
 
   <ItemGroup>
     <PackageReference Include="JKang.IpcServiceFramework.Hosting.NamedPipe" Version="3.1.0" />
-    <PackageReference Include="LibreHardwareMonitorLib" Version="0.8.8" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+    <PackageReference Include="LibreHardwareMonitorLib" Version="0.8.9" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="MQTTnet" Version="3.0.16" />
-    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.16" />
+    <PackageReference Include="MQTTnet" Version="3.1.1" />
+    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.1.1" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="System.Management" Version="5.0.0" />
+    <PackageReference Include="System.Management" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>