appium-webdriveragent 4.10.6 → 4.10.8

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [4.10.8](https://github.com/appium/WebDriverAgent/compare/v4.10.7...v4.10.8) (2022-11-24)
+
+## [4.10.7](https://github.com/appium/WebDriverAgent/compare/v4.10.6...v4.10.7) (2022-11-24)
+
 ## [4.10.6](https://github.com/appium/WebDriverAgent/compare/v4.10.5...v4.10.6) (2022-11-23)
 
 ## [4.10.5](https://github.com/appium/WebDriverAgent/compare/v4.10.4...v4.10.5) (2022-11-22)

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -31,7 +31,6 @@
 #import "XCTestPrivateSymbols.h"
 #import "XCTRunnerDaemonSession.h"
 
-const static NSTimeInterval FBMinimumAppSwitchWait = 3.0;
 static NSString* const FBUnknownBundleId = @"unknown";
 
 
@@ -92,7 +91,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
   if(![[XCUIDevice sharedDevice] fb_goToHomescreenWithError:error]) {
     return NO;
   }
-  [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:MAX(duration, FBMinimumAppSwitchWait)]];
+  [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:MAX(duration, .0)]];
   [self fb_activate];
   return YES;
 }

package/WebDriverAgentLib/Categories/XCUIElement+FBCaching.m

@@ -48,7 +48,7 @@ static char XCUIELEMENT_CACHE_ID_KEY;
     uid = self.fb_uid;
   } else {
     id<FBXCElementSnapshot> snapshot = self.fb_cachedSnapshot ?: self.fb_takeSnapshot;
-    uid = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdUID;
+    uid = [FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot];
   }
 
   objc_setAssociatedObject(self, &XCUIELEMENT_CACHE_ID_KEY, uid, OBJC_ASSOCIATION_RETAIN_NONATOMIC);

package/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m

@@ -34,9 +34,9 @@
 
 @implementation FBXCElementSnapshotWrapper (FBIsVisible)
 
-- (NSString *)fb_uniqId
++ (NSString *)fb_uniqIdWithSnapshot:(id<FBXCElementSnapshot>)snapshot
 {
-  return self.fb_uid ?: [NSString stringWithFormat:@"%p", (void *)self];
+  return [FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot] ?: [NSString stringWithFormat:@"%p", (void *)snapshot];
 }
 
 - (nullable NSNumber *)fb_cachedVisibilityValue
@@ -46,14 +46,14 @@
     return nil;
   }
 
-  NSDictionary<NSString *, NSNumber *> *result = [cache objectForKey:@(self.generation)];
+  NSDictionary<NSString *, NSNumber *> *result = cache[@(self.generation)];
   if (nil == result) {
     // There is no need to keep the cached data for the previous generations
     [cache removeAllObjects];
-    [cache setObject:[NSMutableDictionary dictionary] forKey:@(self.generation)];
+    cache[@(self.generation)] = [NSMutableDictionary dictionary];
     return nil;
   }
-  return [result objectForKey:self.fb_uniqId];
+  return result[[self.class fb_uniqIdWithSnapshot:self.snapshot]];
 }
 
 - (BOOL)fb_cacheVisibilityWithValue:(BOOL)isVisible
@@ -63,19 +63,19 @@
   if (nil == cache) {
     return isVisible;
   }
-  NSMutableDictionary<NSString *, NSNumber *> *destination = [cache objectForKey:@(self.generation)];
+  NSMutableDictionary<NSString *, NSNumber *> *destination = cache[@(self.generation)];
   if (nil == destination) {
     return isVisible;
   }
 
   NSNumber *visibleObj = [NSNumber numberWithBool:isVisible];
-  [destination setObject:visibleObj forKey:self.fb_uniqId];
+  destination[[self.class fb_uniqIdWithSnapshot:self.snapshot]] = visibleObj;
   if (isVisible && nil != ancestors) {
     // if an element is visible then all its ancestors must be visible as well
     for (id<FBXCElementSnapshot> ancestor in ancestors) {
-      NSString *ancestorId = [FBXCElementSnapshotWrapper ensureWrapped:ancestor].fb_uniqId;
-      if (nil == [destination objectForKey:ancestorId]) {
-        [destination setObject:visibleObj forKey:ancestorId];
+      NSString *ancestorId = [self.class fb_uniqIdWithSnapshot:ancestor];
+      if (nil == destination[ancestorId]) {
+        destination[ancestorId] = visibleObj;
       }
     }
   }

package/WebDriverAgentLib/Categories/XCUIElement+FBResolve.m

@@ -41,8 +41,9 @@ static char XCUIELEMENT_IS_RESOLVED_NATIVELY_KEY;
   XCUIElementQuery *query = [self isKindOfClass:XCUIApplication.class]
     ? self.application.fb_query
     : [self.application.fb_query descendantsMatchingType:XCUIElementTypeAny];
-  FBXCElementSnapshotWrapper *cachedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:self.fb_cachedSnapshot];
-  NSString *uid = nil == cachedSnapshot ? self.fb_uid : cachedSnapshot.fb_uid;
+  NSString *uid = nil == self.fb_cachedSnapshot
+    ? self.fb_uid
+    : [FBXCElementSnapshotWrapper wdUIDWithSnapshot:(id)self.fb_cachedSnapshot];
   if (nil == uid) {
     return self;
   }

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

@@ -22,6 +22,7 @@
 #import "XCUIElement+FBClassChain.h"
 #import "XCUIElement+FBFind.h"
 #import "XCUIElement+FBIsVisible.h"
+#import "XCUIElement+FBUID.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
 
@@ -88,7 +89,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
       && [FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdVisible;
   }];
   NSArray *cells = [element fb_filterDescendantsWithSnapshots:visibleCellSnapshots
-                                                      selfUID:[FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdUID
+                                                      selfUID:[FBXCElementSnapshotWrapper wdUIDWithSnapshot:element.lastSnapshot]
                                                  onlyChildren:NO];
   return FBResponseWithCachedElements(cells, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
 }

package/WebDriverAgentLib/Utilities/FBMjpegServer.m

@@ -31,7 +31,6 @@ static const char *QUEUE_NAME = "JPEG Screenshots Provider Queue";
 
 @property (nonatomic, readonly) dispatch_queue_t backgroundQueue;
 @property (nonatomic, readonly) NSMutableArray<GCDAsyncSocket *> *listeningClients;
-@property (nonatomic, readonly) mach_timebase_info_data_t timebaseInfo;
 @property (nonatomic, readonly) FBImageIOScaler *imageScaler;
 @property (nonatomic, readonly) long long mainScreenID;
 
@@ -46,7 +45,6 @@ static const char *QUEUE_NAME = "JPEG Screenshots Provider Queue";
     _listeningClients = [NSMutableArray array];
     dispatch_queue_attr_t queueAttributes = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_UTILITY, 0);
     _backgroundQueue = dispatch_queue_create(QUEUE_NAME, queueAttributes);
-    mach_timebase_info(&_timebaseInfo);
     dispatch_async(_backgroundQueue, ^{
       [self streamScreenshot];
     });
@@ -58,8 +56,8 @@ static const char *QUEUE_NAME = "JPEG Screenshots Provider Queue";
 
 - (void)scheduleNextScreenshotWithInterval:(uint64_t)timerInterval timeStarted:(uint64_t)timeStarted
 {
-  uint64_t timeElapsed = mach_absolute_time() - timeStarted;
-  int64_t nextTickDelta = timerInterval - timeElapsed * self.timebaseInfo.numer / self.timebaseInfo.denom;
+  uint64_t timeElapsed = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW) - timeStarted;
+  int64_t nextTickDelta = timerInterval - timeElapsed;
   if (nextTickDelta > 0) {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, nextTickDelta), self.backgroundQueue, ^{
       [self streamScreenshot];
@@ -81,7 +79,7 @@ static const char *QUEUE_NAME = "JPEG Screenshots Provider Queue";
 
   NSUInteger framerate = FBConfiguration.mjpegServerFramerate;
   uint64_t timerInterval = (uint64_t)(1.0 / ((0 == framerate || framerate > MAX_FPS) ? MAX_FPS : framerate) * NSEC_PER_SEC);
-  uint64_t timeStarted = mach_absolute_time();
+  uint64_t timeStarted = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW);
   @synchronized (self.listeningClients) {
     if (0 == self.listeningClients.count) {
       [self scheduleNextScreenshotWithInterval:timerInterval timeStarted:timeStarted];

package/WebDriverAgentLib/Utilities/FBPasteboard.m

@@ -94,7 +94,7 @@
     pasteboardContent = result;
     didFinishGetPasteboard = YES;
   });
-  uint64_t timeStarted = mach_absolute_time();
+  uint64_t timeStarted = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW);
   while (!didFinishGetPasteboard) {
     [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:ALERT_CHECK_INTERVAL_SEC]];
     if (didFinishGetPasteboard) {
@@ -106,7 +106,7 @@
       FBAlert *alert = [FBAlert alertWithElement:alertElement];
       [alert acceptWithError:nil];
     }
-    uint64_t timeElapsed = mach_absolute_time() - timeStarted;
+    uint64_t timeElapsed = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW) - timeStarted;
     if (timeElapsed / NSEC_PER_SEC > timeout) {
       NSString *description = [NSString stringWithFormat:@"Cannot handle pasteboard alert within %@s timeout", @(timeout)];
       if (error) {

package/WebDriverAgentTests/IntegrationTests/XCUIApplicationHelperTests.m

@@ -46,10 +46,10 @@
 - (void)testDeactivateApplication
 {
   NSError *error;
-  uint64_t timeStarted = mach_absolute_time();
+  uint64_t timeStarted = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW);
   NSTimeInterval backgroundDuration = 5.0;
   XCTAssertTrue([self.testedApplication fb_deactivateWithDuration:backgroundDuration error:&error]);
-  NSTimeInterval timeElapsed = (mach_absolute_time() - timeStarted) / NSEC_PER_SEC;
+  NSTimeInterval timeElapsed = (clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW) - timeStarted) / NSEC_PER_SEC;
   XCTAssertNil(error);
   XCTAssertEqualWithAccuracy(timeElapsed, backgroundDuration, 3.0);
   XCTAssertTrue(self.testedApplication.buttons[@"Alerts"].exists);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "4.10.6",
+  "version": "4.10.8",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {