From a674175131aaa5972e2419cf6d1537371903c8e3 Mon Sep 17 00:00:00 2001
From: Jasper <jasper.lammers@gmail.com>
Date: Mon, 8 Jun 2026 10:34:17 +0200
Subject: [PATCH] Making sure every 'SwitchWhen' only subscribes once to every
 observable.

---
 ...ansitionPipelineConfigurator.SwitchWhen.cs | 67 +++++++++++++++----
 ...htTransitionReactiveNodeConfigurator.On.cs |  2 +-
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.SwitchWhen.cs b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.SwitchWhen.cs
index bea74e8..1873bce 100644
--- a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.SwitchWhen.cs
+++ b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.SwitchWhen.cs
@@ -139,9 +139,15 @@ public ILightTransitionPipelineConfigurator<TLight> SwitchWhen(IObservable<bool>
     {
         return AddReactiveNode(sp => sp
             .SetHierarchyContext(HierarchyPath, "SwitchWhen", LoggingEnabled ?? false)
-            .On(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => x), trueNodeFactory)
-            .On(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => !x), falseNodeFactory)
-            .PassThroughOn(whenObservable.Where(x => !x)));
+            .AddNodeSource(_ => whenObservable.CombineLatest(switchObservable, (when, sw) =>
+            {
+                if (!when)
+                {
+                    return _ =>
+                        new PassThroughNode<LightTransition>();
+                }
+                return sw ? trueNodeFactory : falseNodeFactory;
+            })));
     }
 
     /// <inheritdoc/>
@@ -195,9 +201,20 @@ public ILightTransitionPipelineConfigurator<TLight> SwitchWhen<TTrueNode, TFalse
     {
         return AddReactiveNode(c => c
             .SetHierarchyContext(HierarchyPath, "SwitchWhen", LoggingEnabled ?? false)
-            .On<bool, TTrueNode>(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => x))
-            .On<bool, TFalseNode>(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => !x))
-            .PassThroughOn(whenObservable.Where(x => !x)));
+            .AddNodeSource(_ => whenObservable.CombineLatest(switchObservable, (when, sw) =>
+            {
+                if (!when)
+                {
+                    return _ =>
+                        new PassThroughNode<LightTransition>();
+                }
+
+                return sw
+                    ? sp =>
+                        ActivatorUtilities.CreateInstance<TTrueNode>(sp)
+                    : new Func<IServiceProvider, IPipelineNode<LightTransition>?>(sp =>
+                        ActivatorUtilities.CreateInstance<TFalseNode>(sp));
+            })));
     }
 
     /// <inheritdoc/>
@@ -242,9 +259,22 @@ public ILightTransitionPipelineConfigurator<TLight> AddReactiveNodeSwitchWhen(IO
     {
         return AddReactiveNode(c => c
             .SetHierarchyContext(HierarchyPath, "SwitchWhen", LoggingEnabled ?? false)
-            .On(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => x), trueConfigure.ApplyHierarchySettings(c), instantiationScope)
-            .On(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => !x), falseConfigure.ApplyHierarchySettings(c), instantiationScope)
-            .PassThroughOn(whenObservable.Where(x => !x)));
+            .AddNodeSource(_ => whenObservable.CombineLatest(switchObservable, (when, sw) =>
+            {
+                if (!when)
+                {
+                    return _ =>
+                        new PassThroughNode<LightTransition>();
+                }
+
+                return sw
+                    ? new Func<IServiceProvider, IPipelineNode<LightTransition>?>(sp => sp
+                        .GetRequiredService<ReactiveNodeFactory>().CreateReactiveNode(sp, Light,
+                            trueConfigure.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)))
+                    : new Func<IServiceProvider, IPipelineNode<LightTransition>?>(sp => sp
+                        .GetRequiredService<ReactiveNodeFactory>().CreateReactiveNode(sp, Light,
+                            falseConfigure.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)));
+            })));
     }
 
     /// <inheritdoc/>
@@ -280,9 +310,22 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineSwitchWhen(IObser
     {
         return AddReactiveNode(c => c
             .SetHierarchyContext(HierarchyPath, "SwitchWhen", LoggingEnabled ?? false)
-            .On(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => x), trueConfigure.ApplyHierarchySettings(c), instantiationScope)
-            .On(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => !x), falseConfigure.ApplyHierarchySettings(c), instantiationScope)
-            .PassThroughOn(whenObservable.Where(x => !x)));
+            .AddNodeSource(_ => whenObservable.CombineLatest(switchObservable, (when, sw) =>
+            {
+                if (!when)
+                {
+                    return _ =>
+                        new PassThroughNode<LightTransition>();
+                }
+
+                return sw
+                    ? new Func<IServiceProvider, IPipelineNode<LightTransition>?>(sp => sp
+                        .GetRequiredService<LightPipelineFactory>().CreateLightPipeline(ServiceProvider, Light,
+                            trueConfigure.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)))
+                    : new Func<IServiceProvider, IPipelineNode<LightTransition>?>(sp => sp
+                        .GetRequiredService<LightPipelineFactory>().CreateLightPipeline(ServiceProvider, Light,
+                            falseConfigure.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)));
+            })));
     }
 
     /// <inheritdoc/>
diff --git a/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/LightTransitionReactiveNodeConfigurator.On.cs b/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/LightTransitionReactiveNodeConfigurator.On.cs
index 87abbcf..6b7ec03 100644
--- a/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/LightTransitionReactiveNodeConfigurator.On.cs
+++ b/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/LightTransitionReactiveNodeConfigurator.On.cs
@@ -54,7 +54,7 @@ public ILightTransitionReactiveNodeConfigurator<TLight> On<T>(IObservable<T> tri
     public ILightTransitionReactiveNodeConfigurator<TLight> On<T>(IObservable<T> triggerObservable, Action<ILightTransitionReactiveNodeConfigurator<TLight>> configure, InstantiationScope _ = InstantiationScope.Shared)
     {
         return On(triggerObservable,
-            s => s.GetRequiredService<ReactiveNodeFactory>().CreateReactiveNode(s, Light, configure.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)));
+            sp => sp.GetRequiredService<ReactiveNodeFactory>().CreateReactiveNode(sp, Light, configure.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)));
     }
 
     /// <inheritdoc/>