Merge pull request #4 from jiilaa/net60

.NET 6.0
jiilaa · Jul 23, 2022 · 97dcbf5 · 97dcbf5
2 parents fd364ef + fe62817
commit 97dcbf5
Show file tree

Hide file tree

Showing 40 changed files with 654 additions and 408 deletions.
diff --git a/Common/AlertSettings.cs b/Common/AlertSettings.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace net.jommy.RuuviCore.Common
+{
+    public class AlertSettings
+    {
+        public List<string> EndPoints { get; set; }
+    }
+}
diff --git a/Common/AlertThresholds.cs b/Common/AlertThresholds.cs
@@ -0,0 +1,8 @@
+namespace net.jommy.RuuviCore.Common;
+
+public class AlertThresholds
+{
+    public decimal? MinValidValue { get; set; }
+
+    public decimal? MaxValidValue { get; set; }
+}
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>net.jommy.RuuviCore.Common</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Orleans.Streams.Utils" Version="9.0.0" />
+      <PackageReference Include="Orleans.Streams.Utils" Version="11.1.0" />
     </ItemGroup>
 
 </Project>
diff --git a/Common/InfluxSettings.cs b/Common/InfluxSettings.cs
@@ -9,6 +9,10 @@ public class InfluxSettings
         public string InfluxDatabase { get; set; }
         public string InfluxMeasurementTable { get; set; }
 
+        public string Username { get; set; }
+
+        public string Password { get; set; }
+
         public InfluxSettings()
         {
             InfluxAddress = DefaultInfluxAddress;

diff --git a/Common/RuuviCoreConstants.cs b/Common/RuuviCoreConstants.cs
@@ -3,5 +3,6 @@ namespace net.jommy.RuuviCore.Common
     public static class RuuviCoreConstants
     {
         public const string GrainStorageName = "RuuviStorage";
+        public const string StreamProviderName = "RuuviStreamProvider";
     }
 }
diff --git a/FileStorageProvider/FileStorageProvider.csproj b/FileStorageProvider/FileStorageProvider.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>net.jommy.Orleans</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
-    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="3.6.2" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.6.2" />
+    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.6.2" />
   </ItemGroup>
 
 </Project>
diff --git a/GrainInterfaces/GrainInterfaces.csproj b/GrainInterfaces/GrainInterfaces.csproj
@@ -1,16 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>net.jommy.RuuviCore.Interfaces</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
+    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.6.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/GrainInterfaces/MeasurementEnvelope.cs b/GrainInterfaces/MeasurementEnvelope.cs
@@ -1,17 +1,12 @@
 using System;
 
-namespace net.jommy.RuuviCore.Interfaces
-{
-    [Serializable]
-    public class MeasurementEnvelope
-    {
-        public MeasurementEnvelope()
-        {
-        }
+namespace net.jommy.RuuviCore.Interfaces;
 
-        public string MacAddress { get; set; }
-        public DateTime Timestamp { get; set; }
-        public short SignalStrength { get; set; }
-        public byte[] Data { get; set; }
-    }
+[Serializable]
+public class MeasurementEnvelope
+{
+    public string MacAddress { get; set; }
+    public DateTime Timestamp { get; set; }
+    public short? SignalStrength { get; set; }
+    public byte[] Data { get; set; }
 }
diff --git a/GrainInterfaces/Measurements.cs b/GrainInterfaces/Measurements.cs
@@ -27,7 +27,11 @@ public class Measurements
 
         public override string ToString()
         {
-            return $"[#{SequenceNumber} @ Timestamp:{Timestamp}. Humidity:{Humidity}, Temperature:{Temperature}, Pressure:{Pressure}, BatteryVoltage:{BatteryVoltage}, Acceleration:{Acceleration}, RSSI:{RSSI}, TX Power:{TransmissionPower}, MovementCounter:{MovementCounter}";
+            if (Acceleration != null)
+            {
+                return $"[#{SequenceNumber} @ {Timestamp}. Humidity:{Humidity}, Temperature:{Temperature}, Pressure:{Pressure}, Battery:{BatteryVoltage}, Acceleration:{Acceleration}, RSSI:{RSSI}, Movement:{MovementCounter}";
+            }
+            return $"[#{SequenceNumber} @ {Timestamp}. Humidity:{Humidity}, Temperature:{Temperature}, Pressure:{Pressure}, Battery:{BatteryVoltage}, RSSI:{RSSI}, Movement:{MovementCounter}";
         }
     }
 }
diff --git a/GrainInterfaces/RuuviTag.cs b/GrainInterfaces/RuuviTag.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using net.jommy.RuuviCore.Common;
 
 namespace net.jommy.RuuviCore.Interfaces
 {
@@ -12,7 +14,7 @@ public class RuuviTag
         public bool StoreName { get; set; }
         public bool DiscardMinMaxValues { get; set; }
         public bool AllowMeasurementsThroughGateway { get; set; }
-
         public bool IncludeInDashboard { get; set; }
+        public IDictionary<string, AlertThresholds> AlertRules { get; set; }
     }
 }
diff --git a/GrainServices/AbstractDeviceListener.cs b/GrainServices/AbstractDeviceListener.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using bluez.DBus;
@@ -10,17 +11,21 @@ namespace net.jommy.RuuviCore.GrainServices
 {
     public abstract class AbstractDeviceListener : IDeviceListener
     {
+        private const int AliveThreshold = 60; 
         private const string SignalStrengthKeyName = "RSSI";
         private const string ManufacturerDataKeyName = "ManufacturerData";
 
         private readonly IDevice1 _device;
         private IDisposable _propertiesWatcher;
+        private int _aliveCounter;
 
         protected readonly string DeviceAddress;
         protected readonly IGrainFactory GrainFactory;
 
-        protected abstract Task HandlePropertiesChanged(byte[] manufacturerData);
+        protected abstract Task HandlePropertiesChanged(byte[] manufacturerData, short? signalStrength);
+
         protected abstract Task OnStartListening();
+
         protected abstract ushort ManufacturerKey { get; }
 
         protected AbstractDeviceListener(IDevice1 device, string deviceAddress, IGrainFactory grainFactory)
@@ -43,13 +48,28 @@ public async Task StartListeningAsync()
             _propertiesWatcher = await _device.WatchPropertiesAsync(OnPropertiesChanged);
         }
 
+        public bool IsAlive()
+        {
+            _aliveCounter++;
+            return _aliveCounter <= AliveThreshold;
+        }
+
         protected Task<short> GetSignalStrength()
         {
             return _device.GetAsync<short>(SignalStrengthKeyName);
         }
 
+        public async Task HandleDataAsync(IDictionary<ushort, object> manufacturerData)
+        {
+            if (manufacturerData.TryGetValue(ManufacturerKey, out var bytes))
+            {
+                await HandlePropertiesChanged((byte[])bytes, null);
+            }
+        }
+
         private async void OnPropertiesChanged(PropertyChanges changes)
         {
+            _aliveCounter = 0;
             try
             {
                 var manufacturerDataChange = changes.Changed.FirstOrDefault(c => c.Key == ManufacturerDataKeyName);
@@ -61,7 +81,8 @@ private async void OnPropertiesChanged(PropertyChanges changes)
                 var dict = (IDictionary)manufacturerDataChange.Value;
                 if (dict.Contains(ManufacturerKey))
                 {
-                    await HandlePropertiesChanged((byte[]) dict[ManufacturerKey]);
+                    var signalStrength = await GetSignalStrength();
+                    await HandlePropertiesChanged((byte[]) dict[ManufacturerKey], signalStrength);
                 }
             }
             catch (Exception e)

diff --git a/GrainServices/DBusListener.cs b/GrainServices/DBusListener.cs
@@ -31,7 +31,8 @@ public class DBusListener : GrainService, IRuuviDBusListener
         private readonly DeviceListenerFactory _deviceListenerFactory;
         private readonly ILogger<DBusListener> _logger;
 
-        public DBusListener(IGrainIdentity grainId, Silo silo, ILoggerFactory loggerFactory, IGrainFactory grainFactory, IOptions<DBusSettings> dbusOptions) : base(grainId, silo, loggerFactory)
+        public DBusListener(IGrainIdentity grainId, Silo silo, ILoggerFactory loggerFactory, IGrainFactory grainFactory, IOptions<DBusSettings> dbusOptions) 
+            : base(grainId, silo, loggerFactory)
         {
             _dbusSettings = dbusOptions.Value;
             _deviceListenerFactory = new DeviceListenerFactory(grainFactory, loggerFactory);
@@ -91,8 +92,8 @@ private async void MainLoop()
             }
             catch (Exception e)
             {
-                _logger.LogWarning(e, "DBUS error: {errorMessage}", e.Message);
-                _logger.LogInformation("Ruuvi DBUS Listener NOT listening for bluetooth events.");
+                _logger.LogError(e, "DBUS error: {errorMessage}", e.Message);
+                _logger.LogError("Ruuvi DBUS Listener NOT listening for bluetooth events.");
             }
         }
 
@@ -111,7 +112,7 @@ private async void OnDeviceAdded((ObjectPath objectPath, IDictionary<string, IDi
             }
             catch (Exception e)
             {
-                _logger.LogWarning(e, "Error occurred when discovering a device: {errorMessage}.", e.Message);
+                _logger.LogError(e, "Error occurred when discovering a device: {errorMessage}.", e.Message);
             }
         }
 
@@ -138,21 +139,31 @@ private async Task RegisterDevice(ObjectPath objectPath)
             if (manufacturerData != null)
             {
                 var address = await device.GetAddressAsync();
-                // It seems sometimes devices are found again, so let's dispose old observers so DBUS limits will not get exceeded.
-                if (_deviceListeners.Remove(address, out var oldListener))
+
+                if (_deviceListeners.TryGetValue(address, out var existingListener))
                 {
-                    _logger.LogDebug("Disposing old observer.", address);
-                    oldListener.Dispose();
-                }
+                    if (existingListener.IsAlive())
+                    {
+                        _logger.LogDebug("Using old device listener with address {address} to handle manufacturer data.", address);
+                        await existingListener.HandleDataAsync(manufacturerData);
+                        return;
+                    }
 
+                    // Devices are found again with certain interval. If old listener hasn't had data for a while, let's dispose it and start a new one.
+                    _logger.LogInformation("Disposing old device listener with address {address}.", address);
+                    _deviceListeners.Remove(address);
+                    existingListener.Dispose();
+                }
+
                 if (_deviceListenerFactory.TryConstructDeviceListener(device, address, manufacturerData, out var deviceListener))
                 {
                     _deviceListeners[address] = deviceListener;
                     await deviceListener.StartListeningAsync();
+                    await deviceListener.HandleDataAsync(manufacturerData);
                 }
                 else
                 {
-                    _logger.LogDebug("Unsupported manufacturer, ignoring.");
+                    _logger.LogInformation("Unsupported manufacturer, ignoring: {data}.", manufacturerData);
                 }
             }
             else

diff --git a/GrainServices/GrainServices.csproj b/GrainServices/GrainServices.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>net.jommy.RuuviCore.GrainServices</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
+    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.3.0" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Tmds.DBus" Version="0.9.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.6.2" />
+    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Tmds.DBus" Version="0.11.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/GrainServices/IDeviceListener.cs b/GrainServices/IDeviceListener.cs
@@ -1,10 +1,15 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace net.jommy.RuuviCore.GrainServices
 {
     public interface IDeviceListener : IDisposable
     {
         Task StartListeningAsync();
+
+        bool IsAlive();
+
+        Task HandleDataAsync(IDictionary<ushort, object> manufacturerData);
     }
 }
diff --git a/GrainServices/RuuviTagListener.cs b/GrainServices/RuuviTagListener.cs
@@ -23,15 +23,16 @@ public RuuviTagListener(IDevice1 device, string deviceAddress, IGrainFactory gra
             _grainAddress = deviceAddress.ToActorGuid();
         }
 
-        protected override async Task HandlePropertiesChanged(byte[] manufacturerData)
+        protected override async Task HandlePropertiesChanged(byte[] manufacturerData, short? signalStrength)
         {
+            _logger.LogDebug("Publishing ruuvi data to ruuvi actor {MAC}", DeviceAddress);
             await GrainFactory.GetGrain<IRuuviStreamWorker>(0).Publish(
                 DeviceAddress,
                 new MeasurementEnvelope
                 {
                     MacAddress = DeviceAddress,
                     Timestamp = DateTime.UtcNow,
-                    SignalStrength = await GetSignalStrength(),
+                    SignalStrength = signalStrength,
                     Data = manufacturerData
                 });
         }
@@ -42,7 +43,7 @@ protected override async Task OnStartListening()
             var name = await ruuviTag.GetName();
             if (name != null)
             {
-                _logger.LogInformation("RuuviTag {name} ({mac}) found.", name, DeviceAddress);
+                _logger.LogInformation("Listening ruuvitag {name} ({mac}).", name, DeviceAddress);
             }
             else
             {

diff --git a/Grains/Grains.csproj b/Grains/Grains.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>net.jommy.RuuviCore.Grains</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="InfluxDB.Collector" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.31.2" />
-    <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Client" Version="1.16.1" />
-    <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Transport.Mqtt" Version="1.13.1" />
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
+    <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.41.0" />
+    <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Client" Version="1.19.1" />
+    <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Transport.Mqtt" Version="1.17.1" />
+    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
-    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.3.0" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.6.2" />
+    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.6.2" />
+    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>