Update xterm dependency to @xterm/xterm and adjust imports accordingly

Makefile

@@ -1,12 +1,22 @@
+BRANCH    ?= $(shell git rev-parse --abbrev-ref HEAD)
+BUILDDATE ?= $(shell date --iso-8601=seconds)
+REVISION  ?= $(shell git rev-parse HEAD)
 VERSION_DEV := 0.3.5-dev$(shell date +%Y%m%d%H%M)
+VERSION_NEXT := 0.3.5-$(shell git rev-parse --short HEAD)-$(shell git describe --tags --abbrev=0)
 VERSION := 0.3.4
 
+GO_LDFLAGS := \
+  -s -w \
+  -X github.com/prometheus/common/version.Branch=$(BRANCH) \
+  -X github.com/prometheus/common/version.BuildDate=$(BUILDDATE) \
+  -X github.com/prometheus/common/version.Revision=$(REVISION)
+
 hash_resource:
 	@shasum -a 256 resource/jetkvm_native | cut -d ' ' -f 1 > resource/jetkvm_native.sha256
 
 build_dev: hash_resource
 	@echo "Building..."
-	GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w -X kvm.builtAppVersion=$(VERSION_DEV)" -o bin/jetkvm_app cmd/main.go
+	GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="$(GO_LDFLAGS) -X kvm.builtAppVersion=$(VERSION_DEV)" -o bin/jetkvm_app cmd/main.go
 
 frontend:
 	cd ui && npm ci && npm run build:device
@@ -19,7 +29,11 @@ dev_release: build_dev
 
 build_release: frontend hash_resource
 	@echo "Building release..."
-	GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w -X kvm.builtAppVersion=$(VERSION)" -o bin/jetkvm_app cmd/main.go
+	GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="$(GO_LDFLAGS) -X kvm.builtAppVersion=$(VERSION)" -o bin/jetkvm_app cmd/main.go
+
+build_next: frontend hash_resource
+	@echo "Building jetkvm-next..."
+	GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="$(GO_LDFLAGS) -X kvm.builtAppVersion=$(VERSION_NEXT)" -o bin/next/jetkvm_app cmd/main.go
 
 release:
 	@if rclone lsf r2://jetkvm-update/app/$(VERSION)/ | grep -q "jetkvm_app"; then \

README.md

@@ -1,46 +1,173 @@
-<div align="center">
-    <img alt="JetKVM logo" src="https://jetkvm.com/logo-blue.png" height="28">
+# jetkvm-next
 
-### KVM
+> jetkvm-next is not affiliated with, nor supported by, JetKVM or BuildJet.
 
-[Discord](https://jetkvm.com/discord) | [Website](https://jetkvm.com) | [Issues](https://github.com/jetkvm/cloud-api/issues) | [Docs](https://jetkvm.com/docs)
+jetkvm-next is a fork of the JetKVM application with various in-progress features merged in from commnunity
+pull requests.
 
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/jetkvm.svg?style=social&label=Follow%20%40JetKVM)](https://twitter.com/jetkvm)
+This branch isn't meant to be pulled into the upstream, and will almost certainly contain some bugs, it's a 
+bleeding-edge build of the software that community members can use to try out new features, or for developers to check
+their upcoming features don't clash with other in-progress PRs.
 
-</div>
+Main repo: https://github.com/jetkvm/kvm
 
-JetKVM is a high-performance, open-source KVM over IP (Keyboard, Video, Mouse) solution designed for efficient remote management of computers, servers, and workstations. Whether you're dealing with boot failures, installing a new operating system, adjusting BIOS settings, or simply taking control of a machine from afar, JetKVM provides the tools to get it done effectively.
+## Current Additional Features
+The below [in-development features](https://github.com/jetkvm/kvm) are currently included in `jetkvm-next`.
+The commits from the developer's working tree and cherry picked into this branch, to check the "version" of the feature,
+compare the commit hash on this branch, to the current hash of the commit(s) in the pull request.
 
-## Features
+- tutman - [Plugin System](https://github.com/jetkvm/kvm/pull/10)
+- SuperQ - [Prometheus Metrics](https://github.com/jetkvm/kvm/pull/6)
+- Nevexo - [Force-release IPv4 addresses on Link Down](https://github.com/jetkvm/kvm/pull/16)
+- Nevexo - [Display backlight brightness control](https://github.com/jetkvm/kvm/pull/17)
+- Nevexo - [CTRL+ALT+DEL Button on Action Bar](https://github.com/jetkvm/kvm/pull/18)
+- tutman - [Clean-up jetkvm_native when app exits](https://github.com/jetkvm/kvm/pull/19)
+- Nevexo - [Only start WebSocket client when necessary](https://github.com/jetkvm/kvm/pull/27)
+- Nevexo - [Restore EDID on Reboot](https://github.com/jetkvm/kvm/pull/34)
+- tutman - [Remove Rounded Corners](https://github.com/jetkvm/kvm/pull/86)
+- antonym - [Update ISO Versions](https://github.com/jetkvm/kvm/pull/78)
+- tutman - [Fix fullscreen video absolute position](https://github.com/jetkvm/kvm/pull/85)
+- jackislanding - [Allow configuring USB IDs](https://github.com/jetkvm/kvm/pulls/90)
+- williamjohnstone - [Multiple Keyboard Layouts](https://github.com/jetkvm/kvm/pull/116)
+- andnic - [USB HID Fix](https://github.com/jetkvm/kvm/pull/113)
+- Nevexo - Add Reboot Button (No PR for this as it's not final)
 
-- **Ultra-low Latency** - 1080p@60FPS video with 30-60ms latency using H.264 encoding. Smooth mouse and keyboard interaction for responsive remote control.
-- **Free & Optional Remote Access** - Remote management via JetKVM Cloud using WebRTC.
-- **Open-source software** - Written in Golang on Linux. Easily customizable through SSH access to the JetKVM device.
+If you're looking to try these features out in jetkvm-next, you should go to the PR and read the authors documentation.
 
-## Contributing
+## next-multisession
+As requested by a few in the [JetKVM Discord](https://jetkvm.com/discord), this tree also includes a branch that enables
+support for multiple sessions connecting to the JetKVM.
 
-We welcome contributions from the community! Whether it's improving the firmware, adding new features, or enhancing documentation, your input is valuable. We also have some rules and taboos here, so please read this page and our [Code of Conduct](/CODE_OF_CONDUCT.md) carefully.
+It's a bit of a bodge implementation, but shows the multiple sessions can be handled by the JetKVM.
 
-## I need help
+Every release of jetkvm-next includes jetkvm-next-multisession in a pre-release, the jetkvm-next-multisession branch is based
+off the main jetkvm-next branch, and applies changes to the session handling code.
 
-The best place to search for answers is our [Documentation](https://jetkvm.com/docs). If you can't find the answer there, check our [Discord Server](https://discord.gg/8MaAhua7NW).
+next-muiltisession does not include any concept of control authority/mutex, so all users connected will have full control
+over the target machine, and you'll be fighting for the cursor with the other user.
 
-## I want to report an issue
+## Installation
+> You should read this section multiple times before even plugging in the JetKVM device.
+> If these instructions don't immediately make sense, then it's probably best to avoid installing
+> jetkvm-next, it's incredibly bleeding-edge, and could explode in a million different ways.
 
-If you've found an issue and want to report it, please check our [Issues](https://github.com/jetkvm/kvm/issues) page. Make sure the description contains information about the firmware version you're using, your platform, and a clear explanation of the steps to reproduce the issue.
+**DISCLAIMER:** This is very much beta, canary, unstable, software there could be bugs that cause
+damage to your JetKVM hardware, such as wearing out the eMMC, breaking the LCD or overheating.
 
-# Development
+**On Windows?:** Install WSL now, it makes life much easier.
 
-JetKVM is written in Go & TypeScript. with some bits and pieces written in C. An intermediate level of Go & TypeScript knowledge is recommended for comfortable programming.
+### Prepare the KVM
+Boot up your KVM, login, and enable SSH access with your SSH public key.
 
-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.
+Test you can login to the KVM with your SSH key, remember the username is `root`.
 
-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.
+### Build your own binary
+While I provide pre-compiled binaries with every [release](https://github.com/nevexo/jetkvm-kvm/releases), you can (and should) build
+the binary yourself, this allows you to analyse the code running on your device, and be familiar with the innerworkings of the JetKVM
+software stack, before you have to start debugging it.
 
-## Backend
+#### You will need:
+- A JavaScript runtime, such as Node.JS ([Bun](https://bun.sh) works fine, but you'll need to adjust the Makefile)
+- Git
+- Go (and the various compilers for ARMv7)
+- make
 
-The backend is written in Go and is responsible for the KVM device management, the cloud API and the cloud web.
+#### Get the code
+Make yourself a directory to keep jetkvm-next in, and clone the repo:
 
-## Frontend
+`git clone https://github.com/nevexo/jetkvm-kvm.git`
 
-The frontend is written in React and TypeScript and is served by the KVM device. It has three build targets: `device`, `development` and `production`. Development is used for development of the cloud version on your local machine, device is used for building the frontend for the KVM device and production is used for building the frontend for the cloud.
+(If you're updating, just do `git pull` in the jetkvm-kvm directory.)
+
+As the next branch is the main development branch of jetkvm-next, it may not build as-is, so you should check-out
+one of the tags for the version you want to use. At the time of writing, that's next-7, but if I forget to update
+the README (I will) you should check [the releases page](https://github.com/nevexo/jetkvm-kvm/releases) for the latest tags.
+
+`git checkout next-7`
+
+If you want multisession, then stick -multisession on the end of the checkout command, but note I usually release multisession
+a little bit later than the default.
+
+Your code will now be in line with the code in the binary released.
+
+#### Build the code
+This will automatically build both the frontend and the jetkvm-next binary. If you don't have the proper ARM compilers
+installed for Go, you'll see some errors, simply Google the package that Go says is missing, and the name of your OS, and you'll
+be able to find it. (If you're on WSL, search for the distro you're using, not Windows)
+
+`make build_next`
+
+#### Deploy the binary
+**NOTE:** There's a bug in next_deploy.sh for all versions next-7 and older, so if you're building one of those, you'll need to
+run these commands first:
+
+```
+mkdir -p bin/next
+touch bin/jetkvm_app
+```
+(the script checks if the normal jetkvm_app binary exists, even though it only needs the one in bin/next, oops!)
+
+Run the deployment script:
+```
+./next_deploy.sh -r [address of kvm]
+```
+
+After a moment, you should see `Deployment complete!` - skip to the bottom to see how to launch it.
+
+### Use the provided binary
+Again, I highly recommend you get familiar with the innerworkings of the JetKVM stack and build your own binaries.
+But, if you can't be bothered with the above:
+
+#### Get the binary
+Simply go to the releases page, and download the latest available image, you can choose the multisession version at this stage, if you wish.
+
+Pop the binary somewhere that you can get to with your terminal (on WSL, that's probably /mnt/c/Users/[yourname]/Downloads)
+
+#### Deploy the binary 
+**NOTE:** The buildroot image on the JetKVM doesn't have support for scp, so this is where it gets interesting.
+
+Use `cat` to send the contents of the jetkvm_app_next binary over to your KVM.
+
+`cat jetkvm_app_next | ssh "root@[IP of JetKVM]" "cat > /userdata/jetkvm/bin/jetkvm_app_next"`
+
+That's it :)
+
+## Run jetkvm-next
+**NOTE:** You need to be somewhat quick at doing this as the kernel watchdog timer will reboot the jetkvm
+if the jetkvm_app binary hasn't been running for a while. You can turn that off by running `echo 'V' > /dev/watchdog`
+
+To run jetkvm-next now, run:
+```
+cd /userdata/jetkvm/bin
+killall jetkvm_app
+killall jetkvm_native
+./jetkvm_app_next
+```
+
+The app will launch, and you can try out the new features! When you reboot the device, it'll return to jetkvm_app.
+
+### Use jetkvm-next by default
+You can rename the jetkvm_app binaries to make the KVM start next by default.
+
+```
+cd /userdata/jetkvm/bin
+killall jetkvm_app
+killall jetkvm_native
+mv jetkvm_app jetkvm_app_old
+mv jetkvm_app_next jetkvm_app
+reboot
+```
+
+Your JetKVM is now running jetkvm-next!
+
+### Going back to stable
+If you followed the above instructions properly, switching back to stable is easy.
+
+```
+cd /userdata/jetkvm/bin
+killall jetkvm_app
+mv jetkvm_app jetkvm_app_next
+mv jetkvm_app_old jetkvm_app
+```
+
+If you lost jetkvm_app_old, then [factory reset](https://jetkvm.com/docs/advanced-usage/factory-reset).

cloud.go

@@ -7,13 +7,14 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"github.com/coder/websocket/wsjson"
 	"time"
 
+	"github.com/coder/websocket/wsjson"
+
 	"github.com/coreos/go-oidc/v3/oidc"
 
-	"github.com/gin-gonic/gin"
 	"github.com/coder/websocket"
+	"github.com/gin-gonic/gin"
 )
 
 type CloudRegisterRequest struct {
@@ -192,7 +193,11 @@ func handleSessionRequest(ctx context.Context, c *websocket.Conn, req WebRTCSess
 		return fmt.Errorf("google identity mismatch")
 	}
 
-	session, err := newSession()
+	session, err := newSession(SessionConfig{
+		ICEServers: req.ICEServers,
+		LocalIP:    req.IP,
+		IsCloud:    true,
+	})
 	if err != nil {
 		_ = wsjson.Write(context.Background(), c, gin.H{"error": err})
 		return err

config.go

@@ -11,17 +11,32 @@ type WakeOnLanDevice struct {
 	MacAddress string `json:"macAddress"`
 }
 
+type UsbConfig struct {
+	VendorId     string `json:"vendor_id"`
+	ProductId    string `json:"product_id"`
+	SerialNumber string `json:"serial_number"`
+	Manufacturer string `json:"manufacturer"`
+	Product      string `json:"product"`
+}
+
 type Config struct {
-	CloudURL          string            `json:"cloud_url"`
-	CloudToken        string            `json:"cloud_token"`
-	GoogleIdentity    string            `json:"google_identity"`
-	JigglerEnabled    bool              `json:"jiggler_enabled"`
-	AutoUpdateEnabled bool              `json:"auto_update_enabled"`
-	IncludePreRelease bool              `json:"include_pre_release"`
-	HashedPassword    string            `json:"hashed_password"`
-	LocalAuthToken    string            `json:"local_auth_token"`
-	LocalAuthMode     string            `json:"localAuthMode"` //TODO: fix it with migration
-	WakeOnLanDevices  []WakeOnLanDevice `json:"wake_on_lan_devices"`
+	CloudURL             string            `json:"cloud_url"`
+	CloudToken           string            `json:"cloud_token"`
+	GoogleIdentity       string            `json:"google_identity"`
+	JigglerEnabled       bool              `json:"jiggler_enabled"`
+	AutoUpdateEnabled    bool              `json:"auto_update_enabled"`
+	KeyboardLayout    string            `json:"keyboard_layout"`
+	IncludePreRelease    bool              `json:"include_pre_release"`
+	HashedPassword       string            `json:"hashed_password"`
+	LocalAuthToken       string            `json:"local_auth_token"`
+	LocalAuthMode        string            `json:"localAuthMode"` //TODO: fix it with migration
+	WakeOnLanDevices     []WakeOnLanDevice `json:"wake_on_lan_devices"`
+	DisplayMaxBrightness int               `json:"display_max_brightness"`
+	DisplayDimAfterSec   int               `json:"display_dim_after_sec"`
+	DisplayOffAfterSec   int               `json:"display_off_after_sec"`
+	EdidString           string            `json:"hdmi_edid_string"`
+	UsbConfig            UsbConfig         `json:"usb_config"`
+	VirtualMediaEnabled  bool              `json:"virtual_media_enabled"`
 }
 
 const configPath = "/userdata/kvm_config.json"