Merge d84c00af94 into bde0a086ab

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

jsonrpc.go

@@ -681,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) {
@@ -701,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
 }
@@ -1098,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},

serial.go

@@ -142,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 {
@@ -152,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
 		}
@@ -170,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")
@@ -228,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/src/components/ActionBar.tsx

@@ -262,6 +262,23 @@ 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"

ui/src/components/extensions/DCPowerControl.tsx

@@ -8,14 +8,12 @@ import { useJsonRpc } from "@/hooks/useJsonRpc";
 import notifications from "@/notifications";
 import FieldLabel from "@components/FieldLabel";
 import LoadingSpinner from "@components/LoadingSpinner";
-import {SelectMenuBasic} from "@components/SelectMenuBasic";
 
 interface DCPowerState {
   isOn: boolean;
   voltage: number;
   current: number;
   power: number;
-  restoreState: number;
 }
 
 export function DCPowerControl() {
@@ -45,20 +43,6 @@ export function DCPowerControl() {
       getDCPowerState(); // Refresh state after change
     });
   };
-  const handleRestoreChange = (state: number) => {
-    // const state = powerState?.restoreState === 0 ? 1 : powerState?.restoreState === 1 ? 2 : 0;
-    send("setDCRestoreState", { state }, resp => {
-      if ("error" in resp) {
-        notifications.error(
-          `Failed to set DC power state: ${resp.error.data || "Unknown error"}`,
-        );
-        return;
-      }
-      getDCPowerState(); // Refresh state after change
-    });
-  };
-
-
 
   useEffect(() => {
     getDCPowerState();
@@ -79,7 +63,7 @@ export function DCPowerControl() {
           <LoadingSpinner className="h-6 w-6 text-blue-500 dark:text-blue-400" />
         </Card>
       ) : (
-        <Card className="animate-fadeIn opacity-0">
+        <Card className="h-[160px] animate-fadeIn opacity-0">
           <div className="space-y-4 p-3">
             {/* Power Controls */}
             <div className="flex items-center space-x-2">
@@ -100,21 +84,6 @@ export function DCPowerControl() {
                 onClick={() => handlePowerToggle(false)}
               />
             </div>
-            {powerState.restoreState > -1 ? (
-              <div className="flex items-center">
-                <SelectMenuBasic
-                    size="SM"
-                    label="Restore Power Loss"
-                    value={powerState.restoreState}
-                    onChange={e => handleRestoreChange(parseInt(e.target.value))}
-                    options={[
-                      { value: '0', label: "Power OFF" },
-                      { value: '1', label: "Power ON" },
-                      { value: '2', label: "Last State" },
-                    ]}
-                />
-              </div>
-            ) : null}
             <hr className="border-slate-700/30 dark:border-slate-600/30" />
 
             {/* Status Display */}

ui/src/hooks/stores.ts

@@ -308,6 +308,9 @@ interface SettingsState {
   keyboardLayout: string;
   setKeyboardLayout: (layout: string) => void;
 
+  actionBarCtrlAltDel: boolean;
+  setActionBarCtrlAltDel: (enabled: boolean) => void;
+
   keyboardLedSync: KeyboardLedSync;
   setKeyboardLedSync: (sync: KeyboardLedSync) => void;
 
@@ -356,6 +359,9 @@ export const useSettingsStore = create(
       keyboardLayout: "en-US",
       setKeyboardLayout: layout => set({ keyboardLayout: layout }),
 
+      actionBarCtrlAltDel: false,
+      setActionBarCtrlAltDel: enabled => set({ actionBarCtrlAltDel: enabled }),
+
       keyboardLedSync: "auto",
       setKeyboardLedSync: sync => set({ keyboardLedSync: sync }),
 

ui/src/main.tsx

@@ -42,7 +42,6 @@ import SettingsHardwareRoute from "./routes/devices.$id.settings.hardware";
 import SettingsVideoRoute from "./routes/devices.$id.settings.video";
 import SettingsAppearanceRoute from "./routes/devices.$id.settings.appearance";
 import * as SettingsGeneralIndexRoute from "./routes/devices.$id.settings.general._index";
-import SettingsGeneralRebootRoute from "./routes/devices.$id.settings.general.reboot";
 import SettingsGeneralUpdateRoute from "./routes/devices.$id.settings.general.update";
 import SettingsNetworkRoute from "./routes/devices.$id.settings.network";
 import SecurityAccessLocalAuthRoute from "./routes/devices.$id.settings.access.local-auth";
@@ -141,10 +140,6 @@ if (isOnDevice) {
                   index: true,
                   element: <SettingsGeneralIndexRoute.default />,
                 },
-                {
-                  path: "reboot",
-                  element: <SettingsGeneralRebootRoute />,
-                },
                 {
                   path: "update",
                   element: <SettingsGeneralUpdateRoute />,

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

@@ -0,0 +1,28 @@
+
+import { Checkbox } from "@/components/Checkbox";
+import { SettingsPageHeader } from "@/components/SettingsPageheader";
+import { useSettingsStore } from "@/hooks/stores";
+
+import { SettingsItem } from "./devices.$id.settings";
+
+export default function SettingsCtrlAltDelRoute() {
+  const enableCtrlAltDel = useSettingsStore(state => state.actionBarCtrlAltDel);
+  const setEnableCtrlAltDel = useSettingsStore(state => state.setActionBarCtrlAltDel);
+
+  return (
+    <div className="space-y-4">
+      <SettingsPageHeader
+        title="Action Bar"
+        description="Customize the action bar of your JetKVM interface"
+      />
+      <div className="space-y-4">
+        <SettingsItem title="Enable Ctrl-Alt-Del" description="Enable the Ctrl-Alt-Del key on the virtual keyboard">
+          <Checkbox
+            checked={enableCtrlAltDel}
+            onChange={e => setEnableCtrlAltDel(e.target.checked)}
+          />
+        </SettingsItem>
+      </div>
+    </div>
+  );
+}

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

@@ -92,21 +92,6 @@ export default function SettingsGeneralRoute() {
               />
             </SettingsItem>
           </div>
-
-          <div className="mt-2 flex items-center justify-between gap-x-2">
-            <SettingsItem
-              title="Reboot Device"
-              description="Power cycle the JetKVM"
-            />
-            <div>
-              <Button
-                size="SM"
-                theme="light"
-                text="Reboot Device"
-                onClick={() => navigateTo("./reboot")}
-              />
-            </div>
-          </div>
         </div>
       </div>
     </div>

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

@@ -1,66 +0,0 @@
-import { useNavigate } from "react-router-dom";
-import { useCallback } from "react";
-
-import { useJsonRpc } from "@/hooks/useJsonRpc";
-import { Button } from "@components/Button";
-
-export default function SettingsGeneralRebootRoute() {
-  const navigate = useNavigate();
-  const [send] = useJsonRpc();
-
-  const onConfirmUpdate = useCallback(() => {
-    // This is where we send the RPC to the golang binary
-    send("reboot", {force: true});
-  }, [send]);
-
-  {
-    /* TODO: Migrate to using URLs instead of the global state. To simplify the refactoring, we'll keep the global state for now. */
-  }
-  return <Dialog onClose={() => navigate("..")} onConfirmUpdate={onConfirmUpdate} />;
-}
-
-export function Dialog({
-  onClose,
-  onConfirmUpdate,
-}: {
-  onClose: () => void;
-  onConfirmUpdate: () => void;
-}) {
-
-  return (
-    <div className="pointer-events-auto relative mx-auto text-left">
-      <div>
-          <ConfirmationBox
-            onYes={onConfirmUpdate}
-            onNo={onClose}
-          />
-      </div>
-    </div>
-  );
-}
-
-function ConfirmationBox({
-  onYes,
-  onNo,
-}: {
-  onYes: () => void;
-  onNo: () => void;
-}) {
-  return (
-    <div className="flex flex-col items-start justify-start space-y-4 text-left">
-      <div className="text-left">
-        <p className="text-base font-semibold text-black dark:text-white">
-          Reboot JetKVM
-        </p>
-        <p className="text-sm text-slate-600 dark:text-slate-300">
-          Do you want to proceed with rebooting the system?
-        </p>
-
-        <div className="mt-4 flex gap-x-2">
-          <Button size="SM" theme="light" text="Yes" onClick={onYes} />
-          <Button size="SM" theme="blank" text="No" onClick={onNo} />
-        </div>
-      </div>
-    </div>
-  );
-}

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

@@ -116,6 +116,15 @@ export default function SettingsHardwareRoute() {
             }}
           />
         </SettingsItem>
+        {/* <SettingsItem
+          title="Enable Ctrl+Alt+Del Action Bar"
+          description="Enable or disable the action bar action for sending a Ctrl+Alt+Del to the host"
+        >
+          <Checkbox
+            checked={actionBarConfig.ctrlAltDel}
+            onChange={onActionBarItemChange("ctrlAltDel")}
+          />
+        </SettingsItem> */}
         {settings.backlightSettings.max_brightness != 0 && (
           <>
             <SettingsItem