feat: Enhance email command handling with device ID and update process improvements

Author: geogengames-hue

Program.cs

@@ -175,6 +175,12 @@ private static void EnsureWatchdogInstalled()
                 }
 
                 Logger.Instance.Info("Watchdog path changed, updating service...");
+                if (SuppressWatchdogElevation())
+                {
+                    Logger.Instance.Warn("Skipping elevated watchdog service path update because elevation is disabled for this run.");
+                    return;
+                }
+
                 var psi = new ProcessStartInfo
                 {
                     FileName = watchdogPath,
@@ -205,6 +211,12 @@ private static void EnsureWatchdogInstalled()
             if (exePath == null) return;
 
             Logger.Instance.Info("Installing watchdog service...");
+            if (SuppressWatchdogElevation())
+            {
+                Logger.Instance.Warn("Skipping elevated watchdog service installation because elevation is disabled for this run.");
+                return;
+            }
+
             var psi = new ProcessStartInfo
             {
                 FileName = watchdogPath,
@@ -223,6 +235,11 @@ private static void EnsureWatchdogInstalled()
         }
     }
 
+    private static bool SuppressWatchdogElevation()
+    {
+        return string.Equals(Environment.GetEnvironmentVariable("DEVICEMON_SUPPRESS_WATCHDOG_UAC"), "1", StringComparison.Ordinal);
+    }
+
     private static void StartWatchdogServiceIfNeeded(System.ServiceProcess.ServiceController sc, string watchdogPath, string monitorPath)
     {
         try
@@ -251,6 +268,12 @@ private static void TryElevatedWatchdogUpdate(string watchdogPath, string monito
             if (string.IsNullOrWhiteSpace(watchdogPath) || !File.Exists(watchdogPath))
                 return;
 
+            if (SuppressWatchdogElevation())
+            {
+                Logger.Instance.Warn("Skipping elevated watchdog service repair/start because elevation is disabled for this run.");
+                return;
+            }
+
             Logger.Instance.Warn("Requesting elevated watchdog service repair/start...");
             var psi = new ProcessStartInfo
             {

README.md

@@ -97,10 +97,11 @@ When you run `DeviceMon.exe`, it automatically looks for `GameHost.exe` in the s
 # Output goes to: bin\Release\net8.0-windows\win-x64\publish\
 ```
 
-The script publishes three projects:
+The script publishes four projects:
 1. `MonitorAndControl.csproj` → `DeviceMon.exe`
 2. `Watchdog\SystemHelperWatchdog.csproj` → `GameHost.exe`
-3. `PopupHost\PopupHost.csproj` → `PopupHost.exe`
+3. `PopupHost\PopupHost.csproj` -> `PopupHost.exe`
+4. `UpdateAgent\UpdateAgent.csproj` -> `UpdateAgent.exe`
 
 It also copies `appsettings.json`, the `wwwroot/` folder, and PowerShell helper scripts.
 
@@ -143,6 +144,7 @@ MonitorAndControl/
 │   └── wwwroot/            # SPA dashboard (HTML, JS, CSS, i18n JSON)
 ├── Resources/              # .resx localization files
 ├── PopupHost/              # Warning popup child process
+|-- UpdateAgent/            # Self-update helper launched from dashboard
 ├── Watchdog/               # Windows service watchdog
 └── Tests/                  # Unit tests
 ```
@@ -257,11 +259,11 @@ Once installed, the `GameHost` service runs under the SYSTEM account and automat
 | **Discover** | Scan system for installed games/apps, add them with default limit |
 | **Schedule** | Time‑based allowed hours rules per app |
 | **Logs** | Real‑time event log with filtering |
-| **Settings** | Kill delay, language, auto‑start, webhook, email, admin password, backup/restore, health |
+| **Settings** | Kill delay, language, dashboard hotkey, auto-start, webhook, email, app update, admin password, backup/restore, health |
 
 **Admin password:** Set one in **Settings** from the child PC or a remote dashboard to protect dashboard changes (pause, resume, reset, kill, settings edits) and shutdown.
 
-**App update:** Put a freshly published package on a local folder, UNC share, or HTTP/HTTPS ZIP URL, then use **Settings -> App Update**. The package must contain `DeviceMon.exe`. The dashboard starts `UpdateAgent.exe`, closes DeviceMon, copies the package over the install folder, restarts DeviceMon, and repairs/restarts the watchdog when permissions allow. Check `update.log` in the install folder if an update fails.
+**App update:** Put a freshly published package on a local folder, UNC share, or HTTP/HTTPS ZIP URL, then use **Settings -> App Update**. The package must contain `DeviceMon.exe`. For Windows 11 SMB shares, enter the optional SMB username/password. The dashboard starts `UpdateAgent.exe`, writes an update marker, closes DeviceMon, copies the package over the install folder, restarts DeviceMon, and repairs/restarts the watchdog when permissions allow. The updated watchdog pauses auto-restart while the update marker is fresh. Check `update.log` in the install folder if an update fails.
 
 **Remote access:** Settings show the computer name and IP addresses. From another PC, open `http://CHILD_PC_NAME:5000` or `http://192.168.x.x:5000`.
 
@@ -276,6 +278,7 @@ Once installed, the `GameHost` service runs under the SYSTEM account and automat
 |---------|---------|-------------|
 | `help` | `mc: help` | Shows all available commands |
 | `status` | `mc: status` | Current limits, schedule, and today's usage |
+| `@device command` | `mc: @bedroom status` | Run a command only on the PC with that Device ID |
 | `set [app] [min] min` | `mc: set Fortnite 60 min` | Set daily limit for an app |
 | `bonus [app] [min] min` | `mc: bonus Fortnite 15 min` | Add bonus time today |
 | `extend [app] until bedtime` | `mc: extend Fortnite until bedtime` | Extend until end of allowed window |

Services/EmailService.cs

@@ -26,6 +26,7 @@ public class EmailService : IDisposable
     private string _email = "";
     private string _password = "";
     private string _allowedSender = "";
+    private string _deviceId = Environment.MachineName;
     private string _startAlertDate = DateTime.Now.ToString("yyyy-MM-dd");
     private const string SmtpHost = "smtp.gmail.com";
     private const int SmtpPort = 587;
@@ -50,6 +51,9 @@ public async Task LoadSettingsAsync()
         if (!string.IsNullOrEmpty(storedPassword) && !storedPassword.StartsWith("dpapi:", StringComparison.Ordinal))
             await _db.SetSettingAsync("EmailPassword", SecretProtector.Protect(_password));
         _allowedSender = await _db.GetSettingAsync("EmailAllowedSender", _email);
+        _deviceId = NormalizeDeviceId(await _db.GetSettingAsync("EmailDeviceId", Environment.MachineName));
+        if (string.IsNullOrWhiteSpace(_deviceId))
+            _deviceId = NormalizeDeviceId(Environment.MachineName);
         _notifyEnabled = !string.IsNullOrEmpty(_email) && !string.IsNullOrEmpty(_password)
             && (await _db.GetSettingAsync("EmailNotifyEnabled", "false")) == "true";
         _startNotifyEnabled = !string.IsNullOrEmpty(_email) && !string.IsNullOrEmpty(_password)
@@ -105,8 +109,8 @@ private async void PollRunningTrackedApps(object? state)
             var msg = new MimeMessage();
             msg.From.Add(new MailboxAddress("Monitor", _email));
             msg.To.Add(new MailboxAddress("Parent", to));
-            msg.Subject = subject;
-            msg.Body = new TextPart("plain") { Text = body };
+            msg.Subject = $"[{_deviceId}] {subject}";
+            msg.Body = new TextPart("plain") { Text = WithDeviceHeader(body) };
 
             using var client = new SmtpClient();
             await client.ConnectAsync(SmtpHost, SmtpPort, SecureSocketOptions.StartTls);
@@ -146,7 +150,7 @@ private async void PollRunningTrackedApps(object? state)
         }
 
         var subject = $"App Started: {appName}";
-        var body = $"{appName} was opened on {Environment.MachineName}.\nProcess: {processName}\nTime: {DateTime.Now:g}";
+        var body = $"{appName} was opened.\nProcess: {processName}\nTime: {DateTime.Now:g}";
         return await SendMailAsync(subject, body, _email);
     }
 
@@ -157,7 +161,7 @@ private async void PollRunningTrackedApps(object? state)
 
         return await SendMailAsync(
             "App Started: Test",
-            $"This is a test app-start email from {Environment.MachineName} at {DateTime.Now:g}.",
+            $"This is a test app-start email at {DateTime.Now:g}.",
             _email);
     }
 
@@ -197,9 +201,14 @@ private async void PollInbox(object? state)
                 var commandText = ExtractCommandText(subject, body);
                 if (commandText == null)
                     continue;
+                if (!IsCommandForThisDevice(commandText, out var effectiveCommand))
+                {
+                    Logger.Instance.Info($"Email command ignored on {_deviceId}; target does not match: \"{commandText}\"");
+                    continue;
+                }
 
-                Logger.Instance.Info($"Email command from {from}: \"{commandText}\"");
-                var reply = await ProcessCommandAsync(commandText);
+                Logger.Instance.Info($"Email command from {from}: \"{effectiveCommand}\"");
+                var reply = await ProcessCommandAsync(effectiveCommand);
                 if (reply != null)
                 {
                     Logger.Instance.Info($"Email reply to {from}: \"{reply}\"");
@@ -243,6 +252,24 @@ private string[] GetAllowedSenders()
         return null;
     }
 
+    private bool IsCommandForThisDevice(string commandText, out string effectiveCommand)
+    {
+        effectiveCommand = commandText.Trim();
+        var match = Regex.Match(effectiveCommand, @"^@(?<id>[A-Za-z0-9_.-]+)\s+(?<cmd>.+)$", RegexOptions.IgnoreCase);
+        if (!match.Success)
+            match = Regex.Match(effectiveCommand, @"^to\s+(?<id>[A-Za-z0-9_.-]+)\s+(?<cmd>.+)$", RegexOptions.IgnoreCase);
+
+        if (!match.Success)
+            return true;
+
+        var target = NormalizeDeviceId(match.Groups["id"].Value);
+        if (!target.Equals(_deviceId, StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        effectiveCommand = match.Groups["cmd"].Value.Trim();
+        return effectiveCommand.Length > 0;
+    }
+
     private async Task<string?> ProcessCommandAsync(string text)
     {
         var lines = text.Split('\n', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
@@ -253,6 +280,7 @@ private string[] GetAllowedSenders()
             // help
             if (lower.StartsWith("help"))
                 return @"Commands:
+  @device status                - run command only on one PC
   status                        - current limits, schedule, today's usage
   set [app] [minutes] min       - set daily limit (e.g. set aces 60 min)
   bonus [app] [minutes] min     - add bonus time today (e.g. bonus aces 15 min)
@@ -261,7 +289,7 @@ private string[] GetAllowedSenders()
   set kill-delay [seconds]      - set kill delay
   add [process.exe] [appname]   - register a known app (e.g. add aces.exe Aces)
 
-Prefix commands with mc:, for example: mc: status";
+Prefix commands with mc:, for example: mc: status or mc: @" + _deviceId + " status";
 
             // status
             if (lower.StartsWith("status"))
@@ -270,6 +298,9 @@ set kill-delay [seconds]      - set kill delay
                 var usage = await _db.GetTodayUsageAsync();
                 var schedule = await _db.GetScheduleRulesAsync();
                 var sb = new System.Text.StringBuilder();
+                sb.AppendLine($"Device: {_deviceId}");
+                sb.AppendLine($"Computer: {Environment.MachineName}");
+                sb.AppendLine();
                 sb.AppendLine("=== Limits ===");
                 foreach (var l in limits)
                 {
@@ -402,8 +433,8 @@ private async Task SendReplyAsync(string to, string subject, string body)
             var msg = new MimeMessage();
             msg.From.Add(new MailboxAddress("Monitor", _email));
             msg.To.Add(new MailboxAddress("", to));
-            msg.Subject = "Re: " + subject;
-            msg.Body = new TextPart("plain") { Text = body };
+            msg.Subject = $"Re: [{_deviceId}] " + subject;
+            msg.Body = new TextPart("plain") { Text = WithDeviceHeader(body) };
 
             using var client = new SmtpClient();
             await client.ConnectAsync(SmtpHost, SmtpPort, SecureSocketOptions.StartTls);
@@ -429,8 +460,8 @@ private async Task SendReplyAsync(string to, string subject, string body)
             var msg = new MimeMessage();
             msg.From.Add(new MailboxAddress("Monitor", email));
             msg.To.Add(new MailboxAddress("Parent", email));
-            msg.Subject = "Test from Monitor";
-            msg.Body = new TextPart("plain") { Text = "Email notification test - If you receive this, email is configured correctly." };
+            msg.Subject = $"[{_deviceId}] Test from Monitor";
+            msg.Body = new TextPart("plain") { Text = WithDeviceHeader("Email notification test - If you receive this, email is configured correctly.") };
 
             using var client = new SmtpClient();
             await client.ConnectAsync(SmtpHost, SmtpPort, SecureSocketOptions.StartTls);
@@ -449,4 +480,13 @@ public void Dispose()
         _pollTimer?.Dispose();
         _startAlertTimer?.Dispose();
     }
+
+    private string WithDeviceHeader(string body) =>
+        $"Device: {_deviceId}\nComputer: {Environment.MachineName}\n\n{body}";
+
+    public static string NormalizeDeviceId(string value)
+    {
+        var normalized = Regex.Replace((value ?? "").Trim(), @"[^A-Za-z0-9_.-]+", "-").Trim('-');
+        return normalized.Length > 40 ? normalized[..40] : normalized;
+    }
 }