fix(camera): harden source switching

Author: DjDeveloperr

packages/client/src/features/simulators/CameraSimulationModal.tsx

@@ -77,7 +77,7 @@ export function CameraSimulationModal({
   const activeBundleText = useMemo(() => {
     const bundleIds = status?.bundleIds ?? [];
     if (bundleIds.length === 0) {
-      return status?.alive ? "helper running" : "not running";
+      return status?.alive ? "daemon running" : "not running";
     }
     return bundleIds.join(", ");
   }, [status]);
@@ -95,7 +95,11 @@ export function CameraSimulationModal({
     try {
       const nextStatus = await fetchCameraStatus(udid);
       setStatus(nextStatus);
-      if (nextStatus.mirror === "on" || nextStatus.mirror === "off") {
+      if (
+        nextStatus.mirror === "auto" ||
+        nextStatus.mirror === "on" ||
+        nextStatus.mirror === "off"
+      ) {
         setMirror(nextStatus.mirror);
       }
       if (

packages/server/native/camera/SimDeckCameraService.m

@@ -323,6 +323,15 @@ static BOOL PublishImageAtPath(NSString *path, NSString **error) {
     return YES;
 }
 
+static BOOL CanDecodeImageAtPath(NSString *path, NSString **error) {
+    NSImage *image = [[NSImage alloc] initWithContentsOfFile:path];
+    if ([image CGImageForProposedRect:NULL context:nil hints:nil]) {
+        return YES;
+    }
+    if (error) *error = [NSString stringWithFormat:@"Unable to decode image at %@", path];
+    return NO;
+}
+
 @interface SimDeckCameraWebcamWriter : NSObject <AVCaptureVideoDataOutputSampleBufferDelegate>
 @property (nonatomic, copy) NSString *label;
 @end
@@ -404,6 +413,9 @@ static BOOL StartPlaceholder(NSString **error) {
 }
 
 static BOOL StartImage(NSString *path, NSString **error) {
+    if (!CanDecodeImageAtPath(path, error)) {
+        return NO;
+    }
     StopCurrentSource();
     if (!PublishImageAtPath(path, error)) {
         return NO;
@@ -475,7 +487,6 @@ static BOOL StartVideo(NSString *path, NSString **error) {
 }
 
 static BOOL StartWebcam(NSString *requestedDevice, NSString **error) {
-    StopCurrentSource();
     if (!EnsureCameraAccess(error)) {
         return NO;
     }
@@ -510,6 +521,7 @@ static BOOL StartWebcam(NSString *requestedDevice, NSString **error) {
         return NO;
     }
     [session addOutput:output];
+    StopCurrentSource();
     gWebcamSession = session;
     gWebcamDelegate = writer;
     [session startRunning];
@@ -766,10 +778,15 @@ bool simdeck_camera_start(const char *udid,
                     nativeError = @"Camera simulation is not running for this simulator.";
                     return;
                 }
+                BOOL hasMirrorUpdate = mirror && mirror[0] && gHeader;
+                uint32_t previousMirrorMode = hasMirrorUpdate ? gHeader->mirrorMode : SIMDECK_CAMERA_MIRROR_AUTO;
                 if (mirror && mirror[0] && gHeader) {
                     gHeader->mirrorMode = MirrorModeForName(StringFromCString(mirror));
                 }
                 if (source && source[0] && !SwitchSource(StringFromCString(source), StringFromCString(sourceArgument), &nativeError)) {
+                    if (hasMirrorUpdate && gHeader) {
+                        gHeader->mirrorMode = previousMirrorMode;
+                    }
                     return;
                 }
                 result = JSONCString(StatusPayload(YES, nil));

packages/server/src/camera.rs

@@ -86,19 +86,24 @@ pub fn start_camera(options: CameraStartOptions) -> Result<Value, AppError> {
     validate_udid(&options.udid)?;
     let source = normalize_source(options.source)?;
     let mirror = normalize_mirror(options.mirror.as_deref())?;
+    let bundle_id = options
+        .bundle_id
+        .as_deref()
+        .map(str::trim)
+        .filter(|value| !value.is_empty());
+    if let Some(bundle_id) = bundle_id {
+        validate_bundle_id(bundle_id)?;
+    }
     fs::create_dir_all(camera_state_dir()).map_err(app_internal)?;
 
     let shm_name = shm_name_for_udid(&options.udid);
     native_start_camera(&options.udid, &shm_name, &source, &mirror)?;
 
-    if let Some(bundle_id) = options
-        .bundle_id
-        .as_deref()
-        .map(str::trim)
-        .filter(|value| !value.is_empty())
-    {
-        validate_bundle_id(bundle_id)?;
-        launch_with_injector(&options.udid, bundle_id, &shm_name, &mirror)?;
+    if let Some(bundle_id) = bundle_id {
+        if let Err(error) = launch_with_injector(&options.udid, bundle_id, &shm_name, &mirror) {
+            let _ = native_stop_camera(&options.udid);
+            return Err(error);
+        }
         record_injected_bundle(&options.udid, bundle_id)?;
     }