config.go

@@ -12,11 +12,11 @@ type WakeOnLanDevice struct {
 }
 
 type UsbConfig struct {
-	VendorId     string `json:"vendor_id"`
+	UsbVendorId     string `json:"usb_vendor_id"`
-	ProductId    string `json:"product_id"`
+	UsbProductId    string `json:"usb_product_id"`
-	SerialNumber string `json:"serial_number"`
+	UsbSerialNumber string `json:"usb_serial_number"`
-	Manufacturer string `json:"manufacturer"`
+	UsbManufacturer string `json:"usb_manufacturer"`
-	Product      string `json:"product"`
+	UsbProduct      string `json:"usb_product"`
 }
 
 type Config struct {
@@ -39,11 +39,11 @@ var defaultConfig = &Config{
 	CloudURL:          "https://api.jetkvm.com",
 	AutoUpdateEnabled: true, // Set a default value
 	UsbConfig: UsbConfig{
-		VendorId:     "0x1d6b", //The Linux Foundation
+		UsbVendorId:     "0x1d6b", //The Linux Foundation
-		ProductId:    "0x0104", //Multifunction Composite Gadget¬
+		UsbProductId:    "0x0104", //Multifunction Composite Gadget¬
-		SerialNumber: "",
+		UsbSerialNumber: "",
-		Manufacturer: "JetKVM",
+		UsbManufacturer: "JetKVM",
-		Product:      "JetKVM USB Emulation Device",
+		UsbProduct:      "JetKVM USB Emulation Device",
 	},
 }
 

ui/src/components/USBConfigDialog.tsx

@@ -13,7 +13,7 @@ export interface UsbConfigState {
   product_id: string;
   serial_number: string;
   manufacturer: string;
-  product: string;
+  product_name: string;
 }
 
 export default function USBConfigDialog({
@@ -79,11 +79,11 @@ function UpdateUsbConfigModal({
   error: string | null;
 }) {
   const [usbConfig, setUsbConfig] = useState({
-    vendor_id: '',
+    usb_vendor_id: '',
-    product_id: '',
+    usb_product_id: '',
-    serial_number: '',
+    usb_serial_number: '',
-    manufacturer: '',
+    usb_manufacturer: '',
-    product: '',
+    usb_product: '',
   })
 
   const [usbConfigState, setUsbConfigState] = useState<UsbConfigState>();
@@ -91,10 +91,11 @@ function UpdateUsbConfigModal({
 
   const syncUsbConfig = useCallback(() => {
     send("getUsbConfig", {}, resp => {
-      if ("error" in resp) {
+      if ("result" in resp) {
-        console.error("Failed to load USB Config:", resp.error);
+        console.info("Successfully synced USB Config: ", resp.result);
-      } else {
         setUsbConfigState(resp.result as UsbConfigState);
+      } else {
+        console.error("Failed to load USB Config:", resp.error);
       }
     });
   }, [send, setUsbConfigState]);
@@ -104,24 +105,24 @@ function UpdateUsbConfigModal({
     syncUsbConfig();
   }, [syncUsbConfig]);
 
-  const handleUsbVendorIdChange = (value: string) => {
+  const handleUsbVendorIdChange = (vendorId: string) => {
-    setUsbConfig({... usbConfig, vendor_id: value})
+    setUsbConfig({... usbConfig, usb_vendor_id: vendorId})
   };
 
-  const handleUsbProductIdChange = (value: string) => {
+  const handleUsbProductIdChange = (productId: string) => {
-    setUsbConfig({... usbConfig, product_id: value})
+    setUsbConfig({... usbConfig, usb_product_id: productId})
   };
 
-  const handleUsbSerialChange = (value: string) => {
+  const handleUsbSerialChange = (serialNumber: string) => {
-    setUsbConfig({... usbConfig, serial_number: value})
+    setUsbConfig({... usbConfig, usb_serial_number: serialNumber})
   };
 
-  const handleUsbManufacturer = (value: string) => {
+  const handleUsbManufacturer = (manufacturer: string) => {
-    setUsbConfig({... usbConfig, manufacturer: value})
+    setUsbConfig({... usbConfig, usb_manufacturer: manufacturer})
   };
 
-  const handleUsbProduct = (value: string) => {
+  const handleUsbProduct = (name: string) => {
-    setUsbConfig({... usbConfig, product: value})
+    setUsbConfig({... usbConfig, usb_product: name})
   };
 
   return (
@@ -142,37 +143,35 @@ function UpdateUsbConfigModal({
           required
           label="Vendor ID"
           placeholder="Enter Vendor ID"
-          pattern="^0[xX][\da-fA-F]{4}$"
+          value={usbConfigState?.vendor_id}
-          defaultValue={usbConfigState?.vendor_id}
           onChange={e => handleUsbVendorIdChange(e.target.value)}
         />
         <InputFieldWithLabel
           required
           label="Product ID"
           placeholder="Enter Product ID"
-          pattern="^0[xX][\da-fA-F]{4}$"
+          value={usbConfigState?.product_id}
-          defaultValue={usbConfigState?.product_id}
           onChange={e => handleUsbProductIdChange(e.target.value)}
         />
         <InputFieldWithLabel
           required
           label="Serial Number"
           placeholder="Enter Serial Number"
-          defaultValue={usbConfigState?.serial_number}
+          value={usbConfigState?.serial_number}
           onChange={e => handleUsbSerialChange(e.target.value)}
         />
         <InputFieldWithLabel
           required
           label="Manufacturer"
           placeholder="Enter Manufacturer"
-          defaultValue={usbConfigState?.manufacturer}
+          value={usbConfigState?.manufacturer}
           onChange={e => handleUsbManufacturer(e.target.value)}
         />
         <InputFieldWithLabel
           required
           label="Product Name"
           placeholder="Enter Product Name"
-          defaultValue={usbConfigState?.product}
+          value={usbConfigState?.product_name}
           onChange={e => handleUsbProduct(e.target.value)}
         />
         <div className="flex gap-x-2">

usb.go

@@ -61,8 +61,8 @@ func init() {
 func UpdateGadgetConfig() error {
 	LoadConfig()
 	gadgetAttrs := [][]string{
-		{"idVendor", config.UsbConfig.VendorId},
+		{"idVendor", config.UsbConfig.UsbVendorId},
-		{"idProduct", config.UsbConfig.ProductId},
+		{"idProduct", config.UsbConfig.UsbProductId},
 	}
 	err := writeGadgetAttrs(kvmGadgetPath, gadgetAttrs)
 	if err != nil {
@@ -72,9 +72,9 @@ func UpdateGadgetConfig() error {
 	log.Printf("Successfully updated usb gadget attributes: %v", gadgetAttrs)
 
 	strAttrs := [][]string{
-		{"serialnumber", config.UsbConfig.SerialNumber},
+		{"serialnumber", config.UsbConfig.UsbSerialNumber},
-		{"manufacturer", config.UsbConfig.Manufacturer},
+		{"manufacturer", config.UsbConfig.UsbManufacturer},
-		{"product", config.UsbConfig.Product},
+		{"product", config.UsbConfig.UsbProduct},
 	}
 	gadgetStringsPath := filepath.Join(kvmGadgetPath, "strings", "0x409")
 	err = os.MkdirAll(gadgetStringsPath, 0755)
@@ -120,8 +120,8 @@ func writeGadgetConfig() error {
 	LoadConfig()
 	err = writeGadgetAttrs(kvmGadgetPath, [][]string{
 		{"bcdUSB", "0x0200"}, //USB 2.0
-		{"idVendor", config.UsbConfig.VendorId},
+		{"idVendor", config.UsbConfig.UsbVendorId},
-		{"idProduct", config.UsbConfig.ProductId},
+		{"idProduct", config.UsbConfig.UsbProductId},
 		{"bcdDevice", "0100"},
 	})
 	if err != nil {
@@ -136,8 +136,8 @@ func writeGadgetConfig() error {
 
 	err = writeGadgetAttrs(gadgetStringsPath, [][]string{
 		{"serialnumber", GetDeviceID()},
-		{"manufacturer", config.UsbConfig.Manufacturer},
+		{"manufacturer", config.UsbConfig.UsbManufacturer},
-		{"product", config.UsbConfig.Product},
+		{"product", config.UsbConfig.UsbProduct},
 	})
 	if err != nil {
 		return err