Fix CoreSimulator accessibility FD leaks

Author: DjDeveloperr

cli/XCWAccessibilityBridge.m

@@ -9,6 +9,10 @@
 static NSString * const XCWCoreSimulatorPath = @"/Library/Developer/PrivateFrameworks/CoreSimulator.framework/CoreSimulator";
 static NSString * const XCWAccessibilityPlatformTranslationPath = @"/System/Library/PrivateFrameworks/AccessibilityPlatformTranslation.framework/AccessibilityPlatformTranslation";
 static const NSUInteger XCWAXMaxDepth = 80;
+static NSObject *XCWAXDeviceCacheLock = nil;
+static id XCWAXCachedServiceContext = nil;
+static id XCWAXCachedDeviceSet = nil;
+static NSMutableDictionary<NSString *, id> *XCWAXCachedDevicesByUDID = nil;
 
 typedef id _Nullable (^XCWAXTranslationCallback)(id request);
 
@@ -50,6 +54,19 @@ static BOOL XCWAXLoadPrivateFrameworks(NSError **error) {
 }
 
 static id XCWAXDeviceForUDID(NSString *udid, NSError **error) {
+    static dispatch_once_t cacheOnceToken;
+    dispatch_once(&cacheOnceToken, ^{
+        XCWAXDeviceCacheLock = [NSObject new];
+        XCWAXCachedDevicesByUDID = [NSMutableDictionary dictionary];
+    });
+
+    @synchronized (XCWAXDeviceCacheLock) {
+        id cachedDevice = XCWAXCachedDevicesByUDID[udid];
+        if (cachedDevice != nil) {
+            return cachedDevice;
+        }
+    }
+
     Class serviceContextClass = NSClassFromString(@"SimServiceContext");
     if (serviceContextClass == Nil) {
         if (error != NULL) {
@@ -58,35 +75,50 @@ static id XCWAXDeviceForUDID(NSString *udid, NSError **error) {
         return nil;
     }
 
-    NSError *serviceError = nil;
-    id contextAlloc = ((id(*)(id, SEL))objc_msgSend)(serviceContextClass, sel_registerName("alloc"));
-    id serviceContext = ((id(*)(id, SEL, id, long long, NSError **))objc_msgSend)(
-        contextAlloc,
-        sel_registerName("initWithDeveloperDir:connectionType:error:"),
-        nil,
-        0LL,
-        &serviceError
-    );
-    if (serviceContext == nil) {
-        if (error != NULL) {
-            *error = serviceError ?: XCWAXError(4, @"Unable to create a CoreSimulator service context.");
+    @synchronized (XCWAXDeviceCacheLock) {
+        if (XCWAXCachedDeviceSet == nil) {
+            NSError *serviceError = nil;
+            id contextAlloc = ((id(*)(id, SEL))objc_msgSend)(serviceContextClass, sel_registerName("alloc"));
+            XCWAXCachedServiceContext = ((id(*)(id, SEL, id, long long, NSError **))objc_msgSend)(
+                contextAlloc,
+                sel_registerName("initWithDeveloperDir:connectionType:error:"),
+                nil,
+                0LL,
+                &serviceError
+            );
+            if (XCWAXCachedServiceContext == nil) {
+                if (error != NULL) {
+                    *error = serviceError ?: XCWAXError(4, @"Unable to create a CoreSimulator service context.");
+                }
+                return nil;
+            }
+
+            NSError *deviceSetError = nil;
+            XCWAXCachedDeviceSet = ((id(*)(id, SEL, NSError **))objc_msgSend)(
+                XCWAXCachedServiceContext,
+                sel_registerName("defaultDeviceSetWithError:"),
+                &deviceSetError
+            );
+            if (XCWAXCachedDeviceSet == nil) {
+                XCWAXCachedServiceContext = nil;
+                if (error != NULL) {
+                    *error = deviceSetError ?: XCWAXError(5, @"Unable to access the default CoreSimulator device set.");
+                }
+                return nil;
+            }
         }
-        return nil;
-    }
 
-    NSError *deviceSetError = nil;
-    id deviceSet = ((id(*)(id, SEL, NSError **))objc_msgSend)(serviceContext, sel_registerName("defaultDeviceSetWithError:"), &deviceSetError);
-    if (deviceSet == nil) {
-        if (error != NULL) {
-            *error = deviceSetError ?: XCWAXError(5, @"Unable to access the default CoreSimulator device set.");
+        NSArray *devices = ((id(*)(id, SEL))objc_msgSend)(XCWAXCachedDeviceSet, sel_registerName("devices"));
+        for (id candidate in devices) {
+            NSString *candidateUDID = XCWAXUDIDString(candidate);
+            if (candidateUDID.length > 0) {
+                XCWAXCachedDevicesByUDID[candidateUDID] = candidate;
+            }
         }
-        return nil;
-    }
 
-    NSArray *devices = ((id(*)(id, SEL))objc_msgSend)(deviceSet, sel_registerName("devices"));
-    for (id candidate in devices) {
-        if ([XCWAXUDIDString(candidate) isEqualToString:udid]) {
-            return candidate;
+        id device = XCWAXCachedDevicesByUDID[udid];
+        if (device != nil) {
+            return device;
         }
     }
 

cli/XCWPrivateSimulatorSession.h

@@ -27,7 +27,6 @@ typedef void (^XCWPrivateSimulatorEncodedFrameHandler)(NSData *sampleData,
 
 - (BOOL)waitUntilReadyWithTimeout:(NSTimeInterval)timeout;
 - (BOOL)waitForFirstEncodedFrameWithTimeout:(NSTimeInterval)timeout;
-- (NSDictionary *)sessionInfoRepresentation;
 - (void)requestKeyFrameRefresh;
 - (id)addEncodedFrameListener:(XCWPrivateSimulatorEncodedFrameHandler)handler;
 - (void)removeEncodedFrameListener:(id)token;

cli/XCWPrivateSimulatorSession.m

@@ -30,8 +30,6 @@ @implementation XCWPrivateSimulatorSession {
     NSData *_latestKeyFrameDecoderConfig;
     CGSize _latestKeyFrameDimensions;
     NSUInteger _latestKeyFrameSequenceValue;
-    NSUInteger _displayFrameCount;
-    NSUInteger _manualRefreshFrameCount;
     BOOL _displayReadyValue;
     BOOL _didSignalReadiness;
 }
@@ -143,55 +141,6 @@ - (BOOL)waitForFirstEncodedFrameWithTimeout:(NSTimeInterval)timeout {
     return hasFrame;
 }
 
-- (NSDictionary *)sessionInfoRepresentation {
-    __block NSDictionary *representation = nil;
-    dispatch_sync(_stateQueue, ^{
-        NSMutableDictionary *payload = [@{
-            @"displayReady": @(self->_displayReadyValue),
-            @"displayStatus": self->_displayStatusValue ?: @"",
-            @"displayWidth": @(self->_displaySizeValue.width),
-            @"displayHeight": @(self->_displaySizeValue.height),
-            @"frameSequence": @(self->_encodedFrameSequenceValue),
-            @"displayFrameCount": @(self->_displayFrameCount),
-            @"manualRefreshFrameCount": @(self->_manualRefreshFrameCount),
-            @"encoder": [self->_videoEncoder statsRepresentation],
-        } mutableCopy];
-        if (self->_latestKeyFrameCodec.length > 0) {
-            payload[@"latestKeyFrameCodec"] = self->_latestKeyFrameCodec;
-        }
-        if (self->_latestKeyFrameDecoderConfig.length > 0) {
-            payload[@"latestDecoderConfigBytes"] = @(self->_latestKeyFrameDecoderConfig.length);
-        }
-        representation = payload;
-    });
-    return representation;
-}
-
-- (nullable NSDictionary *)latestEncodedKeyFrameRepresentation {
-    __block NSDictionary *representation = nil;
-    dispatch_sync(_stateQueue, ^{
-        if (self->_latestKeyFrameData.length == 0) {
-            return;
-        }
-
-        NSMutableDictionary *payload = [@{
-            @"sampleData": self->_latestKeyFrameData,
-            @"frameSequence": @(self->_latestKeyFrameSequenceValue),
-            @"timestampUs": @(self->_latestKeyFrameTimestampUs),
-            @"width": @(self->_latestKeyFrameDimensions.width),
-            @"height": @(self->_latestKeyFrameDimensions.height),
-        } mutableCopy];
-        if (self->_latestKeyFrameCodec.length > 0) {
-            payload[@"codec"] = self->_latestKeyFrameCodec;
-        }
-        if (self->_latestKeyFrameDecoderConfig.length > 0) {
-            payload[@"decoderConfig"] = self->_latestKeyFrameDecoderConfig;
-        }
-        representation = payload;
-    });
-    return representation;
-}
-
 - (void)refreshCurrentFrame {
     CVPixelBufferRef pixelBuffer = [_displayBridge copyPixelBuffer];
     if (pixelBuffer == nil) {
@@ -200,7 +149,6 @@ - (void)refreshCurrentFrame {
 
     CGSize displaySize = CGSizeMake((CGFloat)CVPixelBufferGetWidth(pixelBuffer), (CGFloat)CVPixelBufferGetHeight(pixelBuffer));
     dispatch_async(_stateQueue, ^{
-        self->_manualRefreshFrameCount += 1;
         self->_displaySizeValue = displaySize;
         self->_displayReadyValue = YES;
         self->_displayStatusValue = [NSString stringWithFormat:@"Private display ready (%.0fx%.0f)", displaySize.width, displaySize.height];
@@ -363,7 +311,6 @@ - (void)disconnect {
 - (void)privateSimulatorDisplayBridge:(DFPrivateSimulatorDisplayBridge *)bridge didUpdateFrame:(CVPixelBufferRef)pixelBuffer {
     CGSize displaySize = CGSizeMake((CGFloat)CVPixelBufferGetWidth(pixelBuffer), (CGFloat)CVPixelBufferGetHeight(pixelBuffer));
     dispatch_async(_stateQueue, ^{
-        self->_displayFrameCount += 1;
         self->_displaySizeValue = displaySize;
         self->_displayReadyValue = YES;
         self->_displayStatusValue = [NSString stringWithFormat:@"Private display ready (%.0fx%.0f)", displaySize.width, displaySize.height];
@@ -393,7 +340,6 @@ - (void)primeStateFromBridge {
     if (pixelBuffer != nil) {
         CGSize displaySize = CGSizeMake((CGFloat)CVPixelBufferGetWidth(pixelBuffer), (CGFloat)CVPixelBufferGetHeight(pixelBuffer));
         dispatch_async(_stateQueue, ^{
-            self->_manualRefreshFrameCount += 1;
             self->_displaySizeValue = displaySize;
             self->_displayReadyValue = YES;
             self->_displayStatusValue = [NSString stringWithFormat:@"Private display ready (%.0fx%.0f)", displaySize.width, displaySize.height];