Merge d84c00af94 into b91a995918

.golangci.yml

@@ -4,7 +4,6 @@ linters:
     - forbidigo
     - misspell
     - whitespace
-    - gochecknoinits
   settings:
     forbidigo:
       forbid:
@@ -23,9 +22,6 @@ linters:
       - linters:
           - errcheck
         path: _test.go
-      - linters:
-          - gochecknoinits
-        path: internal/logging/sse.go
     paths:
       - third_party$
       - builtin$

Makefile

@@ -2,8 +2,8 @@ BRANCH    ?= $(shell git rev-parse --abbrev-ref HEAD)
 BUILDDATE ?= $(shell date -u +%FT%T%z)
 BUILDTS   ?= $(shell date -u +%s)
 REVISION  ?= $(shell git rev-parse HEAD)
-VERSION_DEV := 0.4.2-dev$(shell date +%Y%m%d%H%M)
-VERSION := 0.4.1
+VERSION_DEV := 0.4.1-dev$(shell date +%Y%m%d%H%M)
+VERSION := 0.4.0
 
 PROMETHEUS_TAG := github.com/prometheus/common/version
 KVM_PKG_NAME := github.com/jetkvm/kvm

display.go

@@ -370,7 +370,9 @@ func startBacklightTickers() {
 	}
 }
 
-func initDisplay() {
+func init() {
+	ensureConfigLoaded()
+
 	go func() {
 		waitCtrlClientConnected()
 		displayLogger.Info().Msg("setting initial display contents")

jiggler.go

@@ -15,7 +15,9 @@ func rpcGetJigglerState() bool {
 	return jigglerEnabled
 }
 
-func initJiggler() {
+func init() {
+	ensureConfigLoaded()
+
 	go runJiggler()
 }
 

main.go

@@ -75,8 +75,8 @@ func Main() {
 		}
 	}()
 
-	// initialize usb gadget
 	initUsbGadget()
+
 	if err := setInitialVirtualMediaState(); err != nil {
 		logger.Warn().Err(err).Msg("failed to set initial virtual media state")
 	}
@@ -84,10 +84,6 @@ func Main() {
 	if err := initImagesFolder(); err != nil {
 		logger.Warn().Err(err).Msg("failed to init images folder")
 	}
-	initJiggler()
-
-	// initialize display
-	initDisplay()
 
 	go func() {
 		time.Sleep(15 * time.Minute)

ui/src/components/WebRTCVideo.tsx

@@ -674,6 +674,7 @@ export default function WebRTCVideo() {
                 <div className="grid grow grid-rows-(--grid-bodyFooter) overflow-hidden">
                   <div className="relative mx-4 my-2 flex items-center justify-center overflow-hidden">
                     <div className="relative flex h-full w-full items-center justify-center">
+                      <div className="relative inline-block">
                         {/* In relative mouse mode and under https, we enable the pointer lock, and to do so we need a bar to show the user to click on the video to enable mouse control */}
                         <PointerLockBar show={showPointerLockBar} />
                         <video
@@ -687,7 +688,7 @@ export default function WebRTCVideo() {
                           disablePictureInPicture
                           controlsList="nofullscreen"
                           className={cx(
-                            "max-h-full min-h-[384px] max-w-full min-w-[512px] bg-black/50 object-contain transition-all duration-1000",
+                            "z-30 max-h-full min-h-[384px] max-w-full min-w-[512px] bg-black/50 object-contain transition-all duration-1000",
                             {
                               "cursor-none": settings.isCursorHidden,
                               "opacity-0":
@@ -717,6 +718,7 @@ export default function WebRTCVideo() {
                             </div>
                           </div>
                         )}
+                      </div>
                     </div>
                   </div>
                   <VirtualKeyboard />

ui/src/keyboardLayouts.ts

@@ -11,7 +11,7 @@ import { chars as chars_sv_SE, name as name_sv_SE } from "@/keyboardLayouts/sv_S
 import { chars as chars_fr_CH, name as name_fr_CH } from "@/keyboardLayouts/fr_CH"
 import { chars as chars_de_CH, name as name_de_CH } from "@/keyboardLayouts/de_CH"
 
-interface KeyInfo { key: string | number; shift?: boolean, altRight?: boolean }
+type KeyInfo = { key: string | number; shift?: boolean, altRight?: boolean }
 export type KeyCombo = KeyInfo & { deadKey?: boolean, accentKey?: KeyInfo }
 
 export const layouts: Record<string, string> = {

ui/src/keyboardLayouts/fr_CH.ts

@@ -1,5 +1,4 @@
 import { KeyCombo } from "../keyboardLayouts"
-
 import { chars as chars_de_CH } from "./de_CH"
 
 export const name = "Français de Suisse";

ui/src/routes/devices.$id.settings.keyboard.tsx

@@ -25,7 +25,7 @@ export default function SettingsKeyboardRoute() {
       if ("error" in resp) return;
       setKeyboardLayout(resp.result as string);
     });
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+  }, []);
 
   const onKeyboardLayoutChange = useCallback(
     (e: React.ChangeEvent<HTMLSelectElement>) => {

ui/src/routes/devices.$id.settings.tsx

@@ -20,8 +20,8 @@ import { LinkButton } from "@/components/Button";
 import LoadingSpinner from "@/components/LoadingSpinner";
 import { useUiStore } from "@/hooks/stores";
 import useKeyboard from "@/hooks/useKeyboard";
-
 import { FeatureFlag } from "../components/FeatureFlag";
+
 import { cx } from "../cva.config";