mirror of https://github.com/jetkvm/kvm.git
Merge branch 'dev' into r/ota
This commit is contained in:
commit
fe9523b1a7
|
|
@ -74,7 +74,12 @@ func supervise() error {
|
||||||
// run the child binary
|
// run the child binary
|
||||||
cmd := exec.Command(binPath)
|
cmd := exec.Command(binPath)
|
||||||
|
|
||||||
cmd.Env = append(os.Environ(), []string{envChildID + "=" + kvm.GetBuiltAppVersion()}...)
|
lastFilePath := filepath.Join(errorDumpDir, errorDumpLastFile)
|
||||||
|
|
||||||
|
cmd.Env = append(os.Environ(), []string{
|
||||||
|
fmt.Sprintf("%s=%s", envChildID, kvm.GetBuiltAppVersion()),
|
||||||
|
fmt.Sprintf("JETKVM_LAST_ERROR_PATH=%s", lastFilePath),
|
||||||
|
}...)
|
||||||
cmd.Args = os.Args
|
cmd.Args = os.Args
|
||||||
|
|
||||||
logFile, err := os.CreateTemp("", "jetkvm-stdout.log")
|
logFile, err := os.CreateTemp("", "jetkvm-stdout.log")
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,107 @@
|
||||||
|
package kvm
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
failsafeDefaultLastCrashPath = "/userdata/jetkvm/crashdump/last-crash.log"
|
||||||
|
failsafeFile = "/userdata/jetkvm/.enablefailsafe"
|
||||||
|
failsafeLastCrashEnv = "JETKVM_LAST_ERROR_PATH"
|
||||||
|
failsafeEnv = "JETKVM_FORCE_FAILSAFE"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
failsafeOnce sync.Once
|
||||||
|
failsafeCrashLog = ""
|
||||||
|
failsafeModeActive = false
|
||||||
|
failsafeModeReason = ""
|
||||||
|
)
|
||||||
|
|
||||||
|
type FailsafeModeNotification struct {
|
||||||
|
Active bool `json:"active"`
|
||||||
|
Reason string `json:"reason"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// this function has side effects and can be only executed once
|
||||||
|
func checkFailsafeReason() {
|
||||||
|
failsafeOnce.Do(func() {
|
||||||
|
// check if the failsafe environment variable is set
|
||||||
|
if os.Getenv(failsafeEnv) == "1" {
|
||||||
|
failsafeModeActive = true
|
||||||
|
failsafeModeReason = "failsafe_env_set"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if the failsafe file exists
|
||||||
|
if _, err := os.Stat(failsafeFile); err == nil {
|
||||||
|
failsafeModeActive = true
|
||||||
|
failsafeModeReason = "failsafe_file_exists"
|
||||||
|
_ = os.Remove(failsafeFile)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// get the last crash log path from the environment variable
|
||||||
|
lastCrashPath := os.Getenv(failsafeLastCrashEnv)
|
||||||
|
if lastCrashPath == "" {
|
||||||
|
lastCrashPath = failsafeDefaultLastCrashPath
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if the last crash log file exists
|
||||||
|
l := failsafeLogger.With().Str("path", lastCrashPath).Logger()
|
||||||
|
fi, err := os.Lstat(lastCrashPath)
|
||||||
|
if err != nil {
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
l.Warn().Err(err).Msg("failed to stat last crash log")
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if fi.Mode()&os.ModeSymlink != os.ModeSymlink {
|
||||||
|
l.Warn().Msg("last crash log is not a symlink, ignoring")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// open the last crash log file and find if it contains the string "panic"
|
||||||
|
content, err := os.ReadFile(lastCrashPath)
|
||||||
|
if err != nil {
|
||||||
|
l.Warn().Err(err).Msg("failed to read last crash log")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// unlink the last crash log file
|
||||||
|
failsafeCrashLog = string(content)
|
||||||
|
_ = os.Remove(lastCrashPath)
|
||||||
|
|
||||||
|
// TODO: read the goroutine stack trace and check which goroutine is panicking
|
||||||
|
if strings.Contains(failsafeCrashLog, "runtime.cgocall") {
|
||||||
|
failsafeModeActive = true
|
||||||
|
failsafeModeReason = "video"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func notifyFailsafeMode(session *Session) {
|
||||||
|
if !failsafeModeActive || session == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
jsonRpcLogger.Info().Str("reason", failsafeModeReason).Msg("sending failsafe mode notification")
|
||||||
|
|
||||||
|
writeJSONRPCEvent("failsafeMode", FailsafeModeNotification{
|
||||||
|
Active: true,
|
||||||
|
Reason: failsafeModeReason,
|
||||||
|
}, session)
|
||||||
|
}
|
||||||
|
|
||||||
|
func rpcGetFailsafeLogs() (string, error) {
|
||||||
|
if !failsafeModeActive {
|
||||||
|
return "", fmt.Errorf("failsafe mode is not active")
|
||||||
|
}
|
||||||
|
|
||||||
|
return failsafeCrashLog, nil
|
||||||
|
}
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
//go:build linux
|
//go:build linux
|
||||||
|
|
||||||
|
// TODO: use a generator to generate the cgo code for the native functions
|
||||||
|
// there's too much boilerplate code to write manually
|
||||||
|
|
||||||
package native
|
package native
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|
@ -46,7 +49,17 @@ static inline void jetkvm_cgo_setup_rpc_handler() {
|
||||||
*/
|
*/
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
var cgoLock sync.Mutex
|
var (
|
||||||
|
cgoLock sync.Mutex
|
||||||
|
cgoDisabled bool
|
||||||
|
)
|
||||||
|
|
||||||
|
func setCgoDisabled(disabled bool) {
|
||||||
|
cgoLock.Lock()
|
||||||
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
cgoDisabled = disabled
|
||||||
|
}
|
||||||
|
|
||||||
//export jetkvm_go_video_state_handler
|
//export jetkvm_go_video_state_handler
|
||||||
func jetkvm_go_video_state_handler(state *C.jetkvm_video_state_t) {
|
func jetkvm_go_video_state_handler(state *C.jetkvm_video_state_t) {
|
||||||
|
|
@ -91,6 +104,10 @@ func jetkvm_go_rpc_handler(method *C.cchar_t, params *C.cchar_t) {
|
||||||
var eventCodeToNameMap = map[int]string{}
|
var eventCodeToNameMap = map[int]string{}
|
||||||
|
|
||||||
func uiEventCodeToName(code int) string {
|
func uiEventCodeToName(code int) string {
|
||||||
|
if cgoDisabled {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
name, ok := eventCodeToNameMap[code]
|
name, ok := eventCodeToNameMap[code]
|
||||||
if !ok {
|
if !ok {
|
||||||
cCode := C.int(code)
|
cCode := C.int(code)
|
||||||
|
|
@ -103,6 +120,10 @@ func uiEventCodeToName(code int) string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func setUpNativeHandlers() {
|
func setUpNativeHandlers() {
|
||||||
|
if cgoDisabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -114,6 +135,10 @@ func setUpNativeHandlers() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiInit(rotation uint16) {
|
func uiInit(rotation uint16) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -123,6 +148,10 @@ func uiInit(rotation uint16) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiTick() {
|
func uiTick() {
|
||||||
|
if cgoDisabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -130,6 +159,10 @@ func uiTick() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoInit(factor float64) error {
|
func videoInit(factor float64) error {
|
||||||
|
if cgoDisabled {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -143,6 +176,10 @@ func videoInit(factor float64) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoShutdown() {
|
func videoShutdown() {
|
||||||
|
if cgoDisabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -150,6 +187,10 @@ func videoShutdown() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoStart() {
|
func videoStart() {
|
||||||
|
if cgoDisabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -157,6 +198,10 @@ func videoStart() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoStop() {
|
func videoStop() {
|
||||||
|
if cgoDisabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -164,6 +209,10 @@ func videoStop() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoLogStatus() string {
|
func videoLogStatus() string {
|
||||||
|
if cgoDisabled {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -174,6 +223,10 @@ func videoLogStatus() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiSetVar(name string, value string) {
|
func uiSetVar(name string, value string) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -187,6 +240,10 @@ func uiSetVar(name string, value string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiGetVar(name string) string {
|
func uiGetVar(name string) string {
|
||||||
|
if cgoDisabled {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -197,6 +254,10 @@ func uiGetVar(name string) string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiSwitchToScreen(screen string) {
|
func uiSwitchToScreen(screen string) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -206,6 +267,10 @@ func uiSwitchToScreen(screen string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiGetCurrentScreen() string {
|
func uiGetCurrentScreen() string {
|
||||||
|
if cgoDisabled {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -214,6 +279,10 @@ func uiGetCurrentScreen() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiObjAddState(objName string, state string) (bool, error) {
|
func uiObjAddState(objName string, state string) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -226,6 +295,10 @@ func uiObjAddState(objName string, state string) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiObjClearState(objName string, state string) (bool, error) {
|
func uiObjClearState(objName string, state string) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -238,6 +311,10 @@ func uiObjClearState(objName string, state string) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiGetLVGLVersion() string {
|
func uiGetLVGLVersion() string {
|
||||||
|
if cgoDisabled {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -246,6 +323,10 @@ func uiGetLVGLVersion() string {
|
||||||
|
|
||||||
// TODO: use Enum instead of string but it's not a hot path and performance is not a concern now
|
// TODO: use Enum instead of string but it's not a hot path and performance is not a concern now
|
||||||
func uiObjAddFlag(objName string, flag string) (bool, error) {
|
func uiObjAddFlag(objName string, flag string) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -258,6 +339,10 @@ func uiObjAddFlag(objName string, flag string) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiObjClearFlag(objName string, flag string) (bool, error) {
|
func uiObjClearFlag(objName string, flag string) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -278,6 +363,10 @@ func uiObjShow(objName string) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiObjSetOpacity(objName string, opacity int) (bool, error) {
|
func uiObjSetOpacity(objName string, opacity int) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -289,6 +378,10 @@ func uiObjSetOpacity(objName string, opacity int) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiObjFadeIn(objName string, duration uint32) (bool, error) {
|
func uiObjFadeIn(objName string, duration uint32) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -301,6 +394,10 @@ func uiObjFadeIn(objName string, duration uint32) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiObjFadeOut(objName string, duration uint32) (bool, error) {
|
func uiObjFadeOut(objName string, duration uint32) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -313,6 +410,10 @@ func uiObjFadeOut(objName string, duration uint32) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiLabelSetText(objName string, text string) (bool, error) {
|
func uiLabelSetText(objName string, text string) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -330,6 +431,10 @@ func uiLabelSetText(objName string, text string) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiImgSetSrc(objName string, src string) (bool, error) {
|
func uiImgSetSrc(objName string, src string) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -345,6 +450,10 @@ func uiImgSetSrc(objName string, src string) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func uiDispSetRotation(rotation uint16) (bool, error) {
|
func uiDispSetRotation(rotation uint16) (bool, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -357,6 +466,10 @@ func uiDispSetRotation(rotation uint16) (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoGetStreamQualityFactor() (float64, error) {
|
func videoGetStreamQualityFactor() (float64, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -365,6 +478,10 @@ func videoGetStreamQualityFactor() (float64, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoSetStreamQualityFactor(factor float64) error {
|
func videoSetStreamQualityFactor(factor float64) error {
|
||||||
|
if cgoDisabled {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -373,6 +490,10 @@ func videoSetStreamQualityFactor(factor float64) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoGetEDID() (string, error) {
|
func videoGetEDID() (string, error) {
|
||||||
|
if cgoDisabled {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
@ -381,6 +502,10 @@ func videoGetEDID() (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func videoSetEDID(edid string) error {
|
func videoSetEDID(edid string) error {
|
||||||
|
if cgoDisabled {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
cgoLock.Lock()
|
cgoLock.Lock()
|
||||||
defer cgoLock.Unlock()
|
defer cgoLock.Unlock()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type Native struct {
|
type Native struct {
|
||||||
|
disable bool
|
||||||
ready chan struct{}
|
ready chan struct{}
|
||||||
l *zerolog.Logger
|
l *zerolog.Logger
|
||||||
lD *zerolog.Logger
|
lD *zerolog.Logger
|
||||||
|
|
@ -27,6 +28,7 @@ type Native struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type NativeOptions struct {
|
type NativeOptions struct {
|
||||||
|
Disable bool
|
||||||
SystemVersion *semver.Version
|
SystemVersion *semver.Version
|
||||||
AppVersion *semver.Version
|
AppVersion *semver.Version
|
||||||
DisplayRotation uint16
|
DisplayRotation uint16
|
||||||
|
|
@ -74,6 +76,7 @@ func NewNative(opts NativeOptions) *Native {
|
||||||
}
|
}
|
||||||
|
|
||||||
return &Native{
|
return &Native{
|
||||||
|
disable: opts.Disable,
|
||||||
ready: make(chan struct{}),
|
ready: make(chan struct{}),
|
||||||
l: nativeLogger,
|
l: nativeLogger,
|
||||||
lD: displayLogger,
|
lD: displayLogger,
|
||||||
|
|
@ -92,6 +95,12 @@ func NewNative(opts NativeOptions) *Native {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *Native) Start() {
|
func (n *Native) Start() {
|
||||||
|
if n.disable {
|
||||||
|
nativeLogger.Warn().Msg("native is disabled, skipping initialization")
|
||||||
|
setCgoDisabled(true)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// set up singleton
|
// set up singleton
|
||||||
setInstance(n)
|
setInstance(n)
|
||||||
setUpNativeHandlers()
|
setUpNativeHandlers()
|
||||||
|
|
|
||||||
|
|
@ -883,6 +883,10 @@ func rpcSetCloudUrl(apiUrl string, appUrl string) error {
|
||||||
disconnectCloud(fmt.Errorf("cloud url changed from %s to %s", currentCloudURL, apiUrl))
|
disconnectCloud(fmt.Errorf("cloud url changed from %s to %s", currentCloudURL, apiUrl))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if publicIPState != nil {
|
||||||
|
publicIPState.SetCloudflareEndpoint(apiUrl)
|
||||||
|
}
|
||||||
|
|
||||||
if err := SaveConfig(); err != nil {
|
if err := SaveConfig(); err != nil {
|
||||||
return fmt.Errorf("failed to save config: %w", err)
|
return fmt.Errorf("failed to save config: %w", err)
|
||||||
}
|
}
|
||||||
|
|
@ -1202,4 +1206,7 @@ var rpcHandlers = map[string]RPCHandler{
|
||||||
"setKeyboardMacros": {Func: setKeyboardMacros, Params: []string{"params"}},
|
"setKeyboardMacros": {Func: setKeyboardMacros, Params: []string{"params"}},
|
||||||
"getLocalLoopbackOnly": {Func: rpcGetLocalLoopbackOnly},
|
"getLocalLoopbackOnly": {Func: rpcGetLocalLoopbackOnly},
|
||||||
"setLocalLoopbackOnly": {Func: rpcSetLocalLoopbackOnly, Params: []string{"enabled"}},
|
"setLocalLoopbackOnly": {Func: rpcSetLocalLoopbackOnly, Params: []string{"enabled"}},
|
||||||
|
"getFailSafeLogs": {Func: rpcGetFailsafeLogs},
|
||||||
|
"getPublicIPAddresses": {Func: rpcGetPublicIPAddresses, Params: []string{"refresh"}},
|
||||||
|
"checkPublicIPAddresses": {Func: rpcCheckPublicIPAddresses},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
1
log.go
1
log.go
|
|
@ -11,6 +11,7 @@ func ErrorfL(l *zerolog.Logger, format string, err error, args ...any) error {
|
||||||
|
|
||||||
var (
|
var (
|
||||||
logger = logging.GetSubsystemLogger("jetkvm")
|
logger = logging.GetSubsystemLogger("jetkvm")
|
||||||
|
failsafeLogger = logging.GetSubsystemLogger("failsafe")
|
||||||
networkLogger = logging.GetSubsystemLogger("network")
|
networkLogger = logging.GetSubsystemLogger("network")
|
||||||
cloudLogger = logging.GetSubsystemLogger("cloud")
|
cloudLogger = logging.GetSubsystemLogger("cloud")
|
||||||
websocketLogger = logging.GetSubsystemLogger("websocket")
|
websocketLogger = logging.GetSubsystemLogger("websocket")
|
||||||
|
|
|
||||||
9
main.go
9
main.go
|
|
@ -16,6 +16,12 @@ var appCtx context.Context
|
||||||
|
|
||||||
func Main() {
|
func Main() {
|
||||||
logger.Log().Msg("JetKVM Starting Up")
|
logger.Log().Msg("JetKVM Starting Up")
|
||||||
|
|
||||||
|
checkFailsafeReason()
|
||||||
|
if failsafeModeActive {
|
||||||
|
logger.Warn().Str("reason", failsafeModeReason).Msg("failsafe mode activated")
|
||||||
|
}
|
||||||
|
|
||||||
LoadConfig()
|
LoadConfig()
|
||||||
|
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
|
|
@ -52,6 +58,7 @@ func Main() {
|
||||||
// Initialize network
|
// Initialize network
|
||||||
if err := initNetwork(); err != nil {
|
if err := initNetwork(); err != nil {
|
||||||
logger.Error().Err(err).Msg("failed to initialize network")
|
logger.Error().Err(err).Msg("failed to initialize network")
|
||||||
|
// TODO: reset config to default
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -62,7 +69,6 @@ func Main() {
|
||||||
// Initialize mDNS
|
// Initialize mDNS
|
||||||
if err := initMdns(); err != nil {
|
if err := initMdns(); err != nil {
|
||||||
logger.Error().Err(err).Msg("failed to initialize mDNS")
|
logger.Error().Err(err).Msg("failed to initialize mDNS")
|
||||||
os.Exit(1)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
initPrometheus()
|
initPrometheus()
|
||||||
|
|
@ -131,6 +137,7 @@ func Main() {
|
||||||
|
|
||||||
// As websocket client already checks if the cloud token is set, we can start it here.
|
// As websocket client already checks if the cloud token is set, we can start it here.
|
||||||
go RunWebsocketClient()
|
go RunWebsocketClient()
|
||||||
|
initPublicIPState()
|
||||||
|
|
||||||
initSerialPort()
|
initSerialPort()
|
||||||
sigs := make(chan os.Signal, 1)
|
sigs := make(chan os.Signal, 1)
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ var (
|
||||||
|
|
||||||
func initNative(systemVersion *semver.Version, appVersion *semver.Version) {
|
func initNative(systemVersion *semver.Version, appVersion *semver.Version) {
|
||||||
nativeInstance = native.NewNative(native.NativeOptions{
|
nativeInstance = native.NewNative(native.NativeOptions{
|
||||||
|
Disable: failsafeModeActive,
|
||||||
SystemVersion: systemVersion,
|
SystemVersion: systemVersion,
|
||||||
AppVersion: appVersion,
|
AppVersion: appVersion,
|
||||||
DisplayRotation: config.GetDisplayRotation(),
|
DisplayRotation: config.GetDisplayRotation(),
|
||||||
|
|
|
||||||
71
network.go
71
network.go
|
|
@ -3,13 +3,18 @@ package kvm
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/jetkvm/kvm/internal/confparser"
|
"github.com/jetkvm/kvm/internal/confparser"
|
||||||
"github.com/jetkvm/kvm/internal/mdns"
|
"github.com/jetkvm/kvm/internal/mdns"
|
||||||
"github.com/jetkvm/kvm/internal/network/types"
|
"github.com/jetkvm/kvm/internal/network/types"
|
||||||
"github.com/jetkvm/kvm/internal/ota"
|
"github.com/jetkvm/kvm/internal/ota"
|
||||||
|
"github.com/jetkvm/kvm/pkg/myip"
|
||||||
"github.com/jetkvm/kvm/pkg/nmlite"
|
"github.com/jetkvm/kvm/pkg/nmlite"
|
||||||
|
"github.com/jetkvm/kvm/pkg/nmlite/link"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
@ -18,6 +23,7 @@ const (
|
||||||
|
|
||||||
var (
|
var (
|
||||||
networkManager *nmlite.NetworkManager
|
networkManager *nmlite.NetworkManager
|
||||||
|
publicIPState *myip.PublicIPState
|
||||||
)
|
)
|
||||||
|
|
||||||
type RpcNetworkSettings struct {
|
type RpcNetworkSettings struct {
|
||||||
|
|
@ -105,6 +111,13 @@ func triggerTimeSyncOnNetworkStateChange() {
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func setPublicIPReadyState(ipv4Ready, ipv6Ready bool) {
|
||||||
|
if publicIPState == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
publicIPState.SetIPv4AndIPv6(ipv4Ready, ipv6Ready)
|
||||||
|
}
|
||||||
|
|
||||||
func networkStateChanged(_ string, state types.InterfaceState) {
|
func networkStateChanged(_ string, state types.InterfaceState) {
|
||||||
// do not block the main thread
|
// do not block the main thread
|
||||||
go waitCtrlAndRequestDisplayUpdate(true, "network_state_changed")
|
go waitCtrlAndRequestDisplayUpdate(true, "network_state_changed")
|
||||||
|
|
@ -118,6 +131,8 @@ func networkStateChanged(_ string, state types.InterfaceState) {
|
||||||
triggerTimeSyncOnNetworkStateChange()
|
triggerTimeSyncOnNetworkStateChange()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setPublicIPReadyState(state.IPv4Ready, state.IPv6Ready)
|
||||||
|
|
||||||
// always restart mDNS when the network state changes
|
// always restart mDNS when the network state changes
|
||||||
if mDNS != nil {
|
if mDNS != nil {
|
||||||
restartMdns()
|
restartMdns()
|
||||||
|
|
@ -165,6 +180,40 @@ func initNetwork() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func initPublicIPState() {
|
||||||
|
// the feature will be only enabled if the cloud has been adopted
|
||||||
|
// due to privacy reasons
|
||||||
|
|
||||||
|
// but it will be initialized anyway to avoid nil pointer dereferences
|
||||||
|
ps := myip.NewPublicIPState(&myip.PublicIPStateConfig{
|
||||||
|
Logger: networkLogger,
|
||||||
|
CloudflareEndpoint: config.CloudURL,
|
||||||
|
APIEndpoint: "",
|
||||||
|
IPv4: false,
|
||||||
|
IPv6: false,
|
||||||
|
HttpClientGetter: func(family int) *http.Client {
|
||||||
|
transport := http.DefaultTransport.(*http.Transport).Clone()
|
||||||
|
transport.Proxy = config.NetworkConfig.GetTransportProxyFunc()
|
||||||
|
transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
|
||||||
|
netType := network
|
||||||
|
switch family {
|
||||||
|
case link.AfInet:
|
||||||
|
netType = "tcp4"
|
||||||
|
case link.AfInet6:
|
||||||
|
netType = "tcp6"
|
||||||
|
}
|
||||||
|
return (&net.Dialer{}).DialContext(ctx, netType, addr)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &http.Client{
|
||||||
|
Transport: transport,
|
||||||
|
Timeout: 30 * time.Second,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
|
publicIPState = ps
|
||||||
|
}
|
||||||
|
|
||||||
func setHostname(nm *nmlite.NetworkManager, hostname, domain string) error {
|
func setHostname(nm *nmlite.NetworkManager, hostname, domain string) error {
|
||||||
if nm == nil {
|
if nm == nil {
|
||||||
return nil
|
return nil
|
||||||
|
|
@ -313,3 +362,25 @@ func rpcToggleDHCPClient() error {
|
||||||
|
|
||||||
return rpcReboot(true)
|
return rpcReboot(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func rpcGetPublicIPAddresses(refresh bool) ([]myip.PublicIP, error) {
|
||||||
|
if publicIPState == nil {
|
||||||
|
return nil, fmt.Errorf("public IP state not initialized")
|
||||||
|
}
|
||||||
|
|
||||||
|
if refresh {
|
||||||
|
if err := publicIPState.ForceUpdate(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return publicIPState.GetAddresses(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func rpcCheckPublicIPAddresses() error {
|
||||||
|
if publicIPState == nil {
|
||||||
|
return fmt.Errorf("public IP state not initialized")
|
||||||
|
}
|
||||||
|
|
||||||
|
return publicIPState.ForceUpdate()
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,160 @@
|
||||||
|
package myip
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jetkvm/kvm/pkg/nmlite/link"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (ps *PublicIPState) request(ctx context.Context, url string, family int) ([]byte, error) {
|
||||||
|
client := ps.httpClient(family)
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("error creating request: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("error sending request: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("error reading response body: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return body, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkCloudflare uses cdn-cgi/trace to get the public IP address
|
||||||
|
func (ps *PublicIPState) checkCloudflare(ctx context.Context, family int) (*PublicIP, error) {
|
||||||
|
u, err := url.JoinPath(ps.cloudflareEndpoint, "/cdn-cgi/trace")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("error joining path: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := ps.request(ctx, u, family)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
values := make(map[string]string)
|
||||||
|
for line := range strings.SplitSeq(string(body), "\n") {
|
||||||
|
key, value, ok := strings.Cut(line, "=")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
values[key] = value
|
||||||
|
}
|
||||||
|
|
||||||
|
ps.lastUpdated = time.Now()
|
||||||
|
if ts, ok := values["ts"]; ok {
|
||||||
|
if ts, err := strconv.ParseFloat(ts, 64); err == nil {
|
||||||
|
ps.lastUpdated = time.Unix(int64(ts), 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ipStr, ok := values["ip"]
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("no IP address found")
|
||||||
|
}
|
||||||
|
|
||||||
|
ip := net.ParseIP(ipStr)
|
||||||
|
if ip == nil {
|
||||||
|
return nil, fmt.Errorf("invalid IP address: %s", ipStr)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &PublicIP{
|
||||||
|
IPAddress: ip,
|
||||||
|
LastUpdated: ps.lastUpdated,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkAPI uses the API endpoint to get the public IP address
|
||||||
|
func (ps *PublicIPState) checkAPI(_ context.Context, _ int) (*PublicIP, error) {
|
||||||
|
return nil, fmt.Errorf("not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkIPs checks both IPv4 and IPv6 public IP addresses in parallel
|
||||||
|
// and updates the IPAddresses slice with the results
|
||||||
|
func (ps *PublicIPState) checkIPs(ctx context.Context, checkIPv4, checkIPv6 bool) error {
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
var mu sync.Mutex
|
||||||
|
var ips []PublicIP
|
||||||
|
var errors []error
|
||||||
|
|
||||||
|
checkFamily := func(family int, familyName string) {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(f int, name string) {
|
||||||
|
defer wg.Done()
|
||||||
|
|
||||||
|
ip, err := ps.checkIPForFamily(ctx, f)
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
if err != nil {
|
||||||
|
errors = append(errors, fmt.Errorf("%s check failed: %w", name, err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ip != nil {
|
||||||
|
ips = append(ips, *ip)
|
||||||
|
}
|
||||||
|
}(family, familyName)
|
||||||
|
}
|
||||||
|
|
||||||
|
if checkIPv4 {
|
||||||
|
checkFamily(link.AfInet, "IPv4")
|
||||||
|
}
|
||||||
|
|
||||||
|
if checkIPv6 {
|
||||||
|
checkFamily(link.AfInet6, "IPv6")
|
||||||
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
if len(ips) > 0 {
|
||||||
|
ps.mu.Lock()
|
||||||
|
defer ps.mu.Unlock()
|
||||||
|
|
||||||
|
ps.addresses = ips
|
||||||
|
ps.lastUpdated = time.Now()
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(errors) > 0 && len(ips) == 0 {
|
||||||
|
return errors[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *PublicIPState) checkIPForFamily(ctx context.Context, family int) (*PublicIP, error) {
|
||||||
|
if ps.apiEndpoint != "" {
|
||||||
|
ip, err := ps.checkAPI(ctx, family)
|
||||||
|
if err == nil && ip != nil {
|
||||||
|
return ip, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ps.cloudflareEndpoint != "" {
|
||||||
|
ip, err := ps.checkCloudflare(ctx, family)
|
||||||
|
if err == nil && ip != nil {
|
||||||
|
return ip, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, fmt.Errorf("all IP check methods failed for family %d", family)
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,196 @@
|
||||||
|
package myip
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jetkvm/kvm/internal/logging"
|
||||||
|
"github.com/rs/zerolog"
|
||||||
|
)
|
||||||
|
|
||||||
|
type PublicIP struct {
|
||||||
|
IPAddress net.IP `json:"ip"`
|
||||||
|
LastUpdated time.Time `json:"last_updated"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type HttpClientGetter func(family int) *http.Client
|
||||||
|
|
||||||
|
type PublicIPState struct {
|
||||||
|
addresses []PublicIP
|
||||||
|
lastUpdated time.Time
|
||||||
|
|
||||||
|
cloudflareEndpoint string // cdn-cgi/trace domain
|
||||||
|
apiEndpoint string // api endpoint
|
||||||
|
ipv4 bool
|
||||||
|
ipv6 bool
|
||||||
|
httpClient HttpClientGetter
|
||||||
|
logger *zerolog.Logger
|
||||||
|
|
||||||
|
timer *time.Timer
|
||||||
|
ctx context.Context
|
||||||
|
cancel context.CancelFunc
|
||||||
|
mu sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
type PublicIPStateConfig struct {
|
||||||
|
CloudflareEndpoint string
|
||||||
|
APIEndpoint string
|
||||||
|
IPv4 bool
|
||||||
|
IPv6 bool
|
||||||
|
HttpClientGetter HttpClientGetter
|
||||||
|
Logger *zerolog.Logger
|
||||||
|
}
|
||||||
|
|
||||||
|
func stripURLPath(s string) string {
|
||||||
|
parsed, err := url.Parse(s)
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
scheme := parsed.Scheme
|
||||||
|
if scheme != "http" && scheme != "https" {
|
||||||
|
scheme = "https"
|
||||||
|
}
|
||||||
|
|
||||||
|
return fmt.Sprintf("%s://%s", scheme, parsed.Host)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewPublicIPState creates a new PublicIPState
|
||||||
|
func NewPublicIPState(config *PublicIPStateConfig) *PublicIPState {
|
||||||
|
if config.Logger == nil {
|
||||||
|
config.Logger = logging.GetSubsystemLogger("publicip")
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
ps := &PublicIPState{
|
||||||
|
addresses: make([]PublicIP, 0),
|
||||||
|
lastUpdated: time.Now(),
|
||||||
|
cloudflareEndpoint: stripURLPath(config.CloudflareEndpoint),
|
||||||
|
apiEndpoint: config.APIEndpoint,
|
||||||
|
ipv4: config.IPv4,
|
||||||
|
ipv6: config.IPv6,
|
||||||
|
httpClient: config.HttpClientGetter,
|
||||||
|
ctx: ctx,
|
||||||
|
cancel: cancel,
|
||||||
|
logger: config.Logger,
|
||||||
|
}
|
||||||
|
// Start the timer automatically
|
||||||
|
ps.Start()
|
||||||
|
return ps
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetFamily sets if we need to track IPv4 and IPv6 public IP addresses
|
||||||
|
func (ps *PublicIPState) SetIPv4AndIPv6(ipv4, ipv6 bool) {
|
||||||
|
ps.mu.Lock()
|
||||||
|
defer ps.mu.Unlock()
|
||||||
|
|
||||||
|
ps.ipv4 = ipv4
|
||||||
|
ps.ipv6 = ipv6
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetCloudflareEndpoint sets the Cloudflare endpoint
|
||||||
|
func (ps *PublicIPState) SetCloudflareEndpoint(endpoint string) {
|
||||||
|
ps.mu.Lock()
|
||||||
|
defer ps.mu.Unlock()
|
||||||
|
|
||||||
|
ps.cloudflareEndpoint = stripURLPath(endpoint)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetAPIEndpoint sets the API endpoint
|
||||||
|
func (ps *PublicIPState) SetAPIEndpoint(endpoint string) {
|
||||||
|
ps.mu.Lock()
|
||||||
|
defer ps.mu.Unlock()
|
||||||
|
|
||||||
|
ps.apiEndpoint = endpoint
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAddresses returns the public IP addresses
|
||||||
|
func (ps *PublicIPState) GetAddresses() []PublicIP {
|
||||||
|
ps.mu.Lock()
|
||||||
|
defer ps.mu.Unlock()
|
||||||
|
|
||||||
|
return ps.addresses
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start starts the timer loop to check public IP addresses periodically
|
||||||
|
func (ps *PublicIPState) Start() {
|
||||||
|
ps.mu.Lock()
|
||||||
|
defer ps.mu.Unlock()
|
||||||
|
|
||||||
|
// Stop any existing timer
|
||||||
|
if ps.timer != nil {
|
||||||
|
ps.timer.Stop()
|
||||||
|
}
|
||||||
|
|
||||||
|
if ps.cancel != nil {
|
||||||
|
ps.cancel()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create new context and cancel function
|
||||||
|
ps.ctx, ps.cancel = context.WithCancel(context.Background())
|
||||||
|
|
||||||
|
// Start the timer loop in a goroutine
|
||||||
|
go ps.timerLoop(ps.ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop stops the timer loop
|
||||||
|
func (ps *PublicIPState) Stop() {
|
||||||
|
ps.mu.Lock()
|
||||||
|
defer ps.mu.Unlock()
|
||||||
|
|
||||||
|
if ps.cancel != nil {
|
||||||
|
ps.cancel()
|
||||||
|
ps.cancel = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if ps.timer != nil {
|
||||||
|
ps.timer.Stop()
|
||||||
|
ps.timer = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ForceUpdate forces an update of the public IP addresses
|
||||||
|
func (ps *PublicIPState) ForceUpdate() error {
|
||||||
|
return ps.checkIPs(context.Background(), true, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// timerLoop runs the periodic IP check loop
|
||||||
|
func (ps *PublicIPState) timerLoop(ctx context.Context) {
|
||||||
|
timer := time.NewTimer(5 * time.Minute)
|
||||||
|
defer timer.Stop()
|
||||||
|
|
||||||
|
// Store timer reference for Stop() to access
|
||||||
|
ps.mu.Lock()
|
||||||
|
ps.timer = timer
|
||||||
|
checkIPv4 := ps.ipv4
|
||||||
|
checkIPv6 := ps.ipv6
|
||||||
|
ps.mu.Unlock()
|
||||||
|
|
||||||
|
// Perform initial check immediately
|
||||||
|
checkIPs := func() {
|
||||||
|
if err := ps.checkIPs(ctx, checkIPv4, checkIPv6); err != nil {
|
||||||
|
ps.logger.Error().Err(err).Msg("failed to check public IP addresses")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
checkIPs()
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-timer.C:
|
||||||
|
// Perform the check
|
||||||
|
checkIPs()
|
||||||
|
|
||||||
|
// Reset the timer for the next check
|
||||||
|
timer.Reset(5 * time.Minute)
|
||||||
|
|
||||||
|
case <-ctx.Done():
|
||||||
|
// Timer was stopped
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -916,5 +916,11 @@
|
||||||
"wake_on_lan_invalid_mac": "Invalid MAC address",
|
"wake_on_lan_invalid_mac": "Invalid MAC address",
|
||||||
"wake_on_lan_magic_sent_success": "Magic Packet sent successfully",
|
"wake_on_lan_magic_sent_success": "Magic Packet sent successfully",
|
||||||
"welcome_to_jetkvm": "Welcome to JetKVM",
|
"welcome_to_jetkvm": "Welcome to JetKVM",
|
||||||
"welcome_to_jetkvm_description": "Control any computer remotely"
|
"welcome_to_jetkvm_description": "Control any computer remotely","connection_stats_remote_ip_address": "Remote IP Address",
|
||||||
|
"connection_stats_remote_ip_address_description": "The IP address of the remote device.",
|
||||||
|
"connection_stats_remote_ip_address_copy_error": "Failed to copy remote IP address",
|
||||||
|
"connection_stats_remote_ip_address_copy_success": "Remote IP address { ip } copied to clipboard",
|
||||||
|
"public_ip_card_header": "Public IP addresses",
|
||||||
|
"public_ip_card_refresh": "Refresh",
|
||||||
|
"public_ip_card_refresh_error": "Failed to refresh public IP addresses: {error}"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "kvm-ui",
|
"name": "kvm-ui",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2025.10.24.2140",
|
"version": "2025.11.07.2130",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^22.20.0"
|
"node": "^22.20.0"
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
"@xterm/addon-webgl": "^0.18.0",
|
"@xterm/addon-webgl": "^0.18.0",
|
||||||
"@xterm/xterm": "^5.5.0",
|
"@xterm/xterm": "^5.5.0",
|
||||||
"cva": "^1.0.0-beta.4",
|
"cva": "^1.0.0-beta.4",
|
||||||
"dayjs": "^1.11.18",
|
"dayjs": "^1.11.19",
|
||||||
"eslint-import-resolver-alias": "^1.1.2",
|
"eslint-import-resolver-alias": "^1.1.2",
|
||||||
"focus-trap-react": "^11.0.4",
|
"focus-trap-react": "^11.0.4",
|
||||||
"framer-motion": "^12.23.24",
|
"framer-motion": "^12.23.24",
|
||||||
|
|
@ -47,52 +47,52 @@
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-animate-height": "^3.2.3",
|
"react-animate-height": "^3.2.3",
|
||||||
"react-dom": "^19.2.0",
|
"react-dom": "^19.2.0",
|
||||||
"react-hook-form": "^7.65.0",
|
"react-hook-form": "^7.66.0",
|
||||||
"react-hot-toast": "^2.6.0",
|
"react-hot-toast": "^2.6.0",
|
||||||
"react-icons": "^5.5.0",
|
"react-icons": "^5.5.0",
|
||||||
"react-router": "^7.9.5",
|
"react-router": "^7.9.5",
|
||||||
"react-simple-keyboard": "^3.8.131",
|
"react-simple-keyboard": "^3.8.132",
|
||||||
"react-use-websocket": "^4.13.0",
|
"react-use-websocket": "^4.13.0",
|
||||||
"react-xtermjs": "^1.0.10",
|
"react-xtermjs": "^1.0.10",
|
||||||
"recharts": "^3.3.0",
|
"recharts": "^3.3.0",
|
||||||
"tailwind-merge": "^3.3.1",
|
"tailwind-merge": "^3.3.1",
|
||||||
"usehooks-ts": "^3.1.1",
|
"usehooks-ts": "^3.1.1",
|
||||||
"validator": "^13.15.15",
|
"validator": "^13.15.20",
|
||||||
"zustand": "^4.5.2"
|
"zustand": "^4.5.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/compat": "^1.4.1",
|
"@eslint/compat": "^1.4.1",
|
||||||
"@eslint/eslintrc": "^3.3.1",
|
"@eslint/eslintrc": "^3.3.1",
|
||||||
"@eslint/js": "^9.39.0",
|
"@eslint/js": "^9.39.1",
|
||||||
"@inlang/cli": "^3.0.12",
|
"@inlang/cli": "^3.0.12",
|
||||||
"@inlang/paraglide-js": "^2.4.0",
|
"@inlang/paraglide-js": "^2.4.0",
|
||||||
"@inlang/plugin-m-function-matcher": "^2.1.0",
|
"@inlang/plugin-m-function-matcher": "^2.1.0",
|
||||||
"@inlang/plugin-message-format": "^4.0.0",
|
"@inlang/plugin-message-format": "^4.0.0",
|
||||||
"@inlang/sdk": "^2.4.9",
|
"@inlang/sdk": "^2.4.9",
|
||||||
"@tailwindcss/forms": "^0.5.10",
|
"@tailwindcss/forms": "^0.5.10",
|
||||||
"@tailwindcss/postcss": "^4.1.16",
|
"@tailwindcss/postcss": "^4.1.17",
|
||||||
"@tailwindcss/typography": "^0.5.19",
|
"@tailwindcss/typography": "^0.5.19",
|
||||||
"@tailwindcss/vite": "^4.1.16",
|
"@tailwindcss/vite": "^4.1.17",
|
||||||
"@types/react": "^19.2.2",
|
"@types/react": "^19.2.2",
|
||||||
"@types/react-dom": "^19.2.2",
|
"@types/react-dom": "^19.2.2",
|
||||||
"@types/semver": "^7.7.1",
|
"@types/semver": "^7.7.1",
|
||||||
"@types/validator": "^13.15.3",
|
"@types/validator": "^13.15.4",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.46.2",
|
"@typescript-eslint/eslint-plugin": "^8.46.3",
|
||||||
"@typescript-eslint/parser": "^8.46.2",
|
"@typescript-eslint/parser": "^8.46.3",
|
||||||
"@vitejs/plugin-react-swc": "^4.2.0",
|
"@vitejs/plugin-react-swc": "^4.2.1",
|
||||||
"autoprefixer": "^10.4.21",
|
"autoprefixer": "^10.4.21",
|
||||||
"eslint": "^9.38.0",
|
"eslint": "^9.39.1",
|
||||||
"eslint-config-prettier": "^10.1.8",
|
"eslint-config-prettier": "^10.1.8",
|
||||||
"eslint-plugin-import": "^2.32.0",
|
"eslint-plugin-import": "^2.32.0",
|
||||||
"eslint-plugin-prettier": "^5.5.4",
|
"eslint-plugin-prettier": "^5.5.4",
|
||||||
"eslint-plugin-react": "^7.37.5",
|
"eslint-plugin-react": "^7.37.5",
|
||||||
"eslint-plugin-react-hooks": "^7.0.1",
|
"eslint-plugin-react-hooks": "^7.0.1",
|
||||||
"eslint-plugin-react-refresh": "^0.4.24",
|
"eslint-plugin-react-refresh": "^0.4.24",
|
||||||
"globals": "^16.4.0",
|
"globals": "^16.5.0",
|
||||||
"postcss": "^8.5.6",
|
"postcss": "^8.5.6",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"prettier-plugin-tailwindcss": "^0.7.1",
|
"prettier-plugin-tailwindcss": "^0.7.1",
|
||||||
"tailwindcss": "^4.1.16",
|
"tailwindcss": "^4.1.17",
|
||||||
"typescript": "^5.9.3",
|
"typescript": "^5.9.3",
|
||||||
"vite": "^7.1.12",
|
"vite": "^7.1.12",
|
||||||
"vite-tsconfig-paths": "^5.1.4"
|
"vite-tsconfig-paths": "^5.1.4"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
import { LuTriangleAlert } from "react-icons/lu";
|
||||||
|
|
||||||
|
import Card from "@components/Card";
|
||||||
|
|
||||||
|
interface FailsafeModeBannerProps {
|
||||||
|
reason: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FailsafeModeBanner({ reason }: FailsafeModeBannerProps) {
|
||||||
|
const getReasonMessage = () => {
|
||||||
|
switch (reason) {
|
||||||
|
case "video":
|
||||||
|
return "Failsafe Mode Active: Video-related settings are currently unavailable";
|
||||||
|
default:
|
||||||
|
return "Failsafe Mode Active: Some settings may be unavailable";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card>
|
||||||
|
<div className="diagonal-stripes flex items-center gap-3 p-4 rounded">
|
||||||
|
<LuTriangleAlert className="h-5 w-5 flex-shrink-0 text-red-600 dark:text-red-400" />
|
||||||
|
<p className="text-sm font-medium text-red-800 dark:text-white">
|
||||||
|
{getReasonMessage()}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,216 @@
|
||||||
|
import { useState } from "react";
|
||||||
|
import { ExclamationTriangleIcon } from "@heroicons/react/24/solid";
|
||||||
|
import { motion, AnimatePresence } from "framer-motion";
|
||||||
|
import { LuInfo } from "react-icons/lu";
|
||||||
|
|
||||||
|
import { Button } from "@/components/Button";
|
||||||
|
import Card, { GridCard } from "@components/Card";
|
||||||
|
import { JsonRpcResponse, useJsonRpc } from "@/hooks/useJsonRpc";
|
||||||
|
import { useDeviceUiNavigation } from "@/hooks/useAppNavigation";
|
||||||
|
import { useVersion } from "@/hooks/useVersion";
|
||||||
|
import { useDeviceStore } from "@/hooks/stores";
|
||||||
|
import notifications from "@/notifications";
|
||||||
|
import { DOWNGRADE_VERSION } from "@/ui.config";
|
||||||
|
|
||||||
|
import { GitHubIcon } from "./Icons";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
interface FailSafeModeOverlayProps {
|
||||||
|
reason: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface OverlayContentProps {
|
||||||
|
readonly children: React.ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
function OverlayContent({ children }: OverlayContentProps) {
|
||||||
|
return (
|
||||||
|
<GridCard cardClassName="h-full pointer-events-auto outline-hidden!">
|
||||||
|
<div className="flex h-full w-full flex-col items-center justify-center rounded-md border border-slate-800/30 dark:border-slate-300/20">
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
</GridCard>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TooltipProps {
|
||||||
|
readonly children: React.ReactNode;
|
||||||
|
readonly text: string;
|
||||||
|
readonly show: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
function Tooltip({ children, text, show }: TooltipProps) {
|
||||||
|
if (!show) {
|
||||||
|
return <>{children}</>;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="group/tooltip relative">
|
||||||
|
{children}
|
||||||
|
<div className="pointer-events-none absolute bottom-full left-1/2 mb-2 hidden -translate-x-1/2 opacity-0 transition-opacity group-hover/tooltip:block group-hover/tooltip:opacity-100">
|
||||||
|
<Card>
|
||||||
|
<div className="whitespace-nowrap px-2 py-1 text-xs flex items-center gap-1 justify-center">
|
||||||
|
<LuInfo className="h-3 w-3 text-slate-700 dark:text-slate-300" />
|
||||||
|
{text}
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FailSafeModeOverlay({ reason }: FailSafeModeOverlayProps) {
|
||||||
|
const { send } = useJsonRpc();
|
||||||
|
const { navigateTo } = useDeviceUiNavigation();
|
||||||
|
const { appVersion } = useVersion();
|
||||||
|
const { systemVersion } = useDeviceStore();
|
||||||
|
const [isDownloadingLogs, setIsDownloadingLogs] = useState(false);
|
||||||
|
const [hasDownloadedLogs, setHasDownloadedLogs] = useState(false);
|
||||||
|
|
||||||
|
const getReasonCopy = () => {
|
||||||
|
switch (reason) {
|
||||||
|
case "video":
|
||||||
|
return {
|
||||||
|
message:
|
||||||
|
"We've detected an issue with the video capture process. Your device is still running and accessible, but video streaming is temporarily unavailable.",
|
||||||
|
};
|
||||||
|
default:
|
||||||
|
return {
|
||||||
|
message:
|
||||||
|
"A critical process has encountered an issue. Your device is still accessible, but some functionality may be temporarily unavailable.",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const { message } = getReasonCopy();
|
||||||
|
|
||||||
|
const handleReportAndDownloadLogs = () => {
|
||||||
|
setIsDownloadingLogs(true);
|
||||||
|
|
||||||
|
send("getFailSafeLogs", {}, async (resp: JsonRpcResponse) => {
|
||||||
|
setIsDownloadingLogs(false);
|
||||||
|
|
||||||
|
if ("error" in resp) {
|
||||||
|
notifications.error(`Failed to get recovery logs: ${resp.error.message}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Download logs
|
||||||
|
const logContent = resp.result as string;
|
||||||
|
const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
|
||||||
|
const filename = `jetkvm-recovery-${reason}-${timestamp}.txt`;
|
||||||
|
|
||||||
|
const blob = new Blob([logContent], { type: "text/plain" });
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
const a = document.createElement("a");
|
||||||
|
a.href = url;
|
||||||
|
a.download = filename;
|
||||||
|
document.body.appendChild(a);
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||||
|
a.click();
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||||
|
document.body.removeChild(a);
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
|
||||||
|
notifications.success("Crash logs downloaded successfully");
|
||||||
|
setHasDownloadedLogs(true);
|
||||||
|
|
||||||
|
// Open GitHub issue
|
||||||
|
const issueBody = `## Issue Description
|
||||||
|
The \`${reason}\` process encountered an error and failsafe mode was activated.
|
||||||
|
|
||||||
|
**Reason:** \`${reason}\`
|
||||||
|
**Timestamp:** ${new Date().toISOString()}
|
||||||
|
**App Version:** ${appVersion || "Unknown"}
|
||||||
|
**System Version:** ${systemVersion || "Unknown"}
|
||||||
|
|
||||||
|
## Logs
|
||||||
|
Please attach the recovery logs file that was downloaded to your computer:
|
||||||
|
\`${filename}\`
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> Please remove any sensitive information from the logs. The reports are public and can be viewed by anyone.
|
||||||
|
|
||||||
|
## Additional Context
|
||||||
|
[Please describe what you were doing when this occurred]`;
|
||||||
|
|
||||||
|
const issueUrl =
|
||||||
|
`https://github.com/jetkvm/kvm/issues/new?` +
|
||||||
|
`title=${encodeURIComponent(`Recovery Mode: ${reason} process issue`)}&` +
|
||||||
|
`body=${encodeURIComponent(issueBody)}`;
|
||||||
|
|
||||||
|
window.open(issueUrl, "_blank");
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDowngrade = () => {
|
||||||
|
navigateTo(`/settings/general/update?app=${DOWNGRADE_VERSION}`);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AnimatePresence>
|
||||||
|
<motion.div
|
||||||
|
className="aspect-video h-full w-full isolate"
|
||||||
|
initial={{ opacity: 0 }}
|
||||||
|
animate={{ opacity: 1 }}
|
||||||
|
exit={{ opacity: 0, transition: { duration: 0 } }}
|
||||||
|
transition={{
|
||||||
|
duration: 0.4,
|
||||||
|
ease: "easeInOut",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<OverlayContent>
|
||||||
|
<div className="flex max-w-lg flex-col items-start gap-y-1">
|
||||||
|
<ExclamationTriangleIcon className="h-12 w-12 text-yellow-500" />
|
||||||
|
<div className="text-left text-sm text-slate-700 dark:text-slate-300">
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="space-y-2 text-black dark:text-white">
|
||||||
|
<h2 className="text-xl font-bold">Fail safe mode activated</h2>
|
||||||
|
<p className="text-sm">{message}</p>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
|
<Button
|
||||||
|
onClick={handleReportAndDownloadLogs}
|
||||||
|
theme="primary"
|
||||||
|
size="SM"
|
||||||
|
disabled={isDownloadingLogs}
|
||||||
|
LeadingIcon={GitHubIcon}
|
||||||
|
text={isDownloadingLogs ? "Downloading Logs..." : "Download Logs & Report Issue"}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div className="h-8 w-px bg-slate-200 dark:bg-slate-700 block" />
|
||||||
|
<Tooltip text="Download logs first" show={!hasDownloadedLogs}>
|
||||||
|
<Button
|
||||||
|
onClick={() => navigateTo("/settings/general/reboot")}
|
||||||
|
theme="light"
|
||||||
|
size="SM"
|
||||||
|
text="Reboot Device"
|
||||||
|
disabled={!hasDownloadedLogs}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
|
||||||
|
<Tooltip text="Download logs first" show={!hasDownloadedLogs}>
|
||||||
|
<Button
|
||||||
|
size="SM"
|
||||||
|
onClick={handleDowngrade}
|
||||||
|
theme="light"
|
||||||
|
text={`Downgrade to v${DOWNGRADE_VERSION}`}
|
||||||
|
disabled={!hasDownloadedLogs}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</OverlayContent>
|
||||||
|
</motion.div>
|
||||||
|
</AnimatePresence>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,106 @@
|
||||||
|
import { LuRefreshCcw } from "react-icons/lu";
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import { Button } from "@components/Button";
|
||||||
|
import { GridCard } from "@components/Card";
|
||||||
|
import { PublicIP } from "@hooks/stores";
|
||||||
|
import { m } from "@localizations/messages.js";
|
||||||
|
import { JsonRpcResponse, useJsonRpc } from "@hooks/useJsonRpc";
|
||||||
|
import notifications from "@/notifications";
|
||||||
|
import { formatters } from "@/utils";
|
||||||
|
|
||||||
|
|
||||||
|
const TimeAgoLabel = ({ date }: { date: Date }) => {
|
||||||
|
const [timeAgo, setTimeAgo] = useState<string | undefined>(formatters.timeAgo(date));
|
||||||
|
useEffect(() => {
|
||||||
|
const interval = setInterval(() => {
|
||||||
|
setTimeAgo(formatters.timeAgo(date));
|
||||||
|
}, 1000);
|
||||||
|
return () => clearInterval(interval);
|
||||||
|
}, [date]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span className="text-sm text-slate-600 dark:text-slate-400 select-none">
|
||||||
|
{timeAgo}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function PublicIPCard() {
|
||||||
|
const { send } = useJsonRpc();
|
||||||
|
|
||||||
|
const [publicIPs, setPublicIPs] = useState<PublicIP[]>([]);
|
||||||
|
const refreshPublicIPs = useCallback(() => {
|
||||||
|
send("getPublicIPAddresses", { refresh: true }, (resp: JsonRpcResponse) => {
|
||||||
|
setPublicIPs([]);
|
||||||
|
if ("error" in resp) {
|
||||||
|
notifications.error(m.public_ip_card_refresh_error({ error: resp.error.data || m.unknown_error() }));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const publicIPs = resp.result as PublicIP[];
|
||||||
|
// sort the public IPs by IP address
|
||||||
|
// IPv6 addresses are sorted after IPv4 addresses
|
||||||
|
setPublicIPs(publicIPs.sort(({ ip: aIp }, { ip: bIp }) => {
|
||||||
|
const aIsIPv6 = aIp.includes(":");
|
||||||
|
const bIsIPv6 = bIp.includes(":");
|
||||||
|
if (aIsIPv6 && !bIsIPv6) return 1;
|
||||||
|
if (!aIsIPv6 && bIsIPv6) return -1;
|
||||||
|
return aIp.localeCompare(bIp);
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
}, [send, setPublicIPs]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
refreshPublicIPs();
|
||||||
|
}, [refreshPublicIPs]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<GridCard>
|
||||||
|
<div className="animate-fadeIn p-4 text-black opacity-0 animation-duration-500 dark:text-white">
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<h3 className="text-base font-bold text-slate-900 dark:text-white">
|
||||||
|
{m.public_ip_card_header()}
|
||||||
|
</h3>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Button
|
||||||
|
size="XS"
|
||||||
|
theme="light"
|
||||||
|
type="button"
|
||||||
|
className="text-red-500"
|
||||||
|
text={m.public_ip_card_refresh()}
|
||||||
|
LeadingIcon={LuRefreshCcw}
|
||||||
|
onClick={refreshPublicIPs}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{publicIPs.length === 0 ? (
|
||||||
|
<div>
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="animate-pulse space-y-2">
|
||||||
|
<div className="h-4 w-1/4 rounded bg-slate-200 dark:bg-slate-700" />
|
||||||
|
<div className="h-4 w-1/3 rounded bg-slate-200 dark:bg-slate-700" />
|
||||||
|
<div className="h-4 w-1/2 rounded bg-slate-200 dark:bg-slate-700" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="flex gap-x-6 gap-y-2">
|
||||||
|
<div className="flex-1 space-y-2">
|
||||||
|
{publicIPs?.map(ip => (
|
||||||
|
<div key={ip.ip} className="flex justify-between border-slate-800/10 pt-2 dark:border-slate-300/20">
|
||||||
|
<span className="text-sm font-medium">
|
||||||
|
{ip.ip}
|
||||||
|
</span>
|
||||||
|
{ip.last_updated && <TimeAgoLabel date={new Date(ip.last_updated)} />}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</GridCard>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
import { useInterval } from "usehooks-ts";
|
import { useInterval } from "usehooks-ts";
|
||||||
|
import { LuCopy } from "react-icons/lu";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
import { m } from "@localizations/messages.js";
|
import { m } from "@localizations/messages.js";
|
||||||
import { useRTCStore, useUiStore } from "@hooks/stores";
|
import { useRTCStore, useUiStore } from "@hooks/stores";
|
||||||
|
|
@ -6,6 +8,10 @@ import { createChartArray, Metric } from "@components/Metric";
|
||||||
import { SettingsSectionHeader } from "@components/SettingsSectionHeader";
|
import { SettingsSectionHeader } from "@components/SettingsSectionHeader";
|
||||||
import SidebarHeader from "@components/SidebarHeader";
|
import SidebarHeader from "@components/SidebarHeader";
|
||||||
import { someIterable } from "@/utils";
|
import { someIterable } from "@/utils";
|
||||||
|
import { GridCard } from "@components/Card";
|
||||||
|
import { Button } from "@components/Button";
|
||||||
|
import { useCopyToClipboard } from "@components/useCopyToClipBoard";
|
||||||
|
import notifications from "@/notifications";
|
||||||
|
|
||||||
export default function ConnectionStatsSidebar() {
|
export default function ConnectionStatsSidebar() {
|
||||||
const { sidebarView, setSidebarView } = useUiStore();
|
const { sidebarView, setSidebarView } = useUiStore();
|
||||||
|
|
@ -21,6 +27,8 @@ export default function ConnectionStatsSidebar() {
|
||||||
appendDiskDataChannelStats,
|
appendDiskDataChannelStats,
|
||||||
} = useRTCStore();
|
} = useRTCStore();
|
||||||
|
|
||||||
|
const [remoteIPAddress, setRemoteIPAddress] = useState<string | null>(null);
|
||||||
|
|
||||||
useInterval(function collectWebRTCStats() {
|
useInterval(function collectWebRTCStats() {
|
||||||
(async () => {
|
(async () => {
|
||||||
if (!mediaStream) return;
|
if (!mediaStream) return;
|
||||||
|
|
@ -49,6 +57,7 @@ export default function ConnectionStatsSidebar() {
|
||||||
} else if (report.type === "remote-candidate") {
|
} else if (report.type === "remote-candidate") {
|
||||||
if (successfulRemoteCandidateId === report.id) {
|
if (successfulRemoteCandidateId === report.id) {
|
||||||
appendRemoteCandidateStats(report);
|
appendRemoteCandidateStats(report);
|
||||||
|
setRemoteIPAddress(report.address);
|
||||||
}
|
}
|
||||||
} else if (report.type === "data-channel" && report.label === "disk") {
|
} else if (report.type === "data-channel" && report.label === "disk") {
|
||||||
appendDiskDataChannelStats(report);
|
appendDiskDataChannelStats(report);
|
||||||
|
|
@ -93,6 +102,8 @@ export default function ConnectionStatsSidebar() {
|
||||||
return { date: d.date, metric: valueMs };
|
return { date: d.date, metric: valueMs };
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const { copy } = useCopyToClipboard();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="grid h-full grid-rows-(--grid-headerBody) shadow-xs">
|
<div className="grid h-full grid-rows-(--grid-headerBody) shadow-xs">
|
||||||
<SidebarHeader title={m.connection_stats_sidebar()} setSidebarView={setSidebarView} />
|
<SidebarHeader title={m.connection_stats_sidebar()} setSidebarView={setSidebarView} />
|
||||||
|
|
@ -106,6 +117,27 @@ export default function ConnectionStatsSidebar() {
|
||||||
title={m.connection_stats_connection()}
|
title={m.connection_stats_connection()}
|
||||||
description={m.connection_stats_connection_description()}
|
description={m.connection_stats_connection_description()}
|
||||||
/>
|
/>
|
||||||
|
{remoteIPAddress && (
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="text-sm text-slate-600 dark:text-slate-400">
|
||||||
|
{m.connection_stats_remote_ip_address()}
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center">
|
||||||
|
<GridCard cardClassName="rounded-r-none">
|
||||||
|
<div className="h-[34px] flex items-center text-xs select-all text-black font-mono dark:text-white px-3 ">
|
||||||
|
{remoteIPAddress}
|
||||||
|
</div>
|
||||||
|
</GridCard>
|
||||||
|
<Button className="rounded-l-none border-l-slate-800/30 dark:border-slate-300/20" size="SM" type="button" theme="light" LeadingIcon={LuCopy} onClick={async () => {
|
||||||
|
if (await copy(remoteIPAddress)) {
|
||||||
|
notifications.success((m.connection_stats_remote_ip_address_copy_success({ ip: remoteIPAddress })));
|
||||||
|
} else {
|
||||||
|
notifications.error(m.connection_stats_remote_ip_address_copy_error());
|
||||||
|
}
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<Metric
|
<Metric
|
||||||
title={m.connection_stats_round_trip_time()}
|
title={m.connection_stats_round_trip_time()}
|
||||||
description={m.connection_stats_round_trip_time_description()}
|
description={m.connection_stats_round_trip_time_description()}
|
||||||
|
|
|
||||||
|
|
@ -758,6 +758,11 @@ export interface IPv6Address {
|
||||||
flag_tentative?: boolean;
|
flag_tentative?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface PublicIP {
|
||||||
|
ip: string;
|
||||||
|
last_updated: Date;
|
||||||
|
}
|
||||||
|
|
||||||
export interface NetworkState {
|
export interface NetworkState {
|
||||||
interface_name?: string;
|
interface_name?: string;
|
||||||
mac_address?: string;
|
mac_address?: string;
|
||||||
|
|
@ -1003,3 +1008,15 @@ export const useMacrosStore = create<MacrosState>((set, get) => ({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
export interface FailsafeModeState {
|
||||||
|
isFailsafeMode: boolean;
|
||||||
|
reason: string; // "video", "network", etc.
|
||||||
|
setFailsafeMode: (active: boolean, reason: string) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useFailsafeModeStore = create<FailsafeModeState>(set => ({
|
||||||
|
isFailsafeMode: false,
|
||||||
|
reason: "",
|
||||||
|
setFailsafeMode: (active, reason) => set({ isFailsafeMode: active, reason }),
|
||||||
|
}));
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { useCallback, useEffect } from "react";
|
import { useCallback, useEffect } from "react";
|
||||||
|
|
||||||
import { useRTCStore } from "@hooks/stores";
|
import { useRTCStore, useFailsafeModeStore } from "@hooks/stores";
|
||||||
|
|
||||||
export interface JsonRpcRequest {
|
export interface JsonRpcRequest {
|
||||||
jsonrpc: string;
|
jsonrpc: string;
|
||||||
|
|
@ -34,12 +34,51 @@ export const RpcMethodNotFound = -32601;
|
||||||
const callbackStore = new Map<number | string, (resp: JsonRpcResponse) => void>();
|
const callbackStore = new Map<number | string, (resp: JsonRpcResponse) => void>();
|
||||||
let requestCounter = 0;
|
let requestCounter = 0;
|
||||||
|
|
||||||
|
// Map of blocked RPC methods by failsafe reason
|
||||||
|
const blockedMethodsByReason: Record<string, string[]> = {
|
||||||
|
video: [
|
||||||
|
'setStreamQualityFactor',
|
||||||
|
'getEDID',
|
||||||
|
'setEDID',
|
||||||
|
'getVideoLogStatus',
|
||||||
|
'setDisplayRotation',
|
||||||
|
'getVideoSleepMode',
|
||||||
|
'setVideoSleepMode',
|
||||||
|
'getVideoState',
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
export function useJsonRpc(onRequest?: (payload: JsonRpcRequest) => void) {
|
export function useJsonRpc(onRequest?: (payload: JsonRpcRequest) => void) {
|
||||||
const { rpcDataChannel } = useRTCStore();
|
const { rpcDataChannel } = useRTCStore();
|
||||||
|
const { isFailsafeMode, reason } = useFailsafeModeStore();
|
||||||
|
|
||||||
const send = useCallback(
|
const send = useCallback(
|
||||||
async (method: string, params: unknown, callback?: (resp: JsonRpcResponse) => void) => {
|
async (method: string, params: unknown, callback?: (resp: JsonRpcResponse) => void) => {
|
||||||
if (rpcDataChannel?.readyState !== "open") return;
|
if (rpcDataChannel?.readyState !== "open") return;
|
||||||
|
|
||||||
|
// Check if method is blocked in failsafe mode
|
||||||
|
if (isFailsafeMode && reason) {
|
||||||
|
const blockedMethods = blockedMethodsByReason[reason] || [];
|
||||||
|
if (blockedMethods.includes(method)) {
|
||||||
|
console.warn(`RPC method "${method}" is blocked in failsafe mode (reason: ${reason})`);
|
||||||
|
|
||||||
|
// Call callback with error if provided
|
||||||
|
if (callback) {
|
||||||
|
const errorResponse: JsonRpcErrorResponse = {
|
||||||
|
jsonrpc: "2.0",
|
||||||
|
error: {
|
||||||
|
code: -32000,
|
||||||
|
message: "Method unavailable in failsafe mode",
|
||||||
|
data: `This feature is unavailable while in failsafe mode (${reason})`,
|
||||||
|
},
|
||||||
|
id: requestCounter + 1,
|
||||||
|
};
|
||||||
|
callback(errorResponse);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
requestCounter++;
|
requestCounter++;
|
||||||
const payload = { jsonrpc: "2.0", method, params, id: requestCounter };
|
const payload = { jsonrpc: "2.0", method, params, id: requestCounter };
|
||||||
// Store the callback if it exists
|
// Store the callback if it exists
|
||||||
|
|
@ -47,7 +86,7 @@ export function useJsonRpc(onRequest?: (payload: JsonRpcRequest) => void) {
|
||||||
|
|
||||||
rpcDataChannel.send(JSON.stringify(payload));
|
rpcDataChannel.send(JSON.stringify(payload));
|
||||||
},
|
},
|
||||||
[rpcDataChannel]
|
[rpcDataChannel, isFailsafeMode, reason]
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
|
||||||
|
|
@ -363,3 +363,11 @@ video::-webkit-media-controls {
|
||||||
.hide-scrollbar::-webkit-scrollbar {
|
.hide-scrollbar::-webkit-scrollbar {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.diagonal-stripes {
|
||||||
|
background: repeating-linear-gradient(
|
||||||
|
135deg,
|
||||||
|
rgba(255, 0, 0, 0.1) 0 12px, /* red-50 with 20% opacity */
|
||||||
|
transparent 12px 24px
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,24 @@
|
||||||
import { useCallback } from "react";
|
import { useCallback , useState } from "react";
|
||||||
import { useNavigate } from "react-router";
|
import { useNavigate } from "react-router";
|
||||||
|
|
||||||
import { useJsonRpc } from "@hooks/useJsonRpc";
|
import { useJsonRpc } from "@hooks/useJsonRpc";
|
||||||
import { Button } from "@components/Button";
|
import { Button } from "@components/Button";
|
||||||
import { m } from "@localizations/messages.js";
|
import { useFailsafeModeStore } from "@/hooks/stores";
|
||||||
import { sleep } from "@/utils";
|
import { sleep } from "@/utils";
|
||||||
|
import { m } from "@localizations/messages.js";
|
||||||
|
|
||||||
|
import LoadingSpinner from "../components/LoadingSpinner";
|
||||||
|
import { useDeviceUiNavigation } from "../hooks/useAppNavigation";
|
||||||
|
|
||||||
|
// Time to wait after initiating reboot before redirecting to home
|
||||||
|
const REBOOT_REDIRECT_DELAY_MS = 5000;
|
||||||
|
|
||||||
export default function SettingsGeneralRebootRoute() {
|
export default function SettingsGeneralRebootRoute() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const { send } = useJsonRpc();
|
const { send } = useJsonRpc();
|
||||||
|
const [isRebooting, setIsRebooting] = useState(false);
|
||||||
|
const { navigateTo } = useDeviceUiNavigation();
|
||||||
|
const { setFailsafeMode } = useFailsafeModeStore();
|
||||||
|
|
||||||
const onClose = useCallback(async () => {
|
const onClose = useCallback(async () => {
|
||||||
navigate(".."); // back to the devices.$id.settings page
|
navigate(".."); // back to the devices.$id.settings page
|
||||||
|
|
@ -18,17 +28,24 @@ export default function SettingsGeneralRebootRoute() {
|
||||||
}, [navigate]);
|
}, [navigate]);
|
||||||
|
|
||||||
|
|
||||||
const onConfirmUpdate = useCallback(() => {
|
const onConfirmUpdate = useCallback(async () => {
|
||||||
send("reboot", { force: true});
|
setIsRebooting(true);
|
||||||
}, [send]);
|
send("reboot", { force: true });
|
||||||
|
|
||||||
return <Dialog onClose={onClose} onConfirmUpdate={onConfirmUpdate} />;
|
await new Promise(resolve => setTimeout(resolve, REBOOT_REDIRECT_DELAY_MS));
|
||||||
|
setFailsafeMode(false, "");
|
||||||
|
navigateTo("/");
|
||||||
|
}, [navigateTo, send, setFailsafeMode]);
|
||||||
|
|
||||||
|
return <Dialog isRebooting={isRebooting} onClose={onClose} onConfirmUpdate={onConfirmUpdate} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Dialog({
|
export function Dialog({
|
||||||
|
isRebooting,
|
||||||
onClose,
|
onClose,
|
||||||
onConfirmUpdate,
|
onConfirmUpdate,
|
||||||
}: Readonly<{
|
}: Readonly<{
|
||||||
|
isRebooting: boolean;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
onConfirmUpdate: () => void;
|
onConfirmUpdate: () => void;
|
||||||
}>) {
|
}>) {
|
||||||
|
|
@ -37,6 +54,7 @@ export function Dialog({
|
||||||
<div className="pointer-events-auto relative mx-auto text-left">
|
<div className="pointer-events-auto relative mx-auto text-left">
|
||||||
<div>
|
<div>
|
||||||
<ConfirmationBox
|
<ConfirmationBox
|
||||||
|
isRebooting={isRebooting}
|
||||||
onYes={onConfirmUpdate}
|
onYes={onConfirmUpdate}
|
||||||
onNo={onClose}
|
onNo={onClose}
|
||||||
/>
|
/>
|
||||||
|
|
@ -46,9 +64,11 @@ export function Dialog({
|
||||||
}
|
}
|
||||||
|
|
||||||
function ConfirmationBox({
|
function ConfirmationBox({
|
||||||
|
isRebooting,
|
||||||
onYes,
|
onYes,
|
||||||
onNo,
|
onNo,
|
||||||
}: {
|
}: {
|
||||||
|
isRebooting: boolean;
|
||||||
onYes: () => void;
|
onYes: () => void;
|
||||||
onNo: () => void;
|
onNo: () => void;
|
||||||
}) {
|
}) {
|
||||||
|
|
@ -61,11 +81,16 @@ function ConfirmationBox({
|
||||||
<p className="text-sm text-slate-600 dark:text-slate-300">
|
<p className="text-sm text-slate-600 dark:text-slate-300">
|
||||||
{m.general_reboot_description()}
|
{m.general_reboot_description()}
|
||||||
</p>
|
</p>
|
||||||
|
{isRebooting ? (
|
||||||
|
<div className="mt-4 flex items-center justify-center">
|
||||||
|
<LoadingSpinner className="h-6 w-6 text-blue-700 dark:text-blue-500" />
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
<div className="mt-4 flex gap-x-2">
|
<div className="mt-4 flex gap-x-2">
|
||||||
<Button size="SM" theme="light" text={m.general_reboot_yes_button()} onClick={onYes} />
|
<Button size="SM" theme="light" text={m.general_reboot_yes_button()} onClick={onYes} />
|
||||||
<Button size="SM" theme="blank" text={m.general_reboot_no_button()} onClick={onNo} />
|
<Button size="SM" theme="blank" text={m.general_reboot_no_button()} onClick={onNo} />
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import dayjs from "dayjs";
|
||||||
import relativeTime from "dayjs/plugin/relativeTime";
|
import relativeTime from "dayjs/plugin/relativeTime";
|
||||||
import validator from "validator";
|
import validator from "validator";
|
||||||
|
|
||||||
|
import PublicIPCard from "@components/PublicIPCard";
|
||||||
import { NetworkSettings, NetworkState, useNetworkStateStore, useRTCStore } from "@hooks/stores";
|
import { NetworkSettings, NetworkState, useNetworkStateStore, useRTCStore } from "@hooks/stores";
|
||||||
import { useJsonRpc } from "@hooks/useJsonRpc";
|
import { useJsonRpc } from "@hooks/useJsonRpc";
|
||||||
import AutoHeight from "@components/AutoHeight";
|
import AutoHeight from "@components/AutoHeight";
|
||||||
|
|
@ -460,6 +461,8 @@ export default function SettingsNetworkRoute() {
|
||||||
/>
|
/>
|
||||||
</SettingsItem>
|
</SettingsItem>
|
||||||
|
|
||||||
|
<PublicIPCard />
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<AutoHeight>
|
<AutoHeight>
|
||||||
{formState.isLoading ? (
|
{formState.isLoading ? (
|
||||||
|
|
@ -540,7 +543,7 @@ export default function SettingsNetworkRoute() {
|
||||||
</AutoHeight>
|
</AutoHeight>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{ isLLDPAvailable &&
|
{isLLDPAvailable &&
|
||||||
(
|
(
|
||||||
<div className="hidden space-y-4">
|
<div className="hidden space-y-4">
|
||||||
<SettingsItem
|
<SettingsItem
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,11 @@ import {
|
||||||
} from "react-icons/lu";
|
} from "react-icons/lu";
|
||||||
|
|
||||||
import { cx } from "@/cva.config";
|
import { cx } from "@/cva.config";
|
||||||
import { useUiStore } from "@hooks/stores";
|
import { useUiStore, useFailsafeModeStore } from "@hooks/stores";
|
||||||
import Card from "@components/Card";
|
import Card from "@components/Card";
|
||||||
import { LinkButton } from "@components/Button";
|
import { FailsafeModeBanner } from "@components/FailSafeModeBanner";
|
||||||
import { FeatureFlag } from "@components/FeatureFlag";
|
import { FeatureFlag } from "@components/FeatureFlag";
|
||||||
|
import { LinkButton } from "@components/Button";
|
||||||
import { m } from "@localizations/messages.js";
|
import { m } from "@localizations/messages.js";
|
||||||
|
|
||||||
/* TODO: Migrate to using URLs instead of the global state. To simplify the refactoring, we'll keep the global state for now. */
|
/* TODO: Migrate to using URLs instead of the global state. To simplify the refactoring, we'll keep the global state for now. */
|
||||||
|
|
@ -30,6 +31,8 @@ export default function SettingsRoute() {
|
||||||
const [showLeftGradient, setShowLeftGradient] = useState(false);
|
const [showLeftGradient, setShowLeftGradient] = useState(false);
|
||||||
const [showRightGradient, setShowRightGradient] = useState(false);
|
const [showRightGradient, setShowRightGradient] = useState(false);
|
||||||
const { width = 0 } = useResizeObserver({ ref: scrollContainerRef as React.RefObject<HTMLDivElement> });
|
const { width = 0 } = useResizeObserver({ ref: scrollContainerRef as React.RefObject<HTMLDivElement> });
|
||||||
|
const { isFailsafeMode: isFailsafeMode, reason: failsafeReason } = useFailsafeModeStore();
|
||||||
|
const isVideoDisabled = isFailsafeMode && failsafeReason === "video";
|
||||||
|
|
||||||
// Handle scroll position to show/hide gradients
|
// Handle scroll position to show/hide gradients
|
||||||
const handleScroll = () => {
|
const handleScroll = () => {
|
||||||
|
|
@ -158,21 +161,28 @@ export default function SettingsRoute() {
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
</FeatureFlag>
|
</FeatureFlag>
|
||||||
<div className="shrink-0">
|
<div className={cx("shrink-0", {
|
||||||
|
"opacity-50 cursor-not-allowed": isVideoDisabled
|
||||||
|
})}>
|
||||||
<NavLink
|
<NavLink
|
||||||
to="video"
|
to="video"
|
||||||
className={({ isActive }) => (isActive ? "active" : "")}
|
className={({ isActive }) => cx(isActive ? "active" : "", {
|
||||||
>
|
"pointer-events-none": isVideoDisabled
|
||||||
|
})} >
|
||||||
<div className="flex items-center gap-x-2 rounded-md px-2.5 py-2.5 text-sm transition-colors hover:bg-slate-100 dark:hover:bg-slate-700 in-[.active]:bg-blue-50 in-[.active]:text-blue-700! md:in-[.active]:bg-transparent dark:in-[.active]:bg-blue-900 dark:in-[.active]:text-blue-200! dark:md:in-[.active]:bg-transparent">
|
<div className="flex items-center gap-x-2 rounded-md px-2.5 py-2.5 text-sm transition-colors hover:bg-slate-100 dark:hover:bg-slate-700 in-[.active]:bg-blue-50 in-[.active]:text-blue-700! md:in-[.active]:bg-transparent dark:in-[.active]:bg-blue-900 dark:in-[.active]:text-blue-200! dark:md:in-[.active]:bg-transparent">
|
||||||
<LuVideo className="h-4 w-4 shrink-0" />
|
<LuVideo className="h-4 w-4 shrink-0" />
|
||||||
<h1>{m.settings_video()}</h1>
|
<h1>{m.settings_video()}</h1>
|
||||||
</div>
|
</div>
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
<div className="shrink-0">
|
<div className={cx("shrink-0", {
|
||||||
|
"opacity-50 cursor-not-allowed": isVideoDisabled
|
||||||
|
})}>
|
||||||
<NavLink
|
<NavLink
|
||||||
to="hardware"
|
to="hardware"
|
||||||
className={({ isActive }) => (isActive ? "active" : "")}
|
className={({ isActive }) => cx(isActive ? "active" : "", {
|
||||||
|
"pointer-events-none": isVideoDisabled
|
||||||
|
})}
|
||||||
>
|
>
|
||||||
<div className="flex items-center gap-x-2 rounded-md px-2.5 py-2.5 text-sm transition-colors hover:bg-slate-100 dark:hover:bg-slate-700 in-[.active]:bg-blue-50 in-[.active]:text-blue-700! md:in-[.active]:bg-transparent dark:in-[.active]:bg-blue-900 dark:in-[.active]:text-blue-200! dark:md:in-[.active]:bg-transparent">
|
<div className="flex items-center gap-x-2 rounded-md px-2.5 py-2.5 text-sm transition-colors hover:bg-slate-100 dark:hover:bg-slate-700 in-[.active]:bg-blue-50 in-[.active]:text-blue-700! md:in-[.active]:bg-transparent dark:in-[.active]:bg-blue-900 dark:in-[.active]:text-blue-200! dark:md:in-[.active]:bg-transparent">
|
||||||
<LuCpu className="h-4 w-4 shrink-0" />
|
<LuCpu className="h-4 w-4 shrink-0" />
|
||||||
|
|
@ -238,8 +248,8 @@ export default function SettingsRoute() {
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
<div className="w-full md:col-span-6">
|
<div className="w-full md:col-span-6 space-y-4">
|
||||||
{/* <AutoHeight> */}
|
{isFailsafeMode && failsafeReason && <FailsafeModeBanner reason={failsafeReason} />}
|
||||||
<Card className="dark:bg-slate-800">
|
<Card className="dark:bg-slate-800">
|
||||||
<div
|
<div
|
||||||
className="space-y-4 px-8 py-6"
|
className="space-y-4 px-8 py-6"
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ import {
|
||||||
useUpdateStore,
|
useUpdateStore,
|
||||||
useVideoStore,
|
useVideoStore,
|
||||||
VideoState,
|
VideoState,
|
||||||
|
useFailsafeModeStore,
|
||||||
} from "@hooks/stores";
|
} from "@hooks/stores";
|
||||||
import { JsonRpcRequest, JsonRpcResponse, RpcMethodNotFound, useJsonRpc } from "@hooks/useJsonRpc";
|
import { JsonRpcRequest, JsonRpcResponse, RpcMethodNotFound, useJsonRpc } from "@hooks/useJsonRpc";
|
||||||
import { useDeviceUiNavigation } from "@hooks/useAppNavigation";
|
import { useDeviceUiNavigation } from "@hooks/useAppNavigation";
|
||||||
|
|
@ -43,6 +44,7 @@ const ConnectionStatsSidebar = lazy(() => import('@components/sidebar/connection
|
||||||
const Terminal = lazy(() => import('@components/Terminal'));
|
const Terminal = lazy(() => import('@components/Terminal'));
|
||||||
const UpdateInProgressStatusCard = lazy(() => import("@components/UpdateInProgressStatusCard"));
|
const UpdateInProgressStatusCard = lazy(() => import("@components/UpdateInProgressStatusCard"));
|
||||||
import Modal from "@components/Modal";
|
import Modal from "@components/Modal";
|
||||||
|
import { FailSafeModeOverlay } from "@components/FailSafeModeOverlay";
|
||||||
import {
|
import {
|
||||||
ConnectionFailedOverlay,
|
ConnectionFailedOverlay,
|
||||||
LoadingConnectionOverlay,
|
LoadingConnectionOverlay,
|
||||||
|
|
@ -101,6 +103,7 @@ const loader: LoaderFunction = ({ params }: LoaderFunctionArgs) => {
|
||||||
return isOnDevice ? deviceLoader() : cloudLoader(params);
|
return isOnDevice ? deviceLoader() : cloudLoader(params);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
export default function KvmIdRoute() {
|
export default function KvmIdRoute() {
|
||||||
const loaderResp = useLoaderData();
|
const loaderResp = useLoaderData();
|
||||||
// Depending on the mode, we set the appropriate variables
|
// Depending on the mode, we set the appropriate variables
|
||||||
|
|
@ -619,7 +622,8 @@ export default function KvmIdRoute() {
|
||||||
keysDownState, setKeysDownState,
|
keysDownState, setKeysDownState,
|
||||||
setUsbState,
|
setUsbState,
|
||||||
} = useHidStore();
|
} = useHidStore();
|
||||||
const { setHidRpcDisabled } = useRTCStore();
|
const setHidRpcDisabled = useRTCStore(state => state.setHidRpcDisabled);
|
||||||
|
const { setFailsafeMode } = useFailsafeModeStore();
|
||||||
|
|
||||||
const [hasUpdated, setHasUpdated] = useState(false);
|
const [hasUpdated, setHasUpdated] = useState(false);
|
||||||
const { navigateTo } = useDeviceUiNavigation();
|
const { navigateTo } = useDeviceUiNavigation();
|
||||||
|
|
@ -696,6 +700,12 @@ export default function KvmIdRoute() {
|
||||||
setRebootState({ isRebooting: true, postRebootAction });
|
setRebootState({ isRebooting: true, postRebootAction });
|
||||||
navigateTo("/");
|
navigateTo("/");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (resp.method === "failsafeMode") {
|
||||||
|
const { active, reason } = resp.params as { active: boolean; reason: string };
|
||||||
|
console.debug("Setting failsafe mode", { active, reason });
|
||||||
|
setFailsafeMode(active, reason);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const { send } = useJsonRpc(onJsonRpcRequest);
|
const { send } = useJsonRpc(onJsonRpcRequest);
|
||||||
|
|
@ -794,6 +804,8 @@ export default function KvmIdRoute() {
|
||||||
getLocalVersion();
|
getLocalVersion();
|
||||||
}, [appVersion, getLocalVersion]);
|
}, [appVersion, getLocalVersion]);
|
||||||
|
|
||||||
|
const { isFailsafeMode, reason: failsafeReason } = useFailsafeModeStore();
|
||||||
|
|
||||||
const ConnectionStatusElement = useMemo(() => {
|
const ConnectionStatusElement = useMemo(() => {
|
||||||
const isOtherSession = location.pathname.includes("other-session");
|
const isOtherSession = location.pathname.includes("other-session");
|
||||||
if (isOtherSession) return null;
|
if (isOtherSession) return null;
|
||||||
|
|
@ -869,13 +881,15 @@ export default function KvmIdRoute() {
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div className="relative flex h-full w-full overflow-hidden">
|
<div className="relative flex h-full w-full overflow-hidden">
|
||||||
<WebRTCVideo hasConnectionIssues={!!ConnectionStatusElement} />
|
{(isFailsafeMode && failsafeReason === "video") ? null : <WebRTCVideo hasConnectionIssues={!!ConnectionStatusElement} />}
|
||||||
<div
|
<div
|
||||||
style={{ animationDuration: "500ms" }}
|
style={{ animationDuration: "500ms" }}
|
||||||
className="animate-slideUpFade pointer-events-none absolute inset-0 flex items-center justify-center p-4"
|
className="animate-slideUpFade pointer-events-none absolute inset-0 flex items-center justify-center p-4"
|
||||||
>
|
>
|
||||||
<div className="relative h-full max-h-[720px] w-full max-w-[1280px] rounded-md">
|
<div className="relative h-full max-h-[720px] w-full max-w-[1280px] rounded-md">
|
||||||
{!!ConnectionStatusElement && ConnectionStatusElement}
|
{isFailsafeMode && failsafeReason ? (
|
||||||
|
<FailSafeModeOverlay reason={failsafeReason} />
|
||||||
|
) : !!ConnectionStatusElement && ConnectionStatusElement}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<SidebarContainer sidebarView={sidebarView} />
|
<SidebarContainer sidebarView={sidebarView} />
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
export const CLOUD_API = import.meta.env.VITE_CLOUD_API;
|
export const CLOUD_API = import.meta.env.VITE_CLOUD_API;
|
||||||
|
|
||||||
|
export const DOWNGRADE_VERSION = import.meta.env.VITE_DOWNGRADE_VERSION || "0.4.8";
|
||||||
|
|
||||||
// In device mode, an empty string uses the current hostname (the JetKVM device's IP) as the API endpoint
|
// In device mode, an empty string uses the current hostname (the JetKVM device's IP) as the API endpoint
|
||||||
export const DEVICE_API = "";
|
export const DEVICE_API = "";
|
||||||
|
|
|
||||||
1
video.go
1
video.go
|
|
@ -27,6 +27,7 @@ func triggerVideoStateUpdate() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func rpcGetVideoState() (native.VideoState, error) {
|
func rpcGetVideoState() (native.VideoState, error) {
|
||||||
|
notifyFailsafeMode(currentSession)
|
||||||
return lastVideoState, nil
|
return lastVideoState, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -286,9 +286,13 @@ func newSession(config SessionConfig) (*Session, error) {
|
||||||
// Enqueue to ensure ordered processing
|
// Enqueue to ensure ordered processing
|
||||||
session.rpcQueue <- msg
|
session.rpcQueue <- msg
|
||||||
})
|
})
|
||||||
triggerOTAStateUpdate(nil)
|
// Wait for channel to be open before sending initial state
|
||||||
|
d.OnOpen(func() {
|
||||||
|
triggerOTAStateUpdate()
|
||||||
triggerVideoStateUpdate()
|
triggerVideoStateUpdate()
|
||||||
triggerUSBStateUpdate()
|
triggerUSBStateUpdate()
|
||||||
|
notifyFailsafeMode(session)
|
||||||
|
})
|
||||||
case "terminal":
|
case "terminal":
|
||||||
handleTerminalChannel(d)
|
handleTerminalChannel(d)
|
||||||
case "serial":
|
case "serial":
|
||||||
|
|
@ -391,10 +395,12 @@ func newSession(config SessionConfig) (*Session, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func onActiveSessionsChanged() {
|
func onActiveSessionsChanged() {
|
||||||
|
notifyFailsafeMode(currentSession)
|
||||||
requestDisplayUpdate(true, "active_sessions_changed")
|
requestDisplayUpdate(true, "active_sessions_changed")
|
||||||
}
|
}
|
||||||
|
|
||||||
func onFirstSessionConnected() {
|
func onFirstSessionConnected() {
|
||||||
|
notifyFailsafeMode(currentSession)
|
||||||
_ = nativeInstance.VideoStart()
|
_ = nativeInstance.VideoStart()
|
||||||
stopVideoSleepModeTicker()
|
stopVideoSleepModeTicker()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue