Skip to content

Using group node output rather than setting lights directly. #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DevJasperNL merged 2 commits into from
Aug 5, 2026
Merged

Using group node output rather than setting lights directly. #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73049e4
Using group node output rather than setting lights directly.
DevJasperNL Aug 5, 2026
a3b133d
Fixing build errors
DevJasperNL Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/CodeCasa.AutomationPipelines.Lights/Nodes/GroupNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ namespace CodeCasa.AutomationPipelines.Lights.Nodes;
internal class GroupNode : PipelineNode<LightTransition>
{
private readonly GroupNodeContext _groupNodeContext;
private readonly ILight _light;

public GroupNode(ILight light, GroupNodeContext groupNodeContext)
public GroupNode(GroupNodeContext groupNodeContext)
{
_light = light;
_groupNodeContext = groupNodeContext;
Name = "Group Node";
}
Expand All @@ -19,14 +17,19 @@ protected override void InputReceived(LightTransition? input)
{
if (input != null)
{
_groupNodeContext.Process(_light, input);
_groupNodeContext.Process(this, input);
}
}

internal void SetOutput(LightTransition? output)
{
Output = output;
}

/// <inheritdoc />
public override async ValueTask DisposeAsync()
{
_groupNodeContext.Unregister(_light);
_groupNodeContext.Unregister(this);
await base.DisposeAsync();
}
}
76 changes: 38 additions & 38 deletions src/CodeCasa.AutomationPipelines.Lights/Nodes/GroupNodeContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ internal class GroupNodeContext(IScheduler scheduler, ILogger<Pipeline<LightTran
private readonly List<GroupInfo> _groups = new();
private readonly Lock _lock = new();

public void Register(ILight light, ILight lightGroup, TimeSpan groupDuration, EqualityComparer<LightTransition> equalityComparer)
public void Register(GroupNode groupNode, ILight lightGroup, TimeSpan groupDuration, EqualityComparer<LightTransition> equalityComparer)
{
lock (_lock)
{
var existingGroup = _groups.FirstOrDefault(g => g.LightGroup == lightGroup);
if (existingGroup == null)
{
existingGroup = new GroupInfo(lightGroup, light, equalityComparer, groupDuration, scheduler, logger);
existingGroup = new GroupInfo(lightGroup, groupNode, equalityComparer, groupDuration, scheduler, logger);
_groups.Add(existingGroup);
}
else
{
existingGroup.AddMember(light);
existingGroup.AddMember(groupNode);
}
}
}

public void Process(ILight light, LightTransition transition)
public void Process(GroupNode groupNode, LightTransition transition)
{
var inputInfo = new InputInfo(DateTime.UtcNow, light, transition);
var inputInfo = new InputInfo(DateTime.UtcNow, groupNode, transition);
lock (_lock)
{
foreach (var group in _groups)
Expand All @@ -39,13 +39,13 @@ public void Process(ILight light, LightTransition transition)

}

public void Unregister(ILight light)
public void Unregister(GroupNode groupNode)
{
lock (_lock)
{
foreach (var group in _groups.ToArray())
{
if (group.RemoveMember(light))
if (group.RemoveMember(groupNode))
{
_groups.Remove(group);
group.Dispose();
Expand All @@ -54,10 +54,10 @@ public void Unregister(ILight light)
}
}

internal class InputInfo(DateTime timestamp, ILight light, LightTransition lightTransition)
internal class InputInfo(DateTime timestamp, GroupNode groupNode, LightTransition lightTransition)
{
public LightTransition Transition { get; } = lightTransition;
public ILight Light { get; } = light;
public GroupNode GroupNode { get; } = groupNode;
public DateTime Timestamp { get; } = timestamp;
public bool HasExecuted { get; private set; }
public void Execute()
Expand All @@ -66,51 +66,51 @@ public void Execute()
{
return;
}
Light.ApplyTransition(Transition);
GroupNode.SetOutput(Transition);
HasExecuted = true;
}
}

internal class GroupInfo(
ILight lightGroup,
ILight firstGroupMember,
GroupNode firstGroupNode,
IEqualityComparer<LightTransition> equalityComparer,
TimeSpan groupDuration,
IScheduler scheduler,
ILogger<Pipeline<LightTransition>>? logger)
: IDisposable
{
public ILight LightGroup { get; } = lightGroup;
private readonly List<ILight> _groupMembers = [firstGroupMember];
private readonly Dictionary<ILight, InputInfo> _groupInputs = new();
private readonly Dictionary<ILight, IDisposable> _scheduledWork = new();
private readonly List<GroupNode> _groupNodes = [firstGroupNode];
private readonly Dictionary<GroupNode, InputInfo> _groupInputs = new();
private readonly Dictionary<GroupNode, IDisposable> _scheduledWork = new();
private readonly Lock _lock = new();

public void AddMember(ILight member)
public void AddMember(GroupNode groupNode)
{
lock (_lock)
{
_groupMembers.Add(member);
_groupNodes.Add(groupNode);
}
}

public bool RemoveMember(ILight member)
public bool RemoveMember(GroupNode groupNode)
{
lock (_lock)
{
_groupMembers.Remove(member);
_groupInputs.Remove(member);
CleanupScheduledWork(member);
_groupNodes.Remove(groupNode);
_groupInputs.Remove(groupNode);
CleanupScheduledWork(groupNode);

return !_groupMembers.Any();
return !_groupNodes.Any();
}
}

public void Process(InputInfo inputInfo)
{
lock (_lock)
{
if (!_groupMembers.Contains(inputInfo.Light))
if (!_groupNodes.Contains(inputInfo.GroupNode))
{
return;
}
Expand All @@ -119,14 +119,14 @@ public void Process(InputInfo inputInfo)
CleanupExpiredInputs(inputInfo.Timestamp);

// If there's an existing input for this light, execute it first
if (_groupInputs.TryGetValue(inputInfo.Light, out var existingInput))
if (_groupInputs.TryGetValue(inputInfo.GroupNode, out var existingInput))
{
existingInput.Execute();
CleanupScheduledWork(inputInfo.Light);
CleanupScheduledWork(inputInfo.GroupNode);
}

// Add the new input
_groupInputs[inputInfo.Light] = inputInfo;
_groupInputs[inputInfo.GroupNode] = inputInfo;

// Check if all group members now have matching transitions
if (AllMembersHaveMatchingTransitions(inputInfo.Transition))
Expand All @@ -144,15 +144,15 @@ public void Process(InputInfo inputInfo)
{
lock (_lock)
{
if (_groupInputs.TryGetValue(inputInfo.Light, out var info) && !info.HasExecuted)
if (_groupInputs.TryGetValue(inputInfo.GroupNode, out var info) && !info.HasExecuted)
{
info.Execute();
_groupInputs.Remove(inputInfo.Light);
_groupInputs.Remove(inputInfo.GroupNode);
}
_scheduledWork.Remove(inputInfo.Light);
_scheduledWork.Remove(inputInfo.GroupNode);
}
});
_scheduledWork[inputInfo.Light] = scheduledWork;
_scheduledWork[inputInfo.GroupNode] = scheduledWork;
}
}

Expand All @@ -164,24 +164,24 @@ private void CleanupExpiredInputs(DateTime currentTime)
if (info.HasExecuted)
{
// This can occur if the light is in multiple groups at once.
_groupInputs.Remove(info.Light);
CleanupScheduledWork(info.Light);
_groupInputs.Remove(info.GroupNode);
CleanupScheduledWork(info.GroupNode);
}
else if (info.Timestamp + groupDuration < currentTime)
{
// We waited long enough for this light to be part of the group,
// but it never received a transition that matched the other lights in the group.
info.Execute();
_groupInputs.Remove(info.Light);
CleanupScheduledWork(info.Light);
_groupInputs.Remove(info.GroupNode);
CleanupScheduledWork(info.GroupNode);
}
}
}

private bool AllMembersHaveMatchingTransitions(LightTransition transition)
{
// We need inputs from ALL group members
if (_groupInputs.Count != _groupMembers.Count)
// We need inputs from ALL group nodes
if (_groupInputs.Count != _groupNodes.Count)
{
return false;
}
Expand All @@ -190,12 +190,12 @@ private bool AllMembersHaveMatchingTransitions(LightTransition transition)
return _groupInputs.Values.All(info => equalityComparer.Equals(info.Transition, transition));
}

private void CleanupScheduledWork(ILight light)
private void CleanupScheduledWork(GroupNode groupNode)
{
if (_scheduledWork.TryGetValue(light, out var disposable))
if (_scheduledWork.TryGetValue(groupNode, out var disposable))
{
disposable.Dispose();
_scheduledWork.Remove(light);
_scheduledWork.Remove(groupNode);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightPipelineFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ internal Dictionary<string, IPipeline<LightTransition>> CreateLightPipelines<TLi

if (conf.LightGroups.Any())
{
var groupNode = new GroupNode(conf.Light, groupContext);
var groupNode = new GroupNode(groupContext);
foreach (var lightGroup in conf.LightGroups)
{
groupContext.Register(conf.Light, lightGroup.Key, lightGroup.Value.TimeSpan, lightGroup.Value.Comparer);
groupContext.Register(groupNode, lightGroup.Key, lightGroup.Value.TimeSpan, lightGroup.Value.Comparer);
}
nodes.Add(groupNode);
}
Expand Down