mirror of
https://github.com/jetkvm/kvm.git
synced 2025-09-16 08:38:14 +00:00
Remove LED sync source option and add keypress reporting while still working with devices that haven't been upgraded We return the modifiers as the valid bitmask so that the VirtualKeyboard and InfoBar can represent the correct keys as down. This is important when we have strokes like Left-Control + Right-Control + Keypad-1 (used in switching KVMs and such). Fix handling of modifier keys in client and also removed the extraneous resetKeyboardState. Manage state to eliminate rerenders by judicious use of useMemo. Centralized keyboard layout and localized display maps Move keyboardOptions to useKeyboardLayouts Added translations for display maps. Add documentation on the legacy support. Return the KeysDownState from keyboardReport Clear out the hidErrorRollOver once sent to reset the keyboard to nothing down. Handles the returned KeysDownState from keyboardReport Now passes all logic through handleKeyPress. If we get a state back from a keyboardReport, use it and also enable keypressReport because we now know it's an upgraded device. Added exposition on isoCode management Fix de-DE chars to reflect German E2 keyboard. https://kbdlayout.info/kbdgre2/overview+virtualkeys Ran go modernize Morphs Interface{} to any Ranges over SplitSeq and FieldSeq for iterating splits Used min for end calculation remote_mount.Read Used range 16 in wol.createMagicPacket DID NOT apply the Omitempty cleanup. Strong typed in the typescript realm. Cleanup react state management to enable upgrading Zustand
139 lines
2.9 KiB
Go
139 lines
2.9 KiB
Go
package usbgadget
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"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...)
|
|
}
|
|
|
|
func hexToDecimal(hex string) (int64, error) {
|
|
decimal, err := strconv.ParseInt(hex, 16, 64)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return decimal, nil
|
|
}
|
|
|
|
func decimalToOctal(decimal int64) string {
|
|
return fmt.Sprintf("%04o", decimal)
|
|
}
|
|
|
|
func hexToOctal(hex string) (string, error) {
|
|
hex = strings.ToLower(hex)
|
|
hex = strings.Replace(hex, "0x", "", 1) //remove 0x or 0X
|
|
|
|
decimal, err := hexToDecimal(hex)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
// Convert the decimal integer to an octal string.
|
|
octal := decimalToOctal(decimal)
|
|
return octal, nil
|
|
}
|
|
|
|
func compareFileContent(oldContent []byte, newContent []byte, looserMatch bool) bool {
|
|
if bytes.Equal(oldContent, newContent) {
|
|
return true
|
|
}
|
|
|
|
if len(oldContent) == len(newContent)+1 &&
|
|
bytes.Equal(oldContent[:len(newContent)], newContent) &&
|
|
oldContent[len(newContent)] == 10 {
|
|
return true
|
|
}
|
|
|
|
if len(newContent) == 4 {
|
|
if len(oldContent) < 6 || len(oldContent) > 7 {
|
|
return false
|
|
}
|
|
|
|
if len(oldContent) == 7 && oldContent[6] == 0x0a {
|
|
oldContent = oldContent[:6]
|
|
}
|
|
|
|
oldOctalValue, err := hexToOctal(string(oldContent))
|
|
if err != nil {
|
|
return false
|
|
}
|
|
|
|
if oldOctalValue == string(newContent) {
|
|
return true
|
|
}
|
|
}
|
|
|
|
if looserMatch {
|
|
oldContentStr := strings.TrimSpace(string(oldContent))
|
|
newContentStr := strings.TrimSpace(string(newContent))
|
|
|
|
return oldContentStr == newContentStr
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func (u *UsbGadget) logWithSuppression(counterName string, every int, logger *zerolog.Logger, err error, msg string, args ...any) {
|
|
u.logSuppressionLock.Lock()
|
|
defer u.logSuppressionLock.Unlock()
|
|
|
|
if _, ok := u.logSuppressionCounter[counterName]; !ok {
|
|
u.logSuppressionCounter[counterName] = 0
|
|
} else {
|
|
u.logSuppressionCounter[counterName]++
|
|
}
|
|
|
|
l := logger.With().Int("counter", u.logSuppressionCounter[counterName]).Logger()
|
|
|
|
if u.logSuppressionCounter[counterName]%every == 0 {
|
|
if err != nil {
|
|
l.Error().Err(err).Msgf(msg, args...)
|
|
} else {
|
|
l.Error().Msgf(msg, args...)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (u *UsbGadget) resetLogSuppressionCounter(counterName string) {
|
|
u.logSuppressionLock.Lock()
|
|
defer u.logSuppressionLock.Unlock()
|
|
|
|
if _, ok := u.logSuppressionCounter[counterName]; !ok {
|
|
u.logSuppressionCounter[counterName] = 0
|
|
}
|
|
}
|