WIP - Add remote service interactions

.github/workflows/dotnet-desktop.yml

@@ -36,7 +36,7 @@
 # For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
 # refer to https://github.com/microsoft/github-actions-for-desktop-apps
 
-name: .NET Core Desktop Build and Verify
+name: Desktop Build and Verify
 permissions:
   contents: read
   pull-requests: write
@@ -53,7 +53,7 @@ jobs:
 
     strategy:
       matrix:
-        configuration: [Debug, Release]
+        configuration: [Release]
 
     runs-on: windows-latest  # For a list of available runner types, refer to
                              # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on

.github/workflows/dotnet-service.yml

@@ -0,0 +1,88 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# This workflow will build, test, sign and package a WPF or Windows Forms desktop application
+# built on .NET Core.
+# To learn how to migrate your existing application to .NET Core,
+# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework
+#
+# To configure this workflow:
+#
+# 1. Configure environment variables
+# GitHub sets default environment variables for every workflow run.
+# Replace the variables relative to your project in the "env" section below.
+#
+# 2. Signing
+# Generate a signing certificate in the Windows Application
+# Packaging Project or add an existing signing certificate to the project.
+# Next, use PowerShell to encode the .pfx file using Base64 encoding
+# by running the following Powershell script to generate the output string:
+#
+# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte
+# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt'
+#
+# Open the output file, SigningCertificate_Encoded.txt, and copy the
+# string inside. Then, add the string to the repo as a GitHub secret
+# and name it "Base64_Encoded_Pfx."
+# For more information on how to configure your signing certificate for
+# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing
+#
+# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key".
+# See "Build the Windows Application Packaging project" below to see how the secret is used.
+#
+# For more information on GitHub Actions, refer to https://github.com/features/actions
+# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
+# refer to https://github.com/microsoft/github-actions-for-desktop-apps
+
+name: Service Build and Verify
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: windows-latest  # For a list of available runner types, refer to
+                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
+
+    env:
+      Solution_Name: services.sln                         # Replace with your solution name, i.e. MyWpfApp.sln.
+      Test_Project_Path: src\ScreenTimeTest\ScreenTimeTest.csproj                 # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj.
+      # Wap_Project_Directory: your-wap-project-directory-name    # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package.
+      # Wap_Project_Path: your-wap-project-path                   # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj.
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    # Install the .NET Core workload
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 9.0.x
+
+    # Build the application to populate the obj folder with RuntimeIdentifiers
+    - name: Build the application
+      run: dotnet build $env:Solution_Name 
+      env:
+        Configuration: ${{ matrix.configuration }}
+
+    # Execute all unit tests in the solution
+    - name: Execute unit tests
+      run: dotnet test $env:Test_Project_Path
+

.gitignore

@@ -396,3 +396,4 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
+.VSCodeCounter/*

client.sln

@@ -4,9 +4,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.5.002.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScreenTimeClient", "src\ScreenTimeClient\ScreenTimeClient.csproj", "{C8F5B159-EE59-4DF2-AE4F-F29720D2C411}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6F2B1F0F-759D-4F8A-85D3-EAB7900F4106} = {6F2B1F0F-759D-4F8A-85D3-EAB7900F4106}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTimeTest", "src\ScreenTimeTest\ScreenTimeTest.csproj", "{723DBE42-FDB4-09D1-B381-2B18C4E0C02D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTIme.Common", "src\ScreenTIme.Common\ScreenTIme.Common.csproj", "{6F2B1F0F-759D-4F8A-85D3-EAB7900F4106}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +26,10 @@ Global
 		{723DBE42-FDB4-09D1-B381-2B18C4E0C02D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{723DBE42-FDB4-09D1-B381-2B18C4E0C02D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{723DBE42-FDB4-09D1-B381-2B18C4E0C02D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F2B1F0F-759D-4F8A-85D3-EAB7900F4106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F2B1F0F-759D-4F8A-85D3-EAB7900F4106}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F2B1F0F-759D-4F8A-85D3-EAB7900F4106}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F2B1F0F-759D-4F8A-85D3-EAB7900F4106}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

screentime.sln

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTimeService", "src\Sc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTimeWebApp", "src\ScreenTimeWebApp\ScreenTimeWebApp.csproj", "{74824E5D-D706-4B15-8FAC-519481DFD92F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTime.Common", "src\ScreenTIme.Common\ScreenTime.Common.csproj", "{7123C63B-9341-FCC6-F236-F06D8B356B34}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{74824E5D-D706-4B15-8FAC-519481DFD92F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74824E5D-D706-4B15-8FAC-519481DFD92F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74824E5D-D706-4B15-8FAC-519481DFD92F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7123C63B-9341-FCC6-F236-F06D8B356B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7123C63B-9341-FCC6-F236-F06D8B356B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7123C63B-9341-FCC6-F236-F06D8B356B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7123C63B-9341-FCC6-F236-F06D8B356B34}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

services.sln

@@ -1,12 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.13.35617.110 d17.13
+VisualStudioVersion = 17.13.35617.110
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTimeService", "src\ScreenTimeService\ScreenTimeService.csproj", "{E14F7292-B70E-774F-19D4-C483AEF4B32D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTimeWebApp", "src\ScreenTimeWebApp\ScreenTimeWebApp.csproj", "{E56516C9-FC8D-185C-B490-01A74AB009A4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTIme.Common", "src\ScreenTIme.Common\ScreenTIme.Common.csproj", "{7123C63B-9341-FCC6-F236-F06D8B356B34}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{E56516C9-FC8D-185C-B490-01A74AB009A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E56516C9-FC8D-185C-B490-01A74AB009A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E56516C9-FC8D-185C-B490-01A74AB009A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7123C63B-9341-FCC6-F236-F06D8B356B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7123C63B-9341-FCC6-F236-F06D8B356B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7123C63B-9341-FCC6-F236-F06D8B356B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7123C63B-9341-FCC6-F236-F06D8B356B34}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/ScreenTimeClient/UserConfiguration.cs → src/ScreenTIme.Common/DailyConfiguration.cs

@@ -1,18 +1,15 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace ScreenTimeClient
+namespace ScreenTime.Common
 {
-    public record class UserConfiguration(
-            string Name,
+    public record DailyConfiguration(
             int DailyLimitMinutes = 60,
             int WarningTimeMinutes = 10,
-            int WarningIntervalSeconds = 60,
             int GraceMinutes = 5,
             string ResetTime = "06:00",
             bool DisableLock = false,
             int DelayLockSeconds = 10,
-            bool EnableOnline = false,
-            List<(DateTimeOffset, int)>? Extensions = null) : IEquatable<UserConfiguration>, IComparable<UserConfiguration>
+            List<(DateTimeOffset, int)>? Extensions = null) : IEquatable<DailyConfiguration>, IComparable<DailyConfiguration>
     {
         public TimeSpan TotalTimeAllowed
         {
@@ -46,22 +43,17 @@
             }
         }
 
-        public int CompareTo(UserConfiguration? other)
+        public int CompareTo(DailyConfiguration? other)
         {
             throw new Exception();
         }
 
-        virtual public bool Equals(UserConfiguration? other)
+        virtual public bool Equals(DailyConfiguration? other)
         {
-            // throw new Exception();
             if (other == null)
             {
                 return false;
             }
-            if (Name != other.Name)
-            {
-                return false;
-            }
             if (DailyLimitMinutes != other.DailyLimitMinutes)
             {
                 return false;
@@ -70,10 +62,6 @@
             {
                 return false;
             }
-            if (WarningIntervalSeconds != other.WarningIntervalSeconds)
-            {
-                return false;
-            }
             if (GraceMinutes != other.GraceMinutes)
             {
                 return false;
@@ -90,10 +78,6 @@
             {
                 return false;
             }
-            if (EnableOnline != other.EnableOnline)
-            {
-                return false;
-            }
             if (Extensions == null && other.Extensions == null)
             {
                 return true;
@@ -126,6 +110,6 @@
         {
             // test
             throw new Exception();
             return base.GetHashCode();
         }
     }

src/ScreenTIme.Common/Extensions.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ScreenTime.Common
+{
+    public record AdminExtensionGrant(Guid UserId, TimeSpan Duration, Guid[] RequestIds);
+    public record ExtensionGrant(DateTimeOffset GrantDate, TimeSpan Duration);
+    public record ExtensionRequest(TimeSpan Duration);
+    public record AdminExtensionRequest(Guid requestId, User User, DateTimeOffset SubmissionDate, TimeSpan Duration);
+}

src/ScreenTIme.Common/Heartbeat.cs

@@ -0,0 +1,6 @@
+namespace ScreenTime.Common
+{
+    public record Heartbeat(DateTimeOffset Timestamp, TimeSpan Duration, UserState UserState);
+
+    public record User (Guid Id, string Name, string Email);
+}

src/ScreenTIme.Common/ScreenTIme.Common.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

src/ScreenTimeClient/UserActivityState.cs → src/ScreenTIme.Common/UserActivityState.cs

@@ -1,5 +1,5 @@
 
-namespace ScreenTimeClient
+namespace ScreenTime.Common
 {
 
     public enum UserActivityState

src/ScreenTimeClient/UserMessage.cs → src/ScreenTIme.Common/UserMessage.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace ScreenTimeClient
+namespace ScreenTime.Common
 {
     // make it so that the properties can be lowercase when deserialized by json 
     public record UserMessage(string Title, string Message, string Icon, string Action);

src/ScreenTIme.Common/UserState.cs

@@ -0,0 +1,8 @@
+using System.Text.Json.Serialization;
+
+namespace ScreenTime.Common
+{
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public enum UserState { Invalid, Okay, Warn, Error, Lock, Paused }
+
+}

src/ScreenTimeClient/UserStatus.cs → src/ScreenTIme.Common/UserStatus.cs

@@ -1,4 +1,4 @@
-namespace ScreenTimeClient
+namespace ScreenTime.Common
 {
     public record UserStatus(TimeSpan LoggedInTime, string Icon, string Action, UserState State, TimeSpan DailyTimeLimit, TimeSpan ExtensionTime);
 

src/ScreenTimeClient/ComputerStateEventArgs.cs

@@ -1,4 +1,6 @@
-namespace ScreenTimeClient
+using ScreenTime.Common;
+
+namespace ScreenTimeClient
 {
     public class ComputerStateEventArgs(UserState state) : EventArgs
     {

src/ScreenTimeClient/Configuration/ClientConfiguration.cs

@@ -0,0 +1,13 @@
+using ScreenTime.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace ScreenTimeClient.Configuration
+{
+
+    public record ClientConfiguration(int WarningInterval, bool EnableOnline);
+}

src/ScreenTimeClient/Configuration/ClientConfigurationRegistryReader.cs

@@ -0,0 +1,40 @@
+using Microsoft.Win32;
+
+namespace ScreenTimeClient.Configuration
+{
+    public class ClientConfigurationRegistryReader : IClientConfigurationReader
+    {
+        const string _baseKey = @"HKEY_CURRENT_USER\Software\ScreenTime";
+
+        public ClientConfiguration GetConfiguration()
+        {
+            var warningInterval = GetRegistryIntValue(_baseKey, "WarningInterval", 60);
+            var enableOnline = GetRegistryIntValue(_baseKey, "EnableOnline", 0) == 1; // convert to boolean
+
+            return new ClientConfiguration(warningInterval, enableOnline);
+
+        }
+
+        private static int GetRegistryIntValue(string key, string valueName, int defaultValue)
+        {
+            var objectValue = Registry.GetValue(key, valueName, defaultValue);
+            if (objectValue == null)
+            {
+                return defaultValue;
+            }
+            else if (objectValue is int intValue)
+            {
+                return intValue;
+            }
+            else if (objectValue is string stringValue)
+            {
+                if (int.TryParse(stringValue, out int result))
+                {
+                    return result;
+                }
+            }
+            return defaultValue;
+        }
+
+    }
+}

src/ScreenTimeClient/Configuration/DailyConfigurationEventArgs.cs

@@ -0,0 +1,11 @@
+using ScreenTime.Common;
+
+
+namespace ScreenTimeClient.Configuration
+{
+    public class DailyConfigurationEventArgs(object Sender, DailyConfiguration Configuration) : EventArgs
+    {
+        public DailyConfiguration Configuration { get; } = Configuration;
+        public object Sender { get; } = Sender;
+    }
+}