Update to latest to enable compatibility with more recent devices

FBControlCore/Utility/FBDeveloperDiskImage.h

@@ -33,13 +33,13 @@ NS_ASSUME_NONNULL_BEGIN
  @param error an error out for any error that occurs.
  @return the path of the disk image.
  */
-+ (nullable instancetype)developerDiskImage:(NSOperatingSystemVersion)targetVersion logger:(nullable id<FBControlCoreLogger>)logger error:(NSError **)error;
++ (nullable instancetype)developerDiskImage:(NSOperatingSystemVersion)targetVersion logger:(nullable id<FBControlCoreLogger>)logger platformRootDirectory:(NSString*)platformRootDirectory error:(NSError **)error;
 
 /**
  Returns all of the Developer Disk Images that are available.
  These Disk Images are found by inspecting the appropriate directories within the current installed Xcode.
  */
-+ (NSArray<FBDeveloperDiskImage *> *)allDiskImages;
++ (NSArray<FBDeveloperDiskImage *> *)allDiskImages:(NSString*)platformRootDirectory;
 
 #pragma mark Properties
 

FBControlCore/Utility/FBDeveloperDiskImage.m

@@ -60,18 +60,18 @@ + (nullable FBDeveloperDiskImage *)diskImageAtPath:(NSString *)path xcodeVersion
 
 #pragma mark Initializers
 
-+ (FBDeveloperDiskImage *)developerDiskImage:(NSOperatingSystemVersion)targetVersion logger:(id<FBControlCoreLogger>)logger error:(NSError **)error
++ (FBDeveloperDiskImage *)developerDiskImage:(NSOperatingSystemVersion)targetVersion logger:(id<FBControlCoreLogger>)logger platformRootDirectory:(NSString*)platformRootDirectory error:(NSError **)error
 {
-  NSArray<FBDeveloperDiskImage *> *images = FBDeveloperDiskImage.allDiskImages;
+    NSArray<FBDeveloperDiskImage *> *images = [FBDeveloperDiskImage allDiskImages:platformRootDirectory];
   return [self bestImageForImages:images targetVersion:targetVersion logger:logger error:error];
 }
 
-+ (NSArray<FBDeveloperDiskImage *> *)allDiskImages
++ (NSArray<FBDeveloperDiskImage *> *)allDiskImages:(NSString*)platformRootDirectory
 {
   static dispatch_once_t onceToken;
   static NSArray<FBDeveloperDiskImage *> *images = nil;
   dispatch_once(&onceToken, ^{
-    images = [self allDiskImagesFromSearchPath:[FBXcodeConfiguration.developerDirectory stringByAppendingPathComponent:@"Platforms/iPhoneOS.platform/DeviceSupport"] xcodeVersion:FBXcodeConfiguration.xcodeVersion logger:FBControlCoreGlobalConfiguration.defaultLogger];
+    images = [self allDiskImagesFromSearchPath:[platformRootDirectory stringByAppendingPathComponent:@"DeviceSupport"] xcodeVersion:FBXcodeConfiguration.xcodeVersion logger:FBControlCoreGlobalConfiguration.defaultLogger];
     if ([[NSProcessInfo.processInfo.environment allKeys] containsObject:ExtraDeviceSupportDirEnv]) {
       NSArray<FBDeveloperDiskImage *> *extraImages = [self allDiskImagesFromSearchPath:NSProcessInfo.processInfo.environment[ExtraDeviceSupportDirEnv] xcodeVersion:FBXcodeConfiguration.xcodeVersion logger:FBControlCoreGlobalConfiguration.defaultLogger];
       images = [images arrayByAddingObjectsFromArray:extraImages];
@@ -107,6 +107,7 @@ - (instancetype)initWithDiskImagePath:(NSString *)diskImagePath signature:(NSDat
 
 #pragma mark Public
 
+// TODO: This only yields symbols for iOS, not tvOS or other.
 + (NSString *)pathForDeveloperSymbols:(NSString *)buildVersion logger:(id<FBControlCoreLogger>)logger error:(NSError **)error
 {
   NSArray<NSString *> *searchPaths = @[

FBDeviceControl/Commands/FBDeviceApplicationCommands.h

@@ -17,6 +17,22 @@ NS_ASSUME_NONNULL_BEGIN
  An Implementation of FBApplicationCommands for Devices
  */
 @interface FBDeviceApplicationCommands : NSObject <FBApplicationCommands>
+/**
+ Instantiates the Commands instance.
+
+ @param target the target to use.
+ @return a new instance of the Command.
+ */
++ (instancetype)commandsWithTarget:(FBDevice *)target;
+
+/**
+ Installs application at given path on the host using a shadow dir on the host to only install changed files.
+
+ @param path the file path of the Application Bundle on the host.
+ @param shadowDir directory on the host that is used for the shadow copy.
+ @return A future that resolves when successful.
+ */
+- (FBFuture<NSNull *> *)deltaInstallApplicationWithPath:(NSString *)path andShadowDirectory:(NSString *)shadowDir;
 
 @end
 

FBDeviceControl/Commands/FBDeviceApplicationCommands.m

@@ -193,6 +193,24 @@ - (instancetype)initWithDevice:(FBDevice *)device deltaUpdateDirectory:(NSURL *)
     }];
 }
 
+- (FBFuture<NSNull *> *)deltaInstallApplicationWithPath:(NSString *)path andShadowDirectory:(NSString *)shadowDir
+{
+  NSString *cacheDirectory = shadowDir;
+  if (cacheDirectory == nil) {
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+    cacheDirectory = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"idb"];
+  }
+
+  // Ensure that the shadow directory exists as the Apple API will not create it.
+  NSError *error = nil;
+  [[NSFileManager defaultManager] createDirectoryAtPath:cacheDirectory withIntermediateDirectories:TRUE attributes:nil error:&error];
+
+  NSDictionary *options = @{@"PackageType" : @"Developer", @"ShadowParentKey" : [NSURL fileURLWithPath:cacheDirectory]};
+  NSURL *appURL = [NSURL fileURLWithPath:path isDirectory:YES];
+
+  return [self secureDeltaInstallApplication:appURL options:options];
+}
+
 - (FBFuture<id> *)uninstallApplicationWithBundleID:(NSString *)bundleID
 {
   // It may be better to investigate if FB_AMDeviceSecureUninstallApplication
@@ -293,7 +311,7 @@ - (instancetype)initWithDevice:(FBDevice *)device deltaUpdateDirectory:(NSURL *)
         bundleNameToPID[bundleName] = pid;
       }
       return bundleNameToPID;
-    }]; 
+    }];
 }
 
 - (FBFuture<NSNumber *> *)processIDWithBundleID:(NSString *)bundleID
@@ -321,6 +339,26 @@ - (instancetype)initWithDevice:(FBDevice *)device deltaUpdateDirectory:(NSURL *)
 }
 
 - (FBFuture<id<FBLaunchedApplication>> *)launchApplication:(FBApplicationLaunchConfiguration *)configuration
+{
+  if (configuration.launchMode == FBApplicationLaunchModeFailIfRunning) {
+    return [[self processIDWithBundleID:configuration.bundleID] onQueue:self.device.asyncQueue chain:^ (FBFuture<NSNumber *>* processIdQueryResult) {
+      if (processIdQueryResult.state == FBFutureStateDone) {
+        return [[FBDeviceControlError
+          describeFormat:@"Application %@ already running with pid %@", configuration.bundleID, processIdQueryResult.result]
+          failFuture];
+      } else if (processIdQueryResult.state == FBFutureStateFailed) {
+        return (FBFuture*)[self launchApplicationIgnoreCurrentState:configuration];
+      } else {
+        return (FBFuture*)processIdQueryResult;
+      }
+    }];
+  }
+  return [self launchApplicationIgnoreCurrentState:configuration];
+}
+
+#pragma mark Private
+
+- (FBFuture<id<FBLaunchedApplication>> *)launchApplicationIgnoreCurrentState:(FBApplicationLaunchConfiguration *)configuration
 {
     if (self.device.osVersion.version.majorVersion >= 17) {
         FBAppleDevicectlCommandExecutor *devicectl = [[FBAppleDevicectlCommandExecutor alloc] initWithDevice:self.device];
@@ -348,8 +386,6 @@ - (instancetype)initWithDevice:(FBDevice *)device deltaUpdateDirectory:(NSURL *)
     }
 }
 
-#pragma mark Private
-
 - (FBFuture<NSNull *> *)killApplicationWithProcessIdentifier:(pid_t)processIdentifier
 {
   return [[self
@@ -359,6 +395,62 @@ - (instancetype)initWithDevice:(FBDevice *)device deltaUpdateDirectory:(NSURL *)
     }];
 }
 
+- (FBFuture<NSNull *> *)secureInstallApplicationBundle:(NSURL *)hostAppURL options:(NSDictionary<NSString *, id> *)options
+{
+  return [[self.device
+    connectToDeviceWithPurpose:@"install"]
+    onQueue:self.device.workQueue pop:^ FBFuture<NSNull *> * (id<FBDeviceCommands> device) {
+      FBDeviceWorkflowStatistics *statistics = [[FBDeviceWorkflowStatistics alloc] initWithWorkflowType:@"Install" logger:device.logger];
+      [self.device.logger logFormat:@"Installing Application %@", hostAppURL];
+      int status = device.calls.SecureInstallApplicationBundle(
+        device.amDeviceRef,
+        (__bridge CFURLRef _Nonnull)(hostAppURL),
+        (__bridge CFDictionaryRef _Nonnull)(options),
+        (AMDeviceProgressCallback) WorkflowCallback,
+        (__bridge void *) (statistics)
+      );
+      if (status != 0) {
+        NSString *errorMessage = CFBridgingRelease(device.calls.CopyErrorText(status));
+          return [[FBDeviceControlError
+                    describeFormat:@"Failed to install application %@ 0x%x (%@). %@", [hostAppURL lastPathComponent], status, errorMessage, statistics.summaryOfRecentEvents]
+                    failFuture];
+        //return [[FBDeviceControlError
+        //  describeFormat:@"Failed to install application %@ 0x%x (%@)", [hostAppURL lastPathComponent], status, errorMessage]
+        //  failFuture];
+      }
+      [self.device.logger logFormat:@"Installed Application %@", hostAppURL];
+      return FBFuture.empty;
+    }];
+}
+
+- (FBFuture<NSNull *> *)secureDeltaInstallApplication:(NSURL *)appURL options:(NSDictionary *)options
+{
+  return [[self.device
+    connectToDeviceWithPurpose:@"install"]
+    onQueue:self.device.workQueue pop:^ FBFuture<NSNull *> * (id<FBDeviceCommands> device) {
+      FBDeviceWorkflowStatistics *statistics = [[FBDeviceWorkflowStatistics alloc] initWithWorkflowType:@"Install" logger:device.logger];
+      [self.device.logger logFormat:@"Installing Application %@", appURL];
+      int status = device.calls.SecureInstallApplicationBundle(
+        device.amDeviceRef,
+        (__bridge CFURLRef _Nonnull)(appURL),
+        (__bridge CFDictionaryRef _Nonnull)(options),
+        (AMDeviceProgressCallback) WorkflowCallback,
+        (__bridge void *) (statistics)
+      );
+      if (status != 0) {
+        NSString *errorMessage = CFBridgingRelease(device.calls.CopyErrorText(status));
+          return [[FBDeviceControlError
+                    describeFormat:@"Failed to install application %@ 0x%x (%@). %@", [appURL lastPathComponent], status, errorMessage, statistics.summaryOfRecentEvents]
+                    failFuture];
+        //return [[FBDeviceControlError
+        //  describeFormat:@"Failed to install application %@ 0x%x (%@)", [appURL lastPathComponent], status, errorMessage]
+        //  failFuture];
+      }
+      [self.device.logger logFormat:@"Installed Application %@", appURL];
+      return FBFuture.empty;
+    }];
+}
+
 - (FBFuture<NSDictionary<NSString *, NSDictionary<NSString *, id> *> *> *)installedApplicationsData:(NSArray<NSString *> *)returnAttributes
 {
   return [[self.device
@@ -398,7 +490,7 @@ - (instancetype)initWithDevice:(FBDevice *)device deltaUpdateDirectory:(NSURL *)
     }];
 }
 
-- (FBFuture<NSDictionary<NSString *, NSNumber *> *> *)pidToRunningProcessName
+- (FBFuture<NSDictionary<NSNumber *, NSString *> *> *)pidToRunningProcessName
 {
   return [[self.device
     startService:@"com.apple.os_trace_relay"]
@@ -428,15 +520,16 @@ - (instancetype)initWithDevice:(FBDevice *)device deltaUpdateDirectory:(NSURL *)
           describeFormat:@"Request to PidList is not RequestSuccessful %@", error]
           failFuture];
       }
-      NSDictionary<NSNumber *, id> *payload = response[@"Payload"];
+      NSDictionary<NSString *, id> *payload = response[@"Payload"];
       NSMutableDictionary<NSNumber *, NSString *> *pidToRunningProcessName = NSMutableDictionary.dictionary;
-      for (NSNumber *processIdentifer in payload.keyEnumerator) {
+      for (NSString *processIdentifer in payload.keyEnumerator) {
         NSDictionary<NSString *, NSString *> *contents = payload[processIdentifer];
         NSString *processName = contents[@"ProcessName"];
         if (![processName isKindOfClass:NSString.class]) {
           continue;
         }
-        pidToRunningProcessName[processIdentifer] = processName;
+        NSNumber* processIdentiferNumber = [NSNumber numberWithInteger:[processIdentifer integerValue]];
+        pidToRunningProcessName[processIdentiferNumber] = processName;
       }
       return [FBFuture futureWithResult:pidToRunningProcessName];
     }];

FBDeviceControl/Commands/FBDeviceCommands.h

@@ -145,6 +145,13 @@ extern FBDeviceActivationState FBDeviceActivationStateCoerceFromString(NSString
  */
 - (FBFutureContext<FBAFCConnection *> *)houseArrestAFCConnectionForBundleID:(NSString *)bundleID afcCalls:(AFCCalls)afcCalls;
 
+/**
+ Invalidates house arrest connection for a given bundle id.
+ Does nothing if no connection exists already.
+ This can be used whenever a cached connection returns previously encountered errors on subsequent operations
+ */
+- (void)invalidateHouseArrestAFCConnectionForBundleID:(NSString *)bundleID;
+
 @end
 
 NS_ASSUME_NONNULL_END

FBDeviceControl/Commands/FBDeviceDeveloperDiskImageCommands.m

@@ -90,14 +90,14 @@ - (instancetype)initWithDevice:(FBDevice *)device
 
 - (NSArray<FBDeveloperDiskImage *> *)mountableDiskImages
 {
-  return FBDeveloperDiskImage.allDiskImages;
+  return [FBDeveloperDiskImage allDiskImages: self.device.platformRootDirectory];
 }
 
 - (FBFuture<FBDeveloperDiskImage *> *)ensureDeveloperDiskImageIsMounted
 {
   NSError *error = nil;
   NSOperatingSystemVersion targetVersion = [FBOSVersion operatingSystemVersionFromName:self.device.productVersion];
-  FBDeveloperDiskImage *diskImage = [FBDeveloperDiskImage developerDiskImage:targetVersion logger:self.device.logger error:&error];
+  FBDeveloperDiskImage *diskImage = [FBDeveloperDiskImage developerDiskImage:targetVersion logger:self.device.logger platformRootDirectory: self.device.platformRootDirectory error:&error];
   if (!diskImage) {
     return [FBFuture futureWithError:error];
   }
@@ -112,7 +112,7 @@ - (instancetype)initWithDevice:(FBDevice *)device
   return [[self
     mountedImageEntries]
     onQueue:self.device.asyncQueue map:^(NSArray<NSDictionary<NSString *,id> *> *mountEntries) {
-      NSArray<FBDeveloperDiskImage *> *images = FBDeveloperDiskImage.allDiskImages;
+      NSArray<FBDeveloperDiskImage *> *images = [FBDeveloperDiskImage allDiskImages: self.device.platformRootDirectory];
       NSDictionary<NSData *, FBDeveloperDiskImage *> *imagesBySignature = [NSDictionary dictionaryWithObjects:images forKeys:[images valueForKey:@"signature"]];
       NSMutableDictionary<NSDictionary<NSString *, id> *, FBDeveloperDiskImage *> *mountEntryToDiskImage = NSMutableDictionary.dictionary;
       for (NSDictionary<NSString *, id> *mountEntry in mountEntries) {

FBDeviceControl/Commands/FBDeviceLogCommands.h

@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
  An implementation of Log Commands for Devices.
  */
 @interface FBDeviceLogCommands : NSObject <FBLogCommands, FBiOSTargetCommand>
++ (instancetype)commandsWithTarget:(FBDevice *)target;
+- (FBFuture<id<FBLogOperation>> *)tailLog:(NSArray<NSString *> *)arguments consumer:(id<FBDataConsumer>)consumer;
 
 @end
 

FBDeviceControl/FBDeviceControl.h

@@ -9,12 +9,16 @@
 #import <FBDeviceControl/FBAMDefines.h>
 #import <FBDeviceControl/FBAMDevice+Private.h>
 #import <FBDeviceControl/FBAMDevice.h>
+#import <FBDeviceControl/FBAMDeviceManager.h>
 #import <FBDeviceControl/FBAMRestorableDeviceManager.h>
 #import <FBDeviceControl/FBDevice.h>
 #import <FBDeviceControl/FBDeviceActivationCommands.h>
+#import <FBDeviceControl/FBDeviceApplicationCommands.h>
 #import <FBDeviceControl/FBDeviceCommands.h>
 #import <FBDeviceControl/FBDeviceControlError.h>
 #import <FBDeviceControl/FBDeviceControlFrameworkLoader.h>
+#import <FBDeviceControl/FBDeviceFileCommands.h>
+#import <FBDeviceControl/FBDeviceLogCommands.h>
 #import <FBDeviceControl/FBDeviceDebugSymbolsCommands.h>
 #import <FBDeviceControl/FBDevicePowerCommands.h>
 #import <FBDeviceControl/FBDeviceRecoveryCommands.h>

FBDeviceControl/Management/FBAMDServiceConnection.h

@@ -238,6 +238,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, strong, nullable, readonly) id<FBControlCoreLogger> logger;
 
+/**
+  The size of the read buffer. Public so specific services(such as syslog) can override the default.
+ */
+@property (nonatomic, assign) int readBufferSize;
+
 @end
 
 NS_ASSUME_NONNULL_END

FBDeviceControl/Management/FBAMDServiceConnection.m

@@ -136,6 +136,8 @@ - (instancetype)initWithName:(NSString *)name connection:(AMDServiceConnectionRe
   _device = device;
   _calls = calls;
   _logger = logger;
+  // There's an upper limit on the number of bytes we can read at once
+  _readBufferSize = 1024 * 4;
 
   return self;
 }

FBDeviceControl/Management/FBAMDevice.m

@@ -224,6 +224,11 @@ - (FBDeviceActivationState)activationState
     }];
 }
 
+- (void)invalidateHouseArrestAFCConnectionForBundleID:(NSString *)bundleID
+{
+  [self.serviceManager invalidateHouseArrestAFCConnectionForBundleID:bundleID];
+}
+
 #pragma mark FBFutureContextManager Implementation
 
 - (FBFuture<FBAMDevice *> *)prepare:(id<FBControlCoreLogger>)logger
@@ -277,6 +282,8 @@ + (NSString *)osVersionForDeviceClass:(NSString *)deviceClass productVersion:(NS
   NSDictionary<NSString *, NSString *> *deviceClassOSPrefixMapping = @{
     @"iPhone" : @"iOS",
     @"iPad" : @"iOS",
+    @"iPod" : @"iOS",
+    @"AppleTV" : @"tvOS",
   };
   NSString *osPrefix = deviceClassOSPrefixMapping[deviceClass];
   if (!osPrefix) {

FBDeviceControl/Management/FBAMDeviceServiceManager.h

@@ -43,6 +43,14 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (FBFutureContextManager<FBAFCConnection *> *)houseArrestAFCConnectionForBundleID:(NSString *)bundleID afcCalls:(AFCCalls)afcCalls;
 
+
+/**
+ Invalidates house arrest connection for a given bundle id.
+ Does nothing if no connection exists already.
+ This can be used whenever a cached connection returns previously encountered errors on subsequent operations
+ */
+- (void)invalidateHouseArrestAFCConnectionForBundleID:(NSString *)bundleID;
+
 @end
 
 NS_ASSUME_NONNULL_END

FBDeviceControl/Management/FBAMDeviceServiceManager.m

@@ -131,4 +131,11 @@ - (instancetype)initWithAMDevice:(FBAMDevice *)device serviceTimeout:(nullable N
   return manager;
 }
 
+- (void)invalidateHouseArrestAFCConnectionForBundleID:(NSString *)bundleID
+{
+  [self.houseArrestManagers removeObjectForKey:bundleID];
+  [self.houseArrestDelegates removeObjectForKey:bundleID];
+}
+
+
 @end