cleanup

Author: Rafal Maciag

src/All.sln

@@ -44,6 +44,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPi.AutoUpdater.Host",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPi.Pid", "EventPi.Pid\EventPi.Pid.csproj", "{CA093F5C-59C5-4FDC-847E-F91ACB5C730A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPi.NetworkMonitor", "EventPi.NetworkMonitor\EventPi.NetworkMonitor.csproj", "{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -114,6 +116,10 @@ Global
 		{CA093F5C-59C5-4FDC-847E-F91ACB5C730A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CA093F5C-59C5-4FDC-847E-F91ACB5C730A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA093F5C-59C5-4FDC-847E-F91ACB5C730A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/EventPi.AutoUpdater.Host/EventPi.AutoUpdater.Host.csproj

@@ -13,10 +13,10 @@
     <PackageReference Include="CliWrap" Version="3.6.7" />
     <PackageReference Include="Docker.DotNet" Version="3.125.15" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
-    <PackageReference Include="LibGit2Sharp" Version="0.30.0" />
+    <PackageReference Include="LibGit2Sharp" Version="0.31.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="ModelingEvolution.Observable.Blazor" Version="0.0.5.4" />
-    <PackageReference Include="MudBlazor" Version="7.15.0" />
+    <PackageReference Include="MudBlazor" Version="8.9.0" />
   </ItemGroup>
 
   <ItemGroup>

src/EventPi.AutoUpdater.Host/Properties/launchSettings.json

@@ -24,6 +24,16 @@
       },
       "publishAllPorts": true,
       "useSSL": false
+    },
+    "WSL": {
+      "commandName": "WSL2",
+      "launchBrowser": true,
+      "launchUrl": "http://localhost:5018",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_URLS": "http://localhost:5018"
+      },
+      "distributionName": ""
     }
   },
   "$schema": "http://json.schemastore.org/launchsettings.json",

src/EventPi.AutoUpdater.Host/README.md

@@ -0,0 +1,215 @@
+# EventPi AutoUpdater Host - Requirements
+
+## Overview
+
+EventPi AutoUpdater Host is a web-based application management system that provides automated deployment and version management for Docker Compose applications. It bridges Git repository version control with containerized application deployment, offering a modern web interface for monitoring and controlling updates across multiple applications.
+
+## Core Functionality
+
+### 1. Git-Based Version Management
+
+#### 1.1 Repository Integration
+- **Git Repository Monitoring**: Track multiple Git repositories containing Docker Compose applications
+- **Automatic Cloning**: Clone repositories on first access if not locally available
+- **Remote Synchronization**: Fetch latest changes and tags from remote repositories
+- **Tag-Based Versioning**: Use Git tags as version identifiers following semantic versioning (e.g., v1.2.3, ver2.1.0)
+
+#### 1.2 Version Detection and Comparison
+- **Current Version Tracking**: Maintain deployment state with version information in `deployment.state.json`
+- **Available Version Discovery**: Enumerate Git tags to identify available versions
+- **Upgrade Detection**: Compare current deployed version against available tags to identify upgrades
+- **Semantic Version Parsing**: Parse version strings from Git tags (supports v1.2.3, ver1.2.3 formats)
+
+### 2. Docker Compose Management
+
+#### 2.1 Container Orchestration
+- **Docker Compose File Support**: Handle single or multiple docker-compose.yml files per project
+- **Remote Execution**: Execute Docker Compose commands on remote hosts via SSH
+- **Volume Mapping Analysis**: Analyze container volume mappings to translate paths between container and host
+- **Service Lifecycle Management**: Stop, update, and restart Docker Compose services
+
+#### 2.2 Docker Registry Integration
+- **Private Registry Support**: Authenticate with private Docker registries using PAT tokens
+- **Multi-Registry Support**: Handle authentication for multiple registries simultaneously
+- **Docker Hub Integration**: Built-in support for Docker Hub authentication
+
+### 3. Web-Based User Interface
+
+#### 3.1 Dashboard Features
+- **Package Overview**: Display all configured packages with current versions
+- **Update Status Indicators**: Show which packages have available upgrades
+- **Real-time Updates**: Live UI updates using Blazor Server's SignalR connection
+- **Modern UI Framework**: Built with MudBlazor Material Design components
+
+#### 3.2 User Interactions
+- **Individual Package Management**: View details for each configured package
+- **Bulk Operations**: "Update All" functionality to upgrade all packages simultaneously
+- **Update Confirmation**: Clear indication of available upgrades before proceeding
+
+### 4. Network Management Integration
+
+#### 4.1 VPN Control
+- **WireGuard Integration**: Control WireGuard VPN connections (specifically wg0 interface)
+- **NetworkManager Interface**: Use D-Bus communication with NetworkManager for network control
+- **Connection Status Monitoring**: Real-time VPN connection status display
+- **Toggle Control**: Simple on/off switch for VPN connectivity
+
+## Technical Architecture
+
+### 5. Application Stack
+
+#### 5.1 Frontend
+- **Framework**: ASP.NET Core Blazor Server (.NET 9.0)
+- **UI Library**: MudBlazor for Material Design components
+- **Real-time Communication**: SignalR for live updates
+- **Observable Pattern**: ModelingEvolution.Observable for reactive UI updates
+
+#### 5.2 Backend Services
+- **Git Operations**: LibGit2Sharp for repository management
+- **SSH Communication**: SSH.NET for remote command execution
+- **Docker Integration**: Docker.DotNet and Ductus.FluentDocker for container management
+- **Process Execution**: CliWrap for command-line operations
+
+#### 5.3 Configuration Management
+- **JSON Configuration**: appsettings.json with hot-reload support
+- **Environment Variables**: Support for environment-based configuration
+- **File-based Overrides**: Support for external configuration files
+
+### 6. Deployment Architecture
+
+#### 6.1 Containerization
+- **Docker Container**: Runs as a containerized application
+- **Multi-stage Build**: Optimized Dockerfile with development and production stages
+- **Volume Mounting**: `/data` volume for persistent configuration and repositories
+- **Docker Socket Access**: Requires access to host Docker daemon
+
+#### 6.2 Host Communication
+- **SSH Protocol**: Secure communication with Docker host
+- **Network Discovery**: Automatic detection of Docker bridge gateway (172.17.0.1)
+- **Path Translation**: Convert container paths to host paths using volume mappings
+
+## Configuration Schema
+
+### 7. Package Configuration
+
+#### 7.1 Standard Package Format
+```json
+{
+  "RepositoryLocation": "/data/repos/app-name",
+  "RepositoryUrl": "https://github.com/user/repository.git",
+  "DockerComposeDirectory": "./docker",
+  "MergerName": "deployment-user",
+  "MergerEmail": "admin@example.com",
+  "DockerIoAuth": "base64-encoded-credentials"
+}
+```
+
+#### 7.2 Configuration Sections
+- **StdPackages**: Standard package configurations
+- **Packages**: Additional package configurations
+- **SSH Credentials**: `SshUser` and `SshPwd` for host communication
+- **Docker Authentication**: Registry credentials for private repositories
+
+### 8. Security Requirements
+
+#### 8.1 Authentication & Authorization
+- **SSH Key/Password Authentication**: Secure connection to Docker host
+- **Docker Registry Authentication**: Support for private registry access
+- **Volume Security**: Secure handling of mounted volumes and file permissions
+
+#### 8.2 Network Security
+- **TLS/SSL Support**: HTTPS communication capability
+- **VPN Integration**: Secure network connectivity through WireGuard
+- **Container Isolation**: Proper container security boundaries
+
+## Operational Requirements
+
+### 9. Monitoring and Logging
+
+#### 9.1 Application Logging
+- **Structured Logging**: Comprehensive logging using Microsoft.Extensions.Logging
+- **SSH Operation Logging**: Log all remote commands and results
+- **Update Process Tracking**: Log deployment operations and results
+- **Error Handling**: Comprehensive error logging and reporting
+
+#### 9.2 Health Monitoring
+- **Service Health Checks**: Monitor application and dependent service health
+- **Docker Connectivity**: Verify Docker daemon connectivity
+- **SSH Connectivity**: Monitor SSH connection status
+- **Repository Accessibility**: Verify Git repository access
+
+### 10. Performance Requirements
+
+#### 10.1 Scalability
+- **Multiple Package Support**: Handle dozens of packages efficiently
+- **Concurrent Operations**: Support simultaneous package updates
+- **Resource Management**: Efficient memory and CPU usage
+- **Network Optimization**: Minimize bandwidth usage for Git operations
+
+#### 10.2 Reliability
+- **Update Rollback**: Ability to rollback failed deployments
+- **State Persistence**: Maintain deployment state across application restarts
+- **Error Recovery**: Graceful handling of network and deployment failures
+- **Transaction Safety**: Ensure atomic deployment operations
+
+## Integration Requirements
+
+### 11. External System Integration
+
+#### 11.1 Git Providers
+- **GitHub Support**: Full compatibility with GitHub repositories
+- **GitLab Support**: Support for GitLab hosted repositories
+- **Private Git Servers**: Compatible with self-hosted Git solutions
+- **Authentication Methods**: Support for HTTPS and SSH Git authentication
+
+#### 11.2 Container Registries
+- **Docker Hub**: Native support for Docker Hub
+- **Private Registries**: Support for enterprise container registries
+- **Multi-Registry**: Simultaneous support for multiple registries
+- **Authentication**: Token-based and credential-based authentication
+
+### 12. Notification and Alerting
+
+#### 12.1 Update Notifications
+- **Available Update Alerts**: Notify when new versions are available
+- **Deployment Status**: Report success/failure of deployment operations
+- **Error Notifications**: Alert on deployment or connectivity errors
+
+#### 12.2 Communication Channels
+- **Web Interface**: Real-time notifications in the web UI
+- **Email Integration**: Email notifications for critical events
+- **Webhook Support**: Extensible webhook system for external integrations
+
+## Non-Functional Requirements
+
+### 13. Usability
+- **Intuitive Interface**: Simple, clear web interface requiring minimal training
+- **Responsive Design**: Compatible with desktop and mobile browsers
+- **Accessibility**: WCAG compliant interface design
+- **Documentation**: Comprehensive user and administrator documentation
+
+### 14. Maintainability
+- **Modular Architecture**: Clean separation of concerns
+- **Configuration Management**: Externalized configuration
+- **Update Mechanism**: Self-update capability for the AutoUpdater itself
+- **Diagnostic Tools**: Built-in diagnostic and troubleshooting features
+
+### 15. Compatibility
+- **Operating System**: Linux host support (primary target)
+- **Docker Version**: Compatible with Docker 20.10+ and Docker Compose v2
+- **Browser Support**: Modern browser compatibility (Chrome, Firefox, Safari, Edge)
+- **Network Protocols**: IPv4/IPv6 support
+
+## Future Enhancements
+
+### 16. Planned Features
+- **Role-Based Access Control**: Multi-user support with permissions
+- **API Interface**: RESTful API for programmatic access
+- **Backup Integration**: Automated backup before deployments
+- **Advanced Scheduling**: Cron-based update scheduling
+- **Multi-Host Management**: Manage containers across multiple Docker hosts
+- **Kubernetes Support**: Extend support to Kubernetes deployments
+- **Advanced Notifications**: Slack, Discord, and other notification channels
+- **Deployment Pipelines**: Multi-stage deployment workflows
+- **Health Check Integration**: Application-specific health monitoring
+- **Metrics and Analytics**: Deployment metrics and performance analytics

src/EventPi.NetworkMonitor/DeviceInfo.cs

@@ -1,8 +1,10 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
+using System.Linq;
 using System.Net;
 using System.Runtime.InteropServices.Marshalling;
-using EventPi.Abstractions;
+
+using ModelingEvolution.Ipv4;
 using NetworkManager.DBus;
 using Tmds.DBus.Protocol;
 using Connection = NetworkManager.DBus.Connection;
@@ -204,7 +206,7 @@ public async ValueTask DisposeAsync()
     }
 }
 
-public record ConnectionInfo(Ip4Config Ip4Config);
+public record ConnectionInfo(Ipv4Configuration Ip4Config);
 
 public record DeviceInfo
 {
@@ -222,34 +224,34 @@ public record DeviceInfo
             var ipV4ConfigId2 = await Device.GetIp4ConfigAsync();
             var ipV4Config2 = Device.Service.CreateIP4Config(ipV4ConfigId2);
             var ips2 = await ipV4Config2.GetAddressDataAsync();
-            Ip4 ip2 = Ip4.Loopback;
-            uint prefix2= 32;
+            Ipv4Address ip2 = Ipv4Address.Loopback;
+            int prefix2= 32;
             foreach (var i in ips2)
             {
                 ip2 = i["address"].GetString();
-                prefix2 = i["prefix"].GetUInt32();
+                prefix2 = i["prefix"].GetInt32();
             }
 
 
-            Ip4 gw2 = await ipV4Config2.GetGatewayAsync();
-            return new ConnectionInfo(Ip4Config: new Ip4Config(ip2, prefix2, gw2));
+            Ipv4Address gw2 = await ipV4Config2.GetGatewayAsync();
+            return new ConnectionInfo(Ip4Config: new Ipv4Configuration(ip2, prefix2, gw2));
         }
 
         var active = Device.Service.CreateActive(activeId);
         var ipV4ConfigId = await active.GetIp4ConfigAsync();
         var ipV4Config = Device.Service.CreateIP4Config(ipV4ConfigId);
         var ips = await ipV4Config.GetAddressDataAsync();
-        Ip4 ip = Ip4.Loopback;
-        uint prefix = 32;
+        Ipv4Address ip = Ipv4Address.Loopback;
+        int prefix = 32;
         foreach (var i in ips)
         {
             ip  = i["address"].GetString();
-            prefix = i["prefix"].GetUInt32();
+            prefix = i["prefix"].GetInt32();
         }
 
 
-        Ip4 gw = await ipV4Config.GetGatewayAsync();
-        return new ConnectionInfo(Ip4Config: new Ip4Config(ip, prefix, gw));
+        Ipv4Address gw = await ipV4Config.GetGatewayAsync();
+        return new ConnectionInfo(Ip4Config: new Ipv4Configuration(ip, prefix, gw));
 
     }
     public async Task<ProfileInfo?> GetConnectionProfile()

src/EventPi.NetworkMonitor/EventPi.NetworkMonitor.csproj

@@ -6,9 +6,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="ModelingEvolution.Ipv4" Version="1.0.0" />
+    <PackageReference Include="ModelingEvolution.JsonParsableConverter" Version="1.0.0" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.3" />
     <PackageReference Include="Tmds.DBus.Protocol" Version="0.21.2" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EventPi.Abstractions\EventPi.Abstractions.csproj" />
-  </ItemGroup>
 </Project>

src/EventPi.NetworkMonitor/Extensions.cs

@@ -0,0 +1,30 @@
+using System.Security.Cryptography;
+using System.Text;
+
+namespace EventPi.NetworkMonitor;
+
+static class Extensions
+{
+  
+    public static byte[] ToHash(this string t)
+    {
+        using (SHA256 shA256 = SHA256.Create())
+        {
+            byte[] hash = shA256.ComputeHash(Encoding.Default.GetBytes(t));
+            ulong uint64_1 = BitConverter.ToUInt64(hash, 0);
+            ulong uint64_2 = BitConverter.ToUInt64(hash, 8);
+            ulong uint64_3 = BitConverter.ToUInt64(hash, 16);
+            ulong uint64_4 = BitConverter.ToUInt64(hash, 24);
+            ulong num1 = uint64_1 ^ uint64_3;
+            ulong num2 = uint64_2 ^ uint64_4;
+            Memory<byte> memory = new Memory<byte>(new byte[16]);
+            BitConverter.TryWriteBytes(memory.Span, num1);
+            BitConverter.TryWriteBytes(memory.Slice(8, 8).Span, num2);
+            return memory.ToArray();
+        }
+    }
+    public static Guid ToGuid(this string t) => new Guid(t.ToHash());
+    
+
+
+}

src/EventPi.NetworkMonitor/NetworkManagerClient.cs

@@ -6,7 +6,6 @@
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using NetworkManager.DBus;
 using Tmds.DBus.Protocol;
 using Connection = Tmds.DBus.Protocol.Connection;
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously

src/EventPi.NetworkMonitor/PathId.cs

@@ -1,4 +1,4 @@
-using EventPi.Abstractions;
+
 using Tmds.DBus.Protocol;
 
 namespace EventPi.NetworkMonitor;

src/EventPi.NetworkMonitor/WifiNetwork.cs

@@ -1,5 +1,6 @@
 using System.Text;
-using EventPi.Abstractions;
+using System.Linq;
+
 using NetworkManager.DBus;
 using Tmds.DBus.Protocol;
 using Connection = NetworkManager.DBus.Connection;