Skip to content

Commit

Permalink
Fixed concurrency on states (#107)
Browse files Browse the repository at this point in the history
  • Loading branch information
@helto4real
helto4real committed May 3, 2020
1 parent 50e6558 commit 5dac82f
Show file tree
Hide file tree
Showing 9 changed files with 264 additions and 33 deletions.
212 changes: 212 additions & 0 deletions exampleapps/apps/_EntityExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
using JoySoftware.HomeAssistant.NetDaemon.Common;

namespace Netdaemon.Generated.Extensions
{
public static partial class EntityExtension
{
public static SwitchEntities SwitchEx(this NetDaemonApp app) => new SwitchEntities(app);
public static SceneEntities SceneEx(this NetDaemonApp app) => new SceneEntities(app);
public static LightEntities LightEx(this NetDaemonApp app) => new LightEntities(app);
public static MediaPlayerEntities MediaPlayerEx(this NetDaemonApp app) => new MediaPlayerEntities(app);
public static ScriptEntities ScriptEx(this NetDaemonApp app) => new ScriptEntities(app);
public static CameraEntities CameraEx(this NetDaemonApp app) => new CameraEntities(app);
public static AutomationEntities AutomationEx(this NetDaemonApp app) => new AutomationEntities(app);
}

public partial class SwitchEntities
{
private readonly NetDaemonApp _app;
public SwitchEntities(NetDaemonApp app)
{
_app = app;
}

public IEntity Remote1B1 => _app.Entity("switch.remote_1_b1");
public IEntity Switch4TomasFan => _app.Entity("switch.switch4_tomas_fan");
public IEntity Switch9outdoor => _app.Entity("switch.switch9outdoor");
public IEntity JulbelysningVardagsrumH => _app.Entity("switch.julbelysning_vardagsrum_h");
public IEntity NetdaemonMagicCube => _app.Entity("switch.netdaemon_magic_cube");
public IEntity MelkersRumFonster => _app.Entity("switch.melkers_rum_fonster");
public IEntity ComputerTomas => _app.Entity("switch.computer_tomas");
public IEntity NetdaemonWelcomeHome => _app.Entity("switch.netdaemon_welcome_home");
public IEntity Remote1B3 => _app.Entity("switch.remote_1_b3");
public IEntity Switch66 => _app.Entity("switch.switch66");
public IEntity NetdaemonHacsNotifyOnUpdate => _app.Entity("switch.netdaemon_hacs_notify_on_update");
public IEntity Switch1Lb => _app.Entity("switch.switch_1_lb");
public IEntity Motorvarmare => _app.Entity("switch.motorvarmare");
public IEntity NetdaemonGlobalApp => _app.Entity("switch.netdaemon_global_app");
public IEntity Switch10 => _app.Entity("switch.switch10");
public IEntity Switch11 => _app.Entity("switch.switch11");
public IEntity Remote1B2 => _app.Entity("switch.remote_1_b2");
public IEntity NetdaemonHouseStateManager => _app.Entity("switch.netdaemon_house_state_manager");
public IEntity KokKaffebryggare => _app.Entity("switch.kok_kaffebryggare");
public IEntity Film => _app.Entity("switch.film");
public IEntity NetdaemonTv => _app.Entity("switch.netdaemon_tv");
public IEntity JulbelysningTomasRum => _app.Entity("switch.julbelysning_tomas_rum");
public IEntity Switch2 => _app.Entity("switch.switch2");
public IEntity Switch13 => _app.Entity("switch.switch13");
public IEntity Switch3 => _app.Entity("switch.switch3");
public IEntity JulbelysningVardagsrumV => _app.Entity("switch.julbelysning_vardagsrum_v");
public IEntity SallysRumFonster => _app.Entity("switch.sallys_rum_fonster");
public IEntity Switch8MelkersTv => _app.Entity("switch.switch8_melkers_tv");
public IEntity Switch14 => _app.Entity("switch.switch14");
public IEntity Tv => _app.Entity("switch.tv");
public IEntity Switch5MelkersFan => _app.Entity("switch.switch5_melkers_fan");
public IEntity Switch1Rb => _app.Entity("switch.switch_1_rb");
public IEntity JulbelysningKokV => _app.Entity("switch.julbelysning_kok_v");
public IEntity JulbelysningKokH => _app.Entity("switch.julbelysning_kok_h");
public IEntity ADiod => _app.Entity("switch.a_diod");
public IEntity Switch12 => _app.Entity("switch.switch12");
public IEntity NetdaemonMyApp => _app.Entity("switch.netdaemon_my_app");
public IEntity JulbelysningVardagsrumM => _app.Entity("switch.julbelysning_vardagsrum_m");
public IEntity Testswitch => _app.Entity("switch.testswitch");
public IEntity NetdaemonLightManager => _app.Entity("switch.netdaemon_light_manager");
public IEntity JulbelysningSovrum => _app.Entity("switch.julbelysning_sovrum");
public IEntity Switch15 => _app.Entity("switch.switch15");
public IEntity Switch1 => _app.Entity("switch.switch1");
public IEntity NetdaemonMotorvarmare => _app.Entity("switch.netdaemon_motorvarmare");
public IEntity ShellyRelay => _app.Entity("switch.shelly_relay");
public IEntity NetdaemonCalendarTrash => _app.Entity("switch.netdaemon_calendar_trash");
public IEntity Switch16 => _app.Entity("switch.switch16");
public IEntity NetdaemonRoomSpecific => _app.Entity("switch.netdaemon_room_specific");
public IEntity Switch7 => _app.Entity("switch.switch7");
public IEntity NetdaemonMotion => _app.Entity("switch.netdaemon_motion");
public IEntity TvrumVagg => _app.Entity("switch.tvrum_vagg");
public IEntity Sonoff1Relay => _app.Entity("switch.sonoff1_relay");
}

public partial class SceneEntities
{
private readonly NetDaemonApp _app;
public SceneEntities(NetDaemonApp app)
{
_app = app;
}

public IEntity Kvall => _app.Entity("scene.kvall");
public IEntity Stadning => _app.Entity("scene.stadning");
public IEntity Natt => _app.Entity("scene.natt");
public IEntity Morgon => _app.Entity("scene.morgon");
public IEntity Dag => _app.Entity("scene.dag");
}

public partial class LightEntities
{
private readonly NetDaemonApp _app;
public LightEntities(NetDaemonApp app)
{
_app = app;
}

public IEntity MelkersRum => _app.Entity("light.melkers_rum");
public IEntity TvrumVagg => _app.Entity("light.tvrum_vagg");
public IEntity TvrumFonsterVanster => _app.Entity("light.tvrum_fonster_vanster");
public IEntity SallysRum => _app.Entity("light.sallys_rum");
public IEntity JulbelysningVardagsrumV => _app.Entity("light.julbelysning_vardagsrum_v");
public IEntity VardagsrumFonsterVanster => _app.Entity("light.vardagsrum_fonster_vanster");
public IEntity KokLillaFonster => _app.Entity("light.kok_lilla_fonster");
public IEntity JulbelysningSovrum => _app.Entity("light.julbelysning_sovrum");
public IEntity Farstukvisten => _app.Entity("light.farstukvisten");
public IEntity SovrumBrya => _app.Entity("light.sovrum_brya");
public IEntity ConfigurationTool27 => _app.Entity("light.configuration_tool_27");
public IEntity FarstukvistLed => _app.Entity("light.farstukvist_led");
public IEntity JulbelysningVardagsrumM => _app.Entity("light.julbelysning_vardagsrum_m");
public IEntity TvrumBakgrundTv => _app.Entity("light.tvrum_bakgrund_tv");
public IEntity JulbelysningKokV => _app.Entity("light.julbelysning_kok_v");
public IEntity SovrumFonster => _app.Entity("light.sovrum_fonster");
public IEntity TomasRumFonster => _app.Entity("light.tomas_rum_fonster");
public IEntity KokFonster => _app.Entity("light.kok_fonster");
public IEntity JulbelysningTomasRum => _app.Entity("light.julbelysning_tomas_rum");
public IEntity MelkersRumFonster => _app.Entity("light.melkers_rum_fonster");
public IEntity VardagsrumFonsterMitten => _app.Entity("light.vardagsrum_fonster_mitten");
public IEntity SallysRumFonster => _app.Entity("light.sallys_rum_fonster");
public IEntity Sovrum => _app.Entity("light.sovrum");
public IEntity JulbelysningVardagsrumH => _app.Entity("light.julbelysning_vardagsrum_h");
public IEntity HallDorr => _app.Entity("light.hall_dorr");
public IEntity Vardagsrum => _app.Entity("light.vardagsrum");
public IEntity HallByra => _app.Entity("light.hall_byra");
public IEntity Ambient => _app.Entity("light.ambient");
public IEntity TvrumFonsterHoger => _app.Entity("light.tvrum_fonster_hoger");
public IEntity Kok => _app.Entity("light.kok");
public IEntity VardagsrumFonsterHoger => _app.Entity("light.vardagsrum_fonster_hoger");
public IEntity TomasRum => _app.Entity("light.tomas_rum");
public IEntity Tvrummet => _app.Entity("light.tvrummet");
public IEntity JulbelysningKokH => _app.Entity("light.julbelysning_kok_h");
}

public partial class MediaPlayerEntities
{
private readonly NetDaemonApp _app;
public MediaPlayerEntities(NetDaemonApp app)
{
_app = app;
}

public IMediaPlayer PlexTomasIpad => _app.MediaPlayer("media_player.plex_tomas_ipad");
public IMediaPlayer Kok => _app.MediaPlayer("media_player.kok");
public IMediaPlayer TvNere => _app.MediaPlayer("media_player.tv_nere");
public IMediaPlayer PlexChrome3 => _app.MediaPlayer("media_player.plex_chrome_3");
public IMediaPlayer Huset => _app.MediaPlayer("media_player.huset");
public IMediaPlayer TvUppe2 => _app.MediaPlayer("media_player.tv_uppe2");
public IMediaPlayer PlexChromecast => _app.MediaPlayer("media_player.plex_chromecast");
public IMediaPlayer KodiTvNere => _app.MediaPlayer("media_player.kodi_tv_nere");
public IMediaPlayer PlexPlexWebChrome => _app.MediaPlayer("media_player.plex_plex_web_chrome");
public IMediaPlayer TvUppe => _app.MediaPlayer("media_player.tv_uppe");
public IMediaPlayer PlexChrome => _app.MediaPlayer("media_player.plex_chrome");
public IMediaPlayer MelkersTv => _app.MediaPlayer("media_player.melkers_tv");
public IMediaPlayer SallysHogtalare => _app.MediaPlayer("media_player.sallys_hogtalare");
public IMediaPlayer TvRummetGh => _app.MediaPlayer("media_player.tv_rummet_gh");
public IMediaPlayer Sovrum => _app.MediaPlayer("media_player.sovrum");
public IMediaPlayer MelkersRum => _app.MediaPlayer("media_player.melkers_rum");
public IMediaPlayer PlexKodiAddOnLibreelec => _app.MediaPlayer("media_player.plex_kodi_add_on_libreelec");
public IMediaPlayer Vardagsrum => _app.MediaPlayer("media_player.vardagsrum");
public IMediaPlayer PlexChrome2 => _app.MediaPlayer("media_player.plex_chrome_2");
}

public partial class ScriptEntities
{
private readonly NetDaemonApp _app;
public ScriptEntities(NetDaemonApp app)
{
_app = app;
}

public IEntity ColorScene => _app.Entity("script.color_scene");
public IEntity DayScene => _app.Entity("script.day_scene");
public IEntity NotifyGreet => _app.Entity("script.notify_greet");
public IEntity FilmScene => _app.Entity("script.film_scene");
public IEntity EveningScene => _app.Entity("script.evening_scene");
public IEntity TvOffScene => _app.Entity("script.tv_off_scene");
public IEntity TvScene => _app.Entity("script.tv_scene");
public IEntity Notify => _app.Entity("script.notify");
public IEntity Setnightmode => _app.Entity("script.setnightmode");
public IEntity E1586350051032 => _app.Entity("script.1586350051032");
public IEntity CleaningScene => _app.Entity("script.cleaning_scene");
public IEntity NightScene => _app.Entity("script.night_scene");
public IEntity MorningScene => _app.Entity("script.morning_scene");
}

public partial class CameraEntities
{
private readonly NetDaemonApp _app;
public CameraEntities(NetDaemonApp app)
{
_app = app;
}

public ICamera MyCamera => _app.Camera("camera.my_camera");
public ICamera KameraStream => _app.Camera("camera.kamera_stream");
public ICamera Kamera3 => _app.Camera("camera.kamera_3");
}

public partial class AutomationEntities
{
private readonly NetDaemonApp _app;
public AutomationEntities(NetDaemonApp app)
{
_app = app;
}

public IEntity SetThemeAtStartup => _app.Entity("automation.set_theme_at_startup");
}
}
11 changes: 11 additions & 0 deletions exampleapps/apps/test1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Linq;
using System;
using System.Collections.Generic;
using System.Threading;
// using Netdaemon.Generated.Extensions;
public class GlobalApp : NetDaemonApp
{
Expand All @@ -16,6 +17,16 @@ public override async Task InitializeAsync()
Log("Logging from global app");
LogError("OMG SOMETING IS WRONG {error}", "The error!");

Entities(p =>
{
// await Task.Delay(5000);
Thread.Sleep(10);
return false;
}).WhenStateChange("on", "off")
.Call((a, b, c) => { Log("Logging from global app"); return Task.CompletedTask; })
.Execute();

Log("AfterExecute");
// Entity("light.my_light").TurnOn();
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/App/NetDaemon.App/Common/NetDaemonApp.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public virtual Task InitializeAsync()
public async ValueTask<T> GetDataAsync<T>(string id)
{
_ = _daemon as INetDaemon ?? throw new NullReferenceException($"{nameof(_daemon)} cant be null!");
return await _daemon!.GetDataAsync<T>(id);
return await _daemon!.GetDataAsync<T>(id).ConfigureAwait(false);
}

/// <inheritdoc/>
Expand Down Expand Up @@ -291,14 +291,14 @@ public IScript RunScript(params string[] entityIds)
public async Task<bool> SendEvent(string eventId, dynamic? data = null)
{
_ = _daemon as INetDaemon ?? throw new NullReferenceException($"{nameof(_daemon)} cant be null!");
return await _daemon!.SendEvent(eventId, data);
return await _daemon!.SendEvent(eventId, data).ConfigureAwait(false);
}

/// <inheritdoc/>
public async Task<EntityState?> SetState(string entityId, dynamic state, params (string name, object val)[] attributes)
{
_ = _daemon as INetDaemon ?? throw new NullReferenceException($"{nameof(_daemon)} cant be null!");
return await _daemon!.SetState(entityId, state, attributes);
return await _daemon!.SetState(entityId, state, attributes).ConfigureAwait(false);
}

/// <inheritdoc/>
Expand All @@ -312,7 +312,7 @@ public void Speak(string entityId, string message)
public virtual Task StartUpAsync(INetDaemon daemon)
{
_daemon = daemon;
_lazyStoreStateTask = Task.Run(async () => await HandleLazyStorage());
_lazyStoreStateTask = Task.Run(async () => await HandleLazyStorage().ConfigureAwait(false));
_storageObject = new FluentExpandoObject(false, true, daemon: this);
Logger = daemon.Logger;

Expand Down Expand Up @@ -355,7 +355,7 @@ public async Task RestoreAppStateAsync()
{
_ = _daemon as INetDaemon ?? throw new NullReferenceException($"{nameof(_daemon)} cant be null!");

var obj = await _daemon!.GetDataAsync<IDictionary<string, object>>(GetUniqueIdForStorage());
var obj = await _daemon!.GetDataAsync<IDictionary<string, object>>(GetUniqueIdForStorage()).ConfigureAwait(false);

if (obj != null)
{
Expand All @@ -371,7 +371,7 @@ public async Task RestoreAppStateAsync()
if (appState == null || (appState != "on" && appState != "off"))
{
IsEnabled = true;
await _daemon.SetState($"switch.netdaemon_{Id?.ToSafeHomeAssistantEntityId()}", "on");
await _daemon.SetState($"switch.netdaemon_{Id?.ToSafeHomeAssistantEntityId()}", "on").ConfigureAwait(false);

return;
}
Expand Down
26 changes: 17 additions & 9 deletions src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class NetDaemonHost : INetDaemonHost, IAsyncDisposable
internal int InternalDelayTimeForTts = 2500;

// internal so we can use for unittest
internal IDictionary<string, EntityState> InternalState = new Dictionary<string, EntityState>();
internal ConcurrentDictionary<string, EntityState> InternalState = new ConcurrentDictionary<string, EntityState>();

private readonly IList<(string pattern, Func<string, dynamic, Task> action)> _eventActions =
new List<(string pattern, Func<string, dynamic, Task> action)>();
Expand Down Expand Up @@ -84,7 +84,7 @@ public NetDaemonHost(IHassClient? hassClient, IDataRepository? repository, ILogg

public IScheduler Scheduler => _scheduler;

public IEnumerable<EntityState> State => InternalState?.Values!;
public IEnumerable<EntityState> State => InternalState.Select(n => n.Value);

private static ILoggerFactory DefaultLoggerFactory => LoggerFactory.Create(builder =>
{
Expand All @@ -100,8 +100,8 @@ public IEntity Entities(INetDaemonApp app, Func<IEntityProperties, bool> func)
try
{
IEnumerable<IEntityProperties> x = State.Where(func);

return new EntityManager(x.Select(n => n.EntityId).ToArray(), this, app);
var selectedEntities = x.Select(n => n.EntityId).ToArray();
return new EntityManager(selectedEntities, this, app);
}
catch (Exception e)
{
Expand Down Expand Up @@ -246,17 +246,25 @@ public async Task Run(string host, short port, bool ssl, string token, Cancellat

await _hassClient.SubscribeToEvents().ConfigureAwait(false);

Connected = true;
InternalState = _hassClient.States.Values.Select(n => n.ToDaemonEntityState())

var initialStates = _hassClient.States.Values.Select(n => n.ToDaemonEntityState())
.ToDictionary(n => n.EntityId);

foreach (var key in initialStates.Keys)
{
InternalState[key] = initialStates[key];
}

Connected = true;

Logger.LogInformation(
hassioToken != null
? "Successfully connected to Home Assistant Core in Home Assistant Add-on"
: "Successfully connected to Home Assistant Core on host {host}:{port}", host, port);

while (!cancellationToken.IsCancellationRequested)
{

HassEvent changedEvent = await _hassClient.ReadEventAsync(cancellationToken).ConfigureAwait(false);
if (changedEvent != null)
{
Expand Down Expand Up @@ -550,7 +558,7 @@ public async Task StopDaemonActivitiesAsync()
_stateActions.Clear();
_serviceCallFunctionList.Clear();

await _scheduler.Restart();
await _scheduler.Restart().ConfigureAwait(false);
}

/// <inheritdoc/>
Expand All @@ -565,7 +573,7 @@ public async Task SetDaemonStateAsync(int numberOfLoadedApps, int numberOfRunnin
"Connected", // State will alawys be connected, otherwise state could not be set.
("number_of_loaded_apps", numberOfLoadedApps),
("number_of_running_apps", numberOfRunningApps),
("version", GetType().Assembly.GetName().Version?.ToString() ?? "N/A"));
("version", GetType().Assembly.GetName().Version?.ToString() ?? "N/A")).ConfigureAwait(false);
}

/// <inheritdoc/>
Expand Down Expand Up @@ -664,7 +672,7 @@ public void ClearAppInstances()

public async ValueTask DisposeAsync()
{
await Stop();
await Stop().ConfigureAwait(false);
}
}
public class DelayResult : IDelayResult
Expand Down
2 changes: 1 addition & 1 deletion src/Daemon/NetDaemon.Daemon/Daemon/Scheduler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ public async Task Stop()
/// </summary>
public async Task Restart()
{
await Stop();
await Stop().ConfigureAwait(false);
_cancelSource = new CancellationTokenSource();
}

Expand Down
Loading

0 comments on commit 5dac82f

Please sign in to comment.