Merge ffb5bb544b into 1ce63664c0

Also cleaned up the loader function error-state returns

config.go

@@ -177,7 +177,8 @@ func getDefaultConfig() Config {
 			_ = confparser.SetDefaultsAndValidate(c)
 			return c
 		}(),
-		DefaultLogLevel: "INFO",
+		DefaultLogLevel:    "INFO",
+		VideoQualityFactor: 1.0,
 	}
 }
 

internal/native/cgo/ctrl.c

@@ -306,7 +306,7 @@ int jetkvm_ui_add_flag(const char *obj_name, const char *flag_name) {
     if (obj == NULL) {
         return -1;
     }
-    
+
     lv_obj_flag_t flag_val = str_to_lv_obj_flag(flag_name);
     if (flag_val == 0)
     {
@@ -368,7 +368,7 @@ void jetkvm_video_stop() {
 }
 
 int jetkvm_video_set_quality_factor(float quality_factor) {
-    if (quality_factor < 0 || quality_factor > 1) {
+    if (quality_factor <= 0 || quality_factor > 1) {
         return -1;
     }
     video_set_quality_factor(quality_factor);
@@ -417,4 +417,4 @@ void jetkvm_crash() {
     // let's call a function that will crash the program
     int* p = 0;
     *p = 0;
-}
+}

internal/native/cgo/video.c

@@ -235,7 +235,7 @@ int video_init(float factor)
 {
     detect_sleep_mode();
 
-    if (factor < 0 || factor > 1) {
+    if (factor <= 0 || factor > 1) {
         factor = 1.0f;
     }
     quality_factor = factor;

internal/native/native.go

@@ -69,7 +69,7 @@ func NewNative(opts NativeOptions) *Native {
 	sleepModeSupported := isSleepModeSupported()
 
 	defaultQualityFactor := opts.DefaultQualityFactor
-	if defaultQualityFactor < 0 || defaultQualityFactor > 1 {
+	if defaultQualityFactor <= 0 || defaultQualityFactor > 1 {
 		defaultQualityFactor = 1.0
 	}
 

jsonrpc.go

@@ -177,10 +177,8 @@ func rpcReboot(force bool) error {
 	return hwReboot(force, nil, 0)
 }
 
-var streamFactor = 1.0
-
 func rpcGetStreamQualityFactor() (float64, error) {
-	return streamFactor, nil
+	return config.VideoQualityFactor, nil
 }
 
 func rpcSetStreamQualityFactor(factor float64) error {
@@ -190,7 +188,10 @@ func rpcSetStreamQualityFactor(factor float64) error {
 		return err
 	}
 
-	streamFactor = factor
+	config.VideoQualityFactor = factor
+	if err := SaveConfig(); err != nil {
+		return fmt.Errorf("failed to save config: %w", err)
+	}
 	return nil
 }
 

ui/src/main.tsx

@@ -73,10 +73,10 @@ export async function checkDeviceAuth() {
     .GET(`${DEVICE_API}/device/status`)
     .then(res => res.json() as Promise<DeviceStatus>);
 
-  if (!res.isSetup) return redirect("/welcome");
+  if (!res.isSetup) throw redirect("/welcome");
 
   const deviceRes = await api.GET(`${DEVICE_API}/device`);
-  if (deviceRes.status === 401) return redirect("/login-local");
+  if (deviceRes.status === 401) throw redirect("/login-local");
   if (deviceRes.ok) {
     const device = (await deviceRes.json()) as LocalDevice;
     return { authMode: device.authMode };

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

@@ -58,7 +58,7 @@ const loader: LoaderFunction = async ({ params }: LoaderFunctionArgs) => {
     return { device, user };
   } catch (e) {
     console.error(e);
-    return { devices: [] };
+    return { user };
   }
 };
 

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

@@ -54,7 +54,7 @@ const loader: LoaderFunction = async ({ params }: LoaderFunctionArgs) => {
     return { device, user };
   } catch (e) {
     console.error(e);
-    return { devices: [] };
+    return { user };
   }
 };
 

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

@@ -78,10 +78,8 @@ const deviceLoader = async () => {
 
 const cloudLoader = async (params: Params<string>): Promise<CloudLoaderResp> => {
   const user = await checkAuth();
-
   const iceResp = await api.POST(`${CLOUD_API}/webrtc/ice_config`);
   const iceConfig = await iceResp.json();
-
   const deviceResp = await api.GET(`${CLOUD_API}/devices/${params.id}`);
 
   if (!deviceResp.ok) {

ui/src/routes/devices.tsx

@@ -16,7 +16,7 @@ interface LoaderData {
   devices: { id: string; name: string; online: boolean; lastSeen: string }[];
   user: User;
 }
-const loader: LoaderFunction = async ()=> {
+const loader: LoaderFunction = async () => {
   const user = await checkAuth();
 
   try {
@@ -30,7 +30,7 @@ const loader: LoaderFunction = async ()=> {
     return { devices, user };
   } catch (e) {
     console.error(e);
-    return { devices: [] };
+    return { devices: [], user };
   }
 };