.github/ISSUE_TEMPLATE/bug.yml

@@ -1,76 +0,0 @@
----
-name: Bug report
-description: 🐛 Let us know about an unexpected error, a crash, or an unexpected behavior.
-type: 'Bug'
-labels:
-  - 'type: bug'
-body:
-  - type: checkboxes
-    attributes:
-      label: Disclaimer
-      description: |
-        For support questions, please use the [discussions][] or [Discord][] instead. Before
-        opening a bug report, ensure you have read the [documentation][],
-        [Troubleshooting][] and [Device FAQs][]. Only use bug reports for actual
-        bugs.
-
-        [documentation]: https://jetkvm.com/docs
-        [Troubleshooting]: https://jetkvm.com/docs/getting-started/troubleshooting
-        [Device FAQs]: https://jetkvm.com/docs/getting-started/faq
-        [discussions]: https://github.com/jetkvm/kvm/discussions
-        [Discord]: https://jetkvm.com/discord
-      options:
-        - label: I have read and understood the disclaimer.
-          required: true
-  - type: input
-    attributes:
-      label: Application version
-      description: |
-        Provide the application version (can be found in General settings)
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: System version
-      description: |
-        Provide the system version (can be found in General settings)
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Device model
-      description: Provide the device model
-      options:
-        - JetKVM
-        - JetKVM (POE)
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: Extension model
-      description: Provide the extension model (if the bug is related to the extension)
-      options:
-        - ATX Power Control
-        - DC Power Control
-        - Serial Console
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: Remote device Hardware
-      description: If the bug is related to a remote device, please provide its hardware information e.g. Raspberry Pi 5
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: Remote device OS
-      description: If the bug is related to a remote device, please provide its OS information as detailed as possible e.g. Debian 12.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Bug description
-      description: |
-        Provide a description of the problem: steps to reproduce it, what you are expecting and what you got.
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,10 +0,0 @@
-blank_issues_enabled: true
-
-contact_links:
-  - name: Hardware Issues
-    url: https://jetkvm.com/contact
-    about: If your hardware is not powering on or is not working, please contact us.
-
-  - name: Discord
-    url: https://jetkvm.com/discord
-    about: Engage with the JetKVM team and other community members.

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,46 +0,0 @@
-name: Feature
-type: 'Feature'
-description: 🚀 Request a new feature.
-labels:
-- 'type: feature'
-body:
-  - type: textarea
-    attributes:
-      label: A note for the community
-      value: |
-        > [!NOTE]
-        > Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request.
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Disclaimer
-      description: |
-        Before requesting a feature, check it does not already exist in the [documentation](https://jetkvm.com/docs) or our [roadmap](https://jetkvm.com/roadmap).
-        You are quite welcome opening a feature request before spending time to implement it yourself.
-      options:
-        - label: I have read and understood the disclaimer.
-          required: true
-        - label: I plan to implement the feature myself.
-  - type: dropdown
-    attributes:
-      label: Subsystem
-      description: Provide the subsystem of the feature you request, you can choose multiple if you think it fits in multiple areas.
-      options:
-        - Hardware
-        - Device Compatibility
-        - Keyboard
-        - Mouse
-        - Power
-        - UI: Screen
-        - UI: Application
-        - UI: Cloud
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Feature description
-      description: |
-        Provide a description of the feature you request.
-    validations:
-      required: true

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.event_name != 'pull_request_review' || github.event.review.state == 'approved'
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:

.github/workflows/golangci-lint.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Install Go
         uses: actions/setup-go@fa96338abe5531f6e34c5cc0bbe28c1a533d5505 # v4.2.1
         with:

.github/workflows/ui-lint.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:

.golangci.yml

@@ -23,9 +23,6 @@ linters:
       - linters:
           - errcheck
         path: _test.go
-      - linters:
-          - forbidigo
-        path: cmd/main.go
       - linters:
           - gochecknoinits
         path: internal/logging/sse.go

DEVELOPMENT.md

@@ -1,356 +0,0 @@
-<div align="center">
-    <img alt="JetKVM logo" src="https://jetkvm.com/logo-blue.png" height="28">
-
-### Development Guide
-
-[Discord](https://jetkvm.com/discord) | [Website](https://jetkvm.com) | [Issues](https://github.com/jetkvm/cloud-api/issues) | [Docs](https://jetkvm.com/docs)
-
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/jetkvm.svg?style=social&label=Follow%20%40JetKVM)](https://twitter.com/jetkvm)
-
-[![Go Report Card](https://goreportcard.com/badge/github.com/jetkvm/kvm)](https://goreportcard.com/report/github.com/jetkvm/kvm)
-
-</div>
-
-# JetKVM Development Guide
-
-Welcome to JetKVM development! This guide will help you get started quickly, whether you're fixing bugs, adding features, or just exploring the codebase.
-
-## Get Started
-
-### Prerequisites
-- **A JetKVM device** (for full development)
-- **[Go 1.24.4+](https://go.dev/doc/install)** and **[Node.js 22.15.0](https://nodejs.org/en/download/)**
-- **[Git](https://git-scm.com/downloads)** for version control
-- **[SSH access](https://jetkvm.com/docs/advanced-usage/developing#developer-mode)** to your JetKVM device
-
-### Development Environment
-
-**Recommended:** Development is best done on **Linux** or **macOS**. 
-
-If you're using Windows, we strongly recommend using **WSL (Windows Subsystem for Linux)** for the best development experience:
-- [Install WSL on Windows](https://docs.microsoft.com/en-us/windows/wsl/install)
-- [WSL Setup Guide](https://docs.microsoft.com/en-us/windows/wsl/setup/environment)
-
-This ensures compatibility with shell scripts and build tools used in the project.
-
-### Project Setup
-
-1. **Clone the repository:**
-   ```bash
-   git clone https://github.com/jetkvm/kvm.git
-   cd kvm
-   ```
-
-2. **Check your tools:**
-   ```bash
-   go version && node --version
-   ```
-
-3. **Find your JetKVM IP address** (check your router or device screen)
-
-4. **Deploy and test:**
-   ```bash
-   ./dev_deploy.sh -r 192.168.1.100  # Replace with your device IP
-   ```
-
-5. **Open in browser:** `http://192.168.1.100`
-
-That's it! You're now running your own development version of JetKVM.
-
----
-
-## Common Tasks
-
-### Modify the UI
-
-```bash
-cd ui
-npm install
-./dev_device.sh 192.168.1.100  # Replace with your device IP
-```
-
-Now edit files in `ui/src/` and see changes live in your browser!
-
-### Modify the backend
-
-```bash
-# Edit Go files (config.go, web.go, etc.)
-./dev_deploy.sh -r 192.168.1.100 --skip-ui-build
-```
-
-### Run tests
-
-```bash
-./dev_deploy.sh -r 192.168.1.100 --run-go-tests
-```
-
-### View logs
-
-```bash
-ssh root@192.168.1.100
-tail -f /var/log/jetkvm.log
-```
-
----
-
-## Project Layout
-
-```
-/kvm/
-├── main.go              # App entry point
-├── config.go           # Settings & configuration
-├── web.go              # API endpoints
-├── ui/                 # React frontend
-│   ├── src/routes/     # Pages (login, settings, etc.)
-│   └── src/components/ # UI components
-└── internal/           # Internal Go packages
-```
-
-**Key files for beginners:**
-
-- `web.go` - Add new API endpoints here
-- `config.go` - Add new settings here
-- `ui/src/routes/` - Add new pages here
-- `ui/src/components/` - Add new UI components here
-
----
-
-## Development Modes
-
-### Full Development (Recommended)
-
-*Best for: Complete feature development*
-
-```bash
-# Deploy everything to your JetKVM device
-./dev_deploy.sh -r <YOUR_DEVICE_IP>
-```
-
-### Frontend Only
-
-*Best for: UI changes without device*
-
-```bash
-cd ui
-npm install
-./dev_device.sh <YOUR_DEVICE_IP>
-```
-
-### Quick Backend Changes
-
-*Best for: API or backend logic changes*
-
-```bash
-# Skip frontend build for faster deployment
-./dev_deploy.sh -r <YOUR_DEVICE_IP> --skip-ui-build
-```
-
----
-
-## Debugging Made Easy
-
-### Check if everything is working
-
-```bash
-# Test connection to device
-ping 192.168.1.100
-
-# Check if JetKVM is running
-ssh root@192.168.1.100 ps aux | grep jetkvm
-```
-
-### View live logs
-
-```bash
-ssh root@192.168.1.100
-tail -f /var/log/jetkvm.log
-```
-
-### Reset everything (if stuck)
-
-```bash
-ssh root@192.168.1.100
-rm /userdata/kvm_config.json
-systemctl restart jetkvm
-```
-
----
-
-## Testing Your Changes
-
-### Manual Testing
-
-1. Deploy your changes: `./dev_deploy.sh -r <IP>`
-2. Open browser: `http://<IP>`
-3. Test your feature
-4. Check logs: `ssh root@<IP> tail -f /var/log/jetkvm.log`
-
-### Automated Testing
-
-```bash
-# Run all tests
-./dev_deploy.sh -r <IP> --run-go-tests
-
-# Frontend linting
-cd ui && npm run lint
-```
-
-### API Testing
-
-```bash
-# Test login endpoint
-curl -X POST http://<IP>/auth/password-local \
-  -H "Content-Type: application/json" \
-  -d '{"password": "test123"}'
-```
-
----
-
-## Common Issues & Solutions
-
-### "Build failed" or "Permission denied"
-
-```bash
-# Fix permissions
-ssh root@<IP> chmod +x /userdata/jetkvm/bin/jetkvm_app_debug
-
-# Clean and rebuild
-go clean -modcache
-go mod tidy
-make build_dev
-```
-
-### "Can't connect to device"
-
-```bash
-# Check network
-ping <IP>
-
-# Check SSH
-ssh root@<IP> echo "Connection OK"
-```
-
-### "Frontend not updating"
-
-```bash
-# Clear cache and rebuild
-cd ui
-npm cache clean --force
-rm -rf node_modules
-npm install
-```
-
----
-
-## Next Steps
-
-### Adding a New Feature
-
-1. **Backend:** Add API endpoint in `web.go`
-2. **Config:** Add settings in `config.go`
-3. **Frontend:** Add UI in `ui/src/routes/`
-4. **Test:** Deploy and test with `./dev_deploy.sh`
-
-### Code Style
-
-- **Go:** Follow standard Go conventions
-- **TypeScript:** Use TypeScript for type safety
-- **React:** Keep components small and reusable
-
-### Environment Variables
-
-```bash
-# Enable debug logging
-export LOG_TRACE_SCOPES="jetkvm,cloud,websocket,native,jsonrpc"
-
-# Frontend development
-export JETKVM_PROXY_URL="ws://<IP>"
-```
-
----
-
-## Need Help?
-
-1. **Check logs first:** `ssh root@<IP> tail -f /var/log/jetkvm.log`
-2. **Search issues:** [GitHub Issues](https://github.com/jetkvm/kvm/issues)
-3. **Ask on Discord:** [JetKVM Discord](https://jetkvm.com/discord)
-4. **Read docs:** [JetKVM Documentation](https://jetkvm.com/docs)
-
----
-
-## Contributing
-
-### Ready to contribute?
-
-1. Fork the repository
-2. Create a feature branch
-3. Make your changes
-4. Test thoroughly
-5. Submit a pull request
-
-### Before submitting:
-
-- [ ] Code works on device
-- [ ] Tests pass
-- [ ] Code follows style guidelines
-- [ ] Documentation updated (if needed)
-
----
-
-## Advanced Topics
-
-### Performance Profiling
-
-1. Enable `Developer Mode` on your JetKVM device
-2. Add a password on the `Access` tab
-
-```bash
-# Access profiling
-curl http://api:$JETKVM_PASSWORD@YOUR_DEVICE_IP/developer/pprof/
-```
-
-### Advanced Environment Variables
-
-```bash
-# Enable trace logging (useful for debugging)
-export LOG_TRACE_SCOPES="jetkvm,cloud,websocket,native,jsonrpc"
-
-# For frontend development
-export JETKVM_PROXY_URL="ws://<JETKVM_IP>"
-
-# Enable SSL in development
-export USE_SSL=true
-```
-
-### Configuration Management
-
-The application uses a JSON configuration file stored at `/userdata/kvm_config.json`.
-
-#### Adding New Configuration Options
-
-1. **Update the Config struct in `config.go`:**
-
-   ```go
-   type Config struct {
-       // ... existing fields
-       NewFeatureEnabled bool `json:"new_feature_enabled"`
-   }
-   ```
-
-2. **Update the default configuration:**
-
-   ```go
-   var defaultConfig = &Config{
-       // ... existing defaults
-       NewFeatureEnabled: false,
-   }
-   ```
-
-3. **Add migration logic if needed for existing installations**
-
-
----
-
-**Happy coding!**
-
-For more information, visit the [JetKVM Documentation](https://jetkvm.com/docs) or join our [Discord Server](https://jetkvm.com/discord).

Makefile

@@ -1,14 +1,14 @@
-BRANCH    := $(shell git rev-parse --abbrev-ref HEAD)
+BRANCH    ?= $(shell git rev-parse --abbrev-ref HEAD)
-BUILDDATE := $(shell date -u +%FT%T%z)
+BUILDDATE ?= $(shell date -u +%FT%T%z)
-BUILDTS   := $(shell date -u +%s)
+BUILDTS   ?= $(shell date -u +%s)
-REVISION  := $(shell git rev-parse HEAD)
+REVISION  ?= $(shell git rev-parse HEAD)
-VERSION_DEV := 0.4.9-dev$(shell date +%Y%m%d%H%M)
+VERSION_DEV ?= 0.4.7-dev$(shell date +%Y%m%d%H%M)
-VERSION := 0.4.8
+VERSION ?= 0.4.6
 
 PROMETHEUS_TAG := github.com/prometheus/common/version
 KVM_PKG_NAME := github.com/jetkvm/kvm
 
-GO_BUILD_ARGS := -tags netgo -tags timetzdata
+GO_BUILD_ARGS := -tags netgo
 GO_RELEASE_BUILD_ARGS := -trimpath $(GO_BUILD_ARGS)
 GO_LDFLAGS := \
   -s -w \
@@ -62,25 +62,10 @@ build_dev_test: build_test2json build_gotestsum
 	tar czfv device-tests.tar.gz -C $(BIN_DIR)/tests .
 
 frontend:
-	cd ui && npm ci && npm run build:device && \
+	cd ui && npm ci && npm run build:device
-	find ../static/ \
-		-type f \
-		\( -name '*.js' \
-		-o -name '*.css' \
-		-o -name '*.html' \
-		-o -name '*.ico' \
-		-o -name '*.png' \
-		-o -name '*.jpg' \
-		-o -name '*.jpeg' \
-		-o -name '*.gif' \
-		-o -name '*.svg' \
-		-o -name '*.webp' \
-		-o -name '*.woff2' \
-		\) \
-		-exec sh -c 'gzip -9 -kfv {}' \;
 
 dev_release: frontend build_dev
-	@echo "Uploading release... $(VERSION_DEV)"
+	@echo "Uploading release..."
 	@shasum -a 256 bin/jetkvm_app | cut -d ' ' -f 1 > bin/jetkvm_app.sha256
 	rclone copyto bin/jetkvm_app r2://jetkvm-update/app/$(VERSION_DEV)/jetkvm_app
 	rclone copyto bin/jetkvm_app.sha256 r2://jetkvm-update/app/$(VERSION_DEV)/jetkvm_app.sha256

README.md

@@ -37,9 +37,7 @@ JetKVM is written in Go & TypeScript. with some bits and pieces written in C. An
 
 The project contains two main parts, the backend software that runs on the KVM device and the frontend software that is served by the KVM device, and also the cloud.
 
-For comprehensive development information, including setup, testing, debugging, and contribution guidelines, see **[DEVELOPMENT.md](DEVELOPMENT.md)**.
+For most of local device development, all you need is to use the `./dev_deploy.sh` script. It will build the frontend and backend and deploy them to the local KVM device. Run `./dev_deploy.sh --help` for more information.
-
-For quick device development, use the `./dev_deploy.sh` script. It will build the frontend and backend and deploy them to the local KVM device. Run `./dev_deploy.sh --help` for more information.
 
 ## Backend
 

block_device.go

@@ -22,12 +22,25 @@ func (r remoteImageBackend) ReadAt(p []byte, off int64) (n int, err error) {
 		return 0, errors.New("image not mounted")
 	}
 	source := currentVirtualMediaState.Source
+	mountedImageSize := currentVirtualMediaState.Size
 	virtualMediaStateMutex.RUnlock()
 
-	_, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
+	readLen := int64(len(p))
+	if off+readLen > mountedImageSize {
+		readLen = mountedImageSize - off
+	}
+	var data []byte
 	switch source {
+	case WebRTC:
+		data, err = webRTCDiskReader.Read(ctx, off, readLen)
+		if err != nil {
+			return 0, err
+		}
+		n = copy(p, data)
+		return n, nil
 	case HTTP:
 		return httpRangeReader.ReadAt(p, off)
 	default:

cloud.go

@@ -475,10 +475,6 @@ func handleSessionRequest(
 
 	cloudLogger.Info().Interface("session", session).Msg("new session accepted")
 	cloudLogger.Trace().Interface("session", session).Msg("new session accepted")
-
-	// Cancel any ongoing keyboard macro when session changes
-	cancelKeyboardMacro()
-
 	currentSession = session
 	_ = wsjson.Write(context.Background(), c, gin.H{"type": "answer", "data": sd})
 	return nil

cmd/main.go

@@ -1,27 +1,9 @@
 package main
 
 import (
-	"flag"
-	"fmt"
-	"os"
-
 	"github.com/jetkvm/kvm"
 )
 
 func main() {
-	versionPtr := flag.Bool("version", false, "print version and exit")
-	versionJsonPtr := flag.Bool("version-json", false, "print version as json and exit")
-	flag.Parse()
-
-	if *versionPtr || *versionJsonPtr {
-		versionData, err := kvm.GetVersionData(*versionJsonPtr)
-		if err != nil {
-			fmt.Printf("failed to get version data: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println(string(versionData))
-		return
-	}
-
 	kvm.Main()
 }

config.go

@@ -9,8 +9,6 @@ import (
 	"github.com/jetkvm/kvm/internal/logging"
 	"github.com/jetkvm/kvm/internal/network"
 	"github.com/jetkvm/kvm/internal/usbgadget"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
 type WakeOnLanDevice struct {
@@ -82,7 +80,6 @@ type Config struct {
 	CloudToken           string                 `json:"cloud_token"`
 	GoogleIdentity       string                 `json:"google_identity"`
 	JigglerEnabled       bool                   `json:"jiggler_enabled"`
-	JigglerConfig        *JigglerConfig         `json:"jiggler_config"`
 	AutoUpdateEnabled    bool                   `json:"auto_update_enabled"`
 	IncludePreRelease    bool                   `json:"include_pre_release"`
 	HashedPassword       string                 `json:"hashed_password"`
@@ -114,19 +111,11 @@ var defaultConfig = &Config{
 	ActiveExtension:      "",
 	KeyboardMacros:       []KeyboardMacro{},
 	DisplayRotation:      "270",
-	KeyboardLayout:       "en-US",
+	KeyboardLayout:       "en_US",
 	DisplayMaxBrightness: 64,
 	DisplayDimAfterSec:   120,  // 2 minutes
 	DisplayOffAfterSec:   1800, // 30 minutes
-	JigglerEnabled:       false,
+	TLSMode:              "",
-	// This is the "Standard" jiggler option in the UI
-	JigglerConfig: &JigglerConfig{
-		InactivityLimitSeconds: 60,
-		JitterPercentage:       25,
-		ScheduleCronTab:        "0 * * * * *",
-		Timezone:               "UTC",
-	},
-	TLSMode: "",
 	UsbConfig: &usbgadget.Config{
 		VendorId:     "0x1d6b", //The Linux Foundation
 		ProductId:    "0x0104", //Multifunction Composite Gadget
@@ -149,21 +138,6 @@ var (
 	configLock = &sync.Mutex{}
 )
 
-var (
-	configSuccess = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "jetkvm_config_last_reload_successful",
-			Help: "The last configuration load succeeded",
-		},
-	)
-	configSuccessTime = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "jetkvm_config_last_reload_success_timestamp_seconds",
-			Help: "Timestamp of last successful config load",
-		},
-	)
-)
-
 func LoadConfig() {
 	configLock.Lock()
 	defer configLock.Unlock()
@@ -179,8 +153,6 @@ func LoadConfig() {
 	file, err := os.Open(configPath)
 	if err != nil {
 		logger.Debug().Msg("default config file doesn't exist, using default")
-		configSuccess.Set(1.0)
-		configSuccessTime.SetToCurrentTime()
 		return
 	}
 	defer file.Close()
@@ -189,7 +161,6 @@ func LoadConfig() {
 	loadedConfig := *defaultConfig
 	if err := json.NewDecoder(file).Decode(&loadedConfig); err != nil {
 		logger.Warn().Err(err).Msg("config file JSON parsing failed")
-		configSuccess.Set(0.0)
 		return
 	}
 
@@ -206,22 +177,10 @@ func LoadConfig() {
 		loadedConfig.NetworkConfig = defaultConfig.NetworkConfig
 	}
 
-	if loadedConfig.JigglerConfig == nil {
-		loadedConfig.JigglerConfig = defaultConfig.JigglerConfig
-	}
-
-	// fixup old keyboard layout value
-	if loadedConfig.KeyboardLayout == "en_US" {
-		loadedConfig.KeyboardLayout = "en-US"
-	}
-
 	config = &loadedConfig
 
 	logging.GetRootLogger().UpdateLogLevel(config.DefaultLogLevel)
 
-	configSuccess.Set(1.0)
-	configSuccessTime.SetToCurrentTime()
-
 	logger.Info().Str("path", configPath).Msg("config loaded")
 }
 
@@ -231,11 +190,6 @@ func SaveConfig() error {
 
 	logger.Trace().Str("path", configPath).Msg("Saving config")
 
-	// fixup old keyboard layout value
-	if config.KeyboardLayout == "en_US" {
-		config.KeyboardLayout = "en-US"
-	}
-
 	file, err := os.Create(configPath)
 	if err != nil {
 		return fmt.Errorf("failed to create config file: %w", err)
@@ -248,11 +202,6 @@ func SaveConfig() error {
 		return fmt.Errorf("failed to encode config: %w", err)
 	}
 
-	if err := file.Sync(); err != nil {
-		return fmt.Errorf("failed to wite config: %w", err)
-	}
-
-	logger.Info().Str("path", configPath).Msg("config saved")
 	return nil
 }
 

dc_metrics.go

@@ -1,53 +0,0 @@
-package kvm
-
-import (
-	"sync"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-var (
-	dcCurrentGauge = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "jetkvm_dc_current_amperes",
-		Help: "Current DC power consumption in amperes",
-	})
-
-	dcPowerGauge = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "jetkvm_dc_power_watts",
-		Help: "DC power consumption in watts",
-	})
-
-	dcVoltageGauge = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "jetkvm_dc_voltage_volts",
-		Help: "DC voltage in volts",
-	})
-
-	dcStateGauge = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "jetkvm_dc_power_state",
-		Help: "DC power state (1 = on, 0 = off)",
-	})
-
-	dcMetricsRegistered sync.Once
-)
-
-// registerDCMetrics registers the DC power metrics with Prometheus (called once when DC control is mounted)
-func registerDCMetrics() {
-	dcMetricsRegistered.Do(func() {
-		prometheus.MustRegister(dcCurrentGauge)
-		prometheus.MustRegister(dcPowerGauge)
-		prometheus.MustRegister(dcVoltageGauge)
-		prometheus.MustRegister(dcStateGauge)
-	})
-}
-
-// updateDCMetrics updates the Prometheus metrics with current DC power state values
-func updateDCMetrics(state DCPowerState) {
-	dcCurrentGauge.Set(state.Current)
-	dcPowerGauge.Set(state.Power)
-	dcVoltageGauge.Set(state.Voltage)
-	if state.IsOn {
-		dcStateGauge.Set(1)
-	} else {
-		dcStateGauge.Set(0)
-	}
-}

dev_deploy.sh

@@ -28,7 +28,6 @@ show_help() {
     echo "      --run-go-tests         Run go tests"
     echo "      --run-go-tests-only    Run go tests and exit"
     echo "      --skip-ui-build        Skip frontend/UI build"
-    echo "  -i, --install              Build for release and install the app"
     echo "      --help                 Display this help message"
     echo
     echo "Example:"
@@ -44,7 +43,6 @@ RESET_USB_HID_DEVICE=false
 LOG_TRACE_SCOPES="${LOG_TRACE_SCOPES:-jetkvm,cloud,websocket,native,jsonrpc}"
 RUN_GO_TESTS=false
 RUN_GO_TESTS_ONLY=false
-INSTALL_APP=false
 
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
@@ -74,10 +72,6 @@ while [[ $# -gt 0 ]]; do
             RUN_GO_TESTS=true
             shift
             ;;
-        -i|--install)
-            INSTALL_APP=true
-            shift
-            ;;
         --help)
             show_help
             exit 0
@@ -145,36 +139,25 @@ EOF
     fi
 fi
 
-if [ "$INSTALL_APP" = true ]
+msg_info "▶ Building go binary"
-then
+make build_dev
-	msg_info "▶ Building release binary"
+
-	make build_release
+# Kill any existing instances of the application
-	
+ssh "${REMOTE_USER}@${REMOTE_HOST}" "killall jetkvm_app_debug || true"
-	# Copy the binary to the remote host as if we were the OTA updater.
+
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > /userdata/jetkvm/jetkvm_app.update" < bin/jetkvm_app
+# Copy the binary to the remote host
-	
+ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > ${REMOTE_PATH}/jetkvm_app_debug" < bin/jetkvm_app
-	# Reboot the device, the new app will be deployed by the startup process.
+
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "reboot"
+if [ "$RESET_USB_HID_DEVICE" = true ]; then
-else
+    msg_info "▶ Resetting USB HID device"
-	msg_info "▶ Building development binary"
+    msg_warn "The option has been deprecated and will be removed in a future version, as JetKVM will now reset USB gadget configuration when needed"
-	make build_dev
+    # Remove the old USB gadget configuration
-	
+    ssh "${REMOTE_USER}@${REMOTE_HOST}" "rm -rf /sys/kernel/config/usb_gadget/jetkvm/configs/c.1/hid.usb*"
-	# Kill any existing instances of the application
+    ssh "${REMOTE_USER}@${REMOTE_HOST}" "ls /sys/class/udc > /sys/kernel/config/usb_gadget/jetkvm/UDC"
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "killall jetkvm_app_debug || true"
+fi
-	
+
-	# Copy the binary to the remote host
+# Deploy and run the application on the remote host
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > ${REMOTE_PATH}/jetkvm_app_debug" < bin/jetkvm_app
+ssh "${REMOTE_USER}@${REMOTE_HOST}" ash << EOF
-	
-	if [ "$RESET_USB_HID_DEVICE" = true ]; then
-	msg_info "▶ Resetting USB HID device"
-	msg_warn "The option has been deprecated and will be removed in a future version, as JetKVM will now reset USB gadget configuration when needed"
-	# Remove the old USB gadget configuration
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "rm -rf /sys/kernel/config/usb_gadget/jetkvm/configs/c.1/hid.usb*"
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "ls /sys/class/udc > /sys/kernel/config/usb_gadget/jetkvm/UDC"
-	fi
-	
-	# Deploy and run the application on the remote host
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" ash << EOF
 set -e
 
 # Set the library path to include the directory where librockit.so is located
@@ -191,8 +174,7 @@ cd "${REMOTE_PATH}"
 chmod +x jetkvm_app_debug
 
 # Run the application in the background
-PION_LOG_TRACE=${LOG_TRACE_SCOPES} ./jetkvm_app_debug | tee -a /tmp/jetkvm_app_debug.log
+PION_LOG_TRACE=${LOG_TRACE_SCOPES} GODEBUG=netdns=1 ./jetkvm_app_debug
 EOF
-fi
 
-echo "Deployment complete."
+echo "Deployment complete."

display.go

@@ -1,7 +1,6 @@
 package kvm
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -31,7 +30,7 @@ const (
 // do not call this function directly, use switchToScreenIfDifferent instead
 // this function is not thread safe
 func switchToScreen(screen string) {
-	_, err := CallCtrlAction("lv_scr_load", map[string]any{"obj": screen})
+	_, err := CallCtrlAction("lv_scr_load", map[string]interface{}{"obj": screen})
 	if err != nil {
 		displayLogger.Warn().Err(err).Str("screen", screen).Msg("failed to switch to screen")
 		return
@@ -40,15 +39,15 @@ func switchToScreen(screen string) {
 }
 
 func lvObjSetState(objName string, state string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_set_state", map[string]any{"obj": objName, "state": state})
+	return CallCtrlAction("lv_obj_set_state", map[string]interface{}{"obj": objName, "state": state})
 }
 
 func lvObjAddFlag(objName string, flag string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_add_flag", map[string]any{"obj": objName, "flag": flag})
+	return CallCtrlAction("lv_obj_add_flag", map[string]interface{}{"obj": objName, "flag": flag})
 }
 
 func lvObjClearFlag(objName string, flag string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_clear_flag", map[string]any{"obj": objName, "flag": flag})
+	return CallCtrlAction("lv_obj_clear_flag", map[string]interface{}{"obj": objName, "flag": flag})
 }
 
 func lvObjHide(objName string) (*CtrlResponse, error) {
@@ -60,27 +59,27 @@ func lvObjShow(objName string) (*CtrlResponse, error) {
 }
 
 func lvObjSetOpacity(objName string, opacity int) (*CtrlResponse, error) { // nolint:unused
-	return CallCtrlAction("lv_obj_set_style_opa_layered", map[string]any{"obj": objName, "opa": opacity})
+	return CallCtrlAction("lv_obj_set_style_opa_layered", map[string]interface{}{"obj": objName, "opa": opacity})
 }
 
 func lvObjFadeIn(objName string, duration uint32) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_fade_in", map[string]any{"obj": objName, "duration": duration})
+	return CallCtrlAction("lv_obj_fade_in", map[string]interface{}{"obj": objName, "time": duration})
 }
 
 func lvObjFadeOut(objName string, duration uint32) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_fade_out", map[string]any{"obj": objName, "duration": duration})
+	return CallCtrlAction("lv_obj_fade_out", map[string]interface{}{"obj": objName, "time": duration})
 }
 
 func lvLabelSetText(objName string, text string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_label_set_text", map[string]any{"obj": objName, "text": text})
+	return CallCtrlAction("lv_label_set_text", map[string]interface{}{"obj": objName, "text": text})
 }
 
 func lvImgSetSrc(objName string, src string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_img_set_src", map[string]any{"obj": objName, "src": src})
+	return CallCtrlAction("lv_img_set_src", map[string]interface{}{"obj": objName, "src": src})
 }
 
 func lvDispSetRotation(rotation string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_disp_set_rotation", map[string]any{"rotation": rotation})
+	return CallCtrlAction("lv_disp_set_rotation", map[string]interface{}{"rotation": rotation})
 }
 
 func updateLabelIfChanged(objName string, newText string) {
@@ -111,6 +110,12 @@ func clearDisplayState() {
 	currentScreen = "ui_Boot_Screen"
 }
 
+var (
+	cloudBlinkLock    sync.Mutex = sync.Mutex{}
+	cloudBlinkStopped bool
+	cloudBlinkTicker  *time.Ticker
+)
+
 func updateDisplay() {
 	updateLabelIfChanged("ui_Home_Content_Ip", networkState.IPv4String())
 	if usbState == "configured" {
@@ -147,81 +152,48 @@ func updateDisplay() {
 		stopCloudBlink()
 	case CloudConnectionStateConnecting:
 		_, _ = lvImgSetSrc("ui_Home_Header_Cloud_Status_Icon", "cloud.png")
-		restartCloudBlink()
+		startCloudBlink()
 	case CloudConnectionStateConnected:
 		_, _ = lvImgSetSrc("ui_Home_Header_Cloud_Status_Icon", "cloud.png")
 		stopCloudBlink()
 	}
 }
 
-const (
-	cloudBlinkInterval = 2 * time.Second
-	cloudBlinkDuration = 1 * time.Second
-)
-
-var (
-	cloudBlinkTicker *time.Ticker
-	cloudBlinkCancel context.CancelFunc
-	cloudBlinkLock   = sync.Mutex{}
-)
-
-func doCloudBlink(ctx context.Context) {
-	for range cloudBlinkTicker.C {
-		if cloudConnectionState != CloudConnectionStateConnecting {
-			continue
-		}
-
-		_, _ = lvObjFadeOut("ui_Home_Header_Cloud_Status_Icon", uint32(cloudBlinkDuration.Milliseconds()))
-
-		select {
-		case <-ctx.Done():
-			return
-		case <-time.After(cloudBlinkDuration):
-		}
-
-		_, _ = lvObjFadeIn("ui_Home_Header_Cloud_Status_Icon", uint32(cloudBlinkDuration.Milliseconds()))
-
-		select {
-		case <-ctx.Done():
-			return
-		case <-time.After(cloudBlinkDuration):
-		}
-	}
-}
-
-func restartCloudBlink() {
-	stopCloudBlink()
-	startCloudBlink()
-}
-
 func startCloudBlink() {
-	cloudBlinkLock.Lock()
-	defer cloudBlinkLock.Unlock()
-
 	if cloudBlinkTicker == nil {
-		cloudBlinkTicker = time.NewTicker(cloudBlinkInterval)
+		cloudBlinkTicker = time.NewTicker(2 * time.Second)
 	} else {
-		cloudBlinkTicker.Reset(cloudBlinkInterval)
+		// do nothing if the blink isn't stopped
+		if cloudBlinkStopped {
+			cloudBlinkLock.Lock()
+			defer cloudBlinkLock.Unlock()
+
+			cloudBlinkStopped = false
+			cloudBlinkTicker.Reset(2 * time.Second)
+		}
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
+	go func() {
-	cloudBlinkCancel = cancel
+		for range cloudBlinkTicker.C {
-
+			if cloudConnectionState != CloudConnectionStateConnecting {
-	go doCloudBlink(ctx)
+				continue
+			}
+			_, _ = lvObjFadeOut("ui_Home_Header_Cloud_Status_Icon", 1000)
+			time.Sleep(1000 * time.Millisecond)
+			_, _ = lvObjFadeIn("ui_Home_Header_Cloud_Status_Icon", 1000)
+			time.Sleep(1000 * time.Millisecond)
+		}
+	}()
 }
 
 func stopCloudBlink() {
-	cloudBlinkLock.Lock()
-	defer cloudBlinkLock.Unlock()
-
-	if cloudBlinkCancel != nil {
-		cloudBlinkCancel()
-		cloudBlinkCancel = nil
-	}
-
 	if cloudBlinkTicker != nil {
 		cloudBlinkTicker.Stop()
 	}
+
+	cloudBlinkLock.Lock()
+	defer cloudBlinkLock.Unlock()
+	cloudBlinkStopped = true
 }
 
 var (

fuse.go

@@ -0,0 +1,114 @@
+package kvm
+
+import (
+	"context"
+	"os"
+	"sync"
+	"syscall"
+
+	"github.com/hanwen/go-fuse/v2/fs"
+	"github.com/hanwen/go-fuse/v2/fuse"
+)
+
+type WebRTCStreamFile struct {
+	fs.Inode
+	mu   sync.Mutex
+	Attr fuse.Attr
+	size uint64
+}
+
+var _ = (fs.NodeOpener)((*WebRTCStreamFile)(nil))
+var _ = (fs.NodeOpener)((*WebRTCStreamFile)(nil))
+var _ = (fs.NodeOpener)((*WebRTCStreamFile)(nil))
+var _ = (fs.NodeOpener)((*WebRTCStreamFile)(nil))
+var _ = (fs.NodeOpener)((*WebRTCStreamFile)(nil))
+
+func (f *WebRTCStreamFile) Open(ctx context.Context, flags uint32) (fh fs.FileHandle, fuseFlags uint32, errno syscall.Errno) {
+	return nil, fuse.FOPEN_KEEP_CACHE, fs.OK
+}
+
+func (f *WebRTCStreamFile) Write(ctx context.Context, fh fs.FileHandle, data []byte, off int64) (uint32, syscall.Errno) {
+	return 0, syscall.EROFS
+}
+
+var _ = (fs.NodeGetattrer)((*WebRTCStreamFile)(nil))
+
+func (f *WebRTCStreamFile) Getattr(ctx context.Context, fh fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	out.Attr = f.Attr
+	out.Size = f.size
+	return fs.OK
+}
+
+func (f *WebRTCStreamFile) Setattr(ctx context.Context, fh fs.FileHandle, in *fuse.SetAttrIn, out *fuse.AttrOut) syscall.Errno {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	out.Attr = f.Attr
+	return fs.OK
+}
+
+func (f *WebRTCStreamFile) Flush(ctx context.Context, fh fs.FileHandle) syscall.Errno {
+	return fs.OK
+}
+
+type DiskReadRequest struct {
+	Start uint64 `json:"start"`
+	End   uint64 `json:"end"`
+}
+
+var diskReadChan = make(chan []byte, 1)
+
+func (f *WebRTCStreamFile) Read(ctx context.Context, fh fs.FileHandle, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) {
+	buf, err := webRTCDiskReader.Read(ctx, off, int64(len(dest)))
+	if err != nil {
+		return nil, syscall.EIO
+	}
+	return fuse.ReadResultData(buf), fs.OK
+}
+
+func (f *WebRTCStreamFile) SetSize(size uint64) {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	f.size = size
+}
+
+type FuseRoot struct {
+	fs.Inode
+}
+
+var webRTCStreamFile = &WebRTCStreamFile{}
+
+func (r *FuseRoot) OnAdd(ctx context.Context) {
+	ch := r.NewPersistentInode(ctx, webRTCStreamFile, fs.StableAttr{Ino: 2})
+	r.AddChild("disk", ch, false)
+}
+
+func (r *FuseRoot) Getattr(ctx context.Context, fh fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
+	out.Mode = 0755
+	return 0
+}
+
+var _ = (fs.NodeGetattrer)((*FuseRoot)(nil))
+var _ = (fs.NodeOnAdder)((*FuseRoot)(nil))
+
+const fuseMountPoint = "/mnt/webrtc"
+
+var fuseServer *fuse.Server
+
+func RunFuseServer() {
+	opts := &fs.Options{}
+	opts.DirectMountStrict = true
+	_ = os.Mkdir(fuseMountPoint, 0755)
+	var err error
+	fuseServer, err = fs.Mount(fuseMountPoint, &FuseRoot{}, opts)
+	if err != nil {
+		logger.Warn().Err(err).Msg("failed to mount fuse")
+	}
+	fuseServer.Wait()
+}
+
+type WebRTCImage struct {
+	Size     uint64 `json:"size"`
+	Filename string `json:"filename"`
+}

go.mod

@@ -6,33 +6,31 @@ require (
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/beevik/ntp v1.4.3
 	github.com/coder/websocket v1.8.13
-	github.com/coreos/go-oidc/v3 v3.15.0
+	github.com/coreos/go-oidc/v3 v3.14.1
 	github.com/creack/pty v1.1.24
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/gin-contrib/logger v1.2.6
 	github.com/gin-gonic/gin v1.10.1
-	github.com/go-co-op/gocron/v2 v2.16.5
-	github.com/google/flatbuffers v25.2.10+incompatible
 	github.com/google/uuid v1.6.0
 	github.com/guregu/null/v6 v6.0.0
-	github.com/gwatts/rootcerts v0.0.0-20250901182336-dc5ae18bd79f
+	github.com/gwatts/rootcerts v0.0.0-20250601184604-370a9a75f341
+	github.com/hanwen/go-fuse/v2 v2.8.0
 	github.com/pion/logging v0.2.4
 	github.com/pion/mdns/v2 v2.0.7
-	github.com/pion/webrtc/v4 v4.1.4
+	github.com/pion/webrtc/v4 v4.1.3
 	github.com/pojntfx/go-nbd v0.3.2
-	github.com/prometheus/client_golang v1.23.0
+	github.com/prometheus/client_golang v1.22.0
-	github.com/prometheus/common v0.66.0
+	github.com/prometheus/common v0.65.0
-	github.com/prometheus/procfs v0.17.0
+	github.com/prometheus/procfs v0.16.1
 	github.com/psanford/httpreadat v0.1.0
-	github.com/rs/xid v1.6.0
 	github.com/rs/zerolog v1.34.0
 	github.com/sourcegraph/tf-dag v0.2.2-0.20250131204052-3e8ff1477b4f
-	github.com/stretchr/testify v1.11.1
+	github.com/stretchr/testify v1.10.0
 	github.com/vishvananda/netlink v1.3.1
 	go.bug.st/serial v1.6.4
-	golang.org/x/crypto v0.41.0
+	golang.org/x/crypto v0.39.0
-	golang.org/x/net v0.43.0
+	golang.org/x/net v0.41.0
-	golang.org/x/sys v0.35.0
+	golang.org/x/sys v0.33.0
 )
 
 replace github.com/pojntfx/go-nbd v0.3.2 => github.com/chemhack/go-nbd v0.0.0-20241006125820-59e45f5b1e7b
@@ -52,8 +50,6 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.26.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
-	github.com/jonboulle/clockwork v0.5.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
@@ -65,31 +61,28 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pilebones/go-udev v0.9.1 // indirect
 	github.com/pion/datachannel v1.5.10 // indirect
-	github.com/pion/dtls/v3 v3.0.7 // indirect
+	github.com/pion/dtls/v3 v3.0.6 // indirect
 	github.com/pion/ice/v4 v4.0.10 // indirect
 	github.com/pion/interceptor v0.1.40 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
 	github.com/pion/rtcp v1.2.15 // indirect
-	github.com/pion/rtp v1.8.22 // indirect
+	github.com/pion/rtp v1.8.20 // indirect
 	github.com/pion/sctp v1.8.39 // indirect
-	github.com/pion/sdp/v3 v3.0.16 // indirect
+	github.com/pion/sdp/v3 v3.0.14 // indirect
-	github.com/pion/srtp/v3 v3.0.7 // indirect
+	github.com/pion/srtp/v3 v3.0.6 // indirect
 	github.com/pion/stun/v3 v3.0.0 // indirect
 	github.com/pion/transport/v3 v3.0.7 // indirect
-	github.com/pion/turn/v4 v4.1.1 // indirect
+	github.com/pion/turn/v4 v4.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.0 // indirect
-	github.com/vearutop/statigz v1.5.0 // indirect
 	github.com/vishvananda/netns v0.0.5 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
 	golang.org/x/arch v0.18.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
-	google.golang.org/protobuf v1.36.8 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -18,8 +18,8 @@ github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJ
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
 github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
 github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
-github.com/coreos/go-oidc/v3 v3.15.0 h1:R6Oz8Z4bqWR7VFQ+sPSvZPQv4x8M+sJkDO5ojgwlyAg=
+github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk=
-github.com/coreos/go-oidc/v3 v3.15.0/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
+github.com/coreos/go-oidc/v3 v3.14.1/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/goselect v0.1.3 h1:MaGNMclRo7P2Jl21hBpR1Cn33ITSbKP6E49RtfblLKc=
 github.com/creack/goselect v0.1.3/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
@@ -38,8 +38,6 @@ github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w
 github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
 github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
 github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/go-co-op/gocron/v2 v2.16.5 h1:j228Jxk7bb9CF8LKR3gS+bK3rcjRUINjlVI+ZMp26Ss=
-github.com/go-co-op/gocron/v2 v2.16.5/go.mod h1:zAfC/GFQ668qHxOVl/D68Jh5Ce7sDqX6TJnSQyRkRBc=
 github.com/go-jose/go-jose/v4 v4.1.0 h1:cYSYxd3pw5zd2FSXk2vGdn9igQU2PS8MuxrCOCl0FdY=
 github.com/go-jose/go-jose/v4 v4.1.0/go.mod h1:GG/vqmYm3Von2nYiB2vGTXzdoNKE5tix5tuc6iAd+sw=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -53,21 +51,17 @@ github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAu
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
-github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
-github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
 github.com/guregu/null/v6 v6.0.0 h1:N14VRS+4di81i1PXRiprbQJ9EM9gqBa0+KVMeS/QSjQ=
 github.com/guregu/null/v6 v6.0.0/go.mod h1:hrMIhIfrOZeLPZhROSn149tpw2gHkidAqxoXNyeX3iQ=
-github.com/gwatts/rootcerts v0.0.0-20250901182336-dc5ae18bd79f h1:08t2PbrkDgW2+mwCQ3jhKUBrCM9Bc9SeH5j2Dst3B+0=
+github.com/gwatts/rootcerts v0.0.0-20250601184604-370a9a75f341 h1:zPrkLSKi7kKJoNJH4uUmsQ86+0/QqpwEns0NyNLwKv0=
-github.com/gwatts/rootcerts v0.0.0-20250901182336-dc5ae18bd79f/go.mod h1:5Kt9XkWvkGi2OHOq0QsGxebHmhCcqJ8KCbNg/a6+n+g=
+github.com/gwatts/rootcerts v0.0.0-20250601184604-370a9a75f341/go.mod h1:5Kt9XkWvkGi2OHOq0QsGxebHmhCcqJ8KCbNg/a6+n+g=
-github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
+github.com/hanwen/go-fuse/v2 v2.8.0 h1:wV8rG7rmCz8XHSOwBZhG5YcVqcYjkzivjmbaMafPlAs=
-github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
+github.com/hanwen/go-fuse/v2 v2.8.0/go.mod h1:yE6D2PqWwm3CbYRxFXV9xUd8Md5d6NG0WBs5spCswmI=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
@@ -94,6 +88,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
+github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -107,8 +103,8 @@ github.com/pilebones/go-udev v0.9.1 h1:uN72M1C1fgzhsVmBGEM8w9RD1JY4iVsPZpr+Z6rb3
 github.com/pilebones/go-udev v0.9.1/go.mod h1:Bgcl07crebF3JSeS4+nuaRvhWFdCeFoBhXXeAp93XNo=
 github.com/pion/datachannel v1.5.10 h1:ly0Q26K1i6ZkGf42W7D4hQYR90pZwzFOjTq5AuCKk4o=
 github.com/pion/datachannel v1.5.10/go.mod h1:p/jJfC9arb29W7WrxyKbepTU20CFgyx5oLo8Rs4Py/M=
-github.com/pion/dtls/v3 v3.0.7 h1:bItXtTYYhZwkPFk4t1n3Kkf5TDrfj6+4wG+CZR8uI9Q=
+github.com/pion/dtls/v3 v3.0.6 h1:7Hkd8WhAJNbRgq9RgdNh1aaWlZlGpYTzdqjy9x9sK2E=
-github.com/pion/dtls/v3 v3.0.7/go.mod h1:uDlH5VPrgOQIw59irKYkMudSFprY9IEFCqz/eTz16f8=
+github.com/pion/dtls/v3 v3.0.6/go.mod h1:iJxNQ3Uhn1NZWOMWlLxEEHAN5yX7GyPvvKw04v9bzYU=
 github.com/pion/ice/v4 v4.0.10 h1:P59w1iauC/wPk9PdY8Vjl4fOFL5B+USq1+xbDcN6gT4=
 github.com/pion/ice/v4 v4.0.10/go.mod h1:y3M18aPhIxLlcO/4dn9X8LzLLSma84cx6emMSu14FGw=
 github.com/pion/interceptor v0.1.40 h1:e0BjnPcGpr2CFQgKhrQisBU7V3GXK6wrfYrGYaU6Jq4=
@@ -121,40 +117,37 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
 github.com/pion/rtcp v1.2.15 h1:LZQi2JbdipLOj4eBjK4wlVoQWfrZbh3Q6eHtWtJBZBo=
 github.com/pion/rtcp v1.2.15/go.mod h1:jlGuAjHMEXwMUHK78RgX0UmEJFV4zUKOFHR7OP+D3D0=
-github.com/pion/rtp v1.8.22 h1:8NCVDDF+uSJmMUkjLJVnIr/HX7gPesyMV1xFt5xozXc=
+github.com/pion/rtp v1.8.20 h1:8zcyqohadZE8FCBeGdyEvHiclPIezcwRQH9zfapFyYI=
-github.com/pion/rtp v1.8.22/go.mod h1:rF5nS1GqbR7H/TCpKwylzeq6yDM+MM6k+On5EgeThEM=
+github.com/pion/rtp v1.8.20/go.mod h1:bAu2UFKScgzyFqvUKmbvzSdPr+NGbZtv6UB2hesqXBk=
 github.com/pion/sctp v1.8.39 h1:PJma40vRHa3UTO3C4MyeJDQ+KIobVYRZQZ0Nt7SjQnE=
 github.com/pion/sctp v1.8.39/go.mod h1:cNiLdchXra8fHQwmIoqw0MbLLMs+f7uQ+dGMG2gWebE=
-github.com/pion/sdp/v3 v3.0.16 h1:0dKzYO6gTAvuLaAKQkC02eCPjMIi4NuAr/ibAwrGDCo=
+github.com/pion/sdp/v3 v3.0.14 h1:1h7gBr9FhOWH5GjWWY5lcw/U85MtdcibTyt/o6RxRUI=
-github.com/pion/sdp/v3 v3.0.16/go.mod h1:9tyKzznud3qiweZcD86kS0ff1pGYB3VX+Bcsmkx6IXo=
+github.com/pion/sdp/v3 v3.0.14/go.mod h1:88GMahN5xnScv1hIMTqLdu/cOcUkj6a9ytbncwMCq2E=
-github.com/pion/srtp/v3 v3.0.7 h1:QUElw0A/FUg3MP8/KNMZB3i0m8F9XeMnTum86F7S4bs=
+github.com/pion/srtp/v3 v3.0.6 h1:E2gyj1f5X10sB/qILUGIkL4C2CqK269Xq167PbGCc/4=
-github.com/pion/srtp/v3 v3.0.7/go.mod h1:qvnHeqbhT7kDdB+OGB05KA/P067G3mm7XBfLaLiaNF0=
+github.com/pion/srtp/v3 v3.0.6/go.mod h1:BxvziG3v/armJHAaJ87euvkhHqWe9I7iiOy50K2QkhY=
 github.com/pion/stun/v3 v3.0.0 h1:4h1gwhWLWuZWOJIJR9s2ferRO+W3zA/b6ijOI6mKzUw=
 github.com/pion/stun/v3 v3.0.0/go.mod h1:HvCN8txt8mwi4FBvS3EmDghW6aQJ24T+y+1TKjB5jyU=
 github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0=
 github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo=
-github.com/pion/turn/v4 v4.1.1 h1:9UnY2HB99tpDyz3cVVZguSxcqkJ1DsTSZ+8TGruh4fc=
+github.com/pion/turn/v4 v4.0.2 h1:ZqgQ3+MjP32ug30xAbD6Mn+/K4Sxi3SdNOTFf+7mpps=
-github.com/pion/turn/v4 v4.1.1/go.mod h1:2123tHk1O++vmjI5VSD0awT50NywDAq5A2NNNU4Jjs8=
+github.com/pion/turn/v4 v4.0.2/go.mod h1:pMMKP/ieNAG/fN5cZiN4SDuyKsXtNTr0ccN7IToA1zs=
-github.com/pion/webrtc/v4 v4.1.4 h1:/gK1ACGHXQmtyVVbJFQDxNoODg4eSRiFLB7t9r9pg8M=
+github.com/pion/webrtc/v4 v4.1.3 h1:YZ67Boj9X/hk190jJZ8+HFGQ6DqSZ/fYP3sLAZv7c3c=
-github.com/pion/webrtc/v4 v4.1.4/go.mod h1:Oab9npu1iZtQRMic3K3toYq5zFPvToe/QBw7dMI2ok4=
+github.com/pion/webrtc/v4 v4.1.3/go.mod h1:rsq+zQ82ryfR9vbb0L1umPJ6Ogq7zm8mcn9fcGnxomM=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
-github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.66.0 h1:K/rJPHrG3+AoQs50r2+0t7zMnMzek2Vbv31OFVsMeVY=
+github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
-github.com/prometheus/common v0.66.0/go.mod h1:Ux6NtV1B4LatamKE63tJBntoxD++xmtI/lK0VtEplN4=
+github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
-github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
+github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
-github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
+github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
 github.com/psanford/httpreadat v0.1.0 h1:VleW1HS2zO7/4c7c7zNl33fO6oYACSagjJIyMIwZLUE=
 github.com/psanford/httpreadat v0.1.0/go.mod h1:Zg7P+TlBm3bYbyHTKv/EdtSJZn3qwbPwpfZ/I9GKCRE=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
 github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
@@ -168,14 +161,12 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
 github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
-github.com/vearutop/statigz v1.5.0 h1:FuWwZiT82yBw4xbWdWIawiP2XFTyEPhIo8upRxiKLqk=
-github.com/vearutop/statigz v1.5.0/go.mod h1:oHmjFf3izfCO804Di1ZjB666P3fAlVzJEx2k6jNt/Gk=
 github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0=
 github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4=
 github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
@@ -184,14 +175,12 @@ github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
 github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 go.bug.st/serial v1.6.4 h1:7FmqNPgVp3pu2Jz5PoPtbZ9jJO5gnEnZIvnI1lzve8A=
 go.bug.st/serial v1.6.4/go.mod h1:nofMJxTeNVny/m6+KaafC6vJGj3miwQZ6vW4BZUGJPI=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc=
 golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
-golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -199,17 +188,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
-google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

hidrpc.go

@@ -1,259 +0,0 @@
-package kvm
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/jetkvm/kvm/internal/hidrpc"
-	"github.com/jetkvm/kvm/internal/usbgadget"
-	"github.com/rs/zerolog"
-)
-
-func handleHidRPCMessage(message hidrpc.Message, session *Session) {
-	var rpcErr error
-
-	switch message.Type() {
-	case hidrpc.TypeHandshake:
-		message, err := hidrpc.NewHandshakeMessage().Marshal()
-		if err != nil {
-			logger.Warn().Err(err).Msg("failed to marshal handshake message")
-			return
-		}
-		if err := session.HidChannel.Send(message); err != nil {
-			logger.Warn().Err(err).Msg("failed to send handshake message")
-			return
-		}
-		session.hidRPCAvailable = true
-	case hidrpc.TypeKeypressReport, hidrpc.TypeKeyboardReport:
-		rpcErr = handleHidRPCKeyboardInput(message)
-	case hidrpc.TypeKeyboardMacroReport:
-		keyboardMacroReport, err := message.KeyboardMacroReport()
-		if err != nil {
-			logger.Warn().Err(err).Msg("failed to get keyboard macro report")
-			return
-		}
-		rpcErr = rpcExecuteKeyboardMacro(keyboardMacroReport.Steps)
-	case hidrpc.TypeCancelKeyboardMacroReport:
-		rpcCancelKeyboardMacro()
-		return
-	case hidrpc.TypeKeypressKeepAliveReport:
-		rpcErr = handleHidRPCKeypressKeepAlive(session)
-	case hidrpc.TypePointerReport:
-		pointerReport, err := message.PointerReport()
-		if err != nil {
-			logger.Warn().Err(err).Msg("failed to get pointer report")
-			return
-		}
-		rpcErr = rpcAbsMouseReport(pointerReport.X, pointerReport.Y, pointerReport.Button)
-	case hidrpc.TypeMouseReport:
-		mouseReport, err := message.MouseReport()
-		if err != nil {
-			logger.Warn().Err(err).Msg("failed to get mouse report")
-			return
-		}
-		rpcErr = rpcRelMouseReport(mouseReport.DX, mouseReport.DY, mouseReport.Button)
-	default:
-		logger.Warn().Uint8("type", uint8(message.Type())).Msg("unknown HID RPC message type")
-	}
-
-	if rpcErr != nil {
-		logger.Warn().Err(rpcErr).Msg("failed to handle HID RPC message")
-	}
-}
-
-func onHidMessage(msg hidQueueMessage, session *Session) {
-	data := msg.Data
-
-	scopedLogger := hidRPCLogger.With().
-		Str("channel", msg.channel).
-		Bytes("data", data).
-		Logger()
-	scopedLogger.Debug().Msg("HID RPC message received")
-
-	if len(data) < 1 {
-		scopedLogger.Warn().Int("length", len(data)).Msg("received empty data in HID RPC message handler")
-		return
-	}
-
-	var message hidrpc.Message
-
-	if err := hidrpc.Unmarshal(data, &message); err != nil {
-		scopedLogger.Warn().Err(err).Msg("failed to unmarshal HID RPC message")
-		return
-	}
-
-	if scopedLogger.GetLevel() <= zerolog.DebugLevel {
-		scopedLogger = scopedLogger.With().Str("descr", message.String()).Logger()
-	}
-
-	t := time.Now()
-
-	r := make(chan interface{})
-	go func() {
-		handleHidRPCMessage(message, session)
-		r <- nil
-	}()
-	select {
-	case <-time.After(1 * time.Second):
-		scopedLogger.Warn().Msg("HID RPC message timed out")
-	case <-r:
-		scopedLogger.Debug().Dur("duration", time.Since(t)).Msg("HID RPC message handled")
-	}
-}
-
-// Tunables
-// Keep in mind
-// macOS default: 15 * 15 = 225ms https://discussions.apple.com/thread/1316947?sortBy=rank
-// Linux default: 250ms https://man.archlinux.org/man/kbdrate.8.en
-// Windows default: 1s `HKEY_CURRENT_USER\Control Panel\Accessibility\Keyboard Response\AutoRepeatDelay`
-
-const expectedRate = 50 * time.Millisecond       // expected keepalive interval
-const maxLateness = 50 * time.Millisecond        // max jitter we'll tolerate OR jitter budget
-const baseExtension = expectedRate + maxLateness // 100ms extension on perfect tick
-
-const maxStaleness = 225 * time.Millisecond // discard ancient packets outright
-
-func handleHidRPCKeypressKeepAlive(session *Session) error {
-	session.keepAliveJitterLock.Lock()
-	defer session.keepAliveJitterLock.Unlock()
-
-	now := time.Now()
-
-	// 1) Staleness guard: ensures packets that arrive far beyond the life of a valid key hold
-	// (e.g. after a network stall, retransmit burst, or machine sleep) are ignored outright.
-	// This prevents “zombie” keepalives from reviving a key that should already be released.
-	if !session.lastTimerResetTime.IsZero() && now.Sub(session.lastTimerResetTime) > maxStaleness {
-		return nil
-	}
-
-	validTick := true
-	timerExtension := baseExtension
-
-	if !session.lastKeepAliveArrivalTime.IsZero() {
-		timeSinceLastTick := now.Sub(session.lastKeepAliveArrivalTime)
-		lateness := timeSinceLastTick - expectedRate
-
-		if lateness > 0 {
-			if lateness <= maxLateness {
-				// --- Small lateness (within jitterBudget) ---
-				// This is normal jitter (e.g., Wi-Fi contention).
-				// We still accept the tick, but *reduce the extension*
-				// so that the total hold time stays aligned with REAL client side intent.
-				timerExtension -= lateness
-			} else {
-				// --- Large lateness (beyond jitterBudget) ---
-				// This is likely a retransmit stall or ordering delay.
-				// We reject the tick entirely and DO NOT extend,
-				// so the auto-release still fires on time.
-				validTick = false
-			}
-		}
-	}
-
-	if !validTick {
-		return nil
-	}
-	// Only valid ticks update our state and extend the timer.
-	session.lastKeepAliveArrivalTime = now
-	session.lastTimerResetTime = now
-	if gadget != nil {
-		gadget.DelayAutoReleaseWithDuration(timerExtension)
-	}
-
-	// On a miss: do not advance any state — keeps baseline stable.
-	return nil
-}
-
-func handleHidRPCKeyboardInput(message hidrpc.Message) error {
-	switch message.Type() {
-	case hidrpc.TypeKeypressReport:
-		keypressReport, err := message.KeypressReport()
-		if err != nil {
-			logger.Warn().Err(err).Msg("failed to get keypress report")
-			return err
-		}
-		return rpcKeypressReport(keypressReport.Key, keypressReport.Press)
-	case hidrpc.TypeKeyboardReport:
-		keyboardReport, err := message.KeyboardReport()
-		if err != nil {
-			logger.Warn().Err(err).Msg("failed to get keyboard report")
-			return err
-		}
-		return rpcKeyboardReport(keyboardReport.Modifier, keyboardReport.Keys)
-	}
-
-	return fmt.Errorf("unknown HID RPC message type: %d", message.Type())
-}
-
-func reportHidRPC(params any, session *Session) {
-	if session == nil {
-		logger.Warn().Msg("session is nil, skipping reportHidRPC")
-		return
-	}
-
-	if !session.hidRPCAvailable || session.HidChannel == nil {
-		logger.Warn().
-			Bool("hidRPCAvailable", session.hidRPCAvailable).
-			Bool("HidChannel", session.HidChannel != nil).
-			Msg("HID RPC is not available, skipping reportHidRPC")
-		return
-	}
-
-	var (
-		message []byte
-		err     error
-	)
-	switch params := params.(type) {
-	case usbgadget.KeyboardState:
-		message, err = hidrpc.NewKeyboardLedMessage(params).Marshal()
-	case usbgadget.KeysDownState:
-		message, err = hidrpc.NewKeydownStateMessage(params).Marshal()
-	case hidrpc.KeyboardMacroState:
-		message, err = hidrpc.NewKeyboardMacroStateMessage(params.State, params.IsPaste).Marshal()
-	default:
-		err = fmt.Errorf("unknown HID RPC message type: %T", params)
-	}
-
-	if err != nil {
-		logger.Warn().Err(err).Msg("failed to marshal HID RPC message")
-		return
-	}
-
-	if message == nil {
-		logger.Warn().Msg("failed to marshal HID RPC message")
-		return
-	}
-
-	if err := session.HidChannel.Send(message); err != nil {
-		if errors.Is(err, io.ErrClosedPipe) {
-			logger.Debug().Err(err).Msg("HID RPC channel closed, skipping reportHidRPC")
-			return
-		}
-		logger.Warn().Err(err).Msg("failed to send HID RPC message")
-	}
-}
-
-func (s *Session) reportHidRPCKeyboardLedState(state usbgadget.KeyboardState) {
-	if !s.hidRPCAvailable {
-		writeJSONRPCEvent("keyboardLedState", state, s)
-	}
-	reportHidRPC(state, s)
-}
-
-func (s *Session) reportHidRPCKeysDownState(state usbgadget.KeysDownState) {
-	if !s.hidRPCAvailable {
-		usbLogger.Debug().Interface("state", state).Msg("reporting keys down state")
-		writeJSONRPCEvent("keysDownState", state, s)
-	}
-	usbLogger.Debug().Interface("state", state).Msg("reporting keys down state, calling reportHidRPC")
-	reportHidRPC(state, s)
-}
-
-func (s *Session) reportHidRPCKeyboardMacroState(state hidrpc.KeyboardMacroState) {
-	if !s.hidRPCAvailable {
-		writeJSONRPCEvent("keyboardMacroState", state, s)
-	}
-	reportHidRPC(state, s)
-}

internal/confparser/confparser.go

@@ -3,7 +3,6 @@ package confparser
 import (
 	"fmt"
 	"net"
-	"net/url"
 	"reflect"
 	"slices"
 	"strconv"
@@ -16,22 +15,22 @@ import (
 type FieldConfig struct {
 	Name              string
 	Required          bool
-	RequiredIf        map[string]any
+	RequiredIf        map[string]interface{}
 	OneOf             []string
 	ValidateTypes     []string
-	Defaults          any
+	Defaults          interface{}
 	IsEmpty           bool
-	CurrentValue      any
+	CurrentValue      interface{}
 	TypeString        string
 	Delegated         bool
 	shouldUpdateValue bool
 }
 
-func SetDefaultsAndValidate(config any) error {
+func SetDefaultsAndValidate(config interface{}) error {
 	return setDefaultsAndValidate(config, true)
 }
 
-func setDefaultsAndValidate(config any, isRoot bool) error {
+func setDefaultsAndValidate(config interface{}, isRoot bool) error {
 	// first we need to check if the config is a pointer
 	if reflect.TypeOf(config).Kind() != reflect.Ptr {
 		return fmt.Errorf("config is not a pointer")
@@ -55,7 +54,7 @@ func setDefaultsAndValidate(config any, isRoot bool) error {
 			Name:          field.Name,
 			OneOf:         splitString(field.Tag.Get("one_of")),
 			ValidateTypes: splitString(field.Tag.Get("validate_type")),
-			RequiredIf:    make(map[string]any),
+			RequiredIf:    make(map[string]interface{}),
 			CurrentValue:  fieldValue.Interface(),
 			IsEmpty:       false,
 			TypeString:    fieldType,
@@ -142,8 +141,8 @@ func setDefaultsAndValidate(config any, isRoot bool) error {
 		// now check if the field has required_if
 		requiredIf := field.Tag.Get("required_if")
 		if requiredIf != "" {
-			requiredIfParts := strings.SplitSeq(requiredIf, ",")
+			requiredIfParts := strings.Split(requiredIf, ",")
-			for part := range requiredIfParts {
+			for _, part := range requiredIfParts {
 				partVal := strings.SplitN(part, "=", 2)
 				if len(partVal) != 2 {
 					return fmt.Errorf("invalid required_if for field `%s`: %s", field.Name, requiredIf)
@@ -168,7 +167,7 @@ func setDefaultsAndValidate(config any, isRoot bool) error {
 	return nil
 }
 
-func validateFields(config any, fields map[string]FieldConfig) error {
+func validateFields(config interface{}, fields map[string]FieldConfig) error {
 	// now we can start to validate the fields
 	for _, fieldConfig := range fields {
 		if err := fieldConfig.validate(fields); err != nil {
@@ -215,7 +214,7 @@ func (f *FieldConfig) validate(fields map[string]FieldConfig) error {
 	return nil
 }
 
-func (f *FieldConfig) populate(config any) {
+func (f *FieldConfig) populate(config interface{}) {
 	// update the field if it's not empty
 	if !f.shouldUpdateValue {
 		return
@@ -373,10 +372,6 @@ func (f *FieldConfig) validateField() error {
 			if _, err := idna.Lookup.ToASCII(val); err != nil {
 				return fmt.Errorf("field `%s` is not a valid hostname: %s", f.Name, val)
 			}
-		case "proxy":
-			if url, err := url.Parse(val); err != nil || (url.Scheme != "http" && url.Scheme != "https") || url.Host == "" {
-				return fmt.Errorf("field `%s` is not a valid HTTP proxy URL: %s", f.Name, val)
-			}
 		default:
 			return fmt.Errorf("field `%s` cannot use validate_type: unsupported validator: %s", f.Name, validateType)
 		}

internal/confparser/confparser_test.go

@@ -43,11 +43,9 @@ type testNetworkConfig struct {
 	LLDPTxTLVs              []string    `json:"lldp_tx_tlvs,omitempty" one_of:"chassis,port,system,vlan" default:"chassis,port,system,vlan"`
 	MDNSMode                null.String `json:"mdns_mode,omitempty" one_of:"disabled,auto,ipv4_only,ipv6_only" default:"auto"`
 	TimeSyncMode            null.String `json:"time_sync_mode,omitempty" one_of:"ntp_only,ntp_and_http,http_only,custom" default:"ntp_and_http"`
-	TimeSyncOrdering        []string    `json:"time_sync_ordering,omitempty" one_of:"http,ntp,ntp_dhcp,ntp_user_provided,http_user_provided" default:"ntp,http"`
+	TimeSyncOrdering        []string    `json:"time_sync_ordering,omitempty" one_of:"http,ntp,ntp_dhcp,ntp_user_provided,ntp_fallback" default:"ntp,http"`
 	TimeSyncDisableFallback null.Bool   `json:"time_sync_disable_fallback,omitempty" default:"false"`
 	TimeSyncParallel        null.Int    `json:"time_sync_parallel,omitempty" default:"4"`
-	TimeSyncNTPServers      []string    `json:"time_sync_ntp_servers,omitempty" validate_type:"ipv4_or_ipv6" required_if:"TimeSyncOrdering=ntp_user_provided"`
-	TimeSyncHTTPUrls        []string    `json:"time_sync_http_urls,omitempty" validate_type:"url" required_if:"TimeSyncOrdering=http_user_provided"`
 }
 
 func TestValidateConfig(t *testing.T) {

internal/confparser/utils.go

@@ -16,7 +16,7 @@ func splitString(s string) []string {
 	return strings.Split(s, ",")
 }
 
-func toString(v any) (string, error) {
+func toString(v interface{}) (string, error) {
 	switch v := v.(type) {
 	case string:
 		return v, nil

internal/hidrpc/hidrpc.go

@@ -1,123 +0,0 @@
-package hidrpc
-
-import (
-	"fmt"
-
-	"github.com/jetkvm/kvm/internal/usbgadget"
-)
-
-// MessageType is the type of the HID RPC message
-type MessageType byte
-
-const (
-	TypeHandshake                 MessageType = 0x01
-	TypeKeyboardReport            MessageType = 0x02
-	TypePointerReport             MessageType = 0x03
-	TypeWheelReport               MessageType = 0x04
-	TypeKeypressReport            MessageType = 0x05
-	TypeKeypressKeepAliveReport   MessageType = 0x09
-	TypeMouseReport               MessageType = 0x06
-	TypeKeyboardMacroReport       MessageType = 0x07
-	TypeCancelKeyboardMacroReport MessageType = 0x08
-	TypeKeyboardLedState          MessageType = 0x32
-	TypeKeydownState              MessageType = 0x33
-	TypeKeyboardMacroState        MessageType = 0x34
-)
-
-const (
-	Version byte = 0x01 // Version of the HID RPC protocol
-)
-
-// GetQueueIndex returns the index of the queue to which the message should be enqueued.
-func GetQueueIndex(messageType MessageType) int {
-	switch messageType {
-	case TypeHandshake:
-		return 0
-	case TypeKeyboardReport, TypeKeypressReport, TypeKeyboardMacroReport, TypeKeyboardLedState, TypeKeydownState, TypeKeyboardMacroState:
-		return 1
-	case TypePointerReport, TypeMouseReport, TypeWheelReport:
-		return 2
-	// we don't want to block the queue for this message
-	case TypeCancelKeyboardMacroReport:
-		return 3
-	default:
-		return 3
-	}
-}
-
-// Unmarshal unmarshals the HID RPC message from the data.
-func Unmarshal(data []byte, message *Message) error {
-	l := len(data)
-	if l < 1 {
-		return fmt.Errorf("invalid data length: %d", l)
-	}
-
-	message.t = MessageType(data[0])
-	message.d = data[1:]
-	return nil
-}
-
-// Marshal marshals the HID RPC message to the data.
-func Marshal(message *Message) ([]byte, error) {
-	if message.t == 0 {
-		return nil, fmt.Errorf("invalid message type: %d", message.t)
-	}
-
-	data := make([]byte, len(message.d)+1)
-	data[0] = byte(message.t)
-	copy(data[1:], message.d)
-
-	return data, nil
-}
-
-// NewHandshakeMessage creates a new handshake message.
-func NewHandshakeMessage() *Message {
-	return &Message{
-		t: TypeHandshake,
-		d: []byte{Version},
-	}
-}
-
-// NewKeyboardReportMessage creates a new keyboard report message.
-func NewKeyboardReportMessage(keys []byte, modifier uint8) *Message {
-	return &Message{
-		t: TypeKeyboardReport,
-		d: append([]byte{modifier}, keys...),
-	}
-}
-
-// NewKeyboardLedMessage creates a new keyboard LED message.
-func NewKeyboardLedMessage(state usbgadget.KeyboardState) *Message {
-	return &Message{
-		t: TypeKeyboardLedState,
-		d: []byte{state.Byte()},
-	}
-}
-
-// NewKeydownStateMessage creates a new keydown state message.
-func NewKeydownStateMessage(state usbgadget.KeysDownState) *Message {
-	data := make([]byte, len(state.Keys)+1)
-	data[0] = state.Modifier
-	copy(data[1:], state.Keys)
-
-	return &Message{
-		t: TypeKeydownState,
-		d: data,
-	}
-}
-
-// NewKeyboardMacroStateMessage creates a new keyboard macro state message.
-func NewKeyboardMacroStateMessage(state bool, isPaste bool) *Message {
-	data := make([]byte, 2)
-	if state {
-		data[0] = 1
-	}
-	if isPaste {
-		data[1] = 1
-	}
-
-	return &Message{
-		t: TypeKeyboardMacroState,
-		d: data,
-	}
-}

internal/hidrpc/message.go

@@ -1,207 +0,0 @@
-package hidrpc
-
-import (
-	"encoding/binary"
-	"fmt"
-)
-
-// Message ..
-type Message struct {
-	t MessageType
-	d []byte
-}
-
-// Marshal marshals the message to a byte array.
-func (m *Message) Marshal() ([]byte, error) {
-	return Marshal(m)
-}
-
-func (m *Message) Type() MessageType {
-	return m.t
-}
-
-func (m *Message) String() string {
-	switch m.t {
-	case TypeHandshake:
-		return "Handshake"
-	case TypeKeypressReport:
-		if len(m.d) < 2 {
-			return fmt.Sprintf("KeypressReport{Malformed: %v}", m.d)
-		}
-		return fmt.Sprintf("KeypressReport{Key: %d, Press: %v}", m.d[0], m.d[1] == uint8(1))
-	case TypeKeyboardReport:
-		if len(m.d) < 2 {
-			return fmt.Sprintf("KeyboardReport{Malformed: %v}", m.d)
-		}
-		return fmt.Sprintf("KeyboardReport{Modifier: %d, Keys: %v}", m.d[0], m.d[1:])
-	case TypePointerReport:
-		if len(m.d) < 9 {
-			return fmt.Sprintf("PointerReport{Malformed: %v}", m.d)
-		}
-		return fmt.Sprintf("PointerReport{X: %d, Y: %d, Button: %d}", m.d[0:4], m.d[4:8], m.d[8])
-	case TypeMouseReport:
-		if len(m.d) < 3 {
-			return fmt.Sprintf("MouseReport{Malformed: %v}", m.d)
-		}
-		return fmt.Sprintf("MouseReport{DX: %d, DY: %d, Button: %d}", m.d[0], m.d[1], m.d[2])
-	case TypeKeypressKeepAliveReport:
-		return "KeypressKeepAliveReport"
-	case TypeKeyboardMacroReport:
-		if len(m.d) < 5 {
-			return fmt.Sprintf("KeyboardMacroReport{Malformed: %v}", m.d)
-		}
-		return fmt.Sprintf("KeyboardMacroReport{IsPaste: %v, Length: %d}", m.d[0] == uint8(1), binary.BigEndian.Uint32(m.d[1:5]))
-	default:
-		return fmt.Sprintf("Unknown{Type: %d, Data: %v}", m.t, m.d)
-	}
-}
-
-// KeypressReport ..
-type KeypressReport struct {
-	Key   byte
-	Press bool
-}
-
-// KeypressReport returns the keypress report from the message.
-func (m *Message) KeypressReport() (KeypressReport, error) {
-	if m.t != TypeKeypressReport {
-		return KeypressReport{}, fmt.Errorf("invalid message type: %d", m.t)
-	}
-
-	return KeypressReport{
-		Key:   m.d[0],
-		Press: m.d[1] == uint8(1),
-	}, nil
-}
-
-// KeyboardReport ..
-type KeyboardReport struct {
-	Modifier byte
-	Keys     []byte
-}
-
-// KeyboardReport returns the keyboard report from the message.
-func (m *Message) KeyboardReport() (KeyboardReport, error) {
-	if m.t != TypeKeyboardReport {
-		return KeyboardReport{}, fmt.Errorf("invalid message type: %d", m.t)
-	}
-
-	return KeyboardReport{
-		Modifier: m.d[0],
-		Keys:     m.d[1:],
-	}, nil
-}
-
-// Macro ..
-type KeyboardMacroStep struct {
-	Modifier byte   // 1 byte
-	Keys     []byte // 6 bytes: hidKeyBufferSize
-	Delay    uint16 // 2 bytes
-}
-type KeyboardMacroReport struct {
-	IsPaste   bool
-	StepCount uint32
-	Steps     []KeyboardMacroStep
-}
-
-// HidKeyBufferSize is the size of the keys buffer in the keyboard report.
-const HidKeyBufferSize = 6
-
-// KeyboardMacroReport returns the keyboard macro report from the message.
-func (m *Message) KeyboardMacroReport() (KeyboardMacroReport, error) {
-	if m.t != TypeKeyboardMacroReport {
-		return KeyboardMacroReport{}, fmt.Errorf("invalid message type: %d", m.t)
-	}
-
-	isPaste := m.d[0] == uint8(1)
-	stepCount := binary.BigEndian.Uint32(m.d[1:5])
-
-	// check total length
-	expectedLength := int(stepCount)*9 + 5
-	if len(m.d) != expectedLength {
-		return KeyboardMacroReport{}, fmt.Errorf("invalid length: %d, expected: %d", len(m.d), expectedLength)
-	}
-
-	steps := make([]KeyboardMacroStep, 0, int(stepCount))
-	offset := 5
-	for i := 0; i < int(stepCount); i++ {
-		steps = append(steps, KeyboardMacroStep{
-			Modifier: m.d[offset],
-			Keys:     m.d[offset+1 : offset+7],
-			Delay:    binary.BigEndian.Uint16(m.d[offset+7 : offset+9]),
-		})
-
-		offset += 1 + HidKeyBufferSize + 2
-	}
-
-	return KeyboardMacroReport{
-		IsPaste:   isPaste,
-		Steps:     steps,
-		StepCount: stepCount,
-	}, nil
-}
-
-// PointerReport ..
-type PointerReport struct {
-	X      int
-	Y      int
-	Button uint8
-}
-
-func toInt(b []byte) int {
-	return int(b[0])<<24 + int(b[1])<<16 + int(b[2])<<8 + int(b[3])<<0
-}
-
-// PointerReport returns the point report from the message.
-func (m *Message) PointerReport() (PointerReport, error) {
-	if m.t != TypePointerReport {
-		return PointerReport{}, fmt.Errorf("invalid message type: %d", m.t)
-	}
-
-	if len(m.d) != 9 {
-		return PointerReport{}, fmt.Errorf("invalid message length: %d", len(m.d))
-	}
-
-	return PointerReport{
-		X:      toInt(m.d[0:4]),
-		Y:      toInt(m.d[4:8]),
-		Button: uint8(m.d[8]),
-	}, nil
-}
-
-// MouseReport ..
-type MouseReport struct {
-	DX     int8
-	DY     int8
-	Button uint8
-}
-
-// MouseReport returns the mouse report from the message.
-func (m *Message) MouseReport() (MouseReport, error) {
-	if m.t != TypeMouseReport {
-		return MouseReport{}, fmt.Errorf("invalid message type: %d", m.t)
-	}
-
-	return MouseReport{
-		DX:     int8(m.d[0]),
-		DY:     int8(m.d[1]),
-		Button: uint8(m.d[2]),
-	}, nil
-}
-
-type KeyboardMacroState struct {
-	State   bool
-	IsPaste bool
-}
-
-// KeyboardMacroState returns the keyboard macro state report from the message.
-func (m *Message) KeyboardMacroState() (KeyboardMacroState, error) {
-	if m.t != TypeKeyboardMacroState {
-		return KeyboardMacroState{}, fmt.Errorf("invalid message type: %d", m.t)
-	}
-
-	return KeyboardMacroState{
-		State:   m.d[0] == uint8(1),
-		IsPaste: m.d[1] == uint8(1),
-	}, nil
-}

internal/logging/logger.go

@@ -50,7 +50,7 @@ var (
 		TimeFormat:    time.RFC3339,
 		PartsOrder:    []string{"time", "level", "scope", "component", "message"},
 		FieldsExclude: []string{"scope", "component"},
-		FormatPartValueByName: func(value any, name string) string {
+		FormatPartValueByName: func(value interface{}, name string) string {
 			val := fmt.Sprintf("%s", value)
 			if name == "component" {
 				if value == nil {
@@ -121,8 +121,8 @@ func (l *Logger) updateLogLevel() {
 			continue
 		}
 
-		scopes := strings.SplitSeq(strings.ToLower(env), ",")
+		scopes := strings.Split(strings.ToLower(env), ",")
-		for scope := range scopes {
+		for _, scope := range scopes {
 			l.scopeLevels[scope] = level
 		}
 	}

internal/logging/pion.go

@@ -13,32 +13,32 @@ type pionLogger struct {
 func (c pionLogger) Trace(msg string) {
 	c.logger.Trace().Msg(msg)
 }
-func (c pionLogger) Tracef(format string, args ...any) {
+func (c pionLogger) Tracef(format string, args ...interface{}) {
 	c.logger.Trace().Msgf(format, args...)
 }
 
 func (c pionLogger) Debug(msg string) {
 	c.logger.Debug().Msg(msg)
 }
-func (c pionLogger) Debugf(format string, args ...any) {
+func (c pionLogger) Debugf(format string, args ...interface{}) {
 	c.logger.Debug().Msgf(format, args...)
 }
 func (c pionLogger) Info(msg string) {
 	c.logger.Info().Msg(msg)
 }
-func (c pionLogger) Infof(format string, args ...any) {
+func (c pionLogger) Infof(format string, args ...interface{}) {
 	c.logger.Info().Msgf(format, args...)
 }
 func (c pionLogger) Warn(msg string) {
 	c.logger.Warn().Msg(msg)
 }
-func (c pionLogger) Warnf(format string, args ...any) {
+func (c pionLogger) Warnf(format string, args ...interface{}) {
 	c.logger.Warn().Msgf(format, args...)
 }
 func (c pionLogger) Error(msg string) {
 	c.logger.Error().Msg(msg)
 }
-func (c pionLogger) Errorf(format string, args ...any) {
+func (c pionLogger) Errorf(format string, args ...interface{}) {
 	c.logger.Error().Msgf(format, args...)
 }
 

internal/logging/utils.go

@@ -13,7 +13,7 @@ func GetDefaultLogger() *zerolog.Logger {
 	return &defaultLogger
 }
 
-func ErrorfL(l *zerolog.Logger, format string, err error, args ...any) error {
+func ErrorfL(l *zerolog.Logger, format string, err error, args ...interface{}) error {
 	// TODO: move rootLogger to logging package
 	if l == nil {
 		l = &defaultLogger

internal/network/config.go

@@ -3,8 +3,6 @@ package network
 import (
 	"fmt"
 	"net"
-	"net/http"
-	"net/url"
 	"time"
 
 	"github.com/guregu/null/v6"
@@ -34,9 +32,8 @@ type IPv6StaticConfig struct {
 	DNS     []string    `json:"dns,omitempty" validate_type:"ipv6" required:"true"`
 }
 type NetworkConfig struct {
-	Hostname  null.String `json:"hostname,omitempty" validate_type:"hostname"`
+	Hostname null.String `json:"hostname,omitempty" validate_type:"hostname"`
-	HTTPProxy null.String `json:"http_proxy,omitempty" validate_type:"proxy"`
+	Domain   null.String `json:"domain,omitempty" validate_type:"hostname"`
-	Domain    null.String `json:"domain,omitempty" validate_type:"hostname"`
 
 	IPv4Mode   null.String       `json:"ipv4_mode,omitempty" one_of:"dhcp,static,disabled" default:"dhcp"`
 	IPv4Static *IPv4StaticConfig `json:"ipv4_static,omitempty" required_if:"IPv4Mode=static"`
@@ -48,20 +45,19 @@ type NetworkConfig struct {
 	LLDPTxTLVs              []string    `json:"lldp_tx_tlvs,omitempty" one_of:"chassis,port,system,vlan" default:"chassis,port,system,vlan"`
 	MDNSMode                null.String `json:"mdns_mode,omitempty" one_of:"disabled,auto,ipv4_only,ipv6_only" default:"auto"`
 	TimeSyncMode            null.String `json:"time_sync_mode,omitempty" one_of:"ntp_only,ntp_and_http,http_only,custom" default:"ntp_and_http"`
-	TimeSyncOrdering        []string    `json:"time_sync_ordering,omitempty" one_of:"http,ntp,ntp_dhcp,ntp_user_provided,http_user_provided" default:"ntp,http"`
+	TimeSyncOrdering        []string    `json:"time_sync_ordering,omitempty" one_of:"http,ntp,ntp_dhcp,ntp_user_provided,ntp_fallback" default:"ntp,http"`
 	TimeSyncDisableFallback null.Bool   `json:"time_sync_disable_fallback,omitempty" default:"false"`
 	TimeSyncParallel        null.Int    `json:"time_sync_parallel,omitempty" default:"4"`
-	TimeSyncNTPServers      []string    `json:"time_sync_ntp_servers,omitempty" validate_type:"ipv4_or_ipv6" required_if:"TimeSyncOrdering=ntp_user_provided"`
-	TimeSyncHTTPUrls        []string    `json:"time_sync_http_urls,omitempty" validate_type:"url" required_if:"TimeSyncOrdering=http_user_provided"`
 }
 
 func (c *NetworkConfig) GetMDNSMode() *mdns.MDNSListenOptions {
+	mode := c.MDNSMode.String
 	listenOptions := &mdns.MDNSListenOptions{
-		IPv4: c.IPv4Mode.String != "disabled",
+		IPv4: true,
-		IPv6: c.IPv6Mode.String != "disabled",
+		IPv6: true,
 	}
 
-	switch c.MDNSMode.String {
+	switch mode {
 	case "ipv4_only":
 		listenOptions.IPv6 = false
 	case "ipv6_only":
@@ -73,18 +69,6 @@ func (c *NetworkConfig) GetMDNSMode() *mdns.MDNSListenOptions {
 
 	return listenOptions
 }
-
-func (s *NetworkConfig) GetTransportProxyFunc() func(*http.Request) (*url.URL, error) {
-	return func(*http.Request) (*url.URL, error) {
-		if s.HTTPProxy.String == "" {
-			return nil, nil
-		} else {
-			proxyUrl, _ := url.Parse(s.HTTPProxy.String)
-			return proxyUrl, nil
-		}
-	}
-}
-
 func (s *NetworkInterfaceState) GetHostname() string {
 	hostname := ToValidHostname(s.config.Hostname.String)
 

internal/network/hostname.go

@@ -42,7 +42,7 @@ func updateEtcHosts(hostname string, fqdn string) error {
 	hostLine := fmt.Sprintf("127.0.1.1\t%s %s", hostname, fqdn)
 	hostLineExists := false
 
-	for line := range strings.SplitSeq(string(lines), "\n") {
+	for _, line := range strings.Split(string(lines), "\n") {
 		if strings.HasPrefix(line, "127.0.1.1") {
 			hostLineExists = true
 			line = hostLine

internal/network/netif.go

@@ -21,7 +21,6 @@ type NetworkInterfaceState struct {
 	ipv6Addr      *net.IP
 	ipv6Addresses []IPv6Address
 	ipv6LinkLocal *net.IP
-	ntpAddresses  []*net.IP
 	macAddr       *net.HardwareAddr
 
 	l         *zerolog.Logger
@@ -48,7 +47,7 @@ type NetworkInterfaceOptions struct {
 	DefaultHostname   string
 	OnStateChange     func(state *NetworkInterfaceState)
 	OnInitialCheck    func(state *NetworkInterfaceState)
-	OnDhcpLeaseChange func(lease *udhcpc.Lease, state *NetworkInterfaceState)
+	OnDhcpLeaseChange func(lease *udhcpc.Lease)
 	OnConfigChange    func(config *NetworkConfig)
 	NetworkConfig     *NetworkConfig
 }
@@ -77,7 +76,6 @@ func NewNetworkInterfaceState(opts *NetworkInterfaceOptions) (*NetworkInterfaceS
 		onInitialCheck:  opts.OnInitialCheck,
 		cbConfigChange:  opts.OnConfigChange,
 		config:          opts.NetworkConfig,
-		ntpAddresses:    make([]*net.IP, 0),
 	}
 
 	// create the dhcp client
@@ -91,10 +89,10 @@ func NewNetworkInterfaceState(opts *NetworkInterfaceOptions) (*NetworkInterfaceS
 				opts.Logger.Error().Err(err).Msg("failed to update network state")
 				return
 			}
-			_ = s.updateNtpServersFromLease(lease)
+
 			_ = s.setHostnameIfNotSame()
 
-			opts.OnDhcpLeaseChange(lease, s)
+			opts.OnDhcpLeaseChange(lease)
 		},
 	})
 
@@ -137,27 +135,6 @@ func (s *NetworkInterfaceState) IPv6String() string {
 	return s.ipv6Addr.String()
 }
 
-func (s *NetworkInterfaceState) NtpAddresses() []*net.IP {
-	return s.ntpAddresses
-}
-
-func (s *NetworkInterfaceState) NtpAddressesString() []string {
-	ntpServers := []string{}
-
-	if s != nil {
-		s.l.Debug().Any("s", s).Msg("getting NTP address strings")
-
-		if len(s.ntpAddresses) > 0 {
-			for _, server := range s.ntpAddresses {
-				s.l.Debug().IPAddr("server", *server).Msg("converting NTP address")
-				ntpServers = append(ntpServers, server.String())
-			}
-		}
-	}
-
-	return ntpServers
-}
-
 func (s *NetworkInterfaceState) MAC() *net.HardwareAddr {
 	return s.macAddr
 }
@@ -239,10 +216,6 @@ func (s *NetworkInterfaceState) update() (DhcpTargetState, error) {
 			ipv4Addresses = append(ipv4Addresses, addr.IP)
 			ipv4AddressesString = append(ipv4AddressesString, addr.IPNet.String())
 		} else if addr.IP.To16() != nil {
-			if s.config.IPv6Mode.String == "disabled" {
-				continue
-			}
-
 			scopedLogger := s.l.With().Str("ipv6", addr.IP.String()).Logger()
 			// check if it's a link local address
 			if addr.IP.IsLinkLocalUnicast() {
@@ -291,37 +264,35 @@ func (s *NetworkInterfaceState) update() (DhcpTargetState, error) {
 	}
 	s.ipv4Addresses = ipv4AddressesString
 
-	if s.config.IPv6Mode.String != "disabled" {
+	if ipv6LinkLocal != nil {
-		if ipv6LinkLocal != nil {
+		if s.ipv6LinkLocal == nil || s.ipv6LinkLocal.String() != ipv6LinkLocal.String() {
-			if s.ipv6LinkLocal == nil || s.ipv6LinkLocal.String() != ipv6LinkLocal.String() {
+			scopedLogger := s.l.With().Str("ipv6", ipv6LinkLocal.String()).Logger()
-				scopedLogger := s.l.With().Str("ipv6", ipv6LinkLocal.String()).Logger()
+			if s.ipv6LinkLocal != nil {
-				if s.ipv6LinkLocal != nil {
+				scopedLogger.Info().
-					scopedLogger.Info().
+					Str("old_ipv6", s.ipv6LinkLocal.String()).
-						Str("old_ipv6", s.ipv6LinkLocal.String()).
+					Msg("IPv6 link local address changed")
-						Msg("IPv6 link local address changed")
+			} else {
-				} else {
+				scopedLogger.Info().Msg("IPv6 link local address found")
-					scopedLogger.Info().Msg("IPv6 link local address found")
-				}
-				s.ipv6LinkLocal = ipv6LinkLocal
-				changed = true
 			}
+			s.ipv6LinkLocal = ipv6LinkLocal
+			changed = true
 		}
-		s.ipv6Addresses = ipv6Addresses
+	}
+	s.ipv6Addresses = ipv6Addresses
 
-		if len(ipv6Addresses) > 0 {
+	if len(ipv6Addresses) > 0 {
-			// compare the addresses to see if there's a change
+		// compare the addresses to see if there's a change
-			if s.ipv6Addr == nil || s.ipv6Addr.String() != ipv6Addresses[0].Address.String() {
+		if s.ipv6Addr == nil || s.ipv6Addr.String() != ipv6Addresses[0].Address.String() {
-				scopedLogger := s.l.With().Str("ipv6", ipv6Addresses[0].Address.String()).Logger()
+			scopedLogger := s.l.With().Str("ipv6", ipv6Addresses[0].Address.String()).Logger()
-				if s.ipv6Addr != nil {
+			if s.ipv6Addr != nil {
-					scopedLogger.Info().
+				scopedLogger.Info().
-						Str("old_ipv6", s.ipv6Addr.String()).
+					Str("old_ipv6", s.ipv6Addr.String()).
-						Msg("IPv6 address changed")
+					Msg("IPv6 address changed")
-				} else {
+			} else {
-					scopedLogger.Info().Msg("IPv6 address found")
+				scopedLogger.Info().Msg("IPv6 address found")
-				}
-				s.ipv6Addr = &ipv6Addresses[0].Address
-				changed = true
 			}
+			s.ipv6Addr = &ipv6Addresses[0].Address
+			changed = true
 		}
 	}
 
@@ -347,25 +318,6 @@ func (s *NetworkInterfaceState) update() (DhcpTargetState, error) {
 	return dhcpTargetState, nil
 }
 
-func (s *NetworkInterfaceState) updateNtpServersFromLease(lease *udhcpc.Lease) error {
-	if lease != nil && len(lease.NTPServers) > 0 {
-		s.l.Info().Msg("lease found, updating DHCP NTP addresses")
-		s.ntpAddresses = make([]*net.IP, 0, len(lease.NTPServers))
-
-		for _, ntpServer := range lease.NTPServers {
-			if ntpServer != nil {
-				s.l.Info().IPAddr("ntp_server", ntpServer).Msg("NTP server found in lease")
-				s.ntpAddresses = append(s.ntpAddresses, &ntpServer)
-			}
-		}
-	} else {
-		s.l.Info().Msg("no NTP servers found in lease")
-		s.ntpAddresses = make([]*net.IP, 0, len(s.config.TimeSyncNTPServers))
-	}
-
-	return nil
-}
-
 func (s *NetworkInterfaceState) CheckAndUpdateDhcp() error {
 	dhcpTargetState, err := s.update()
 	if err != nil {

internal/network/rpc.go

@@ -65,7 +65,7 @@ func (s *NetworkInterfaceState) IPv6LinkLocalAddress() string {
 func (s *NetworkInterfaceState) RpcGetNetworkState() RpcNetworkState {
 	ipv6Addresses := make([]RpcIPv6Address, 0)
 
-	if s.ipv6Addresses != nil && s.config.IPv6Mode.String != "disabled" {
+	if s.ipv6Addresses != nil {
 		for _, addr := range s.ipv6Addresses {
 			ipv6Addresses = append(ipv6Addresses, RpcIPv6Address{
 				Address:           addr.Prefix.String(),

internal/network/utils.go

@@ -13,7 +13,7 @@ func lifetimeToTime(lifetime int) *time.Time {
 	return &t
 }
 
-func IsSame(a, b any) bool {
+func IsSame(a, b interface{}) bool {
 	aJSON, err := json.Marshal(a)
 	if err != nil {
 		return false

internal/timesync/http.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"math/rand"
 	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 )
@@ -20,9 +19,9 @@ var defaultHTTPUrls = []string{
 	// "http://www.msftconnecttest.com/connecttest.txt",
 }
 
-func (t *TimeSync) queryAllHttpTime(httpUrls []string) (now *time.Time) {
+func (t *TimeSync) queryAllHttpTime() (now *time.Time) {
-	chunkSize := int(t.networkConfig.TimeSyncParallel.ValueOr(4))
+	chunkSize := 4
-	t.l.Info().Strs("httpUrls", httpUrls).Int("chunkSize", chunkSize).Msg("querying HTTP URLs")
+	httpUrls := t.httpUrls
 
 	// shuffle the http urls to avoid always querying the same servers
 	rand.Shuffle(len(httpUrls), func(i, j int) { httpUrls[i], httpUrls[j] = httpUrls[j], httpUrls[i] })
@@ -58,7 +57,6 @@ func (t *TimeSync) queryMultipleHttp(urls []string, timeout time.Duration) (now
 				ctx,
 				url,
 				timeout,
-				t.networkConfig.GetTransportProxyFunc(),
 			)
 			duration := time.Since(startTime)
 
@@ -124,16 +122,10 @@ func queryHttpTime(
 	ctx context.Context,
 	url string,
 	timeout time.Duration,
-	proxyFunc func(*http.Request) (*url.URL, error),
 ) (now *time.Time, response *http.Response, err error) {
-	transport := http.DefaultTransport.(*http.Transport).Clone()
-	transport.Proxy = proxyFunc
-
 	client := http.Client{
-		Transport: transport,
+		Timeout: timeout,
-		Timeout:   timeout,
 	}
-
 	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
 	if err != nil {
 		return nil, nil, err

internal/timesync/metrics.go

@@ -73,7 +73,6 @@ var (
 		},
 		[]string{"url"},
 	)
-
 	metricNtpServerInfo = promauto.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: "jetkvm_timesync_ntp_server_info",

internal/timesync/ntp.go

@@ -1,7 +1,6 @@
 package timesync
 
 import (
-	"context"
 	"math/rand/v2"
 	"strconv"
 	"time"
@@ -9,37 +8,22 @@ import (
 	"github.com/beevik/ntp"
 )
 
-var defaultNTPServerIPs = []string{
+var defaultNTPServers = []string{
-	// These servers are known by static IP and as such don't need DNS lookups
-	// These are from Google and Cloudflare since if they're down, the internet
-	// is broken anyway
-	"162.159.200.1",      // time.cloudflare.com IPv4
-	"162.159.200.123",    // time.cloudflare.com IPv4
-	"2606:4700:f1::1",    // time.cloudflare.com IPv6
-	"2606:4700:f1::123",  // time.cloudflare.com IPv6
-	"216.239.35.0",       // time.google.com IPv4
-	"216.239.35.4",       // time.google.com IPv4
-	"216.239.35.8",       // time.google.com IPv4
-	"216.239.35.12",      // time.google.com IPv4
-	"2001:4860:4806::",   // time.google.com IPv6
-	"2001:4860:4806:4::", // time.google.com IPv6
-	"2001:4860:4806:8::", // time.google.com IPv6
-	"2001:4860:4806:c::", // time.google.com IPv6
-}
-
-var defaultNTPServerHostnames = []string{
-	// should use something from https://github.com/jauderho/public-ntp-servers
 	"time.apple.com",
 	"time.aws.com",
 	"time.windows.com",
 	"time.google.com",
-	"time.cloudflare.com",
+	"162.159.200.123",   // time.cloudflare.com IPv4
-	"pool.ntp.org",
+	"2606:4700:f1::123", // time.cloudflare.com IPv6
+	"0.pool.ntp.org",
+	"1.pool.ntp.org",
+	"2.pool.ntp.org",
+	"3.pool.ntp.org",
 }
 
-func (t *TimeSync) queryNetworkTime(ntpServers []string) (now *time.Time, offset *time.Duration) {
+func (t *TimeSync) queryNetworkTime() (now *time.Time, offset *time.Duration) {
-	chunkSize := int(t.networkConfig.TimeSyncParallel.ValueOr(4))
+	chunkSize := 4
-	t.l.Info().Strs("servers", ntpServers).Int("chunkSize", chunkSize).Msg("querying NTP servers")
+	ntpServers := t.ntpServers
 
 	// shuffle the ntp servers to avoid always querying the same servers
 	rand.Shuffle(len(ntpServers), func(i, j int) { ntpServers[i], ntpServers[j] = ntpServers[j], ntpServers[i] })
@@ -62,10 +46,6 @@ type ntpResult struct {
 
 func (t *TimeSync) queryMultipleNTP(servers []string, timeout time.Duration) (now *time.Time, offset *time.Duration) {
 	results := make(chan *ntpResult, len(servers))
-
-	_, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
 	for _, server := range servers {
 		go func(server string) {
 			scopedLogger := t.l.With().
@@ -86,25 +66,15 @@ func (t *TimeSync) queryMultipleNTP(servers []string, timeout time.Duration) (no
 				return
 			}
 
-			if response.IsKissOfDeath() {
-				scopedLogger.Warn().
-					Str("kiss_code", response.KissCode).
-					Msg("ignoring NTP server kiss of death")
-				results <- nil
-				return
-			}
-
-			rtt := float64(response.RTT.Milliseconds())
-
 			// set the last RTT
 			metricNtpServerLastRTT.WithLabelValues(
 				server,
-			).Set(rtt)
+			).Set(float64(response.RTT.Milliseconds()))
 
 			// set the RTT histogram
 			metricNtpServerRttHistogram.WithLabelValues(
 				server,
-			).Observe(rtt)
+			).Observe(float64(response.RTT.Milliseconds()))
 
 			// set the server info
 			metricNtpServerInfo.WithLabelValues(
@@ -121,13 +91,10 @@ func (t *TimeSync) queryMultipleNTP(servers []string, timeout time.Duration) (no
 			scopedLogger.Info().
 				Str("time", now.Format(time.RFC3339)).
 				Str("reference", response.ReferenceString()).
-				Float64("rtt", rtt).
+				Str("rtt", response.RTT.String()).
 				Str("clockOffset", response.ClockOffset.String()).
 				Uint8("stratum", response.Stratum).
 				Msg("NTP server returned time")
-
-			cancel()
-
 			results <- &ntpResult{
 				now:    now,
 				offset: &response.ClockOffset,

internal/timesync/timesync.go

@@ -28,8 +28,9 @@ type TimeSync struct {
 	syncLock *sync.Mutex
 	l        *zerolog.Logger
 
-	networkConfig    *network.NetworkConfig
+	ntpServers    []string
-	dhcpNtpAddresses []string
+	httpUrls      []string
+	networkConfig *network.NetworkConfig
 
 	rtcDevicePath string
 	rtcDevice     *os.File //nolint:unused
@@ -63,13 +64,14 @@ func NewTimeSync(opts *TimeSyncOptions) *TimeSync {
 	}
 
 	t := &TimeSync{
-		syncLock:         &sync.Mutex{},
+		syncLock:      &sync.Mutex{},
-		l:                opts.Logger,
+		l:             opts.Logger,
-		dhcpNtpAddresses: []string{},
+		rtcDevicePath: rtcDevice,
-		rtcDevicePath:    rtcDevice,
+		rtcLock:       &sync.Mutex{},
-		rtcLock:          &sync.Mutex{},
+		preCheckFunc:  opts.PreCheckFunc,
-		preCheckFunc:     opts.PreCheckFunc,
+		ntpServers:    defaultNTPServers,
-		networkConfig:    opts.NetworkConfig,
+		httpUrls:      defaultHTTPUrls,
+		networkConfig: opts.NetworkConfig,
 	}
 
 	if t.rtcDevicePath != "" {
@@ -80,42 +82,34 @@ func NewTimeSync(opts *TimeSyncOptions) *TimeSync {
 	return t
 }
 
-func (t *TimeSync) SetDhcpNtpAddresses(addresses []string) {
-	t.dhcpNtpAddresses = addresses
-}
-
 func (t *TimeSync) getSyncMode() SyncMode {
 	syncMode := SyncMode{
-		Ntp:             true,
-		Http:            true,
-		Ordering:        []string{"ntp_dhcp", "ntp", "http"},
 		NtpUseFallback:  true,
 		HttpUseFallback: true,
 	}
+	var syncModeString string
 
 	if t.networkConfig != nil {
-		switch t.networkConfig.TimeSyncMode.String {
+		syncModeString = t.networkConfig.TimeSyncMode.String
-		case "ntp_only":
-			syncMode.Http = false
-		case "http_only":
-			syncMode.Ntp = false
-		}
-
 		if t.networkConfig.TimeSyncDisableFallback.Bool {
 			syncMode.NtpUseFallback = false
 			syncMode.HttpUseFallback = false
 		}
-
-		var syncOrdering = t.networkConfig.TimeSyncOrdering
-		if len(syncOrdering) > 0 {
-			syncMode.Ordering = syncOrdering
-		}
 	}
 
-	t.l.Debug().Strs("Ordering", syncMode.Ordering).Bool("Ntp", syncMode.Ntp).Bool("Http", syncMode.Http).Bool("NtpUseFallback", syncMode.NtpUseFallback).Bool("HttpUseFallback", syncMode.HttpUseFallback).Msg("sync mode")
+	switch syncModeString {
+	case "ntp_only":
+		syncMode.Ntp = true
+	case "http_only":
+		syncMode.Http = true
+	default:
+		syncMode.Ntp = true
+		syncMode.Http = true
+	}
 
 	return syncMode
 }
+
 func (t *TimeSync) doTimeSync() {
 	metricTimeSyncStatus.Set(0)
 	for {
@@ -158,64 +152,18 @@ func (t *TimeSync) Sync() error {
 	var (
 		now    *time.Time
 		offset *time.Duration
-		log    zerolog.Logger
 	)
 
-	metricTimeSyncCount.Inc()
-
 	syncMode := t.getSyncMode()
 
-Orders:
+	metricTimeSyncCount.Inc()
-	for _, mode := range syncMode.Ordering {
+
-		log = t.l.With().Str("mode", mode).Logger()
+	if syncMode.Ntp {
-		switch mode {
+		now, offset = t.queryNetworkTime()
-		case "ntp_user_provided":
+	}
-			if syncMode.Ntp {
+
-				log.Info().Msg("using NTP custom servers")
+	if syncMode.Http && now == nil {
-				now, offset = t.queryNetworkTime(t.networkConfig.TimeSyncNTPServers)
+		now = t.queryAllHttpTime()
-				if now != nil {
-					break Orders
-				}
-			}
-		case "ntp_dhcp":
-			if syncMode.Ntp {
-				log.Info().Msg("using NTP servers from DHCP")
-				now, offset = t.queryNetworkTime(t.dhcpNtpAddresses)
-				if now != nil {
-					break Orders
-				}
-			}
-		case "ntp":
-			if syncMode.Ntp && syncMode.NtpUseFallback {
-				log.Info().Msg("using NTP fallback IPs")
-				now, offset = t.queryNetworkTime(defaultNTPServerIPs)
-				if now == nil {
-					log.Info().Msg("using NTP fallback hostnames")
-					now, offset = t.queryNetworkTime(defaultNTPServerHostnames)
-				}
-				if now != nil {
-					break Orders
-				}
-			}
-		case "http_user_provided":
-			if syncMode.Http {
-				log.Info().Msg("using HTTP custom URLs")
-				now = t.queryAllHttpTime(t.networkConfig.TimeSyncHTTPUrls)
-				if now != nil {
-					break Orders
-				}
-			}
-		case "http":
-			if syncMode.Http && syncMode.HttpUseFallback {
-				log.Info().Msg("using HTTP fallback")
-				now = t.queryAllHttpTime(defaultHTTPUrls)
-				if now != nil {
-					break Orders
-				}
-			}
-		default:
-			log.Warn().Msg("unknown time sync mode, skipping")
-		}
 	}
 
 	if now == nil {
@@ -227,8 +175,6 @@ Orders:
 		now = &newNow
 	}
 
-	log.Info().Time("now", *now).Msg("time obtained")
-
 	err := t.setSystemTime(*now)
 	if err != nil {
 		return fmt.Errorf("failed to set system time: %w", err)

internal/tzdata/gen.go

@@ -1,72 +0,0 @@
-//go:build ignore
-
-package main
-
-import (
-	"archive/zip"
-	"bytes"
-	"flag"
-	"fmt"
-	"os"
-	"text/template"
-)
-
-var tmpl = `// Code generated by "go run gen.go". DO NOT EDIT.
-//go:generate env ZONEINFO=$GOROOT/lib/time/zoneinfo.zip go run gen.go -output tzdata.go
-package tzdata
-var TimeZones = []string{
-	{{- range . }}
-	"{{.}}",
-	{{- end }}
-}
-`
-
-var filename = flag.String("output", "tzdata.go", "output file name")
-
-func main() {
-	flag.Parse()
-
-	path := os.Getenv("ZONEINFO")
-	if path == "" {
-		fmt.Println("ZONEINFO is not set")
-		os.Exit(1)
-	}
-
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		fmt.Printf("ZONEINFO %s does not exist\n", path)
-		os.Exit(1)
-	}
-
-	zipfile, err := zip.OpenReader(path)
-	if err != nil {
-		fmt.Printf("Error opening ZONEINFO %s: %v\n", path, err)
-		os.Exit(1)
-	}
-	defer zipfile.Close()
-
-	timezones := []string{}
-
-	for _, file := range zipfile.File {
-		timezones = append(timezones, file.Name)
-	}
-
-	var buf bytes.Buffer
-
-	tmpl, err := template.New("tzdata").Parse(tmpl)
-	if err != nil {
-		fmt.Printf("Error parsing template: %v\n", err)
-		os.Exit(1)
-	}
-
-	err = tmpl.Execute(&buf, timezones)
-	if err != nil {
-		fmt.Printf("Error executing template: %v\n", err)
-		os.Exit(1)
-	}
-
-	err = os.WriteFile(*filename, buf.Bytes(), 0644)
-	if err != nil {
-		fmt.Printf("Error writing file %s: %v\n", *filename, err)
-		os.Exit(1)
-	}
-}

internal/tzdata/tzdata.go

@@ -1,602 +0,0 @@
-// Code generated by "go run gen.go". DO NOT EDIT.
-//go:generate env ZONEINFO=$GOROOT/lib/time/zoneinfo.zip go run gen.go -output tzdata.go
-package tzdata
-var TimeZones = []string{
-	"Africa/Abidjan",
-	"Africa/Accra",
-	"Africa/Addis_Ababa",
-	"Africa/Algiers",
-	"Africa/Asmara",
-	"Africa/Asmera",
-	"Africa/Bamako",
-	"Africa/Bangui",
-	"Africa/Banjul",
-	"Africa/Bissau",
-	"Africa/Blantyre",
-	"Africa/Brazzaville",
-	"Africa/Bujumbura",
-	"Africa/Cairo",
-	"Africa/Casablanca",
-	"Africa/Ceuta",
-	"Africa/Conakry",
-	"Africa/Dakar",
-	"Africa/Dar_es_Salaam",
-	"Africa/Djibouti",
-	"Africa/Douala",
-	"Africa/El_Aaiun",
-	"Africa/Freetown",
-	"Africa/Gaborone",
-	"Africa/Harare",
-	"Africa/Johannesburg",
-	"Africa/Juba",
-	"Africa/Kampala",
-	"Africa/Khartoum",
-	"Africa/Kigali",
-	"Africa/Kinshasa",
-	"Africa/Lagos",
-	"Africa/Libreville",
-	"Africa/Lome",
-	"Africa/Luanda",
-	"Africa/Lubumbashi",
-	"Africa/Lusaka",
-	"Africa/Malabo",
-	"Africa/Maputo",
-	"Africa/Maseru",
-	"Africa/Mbabane",
-	"Africa/Mogadishu",
-	"Africa/Monrovia",
-	"Africa/Nairobi",
-	"Africa/Ndjamena",
-	"Africa/Niamey",
-	"Africa/Nouakchott",
-	"Africa/Ouagadougou",
-	"Africa/Porto-Novo",
-	"Africa/Sao_Tome",
-	"Africa/Timbuktu",
-	"Africa/Tripoli",
-	"Africa/Tunis",
-	"Africa/Windhoek",
-	"America/Adak",
-	"America/Anchorage",
-	"America/Anguilla",
-	"America/Antigua",
-	"America/Araguaina",
-	"America/Argentina/Buenos_Aires",
-	"America/Argentina/Catamarca",
-	"America/Argentina/ComodRivadavia",
-	"America/Argentina/Cordoba",
-	"America/Argentina/Jujuy",
-	"America/Argentina/La_Rioja",
-	"America/Argentina/Mendoza",
-	"America/Argentina/Rio_Gallegos",
-	"America/Argentina/Salta",
-	"America/Argentina/San_Juan",
-	"America/Argentina/San_Luis",
-	"America/Argentina/Tucuman",
-	"America/Argentina/Ushuaia",
-	"America/Aruba",
-	"America/Asuncion",
-	"America/Atikokan",
-	"America/Atka",
-	"America/Bahia",
-	"America/Bahia_Banderas",
-	"America/Barbados",
-	"America/Belem",
-	"America/Belize",
-	"America/Blanc-Sablon",
-	"America/Boa_Vista",
-	"America/Bogota",
-	"America/Boise",
-	"America/Buenos_Aires",
-	"America/Cambridge_Bay",
-	"America/Campo_Grande",
-	"America/Cancun",
-	"America/Caracas",
-	"America/Catamarca",
-	"America/Cayenne",
-	"America/Cayman",
-	"America/Chicago",
-	"America/Chihuahua",
-	"America/Ciudad_Juarez",
-	"America/Coral_Harbour",
-	"America/Cordoba",
-	"America/Costa_Rica",
-	"America/Creston",
-	"America/Cuiaba",
-	"America/Curacao",
-	"America/Danmarkshavn",
-	"America/Dawson",
-	"America/Dawson_Creek",
-	"America/Denver",
-	"America/Detroit",
-	"America/Dominica",
-	"America/Edmonton",
-	"America/Eirunepe",
-	"America/El_Salvador",
-	"America/Ensenada",
-	"America/Fort_Nelson",
-	"America/Fort_Wayne",
-	"America/Fortaleza",
-	"America/Glace_Bay",
-	"America/Godthab",
-	"America/Goose_Bay",
-	"America/Grand_Turk",
-	"America/Grenada",
-	"America/Guadeloupe",
-	"America/Guatemala",
-	"America/Guayaquil",
-	"America/Guyana",
-	"America/Halifax",
-	"America/Havana",
-	"America/Hermosillo",
-	"America/Indiana/Indianapolis",
-	"America/Indiana/Knox",
-	"America/Indiana/Marengo",
-	"America/Indiana/Petersburg",
-	"America/Indiana/Tell_City",
-	"America/Indiana/Vevay",
-	"America/Indiana/Vincennes",
-	"America/Indiana/Winamac",
-	"America/Indianapolis",
-	"America/Inuvik",
-	"America/Iqaluit",
-	"America/Jamaica",
-	"America/Jujuy",
-	"America/Juneau",
-	"America/Kentucky/Louisville",
-	"America/Kentucky/Monticello",
-	"America/Knox_IN",
-	"America/Kralendijk",
-	"America/La_Paz",
-	"America/Lima",
-	"America/Los_Angeles",
-	"America/Louisville",
-	"America/Lower_Princes",
-	"America/Maceio",
-	"America/Managua",
-	"America/Manaus",
-	"America/Marigot",
-	"America/Martinique",
-	"America/Matamoros",
-	"America/Mazatlan",
-	"America/Mendoza",
-	"America/Menominee",
-	"America/Merida",
-	"America/Metlakatla",
-	"America/Mexico_City",
-	"America/Miquelon",
-	"America/Moncton",
-	"America/Monterrey",
-	"America/Montevideo",
-	"America/Montreal",
-	"America/Montserrat",
-	"America/Nassau",
-	"America/New_York",
-	"America/Nipigon",
-	"America/Nome",
-	"America/Noronha",
-	"America/North_Dakota/Beulah",
-	"America/North_Dakota/Center",
-	"America/North_Dakota/New_Salem",
-	"America/Nuuk",
-	"America/Ojinaga",
-	"America/Panama",
-	"America/Pangnirtung",
-	"America/Paramaribo",
-	"America/Phoenix",
-	"America/Port-au-Prince",
-	"America/Port_of_Spain",
-	"America/Porto_Acre",
-	"America/Porto_Velho",
-	"America/Puerto_Rico",
-	"America/Punta_Arenas",
-	"America/Rainy_River",
-	"America/Rankin_Inlet",
-	"America/Recife",
-	"America/Regina",
-	"America/Resolute",
-	"America/Rio_Branco",
-	"America/Rosario",
-	"America/Santa_Isabel",
-	"America/Santarem",
-	"America/Santiago",
-	"America/Santo_Domingo",
-	"America/Sao_Paulo",
-	"America/Scoresbysund",
-	"America/Shiprock",
-	"America/Sitka",
-	"America/St_Barthelemy",
-	"America/St_Johns",
-	"America/St_Kitts",
-	"America/St_Lucia",
-	"America/St_Thomas",
-	"America/St_Vincent",
-	"America/Swift_Current",
-	"America/Tegucigalpa",
-	"America/Thule",
-	"America/Thunder_Bay",
-	"America/Tijuana",
-	"America/Toronto",
-	"America/Tortola",
-	"America/Vancouver",
-	"America/Virgin",
-	"America/Whitehorse",
-	"America/Winnipeg",
-	"America/Yakutat",
-	"America/Yellowknife",
-	"Antarctica/Casey",
-	"Antarctica/Davis",
-	"Antarctica/DumontDUrville",
-	"Antarctica/Macquarie",
-	"Antarctica/Mawson",
-	"Antarctica/McMurdo",
-	"Antarctica/Palmer",
-	"Antarctica/Rothera",
-	"Antarctica/South_Pole",
-	"Antarctica/Syowa",
-	"Antarctica/Troll",
-	"Antarctica/Vostok",
-	"Arctic/Longyearbyen",
-	"Asia/Aden",
-	"Asia/Almaty",
-	"Asia/Amman",
-	"Asia/Anadyr",
-	"Asia/Aqtau",
-	"Asia/Aqtobe",
-	"Asia/Ashgabat",
-	"Asia/Ashkhabad",
-	"Asia/Atyrau",
-	"Asia/Baghdad",
-	"Asia/Bahrain",
-	"Asia/Baku",
-	"Asia/Bangkok",
-	"Asia/Barnaul",
-	"Asia/Beirut",
-	"Asia/Bishkek",
-	"Asia/Brunei",
-	"Asia/Calcutta",
-	"Asia/Chita",
-	"Asia/Choibalsan",
-	"Asia/Chongqing",
-	"Asia/Chungking",
-	"Asia/Colombo",
-	"Asia/Dacca",
-	"Asia/Damascus",
-	"Asia/Dhaka",
-	"Asia/Dili",
-	"Asia/Dubai",
-	"Asia/Dushanbe",
-	"Asia/Famagusta",
-	"Asia/Gaza",
-	"Asia/Harbin",
-	"Asia/Hebron",
-	"Asia/Ho_Chi_Minh",
-	"Asia/Hong_Kong",
-	"Asia/Hovd",
-	"Asia/Irkutsk",
-	"Asia/Istanbul",
-	"Asia/Jakarta",
-	"Asia/Jayapura",
-	"Asia/Jerusalem",
-	"Asia/Kabul",
-	"Asia/Kamchatka",
-	"Asia/Karachi",
-	"Asia/Kashgar",
-	"Asia/Kathmandu",
-	"Asia/Katmandu",
-	"Asia/Khandyga",
-	"Asia/Kolkata",
-	"Asia/Krasnoyarsk",
-	"Asia/Kuala_Lumpur",
-	"Asia/Kuching",
-	"Asia/Kuwait",
-	"Asia/Macao",
-	"Asia/Macau",
-	"Asia/Magadan",
-	"Asia/Makassar",
-	"Asia/Manila",
-	"Asia/Muscat",
-	"Asia/Nicosia",
-	"Asia/Novokuznetsk",
-	"Asia/Novosibirsk",
-	"Asia/Omsk",
-	"Asia/Oral",
-	"Asia/Phnom_Penh",
-	"Asia/Pontianak",
-	"Asia/Pyongyang",
-	"Asia/Qatar",
-	"Asia/Qostanay",
-	"Asia/Qyzylorda",
-	"Asia/Rangoon",
-	"Asia/Riyadh",
-	"Asia/Saigon",
-	"Asia/Sakhalin",
-	"Asia/Samarkand",
-	"Asia/Seoul",
-	"Asia/Shanghai",
-	"Asia/Singapore",
-	"Asia/Srednekolymsk",
-	"Asia/Taipei",
-	"Asia/Tashkent",
-	"Asia/Tbilisi",
-	"Asia/Tehran",
-	"Asia/Tel_Aviv",
-	"Asia/Thimbu",
-	"Asia/Thimphu",
-	"Asia/Tokyo",
-	"Asia/Tomsk",
-	"Asia/Ujung_Pandang",
-	"Asia/Ulaanbaatar",
-	"Asia/Ulan_Bator",
-	"Asia/Urumqi",
-	"Asia/Ust-Nera",
-	"Asia/Vientiane",
-	"Asia/Vladivostok",
-	"Asia/Yakutsk",
-	"Asia/Yangon",
-	"Asia/Yekaterinburg",
-	"Asia/Yerevan",
-	"Atlantic/Azores",
-	"Atlantic/Bermuda",
-	"Atlantic/Canary",
-	"Atlantic/Cape_Verde",
-	"Atlantic/Faeroe",
-	"Atlantic/Faroe",
-	"Atlantic/Jan_Mayen",
-	"Atlantic/Madeira",
-	"Atlantic/Reykjavik",
-	"Atlantic/South_Georgia",
-	"Atlantic/St_Helena",
-	"Atlantic/Stanley",
-	"Australia/ACT",
-	"Australia/Adelaide",
-	"Australia/Brisbane",
-	"Australia/Broken_Hill",
-	"Australia/Canberra",
-	"Australia/Currie",
-	"Australia/Darwin",
-	"Australia/Eucla",
-	"Australia/Hobart",
-	"Australia/LHI",
-	"Australia/Lindeman",
-	"Australia/Lord_Howe",
-	"Australia/Melbourne",
-	"Australia/NSW",
-	"Australia/North",
-	"Australia/Perth",
-	"Australia/Queensland",
-	"Australia/South",
-	"Australia/Sydney",
-	"Australia/Tasmania",
-	"Australia/Victoria",
-	"Australia/West",
-	"Australia/Yancowinna",
-	"Brazil/Acre",
-	"Brazil/DeNoronha",
-	"Brazil/East",
-	"Brazil/West",
-	"CET",
-	"CST6CDT",
-	"Canada/Atlantic",
-	"Canada/Central",
-	"Canada/Eastern",
-	"Canada/Mountain",
-	"Canada/Newfoundland",
-	"Canada/Pacific",
-	"Canada/Saskatchewan",
-	"Canada/Yukon",
-	"Chile/Continental",
-	"Chile/EasterIsland",
-	"Cuba",
-	"EET",
-	"EST",
-	"EST5EDT",
-	"Egypt",
-	"Eire",
-	"Etc/GMT",
-	"Etc/GMT+0",
-	"Etc/GMT+1",
-	"Etc/GMT+10",
-	"Etc/GMT+11",
-	"Etc/GMT+12",
-	"Etc/GMT+2",
-	"Etc/GMT+3",
-	"Etc/GMT+4",
-	"Etc/GMT+5",
-	"Etc/GMT+6",
-	"Etc/GMT+7",
-	"Etc/GMT+8",
-	"Etc/GMT+9",
-	"Etc/GMT-0",
-	"Etc/GMT-1",
-	"Etc/GMT-10",
-	"Etc/GMT-11",
-	"Etc/GMT-12",
-	"Etc/GMT-13",
-	"Etc/GMT-14",
-	"Etc/GMT-2",
-	"Etc/GMT-3",
-	"Etc/GMT-4",
-	"Etc/GMT-5",
-	"Etc/GMT-6",
-	"Etc/GMT-7",
-	"Etc/GMT-8",
-	"Etc/GMT-9",
-	"Etc/GMT0",
-	"Etc/Greenwich",
-	"Etc/UCT",
-	"Etc/UTC",
-	"Etc/Universal",
-	"Etc/Zulu",
-	"Europe/Amsterdam",
-	"Europe/Andorra",
-	"Europe/Astrakhan",
-	"Europe/Athens",
-	"Europe/Belfast",
-	"Europe/Belgrade",
-	"Europe/Berlin",
-	"Europe/Bratislava",
-	"Europe/Brussels",
-	"Europe/Bucharest",
-	"Europe/Budapest",
-	"Europe/Busingen",
-	"Europe/Chisinau",
-	"Europe/Copenhagen",
-	"Europe/Dublin",
-	"Europe/Gibraltar",
-	"Europe/Guernsey",
-	"Europe/Helsinki",
-	"Europe/Isle_of_Man",
-	"Europe/Istanbul",
-	"Europe/Jersey",
-	"Europe/Kaliningrad",
-	"Europe/Kiev",
-	"Europe/Kirov",
-	"Europe/Kyiv",
-	"Europe/Lisbon",
-	"Europe/Ljubljana",
-	"Europe/London",
-	"Europe/Luxembourg",
-	"Europe/Madrid",
-	"Europe/Malta",
-	"Europe/Mariehamn",
-	"Europe/Minsk",
-	"Europe/Monaco",
-	"Europe/Moscow",
-	"Europe/Nicosia",
-	"Europe/Oslo",
-	"Europe/Paris",
-	"Europe/Podgorica",
-	"Europe/Prague",
-	"Europe/Riga",
-	"Europe/Rome",
-	"Europe/Samara",
-	"Europe/San_Marino",
-	"Europe/Sarajevo",
-	"Europe/Saratov",
-	"Europe/Simferopol",
-	"Europe/Skopje",
-	"Europe/Sofia",
-	"Europe/Stockholm",
-	"Europe/Tallinn",
-	"Europe/Tirane",
-	"Europe/Tiraspol",
-	"Europe/Ulyanovsk",
-	"Europe/Uzhgorod",
-	"Europe/Vaduz",
-	"Europe/Vatican",
-	"Europe/Vienna",
-	"Europe/Vilnius",
-	"Europe/Volgograd",
-	"Europe/Warsaw",
-	"Europe/Zagreb",
-	"Europe/Zaporozhye",
-	"Europe/Zurich",
-	"Factory",
-	"GB",
-	"GB-Eire",
-	"GMT",
-	"GMT+0",
-	"GMT-0",
-	"GMT0",
-	"Greenwich",
-	"HST",
-	"Hongkong",
-	"Iceland",
-	"Indian/Antananarivo",
-	"Indian/Chagos",
-	"Indian/Christmas",
-	"Indian/Cocos",
-	"Indian/Comoro",
-	"Indian/Kerguelen",
-	"Indian/Mahe",
-	"Indian/Maldives",
-	"Indian/Mauritius",
-	"Indian/Mayotte",
-	"Indian/Reunion",
-	"Iran",
-	"Israel",
-	"Jamaica",
-	"Japan",
-	"Kwajalein",
-	"Libya",
-	"MET",
-	"MST",
-	"MST7MDT",
-	"Mexico/BajaNorte",
-	"Mexico/BajaSur",
-	"Mexico/General",
-	"NZ",
-	"NZ-CHAT",
-	"Navajo",
-	"PRC",
-	"PST8PDT",
-	"Pacific/Apia",
-	"Pacific/Auckland",
-	"Pacific/Bougainville",
-	"Pacific/Chatham",
-	"Pacific/Chuuk",
-	"Pacific/Easter",
-	"Pacific/Efate",
-	"Pacific/Enderbury",
-	"Pacific/Fakaofo",
-	"Pacific/Fiji",
-	"Pacific/Funafuti",
-	"Pacific/Galapagos",
-	"Pacific/Gambier",
-	"Pacific/Guadalcanal",
-	"Pacific/Guam",
-	"Pacific/Honolulu",
-	"Pacific/Johnston",
-	"Pacific/Kanton",
-	"Pacific/Kiritimati",
-	"Pacific/Kosrae",
-	"Pacific/Kwajalein",
-	"Pacific/Majuro",
-	"Pacific/Marquesas",
-	"Pacific/Midway",
-	"Pacific/Nauru",
-	"Pacific/Niue",
-	"Pacific/Norfolk",
-	"Pacific/Noumea",
-	"Pacific/Pago_Pago",
-	"Pacific/Palau",
-	"Pacific/Pitcairn",
-	"Pacific/Pohnpei",
-	"Pacific/Ponape",
-	"Pacific/Port_Moresby",
-	"Pacific/Rarotonga",
-	"Pacific/Saipan",
-	"Pacific/Samoa",
-	"Pacific/Tahiti",
-	"Pacific/Tarawa",
-	"Pacific/Tongatapu",
-	"Pacific/Truk",
-	"Pacific/Wake",
-	"Pacific/Wallis",
-	"Pacific/Yap",
-	"Poland",
-	"Portugal",
-	"ROC",
-	"ROK",
-	"Singapore",
-	"Turkey",
-	"UCT",
-	"US/Alaska",
-	"US/Aleutian",
-	"US/Arizona",
-	"US/Central",
-	"US/East-Indiana",
-	"US/Eastern",
-	"US/Hawaii",
-	"US/Indiana-Starke",
-	"US/Michigan",
-	"US/Mountain",
-	"US/Pacific",
-	"US/Samoa",
-	"UTC",
-	"Universal",
-	"W-SU",
-	"WET",
-	"Zulu",
-}

internal/udhcpc/parser.go

@@ -101,7 +101,7 @@ func (l *Lease) SetLeaseExpiry() (time.Time, error) {
 func UnmarshalDHCPCLease(lease *Lease, str string) error {
 	// parse the lease file as a map
 	data := make(map[string]string)
-	for line := range strings.SplitSeq(str, "\n") {
+	for _, line := range strings.Split(str, "\n") {
 		line = strings.TrimSpace(line)
 		// skip empty lines and comments
 		if line == "" || strings.HasPrefix(line, "#") {
@@ -165,7 +165,7 @@ func UnmarshalDHCPCLease(lease *Lease, str string) error {
 			field.Set(reflect.ValueOf(ip))
 		case []net.IP:
 			val := make([]net.IP, 0)
-			for ipStr := range strings.FieldsSeq(value) {
+			for _, ipStr := range strings.Fields(value) {
 				ip := net.ParseIP(ipStr)
 				if ip == nil {
 					continue

internal/udhcpc/udhcpc.go

@@ -52,7 +52,7 @@ func NewDHCPClient(options *DHCPClientOptions) *DHCPClient {
 }
 
 func (c *DHCPClient) getWatchPaths() []string {
-	watchPaths := make(map[string]any)
+	watchPaths := make(map[string]interface{})
 	watchPaths[filepath.Dir(c.leaseFile)] = nil
 
 	if c.pidFile != "" {

internal/usbgadget/config.go

@@ -30,8 +30,8 @@ var defaultGadgetConfig = map[string]gadgetConfigItem{
 		attrs: gadgetAttributes{
 			"bcdUSB":    "0x0200", // USB 2.0
 			"idVendor":  "0x1d6b", // The Linux Foundation
-			"idProduct": "0x0104", // Multifunction Composite Gadget
+			"idProduct": "0104",   // Multifunction Composite Gadget
-			"bcdDevice": "0x0100", // USB2
+			"bcdDevice": "0100",
 		},
 		configAttrs: gadgetAttributes{
 			"MaxPower": "250", // in unit of 2mA

internal/usbgadget/consts.go

@@ -1,7 +1,3 @@
 package usbgadget
 
-import "time"
-
 const dwc3Path = "/sys/bus/platform/drivers/dwc3"
-
-const hidWriteTimeout = 10 * time.Millisecond

internal/usbgadget/hid_keyboard.go

@@ -1,15 +1,11 @@
 package usbgadget
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"os"
-	"sync"
+	"reflect"
 	"time"
-
-	"github.com/rs/xid"
-	"github.com/rs/zerolog"
 )
 
 var keyboardConfig = gadgetConfigItem{
@@ -18,10 +14,9 @@ var keyboardConfig = gadgetConfigItem{
 	path:       []string{"functions", "hid.usb0"},
 	configPath: []string{"hid.usb0"},
 	attrs: gadgetAttributes{
-		"protocol":        "1",
+		"protocol":      "1",
-		"subclass":        "1",
+		"subclass":      "1",
-		"report_length":   "8",
+		"report_length": "8",
-		"no_out_endpoint": "0",
 	},
 	reportDesc: keyboardReportDesc,
 }
@@ -65,8 +60,6 @@ var keyboardReportDesc = []byte{
 
 const (
 	hidReadBufferSize = 8
-	hidKeyBufferSize  = 6
-	hidErrorRollOver  = 0x01
 	// https://www.usb.org/sites/default/files/documents/hid1_11.pdf
 	// https://www.usb.org/sites/default/files/hut1_2.pdf
 	KeyboardLedMaskNumLock    = 1 << 0
@@ -74,9 +67,7 @@ const (
 	KeyboardLedMaskScrollLock = 1 << 2
 	KeyboardLedMaskCompose    = 1 << 3
 	KeyboardLedMaskKana       = 1 << 4
-	// power on/off LED is 5
+	ValidKeyboardLedMasks     = KeyboardLedMaskNumLock | KeyboardLedMaskCapsLock | KeyboardLedMaskScrollLock | KeyboardLedMaskCompose | KeyboardLedMaskKana
-	KeyboardLedMaskShift  = 1 << 6
-	ValidKeyboardLedMasks = KeyboardLedMaskNumLock | KeyboardLedMaskCapsLock | KeyboardLedMaskScrollLock | KeyboardLedMaskCompose | KeyboardLedMaskKana | KeyboardLedMaskShift
 )
 
 // Synchronization between LED states and CAPS LOCK, NUM LOCK, SCROLL LOCK,
@@ -89,13 +80,6 @@ type KeyboardState struct {
 	ScrollLock bool `json:"scroll_lock"`
 	Compose    bool `json:"compose"`
 	Kana       bool `json:"kana"`
-	Shift      bool `json:"shift"` // This is not part of the main USB HID spec
-	raw        byte
-}
-
-// Byte returns the raw byte representation of the keyboard state.
-func (k *KeyboardState) Byte() byte {
-	return k.raw
 }
 
 func getKeyboardState(b byte) KeyboardState {
@@ -106,28 +90,27 @@ func getKeyboardState(b byte) KeyboardState {
 		ScrollLock: b&KeyboardLedMaskScrollLock != 0,
 		Compose:    b&KeyboardLedMaskCompose != 0,
 		Kana:       b&KeyboardLedMaskKana != 0,
-		Shift:      b&KeyboardLedMaskShift != 0,
-		raw:        b,
 	}
 }
 
-func (u *UsbGadget) updateKeyboardState(state byte) {
+func (u *UsbGadget) updateKeyboardState(b byte) {
 	u.keyboardStateLock.Lock()
 	defer u.keyboardStateLock.Unlock()
 
-	if state&^ValidKeyboardLedMasks != 0 {
+	if b&^ValidKeyboardLedMasks != 0 {
-		u.log.Warn().Uint8("state", state).Msg("ignoring invalid bits")
+		u.log.Trace().Uint8("b", b).Msg("contains invalid bits, ignoring")
 		return
 	}
 
-	if u.keyboardState == state {
+	newState := getKeyboardState(b)
+	if reflect.DeepEqual(u.keyboardState, newState) {
 		return
 	}
-	u.log.Trace().Uint8("old", u.keyboardState).Uint8("new", state).Msg("keyboardState updated")
+	u.log.Info().Interface("old", u.keyboardState).Interface("new", newState).Msg("keyboardState updated")
-	u.keyboardState = state
+	u.keyboardState = newState
 
 	if u.onKeyboardStateChange != nil {
-		(*u.onKeyboardStateChange)(getKeyboardState(state))
+		(*u.onKeyboardStateChange)(newState)
 	}
 }
 
@@ -139,105 +122,7 @@ func (u *UsbGadget) GetKeyboardState() KeyboardState {
 	u.keyboardStateLock.Lock()
 	defer u.keyboardStateLock.Unlock()
 
-	return getKeyboardState(u.keyboardState)
+	return u.keyboardState
-}
-
-func (u *UsbGadget) GetKeysDownState() KeysDownState {
-	u.keyboardStateLock.Lock()
-	defer u.keyboardStateLock.Unlock()
-
-	return u.keysDownState
-}
-
-func (u *UsbGadget) SetOnKeysDownChange(f func(state KeysDownState)) {
-	u.onKeysDownChange = &f
-}
-
-func (u *UsbGadget) SetOnKeepAliveReset(f func()) {
-	u.onKeepAliveReset = &f
-}
-
-// DefaultAutoReleaseDuration is the default duration for auto-release of a key.
-const DefaultAutoReleaseDuration = 100 * time.Millisecond
-
-func (u *UsbGadget) scheduleAutoRelease(key byte) {
-	u.kbdAutoReleaseLock.Lock()
-	defer unlockWithLog(&u.kbdAutoReleaseLock, u.log, "autoRelease scheduled")
-
-	if u.kbdAutoReleaseTimers[key] != nil {
-		u.kbdAutoReleaseTimers[key].Stop()
-	}
-
-	// TODO: make this configurable
-	// We currently hardcode the duration to 100ms
-	// However, it should be the same as the duration of the keep-alive reset called baseExtension.
-	u.kbdAutoReleaseTimers[key] = time.AfterFunc(100*time.Millisecond, func() {
-		u.performAutoRelease(key)
-	})
-}
-
-func (u *UsbGadget) cancelAutoRelease(key byte) {
-	u.kbdAutoReleaseLock.Lock()
-	defer unlockWithLog(&u.kbdAutoReleaseLock, u.log, "autoRelease cancelled")
-
-	if timer := u.kbdAutoReleaseTimers[key]; timer != nil {
-		timer.Stop()
-		u.kbdAutoReleaseTimers[key] = nil
-		delete(u.kbdAutoReleaseTimers, key)
-
-		// Reset keep-alive timing when key is released
-		if u.onKeepAliveReset != nil {
-			(*u.onKeepAliveReset)()
-		}
-	}
-}
-
-func (u *UsbGadget) DelayAutoReleaseWithDuration(resetDuration time.Duration) {
-	u.kbdAutoReleaseLock.Lock()
-	defer unlockWithLog(&u.kbdAutoReleaseLock, u.log, "autoRelease delayed")
-
-	u.log.Debug().Dur("reset_duration", resetDuration).Msg("delaying auto-release with dynamic duration")
-
-	for _, timer := range u.kbdAutoReleaseTimers {
-		if timer != nil {
-			timer.Reset(resetDuration)
-		}
-	}
-}
-
-func (u *UsbGadget) performAutoRelease(key byte) {
-	u.kbdAutoReleaseLock.Lock()
-
-	if u.kbdAutoReleaseTimers[key] == nil {
-		u.log.Warn().Uint8("key", key).Msg("autoRelease timer not found")
-		u.kbdAutoReleaseLock.Unlock()
-		return
-	}
-
-	u.kbdAutoReleaseTimers[key].Stop()
-	u.kbdAutoReleaseTimers[key] = nil
-	delete(u.kbdAutoReleaseTimers, key)
-	u.kbdAutoReleaseLock.Unlock()
-
-	// Skip if already released
-	state := u.GetKeysDownState()
-	alreadyReleased := true
-
-	for i := range state.Keys {
-		if state.Keys[i] == key {
-			alreadyReleased = false
-			break
-		}
-	}
-
-	if alreadyReleased {
-		return
-	}
-
-	_, err := u.keypressReport(key, false)
-	if err != nil {
-		u.log.Warn().Uint8("key", key).Msg("failed to release key")
-	}
 }
 
 func (u *UsbGadget) listenKeyboardEvents() {
@@ -256,7 +141,7 @@ func (u *UsbGadget) listenKeyboardEvents() {
 				l.Info().Msg("context done")
 				return
 			default:
-				l.Trace().Msg("reading from keyboard for LED state changes")
+				l.Trace().Msg("reading from keyboard")
 				if u.keyboardHidFile == nil {
 					u.logWithSuppression("keyboardHidFileNil", 100, &l, nil, "keyboardHidFile is nil")
 					// show the error every 100 times to avoid spamming the logs
@@ -273,7 +158,7 @@ func (u *UsbGadget) listenKeyboardEvents() {
 				}
 				u.resetLogSuppressionCounter("keyboardHidFileRead")
 
-				l.Trace().Int("n", n).Uints8("buf", buf).Msg("got data from keyboard")
+				l.Trace().Int("n", n).Bytes("buf", buf).Msg("got data from keyboard")
 				if n != 1 {
 					l.Trace().Int("n", n).Msg("expected 1 byte, got")
 					continue
@@ -309,16 +194,12 @@ func (u *UsbGadget) OpenKeyboardHidFile() error {
 	return u.openKeyboardHidFile()
 }
 
-var keyboardWriteHidFileLock sync.Mutex
+func (u *UsbGadget) keyboardWriteHidFile(data []byte) error {
-
-func (u *UsbGadget) keyboardWriteHidFile(modifier byte, keys []byte) error {
-	keyboardWriteHidFileLock.Lock()
-	defer keyboardWriteHidFileLock.Unlock()
 	if err := u.openKeyboardHidFile(); err != nil {
 		return err
 	}
 
-	_, err := u.writeWithTimeout(u.keyboardHidFile, append([]byte{modifier, 0x00}, keys[:hidKeyBufferSize]...))
+	_, err := u.keyboardHidFile.Write(data)
 	if err != nil {
 		u.logWithSuppression("keyboardWriteHidFile", 100, u.log, err, "failed to write to hidg0")
 		u.keyboardHidFile.Close()
@@ -329,178 +210,22 @@ func (u *UsbGadget) keyboardWriteHidFile(modifier byte, keys []byte) error {
 	return nil
 }
 
-func (u *UsbGadget) UpdateKeysDown(modifier byte, keys []byte) KeysDownState {
+func (u *UsbGadget) KeyboardReport(modifier uint8, keys []uint8) error {
-	// if we just reported an error roll over, we should clear the keys
+	u.keyboardLock.Lock()
-	if keys[0] == hidErrorRollOver {
+	defer u.keyboardLock.Unlock()
-		for i := range keys {
+
-			keys[i] = 0
+	if len(keys) > 6 {
-		}
+		keys = keys[:6]
+	}
+	if len(keys) < 6 {
+		keys = append(keys, make([]uint8, 6-len(keys))...)
 	}
 
-	state := KeysDownState{
+	err := u.keyboardWriteHidFile([]byte{modifier, 0, keys[0], keys[1], keys[2], keys[3], keys[4], keys[5]})
-		Modifier: modifier,
-		Keys:     []byte(keys[:]),
-	}
-
-	u.keyboardStateLock.Lock()
-
-	if u.keysDownState.Modifier == state.Modifier &&
-		bytes.Equal(u.keysDownState.Keys, state.Keys) {
-		u.keyboardStateLock.Unlock()
-		return state // No change in key down state
-	}
-
-	u.keysDownState = state
-	u.keyboardStateLock.Unlock()
-
-	if u.onKeysDownChange != nil {
-		(*u.onKeysDownChange)(state) // this enques to the outgoing hidrpc queue via usb.go → currentSession.enqueueKeysDownState(...)
-	}
-	return state
-}
-
-func (u *UsbGadget) KeyboardReport(modifier byte, keys []byte) error {
-	defer u.resetUserInputTime()
-
-	if len(keys) > hidKeyBufferSize {
-		keys = keys[:hidKeyBufferSize]
-	}
-	if len(keys) < hidKeyBufferSize {
-		keys = append(keys, make([]byte, hidKeyBufferSize-len(keys))...)
-	}
-
-	err := u.keyboardWriteHidFile(modifier, keys)
 	if err != nil {
-		u.log.Warn().Uint8("modifier", modifier).Uints8("keys", keys).Msg("Could not write keyboard report to hidg0")
+		return err
 	}
 
-	u.UpdateKeysDown(modifier, keys)
+	u.resetUserInputTime()
-	return err
+	return nil
-}
-
-const (
-	// https://www.usb.org/sites/default/files/documents/hut1_2.pdf
-	// Dynamic Flags (DV)
-	LeftControl  = 0xE0
-	LeftShift    = 0xE1
-	LeftAlt      = 0xE2
-	LeftSuper    = 0xE3 // Left GUI (e.g. Windows key, Apple Command key)
-	RightControl = 0xE4
-	RightShift   = 0xE5
-	RightAlt     = 0xE6
-	RightSuper   = 0xE7 // Right GUI (e.g. Windows key, Apple Command key)
-)
-
-const (
-	// https://www.usb.org/sites/default/files/documents/hid1_11.pdf Appendix C
-	ModifierMaskLeftControl  = 0x01
-	ModifierMaskRightControl = 0x10
-	ModifierMaskLeftShift    = 0x02
-	ModifierMaskRightShift   = 0x20
-	ModifierMaskLeftAlt      = 0x04
-	ModifierMaskRightAlt     = 0x40
-	ModifierMaskLeftSuper    = 0x08
-	ModifierMaskRightSuper   = 0x80
-)
-
-// KeyCodeToMaskMap is a slice of KeyCodeMask for quick lookup
-var KeyCodeToMaskMap = map[byte]byte{
-	LeftControl:  ModifierMaskLeftControl,
-	LeftShift:    ModifierMaskLeftShift,
-	LeftAlt:      ModifierMaskLeftAlt,
-	LeftSuper:    ModifierMaskLeftSuper,
-	RightControl: ModifierMaskRightControl,
-	RightShift:   ModifierMaskRightShift,
-	RightAlt:     ModifierMaskRightAlt,
-	RightSuper:   ModifierMaskRightSuper,
-}
-
-func (u *UsbGadget) keypressReport(key byte, press bool) (KeysDownState, error) {
-	defer u.resetUserInputTime()
-
-	l := u.log.With().Uint8("key", key).Bool("press", press).Logger()
-	if l.GetLevel() <= zerolog.DebugLevel {
-		requestID := xid.New()
-		l = l.With().Str("requestID", requestID.String()).Logger()
-	}
-
-	// IMPORTANT: This code parallels the logic in the kernel's hid-gadget driver
-	// for handling key presses and releases. It ensures that the USB gadget
-	// behaves similarly to a real USB HID keyboard. This logic is paralleled
-	// in the client/browser-side code in useKeyboard.ts so make sure to keep
-	// them in sync.
-	var state = u.GetKeysDownState()
-	l.Trace().Interface("state", state).Msg("got keys down state")
-
-	modifier := state.Modifier
-	keys := append([]byte(nil), state.Keys...)
-
-	if mask, exists := KeyCodeToMaskMap[key]; exists {
-		// If the key is a modifier key, we update the keyboardModifier state
-		// by setting or clearing the corresponding bit in the modifier byte.
-		// This allows us to track the state of dynamic modifier keys like
-		// Shift, Control, Alt, and Super.
-		if press {
-			modifier |= mask
-		} else {
-			modifier &^= mask
-		}
-	} else {
-		// handle other keys that are not modifier keys by placing or removing them
-		// from the key buffer since the buffer tracks currently pressed keys
-		overrun := true
-		for i := range hidKeyBufferSize {
-			// If we find the key in the buffer the buffer, we either remove it (if press is false)
-			// or do nothing (if down is true) because the buffer tracks currently pressed keys
-			// and if we find a zero byte, we can place the key there (if press is true)
-			if keys[i] == key || keys[i] == 0 {
-				if press {
-					keys[i] = key // overwrites the zero byte or the same key if already pressed
-				} else {
-					// we are releasing the key, remove it from the buffer
-					if keys[i] != 0 {
-						copy(keys[i:], keys[i+1:])
-						keys[hidKeyBufferSize-1] = 0 // Clear the last byte
-					}
-				}
-				overrun = false // We found a slot for the key
-				break
-			}
-		}
-
-		// If we reach here it means we didn't find an empty slot or the key in the buffer
-		if overrun {
-			if press {
-				l.Error().Msg("keyboard buffer overflow, key not added")
-				// Fill all key slots with ErrorRollOver (0x01) to indicate overflow
-				for i := range keys {
-					keys[i] = hidErrorRollOver
-				}
-			} else {
-				// If we are releasing a key, and we didn't find it in a slot, who cares?
-				l.Warn().Msg("key not found in buffer, nothing to release")
-			}
-		}
-	}
-
-	err := u.keyboardWriteHidFile(modifier, keys)
-	return u.UpdateKeysDown(modifier, keys), err
-}
-
-func (u *UsbGadget) KeypressReport(key byte, press bool) error {
-	state, err := u.keypressReport(key, press)
-	if err != nil {
-		u.log.Warn().Uint8("key", key).Bool("press", press).Msg("failed to report key")
-	}
-	isRolledOver := state.Keys[0] == hidErrorRollOver
-
-	if isRolledOver {
-		u.cancelAutoRelease(key)
-	} else if press {
-		u.scheduleAutoRelease(key)
-	} else {
-		u.cancelAutoRelease(key)
-	}
-
-	return err
 }

internal/usbgadget/hid_mouse_absolute.go

@@ -11,10 +11,9 @@ var absoluteMouseConfig = gadgetConfigItem{
 	path:       []string{"functions", "hid.usb1"},
 	configPath: []string{"hid.usb1"},
 	attrs: gadgetAttributes{
-		"protocol":        "2",
+		"protocol":      "2",
-		"subclass":        "0",
+		"subclass":      "0",
-		"report_length":   "6",
+		"report_length": "6",
-		"no_out_endpoint": "1",
 	},
 	reportDesc: absoluteMouseCombinedReportDesc,
 }
@@ -74,7 +73,7 @@ func (u *UsbGadget) absMouseWriteHidFile(data []byte) error {
 		}
 	}
 
-	_, err := u.writeWithTimeout(u.absMouseHidFile, data)
+	_, err := u.absMouseHidFile.Write(data)
 	if err != nil {
 		u.logWithSuppression("absMouseWriteHidFile", 100, u.log, err, "failed to write to hidg1")
 		u.absMouseHidFile.Close()
@@ -85,17 +84,17 @@ func (u *UsbGadget) absMouseWriteHidFile(data []byte) error {
 	return nil
 }
 
-func (u *UsbGadget) AbsMouseReport(x int, y int, buttons uint8) error {
+func (u *UsbGadget) AbsMouseReport(x, y int, buttons uint8) error {
 	u.absMouseLock.Lock()
 	defer u.absMouseLock.Unlock()
 
 	err := u.absMouseWriteHidFile([]byte{
-		1,            // Report ID 1
+		1,             // Report ID 1
-		buttons,      // Buttons
+		buttons,       // Buttons
-		byte(x),      // X Low Byte
+		uint8(x),      // X Low Byte
-		byte(x >> 8), // X High Byte
+		uint8(x >> 8), // X High Byte
-		byte(y),      // Y Low Byte
+		uint8(y),      // Y Low Byte
-		byte(y >> 8), // Y High Byte
+		uint8(y >> 8), // Y High Byte
 	})
 	if err != nil {
 		return err

internal/usbgadget/hid_mouse_relative.go

@@ -11,10 +11,9 @@ var relativeMouseConfig = gadgetConfigItem{
 	path:       []string{"functions", "hid.usb2"},
 	configPath: []string{"hid.usb2"},
 	attrs: gadgetAttributes{
-		"protocol":        "2",
+		"protocol":      "2",
-		"subclass":        "1",
+		"subclass":      "1",
-		"report_length":   "4",
+		"report_length": "4",
-		"no_out_endpoint": "1",
 	},
 	reportDesc: relativeMouseCombinedReportDesc,
 }
@@ -64,7 +63,7 @@ func (u *UsbGadget) relMouseWriteHidFile(data []byte) error {
 		}
 	}
 
-	_, err := u.writeWithTimeout(u.relMouseHidFile, data)
+	_, err := u.relMouseHidFile.Write(data)
 	if err != nil {
 		u.logWithSuppression("relMouseWriteHidFile", 100, u.log, err, "failed to write to hidg2")
 		u.relMouseHidFile.Close()
@@ -75,15 +74,15 @@ func (u *UsbGadget) relMouseWriteHidFile(data []byte) error {
 	return nil
 }
 
-func (u *UsbGadget) RelMouseReport(mx int8, my int8, buttons uint8) error {
+func (u *UsbGadget) RelMouseReport(mx, my int8, buttons uint8) error {
 	u.relMouseLock.Lock()
 	defer u.relMouseLock.Unlock()
 
 	err := u.relMouseWriteHidFile([]byte{
-		buttons,  // Buttons
+		buttons,   // Buttons
-		byte(mx), // X
+		uint8(mx), // X
-		byte(my), // Y
+		uint8(my), // Y
-		0,        // Wheel
+		0,         // Wheel
 	})
 	if err != nil {
 		return err

internal/usbgadget/usbgadget.go

@@ -41,11 +41,6 @@ var defaultUsbGadgetDevices = Devices{
 	MassStorage:   true,
 }
 
-type KeysDownState struct {
-	Modifier byte      `json:"modifier"`
-	Keys     ByteSlice `json:"keys"`
-}
-
 // UsbGadget is a struct that represents a USB gadget.
 type UsbGadget struct {
 	name          string
@@ -65,12 +60,7 @@ type UsbGadget struct {
 	relMouseHidFile *os.File
 	relMouseLock    sync.Mutex
 
-	keyboardState byte          // keyboard latched state (NumLock, CapsLock, ScrollLock, Compose, Kana)
+	keyboardState       KeyboardState
-	keysDownState KeysDownState // keyboard dynamic state (modifier keys and pressed keys)
-
-	kbdAutoReleaseLock   sync.Mutex
-	kbdAutoReleaseTimers map[byte]*time.Timer
-
 	keyboardStateLock   sync.Mutex
 	keyboardStateCtx    context.Context
 	keyboardStateCancel context.CancelFunc
@@ -87,8 +77,6 @@ type UsbGadget struct {
 	txLock sync.Mutex
 
 	onKeyboardStateChange *func(state KeyboardState)
-	onKeysDownChange      *func(state KeysDownState)
-	onKeepAliveReset      *func()
 
 	log *zerolog.Logger
 
@@ -122,24 +110,22 @@ func newUsbGadget(name string, configMap map[string]gadgetConfigItem, enabledDev
 	keyboardCtx, keyboardCancel := context.WithCancel(context.Background())
 
 	g := &UsbGadget{
-		name:                 name,
+		name:                name,
-		kvmGadgetPath:        path.Join(gadgetPath, name),
+		kvmGadgetPath:       path.Join(gadgetPath, name),
-		configC1Path:         path.Join(gadgetPath, name, "configs/c.1"),
+		configC1Path:        path.Join(gadgetPath, name, "configs/c.1"),
-		configMap:            configMap,
+		configMap:           configMap,
-		customConfig:         *config,
+		customConfig:        *config,
-		configLock:           sync.Mutex{},
+		configLock:          sync.Mutex{},
-		keyboardLock:         sync.Mutex{},
+		keyboardLock:        sync.Mutex{},
-		absMouseLock:         sync.Mutex{},
+		absMouseLock:        sync.Mutex{},
-		relMouseLock:         sync.Mutex{},
+		relMouseLock:        sync.Mutex{},
-		txLock:               sync.Mutex{},
+		txLock:              sync.Mutex{},
-		keyboardStateCtx:     keyboardCtx,
+		keyboardStateCtx:    keyboardCtx,
-		keyboardStateCancel:  keyboardCancel,
+		keyboardStateCancel: keyboardCancel,
-		keyboardState:        0,
+		keyboardState:       KeyboardState{},
-		keysDownState:        KeysDownState{Modifier: 0, Keys: []byte{0, 0, 0, 0, 0, 0}}, // must be initialized to hidKeyBufferSize (6) zero bytes
+		enabledDevices:      *enabledDevices,
-		kbdAutoReleaseTimers: make(map[byte]*time.Timer),
+		lastUserInput:       time.Now(),
-		enabledDevices:       *enabledDevices,
+		log:                 logger,
-		lastUserInput:        time.Now(),
-		log:                  logger,
 
 		strictMode: config.strictMode,
 
@@ -154,37 +140,3 @@ func newUsbGadget(name string, configMap map[string]gadgetConfigItem, enabledDev
 
 	return g
 }
-
-// Close cleans up resources used by the USB gadget
-func (u *UsbGadget) Close() error {
-	// Cancel keyboard state context
-	if u.keyboardStateCancel != nil {
-		u.keyboardStateCancel()
-	}
-
-	// Stop auto-release timer
-	u.kbdAutoReleaseLock.Lock()
-	for _, timer := range u.kbdAutoReleaseTimers {
-		if timer != nil {
-			timer.Stop()
-		}
-	}
-	u.kbdAutoReleaseTimers = make(map[byte]*time.Timer)
-	u.kbdAutoReleaseLock.Unlock()
-
-	// Close HID files
-	if u.keyboardHidFile != nil {
-		u.keyboardHidFile.Close()
-		u.keyboardHidFile = nil
-	}
-	if u.absMouseHidFile != nil {
-		u.absMouseHidFile.Close()
-		u.absMouseHidFile = nil
-	}
-	if u.relMouseHidFile != nil {
-		u.relMouseHidFile.Close()
-		u.relMouseHidFile = nil
-	}
-
-	return nil
-}

internal/usbgadget/utils.go

@@ -2,44 +2,14 @@ package usbgadget
 
 import (
 	"bytes"
-	"encoding/json"
-	"errors"
 	"fmt"
-	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
-	"sync"
-	"time"
 
 	"github.com/rs/zerolog"
 )
 
-type ByteSlice []byte
-
-func (s ByteSlice) MarshalJSON() ([]byte, error) {
-	vals := make([]int, len(s))
-	for i, v := range s {
-		vals[i] = int(v)
-	}
-	return json.Marshal(vals)
-}
-
-func (s *ByteSlice) UnmarshalJSON(data []byte) error {
-	var vals []int
-	if err := json.Unmarshal(data, &vals); err != nil {
-		return err
-	}
-	*s = make([]byte, len(vals))
-	for i, v := range vals {
-		if v < 0 || v > 255 {
-			return fmt.Errorf("value %d out of byte range", v)
-		}
-		(*s)[i] = byte(v)
-	}
-	return nil
-}
-
 func joinPath(basePath string, paths []string) string {
 	pathArr := append([]string{basePath}, paths...)
 	return filepath.Join(pathArr...)
@@ -111,38 +81,7 @@ func compareFileContent(oldContent []byte, newContent []byte, looserMatch bool)
 	return false
 }
 
-func (u *UsbGadget) writeWithTimeout(file *os.File, data []byte) (n int, err error) {
+func (u *UsbGadget) logWithSuppression(counterName string, every int, logger *zerolog.Logger, err error, msg string, args ...interface{}) {
-	if err := file.SetWriteDeadline(time.Now().Add(hidWriteTimeout)); err != nil {
-		return -1, err
-	}
-
-	n, err = file.Write(data)
-	if err == nil {
-		return
-	}
-
-	u.log.Trace().
-		Str("file", file.Name()).
-		Bytes("data", data).
-		Err(err).
-		Msg("write failed")
-
-	if errors.Is(err, os.ErrDeadlineExceeded) {
-		u.logWithSuppression(
-			fmt.Sprintf("writeWithTimeout_%s", file.Name()),
-			1000,
-			u.log,
-			err,
-			"write timed out: %s",
-			file.Name(),
-		)
-		err = nil
-	}
-
-	return
-}
-
-func (u *UsbGadget) logWithSuppression(counterName string, every int, logger *zerolog.Logger, err error, msg string, args ...any) {
 	u.logSuppressionLock.Lock()
 	defer u.logSuppressionLock.Unlock()
 
@@ -171,8 +110,3 @@ func (u *UsbGadget) resetLogSuppressionCounter(counterName string) {
 		u.logSuppressionCounter[counterName] = 0
 	}
 }
-
-func unlockWithLog(lock *sync.Mutex, logger *zerolog.Logger, msg string, args ...any) {
-	logger.Trace().Msgf(msg, args...)
-	lock.Unlock()
-}

internal/utils/ssh.go

@@ -1,73 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"slices"
-	"strings"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// ValidSSHKeyTypes is a list of valid SSH key types
-//
-// Please make sure that all the types in this list are supported by dropbear
-// https://github.com/mkj/dropbear/blob/003c5fcaabc114430d5d14142e95ffdbbd2d19b6/src/signkey.c#L37
-//
-// ssh-dss is not allowed here as it's insecure
-var ValidSSHKeyTypes = []string{
-	ssh.KeyAlgoRSA,
-	ssh.KeyAlgoED25519,
-	ssh.KeyAlgoECDSA256,
-	ssh.KeyAlgoECDSA384,
-	ssh.KeyAlgoECDSA521,
-	ssh.KeyAlgoSKED25519,
-	ssh.KeyAlgoSKECDSA256,
-}
-
-// ValidateSSHKey validates authorized_keys file content
-func ValidateSSHKey(sshKey string) error {
-	// validate SSH key
-	var (
-		hasValidPublicKey = false
-		lastError         = fmt.Errorf("no valid SSH key found")
-	)
-	for _, key := range strings.Split(sshKey, "\n") {
-		key = strings.TrimSpace(key)
-
-		// skip empty lines and comments
-		if key == "" || strings.HasPrefix(key, "#") {
-			continue
-		}
-
-		parsedPublicKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(key))
-		if err != nil {
-			lastError = err
-			continue
-		}
-
-		if parsedPublicKey == nil {
-			continue
-		}
-
-		parsedType := parsedPublicKey.Type()
-		textType := strings.Fields(key)[0]
-
-		if parsedType != textType {
-			lastError = fmt.Errorf("parsed SSH key type %s does not match type in text %s", parsedType, textType)
-			continue
-		}
-
-		if !slices.Contains(ValidSSHKeyTypes, parsedType) {
-			lastError = fmt.Errorf("invalid SSH key type: %s", parsedType)
-			continue
-		}
-
-		hasValidPublicKey = true
-	}
-
-	if !hasValidPublicKey {
-		return lastError
-	}
-
-	return nil
-}

internal/utils/ssh_test.go

@@ -1,220 +0,0 @@
-package utils
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestValidateSSHKey(t *testing.T) {
-	tests := []struct {
-		name        string
-		sshKey      string
-		expectError bool
-		errorMsg    string
-	}{
-		{
-			name:        "valid RSA key",
-			sshKey:      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiYUb9Fy2vlPfO+HwubnshimpVrWPoePyvyN+jPC5gWqZSycjMy6Is2vFVn7oQc72bkY0wZalspT5wUOwKtltSoLpL7vcqGL9zHVw4yjYXtPGIRd3zLpU9wdngevnepPQWTX3LvZTZfmOsrGoMDKIG+Lbmiq/STMuWYecIqMp7tUKRGS8vfAmpu6MsrN9/4UTcdWWXYWJQQn+2nCyMz28jYlWRsKtqFK6owrdZWt8WQnPN+9Upcf2ByQje+0NLnpNrnh+yd2ocuVW9wQYKAZXy7IaTfEJwd5m34sLwkqlZTaBBcmWJU+3RfpYXE763cf3rUoPIGQ8eUEBJ8IdM4vhp test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "valid ED25519 key",
-			sshKey:      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBSbM8wuD5ab0nHsXaYOqaD3GLLUwmDzSk79Xi/N+H2j test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "valid ECDSA key",
-			sshKey:      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAlTkxIo4mXBR+gEX0Q74BpYX4bFFHoX+8Uz7tsob8HvsnMvsEE+BW9h9XrbWX4/4ppL/o6sHbvsqNr9HcyKfdc= test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "valid SK-backed ED25519 key",
-			sshKey:      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHHSRVC3qISk/mOorf24au6esimA9Uu1/BkEnVKJ+4bFAAAABHNzaDo= test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "valid SK-backed ECDSA key",
-			sshKey:      "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBL/CFBZksvs+gJODMB9StxnkY6xRKH73npOzJBVb0UEGCPTAhDrvzW1PE5X5GDYXmZw1s7c/nS+GH0LF0OFCpwAAAAAEc3NoOg== test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "multiple valid keys",
-			sshKey:      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiYUb9Fy2vlPfO+HwubnshimpVrWPoePyvyN+jPC5gWqZSycjMy6Is2vFVn7oQc72bkY0wZalspT5wUOwKtltSoLpL7vcqGL9zHVw4yjYXtPGIRd3zLpU9wdngevnepPQWTX3LvZTZfmOsrGoMDKIG+Lbmiq/STMuWYecIqMp7tUKRGS8vfAmpu6MsrN9/4UTcdWWXYWJQQn+2nCyMz28jYlWRsKtqFK6owrdZWt8WQnPN+9Upcf2ByQje+0NLnpNrnh+yd2ocuVW9wQYKAZXy7IaTfEJwd5m34sLwkqlZTaBBcmWJU+3RfpYXE763cf3rUoPIGQ8eUEBJ8IdM4vhp test@example.com\nssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBSbM8wuD5ab0nHsXaYOqaD3GLLUwmDzSk79Xi/N+H2j test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "valid key with comment",
-			sshKey:      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiYUb9Fy2vlPfO+HwubnshimpVrWPoePyvyN+jPC5gWqZSycjMy6Is2vFVn7oQc72bkY0wZalspT5wUOwKtltSoLpL7vcqGL9zHVw4yjYXtPGIRd3zLpU9wdngevnepPQWTX3LvZTZfmOsrGoMDKIG+Lbmiq/STMuWYecIqMp7tUKRGS8vfAmpu6MsrN9/4UTcdWWXYWJQQn+2nCyMz28jYlWRsKtqFK6owrdZWt8WQnPN+9Upcf2ByQje+0NLnpNrnh+yd2ocuVW9wQYKAZXy7IaTfEJwd5m34sLwkqlZTaBBcmWJU+3RfpYXE763cf3rUoPIGQ8eUEBJ8IdM4vhp user@example.com",
-			expectError: false,
-		},
-		{
-			name:        "valid key with options and comment (we don't support options yet)",
-			sshKey:      "command=\"echo hello\" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiYUb9Fy2vlPfO+HwubnshimpVrWPoePyvyN+jPC5gWqZSycjMy6Is2vFVn7oQc72bkY0wZalspT5wUOwKtltSoLpL7vcqGL9zHVw4yjYXtPGIRd3zLpU9wdngevnepPQWTX3LvZTZfmOsrGoMDKIG+Lbmiq/STMuWYecIqMp7tUKRGS8vfAmpu6MsrN9/4UTcdWWXYWJQQn+2nCyMz28jYlWRsKtqFK6owrdZWt8WQnPN+9Upcf2ByQje+0NLnpNrnh+yd2ocuVW9wQYKAZXy7IaTfEJwd5m34sLwkqlZTaBBcmWJU+3RfpYXE763cf3rUoPIGQ8eUEBJ8IdM4vhp user@example.com",
-			expectError: true,
-		},
-		{
-			name:        "empty string",
-			sshKey:      "",
-			expectError: true,
-			errorMsg:    "no valid SSH key found",
-		},
-		{
-			name:        "whitespace only",
-			sshKey:      "   \n\t  \n  ",
-			expectError: true,
-			errorMsg:    "no valid SSH key found",
-		},
-		{
-			name:        "comment only",
-			sshKey:      "# This is a comment\n# Another comment",
-			expectError: true,
-			errorMsg:    "no valid SSH key found",
-		},
-		{
-			name:        "invalid key format",
-			sshKey:      "not-a-valid-ssh-key",
-			expectError: true,
-		},
-		{
-			name:        "invalid key type",
-			sshKey:      "ssh-dss AAAAB3NzaC1kc3MAAACBAOeB...",
-			expectError: true,
-			errorMsg:    "invalid SSH key type: ssh-dss",
-		},
-		{
-			name:        "unsupported key type",
-			sshKey:      "ssh-rsa-cert-v01@openssh.com AAAAB3NzaC1yc2EAAAADAQABAAABgQC7vbqajDhA...",
-			expectError: true,
-			errorMsg:    "invalid SSH key type: ssh-rsa-cert-v01@openssh.com",
-		},
-		{
-			name:        "malformed key data",
-			sshKey:      "ssh-rsa invalid-base64-data",
-			expectError: true,
-		},
-		{
-			name:        "type mismatch",
-			sshKey:      "ssh-rsa AAAAC3NzaC1lZDI1NTE5AAAAIGomKoH...",
-			expectError: true,
-			errorMsg:    "parsed SSH key type ssh-ed25519 does not match type in text ssh-rsa",
-		},
-		{
-			name:        "mixed valid and invalid keys",
-			sshKey:      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiYUb9Fy2vlPfO+HwubnshimpVrWPoePyvyN+jPC5gWqZSycjMy6Is2vFVn7oQc72bkY0wZalspT5wUOwKtltSoLpL7vcqGL9zHVw4yjYXtPGIRd3zLpU9wdngevnepPQWTX3LvZTZfmOsrGoMDKIG+Lbmiq/STMuWYecIqMp7tUKRGS8vfAmpu6MsrN9/4UTcdWWXYWJQQn+2nCyMz28jYlWRsKtqFK6owrdZWt8WQnPN+9Upcf2ByQje+0NLnpNrnh+yd2ocuVW9wQYKAZXy7IaTfEJwd5m34sLwkqlZTaBBcmWJU+3RfpYXE763cf3rUoPIGQ8eUEBJ8IdM4vhp test@example.com\ninvalid-key\nssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBSbM8wuD5ab0nHsXaYOqaD3GLLUwmDzSk79Xi/N+H2j test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "valid key with empty lines and comments",
-			sshKey:      "# Comment line\n\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiYUb9Fy2vlPfO+HwubnshimpVrWPoePyvyN+jPC5gWqZSycjMy6Is2vFVn7oQc72bkY0wZalspT5wUOwKtltSoLpL7vcqGL9zHVw4yjYXtPGIRd3zLpU9wdngevnepPQWTX3LvZTZfmOsrGoMDKIG+Lbmiq/STMuWYecIqMp7tUKRGS8vfAmpu6MsrN9/4UTcdWWXYWJQQn+2nCyMz28jYlWRsKtqFK6owrdZWt8WQnPN+9Upcf2ByQje+0NLnpNrnh+yd2ocuVW9wQYKAZXy7IaTfEJwd5m34sLwkqlZTaBBcmWJU+3RfpYXE763cf3rUoPIGQ8eUEBJ8IdM4vhp test@example.com\n# Another comment\n\t\n",
-			expectError: false,
-		},
-		{
-			name:        "all invalid keys",
-			sshKey:      "invalid-key-1\ninvalid-key-2\nssh-dss AAAAB3NzaC1kc3MAAACBAOeB...",
-			expectError: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := ValidateSSHKey(tt.sshKey)
-
-			if tt.expectError {
-				if err == nil {
-					t.Errorf("ValidateSSHKey() expected error but got none")
-				} else if tt.errorMsg != "" && !strings.ContainsAny(err.Error(), tt.errorMsg) {
-					t.Errorf("ValidateSSHKey() error = %v, expected to contain %v", err, tt.errorMsg)
-				}
-			} else {
-				if err != nil {
-					t.Errorf("ValidateSSHKey() unexpected error = %v", err)
-				}
-			}
-		})
-	}
-}
-
-func TestValidSSHKeyTypes(t *testing.T) {
-	expectedTypes := []string{
-		"ssh-rsa",
-		"ssh-ed25519",
-		"ecdsa-sha2-nistp256",
-		"ecdsa-sha2-nistp384",
-		"ecdsa-sha2-nistp521",
-		"sk-ecdsa-sha2-nistp256@openssh.com",
-		"sk-ssh-ed25519@openssh.com",
-	}
-
-	if len(ValidSSHKeyTypes) != len(expectedTypes) {
-		t.Errorf("ValidSSHKeyTypes length = %d, expected %d", len(ValidSSHKeyTypes), len(expectedTypes))
-	}
-
-	for _, expectedType := range expectedTypes {
-		found := false
-		for _, actualType := range ValidSSHKeyTypes {
-			if actualType == expectedType {
-				found = true
-				break
-			}
-		}
-		if !found {
-			t.Errorf("ValidSSHKeyTypes missing expected type: %s", expectedType)
-		}
-	}
-}
-
-// TestValidateSSHKeyEdgeCases tests edge cases and boundary conditions
-func TestValidateSSHKeyEdgeCases(t *testing.T) {
-	tests := []struct {
-		name        string
-		sshKey      string
-		expectError bool
-	}{
-		{
-			name:        "key with only type",
-			sshKey:      "ssh-rsa",
-			expectError: true,
-		},
-		{
-			name:        "key with type and empty data",
-			sshKey:      "ssh-rsa ",
-			expectError: true,
-		},
-		{
-			name:        "key with type and whitespace data",
-			sshKey:      "ssh-rsa   \t  ",
-			expectError: true,
-		},
-		{
-			name:        "key with multiple spaces between type and data",
-			sshKey:      "ssh-rsa    AAAAB3NzaC1yc2EAAAADAQABAAABAQDiYUb9Fy2vlPfO+HwubnshimpVrWPoePyvyN+jPC5gWqZSycjMy6Is2vFVn7oQc72bkY0wZalspT5wUOwKtltSoLpL7vcqGL9zHVw4yjYXtPGIRd3zLpU9wdngevnepPQWTX3LvZTZfmOsrGoMDKIG+Lbmiq/STMuWYecIqMp7tUKRGS8vfAmpu6MsrN9/4UTcdWWXYWJQQn+2nCyMz28jYlWRsKtqFK6owrdZWt8WQnPN+9Upcf2ByQje+0NLnpNrnh+yd2ocuVW9wQYKAZXy7IaTfEJwd5m34sLwkqlZTaBBcmWJU+3RfpYXE763cf3rUoPIGQ8eUEBJ8IdM4vhp test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "key with tabs",
-			sshKey:      "\tssh-rsa\tAAAAB3NzaC1yc2EAAAADAQABAAABAQDiYUb9Fy2vlPfO+HwubnshimpVrWPoePyvyN+jPC5gWqZSycjMy6Is2vFVn7oQc72bkY0wZalspT5wUOwKtltSoLpL7vcqGL9zHVw4yjYXtPGIRd3zLpU9wdngevnepPQWTX3LvZTZfmOsrGoMDKIG+Lbmiq/STMuWYecIqMp7tUKRGS8vfAmpu6MsrN9/4UTcdWWXYWJQQn+2nCyMz28jYlWRsKtqFK6owrdZWt8WQnPN+9Upcf2ByQje+0NLnpNrnh+yd2ocuVW9wQYKAZXy7IaTfEJwd5m34sLwkqlZTaBBcmWJU+3RfpYXE763cf3rUoPIGQ8eUEBJ8IdM4vhp test@example.com",
-			expectError: false,
-		},
-		{
-			name:        "very long line",
-			sshKey:      "ssh-rsa " + string(make([]byte, 10000)),
-			expectError: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := ValidateSSHKey(tt.sshKey)
-
-			if tt.expectError {
-				if err == nil {
-					t.Errorf("ValidateSSHKey() expected error but got none")
-				}
-			} else {
-				if err != nil {
-					t.Errorf("ValidateSSHKey() unexpected error = %v", err)
-				}
-			}
-		})
-	}
-}

jiggler.go

@@ -1,160 +1,39 @@
 package kvm
 
 import (
-	"fmt"
-	"math/rand"
 	"time"
-	_ "time/tzdata"
-
-	"github.com/go-co-op/gocron/v2"
-	"github.com/jetkvm/kvm/internal/tzdata"
 )
 
-type JigglerConfig struct {
+var lastUserInput = time.Now()
-	InactivityLimitSeconds int    `json:"inactivity_limit_seconds"`
+
-	JitterPercentage       int    `json:"jitter_percentage"`
+var jigglerEnabled = false
-	ScheduleCronTab        string `json:"schedule_cron_tab"`
+
-	Timezone               string `json:"timezone,omitempty"`
+func rpcSetJigglerState(enabled bool) {
+	jigglerEnabled = enabled
 }
-
-var jobDelta time.Duration = 0
-var scheduler gocron.Scheduler = nil
-
-func rpcSetJigglerState(enabled bool) error {
-	config.JigglerEnabled = enabled
-	err := SaveConfig()
-	if err != nil {
-		return fmt.Errorf("failed to save config: %w", err)
-	}
-	return nil
-}
-
 func rpcGetJigglerState() bool {
-	return config.JigglerEnabled
+	return jigglerEnabled
-}
-
-func rpcGetTimezones() []string {
-	return tzdata.TimeZones
-}
-
-func rpcGetJigglerConfig() (JigglerConfig, error) {
-	return *config.JigglerConfig, nil
-}
-
-func rpcSetJigglerConfig(jigglerConfig JigglerConfig) error {
-	logger.Info().Msgf("jigglerConfig: %v, %v, %v, %v", jigglerConfig.InactivityLimitSeconds, jigglerConfig.JitterPercentage, jigglerConfig.ScheduleCronTab, jigglerConfig.Timezone)
-	config.JigglerConfig = &jigglerConfig
-	err := removeExistingCrobJobs(scheduler)
-	if err != nil {
-		return fmt.Errorf("error removing cron jobs from scheduler %v", err)
-	}
-	err = runJigglerCronTab()
-	if err != nil {
-		return fmt.Errorf("error scheduling jiggler crontab: %v", err)
-	}
-	err = SaveConfig()
-	if err != nil {
-		return fmt.Errorf("failed to save config: %w", err)
-	}
-	return nil
-}
-
-func removeExistingCrobJobs(s gocron.Scheduler) error {
-	for _, j := range s.Jobs() {
-		err := s.RemoveJob(j.ID())
-		if err != nil {
-			return err
-		}
-	}
-	return nil
 }
 
 func initJiggler() {
-	ensureConfigLoaded()
+	go runJiggler()
-	err := runJigglerCronTab()
-	if err != nil {
-		logger.Error().Msgf("Error scheduling jiggler crontab: %v", err)
-		return
-	}
-}
-
-func runJigglerCronTab() error {
-	cronTab := config.JigglerConfig.ScheduleCronTab
-
-	// Apply timezone if specified and valid
-	if config.JigglerConfig.Timezone != "" && config.JigglerConfig.Timezone != "UTC" {
-		// Validate timezone before applying
-		if _, err := time.LoadLocation(config.JigglerConfig.Timezone); err != nil {
-			logger.Warn().Msgf("Invalid timezone '%s', falling back to UTC: %v", config.JigglerConfig.Timezone, err)
-			// Don't add TZ prefix, let it run in UTC
-		} else {
-			cronTab = fmt.Sprintf("TZ=%s %s", config.JigglerConfig.Timezone, cronTab)
-		}
-	}
-
-	s, err := gocron.NewScheduler()
-	if err != nil {
-		return err
-	}
-	scheduler = s
-	_, err = s.NewJob(
-		gocron.CronJob(
-			cronTab,
-			true,
-		),
-		gocron.NewTask(
-			func() {
-				runJiggler()
-			},
-		),
-	)
-	if err != nil {
-		return err
-	}
-	s.Start()
-	delta, err := calculateJobDelta(s)
-	jobDelta = delta
-	logger.Info().Msgf("Time between jiggler runs: %v", jobDelta)
-	if err != nil {
-		return err
-	}
-	return nil
 }
 
 func runJiggler() {
-	if config.JigglerEnabled {
+	for {
-		if config.JigglerConfig.JitterPercentage != 0 {
+		if jigglerEnabled {
-			jitter := calculateJitterDuration(jobDelta)
+			if time.Since(lastUserInput) > 20*time.Second {
-			time.Sleep(jitter)
+				//TODO: change to rel mouse
-		}
+				err := rpcAbsMouseReport(1, 1, 0)
-		inactivitySeconds := config.JigglerConfig.InactivityLimitSeconds
+				if err != nil {
-		timeSinceLastInput := time.Since(gadget.GetLastUserInputTime())
+					logger.Warn().Err(err).Msg("Failed to jiggle mouse")
-		logger.Debug().Msgf("Time since last user input %v", timeSinceLastInput)
+				}
-		if timeSinceLastInput > time.Duration(inactivitySeconds)*time.Second {
+				err = rpcAbsMouseReport(0, 0, 0)
-			logger.Debug().Msg("Jiggling mouse...")
+				if err != nil {
-			//TODO: change to rel mouse
+					logger.Warn().Err(err).Msg("Failed to reset mouse position")
-			err := rpcAbsMouseReport(1, 1, 0)
+				}
-			if err != nil {
-				logger.Warn().Msgf("Failed to jiggle mouse: %v", err)
-			}
-			err = rpcAbsMouseReport(0, 0, 0)
-			if err != nil {
-				logger.Warn().Msgf("Failed to reset mouse position: %v", err)
 			}
 		}
+		time.Sleep(20 * time.Second)
 	}
 }
-
-func calculateJobDelta(s gocron.Scheduler) (time.Duration, error) {
-	j := s.Jobs()[0]
-	runs, err := j.NextRuns(2)
-	if err != nil {
-		return 0.0, err
-	}
-	return runs[1].Sub(runs[0]), nil
-}
-
-func calculateJitterDuration(delta time.Duration) time.Duration {
-	jitter := rand.Float64() * float64(config.JigglerConfig.JitterPercentage) / 100 * delta.Seconds()
-	return time.Duration(jitter * float64(time.Second))
-}

jsonrpc.go

@@ -1,7 +1,6 @@
 package kvm
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -11,36 +10,32 @@ import (
 	"path/filepath"
 	"reflect"
 	"strconv"
-	"sync"
 	"time"
 
 	"github.com/pion/webrtc/v4"
-	"github.com/rs/zerolog"
 	"go.bug.st/serial"
 
-	"github.com/jetkvm/kvm/internal/hidrpc"
 	"github.com/jetkvm/kvm/internal/usbgadget"
-	"github.com/jetkvm/kvm/internal/utils"
 )
 
 type JSONRPCRequest struct {
-	JSONRPC string         `json:"jsonrpc"`
+	JSONRPC string                 `json:"jsonrpc"`
-	Method  string         `json:"method"`
+	Method  string                 `json:"method"`
-	Params  map[string]any `json:"params,omitempty"`
+	Params  map[string]interface{} `json:"params,omitempty"`
-	ID      any            `json:"id,omitempty"`
+	ID      interface{}            `json:"id,omitempty"`
 }
 
 type JSONRPCResponse struct {
-	JSONRPC string `json:"jsonrpc"`
+	JSONRPC string      `json:"jsonrpc"`
-	Result  any    `json:"result,omitempty"`
+	Result  interface{} `json:"result,omitempty"`
-	Error   any    `json:"error,omitempty"`
+	Error   interface{} `json:"error,omitempty"`
-	ID      any    `json:"id"`
+	ID      interface{} `json:"id"`
 }
 
 type JSONRPCEvent struct {
-	JSONRPC string `json:"jsonrpc"`
+	JSONRPC string      `json:"jsonrpc"`
-	Method  string `json:"method"`
+	Method  string      `json:"method"`
-	Params  any    `json:"params,omitempty"`
+	Params  interface{} `json:"params,omitempty"`
 }
 
 type DisplayRotationSettings struct {
@@ -66,7 +61,7 @@ func writeJSONRPCResponse(response JSONRPCResponse, session *Session) {
 	}
 }
 
-func writeJSONRPCEvent(event string, params any, session *Session) {
+func writeJSONRPCEvent(event string, params interface{}, session *Session) {
 	request := JSONRPCEvent{
 		JSONRPC: "2.0",
 		Method:  event,
@@ -87,7 +82,7 @@ func writeJSONRPCEvent(event string, params any, session *Session) {
 		Str("data", requestString).
 		Logger()
 
-	scopedLogger.Trace().Msg("sending JSONRPC event")
+	scopedLogger.Info().Msg("sending JSONRPC event")
 
 	err = session.RPCChannel.SendText(requestString)
 	if err != nil {
@@ -107,7 +102,7 @@ func onRPCMessage(message webrtc.DataChannelMessage, session *Session) {
 
 		errorResponse := JSONRPCResponse{
 			JSONRPC: "2.0",
-			Error: map[string]any{
+			Error: map[string]interface{}{
 				"code":    -32700,
 				"message": "Parse error",
 			},
@@ -128,7 +123,7 @@ func onRPCMessage(message webrtc.DataChannelMessage, session *Session) {
 	if !ok {
 		errorResponse := JSONRPCResponse{
 			JSONRPC: "2.0",
-			Error: map[string]any{
+			Error: map[string]interface{}{
 				"code":    -32601,
 				"message": "Method not found",
 			},
@@ -138,12 +133,13 @@ func onRPCMessage(message webrtc.DataChannelMessage, session *Session) {
 		return
 	}
 
-	result, err := callRPCHandler(scopedLogger, handler, request.Params)
+	scopedLogger.Trace().Msg("Calling RPC handler")
+	result, err := callRPCHandler(handler, request.Params)
 	if err != nil {
 		scopedLogger.Error().Err(err).Msg("Error calling RPC handler")
 		errorResponse := JSONRPCResponse{
 			JSONRPC: "2.0",
-			Error: map[string]any{
+			Error: map[string]interface{}{
 				"code":    -32603,
 				"message": "Internal error",
 				"data":    err.Error(),
@@ -204,7 +200,7 @@ func rpcGetStreamQualityFactor() (float64, error) {
 
 func rpcSetStreamQualityFactor(factor float64) error {
 	logger.Info().Float64("factor", factor).Msg("Setting stream quality factor")
-	var _, err = CallCtrlAction("set_video_quality_factor", map[string]any{"quality_factor": factor})
+	var _, err = CallCtrlAction("set_video_quality_factor", map[string]interface{}{"quality_factor": factor})
 	if err != nil {
 		return err
 	}
@@ -244,7 +240,7 @@ func rpcSetEDID(edid string) error {
 	} else {
 		logger.Info().Str("edid", edid).Msg("Setting EDID")
 	}
-	_, err := CallCtrlAction("set_edid", map[string]any{"edid": edid})
+	_, err := CallCtrlAction("set_edid", map[string]interface{}{"edid": edid})
 	if err != nil {
 		return err
 	}
@@ -282,17 +278,6 @@ func rpcGetUpdateStatus() (*UpdateStatus, error) {
 	return updateStatus, nil
 }
 
-func rpcGetLocalVersion() (*LocalMetadata, error) {
-	systemVersion, appVersion, err := GetLocalVersion()
-	if err != nil {
-		return nil, fmt.Errorf("error getting local version: %w", err)
-	}
-	return &LocalMetadata{
-		AppVersion:    appVersion.String(),
-		SystemVersion: systemVersion.String(),
-	}, nil
-}
-
 func rpcTryUpdate() error {
 	includePreRelease := config.IncludePreRelease
 	go func() {
@@ -444,27 +429,21 @@ func rpcGetSSHKeyState() (string, error) {
 }
 
 func rpcSetSSHKeyState(sshKey string) error {
-	if sshKey == "" {
+	if sshKey != "" {
+		// Create directory if it doesn't exist
+		if err := os.MkdirAll(sshKeyDir, 0700); err != nil {
+			return fmt.Errorf("failed to create SSH key directory: %w", err)
+		}
+
+		// Write SSH key to file
+		if err := os.WriteFile(sshKeyFile, []byte(sshKey), 0600); err != nil {
+			return fmt.Errorf("failed to write SSH key: %w", err)
+		}
+	} else {
 		// Remove SSH key file if empty string is provided
 		if err := os.Remove(sshKeyFile); err != nil && !os.IsNotExist(err) {
 			return fmt.Errorf("failed to remove SSH key file: %w", err)
 		}
-		return nil
-	}
-
-	// Validate SSH key
-	if err := utils.ValidateSSHKey(sshKey); err != nil {
-		return err
-	}
-
-	// Create directory if it doesn't exist
-	if err := os.MkdirAll(sshKeyDir, 0700); err != nil {
-		return fmt.Errorf("failed to create SSH key directory: %w", err)
-	}
-
-	// Write SSH key to file
-	if err := os.WriteFile(sshKeyFile, []byte(sshKey), 0600); err != nil {
-		return fmt.Errorf("failed to write SSH key: %w", err)
 	}
 
 	return nil
@@ -488,12 +467,12 @@ func rpcSetTLSState(state TLSState) error {
 }
 
 type RPCHandler struct {
-	Func   any
+	Func   interface{}
 	Params []string
 }
 
 // call the handler but recover from a panic to ensure our RPC thread doesn't collapse on malformed calls
-func callRPCHandler(logger zerolog.Logger, handler RPCHandler, params map[string]any) (result any, err error) {
+func callRPCHandler(handler RPCHandler, params map[string]interface{}) (result interface{}, err error) {
 	// Use defer to recover from a panic
 	defer func() {
 		if r := recover(); r != nil {
@@ -507,11 +486,11 @@ func callRPCHandler(logger zerolog.Logger, handler RPCHandler, params map[string
 	}()
 
 	// Call the handler
-	result, err = riskyCallRPCHandler(logger, handler, params)
+	result, err = riskyCallRPCHandler(handler, params)
-	return result, err // do not combine these two lines into one, as it breaks the above defer function's setting of err
+	return result, err
 }
 
-func riskyCallRPCHandler(logger zerolog.Logger, handler RPCHandler, params map[string]any) (any, error) {
+func riskyCallRPCHandler(handler RPCHandler, params map[string]interface{}) (interface{}, error) {
 	handlerValue := reflect.ValueOf(handler.Func)
 	handlerType := handlerValue.Type()
 
@@ -520,24 +499,20 @@ func riskyCallRPCHandler(logger zerolog.Logger, handler RPCHandler, params map[s
 	}
 
 	numParams := handlerType.NumIn()
-	paramNames := handler.Params // Get the parameter names from the RPCHandler
+	args := make([]reflect.Value, numParams)
+	// Get the parameter names from the RPCHandler
+	paramNames := handler.Params
 
 	if len(paramNames) != numParams {
-		err := fmt.Errorf("mismatch between handler parameters (%d) and defined parameter names (%d)", numParams, len(paramNames))
+		return nil, errors.New("mismatch between handler parameters and defined parameter names")
-		logger.Error().Strs("paramNames", paramNames).Err(err).Msg("Cannot call RPC handler")
-		return nil, err
 	}
 
-	args := make([]reflect.Value, numParams)
+	for i := 0; i < numParams; i++ {
-
-	for i := range numParams {
 		paramType := handlerType.In(i)
 		paramName := paramNames[i]
 		paramValue, ok := params[paramName]
 		if !ok {
-			err := fmt.Errorf("missing parameter: %s", paramName)
+			return nil, errors.New("missing parameter: " + paramName)
-			logger.Error().Err(err).Msg("Cannot marshal arguments for RPC handler")
-			return nil, err
 		}
 
 		convertedValue := reflect.ValueOf(paramValue)
@@ -554,7 +529,7 @@ func riskyCallRPCHandler(logger zerolog.Logger, handler RPCHandler, params map[s
 						if elemValue.Kind() == reflect.Float64 && paramType.Elem().Kind() == reflect.Uint8 {
 							intValue := int(elemValue.Float())
 							if intValue < 0 || intValue > 255 {
-								return nil, fmt.Errorf("value out of range for uint8: %v for parameter %s", intValue, paramName)
+								return nil, fmt.Errorf("value out of range for uint8: %v", intValue)
 							}
 							newSlice.Index(j).SetUint(uint64(intValue))
 						} else {
@@ -570,12 +545,12 @@ func riskyCallRPCHandler(logger zerolog.Logger, handler RPCHandler, params map[s
 			} else if paramType.Kind() == reflect.Struct && convertedValue.Kind() == reflect.Map {
 				jsonData, err := json.Marshal(convertedValue.Interface())
 				if err != nil {
-					return nil, fmt.Errorf("failed to marshal map to JSON: %v for parameter %s", err, paramName)
+					return nil, fmt.Errorf("failed to marshal map to JSON: %v", err)
 				}
 
 				newStruct := reflect.New(paramType).Interface()
 				if err := json.Unmarshal(jsonData, newStruct); err != nil {
-					return nil, fmt.Errorf("failed to unmarshal JSON into struct: %v for parameter %s", err, paramName)
+					return nil, fmt.Errorf("failed to unmarshal JSON into struct: %v", err)
 				}
 				args[i] = reflect.ValueOf(newStruct).Elem()
 			} else {
@@ -586,7 +561,6 @@ func riskyCallRPCHandler(logger zerolog.Logger, handler RPCHandler, params map[s
 		}
 	}
 
-	logger.Trace().Msg("Calling RPC handler")
 	results := handlerValue.Call(args)
 
 	if len(results) == 0 {
@@ -594,32 +568,23 @@ func riskyCallRPCHandler(logger zerolog.Logger, handler RPCHandler, params map[s
 	}
 
 	if len(results) == 1 {
-		if ok, err := asError(results[0]); ok {
+		if results[0].Type().Implements(reflect.TypeOf((*error)(nil)).Elem()) {
-			return nil, err
+			if !results[0].IsNil() {
-		}
+				return nil, results[0].Interface().(error)
-		return results[0].Interface(), nil
-	}
-
-	if len(results) == 2 {
-		if ok, err := asError(results[1]); ok {
-			if err != nil {
-				return nil, err
 			}
+			return nil, nil
 		}
 		return results[0].Interface(), nil
 	}
 
-	return nil, fmt.Errorf("too many return values from handler: %d", len(results))
+	if len(results) == 2 && results[1].Type().Implements(reflect.TypeOf((*error)(nil)).Elem()) {
-}
+		if !results[1].IsNil() {
-
+			return nil, results[1].Interface().(error)
-func asError(value reflect.Value) (bool, error) {
-	if value.Type().Implements(reflect.TypeOf((*error)(nil)).Elem()) {
-		if value.IsNil() {
-			return true, nil
 		}
-		return true, value.Interface().(error)
+		return results[0].Interface(), nil
 	}
-	return false, nil
+
+	return nil, errors.New("unexpected return values from handler")
 }
 
 func rpcSetMassStorageMode(mode string) (string, error) {
@@ -716,11 +681,10 @@ func rpcResetConfig() error {
 }
 
 type DCPowerState struct {
-	IsOn         bool    `json:"isOn"`
+	IsOn    bool    `json:"isOn"`
-	Voltage      float64 `json:"voltage"`
+	Voltage float64 `json:"voltage"`
-	Current      float64 `json:"current"`
+	Current float64 `json:"current"`
-	Power        float64 `json:"power"`
+	Power   float64 `json:"power"`
-	RestoreState int     `json:"restoreState"`
 }
 
 func rpcGetDCPowerState() (DCPowerState, error) {
@@ -736,15 +700,6 @@ func rpcSetDCPowerState(enabled bool) error {
 	return nil
 }
 
-func rpcSetDCRestoreState(state int) error {
-	logger.Info().Int("state", state).Msg("Setting DC restore state")
-	err := setDCRestoreState(state)
-	if err != nil {
-		return fmt.Errorf("failed to set DC restore state: %w", err)
-	}
-	return nil
-}
-
 func rpcGetActiveExtension() (string, error) {
 	return config.ActiveExtension, nil
 }
@@ -958,7 +913,7 @@ func rpcSetKeyboardLayout(layout string) error {
 	return nil
 }
 
-func getKeyboardMacros() (any, error) {
+func getKeyboardMacros() (interface{}, error) {
 	macros := make([]KeyboardMacro, len(config.KeyboardMacros))
 	copy(macros, config.KeyboardMacros)
 
@@ -966,10 +921,10 @@ func getKeyboardMacros() (any, error) {
 }
 
 type KeyboardMacrosParams struct {
-	Macros []any `json:"macros"`
+	Macros []interface{} `json:"macros"`
 }
 
-func setKeyboardMacros(params KeyboardMacrosParams) (any, error) {
+func setKeyboardMacros(params KeyboardMacrosParams) (interface{}, error) {
 	if params.Macros == nil {
 		return nil, fmt.Errorf("missing or invalid macros parameter")
 	}
@@ -977,7 +932,7 @@ func setKeyboardMacros(params KeyboardMacrosParams) (any, error) {
 	newMacros := make([]KeyboardMacro, 0, len(params.Macros))
 
 	for i, item := range params.Macros {
-		macroMap, ok := item.(map[string]any)
+		macroMap, ok := item.(map[string]interface{})
 		if !ok {
 			return nil, fmt.Errorf("invalid macro at index %d", i)
 		}
@@ -995,16 +950,16 @@ func setKeyboardMacros(params KeyboardMacrosParams) (any, error) {
 		}
 
 		steps := []KeyboardMacroStep{}
-		if stepsArray, ok := macroMap["steps"].([]any); ok {
+		if stepsArray, ok := macroMap["steps"].([]interface{}); ok {
 			for _, stepItem := range stepsArray {
-				stepMap, ok := stepItem.(map[string]any)
+				stepMap, ok := stepItem.(map[string]interface{})
 				if !ok {
 					continue
 				}
 
 				step := KeyboardMacroStep{}
 
-				if keysArray, ok := stepMap["keys"].([]any); ok {
+				if keysArray, ok := stepMap["keys"].([]interface{}); ok {
 					for _, k := range keysArray {
 						if keyStr, ok := k.(string); ok {
 							step.Keys = append(step.Keys, keyStr)
@@ -1012,7 +967,7 @@ func setKeyboardMacros(params KeyboardMacrosParams) (any, error) {
 					}
 				}
 
-				if modsArray, ok := stepMap["modifiers"].([]any); ok {
+				if modsArray, ok := stepMap["modifiers"].([]interface{}); ok {
 					for _, m := range modsArray {
 						if modStr, ok := m.(string); ok {
 							step.Modifiers = append(step.Modifiers, modStr)
@@ -1070,103 +1025,6 @@ func rpcSetLocalLoopbackOnly(enabled bool) error {
 	return nil
 }
 
-var (
-	keyboardMacroCancel context.CancelFunc
-	keyboardMacroLock   sync.Mutex
-)
-
-// cancelKeyboardMacro cancels any ongoing keyboard macro execution
-func cancelKeyboardMacro() {
-	keyboardMacroLock.Lock()
-	defer keyboardMacroLock.Unlock()
-
-	if keyboardMacroCancel != nil {
-		keyboardMacroCancel()
-		logger.Info().Msg("canceled keyboard macro")
-		keyboardMacroCancel = nil
-	}
-}
-
-func setKeyboardMacroCancel(cancel context.CancelFunc) {
-	keyboardMacroLock.Lock()
-	defer keyboardMacroLock.Unlock()
-
-	keyboardMacroCancel = cancel
-}
-
-func rpcExecuteKeyboardMacro(macro []hidrpc.KeyboardMacroStep) error {
-	cancelKeyboardMacro()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	setKeyboardMacroCancel(cancel)
-
-	s := hidrpc.KeyboardMacroState{
-		State:   true,
-		IsPaste: true,
-	}
-
-	if currentSession != nil {
-		currentSession.reportHidRPCKeyboardMacroState(s)
-	}
-
-	err := rpcDoExecuteKeyboardMacro(ctx, macro)
-
-	setKeyboardMacroCancel(nil)
-
-	s.State = false
-	if currentSession != nil {
-		currentSession.reportHidRPCKeyboardMacroState(s)
-	}
-
-	return err
-}
-
-func rpcCancelKeyboardMacro() {
-	cancelKeyboardMacro()
-}
-
-var keyboardClearStateKeys = make([]byte, hidrpc.HidKeyBufferSize)
-
-func isClearKeyStep(step hidrpc.KeyboardMacroStep) bool {
-	return step.Modifier == 0 && bytes.Equal(step.Keys, keyboardClearStateKeys)
-}
-
-func rpcDoExecuteKeyboardMacro(ctx context.Context, macro []hidrpc.KeyboardMacroStep) error {
-	logger.Debug().Interface("macro", macro).Msg("Executing keyboard macro")
-
-	for i, step := range macro {
-		delay := time.Duration(step.Delay) * time.Millisecond
-
-		err := rpcKeyboardReport(step.Modifier, step.Keys)
-		if err != nil {
-			logger.Warn().Err(err).Msg("failed to execute keyboard macro")
-			return err
-		}
-
-		// notify the device that the keyboard state is being cleared
-		if isClearKeyStep(step) {
-			gadget.UpdateKeysDown(0, keyboardClearStateKeys)
-		}
-
-		// Use context-aware sleep that can be cancelled
-		select {
-		case <-time.After(delay):
-			// Sleep completed normally
-		case <-ctx.Done():
-			// make sure keyboard state is reset
-			err := rpcKeyboardReport(0, keyboardClearStateKeys)
-			if err != nil {
-				logger.Warn().Err(err).Msg("failed to reset keyboard state")
-			}
-
-			logger.Debug().Int("step", i).Msg("Keyboard macro cancelled during sleep")
-			return ctx.Err()
-		}
-	}
-
-	return nil
-}
-
 var rpcHandlers = map[string]RPCHandler{
 	"ping":                   {Func: rpcPing},
 	"reboot":                 {Func: rpcReboot, Params: []string{"force"}},
@@ -1177,10 +1035,8 @@ var rpcHandlers = map[string]RPCHandler{
 	"getNetworkSettings":     {Func: rpcGetNetworkSettings},
 	"setNetworkSettings":     {Func: rpcSetNetworkSettings, Params: []string{"settings"}},
 	"renewDHCPLease":         {Func: rpcRenewDHCPLease},
-	"getKeyboardLedState":    {Func: rpcGetKeyboardLedState},
-	"getKeyDownState":        {Func: rpcGetKeysDownState},
 	"keyboardReport":         {Func: rpcKeyboardReport, Params: []string{"modifier", "keys"}},
-	"keypressReport":         {Func: rpcKeypressReport, Params: []string{"key", "press"}},
+	"getKeyboardLedState":    {Func: rpcGetKeyboardLedState},
 	"absMouseReport":         {Func: rpcAbsMouseReport, Params: []string{"x", "y", "buttons"}},
 	"relMouseReport":         {Func: rpcRelMouseReport, Params: []string{"dx", "dy", "buttons"}},
 	"wheelReport":            {Func: rpcWheelReport, Params: []string{"wheelY"}},
@@ -1190,9 +1046,6 @@ var rpcHandlers = map[string]RPCHandler{
 	"rpcMountBuiltInImage":   {Func: rpcMountBuiltInImage, Params: []string{"filename"}},
 	"setJigglerState":        {Func: rpcSetJigglerState, Params: []string{"enabled"}},
 	"getJigglerState":        {Func: rpcGetJigglerState},
-	"setJigglerConfig":       {Func: rpcSetJigglerConfig, Params: []string{"jigglerConfig"}},
-	"getJigglerConfig":       {Func: rpcGetJigglerConfig},
-	"getTimezones":           {Func: rpcGetTimezones},
 	"sendWOLMagicPacket":     {Func: rpcSendWOLMagicPacket, Params: []string{"macAddress"}},
 	"getStreamQualityFactor": {Func: rpcGetStreamQualityFactor},
 	"setStreamQualityFactor": {Func: rpcSetStreamQualityFactor, Params: []string{"factor"}},
@@ -1202,7 +1055,6 @@ var rpcHandlers = map[string]RPCHandler{
 	"setEDID":                {Func: rpcSetEDID, Params: []string{"edid"}},
 	"getDevChannelState":     {Func: rpcGetDevChannelState},
 	"setDevChannelState":     {Func: rpcSetDevChannelState, Params: []string{"enabled"}},
-	"getLocalVersion":        {Func: rpcGetLocalVersion},
 	"getUpdateStatus":        {Func: rpcGetUpdateStatus},
 	"tryUpdate":              {Func: rpcTryUpdate},
 	"getDevModeState":        {Func: rpcGetDevModeState},
@@ -1222,6 +1074,7 @@ var rpcHandlers = map[string]RPCHandler{
 	"getVirtualMediaState":   {Func: rpcGetVirtualMediaState},
 	"getStorageSpace":        {Func: rpcGetStorageSpace},
 	"mountWithHTTP":          {Func: rpcMountWithHTTP, Params: []string{"url", "mode"}},
+	"mountWithWebRTC":        {Func: rpcMountWithWebRTC, Params: []string{"filename", "size", "mode"}},
 	"mountWithStorage":       {Func: rpcMountWithStorage, Params: []string{"filename", "mode"}},
 	"listStorageFiles":       {Func: rpcListStorageFiles},
 	"deleteStorageFile":      {Func: rpcDeleteStorageFile, Params: []string{"filename"}},
@@ -1235,7 +1088,6 @@ var rpcHandlers = map[string]RPCHandler{
 	"getBacklightSettings":   {Func: rpcGetBacklightSettings},
 	"getDCPowerState":        {Func: rpcGetDCPowerState},
 	"setDCPowerState":        {Func: rpcSetDCPowerState, Params: []string{"enabled"}},
-	"setDCRestoreState":      {Func: rpcSetDCRestoreState, Params: []string{"state"}},
 	"getActiveExtension":     {Func: rpcGetActiveExtension},
 	"setActiveExtension":     {Func: rpcSetActiveExtension, Params: []string{"extensionId"}},
 	"getATXState":            {Func: rpcGetATXState},

log.go

@@ -5,7 +5,7 @@ import (
 	"github.com/rs/zerolog"
 )
 
-func ErrorfL(l *zerolog.Logger, format string, err error, args ...any) error {
+func ErrorfL(l *zerolog.Logger, format string, err error, args ...interface{}) error {
 	return logging.ErrorfL(l, format, err, args...)
 }
 
@@ -19,7 +19,6 @@ var (
 	nbdLogger       = logging.GetSubsystemLogger("nbd")
 	timesyncLogger  = logging.GetSubsystemLogger("timesync")
 	jsonRpcLogger   = logging.GetSubsystemLogger("jsonrpc")
-	hidRPCLogger    = logging.GetSubsystemLogger("hidrpc")
 	watchdogLogger  = logging.GetSubsystemLogger("watchdog")
 	websecureLogger = logging.GetSubsystemLogger("websecure")
 	otaLogger       = logging.GetSubsystemLogger("ota")

main.go

@@ -96,25 +96,16 @@ func Main() {
 			if !config.AutoUpdateEnabled {
 				return
 			}
-
-			if isTimeSyncNeeded() || !timeSync.IsSyncSuccess() {
-				logger.Debug().Msg("system time is not synced, will retry in 30 seconds")
-				time.Sleep(30 * time.Second)
-				continue
-			}
-
 			if currentSession != nil {
 				logger.Debug().Msg("skipping update since a session is active")
 				time.Sleep(1 * time.Minute)
 				continue
 			}
-
 			includePreRelease := config.IncludePreRelease
 			err = TryUpdate(context.Background(), GetDeviceID(), includePreRelease)
 			if err != nil {
 				logger.Warn().Err(err).Msg("failed to auto update")
 			}
-
 			time.Sleep(1 * time.Hour)
 		}
 	}()

mdns.go

@@ -13,7 +13,10 @@ func initMdns() error {
 			networkState.GetHostname(),
 			networkState.GetFQDN(),
 		},
-		ListenOptions: config.NetworkConfig.GetMDNSMode(),
+		ListenOptions: &mdns.MDNSListenOptions{
+			IPv4: true,
+			IPv6: true,
+		},
 	})
 	if err != nil {
 		return err

native.go

@@ -9,7 +9,6 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"strings"
 	"sync"
 	"time"
 
@@ -21,18 +20,18 @@ import (
 var ctrlSocketConn net.Conn
 
 type CtrlAction struct {
-	Action string         `json:"action"`
+	Action string                 `json:"action"`
-	Seq    int32          `json:"seq,omitempty"`
+	Seq    int32                  `json:"seq,omitempty"`
-	Params map[string]any `json:"params,omitempty"`
+	Params map[string]interface{} `json:"params,omitempty"`
 }
 
 type CtrlResponse struct {
-	Seq    int32           `json:"seq,omitempty"`
+	Seq    int32                  `json:"seq,omitempty"`
-	Error  string          `json:"error,omitempty"`
+	Error  string                 `json:"error,omitempty"`
-	Errno  int32           `json:"errno,omitempty"`
+	Errno  int32                  `json:"errno,omitempty"`
-	Result map[string]any  `json:"result,omitempty"`
+	Result map[string]interface{} `json:"result,omitempty"`
-	Event  string          `json:"event,omitempty"`
+	Event  string                 `json:"event,omitempty"`
-	Data   json.RawMessage `json:"data,omitempty"`
+	Data   json.RawMessage        `json:"data,omitempty"`
 }
 
 type EventHandler func(event CtrlResponse)
@@ -48,7 +47,7 @@ var (
 	nativeCmdLock = &sync.Mutex{}
 )
 
-func CallCtrlAction(action string, params map[string]any) (*CtrlResponse, error) {
+func CallCtrlAction(action string, params map[string]interface{}) (*CtrlResponse, error) {
 	lock.Lock()
 	defer lock.Unlock()
 	ctrlAction := CtrlAction{
@@ -367,22 +366,6 @@ func shouldOverwrite(destPath string, srcHash []byte) bool {
 	return !bytes.Equal(srcHash, dstHash)
 }
 
-func getNativeSha256() ([]byte, error) {
-	version, err := resource.ResourceFS.ReadFile("jetkvm_native.sha256")
-	if err != nil {
-		return nil, err
-	}
-	return version, nil
-}
-
-func GetNativeVersion() (string, error) {
-	version, err := getNativeSha256()
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(string(version)), nil
-}
-
 func ensureBinaryUpdated(destPath string) error {
 	srcFile, err := resource.ResourceFS.Open("jetkvm_native")
 	if err != nil {
@@ -390,7 +373,7 @@ func ensureBinaryUpdated(destPath string) error {
 	}
 	defer srcFile.Close()
 
-	srcHash, err := getNativeSha256()
+	srcHash, err := resource.ResourceFS.ReadFile("jetkvm_native.sha256")
 	if err != nil {
 		nativeLogger.Debug().Msg("error reading embedded jetkvm_native.sha256, proceeding with update")
 		srcHash = nil
@@ -429,7 +412,7 @@ func ensureBinaryUpdated(destPath string) error {
 func restoreHdmiEdid() {
 	if config.EdidString != "" {
 		nativeLogger.Info().Str("edid", config.EdidString).Msg("Restoring HDMI EDID")
-		_, err := CallCtrlAction("set_edid", map[string]any{"edid": config.EdidString})
+		_, err := CallCtrlAction("set_edid", map[string]interface{}{"edid": config.EdidString})
 		if err != nil {
 			nativeLogger.Warn().Err(err).Msg("Failed to restore HDMI EDID")
 		}

network.go

@@ -15,20 +15,10 @@ var (
 	networkState *network.NetworkInterfaceState
 )
 
-func networkStateChanged(isOnline bool) {
+func networkStateChanged() {
 	// do not block the main thread
 	go waitCtrlAndRequestDisplayUpdate(true)
 
-	if timeSync != nil {
-		if networkState != nil {
-			timeSync.SetDhcpNtpAddresses(networkState.NtpAddressesString())
-		}
-
-		if err := timeSync.Sync(); err != nil {
-			networkLogger.Error().Err(err).Msg("failed to sync time after network state change")
-		}
-	}
-
 	// always restart mDNS when the network state changes
 	if mDNS != nil {
 		_ = mDNS.SetListenOptions(config.NetworkConfig.GetMDNSMode())
@@ -37,13 +27,6 @@ func networkStateChanged(isOnline bool) {
 			networkState.GetFQDN(),
 		}, true)
 	}
-
-	// if the network is now online, trigger an NTP sync if still needed
-	if isOnline && timeSync != nil && (isTimeSyncNeeded() || !timeSync.IsSyncSuccess()) {
-		if err := timeSync.Sync(); err != nil {
-			logger.Warn().Str("error", err.Error()).Msg("unable to sync time on network state change")
-		}
-	}
 }
 
 func initNetwork() error {
@@ -55,13 +38,13 @@ func initNetwork() error {
 		NetworkConfig:   config.NetworkConfig,
 		Logger:          networkLogger,
 		OnStateChange: func(state *network.NetworkInterfaceState) {
-			networkStateChanged(state.IsOnline())
+			networkStateChanged()
 		},
 		OnInitialCheck: func(state *network.NetworkInterfaceState) {
-			networkStateChanged(state.IsOnline())
+			networkStateChanged()
 		},
-		OnDhcpLeaseChange: func(lease *udhcpc.Lease, state *network.NetworkInterfaceState) {
+		OnDhcpLeaseChange: func(lease *udhcpc.Lease) {
-			networkStateChanged(state.IsOnline())
+			networkStateChanged()
 
 			if currentSession == nil {
 				return
@@ -71,15 +54,7 @@ func initNetwork() error {
 		},
 		OnConfigChange: func(networkConfig *network.NetworkConfig) {
 			config.NetworkConfig = networkConfig
-			networkStateChanged(false)
+			networkStateChanged()
-
-			if mDNS != nil {
-				_ = mDNS.SetListenOptions(networkConfig.GetMDNSMode())
-				_ = mDNS.SetLocalNames([]string{
-					networkState.GetHostname(),
-					networkState.GetFQDN(),
-				}, true)
-			}
 		},
 	})
 

ota.go

@@ -50,10 +50,6 @@ const UpdateMetadataUrl = "https://api.jetkvm.com/releases"
 
 var builtAppVersion = "0.1.0+dev"
 
-func GetBuiltAppVersion() string {
-	return builtAppVersion
-}
-
 func GetLocalVersion() (systemVersion *semver.Version, appVersion *semver.Version, err error) {
 	appVersion, err = semver.NewVersion(builtAppVersion)
 	if err != nil {
@@ -93,14 +89,7 @@ func fetchUpdateMetadata(ctx context.Context, deviceId string, includePreRelease
 		return nil, fmt.Errorf("error creating request: %w", err)
 	}
 
-	transport := http.DefaultTransport.(*http.Transport).Clone()
+	resp, err := http.DefaultClient.Do(req)
-	transport.Proxy = config.NetworkConfig.GetTransportProxyFunc()
-
-	client := &http.Client{
-		Transport: transport,
-	}
-
-	resp, err := client.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("error sending request: %w", err)
 	}
@@ -146,7 +135,6 @@ func downloadFile(ctx context.Context, path string, url string, downloadProgress
 	client := http.Client{
 		Timeout: 10 * time.Minute,
 		Transport: &http.Transport{
-			Proxy:               config.NetworkConfig.GetTransportProxyFunc(),
 			TLSHandshakeTimeout: 30 * time.Second,
 			TLSClientConfig: &tls.Config{
 				RootCAs: rootcerts.ServerCertPool(),

remote_mount.go

@@ -0,0 +1,65 @@
+package kvm
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+)
+
+type RemoteImageReader interface {
+	Read(ctx context.Context, offset int64, size int64) ([]byte, error)
+}
+
+type WebRTCDiskReader struct {
+}
+
+var webRTCDiskReader WebRTCDiskReader
+
+func (w *WebRTCDiskReader) Read(ctx context.Context, offset int64, size int64) ([]byte, error) {
+	virtualMediaStateMutex.RLock()
+	if currentVirtualMediaState == nil {
+		virtualMediaStateMutex.RUnlock()
+		return nil, errors.New("image not mounted")
+	}
+	if currentVirtualMediaState.Source != WebRTC {
+		virtualMediaStateMutex.RUnlock()
+		return nil, errors.New("image not mounted from webrtc")
+	}
+	mountedImageSize := currentVirtualMediaState.Size
+	virtualMediaStateMutex.RUnlock()
+	end := offset + size
+	if end > mountedImageSize {
+		end = mountedImageSize
+	}
+	req := DiskReadRequest{
+		Start: uint64(offset),
+		End:   uint64(end),
+	}
+	jsonBytes, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+
+	if currentSession == nil || currentSession.DiskChannel == nil {
+		return nil, errors.New("not active session")
+	}
+
+	logger.Debug().Str("request", string(jsonBytes)).Msg("reading from webrtc")
+	err = currentSession.DiskChannel.SendText(string(jsonBytes))
+	if err != nil {
+		return nil, err
+	}
+	var buf []byte
+	for {
+		select {
+		case data := <-diskReadChan:
+			buf = data[16:]
+		case <-ctx.Done():
+			return nil, context.Canceled
+		}
+		if len(buf) >= int(end-offset) {
+			break
+		}
+	}
+	return buf, nil
+}

resource/jetkvm_native.sha256

@@ -1 +1 @@
-a4fca98710932aaa2765b57404e080105190cfa3af69171f4b4d95d4b78f9af0
+6dabd0e657dd099280d9173069687786a4a8c9c25cf7f9e7ce2f940cab67c521

scripts/update_netboot_xyz.sh

@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-#
-# Exit immediately if a command exits with a non-zero status
-set -e
-
-C_RST="$(tput sgr0)"
-C_ERR="$(tput setaf 1)"
-C_OK="$(tput setaf 2)"
-C_WARN="$(tput setaf 3)"
-C_INFO="$(tput setaf 5)"
-
-msg() { printf '%s%s%s\n' $2 "$1" $C_RST; }
-
-msg_info() { msg "$1" $C_INFO; }
-msg_ok() { msg "$1" $C_OK; }
-msg_err() { msg "$1" $C_ERR; }
-msg_warn() { msg "$1" $C_WARN; }
-
-# Get the latest release information
-msg_info "Getting latest release information ..."
-LATEST_RELEASE=$(curl -s \
-  -H "Accept: application/vnd.github+json" \
-  -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/netbootxyz/netboot.xyz/releases | jq '
-  [.[] | select(.prerelease == false and .draft == false and .assets != null and (.assets | length > 0))] |
-  sort_by(.created_at) | 
-  .[-1]')
-
-# Extract version, download URL, and digest
-VERSION=$(echo "$LATEST_RELEASE" | jq -r '.tag_name')
-ISO_URL=$(echo "$LATEST_RELEASE" | jq -r '.assets[] | select(.name == "netboot.xyz-multiarch.iso") | .browser_download_url')
-EXPECTED_CHECKSUM=$(echo "$LATEST_RELEASE" | jq -r '.assets[] | select(.name == "netboot.xyz-multiarch.iso") | .digest' | sed 's/sha256://')
-
-msg_ok "Latest version: $VERSION"
-msg_ok "ISO URL: $ISO_URL"
-msg_ok "Expected SHA256: $EXPECTED_CHECKSUM"
-
-
-# Check if we already have the same version
-if [ -f "resource/netboot.xyz-multiarch.iso" ]; then
-    msg_info "Checking current resource file ..."
-    
-    # First check by checksum (fastest)
-    CURRENT_CHECKSUM=$(shasum -a 256 resource/netboot.xyz-multiarch.iso | awk '{print $1}')
-    
-    if [ "$CURRENT_CHECKSUM" = "$EXPECTED_CHECKSUM" ]; then
-        msg_ok "Resource file is already up to date (version $VERSION). No update needed."
-        exit 0
-    else
-        msg_info "Checksums differ, proceeding with download ..."
-    fi
-fi
-
-# Download ISO file
-TMP_ISO=$(mktemp -t netbootxyziso)
-msg_info "Downloading ISO file ..."
-curl -L -o "$TMP_ISO" "$ISO_URL"
-
-# Verify SHA256 checksum
-msg_info "Verifying SHA256 checksum ..."
-ACTUAL_CHECKSUM=$(shasum -a 256 "$TMP_ISO" | awk '{print $1}')
-
-if [ "$EXPECTED_CHECKSUM" = "$ACTUAL_CHECKSUM" ]; then
-    msg_ok "Verified SHA256 checksum."
-    mv -f "$TMP_ISO" "resource/netboot.xyz-multiarch.iso"
-    msg_ok "Updated ISO file."
-    git add "resource/netboot.xyz-multiarch.iso"
-    git commit -m "chore: update netboot.xyz-multiarch.iso to $VERSION"
-    msg_ok "Committed changes."
-    msg_ok "You can now push the changes to the remote repository."
-    exit 0
-else
-    msg_err "Inconsistent SHA256 checksum."
-    msg_err "Expected: $EXPECTED_CHECKSUM"
-    msg_err "Actual:   $ACTUAL_CHECKSUM"
-    exit 1
-fi

serial.go

@@ -128,7 +128,6 @@ func pressATXResetButton(duration time.Duration) error {
 
 func mountDCControl() error {
 	_ = port.SetMode(defaultMode)
-	registerDCMetrics()
 	go runDCControl()
 	return nil
 }
@@ -143,7 +142,6 @@ var dcState DCPowerState
 func runDCControl() {
 	scopedLogger := serialLogger.With().Str("service", "dc_control").Logger()
 	reader := bufio.NewReader(port)
-	hasRestoreFeature := false
 	for {
 		line, err := reader.ReadString('\n')
 		if err != nil {
@@ -153,13 +151,7 @@ func runDCControl() {
 
 		// Split the line by semicolon
 		parts := strings.Split(strings.TrimSpace(line), ";")
-		if len(parts) == 5 {
+		if len(parts) != 4 {
-			scopedLogger.Debug().Str("line", line).Msg("Detected DC extension with restore feature")
-			hasRestoreFeature = true
-		} else if len(parts) == 4 {
-			scopedLogger.Debug().Str("line", line).Msg("Detected DC extension without restore feature")
-			hasRestoreFeature = false
-		} else {
 			scopedLogger.Warn().Str("line", line).Msg("Invalid line")
 			continue
 		}
@@ -171,17 +163,6 @@ func runDCControl() {
 			continue
 		}
 		dcState.IsOn = powerState == 1
-		if hasRestoreFeature {
-			restoreState, err := strconv.Atoi(parts[4])
-			if err != nil {
-				scopedLogger.Warn().Err(err).Msg("Invalid restore state")
-				continue
-			}
-			dcState.RestoreState = restoreState
-		} else {
-			// -1 means not supported
-			dcState.RestoreState = -1
-		}
 		milliVolts, err := strconv.ParseFloat(parts[1], 64)
 		if err != nil {
 			scopedLogger.Warn().Err(err).Msg("Invalid voltage")
@@ -207,9 +188,6 @@ func runDCControl() {
 		dcState.Current = amps
 		dcState.Power = watts
 
-		// Update Prometheus metrics
-		updateDCMetrics(dcState)
-
 		if currentSession != nil {
 			writeJSONRPCEvent("dcState", dcState, currentSession)
 		}
@@ -232,25 +210,6 @@ func setDCPowerState(on bool) error {
 	return nil
 }
 
-func setDCRestoreState(state int) error {
-	_, err := port.Write([]byte("\n"))
-	if err != nil {
-		return err
-	}
-	command := "RESTORE_MODE_OFF\n"
-	switch state {
-	case 1:
-		command = "RESTORE_MODE_ON\n"
-	case 2:
-		command = "RESTORE_MODE_LAST_STATE\n"
-	}
-	_, err = port.Write([]byte(command))
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 var defaultMode = &serial.Mode{
 	BaudRate: 115200,
 	DataBits: 8,

ui/eslint.config.cjs

@@ -66,10 +66,6 @@ module.exports = defineConfig([{
             groups: ["builtin", "external", "internal", "parent", "sibling"],
             "newlines-between": "always",
         }],
-    
-        "@typescript-eslint/no-unused-vars": ["warn", {
-            "argsIgnorePattern": "^_", "varsIgnorePattern": "^_"
-        }],
     },
 
     settings: {

ui/index.html

@@ -1,63 +1,51 @@
 <!doctype html>
 <html lang="en">
   <head>
-    <meta charset="utf-8" />
+    <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <!-- These are the fonts used in the app -->
     <link
       rel="preload"
-      href="./public/fonts/CircularXXWeb-Medium.woff2"
+      href="/fonts/CircularXXWeb-Medium.woff2"
       as="font"
       type="font/woff2"
       crossorigin
     />
     <link
       rel="preload"
-      href="./public/fonts/CircularXXWeb-Book.woff2"
+      href="/fonts/CircularXXWeb-Book.woff2"
       as="font"
       type="font/woff2"
       crossorigin
     />
     <link
       rel="preload"
-      href="./public/fonts/CircularXXWeb-Regular.woff2"
+      href="/fonts/CircularXXWeb-Regular.woff2"
-      as="font"
-      type="font/woff2"
-      crossorigin
-    />
-    <link
-      rel="preload"
-      href="./public/fonts/CircularXXWeb-Black.woff2"
       as="font"
       type="font/woff2"
       crossorigin
     />
     <title>JetKVM</title>
-    <link rel="stylesheet" href="./public/fonts/fonts.css" />
+    <link rel="stylesheet" href="/fonts/fonts.css" />
-    <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
+    <link rel="icon" href="/favicon.png" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <link rel="shortcut icon" href="/favicon.ico" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <meta name="apple-mobile-web-app-title" content="JetKVM" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <meta name="theme-color" content="#051946" />
-    <meta name="description" content="A web-based KVM console for managing remote servers." />
     <script>
-      function applyThemeFromPreference() {
+      // Initial theme setup
-        // dark theme setup
+      document.documentElement.classList.toggle(
-        var darkDesired = localStorage.theme === "dark" ||
+        "dark",
+        localStorage.theme === "dark" ||
           (!("theme" in localStorage) &&
-            window.matchMedia("(prefers-color-scheme: dark)").matches)
+            window.matchMedia("(prefers-color-scheme: dark)").matches),
-
+      );
-        document.documentElement.classList.toggle("dark", darkDesired)
-      }
-
-      // initial theme application
-      applyThemeFromPreference();
 
       // Listen for system theme changes
-      window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", applyThemeFromPreference);
+      window
-      window.matchMedia("(prefers-color-scheme: light)").addEventListener("change", applyThemeFromPreference);
+        .matchMedia("(prefers-color-scheme: dark)")
+        .addEventListener("change", ({ matches }) => {
+          if (!("theme" in localStorage)) {
+            // Only auto-switch if user hasn't manually set a theme
+            document.documentElement.classList.toggle("dark", matches);
+          }
+        });
     </script>
   </head>
   <body

ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kvm-ui",
   "private": true,
-  "version": "2025.09.03.2100",
+  "version": "0.0.0",
   "type": "module",
   "engines": {
     "node": "22.15.0"
@@ -19,67 +19,67 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@headlessui/react": "^2.2.7",
+    "@headlessui/react": "^2.2.3",
     "@headlessui/tailwindcss": "^0.2.2",
     "@heroicons/react": "^2.2.0",
-    "@vitejs/plugin-basic-ssl": "^2.1.0",
+    "@vitejs/plugin-basic-ssl": "^2.0.0",
     "@xterm/addon-clipboard": "^0.1.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/addon-unicode11": "^0.8.0",
     "@xterm/addon-web-links": "^0.11.0",
     "@xterm/addon-webgl": "^0.18.0",
     "@xterm/xterm": "^5.5.0",
-    "cva": "^1.0.0-beta.4",
+    "cva": "^1.0.0-beta.3",
-    "dayjs": "^1.11.18",
+    "dayjs": "^1.11.13",
     "eslint-import-resolver-alias": "^1.1.2",
-    "focus-trap-react": "^11.0.4",
+    "focus-trap-react": "^11.0.3",
-    "framer-motion": "^12.23.12",
+    "framer-motion": "^12.11.4",
     "lodash.throttle": "^4.1.1",
     "mini-svg-data-uri": "^1.4.4",
-    "react": "^19.1.1",
+    "react": "^19.1.0",
     "react-animate-height": "^3.2.3",
-    "react-dom": "^19.1.1",
+    "react-dom": "^19.1.0",
-    "react-hot-toast": "^2.6.0",
+    "react-hot-toast": "^2.5.2",
     "react-icons": "^5.5.0",
-    "react-router": "^7.8.2",
+    "react-router-dom": "^6.22.3",
-    "react-simple-keyboard": "^3.8.119",
+    "react-simple-keyboard": "^3.8.72",
     "react-use-websocket": "^4.13.0",
     "react-xtermjs": "^1.0.10",
-    "recharts": "^3.1.2",
+    "recharts": "^2.15.3",
-    "tailwind-merge": "^3.3.1",
+    "tailwind-merge": "^3.3.0",
     "usehooks-ts": "^3.1.1",
-    "validator": "^13.15.15",
+    "validator": "^13.15.0",
     "zustand": "^4.5.2"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.3.2",
+    "@eslint/compat": "^1.2.9",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.34.0",
+    "@eslint/js": "^9.26.0",
     "@tailwindcss/forms": "^0.5.10",
-    "@tailwindcss/postcss": "^4.1.12",
+    "@tailwindcss/postcss": "^4.1.7",
     "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "^4.1.12",
+    "@tailwindcss/vite": "^4.1.7",
-    "@types/react": "^19.1.12",
+    "@types/react": "^19.1.4",
-    "@types/react-dom": "^19.1.9",
+    "@types/react-dom": "^19.1.5",
-    "@types/semver": "^7.7.1",
+    "@types/semver": "^7.7.0",
-    "@types/validator": "^13.15.3",
+    "@types/validator": "^13.15.0",
-    "@typescript-eslint/eslint-plugin": "^8.42.0",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
-    "@typescript-eslint/parser": "^8.42.0",
+    "@typescript-eslint/parser": "^8.32.1",
-    "@vitejs/plugin-react-swc": "^4.0.1",
+    "@vitejs/plugin-react-swc": "^3.9.0",
     "autoprefixer": "^10.4.21",
-    "eslint": "^9.34.0",
+    "eslint": "^9.26.0",
-    "eslint-config-prettier": "^10.1.8",
+    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
-    "globals": "^16.3.0",
+    "globals": "^16.1.0",
-    "postcss": "^8.5.6",
+    "postcss": "^8.5.3",
-    "prettier": "^3.6.2",
+    "prettier": "^3.5.3",
-    "prettier-plugin-tailwindcss": "^0.6.14",
+    "prettier-plugin-tailwindcss": "^0.6.11",
-    "tailwindcss": "^4.1.12",
+    "tailwindcss": "^4.1.7",
-    "typescript": "^5.9.2",
+    "typescript": "^5.8.3",
-    "vite": "^7.1.5",
+    "vite": "^6.3.5",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }

ui/public/favicon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#1D4ED8" d="M0 6a6 6 0 0 1 6-6h12a6 6 0 0 1 6 6v12a6 6 0 0 1-6 6H6a6 6 0 0 1-6-6V6Z"/><path fill="#fff" d="M13.885 12a1.895 1.895 0 1 1-3.79 0 1.895 1.895 0 0 1 3.79 0Z"/><path fill="#fff" fill-rule="evenodd" d="M7.59 9.363c.49.182.74.727.558 1.218A4.103 4.103 0 0 0 12 16.105a4.103 4.103 0 0 0 3.852-5.526.947.947 0 0 1 1.777-.658A5.998 5.998 0 0 1 12 18a5.998 5.998 0 0 1-5.628-8.078.947.947 0 0 1 1.218-.56ZM11.993 7.895c-.628 0-1.22.14-1.75.39a.947.947 0 1 1-.808-1.714A5.985 5.985 0 0 1 11.993 6c.913 0 1.78.204 2.557.57a.947.947 0 1 1-.808 1.715 4.09 4.09 0 0 0-1.75-.39Z" clip-rule="evenodd"/><path fill="#1D4ED8" d="M0 6a6 6 0 0 1 6-6h12a6 6 0 0 1 6 6v12a6 6 0 0 1-6 6H6a6 6 0 0 1-6-6V6Z"/><path fill="#fff" d="M13.885 12a1.895 1.895 0 1 1-3.79 0 1.895 1.895 0 0 1 3.79 0Z"/><path fill="#fff" fill-rule="evenodd" d="M7.59 9.363c.49.182.74.727.558 1.218A4.103 4.103 0 0 0 12 16.105a4.103 4.103 0 0 0 3.852-5.526.947.947 0 0 1 1.777-.658A5.998 5.998 0 0 1 12 18a5.998 5.998 0 0 1-5.628-8.078.947.947 0 0 1 1.218-.56ZM11.993 7.895c-.628 0-1.22.14-1.75.39a.947.947 0 1 1-.808-1.714A5.985 5.985 0 0 1 11.993 6c.913 0 1.78.204 2.557.57a.947.947 0 1 1-.808 1.715 4.09 4.09 0 0 0-1.75-.39Z" clip-rule="evenodd"/></svg><style>@media (prefers-color-scheme:light){:root{filter:none}}@media (prefers-color-scheme:dark){:root{filter:none}}</style></svg>

ui/public/jetkvm.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#1D4ED8" d="M0 6a6 6 0 0 1 6-6h12a6 6 0 0 1 6 6v12a6 6 0 0 1-6 6H6a6 6 0 0 1-6-6V6Z"/><path fill="#fff" d="M13.885 12a1.895 1.895 0 1 1-3.79 0 1.895 1.895 0 0 1 3.79 0Z"/><path fill="#fff" fill-rule="evenodd" d="M7.59 9.363c.49.182.74.727.558 1.218A4.103 4.103 0 0 0 12 16.105a4.103 4.103 0 0 0 3.852-5.526.947.947 0 0 1 1.777-.658A5.998 5.998 0 0 1 12 18a5.998 5.998 0 0 1-5.628-8.078.947.947 0 0 1 1.218-.56ZM11.993 7.895c-.628 0-1.22.14-1.75.39a.947.947 0 1 1-.808-1.714A5.985 5.985 0 0 1 11.993 6c.913 0 1.78.204 2.557.57a.947.947 0 1 1-.808 1.715 4.09 4.09 0 0 0-1.75-.39Z" clip-rule="evenodd"/><path fill="#1D4ED8" d="M0 6a6 6 0 0 1 6-6h12a6 6 0 0 1 6 6v12a6 6 0 0 1-6 6H6a6 6 0 0 1-6-6V6Z"/><path fill="#fff" d="M13.885 12a1.895 1.895 0 1 1-3.79 0 1.895 1.895 0 0 1 3.79 0Z"/><path fill="#fff" fill-rule="evenodd" d="M7.59 9.363c.49.182.74.727.558 1.218A4.103 4.103 0 0 0 12 16.105a4.103 4.103 0 0 0 3.852-5.526.947.947 0 0 1 1.777-.658A5.998 5.998 0 0 1 12 18a5.998 5.998 0 0 1-5.628-8.078.947.947 0 0 1 1.218-.56ZM11.993 7.895c-.628 0-1.22.14-1.75.39a.947.947 0 1 1-.808-1.714A5.985 5.985 0 0 1 11.993 6c.913 0 1.78.204 2.557.57a.947.947 0 1 1-.808 1.715 4.09 4.09 0 0 0-1.75-.39Z" clip-rule="evenodd"/></svg>

ui/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

ui/public/site.webmanifest

@@ -1,21 +0,0 @@
-{
-  "name": "JetKVM",
-  "short_name": "JetKVM",
-  "icons": [
-    {
-      "src": "/web-app-manifest-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/web-app-manifest-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png",
-      "purpose": "maskable"
-    }
-  ],
-  "theme_color": "#002b36",
-  "background_color": "#051946",
-  "display": "standalone"
-}

ui/src/assets/attach-icon.svg

@@ -0,0 +1,8 @@
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2 6C2 4.89543 2.89543 4 4 4H20C21.1046 4 22 4.89543 22 6V18C22 19.1046 21.1046 20 20 20H4C2.89543 20 2 19.1046 2 18V6Z"
+          fill="white"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M20 6H4V18H20V6ZM4 4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4H4Z"
+          fill="black"/>
+    <path d="M4 13H20V18H4V13Z" fill="black"/>
+</svg>

ui/src/components/ActionBar.tsx

@@ -26,13 +26,17 @@ export default function Actionbar({
   requestFullscreen: () => Promise<void>;
 }) {
   const { navigateTo } = useDeviceUiNavigation();
-  const { isVirtualKeyboardEnabled, setVirtualKeyboardEnabled } = useHidStore();
+  const virtualKeyboard = useHidStore(state => state.isVirtualKeyboardEnabled);
-  const { setDisableVideoFocusTrap, terminalType, setTerminalType, toggleSidebarView } = useUiStore();
 
+  const setVirtualKeyboard = useHidStore(state => state.setVirtualKeyboardEnabled);
+  const toggleSidebarView = useUiStore(state => state.toggleSidebarView);
+  const setDisableFocusTrap = useUiStore(state => state.setDisableVideoFocusTrap);
+  const terminalType = useUiStore(state => state.terminalType);
+  const setTerminalType = useUiStore(state => state.setTerminalType);
   const remoteVirtualMediaState = useMountMediaStore(
     state => state.remoteVirtualMediaState,
   );
-  const { developerMode } = useSettingsStore();
+  const developerMode = useSettingsStore(state => state.developerMode);
 
   // This is the only way to get a reliable state change for the popover
   // at time of writing this there is no mount, or unmount event for the popover
@@ -43,13 +47,13 @@ export default function Actionbar({
         isOpen.current = open;
         if (!open) {
           setTimeout(() => {
-            setDisableVideoFocusTrap(false);
+            setDisableFocusTrap(false);
-            console.debug("Popover is closing. Returning focus trap to video");
+            console.log("Popover is closing. Returning focus trap to video");
           }, 0);
         }
       }
     },
-    [setDisableVideoFocusTrap],
+    [setDisableFocusTrap],
   );
 
   return (
@@ -77,7 +81,7 @@ export default function Actionbar({
                 text="Paste text"
                 LeadingIcon={MdOutlineContentPasteGo}
                 onClick={() => {
-                  setDisableVideoFocusTrap(true);
+                  setDisableFocusTrap(true);
                 }}
               />
             </PopoverButton>
@@ -119,7 +123,7 @@ export default function Actionbar({
                     );
                   }}
                   onClick={() => {
-                    setDisableVideoFocusTrap(true);
+                    setDisableFocusTrap(true);
                   }}
                 />
               </PopoverButton>
@@ -150,7 +154,7 @@ export default function Actionbar({
                   theme="light"
                   text="Wake on LAN"
                   onClick={() => {
-                    setDisableVideoFocusTrap(true);
+                    setDisableFocusTrap(true);
                   }}
                   LeadingIcon={({ className }) => (
                     <svg
@@ -200,7 +204,7 @@ export default function Actionbar({
               theme="light"
               text="Virtual Keyboard"
               LeadingIcon={FaKeyboard}
-              onClick={() => setVirtualKeyboardEnabled(!isVirtualKeyboardEnabled)}
+              onClick={() => setVirtualKeyboard(!virtualKeyboard)}
             />
           </div>
         </div>
@@ -214,7 +218,7 @@ export default function Actionbar({
                 text="Extension"
                 LeadingIcon={LuCable}
                 onClick={() => {
-                  setDisableVideoFocusTrap(true);
+                  setDisableFocusTrap(true);
                 }}
               />
             </PopoverButton>
@@ -239,7 +243,7 @@ export default function Actionbar({
               theme="light"
               text="Virtual Keyboard"
               LeadingIcon={FaKeyboard}
-              onClick={() => setVirtualKeyboardEnabled(!isVirtualKeyboardEnabled)}
+              onClick={() => setVirtualKeyboard(!virtualKeyboard)}
             />
           </div>
           <div className="hidden md:block">
@@ -258,16 +262,30 @@ export default function Actionbar({
               }}
             />
           </div>
+          {/* {useSettingsStore().actionBarCtrlAltDel && (
+            <div className="hidden lg:block">
+              <Button
+              size="XS"
+              theme="light"
+              text="Ctrl + Alt + Del"
+              LeadingIcon={FaLock}
+              onClick={() => {
+                sendKeyboardEvent(
+                [keys["Delete"]],
+                [modifiers["ControlLeft"], modifiers["AltLeft"]],
+                );
+                setTimeout(resetKeyboardState, 100);
+              }}
+              />
+            </div>
+            )} */}
           <div>
             <Button
               size="XS"
               theme="light"
               text="Settings"
               LeadingIcon={LuSettings}
-              onClick={() => {
+              onClick={() => navigateTo("/settings")}
-                  setDisableVideoFocusTrap(true);
-                  navigateTo("/settings")
-              }}
             />
           </div>
 

ui/src/components/AuthLayout.tsx

@@ -1,4 +1,4 @@
-import { useLocation, useNavigation, useSearchParams } from "react-router";
+import { useLocation, useNavigation, useSearchParams } from "react-router-dom";
 
 import { Button, LinkButton } from "@components/Button";
 import { GoogleIcon } from "@components/Icons";

ui/src/components/Button.tsx

@@ -1,6 +1,5 @@
 import React, { JSX } from "react";
-import { Link, useNavigation } from "react-router";
+import { FetcherWithComponents, Link, LinkProps, useNavigation } from "react-router-dom";
-import type { FetcherWithComponents, LinkProps } from "react-router";
 
 import ExtLink from "@/components/ExtLink";
 import LoadingSpinner from "@/components/LoadingSpinner";
@@ -176,7 +175,7 @@ type ButtonPropsType = Pick<
 export const Button = React.forwardRef<HTMLButtonElement, ButtonPropsType>(
   ({ type, disabled, onClick, formNoValidate, loading, fetcher, ...props }, ref) => {
     const classes = cx(
-      "group outline-hidden cursor-pointer",
+      "group outline-hidden",
       props.fullWidth ? "w-full" : "",
       loading ? "pointer-events-none" : "",
     );

ui/src/components/CustomTooltip.tsx

@@ -1,25 +1,25 @@
 import Card from "@components/Card";
 
 export interface CustomTooltipProps {
-  payload: { payload: { date: number; metric: number }; unit: string }[];
+  payload: { payload: { date: number; stat: number }; unit: string }[];
 }
 
 export default function CustomTooltip({ payload }: CustomTooltipProps) {
   if (payload?.length) {
     const toolTipData = payload[0];
-    const { date, metric } = toolTipData.payload;
+    const { date, stat } = toolTipData.payload;
 
     return (
       <Card>
-        <div className="px-2 py-1.5 text-black dark:text-white">
+        <div className="p-2 text-black dark:text-white">
-          <div className="text-[13px] font-semibold">
+          <div className="font-semibold">
             {new Date(date * 1000).toLocaleTimeString()}
           </div>
           <div className="space-y-1">
             <div className="flex items-center gap-x-1">
               <div className="h-[2px] w-2 bg-blue-700" />
-              <span className="text-[13px]">
+              <span >
-                {metric} {toolTipData?.unit}
+                {stat} {toolTipData?.unit}
               </span>
             </div>
           </div>

ui/src/components/FieldLabel.tsx

@@ -27,7 +27,7 @@ export default function FieldLabel({
       >
         {label}
         {description && (
-          <span className="mb-0.5 text-[13px] font-normal text-slate-600 dark:text-slate-400">
+          <span className="my-0.5 text-[13px] font-normal text-slate-600 dark:text-slate-400">
             {description}
           </span>
         )}
@@ -36,11 +36,11 @@ export default function FieldLabel({
   } else if (as === "span") {
     return (
       <div className="flex select-none flex-col">
-        <span className="font-display text-[13px] font-semibold leading-snug text-black dark:text-white">
+        <span className="font-display text-[13px] font-medium leading-snug text-black dark:text-white">
           {label}
         </span>
         {description && (
-          <span className="mb-0.5 text-[13px] font-normal text-slate-600 dark:text-slate-400">
+          <span className="my-0.5 text-[13px] font-normal text-slate-600 dark:text-slate-400">
             {description}
           </span>
         )}
@@ -49,4 +49,4 @@ export default function FieldLabel({
   } else {
     return <></>;
   }
-}
+}

ui/src/components/Fieldset.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import clsx from "clsx";
-import { useNavigation } from "react-router";
+import { FetcherWithComponents, useNavigation } from "react-router-dom";
-import type { FetcherWithComponents } from "react-router";
 
 export default function Fieldset({
   children,

ui/src/components/Header.tsx

@@ -1,5 +1,5 @@
 import { useCallback } from "react";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { ArrowLeftEndOnRectangleIcon, ChevronDownIcon } from "@heroicons/react/16/solid";
 import { Button, Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
 import { LuMonitorSmartphone } from "react-icons/lu";
@@ -48,7 +48,7 @@ export default function DashboardNavbar({
     navigate("/");
   }, [navigate, setUser]);
 
-  const { usbState } = useHidStore();
+  const usbState = useHidStore(state => state.usbState);
 
   // for testing
   //userEmail = "user@example.org";
@@ -103,7 +103,7 @@ export default function DashboardNavbar({
                     <hr className="h-[20px] w-px self-center border-none bg-slate-800/20 dark:bg-slate-300/20" />
                     <div className="relative inline-block text-left">
                       <Menu>
-                        <MenuButton as="div" className="h-full">
+                        <MenuButton className="h-full">
                           <Button className="flex h-full items-center gap-x-3 rounded-md border border-slate-800/20 bg-white px-2 py-1.5 dark:border-slate-600 dark:bg-slate-800 dark:text-white">
                             {picture ? (
                               <img

ui/src/components/InfoBar.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo } from "react";
+import { useEffect } from "react";
 
 import { cx } from "@/cva.config";
 import {
@@ -7,71 +7,65 @@ import {
   useRTCStore,
   useSettingsStore,
   useVideoStore,
-  VideoState
 } from "@/hooks/stores";
 import { keys, modifiers } from "@/keyboardMappings";
-import { useHidRpc } from "@/hooks/useHidRpc";
 
 export default function InfoBar() {
-  const { keysDownState } = useHidStore();
+  const activeKeys = useHidStore(state => state.activeKeys);
-  const { mouseX, mouseY, mouseMove } = useMouseStore();
+  const activeModifiers = useHidStore(state => state.activeModifiers);
-  const { rpcHidStatus } = useHidRpc();
+  const mouseX = useMouseStore(state => state.mouseX);
+  const mouseY = useMouseStore(state => state.mouseY);
+  const mouseMove = useMouseStore(state => state.mouseMove);
 
   const videoClientSize = useVideoStore(
-    (state: VideoState) => `${Math.round(state.clientWidth)}x${Math.round(state.clientHeight)}`,
+    state => `${Math.round(state.clientWidth)}x${Math.round(state.clientHeight)}`,
   );
 
   const videoSize = useVideoStore(
-    (state: VideoState) => `${Math.round(state.width)}x${Math.round(state.height)}`,
+    state => `${Math.round(state.width)}x${Math.round(state.height)}`,
   );
 
-  const { rpcDataChannel } = useRTCStore();
+  const rpcDataChannel = useRTCStore(state => state.rpcDataChannel);
-  const { debugMode, mouseMode, showPressedKeys } = useSettingsStore();
+
-  const { isPasteInProgress } = useHidStore();
+  const settings = useSettingsStore();
+  const showPressedKeys = useSettingsStore(state => state.showPressedKeys);
 
   useEffect(() => {
     if (!rpcDataChannel) return;
     rpcDataChannel.onclose = () => console.log("rpcDataChannel has closed");
-    rpcDataChannel.onerror = (e: Event) =>
+    rpcDataChannel.onerror = e =>
-      console.error(`Error on DataChannel '${rpcDataChannel.label}': ${e}`);
+      console.log(`Error on DataChannel '${rpcDataChannel.label}': ${e}`);
   }, [rpcDataChannel]);
 
-  const { keyboardLedState, usbState } = useHidStore();
+  const keyboardLedState = useHidStore(state => state.keyboardLedState);
-  const { isTurnServerInUse } = useRTCStore();
+  const keyboardLedStateSyncAvailable = useHidStore(state => state.keyboardLedStateSyncAvailable);
-  const { hdmiState } = useVideoStore();
+  const keyboardLedSync = useSettingsStore(state => state.keyboardLedSync);
 
-  const displayKeys = useMemo(() => {
+  const isTurnServerInUse = useRTCStore(state => state.isTurnServerInUse);
-    if (!showPressedKeys)
-      return "";
 
-    const activeModifierMask = keysDownState.modifier || 0;
+  const usbState = useHidStore(state => state.usbState);
-    const keysDown = keysDownState.keys || [];
+  const hdmiState = useVideoStore(state => state.hdmiState);
-    const modifierNames = Object.entries(modifiers).filter(([_, mask]) => (activeModifierMask & mask) !== 0).map(([name, _]) => name);
-    const keyNames = Object.entries(keys).filter(([_, value]) => keysDown.includes(value)).map(([name, _]) => name);
-
-    return [...modifierNames, ...keyNames].join(", ");
-  }, [keysDownState, showPressedKeys]);
 
   return (
     <div className="bg-white border-t border-t-slate-800/30 text-slate-800 dark:border-t-slate-300/20 dark:bg-slate-900 dark:text-slate-300">
       <div className="flex flex-wrap items-stretch justify-between gap-1">
         <div className="flex items-center">
           <div className="flex flex-wrap items-center pl-2 gap-x-4">
-            {debugMode ? (
+            {settings.debugMode ? (
               <div className="flex">
                 <span className="text-xs font-semibold">Resolution:</span>{" "}
                 <span className="text-xs">{videoSize}</span>
               </div>
             ) : null}
 
-            {debugMode ? (
+            {settings.debugMode ? (
               <div className="flex">
                 <span className="text-xs font-semibold">Video Size: </span>
                 <span className="text-xs">{videoClientSize}</span>
               </div>
             ) : null}
 
-            {(debugMode && mouseMode == "absolute") ? (
+            {(settings.debugMode && settings.mouseMode == "absolute") ? (
               <div className="flex w-[118px] items-center gap-x-1">
                 <span className="text-xs font-semibold">Pointer:</span>
                 <span className="text-xs">
@@ -80,7 +74,7 @@ export default function InfoBar() {
               </div>
             ) : null}
 
-            {(debugMode && mouseMode == "relative") ? (
+            {(settings.debugMode && settings.mouseMode == "relative") ? (
               <div className="flex w-[118px] items-center gap-x-1">
                 <span className="text-xs font-semibold">Last Move:</span>
                 <span className="text-xs">
@@ -91,35 +85,31 @@ export default function InfoBar() {
               </div>
             ) : null}
 
-            {debugMode && (
+            {settings.debugMode && (
               <div className="flex w-[156px] items-center gap-x-1">
                 <span className="text-xs font-semibold">USB State:</span>
                 <span className="text-xs">{usbState}</span>
               </div>
             )}
-            {debugMode && (
+            {settings.debugMode && (
               <div className="flex w-[156px] items-center gap-x-1">
                 <span className="text-xs font-semibold">HDMI State:</span>
                 <span className="text-xs">{hdmiState}</span>
               </div>
             )}
-            {debugMode && (
+
-              <div className="flex w-[156px] items-center gap-x-1">
-                <span className="text-xs font-semibold">HidRPC State:</span>
-                <span className="text-xs">{rpcHidStatus}</span>
-              </div>
-            )}
-            {isPasteInProgress && (
-              <div className="flex w-[156px] items-center gap-x-1">
-                <span className="text-xs font-semibold">Paste Mode:</span>
-                <span className="text-xs">Enabled</span>
-              </div>
-            )}
             {showPressedKeys && (
               <div className="flex items-center gap-x-1">
                 <span className="text-xs font-semibold">Keys:</span>
                 <h2 className="text-xs">
-                  {displayKeys}
+                  {[
+                    ...activeKeys.map(
+                      x => Object.entries(keys).filter(y => y[1] === x)[0][0],
+                    ),
+                    activeModifiers.map(
+                      x => Object.entries(modifiers).filter(y => y[1] === x)[0][0],
+                    ),
+                  ].join(", ")}
                 </h2>
               </div>
             )}
@@ -132,10 +122,23 @@ export default function InfoBar() {
             </div>
           )}
 
+          {keyboardLedStateSyncAvailable ? (
+            <div
+              className={cx(
+                "shrink-0 p-1 px-1.5 text-xs",
+                keyboardLedSync !== "browser"
+                  ? "text-black dark:text-white"
+                  : "text-slate-800/20 dark:text-slate-300/20",
+              )}
+              title={"Your keyboard LED state is managed by" + (keyboardLedSync === "browser" ? " the browser" : " the host")}
+            >
+              {keyboardLedSync === "browser" ? "Browser" : "Host"}
+            </div>
+          ) : null}
           <div
             className={cx(
               "shrink-0 p-1 px-1.5 text-xs",
-              keyboardLedState.caps_lock
+              keyboardLedState?.caps_lock
                 ? "text-black dark:text-white"
                 : "text-slate-800/20 dark:text-slate-300/20",
             )}
@@ -145,7 +148,7 @@ export default function InfoBar() {
           <div
             className={cx(
               "shrink-0 p-1 px-1.5 text-xs",
-              keyboardLedState.num_lock
+              keyboardLedState?.num_lock
                 ? "text-black dark:text-white"
                 : "text-slate-800/20 dark:text-slate-300/20",
             )}
@@ -155,28 +158,23 @@ export default function InfoBar() {
           <div
             className={cx(
               "shrink-0 p-1 px-1.5 text-xs",
-              keyboardLedState.scroll_lock
+              keyboardLedState?.scroll_lock
                 ? "text-black dark:text-white"
                 : "text-slate-800/20 dark:text-slate-300/20",
             )}
           >
             Scroll Lock
           </div>
-          {keyboardLedState.compose ? (
+          {keyboardLedState?.compose ? (
             <div className="shrink-0 p-1 px-1.5 text-xs">
               Compose
             </div>
           ) : null}
-          {keyboardLedState.kana ? (
+          {keyboardLedState?.kana ? (
             <div className="shrink-0 p-1 px-1.5 text-xs">
               Kana
             </div>
           ) : null}
-          {keyboardLedState.shift ? (
-            <div className="shrink-0 p-1 px-1.5 text-xs">
-              Shift
-            </div>
-          ) : null}
         </div>
       </div>
     </div>

ui/src/components/InputField.tsx

@@ -26,7 +26,7 @@ type InputFieldProps = {
 
 type InputFieldWithLabelProps = InputFieldProps & {
   label: React.ReactNode;
-  description?: React.ReactNode | string | null;
+  description?: string | null;
 };
 
 const InputField = forwardRef<HTMLInputElement, InputFieldProps>(function InputField(

ui/src/components/Ipv6NetworkCard.tsx

@@ -17,7 +17,7 @@ export default function Ipv6NetworkCard({
           </h3>
 
           <div className="grid grid-cols-2 gap-x-6 gap-y-2">
-            {networkState?.ipv6_link_local && (
+            {networkState?.dhcp_lease?.ip && (
               <div className="flex flex-col justify-between">
                 <span className="text-sm text-slate-600 dark:text-slate-400">
                   Link-local

ui/src/components/JigglerSetting.tsx

@@ -1,176 +0,0 @@
-import { useEffect, useMemo, useState } from "react";
-import { LuExternalLink } from "react-icons/lu";
-
-import { Button, LinkButton } from "@components/Button";
-import { JsonRpcResponse, useJsonRpc } from "@/hooks/useJsonRpc";
-
-import { InputFieldWithLabel } from "./InputField";
-import { SelectMenuBasic } from "./SelectMenuBasic";
-
-export interface JigglerConfig {
-  inactivity_limit_seconds: number;
-  jitter_percentage: number;
-  schedule_cron_tab: string;
-  timezone?: string;
-}
-
-export function JigglerSetting({
-  onSave,
-  defaultJigglerState,
-}: {
-  onSave: (jigglerConfig: JigglerConfig) => void;
-  defaultJigglerState?: JigglerConfig;
-}) {
-  const [jigglerConfigState, setJigglerConfigState] = useState<JigglerConfig>(
-    defaultJigglerState || {
-      inactivity_limit_seconds: 20,
-      jitter_percentage: 0,
-      schedule_cron_tab: "*/20 * * * * *",
-      timezone: "UTC",
-    },
-  );
-
-  const { send } = useJsonRpc();
-  const [timezones, setTimezones] = useState<string[]>([]);
-
-  useEffect(() => {
-    send("getTimezones", {}, (resp: JsonRpcResponse) => {
-      if ("error" in resp) return;
-      setTimezones(resp.result as string[]);
-    });
-  }, [send]);
-
-  const timezoneOptions = useMemo(
-    () =>
-      timezones.map((timezone: string) => ({
-        value: timezone,
-        label: timezone,
-      })),
-    [timezones],
-  );
-
-  const exampleConfigs = [
-    {
-      name: "Business Hours 9-17",
-      config: {
-        inactivity_limit_seconds: 60,
-        jitter_percentage: 25,
-        schedule_cron_tab: "0 * 9-17 * * 1-5",
-        timezone: jigglerConfigState.timezone || "UTC",
-      },
-    },
-    {
-      name: "Business Hours 8-17",
-      config: {
-        inactivity_limit_seconds: 60,
-        jitter_percentage: 25,
-        schedule_cron_tab: "0 * 8-17 * * 1-5",
-        timezone: jigglerConfigState.timezone || "UTC",
-      },
-    },
-  ];
-
-  return (
-    <div className="space-y-4">
-      <div className="space-y-2">
-        <h4 className="text-sm font-semibold text-gray-900 dark:text-gray-100">
-          Examples
-        </h4>
-        <div className="flex flex-wrap gap-2">
-          {exampleConfigs.map((example, index) => (
-            <Button
-              key={index}
-              size="XS"
-              theme="light"
-              text={example.name}
-              onClick={() => setJigglerConfigState(example.config)}
-            />
-          ))}
-          <LinkButton
-            to="https://crontab.guru/examples.html"
-            size="XS"
-            theme="light"
-            text="More examples"
-            LeadingIcon={LuExternalLink}
-          />
-        </div>
-      </div>
-
-      <div className="grid grid-cols-1 items-end gap-4 md:grid-cols-2">
-        <InputFieldWithLabel
-          required
-          size="SM"
-          label="Cron Schedule"
-          description="Cron expression for scheduling"
-          placeholder="*/20 * * * * *"
-          value={jigglerConfigState.schedule_cron_tab}
-          onChange={e =>
-            setJigglerConfigState({
-              ...jigglerConfigState,
-              schedule_cron_tab: e.target.value,
-            })
-          }
-        />
-
-        <InputFieldWithLabel
-          size="SM"
-          label="Inactivity Limit Seconds"
-          description="Inactivity time before jiggle"
-          value={jigglerConfigState.inactivity_limit_seconds}
-          type="number"
-          min="1"
-          max="100"
-          onChange={e =>
-            setJigglerConfigState({
-              ...jigglerConfigState,
-              inactivity_limit_seconds: Number(e.target.value),
-            })
-          }
-        />
-
-        <InputFieldWithLabel
-          required
-          size="SM"
-          label="Random delay"
-          description="To avoid recognizable patterns"
-          placeholder="25"
-          TrailingElm={<span className="px-2 text-xs text-slate-500">%</span>}
-          value={jigglerConfigState.jitter_percentage}
-          type="number"
-          min="0"
-          max="100"
-          onChange={e =>
-            setJigglerConfigState({
-              ...jigglerConfigState,
-              jitter_percentage: Number(e.target.value),
-            })
-          }
-        />
-
-        <SelectMenuBasic
-          size="SM"
-          label="Timezone"
-          description="Timezone for cron schedule"
-          value={jigglerConfigState.timezone || "UTC"}
-          disabled={timezones.length === 0}
-          onChange={e =>
-            setJigglerConfigState({
-              ...jigglerConfigState,
-              timezone: e.target.value,
-            })
-          }
-          options={timezoneOptions}
-        />
-      </div>
-
-      <div className="flex gap-x-2">
-        <Button
-          size="SM"
-          theme="primary"
-          text="Save Jiggler Config"
-          onClick={() => onSave(jigglerConfigState)}
-        />
-      </div>
-    </div>
-  );
-}

ui/src/components/KvmCard.tsx

@@ -1,6 +1,6 @@
 import { MdConnectWithoutContact } from "react-icons/md";
 import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 import { LuEllipsisVertical } from "react-icons/lu";
 
 import Card from "@components/Card";
@@ -100,12 +100,15 @@ export default function KvmCard({
             )}
           </div>
           <Menu as="div" className="relative inline-block text-left">
-            <MenuButton
+            <div>
-              as={Button}
+              <MenuButton
-              theme="light"
+                as={Button}
-              TrailingIcon={LuEllipsisVertical}
+                theme="light"
-              size="MD"
+                TrailingIcon={LuEllipsisVertical}
-            ></MenuButton>
+                size="MD"
+              ></MenuButton>
+            </div>
+
             <MenuItems
               transition
               className="data-closed:scale-95 data-closed:transform data-closed:opacity-0 data-enter:duration-100 data-leave:duration-75 data-enter:ease-out data-leave:ease-in"

ui/src/components/MacroBar.tsx

@@ -10,7 +10,7 @@ import { useJsonRpc } from "@/hooks/useJsonRpc";
 export default function MacroBar() {
   const { macros, initialized, loadMacros, setSendFn } = useMacrosStore();
   const { executeMacro } = useKeyboard();
-  const { send } = useJsonRpc();
+  const [send] = useJsonRpc();
 
   useEffect(() => {
     setSendFn(send);

ui/src/components/MacroForm.tsx

@@ -1,18 +1,17 @@
 import { useState } from "react";
 import { LuPlus } from "react-icons/lu";
 
+import { KeySequence } from "@/hooks/stores";
 import { Button } from "@/components/Button";
-import FieldLabel from "@/components/FieldLabel";
-import Fieldset from "@/components/Fieldset";
 import { InputFieldWithLabel, FieldError } from "@/components/InputField";
+import Fieldset from "@/components/Fieldset";
 import { MacroStepCard } from "@/components/MacroStepCard";
 import {
   DEFAULT_DELAY,
   MAX_STEPS_PER_MACRO,
   MAX_KEYS_PER_STEP,
 } from "@/constants/macros";
-import { KeySequence } from "@/hooks/stores";
+import FieldLabel from "@/components/FieldLabel";
-import useKeyboardLayout from "@/hooks/useKeyboardLayout";
 
 interface ValidationErrors {
   name?: string;
@@ -45,7 +44,6 @@ export function MacroForm({
   const [keyQueries, setKeyQueries] = useState<Record<number, string>>({});
   const [errors, setErrors] = useState<ValidationErrors>({});
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const { selectedKeyboard } = useKeyboardLayout();
 
   const showTemporaryError = (message: string) => {
     setErrorMessage(message);
@@ -236,7 +234,6 @@ export function MacroForm({
                   }
                   onDelayChange={delay => handleDelayChange(stepIndex, delay)}
                   isLastStep={stepIndex === (macro.steps?.length || 0) - 1}
-                  keyboard={selectedKeyboard}
                 />
               ))}
             </div>

ui/src/components/MacroStepCard.tsx

@@ -1,18 +1,23 @@
-import { useMemo } from "react";
 import { LuArrowUp, LuArrowDown, LuX, LuTrash2 } from "react-icons/lu";
 
 import { Button } from "@/components/Button";
 import { Combobox } from "@/components/Combobox";
 import { SelectMenuBasic } from "@/components/SelectMenuBasic";
 import Card from "@/components/Card";
-import FieldLabel from "@/components/FieldLabel";
+import { keys, modifiers, keyDisplayMap } from "@/keyboardMappings";
 import { MAX_KEYS_PER_STEP, DEFAULT_DELAY } from "@/constants/macros";
-import { KeyboardLayout } from "@/keyboardLayouts";
+import FieldLabel from "@/components/FieldLabel";
-import { keys, modifiers } from "@/keyboardMappings";
 
 // Filter out modifier keys since they're handled in the modifiers section
 const modifierKeyPrefixes = ['Alt', 'Control', 'Shift', 'Meta'];
 
+const keyOptions = Object.keys(keys)
+  .filter(key => !modifierKeyPrefixes.some(prefix => key.startsWith(prefix)))
+  .map(key => ({
+    value: key,
+    label: keyDisplayMap[key] || key,
+  }));
+
 const modifierOptions = Object.keys(modifiers).map(modifier => ({
   value: modifier,
   label: modifier.replace(/^(Control|Alt|Shift|Meta)(Left|Right)$/, "$1 $2"),
@@ -62,7 +67,6 @@ interface MacroStepCardProps {
   onModifierChange: (modifiers: string[]) => void;
   onDelayChange: (delay: number) => void;
   isLastStep: boolean;
-  keyboard: KeyboardLayout
 }
 
 const ensureArray = <T,>(arr: T[] | null | undefined): T[] => {
@@ -80,22 +84,9 @@ export function MacroStepCard({
   keyQuery,
   onModifierChange,
   onDelayChange,
-  isLastStep,
+  isLastStep
-  keyboard
 }: MacroStepCardProps) {
-  const { keyDisplayMap } = keyboard;
+  const getFilteredKeys = () => {
-
-  const keyOptions = useMemo(() =>
-    Object.keys(keys)
-      .filter(key => !modifierKeyPrefixes.some(prefix => key.startsWith(prefix)))
-      .map(key => ({
-        value: key,
-        label: keyDisplayMap[key] || key,
-      })),
-    [keyDisplayMap]
-  );
-  
-  const filteredKeys = useMemo(() => {
     const selectedKeys = ensureArray(step.keys);
     const availableKeys = keyOptions.filter(option => !selectedKeys.includes(option.value));
     
@@ -104,7 +95,7 @@ export function MacroStepCard({
     } else {
       return availableKeys.filter(option => option.label.toLowerCase().includes(keyQuery.toLowerCase()));
     }
-  }, [keyOptions, keyQuery, step.keys]);
+  };
 
   return (
     <Card className="p-4">
@@ -213,7 +204,7 @@ export function MacroStepCard({
               }}
               displayValue={() => keyQuery}
               onInputChange={onKeyQueryChange}
-              options={() => filteredKeys}
+              options={getFilteredKeys}
               disabledMessage="Max keys reached"
               size="SM"
               immediate

ui/src/components/Metric.tsx

@@ -1,180 +0,0 @@
-/* eslint-disable react-refresh/only-export-components */
-import { ComponentProps } from "react";
-import { cva, cx } from "cva";
-
-import { someIterable } from "../utils";
-
-import { GridCard } from "./Card";
-import MetricsChart from "./MetricsChart";
-
-interface ChartPoint {
-  date: number;
-  metric: number | null;
-}
-
-interface MetricProps<T, K extends keyof T> {
-  title: string;
-  description: string;
-  stream?: Map<number, T>;
-  metric?: K;
-  data?: ChartPoint[];
-  gate?: Map<number, unknown>;
-  supported?: boolean;
-  map?: (p: { date: number; metric: number | null }) => ChartPoint;
-  domain?: [number, number];
-  unit: string;
-  heightClassName?: string;
-  referenceValue?: number;
-  badge?: ComponentProps<typeof MetricHeader>["badge"];
-  badgeTheme?: ComponentProps<typeof MetricHeader>["badgeTheme"];
-}
-
-/**
- * Creates a chart array from a metrics map and a metric name.
- *
- * @param metrics - Expected to be ordered from oldest to newest.
- * @param metricName - Name of the metric to create a chart array for.
- */
-export function createChartArray<T, K extends keyof T>(
-  metrics: Map<number, T>,
-  metricName: K,
-) {
-  const result: { date: number; metric: number | null }[] = [];
-  const iter = metrics.entries();
-  let next = iter.next() as IteratorResult<[number, T]>;
-  const nowSeconds = Math.floor(Date.now() / 1000);
-
-  // We want 120 data points, in the chart.
-  const firstDate = Math.min(next.value?.[0] ?? nowSeconds, nowSeconds - 120);
-
-  for (let t = firstDate; t < nowSeconds; t++) {
-    while (!next.done && next.value[0] < t) next = iter.next();
-    const has = !next.done && next.value[0] === t;
-
-    let metric = null;
-    if (has) metric = next.value[1][metricName] as number;
-    result.push({ date: t, metric });
-
-    if (has) next = iter.next();
-  }
-
-  return result;
-}
-
-function computeReferenceValue(points: ChartPoint[]): number | undefined {
-  const values = points
-    .filter(p => p.metric != null && Number.isFinite(p.metric))
-    .map(p => Number(p.metric));
-
-  if (values.length === 0) return undefined;
-
-  const sum = values.reduce((acc, v) => acc + v, 0);
-  const mean = sum / values.length;
-  return Math.round(mean);
-}
-
-const theme = {
-  light:
-    "bg-white text-black border border-slate-800/20 dark:border dark:border-slate-700 dark:bg-slate-800 dark:text-slate-300",
-  danger: "bg-red-500 dark:border-red-700 dark:bg-red-800 dark:text-red-50",
-  primary: "bg-blue-500 dark:border-blue-700 dark:bg-blue-800 dark:text-blue-50",
-};
-
-interface SettingsItemProps {
-  readonly title: string;
-  readonly description: string | React.ReactNode;
-  readonly badge?: string;
-  readonly className?: string;
-  readonly children?: React.ReactNode;
-  readonly badgeTheme?: keyof typeof theme;
-}
-
-export function MetricHeader(props: SettingsItemProps) {
-  const { title, description, badge } = props;
-  const badgeVariants = cva({ variants: { theme: theme } });
-
-  return (
-    <div className="space-y-0.5">
-      <div className="flex items-center gap-x-2">
-        <div className="flex w-full items-center justify-between text-base font-semibold text-black dark:text-white">
-          {title}
-          {badge && (
-            <span
-              className={cx(
-                "ml-2 rounded-sm px-2 py-1 font-mono text-[10px] leading-none font-medium",
-                badgeVariants({ theme: props.badgeTheme ?? "light" }),
-              )}
-            >
-              {badge}
-            </span>
-          )}
-        </div>
-      </div>
-      <div className="text-sm text-slate-700 dark:text-slate-300">{description}</div>
-    </div>
-  );
-}
-
-export function Metric<T, K extends keyof T>({
-  title,
-  description,
-  stream,
-  metric,
-  data,
-  gate,
-  supported,
-  map,
-  domain = [0, 600],
-  unit = "",
-  heightClassName = "h-[127px]",
-  badge,
-  badgeTheme,
-}: MetricProps<T, K>) {
-  const ready = gate ? gate.size > 0 : stream ? stream.size > 0 : true;
-  const supportedFinal =
-    supported ??
-    (stream && metric ? someIterable(stream, ([, s]) => s[metric] !== undefined) : true);
-
-  // Either we let the consumer provide their own chartArray, or we create one from the stream and metric.
-  const raw = data ?? ((stream && metric && createChartArray(stream, metric)) || []);
-
-  // If the consumer provides a map function, we apply it to the raw data.
-  const dataFinal: ChartPoint[] = map ? raw.map(map) : raw;
-
-  // Compute the average value of the metric.
-  const referenceValue = computeReferenceValue(dataFinal);
-
-  return (
-    <div className="space-y-2">
-      <MetricHeader
-        title={title}
-        description={description}
-        badge={badge}
-        badgeTheme={badgeTheme}
-      />
-
-      <GridCard>
-        <div
-          className={`flex ${heightClassName} w-full items-center justify-center text-sm text-slate-500`}
-        >
-          {!ready ? (
-            <div className="flex flex-col items-center space-y-1">
-              <p className="text-slate-700">Waiting for data...</p>
-            </div>
-          ) : supportedFinal ? (
-            <MetricsChart
-              data={dataFinal}
-              domain={domain}
-              unit={unit}
-              referenceValue={referenceValue}
-            />
-          ) : (
-            <div className="flex flex-col items-center space-y-1">
-              <p className="text-black">Metric not supported</p>
-            </div>
-          )}
-        </div>
-      </GridCard>
-    </div>
-  );
-}

ui/src/components/SelectMenuBasic.tsx

@@ -26,7 +26,7 @@ type SelectMenuProps = Pick<
 
 const sizes = {
   XS: "h-[24.5px] pl-3 pr-8 text-xs",
-  SM: "h-[36px] pl-3 pr-8 text-[13px]",
+  SM: "h-[32px] pl-3 pr-8 text-[13px]",
   MD: "h-[40px] pl-4 pr-10 text-sm",
   LG: "h-[48px] pl-4 pr-10 px-5 text-base",
 };
@@ -62,7 +62,7 @@ export const SelectMenuBasic = React.forwardRef<HTMLSelectElement, SelectMenuPro
           "text-sm",
         )}
       >
-        {label && <FieldLabel label={label} id={id} />}
+        {label && <FieldLabel label={label} id={id} as="span" />}
         <Card className="w-auto border! border-solid border-slate-800/30! shadow-xs outline-0 dark:border-slate-300/30!">
           <select
             ref={ref}

ui/src/components/SettingsNestedSection.tsx

@@ -1,11 +0,0 @@
-export default function SettingsNestedSection({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <div className="ml-2 border-l border-slate-800/30 pl-4 dark:border-slate-300/30">
-      {children}
-    </div>
-  );
-}

ui/src/components/SimpleNavbar.tsx

@@ -1,4 +1,4 @@
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 import React from "react";
 
 import Container from "@/components/Container";

ui/src/components/StatChart.tsx

@@ -12,13 +12,13 @@ import {
 
 import CustomTooltip, { CustomTooltipProps } from "@components/CustomTooltip";
 
-export default function MetricsChart({
+export default function StatChart({
   data,
   domain,
   unit,
   referenceValue,
 }: {
-  data: { date: number; metric: number | null | undefined }[];
+  data: { date: number; stat: number | null | undefined }[];
   domain?: [string | number, string | number];
   unit?: string;
   referenceValue?: number;
@@ -33,7 +33,7 @@ export default function MetricsChart({
           strokeLinecap="butt"
           stroke="rgba(30, 41, 59, 0.1)"
         />
-        {referenceValue !== undefined && (
+        {referenceValue && (
           <ReferenceLine
             y={referenceValue}
             strokeDasharray="3 3"
@@ -64,7 +64,7 @@ export default function MetricsChart({
             .map(x => x.date)}
         />
         <YAxis
-          dataKey="metric"
+          dataKey="stat"
           axisLine={false}
           orientation="right"
           tick={{
@@ -73,7 +73,6 @@ export default function MetricsChart({
             fill: "rgba(107, 114, 128, 1)",
           }}
           padding={{ top: 0, bottom: 0 }}
-          allowDecimals
           tickLine={false}
           unit={unit}
           domain={domain || ["auto", "auto"]}
@@ -88,7 +87,7 @@ export default function MetricsChart({
         <Line
           type="monotone"
           isAnimationActive={false}
-          dataKey="metric"
+          dataKey="stat"
           stroke="rgb(29 78 216)"
           strokeLinecap="round"
           strokeWidth={2}