serve-sim 0.1.49 → 0.1.50-beta.145.1

package/README.md

@@ -54,7 +54,9 @@ serve-sim fold 100 -d <udid>
 
 Commands wait for the guest to acknowledge dispatch. Invalid angles and failed
 commands do not change capture. The bundled `simduo/serve-sim-duo-hid` executable
-runs inside the simulator and exits with the device session.
+runs inside the simulator and exits with the device session. Its `watch-angle` mode
+reads the hinge angle inside the simulator from CoreMotion, so it doesn't depend on
+`devicectl`. That is how the preview learns the current angle and follows Device Hub.
 
 Duo uses one interactive RealityKit preview of the installed Xcode model, with
 live screen textures and touches mapped to each bent screen half. Apple's model

package/Sources/SimCameraInjector/SimCamFakes.h

@@ -69,6 +69,7 @@ void SimCamLogSwallowedRuntimeError(NSString *via, id object, NSDictionary *user
 
 AVCaptureDeviceFormat *SimCamSharedFakeFormat(void);
 AVCaptureDevice *SimCamFakeDeviceForPosition(AVCaptureDevicePosition p);
+NSArray<AVCaptureDevice *> *SimCamFakeDevices(void);
 AVCaptureDeviceInput *SimCamFakeInputForPosition(AVCaptureDevicePosition p);
 NSArray<AVCaptureInputPort *> *SimCamFakePortsForInput(AVCaptureInput *input);
 

package/Sources/SimCameraInjector/SimCamFakes.m

@@ -143,6 +143,14 @@ void SimCamLogSwallowedRuntimeError(NSString *via, id object, NSDictionary *user
 - (BOOL)isVideoBinned { return NO; }
 - (BOOL)isVideoHDRSupported { return NO; }
 - (BOOL)isVideoStabilizationModeSupported:(AVCaptureVideoStabilizationMode)m { return NO; }
+// AVFoundation's description reads private state this instance doesn't have.
+- (NSString *)description {
+    CMFormatDescriptionRef format = self.formatDescription;
+    CMVideoDimensions size = CMVideoFormatDescriptionGetDimensions(format);
+    FourCharCode subtype = CMFormatDescriptionGetMediaSubType(format);
+    return [NSString stringWithFormat:@"<SimCamFakeFormat %dx%d %c%c%c%c>", size.width, size.height,
+        (char)(subtype >> 24), (char)(subtype >> 16), (char)(subtype >> 8), (char)subtype];
+}
 - (CGFloat)videoMaxZoomFactor { return 16.0; }
 - (CGFloat)videoZoomFactorUpscaleThreshold { return 1.0; }
 - (AVCaptureAutoFocusSystem)autoFocusSystem { return AVCaptureAutoFocusSystemNone; }
@@ -293,6 +301,13 @@ AVCaptureDevice *SimCamFakeDeviceForPosition(AVCaptureDevicePosition p) {
     return p == AVCaptureDevicePositionBack ? back : front;
 }
 
+NSArray<AVCaptureDevice *> *SimCamFakeDevices(void) {
+    return @[
+        SimCamFakeDeviceForPosition(AVCaptureDevicePositionFront),
+        SimCamFakeDeviceForPosition(AVCaptureDevicePositionBack),
+    ];
+}
+
 #pragma mark - SimCamFakeConnection
 
 @interface AVCaptureConnection (SimCamPrivate)

package/Sources/SimCameraInjector/SimCamSwizzles.m

@@ -129,22 +129,24 @@ BOOL SwizzleInstanceMethod(Class cls, SEL orig, SEL swiz) {
     }
     return [self simcam_defaultDeviceWithMediaType:m];
 }
++ (AVCaptureDevice *)simcam_deviceWithUniqueID:(NSString *)uniqueID {
+    for (AVCaptureDevice *fake in SimCamFakeDevices()) {
+        if ([fake.uniqueID isEqualToString:uniqueID]) {
+            simcam_log(@"deviceWithUniqueID: %@ → fake", uniqueID);
+            return fake;
+        }
+    }
+    return [self simcam_deviceWithUniqueID:uniqueID];
+}
 + (NSArray<AVCaptureDevice *> *)simcam_devicesWithMediaType:(AVMediaType)m {
     if ([m isEqualToString:AVMediaTypeVideo]) {
-        return @[
-            SimCamFakeDeviceForPosition(AVCaptureDevicePositionFront),
-            SimCamFakeDeviceForPosition(AVCaptureDevicePositionBack),
-        ];
+        return SimCamFakeDevices();
     }
     return [self simcam_devicesWithMediaType:m];
 }
 + (NSArray<AVCaptureDevice *> *)simcam_devices {
     NSArray *real = [self simcam_devices];
-    NSArray *fakes = @[
-        SimCamFakeDeviceForPosition(AVCaptureDevicePositionFront),
-        SimCamFakeDeviceForPosition(AVCaptureDevicePositionBack),
-    ];
-    return [fakes arrayByAddingObjectsFromArray:real ?: @[]];
+    return [SimCamFakeDevices() arrayByAddingObjectsFromArray:real ?: @[]];
 }
 @end
 
@@ -160,10 +162,9 @@ BOOL SwizzleInstanceMethod(Class cls, SEL orig, SEL swiz) {
         [self simcam_discoverySessionWithDeviceTypes:types mediaType:m position:p];
     if ([m isEqualToString:AVMediaTypeVideo] || m == nil) {
         NSMutableArray *list = [NSMutableArray new];
-        if (p == AVCaptureDevicePositionUnspecified || p == AVCaptureDevicePositionFront)
-            [list addObject:SimCamFakeDeviceForPosition(AVCaptureDevicePositionFront)];
-        if (p == AVCaptureDevicePositionUnspecified || p == AVCaptureDevicePositionBack)
-            [list addObject:SimCamFakeDeviceForPosition(AVCaptureDevicePositionBack)];
+        for (AVCaptureDevice *fake in SimCamFakeDevices()) {
+            if (p == AVCaptureDevicePositionUnspecified || p == fake.position) [list addObject:fake];
+        }
         @try {
             [real setValue:list forKey:@"devices"];
         } @catch (__unused id e) {
@@ -1221,6 +1222,9 @@ void SimCamInstallSwizzles(void) {
         @selector(devicesWithMediaType:),
         @selector(simcam_devicesWithMediaType:));
     SwizzleClassMethod(dev, @selector(devices), @selector(simcam_devices));
+    SwizzleClassMethod(dev,
+        @selector(deviceWithUniqueID:),
+        @selector(simcam_deviceWithUniqueID:));
 
     Class disc = [AVCaptureDeviceDiscoverySession class];
     SwizzleClassMethod(disc,

package/Sources/SimDuoHID/main.m

@@ -1,5 +1,6 @@
 // Guest HID transport for hinge angles, physical orientation, and hardware buttons.
 // Spawned inside iOS Simulator; one command/reply per line until EOF.
+// `watch-angle` instead streams the hinge angle the guest reports (see watchAngle).
 #import <Foundation/Foundation.h>
 #import <dlfcn.h>
 #import <mach/mach_time.h>
@@ -8,6 +9,55 @@
 #import <math.h>
 #import <unistd.h>
 
+// CoreMotion's private hinge-angle API, the source UIKit's UIHinge reads.
+@interface CMAngle : NSObject
+- (float)angleDegrees;
+@end
+@interface CMAngleManager : NSObject
++ (BOOL)isAvailable;
+- (void)startAngleUpdatesToQueue:(NSOperationQueue *)queue handler:(void (^)(CMAngle *angle))handler;
+- (void)stopAngleUpdates;
+@end
+
+// Prints `angle <degrees>` for the first sample and for every later change of at
+// least 0.5°, until the parent closes stdin. Read-only: it never creates the HID
+// services, so it can run next to the command transport. Reading in the guest
+// keeps the hinge independent of CoreDevice: `devicectl device motion` exists in
+// devicectl 651.13.4 (Xcode 27.1 beta, 27A9269) but not in 651.13.5 (Xcode 27.1
+// 27A9275) or later (seen through 651.32, Xcode 27.2 27B52), and CoreDevice is
+// shared by every installed Xcode.
+static int watchAngle(void) {
+    dlopen("/System/Library/Frameworks/CoreMotion.framework/CoreMotion", RTLD_NOW);
+    Class managerClass = NSClassFromString(@"CMAngleManager");
+    if (!managerClass || ![managerClass respondsToSelector:@selector(isAvailable)] || ![managerClass isAvailable]) {
+        fprintf(stderr, "Hinge angle unavailable: CMAngleManager reports no hinge\n");
+        return 2;
+    }
+    CMAngleManager *manager = [managerClass new];
+    if (![manager respondsToSelector:@selector(startAngleUpdatesToQueue:handler:)]) {
+        fprintf(stderr, "Hinge angle unavailable: CMAngleManager has no angle updates\n");
+        return 2;
+    }
+    NSOperationQueue *queue = [NSOperationQueue new];
+    queue.maxConcurrentOperationCount = 1;
+    __block double last = NAN;
+    [manager startAngleUpdatesToQueue:queue handler:^(CMAngle *sample) {
+        double degrees = [sample angleDegrees];
+        if (!isfinite(degrees) || degrees < 0 || degrees > 180) return;
+        if (isfinite(last) && fabs(degrees - last) < 0.5) return;
+        last = degrees;
+        if (degrees == 0) degrees = 0; // never print -0.0
+        printf("angle %.1f\n", degrees);
+        fflush(stdout);
+    }];
+    // Updates arrive on `queue`, not the main run loop, so the main thread only
+    // waits for the parent to close stdin.
+    char buffer[64];
+    while (read(STDIN_FILENO, buffer, sizeof buffer) > 0) {}
+    [manager stopAngleUpdates];
+    return 0;
+}
+
 @interface DuoServiceDelegate : NSObject
 @property NSDictionary *properties;
 @end
@@ -87,8 +137,10 @@ static BOOL sendEvent(id service, CFTypeRef event) {
     CFRelease(event);
     return ok;
 }
-int main(void) {
+int main(int argc, char **argv) {
     @autoreleasepool {
+        if (argc == 2 && strcmp(argv[1], "watch-angle") == 0) return watchAngle();
+        if (argc != 1) { fprintf(stderr, "usage: serve-sim-duo-hid [watch-angle]\n"); return 64; }
         dlopen("/System/Library/PrivateFrameworks/HID.framework/HID", RTLD_NOW);
         void *io = dlopen("/System/Library/Frameworks/IOKit.framework/IOKit", RTLD_NOW);
         CFTypeRef (*vendor)(CFAllocatorRef, uint64_t, uint32_t, uint32_t, uint32_t, const void *, CFIndex, uint32_t) = dlsym(io, "IOHIDEventCreateVendorDefinedEvent");