appium-webdriveragent 16.1.7 → 16.2.1

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [16.2.1](https://github.com/appium/WebDriverAgent/compare/v16.2.0...v16.2.1) (2026-08-17)
+
+### Bug Fixes
+
+* sign the runner by certificate hash instead of display name ([#1211](https://github.com/appium/WebDriverAgent/issues/1211)) ([59e95a7](https://github.com/appium/WebDriverAgent/commit/59e95a73986a91c90c951608d7744a032997810b))
+
+## [16.2.0](https://github.com/appium/WebDriverAgent/compare/v16.1.7...v16.2.0) (2026-08-13)
+
+### Features
+
+* Convert FBConfiguration to a singleton with native properties ([#1208](https://github.com/appium/WebDriverAgent/issues/1208)) ([ee029da](https://github.com/appium/WebDriverAgent/commit/ee029da84448895c4ad51be0688e7b7df30697de))
+
 ## [16.1.7](https://github.com/appium/WebDriverAgent/compare/v16.1.6...v16.1.7) (2026-08-11)
 
 ### Bug Fixes

package/Scripts/embed-runner-icon.sh

@@ -36,12 +36,32 @@ if [ ${#ICONS[@]} -eq 0 ]; then
     exit 0
 fi
 
-cp -f "${ICONS[@]}" "$RUNNER_APP/"
+PLIST="$RUNNER_APP/Info.plist"
+
+# Everything below mutates a bundle Xcode already signed, so keep enough state
+# to undo it: a failed re-sign must not leave an uninstallable runner behind.
+PLIST_BACKUP=$(mktemp)
+CERT_DIR=$(mktemp -d)
+trap 'rm -rf "$PLIST_BACKUP" "$CERT_DIR"' EXIT
+cp "$PLIST" "$PLIST_BACKUP"
+ADDED_FILES=()
+
+restore_bundle() {
+    cp -f "$PLIST_BACKUP" "$PLIST"
+    if [ ${#ADDED_FILES[@]} -gt 0 ]; then
+        rm -f "${ADDED_FILES[@]}"
+    fi
+}
+
+for icon in "${ICONS[@]}"; do
+    dest="$RUNNER_APP/$(basename "$icon")"
+    [ -e "$dest" ] || ADDED_FILES+=("$dest")
+    cp -f "$icon" "$dest"
+done
 if [ -f "$XCTEST/Assets.car" ]; then
+    [ -e "$RUNNER_APP/Assets.car" ] || ADDED_FILES+=("$RUNNER_APP/Assets.car")
     cp -f "$XCTEST/Assets.car" "$RUNNER_APP/"
 fi
-
-PLIST="$RUNNER_APP/Info.plist"
 /usr/libexec/PlistBuddy -c "Delete :CFBundleIcons" "$PLIST" 2>/dev/null || true
 /usr/libexec/PlistBuddy -c "Delete :CFBundleIcons~ipad" "$PLIST" 2>/dev/null || true
 
@@ -58,29 +78,40 @@ PLIST="$RUNNER_APP/Info.plist"
 /usr/libexec/PlistBuddy -c "Add :CFBundleIcons~ipad:CFBundlePrimaryIcon:CFBundleIconFiles:0 string AppIcon60x60" "$PLIST"
 /usr/libexec/PlistBuddy -c "Add :CFBundleIcons~ipad:CFBundlePrimaryIcon:CFBundleIconFiles:1 string AppIcon76x76" "$PLIST"
 
-# Re-codesign since we modified the bundle after Xcode signed it.
-# In a scheme post-action context Xcode's CODE_SIGN_* env vars are not exposed,
-# so discover the existing signing identity from the already-signed bundle.
+# Re-codesign since we modified the bundle after Xcode signed it. Scheme
+# post-actions never receive EXPANDED_CODE_SIGN_IDENTITY, so the signer has to
+# be recovered from the already-signed bundle.
 if [ -d "$RUNNER_APP/_CodeSignature" ]; then
     # Capture the signature info once. Piping codesign straight into
     # `awk ... exit` makes awk close the pipe early, killing codesign with
     # SIGPIPE -- which `set -o pipefail` turns into a fatal error. That trips
     # only when an Authority line exists, i.e. on every real-device build.
     SIGN_INFO=$(codesign -dvv "$RUNNER_APP" 2>&1 || true)
-    EXISTING_IDENT="${EXPANDED_CODE_SIGN_IDENTITY:-}"
-    if [ -z "$EXISTING_IDENT" ]; then
-        EXISTING_IDENT=$(awk -F'=' '/^Authority/ {print $2; exit}' <<< "$SIGN_INFO")
-    fi
-    # Simulator builds are ad-hoc signed: there is no Authority line, but the
-    # bundle can still be re-signed ad-hoc with an identity of "-".
-    if [ -z "$EXISTING_IDENT" ] && grep -q '^Signature=adhoc' <<< "$SIGN_INFO"; then
+
+    if grep -q '^Signature=adhoc' <<< "$SIGN_INFO"; then
+        # Simulator builds are ad-hoc signed; re-sign them ad-hoc.
         EXISTING_IDENT="-"
-    fi
-    if [ -n "$EXISTING_IDENT" ]; then
-        codesign --force --sign "$EXISTING_IDENT" \
-                 --preserve-metadata=identifier,entitlements "$RUNNER_APP"
     else
-        echo "warning: bundle is signed but no identity discovered; signature will be invalid"
+        # Identify the signer by leaf-certificate SHA-1, never by Authority
+        # display name: duplicate identities can share a name, and codesign
+        # then rejects the name as ambiguous (Apple TN3161).
+        EXISTING_IDENT=""
+        if codesign -d --extract-certificates="$CERT_DIR/leaf" "$RUNNER_APP" 2>/dev/null \
+                && [ -f "$CERT_DIR/leaf0" ]; then
+            EXISTING_IDENT=$(shasum -a 1 "$CERT_DIR/leaf0" | awk '{print toupper($1)}')
+        fi
+        if [ -z "$EXISTING_IDENT" ]; then
+            EXISTING_IDENT=$(awk -F'=' '/^Authority/ {print $2; exit}' <<< "$SIGN_INFO")
+        fi
+    fi
+
+    if [ -z "$EXISTING_IDENT" ] || ! codesign --force --sign "$EXISTING_IDENT" \
+            --preserve-metadata=identifier,entitlements "$RUNNER_APP"; then
+        # A modified-but-stale-signed bundle fails to install, which would break
+        # the session over a cosmetic icon. Undo instead.
+        restore_bundle
+        echo "warning: could not re-sign $RUNNER_APP; skipped icon embed"
+        exit 0
     fi
 fi
 

package/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.m

@@ -61,7 +61,7 @@
                                             error:error]) {
     return NO;
   }
-  [self fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  [self fb_waitUntilStableWithTimeout:FBConfiguration.sharedInstance.animationCoolOffTimeout];
   return YES;
 }
 

package/WebDriverAgentLib/Categories/XCUIApplicationProcess+FBQuiescence.m

@@ -22,13 +22,13 @@ static void (*original_waitForQuiescenceIncludingAnimationsIdlePreEvent)(id, SEL
 static void swizzledWaitForQuiescenceIncludingAnimationsIdle(id self, SEL _cmd, BOOL includingAnimations)
 {
   NSString *bundleId = [self bundleID];
-  if (![[self fb_shouldWaitForQuiescence] boolValue] || FBConfiguration.waitForIdleTimeout < DBL_EPSILON) {
+  if (![[self fb_shouldWaitForQuiescence] boolValue] || FBConfiguration.sharedInstance.waitForIdleTimeout < DBL_EPSILON) {
     [FBLogger logFmt:@"Quiescence checks are disabled for %@ application. Making it to believe it is idling",
      bundleId];
     return;
   }
 
-  NSTimeInterval desiredTimeout = FBConfiguration.waitForIdleTimeout;
+  NSTimeInterval desiredTimeout = FBConfiguration.sharedInstance.waitForIdleTimeout;
   NSTimeInterval previousTimeout = _XCTApplicationStateTimeout();
   _XCTSetApplicationStateTimeout(desiredTimeout);
   [FBLogger logFmt:@"Waiting up to %@s until %@ is in idle state (%@ animations)",
@@ -43,13 +43,13 @@ static void swizzledWaitForQuiescenceIncludingAnimationsIdle(id self, SEL _cmd,
 static void swizzledWaitForQuiescenceIncludingAnimationsIdlePreEvent(id self, SEL _cmd, BOOL includingAnimations, BOOL isPreEvent)
 {
   NSString *bundleId = [self bundleID];
-  if (![[self fb_shouldWaitForQuiescence] boolValue] || FBConfiguration.waitForIdleTimeout < DBL_EPSILON) {
+  if (![[self fb_shouldWaitForQuiescence] boolValue] || FBConfiguration.sharedInstance.waitForIdleTimeout < DBL_EPSILON) {
     [FBLogger logFmt:@"Quiescence checks are disabled for %@ application. Making it to believe it is idling",
      bundleId];
     return;
   }
 
-  NSTimeInterval desiredTimeout = FBConfiguration.waitForIdleTimeout;
+  NSTimeInterval desiredTimeout = FBConfiguration.sharedInstance.waitForIdleTimeout;
   NSTimeInterval previousTimeout = _XCTApplicationStateTimeout();
   _XCTSetApplicationStateTimeout(desiredTimeout);
   [FBLogger logFmt:@"Waiting up to %@s until %@ is in idle state (%@ animations)",

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -174,7 +174,7 @@ static bool fb_isLocked;
 
 - (NSData *)fb_screenshotWithError:(NSError*__autoreleasing*)error
 {
-  return [FBScreenshot takeInOriginalResolutionWithQuality:FBConfiguration.screenshotQuality
+  return [FBScreenshot takeInOriginalResolutionWithQuality:FBConfiguration.sharedInstance.screenshotQuality
                                                      error:error];
 }
 

package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m

@@ -59,7 +59,7 @@ static UIInterfaceOrientation FBInterfaceOrientationFromDeviceOrientation(UIDevi
 {
   // Tapping elements immediately after rotation may fail due to way UIKit is handling touches.
   // We should wait till UI cools off, before continuing
-  [application fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  [application fb_waitUntilStableWithTimeout:FBConfiguration.sharedInstance.animationCoolOffTimeout];
 
   return application.interfaceOrientation == FBInterfaceOrientationFromDeviceOrientation(orientation);
 }

package/WebDriverAgentLib/Categories/XCUIElement+FBFind.m

@@ -109,7 +109,7 @@
     id<FBXCElementSnapshot> snapshot = matchingSnapshots.firstObject;
     matchingSnapshots = @[snapshot];
   }
-  XCUIElement *scopeRoot = FBConfiguration.limitXpathContextScope ? self : self.application;
+  XCUIElement *scopeRoot = FBConfiguration.sharedInstance.limitXpathContextScope ? self : self.application;
   return [scopeRoot fb_filterDescendantsWithSnapshots:matchingSnapshots
                                          onlyChildren:NO];
 }

package/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m

@@ -198,7 +198,7 @@ const CGFloat FBScrollTouchProportion = 0.75f;
       }
       scrollCount++;
       // Wait for scroll animation
-      [self fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+      [self fb_waitUntilStableWithTimeout:FBConfiguration.sharedInstance.animationCoolOffTimeout];
     }
   }
 

package/WebDriverAgentLib/Categories/XCUIElement+FBTVFocuse.m

@@ -24,7 +24,7 @@ int const MAX_ITERATIONS_COUNT = 100;
 
 - (BOOL)fb_setFocusWithError:(NSError**) error
 {
-  [XCUIApplication.fb_activeApplication fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  [XCUIApplication.fb_activeApplication fb_waitUntilStableWithTimeout:FBConfiguration.sharedInstance.animationCoolOffTimeout];
 
   if (!self.wdEnabled) {
     if (error) {

package/WebDriverAgentLib/Categories/XCUIElement+FBTyping.m

@@ -100,7 +100,7 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
 {
   return [self fb_typeText:text
                shouldClear:shouldClear
-                 frequency:FBConfiguration.maxTypingFrequency
+                 frequency:FBConfiguration.sharedInstance.maxTypingFrequency
                      error:error];
 }
 
@@ -184,7 +184,7 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
       [self fb_prepareForTextInputWithSnapshot:snapshot];
     }
 
-    if (retry == 0 && FBConfiguration.useClearTextShortcut) {
+    if (retry == 0 && FBConfiguration.sharedInstance.useClearTextShortcut) {
       // 1st attempt is via the IOHIDEvent as the fastest operation
       // https://github.com/appium/appium/issues/19389
       [[XCUIDevice sharedDevice] fb_performIOHIDEventWithPage:0x07  // kHIDPage_KeyboardOrKeypad
@@ -194,8 +194,8 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
     } else if (retry >= MAX_CLEAR_RETRIES - 1) {
       // Last chance retry. Tripple-tap the field to select its content
       [self tapWithNumberOfTaps:3 numberOfTouches:1];
-      return FBTypeText(backspaceDeleteSequence, FBConfiguration.defaultTypingFrequency, error);
-    } else if (!FBTypeText(backspacesToType, FBConfiguration.defaultTypingFrequency, error)) {
+      return FBTypeText(backspaceDeleteSequence, FBConfiguration.sharedInstance.defaultTypingFrequency, error);
+    } else if (!FBTypeText(backspacesToType, FBConfiguration.sharedInstance.defaultTypingFrequency, error)) {
       // 2nd operation
       return NO;
     }
@@ -215,7 +215,7 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
   // kHIDPage_KeyboardOrKeypad did not work for tvOS's search field. (tvOS 17 at least)
   // Tested XCUIElementTypeSearchField and XCUIElementTypeTextView whch were
   // common search field and email/passowrd input in tvOS apps.
-  return FBTypeText(backspacesToType, FBConfiguration.defaultTypingFrequency, error);
+  return FBTypeText(backspacesToType, FBConfiguration.sharedInstance.defaultTypingFrequency, error);
 #endif
 }
 

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -130,7 +130,7 @@
 
 - (void)fb_waitUntilStable
 {
-  [self fb_waitUntilStableWithTimeout:FBConfiguration.waitForIdleTimeout];
+  [self fb_waitUntilStableWithTimeout:FBConfiguration.sharedInstance.waitForIdleTimeout];
 }
 
 - (void)fb_waitUntilStableWithTimeout:(NSTimeInterval)timeout
@@ -139,9 +139,9 @@
     return;
   }
 
-  NSTimeInterval previousTimeout = FBConfiguration.waitForIdleTimeout;
+  NSTimeInterval previousTimeout = FBConfiguration.sharedInstance.waitForIdleTimeout;
   BOOL previousQuiescence = self.application.fb_shouldWaitForQuiescence;
-  FBConfiguration.waitForIdleTimeout = timeout;
+  FBConfiguration.sharedInstance.waitForIdleTimeout = timeout;
   if (!previousQuiescence) {
     self.application.fb_shouldWaitForQuiescence = YES;
   }
@@ -150,7 +150,7 @@
   if (previousQuiescence != self.application.fb_shouldWaitForQuiescence) {
     self.application.fb_shouldWaitForQuiescence = previousQuiescence;
   }
-  FBConfiguration.waitForIdleTimeout = previousTimeout;
+  FBConfiguration.sharedInstance.waitForIdleTimeout = previousTimeout;
 }
 
 - (void)fb_raiseStaleElementExceptionWithError:(NSError *)error __attribute__((noreturn))

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -37,7 +37,7 @@
     return [self fb_nativeSnapshot];
   }
   // https://github.com/appium/WebDriverAgent/issues/1085
-  if (FBConfiguration.enforceCustomSnapshots) {
+  if (FBConfiguration.sharedInstance.enforceCustomSnapshots) {
     return [self fb_customSnapshot];
   }
   // https://github.com/appium/appium-xcuitest-driver/issues/2552

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -219,7 +219,7 @@
     [element adjustToNormalizedSliderPosition:sliderValue];
     return FBResponseWithOK();
   }
-  NSUInteger frequency = (NSUInteger)[request.arguments[@"frequency"] longLongValue] ?: [FBConfiguration maxTypingFrequency];
+  NSUInteger frequency = (NSUInteger)[request.arguments[@"frequency"] longLongValue] ?: FBConfiguration.sharedInstance.maxTypingFrequency;
   NSError *error = nil;
   // checkStaleness:YES above already took a fresh, verified-live snapshot of
   // `element` and cached it as `lastSnapshot` - reuse it instead of paying
@@ -292,7 +292,7 @@
   if (![element fb_setFocusWithError:&error]) {
     return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description traceback:nil]);
   }
-  return FBResponseWithStatus([FBCommandStatus okWithValue: FBDictionaryResponseWithElement(element, FBConfiguration.shouldUseCompactResponses)]);
+  return FBResponseWithStatus([FBCommandStatus okWithValue: FBDictionaryResponseWithElement(element, FBConfiguration.sharedInstance.shouldUseCompactResponses)]);
 }
 #else
 + (id<FBResponsePayload>)handleDoubleTap:(FBRouteRequest *)request
@@ -520,7 +520,7 @@
 + (id<FBResponsePayload>)handleKeys:(FBRouteRequest *)request
 {
   NSString *textToType = [request.arguments[@"value"] componentsJoinedByString:@""];
-  NSUInteger frequency = [request.arguments[@"frequency"] unsignedIntegerValue] ?: [FBConfiguration maxTypingFrequency];
+  NSUInteger frequency = [request.arguments[@"frequency"] unsignedIntegerValue] ?: FBConfiguration.sharedInstance.maxTypingFrequency;
   NSError *error;
   if (!FBTypeText(textToType, frequency, &error)) {
     return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

@@ -63,7 +63,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
   if (!element) {
     return FBNoSuchElementErrorResponseForRequest(request);
   }
-  return FBResponseWithCachedElement(element, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
+  return FBResponseWithCachedElement(element, request.session.elementCache, FBConfiguration.sharedInstance.shouldUseCompactResponses);
 }
 
 + (id<FBResponsePayload>)handleFindElements:(FBRouteRequest *)request
@@ -73,7 +73,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
                                       withValue:request.arguments[@"value"]
                                           under:session.activeApplication
                     shouldReturnAfterFirstMatch:NO];
-  return FBResponseWithCachedElements(elements, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
+  return FBResponseWithCachedElements(elements, request.session.elementCache, FBConfiguration.sharedInstance.shouldUseCompactResponses);
 }
 
 + (id<FBResponsePayload>)handleFindVisibleCells:(FBRouteRequest *)request
@@ -87,7 +87,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
   }];
   NSArray *cells = [element fb_filterDescendantsWithSnapshots:visibleCellSnapshots
                                                  onlyChildren:NO];
-  return FBResponseWithCachedElements(cells, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
+  return FBResponseWithCachedElements(cells, request.session.elementCache, FBConfiguration.sharedInstance.shouldUseCompactResponses);
 }
 
 + (id<FBResponsePayload>)handleFindSubElement:(FBRouteRequest *)request
@@ -101,7 +101,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
   if (!foundElement) {
     return FBNoSuchElementErrorResponseForRequest(request);
   }
-  return FBResponseWithCachedElement(foundElement, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
+  return FBResponseWithCachedElement(foundElement, request.session.elementCache, FBConfiguration.sharedInstance.shouldUseCompactResponses);
 }
 
 + (id<FBResponsePayload>)handleFindSubElements:(FBRouteRequest *)request
@@ -113,7 +113,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
                                            withValue:request.arguments[@"value"]
                                                under:element
                          shouldReturnAfterFirstMatch:NO];
-  return FBResponseWithCachedElements(foundElements, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
+  return FBResponseWithCachedElements(foundElements, request.session.elementCache, FBConfiguration.sharedInstance.shouldUseCompactResponses);
 }
 
 + (id<FBResponsePayload>)handleGetActiveElement:(FBRouteRequest *)request
@@ -122,7 +122,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
   if (nil == element) {
     return FBNoSuchElementErrorResponseForRequest(request);
   }
-  return FBResponseWithCachedElement(element, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
+  return FBResponseWithCachedElement(element, request.session.elementCache, FBConfiguration.sharedInstance.shouldUseCompactResponses);
 }
 
 #if TARGET_OS_TV
@@ -131,7 +131,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
   XCUIElement *element = request.session.activeApplication.fb_focusedElement;
   return element == nil
     ? FBNoSuchElementErrorResponseForRequest(request)
-    : FBResponseWithCachedElement(element, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
+    : FBResponseWithCachedElement(element, request.session.elementCache, FBConfiguration.sharedInstance.shouldUseCompactResponses);
 }
 #endif
 

package/WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -264,29 +264,29 @@
 
 + (void)applyConfigurationFromCapabilities:(NSDictionary<NSString *, id> *)capabilities
 {
-  [FBConfiguration resetSessionSettings];
+  [FBConfiguration.sharedInstance resetSessionSettings];
   if (capabilities[FB_SETTING_USE_COMPACT_RESPONSES]) {
-    [FBConfiguration setShouldUseCompactResponses:[capabilities[FB_SETTING_USE_COMPACT_RESPONSES] boolValue]];
+    FBConfiguration.sharedInstance.shouldUseCompactResponses = [capabilities[FB_SETTING_USE_COMPACT_RESPONSES] boolValue];
   }
   NSString *elementResponseAttributes = capabilities[FB_SETTING_ELEMENT_RESPONSE_ATTRIBUTES];
   if (elementResponseAttributes) {
-    [FBConfiguration setElementResponseAttributes:elementResponseAttributes];
+    FBConfiguration.sharedInstance.elementResponseAttributes = elementResponseAttributes;
   }
   if (capabilities[FB_CAP_MAX_TYPING_FREQUENCY]) {
-    [FBConfiguration setMaxTypingFrequency:[capabilities[FB_CAP_MAX_TYPING_FREQUENCY] unsignedIntegerValue]];
+    FBConfiguration.sharedInstance.maxTypingFrequency = [capabilities[FB_CAP_MAX_TYPING_FREQUENCY] unsignedIntegerValue];
   }
   if (capabilities[FB_CAP_USE_SINGLETON_TEST_MANAGER]) {
-    [FBConfiguration setShouldUseSingletonTestManager:[capabilities[FB_CAP_USE_SINGLETON_TEST_MANAGER] boolValue]];
+    FBConfiguration.sharedInstance.shouldUseSingletonTestManager = [capabilities[FB_CAP_USE_SINGLETON_TEST_MANAGER] boolValue];
   }
   if (capabilities[FB_CAP_DISABLE_AUTOMATIC_SCREENSHOTS]) {
     if ([capabilities[FB_CAP_DISABLE_AUTOMATIC_SCREENSHOTS] boolValue]) {
-      [FBConfiguration disableScreenshots];
+      [FBConfiguration.sharedInstance disableScreenshots];
     } else {
-      [FBConfiguration enableScreenshots];
+      [FBConfiguration.sharedInstance enableScreenshots];
     }
   }
   if (capabilities[FB_CAP_SHOULD_TERMINATE_APP]) {
-    [FBConfiguration setShouldTerminateApp:[capabilities[FB_CAP_SHOULD_TERMINATE_APP] boolValue]];
+    FBConfiguration.sharedInstance.shouldTerminateApp = [capabilities[FB_CAP_SHOULD_TERMINATE_APP] boolValue];
   }
   NSNumber *delay = capabilities[FB_CAP_EVENT_LOOP_IDLE_DELAY_SEC];
   if ([delay doubleValue] > 0.0) {
@@ -295,11 +295,11 @@
     [XCUIApplicationProcessDelay disableEventLoopDelay];
   }
   if (nil != capabilities[FB_SETTING_WAIT_FOR_IDLE_TIMEOUT]) {
-    FBConfiguration.waitForIdleTimeout = [capabilities[FB_SETTING_WAIT_FOR_IDLE_TIMEOUT] doubleValue];
+    FBConfiguration.sharedInstance.waitForIdleTimeout = [capabilities[FB_SETTING_WAIT_FOR_IDLE_TIMEOUT] doubleValue];
   }
   if (nil == capabilities[FB_CAP_FORCE_SIMULATOR_SOFTWARE_KEYBOARD_PRESENCE] ||
       [capabilities[FB_CAP_FORCE_SIMULATOR_SOFTWARE_KEYBOARD_PRESENCE] boolValue]) {
-    [FBConfiguration forceSimulatorSoftwareKeyboardPresence];
+    [FBConfiguration.sharedInstance forceSimulatorSoftwareKeyboardPresence];
   }
 }
 

package/WebDriverAgentLib/FBAlert.m

@@ -200,7 +200,7 @@
   id<FBXCElementSnapshot> snapshot = dstField.fb_cachedSnapshot ?: [dstField fb_standardSnapshot];
   if (![dstField fb_typeText:text
                   shouldClear:YES
-                    frequency:FBConfiguration.maxTypingFrequency
+                    frequency:FBConfiguration.sharedInstance.maxTypingFrequency
                      snapshot:snapshot
                         error:&error]) {
     [self fb_raiseSetTextFailedExceptionWithReason:error.description];
@@ -236,17 +236,17 @@
   }
 
   XCUIElement *acceptButton = nil;
-  if (FBConfiguration.acceptAlertButtonSelector.length) {
+  if (FBConfiguration.sharedInstance.acceptAlertButtonSelector.length) {
     NSString *errorReason = nil;
     @try {
-      acceptButton = [[alertElement fb_descendantsMatchingClassChain:FBConfiguration.acceptAlertButtonSelector
+      acceptButton = [[alertElement fb_descendantsMatchingClassChain:FBConfiguration.sharedInstance.acceptAlertButtonSelector
                                            shouldReturnAfterFirstMatch:YES] firstObject];
     } @catch (NSException *ex) {
       errorReason = ex.reason;
     }
     if (nil == acceptButton) {
       [FBLogger logFmt:@"Cannot find any match for Accept alert button using the class chain selector '%@'",
-       FBConfiguration.acceptAlertButtonSelector];
+       FBConfiguration.sharedInstance.acceptAlertButtonSelector];
       if (nil != errorReason) {
         [FBLogger logFmt:@"Original error: %@", errorReason];
       }
@@ -293,17 +293,17 @@
   }
 
   XCUIElement *dismissButton = nil;
-  if (FBConfiguration.dismissAlertButtonSelector.length) {
+  if (FBConfiguration.sharedInstance.dismissAlertButtonSelector.length) {
     NSString *errorReason = nil;
     @try {
-      dismissButton = [[alertElement fb_descendantsMatchingClassChain:FBConfiguration.dismissAlertButtonSelector
+      dismissButton = [[alertElement fb_descendantsMatchingClassChain:FBConfiguration.sharedInstance.dismissAlertButtonSelector
                                             shouldReturnAfterFirstMatch:YES] firstObject];
     } @catch (NSException *ex) {
       errorReason = ex.reason;
     }
     if (nil == dismissButton) {
       [FBLogger logFmt:@"Cannot find any match for Dismiss alert button using the class chain selector '%@'",
-       FBConfiguration.dismissAlertButtonSelector];
+       FBConfiguration.sharedInstance.dismissAlertButtonSelector];
       if (nil != errorReason) {
         [FBLogger logFmt:@"Original error: %@", errorReason];
       }

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>16.1.7</string>
+    <string>16.2.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>16.1.7</string>
+    <string>16.2.1</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentLib/Routing/FBResponsePayload.m

@@ -120,7 +120,7 @@ inline NSDictionary *FBDictionaryResponseWithElement(XCUIElement *element, BOOL
 
     NSMutableDictionary *result = compactResult.mutableCopy;
     FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
-    NSArray *fields = [FBConfiguration.elementResponseAttributes componentsSeparatedByString:@","];
+    NSArray *fields = [FBConfiguration.sharedInstance.elementResponseAttributes componentsSeparatedByString:@","];
     for (NSString *field in fields) {
       // 'name' here is the w3c-approved identifier for what we mean by 'type'
       if ([field isEqualToString:@"name"] || [field isEqualToString:@"type"]) {

package/WebDriverAgentLib/Routing/FBSession.m

@@ -52,7 +52,7 @@ NSString *const FB_SAFARI_BUNDLE_ID = @"com.apple.mobilesafari";
 
 - (void)didDetectAlert:(FBAlert *)alert
 {
-  NSString *autoClickAlertSelector = FBConfiguration.autoClickAlertSelector;
+  NSString *autoClickAlertSelector = FBConfiguration.sharedInstance.autoClickAlertSelector;
   if ([autoClickAlertSelector length] > 0) {
     @try {
       [alert clickElementMatchingClassChain:autoClickAlertSelector];
@@ -185,7 +185,7 @@ static FBSession *_activeSession = nil;
   }
 
   if (nil != self.testedApplication
-      && FBConfiguration.shouldTerminateApp
+      && FBConfiguration.sharedInstance.shouldTerminateApp
       && self.testedApplication.running
       && ![self.testedApplication fb_isSameAppAs:XCUIApplication.fb_systemApplication]) {
     @try {
@@ -217,7 +217,7 @@ static FBSession *_activeSession = nil;
                                       // To look for 'criticalAlertSetting' elements https://developer.apple.com/documentation/usernotifications/unnotificationsettings/criticalalertsetting
                                       // See https://github.com/appium/appium/issues/20835
                                       @"NotificationShortLookView"];
-      if ([FBConfiguration shouldRespectSystemAlerts]
+      if (FBConfiguration.sharedInstance.shouldRespectSystemAlerts
           && [[XCUIApplication.fb_systemApplication descendantsMatchingType:XCUIElementTypeAny]
               matchingPredicate:searchPredicate].count > 0) {
         return XCUIApplication.fb_systemApplication;

package/WebDriverAgentLib/Routing/FBWebServer.m

@@ -41,7 +41,7 @@ static NSString *const FBServerURLEndMarker = @"<-ServerURLHere";
 
 - (UInt64)maxRequestBodySize
 {
-  return FBConfiguration.httpRequestBodySizeLimit;
+  return FBConfiguration.sharedInstance.httpRequestBodySizeLimit;
 }
 
 @end
@@ -104,8 +104,8 @@ static NSString *const FBServerURLEndMarker = @"<-ServerURLHere";
   [self registerRouteHandlers:[self.class collectCommandHandlerClasses]];
   [self registerServerKeyRouteHandlers];
 
-  NSRange serverPortRange = FBConfiguration.bindingPortRange;
-  NSString *bindingIP = FBConfiguration.bindingIPAddress;
+  NSRange serverPortRange = FBConfiguration.sharedInstance.bindingPortRange;
+  NSString *bindingIP = FBConfiguration.sharedInstance.bindingIPAddress;
   if (bindingIP != nil) {
     [self.server setInterface:bindingIP];
     [FBLogger logFmt:@"Using custom binding IP address: %@", bindingIP];
@@ -146,11 +146,11 @@ static NSString *const FBServerURLEndMarker = @"<-ServerURLHere";
   [self readMjpegSettingsFromEnv];
   self.mjpegServer = [[FBMjpegServer alloc] init];
   self.screenshotsBroadcaster = [[FBTCPSocket alloc]
-                                 initWithPort:(uint16_t)FBConfiguration.mjpegServerPort];
+                                 initWithPort:(uint16_t)FBConfiguration.sharedInstance.mjpegServerPort];
   self.screenshotsBroadcaster.delegate = self.mjpegServer;
   NSError *error;
   if (![self.screenshotsBroadcaster startWithError:&error]) {
-    [FBLogger logFmt:@"Cannot init screenshots broadcaster service on port %@. Original error: %@", @(FBConfiguration.mjpegServerPort), error.description];
+    [FBLogger logFmt:@"Cannot init screenshots broadcaster service on port %@. Original error: %@", @(FBConfiguration.sharedInstance.mjpegServerPort), error.description];
     [self.mjpegServer stopStreaming];
     self.mjpegServer = nil;
     self.screenshotsBroadcaster = nil;
@@ -179,11 +179,11 @@ static NSString *const FBServerURLEndMarker = @"<-ServerURLHere";
   NSDictionary *env = NSProcessInfo.processInfo.environment;
   NSString *scalingFactor = [env objectForKey:@"MJPEG_SCALING_FACTOR"];
   if (scalingFactor != nil && [scalingFactor length] > 0) {
-    [FBConfiguration setMjpegScalingFactor:[scalingFactor floatValue]];
+    FBConfiguration.sharedInstance.mjpegScalingFactor = [scalingFactor floatValue];
   }
   NSString *screenshotQuality = [env objectForKey:@"MJPEG_SERVER_SCREENSHOT_QUALITY"];
   if (screenshotQuality != nil && [screenshotQuality length] > 0) {
-    [FBConfiguration setMjpegServerScreenshotQuality:[screenshotQuality integerValue]];
+    FBConfiguration.sharedInstance.mjpegServerScreenshotQuality = [screenshotQuality integerValue];
   }
 }