Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore: add connect/disconnect notifications on Coder Connect#140

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.

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

Already on GitHub?Sign in to your account

Merged
ibetitsmike merged 7 commits intomainfrommike/40-connect-notification
Jul 1, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
12 changes: 11 additions & 1 deletionApp/App.xaml.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@

namespace Coder.Desktop.App;

public partial class App : Application, IDispatcherQueueManager
public partial class App : Application, IDispatcherQueueManager, INotificationHandler
{
private const string MutagenControllerConfigSection = "MutagenController";
private const string UpdaterConfigSection = "Updater";
Expand DownExpand Up@@ -91,6 +91,7 @@ public App()
services.AddSingleton<IAgentApiClientFactory, AgentApiClientFactory>();

services.AddSingleton<IDispatcherQueueManager>(_ => this);
services.AddSingleton<INotificationHandler>(_ => this);
services.AddSingleton<ICredentialBackend>(_ =>
new WindowsCredentialBackend(WindowsCredentialBackend.CoderCredentialsTargetName));
services.AddSingleton<ICredentialManager, CredentialManager>();
Expand DownExpand Up@@ -335,4 +336,13 @@ public void RunInUiThread(DispatcherQueueHandler action)
}
dispatcherQueue.TryEnqueue(action);
}

public void HandleNotificationActivation(IDictionary<string, string> args)
{
var app = (App)Current;
if (app != null && app.TrayWindow != null)
Comment on lines +342 to +343
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Shouldn't this just beif (TrayWindow != null) TrayWindow.Tray_Open();?

{
app.TrayWindow.Tray_Open();
}
}
}
41 changes: 35 additions & 6 deletionsApp/Services/UserNotifier.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Coder.Desktop.App.Views;
using Microsoft.Extensions.Logging;
using Microsoft.Windows.AppNotifications;
using Microsoft.Windows.AppNotifications.Builder;
Expand All@@ -20,17 +21,40 @@ public interface IUserNotifier : INotificationHandler, IAsyncDisposable
public void UnregisterHandler(string name);

public Task ShowErrorNotification(string title, string message, CancellationToken ct = default);
public Task ShowActionNotification(string title, string message, string handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default);
/// <summary>
/// This method allows to display a Windows-native notification with an action defined in
/// <paramref name="handlerName"/> and provided <paramref name="args"/>.
/// </summary>
/// <param name="title">Title of the notification.</param>
/// <param name="message">Message to be displayed in the notification body.</param>
/// <param name="handlerName">Handler should be e.g. <c>nameof(Handler)</c> where <c>Handler</c>
/// implements <see cref="Coder.Desktop.App.Services.INotificationHandler" />.
/// If handler is <c>null</c> the action will open Coder Desktop.</param>
/// <param name="args">Arguments to be provided to the handler when executing the action.</param>
public Task ShowActionNotification(string title, string message, string? handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default);
}

public class UserNotifier(ILogger<UserNotifier> logger, IDispatcherQueueManager dispatcherQueueManager) : IUserNotifier
public class UserNotifier : IUserNotifier
{
private const string CoderNotificationHandler = "CoderNotificationHandler";
private const string DefaultNotificationHandler = "DefaultNotificationHandler";

private readonly AppNotificationManager _notificationManager = AppNotificationManager.Default;
private readonly ILogger<UserNotifier> _logger;
private readonly IDispatcherQueueManager _dispatcherQueueManager;

private ConcurrentDictionary<string, INotificationHandler> Handlers { get; } = new();

public UserNotifier(ILogger<UserNotifier> logger, IDispatcherQueueManager dispatcherQueueManager,
INotificationHandler notificationHandler)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Perhaps we should wrap it with a marker type likepublic interface IDefaultNotificationHandler : INotificationHandler so we don't inadvertently add another implementation that could get DI'd here, and only have theApp implementIDefaultNotificationHandler

{
_logger = logger;
_dispatcherQueueManager = dispatcherQueueManager;
var defaultHandlerAdded = Handlers.TryAdd(DefaultNotificationHandler, notificationHandler);
if (!defaultHandlerAdded)
throw new Exception($"UserNotifier failed to be initialized with {nameof(DefaultNotificationHandler)}");
}

public ValueTask DisposeAsync()
{
return ValueTask.CompletedTask;
Expand All@@ -50,6 +74,8 @@ public void RegisterHandler(string name, INotificationHandler handler)

public void UnregisterHandler(string name)
{
if (name == nameof(DefaultNotificationHandler))
throw new InvalidOperationException($"You cannot remove '{name}'.");
if (!Handlers.TryRemove(name, out _))
throw new InvalidOperationException($"No handler with the name '{name}' is registered.");
}
Expand All@@ -61,8 +87,11 @@ public Task ShowErrorNotification(string title, string message, CancellationToke
return Task.CompletedTask;
}

public Task ShowActionNotification(string title, string message, string handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default)
public Task ShowActionNotification(string title, string message, string? handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default)
{
if (handlerName == null)
handlerName = nameof(DefaultNotificationHandler); // Use default handler if no handler name is provided

if (!Handlers.TryGetValue(handlerName, out _))
throw new InvalidOperationException($"No action handler with the name '{handlerName}' is registered.");

Expand DownExpand Up@@ -90,19 +119,19 @@ public void HandleNotificationActivation(IDictionary<string, string> args)

if (!Handlers.TryGetValue(handlerName, out var handler))
{
logger.LogWarning("no action handler '{HandlerName}' found for notification activation, ignoring", handlerName);
_logger.LogWarning("no action handler '{HandlerName}' found for notification activation, ignoring", handlerName);
return;
}

dispatcherQueueManager.RunInUiThread(() =>
_dispatcherQueueManager.RunInUiThread(() =>
{
try
{
handler.HandleNotificationActivation(args);
}
catch (Exception ex)
{
logger.LogWarning(ex, "could not handle activation for notification with handler '{HandlerName}", handlerName);
_logger.LogWarning(ex, "could not handle activation for notification with handler '{HandlerName}", handlerName);
}
});
}
Expand Down
59 changes: 57 additions & 2 deletionsApp/Views/TrayWindow.xaml.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,12 @@
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Documents;
using Microsoft.UI.Xaml.Media.Animation;
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using Windows.Graphics;
using Windows.System;
Expand All@@ -33,17 +36,23 @@ public sealed partial class TrayWindow : Window
private int _lastWindowHeight;
private Storyboard? _currentSb;

private VpnLifecycle curVpnLifecycle = VpnLifecycle.Stopped;
private RpcLifecycle curRpcLifecycle = RpcLifecycle.Disconnected;

private readonly IRpcController _rpcController;
private readonly ICredentialManager _credentialManager;
private readonly ISyncSessionController _syncSessionController;
private readonly IUpdateController _updateController;
private readonly IUserNotifier _userNotifier;
private readonly TrayWindowLoadingPage _loadingPage;
private readonly TrayWindowDisconnectedPage _disconnectedPage;
private readonly TrayWindowLoginRequiredPage _loginRequiredPage;
private readonly TrayWindowMainPage _mainPage;

public TrayWindow(IRpcController rpcController, ICredentialManager credentialManager,
public TrayWindow(
IRpcController rpcController, ICredentialManager credentialManager,
ISyncSessionController syncSessionController, IUpdateController updateController,
IUserNotifier userNotifier,
TrayWindowLoadingPage loadingPage,
TrayWindowDisconnectedPage disconnectedPage, TrayWindowLoginRequiredPage loginRequiredPage,
TrayWindowMainPage mainPage)
Expand All@@ -52,6 +61,7 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan
_credentialManager = credentialManager;
_syncSessionController = syncSessionController;
_updateController = updateController;
_userNotifier = userNotifier;
_loadingPage = loadingPage;
_disconnectedPage = disconnectedPage;
_loginRequiredPage = loginRequiredPage;
Expand DownExpand Up@@ -142,9 +152,54 @@ private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,
}
}

private void MaybeNotifyUser(RpcModel rpcModel)
{
// This method is called when the state changes, but we don't want to notify
// the user if the state hasn't changed.
var isRpcLifecycleChanged = rpcModel.RpcLifecycle == RpcLifecycle.Disconnected && curRpcLifecycle != rpcModel.RpcLifecycle;
var isVpnLifecycleChanged = (rpcModel.VpnLifecycle == VpnLifecycle.Started || rpcModel.VpnLifecycle == VpnLifecycle.Stopped) && curVpnLifecycle != rpcModel.VpnLifecycle;

if (!isRpcLifecycleChanged && !isVpnLifecycleChanged)
{
return;
}

Comment on lines +157 to +166
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I don't think you need any of these lines since they're essentially covered by what's below right?

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Unfortunately no, I ignore the intermediate states of the Vpn lifecycle on purpose (and I don't update the prevRpcLifecycle for that reason).

var oldRpcLifeycle = curRpcLifecycle;
var oldVpnLifecycle = curVpnLifecycle;
curRpcLifecycle = rpcModel.RpcLifecycle;
curVpnLifecycle = rpcModel.VpnLifecycle;

var messages = new List<string>();

if (oldRpcLifeycle != RpcLifecycle.Disconnected && curRpcLifecycle == RpcLifecycle.Disconnected)
{
messages.Add("Disconnected from Coder background service.");
}

if (oldVpnLifecycle != curVpnLifecycle)
{
switch (curVpnLifecycle)
{
case VpnLifecycle.Started:
messages.Add("Coder Connect started.");
break;
case VpnLifecycle.Stopped:
messages.Add("Coder Connect stopped.");
break;
}
}

if (messages.Count == 0) return;
if (_aw.IsVisible) return;

var message = string.Join(" ", messages);
_userNotifier.ShowActionNotification(message, string.Empty, null, null, CancellationToken.None);
}

private void RpcController_StateChanged(object? _, RpcModel model)
{
SetPageByState(model, _credentialManager.GetCachedCredentials(), _syncSessionController.GetState());
MaybeNotifyUser(model);
}

private void CredentialManager_CredentialsChanged(object? _, CredentialModel model)
Expand DownExpand Up@@ -297,7 +352,7 @@ private void Window_Activated(object sender, WindowActivatedEventArgs e)
}

[RelayCommand]
private void Tray_Open()
public void Tray_Open()
{
MoveResizeAndActivate();
}
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp