29086619629

Committed 10 Jul 2026 10:31AM UTC coverage: 83.603% (+0.3%) from 83.301%

Build # 29086619629

Build Type

push

github

Committed by

web-flow

Commit Message

[codex] Improve high-event hot paths (#1389)

* Add high-event performance benchmark baseline

* Improve high-event hot paths

* Improve patch coverage for hot-path tests

* Address PR review feedback

* Remove the high-event review docs and some tidying up comments that are not needed

Coverage Stats

900 of 1217 branches covered (73.95%)

Branch coverage included in aggregate %.

84 of 85 new or added lines in 3 files covered. (98.82%)

3 existing lines in 1 file now uncovered.

3439 of 3973 relevant lines covered (86.56%)

1298.44 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.89

/src/Client/NetDaemon.HassClient/Internal/Helpers/ResultMessageHandler.cs

﻿using System.Collections.Concurrent;

namespace NetDaemon.Client.Internal.Helpers;

/// <summary>
/// Handles the result of a 'fire and forget` Message tp Home Assistant
/// We mainly make sure that any Errors from HA or technical exceptions will get logged correctly
/// We also track the tasks so we can await for all pending tasks to finish
/// </summary>
internal class ResultMessageHandler(ILogger logger) : IAsyncDisposable
{
    private readonly ConcurrentDictionary<Task, object?> _backgroundTasks = new();

    public void HandleResult(Task<HassMessage> returnMessageTask, CommandMessage originalCommand)
    {
        var withErrorHandling = HandleResultError(returnMessageTask, originalCommand);

        // Save the task in the dictionary and remove it when it is done
        // this allows us to wait for all pending background tasks to finish
        _backgroundTasks.TryAdd(withErrorHandling, null);
        withErrorHandling.ContinueWith(_ => _backgroundTasks.TryRemove(withErrorHandling, out var _));
    }

    private async Task HandleResultError(Task<HassMessage> returnMessageTask, CommandMessage originalCommand)
    {
        try
        {
            var result = await returnMessageTask.ConfigureAwait(false);
            if (!result.Success ?? false)
            {
                logger.LogError("Failed command ({CommandType}) error: {ErrorResult}.  Sent command is {CommandMessage}",
                    originalCommand.Type, result.Error, originalCommand.GetJsonString());
            }
        }
        catch (TimeoutException)
        {
            logger.LogWarning("Command ({CommandType}) did not get response in timely fashion.  Sent command is {CommandMessage}",
                originalCommand.Type, originalCommand.GetJsonString());
        }
        catch (OperationCanceledException)
        {
            // Expected during connection shutdown or caller cancellation.
        }
        catch (Exception e)
        {
            logger.LogError(e, "Exception waiting for result message.  Sent command is {CommandMessage}", originalCommand.GetJsonString());
        }
    }

    public async Task WaitPendingBackgroundTasksAsync()
    {
        if (!_backgroundTasks.IsEmpty)
        {
            await Task.WhenAll(_backgroundTasks.Keys).ConfigureAwait(false);
        }
    }

    public async ValueTask DisposeAsync()
    {
        try
        {
            await WaitPendingBackgroundTasksAsync().WaitAsync(TimeSpan.FromSeconds(5)).ConfigureAwait(false);
        }
        catch (TimeoutException e)
        {
            logger.LogError(e, "One or requests are still pending while closing connection to Home Assistant");
        }
    }
}

1	using System.Collections.Concurrent;
2
3	namespace NetDaemon.Client.Internal.Helpers;
4
5	/// <summary>
6	/// Handles the result of a 'fire and forget` Message tp Home Assistant
7	/// We mainly make sure that any Errors from HA or technical exceptions will get logged correctly
8	/// We also track the tasks so we can await for all pending tasks to finish
9	/// </summary>
10	internal class ResultMessageHandler(ILogger logger) : IAsyncDisposable	50✔
11	{
12	private readonly ConcurrentDictionary<Task, object?> _backgroundTasks = new();	50✔
13
14	public void HandleResult(Task<HassMessage> returnMessageTask, CommandMessage originalCommand)
15	{
16	var withErrorHandling = HandleResultError(returnMessageTask, originalCommand);	23✔
17
18	// Save the task in the dictionary and remove it when it is done
19	// this allows us to wait for all pending background tasks to finish
20	_backgroundTasks.TryAdd(withErrorHandling, null);	23✔
21	withErrorHandling.ContinueWith(_ => _backgroundTasks.TryRemove(withErrorHandling, out var _));	46✔
22	}	23✔
23
24	private async Task HandleResultError(Task<HassMessage> returnMessageTask, CommandMessage originalCommand)
25	{
26	try
27	{
28	var result = await returnMessageTask.ConfigureAwait(false);	23✔
29	if (!result.Success ?? false)	18!
30	{
31	logger.LogError("Failed command ({CommandType}) error: {ErrorResult}. Sent command is {CommandMessage}",	1✔
32	originalCommand.Type, result.Error, originalCommand.GetJsonString());	1✔
33	}
34	}	18✔
35	catch (TimeoutException)	1✔
36	{
37	logger.LogWarning("Command ({CommandType}) did not get response in timely fashion. Sent command is {CommandMessage}",	1✔
38	originalCommand.Type, originalCommand.GetJsonString());	1✔
39	}	1✔
40	catch (OperationCanceledException)	3✔
41	{
42	// Expected during connection shutdown or caller cancellation.
43	}	3✔
44	catch (Exception e)	1✔
45	{
46	logger.LogError(e, "Exception waiting for result message. Sent command is {CommandMessage}", originalCommand.GetJsonString());	1✔
47	}	1✔
48	}	23✔
49
50	public async Task WaitPendingBackgroundTasksAsync()
51	{
52	if (!_backgroundTasks.IsEmpty)	54✔
53	{
54	await Task.WhenAll(_backgroundTasks.Keys).ConfigureAwait(false);	5✔
55	}
56	}	54✔
57
58	public async ValueTask DisposeAsync()
59	{
60	try
61	{
62	await WaitPendingBackgroundTasksAsync().WaitAsync(TimeSpan.FromSeconds(5)).ConfigureAwait(false);	49✔
63	}	49✔
UNCOV 64	catch (TimeoutException e)	×
65	{
UNCOV 66	logger.LogError(e, "One or requests are still pending while closing connection to Home Assistant");	×
UNCOV 67	}	×
68	}	49✔
69	}

net-daemon / netdaemon / 29086619629

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous