appium-webdriveragent 16.11.0 → 16.11.2

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [16.11.2](https://github.com/appium/WebDriverAgent/compare/v16.11.1...v16.11.2) (2026-08-30)
+
+### Bug Fixes
+
+* reject requests admitted after their session was abandoned ([#1229](https://github.com/appium/WebDriverAgent/issues/1229)) ([d6b4862](https://github.com/appium/WebDriverAgent/commit/d6b4862ea113083959a80e87c488fd555cbc8061))
+
+## [16.11.1](https://github.com/appium/WebDriverAgent/compare/v16.11.0...v16.11.1) (2026-08-29)
+
+### Bug Fixes
+
+* build of FBMjpegServer ([#1239](https://github.com/appium/WebDriverAgent/issues/1239)) ([a3b8650](https://github.com/appium/WebDriverAgent/commit/a3b8650670b9b30c5fc0cd5aa4834a6774d4a828))
+
 ## [16.11.0](https://github.com/appium/WebDriverAgent/compare/v16.10.0...v16.11.0) (2026-08-29)
 
 ### Features

package/WebDriverAgent.xcodeproj/project.pbxproj

@@ -1191,6 +1191,7 @@
 		EE8DDD7F20C5733C004D4925 /* XCUIElement+FBForceTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = EE8DDD7D20C5733C004D4925 /* XCUIElement+FBForceTouch.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EE9AB8011CAEE048008C271F /* UITestingUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7FD1CAEE048008C271F /* UITestingUITests.m */; };
 		EE9B76591CF7987800275851 /* FBRouteTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76571CF7987300275851 /* FBRouteTests.m */; };
+		C312172CE7EE9B10B7A3034B /* FBHTTPServerSessionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FB741D78562232A78902B374 /* FBHTTPServerSessionTests.m */; };
 		DF82F4A8758B79DD91FA20CC /* FBHTTPServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 76B7399DDF52C85A21433C1D /* FBHTTPServerTests.m */; };
 		EE9B768E1CF7997600275851 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76831CF7997600275851 /* AppDelegate.m */; };
 		EE9B768F1CF7997600275851 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76851CF7997600275851 /* ViewController.m */; };
@@ -1908,6 +1909,7 @@
 		EE9B75D41CF7956C00275851 /* IntegrationApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = IntegrationApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		EE9B75EC1CF7956C00275851 /* IntegrationTests_1.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IntegrationTests_1.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		EE9B76571CF7987300275851 /* FBRouteTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBRouteTests.m; sourceTree = "<group>"; };
+		FB741D78562232A78902B374 /* FBHTTPServerSessionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBHTTPServerSessionTests.m; sourceTree = "<group>"; };
 		76B7399DDF52C85A21433C1D /* FBHTTPServerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBHTTPServerTests.m; sourceTree = "<group>"; };
 		EE9B76581CF7987300275851 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EE9B76821CF7997600275851 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -2679,6 +2681,7 @@
 				713352FC26CEF31D00523CBC /* FBLRUCacheTests.m */,
 				EE18883C1DA663EB00307AA8 /* FBMathUtilsTests.m */,
 				718F49C7230844330045FE8B /* FBProtocolHelpersTests.m */,
+				FB741D78562232A78902B374 /* FBHTTPServerSessionTests.m */,
 				76B7399DDF52C85A21433C1D /* FBHTTPServerTests.m */,
 				EE9B76571CF7987300275851 /* FBRouteTests.m */,
 				EE3F8CFD1D08AA17006F02CE /* FBRunLoopSpinnerTests.m */,
@@ -4816,6 +4819,7 @@
 				719FF5B91DAD21F5008E0099 /* FBElementUtilitiesTests.m in Sources */,
 				716E0BD11E917F260087A825 /* FBXMLSafeStringTests.m in Sources */,
 				ADEF63AF1D09DEBE0070A7E3 /* FBRuntimeUtilsTests.m in Sources */,
+				C312172CE7EE9B10B7A3034B /* FBHTTPServerSessionTests.m in Sources */,
 				DF82F4A8758B79DD91FA20CC /* FBHTTPServerTests.m in Sources */,
 				EE9B76591CF7987800275851 /* FBRouteTests.m in Sources */,
 				7139145C1DF01A12005896C2 /* NSExpressionFBFormatTests.m in Sources */,

package/WebDriverAgentLib/Info.plist

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

package/WebDriverAgentLib/Routing/FBHTTPServer.m

@@ -131,6 +131,10 @@ static BOOL FBParseContentLength(NSString *value, NSUInteger *outLength)
 // standalone or not (except DELETE /session itself - see -dispatchMethod:). See
 // -abandonPendingRequestsForSessionID:. Guarded by @synchronized(self.pendingSessionRequests).
 @property (nonatomic, strong) NSMutableDictionary<NSString *, NSMutableSet<FBPendingRequest *> *> *pendingSessionRequests;
+// Already-abandoned sessions mapped to the response they were abandoned with, so a request parsed
+// after that point is answered at once instead of queueing for a session that is gone. Kept for
+// the server's lifetime; ids are UUIDs. Guarded by @synchronized(self.pendingSessionRequests).
+@property (nonatomic, strong) NSMutableDictionary<NSString *, RouteResponse *> *abandonedSessionResponses;
 // When each connection started waiting for its current request. The reaper closes connections
 // whose entry outlives FBIncompleteRequestTimeout; idle keep-alive connections have no entry and
 // are exempt. Guarded by @synchronized(self.connectionBuffers).
@@ -159,6 +163,7 @@ static const int64_t FBStaleConnectionSweepIntervalSec = 10;
     _connectionsAwaitingResponse = [NSMutableSet set];
     _standaloneWaiters = [NSMutableDictionary dictionary];
     _pendingSessionRequests = [NSMutableDictionary dictionary];
+    _abandonedSessionResponses = [NSMutableDictionary dictionary];
     _incompleteRequestStarts = [NSMapTable mapTableWithKeyOptions:(NSPointerFunctionsOptions)(NSMapTableObjectPointerPersonality | NSMapTableStrongMemory)
                                                      valueOptions:(NSPointerFunctionsOptions)NSMapTableStrongMemory];
   }
@@ -678,7 +683,11 @@ static const int64_t FBStaleConnectionSweepIntervalSec = 10;
     FBPendingRequest *pendingRequest = nil;
     if (nil != sessionID) {
       pendingRequest = [[FBPendingRequest alloc] initWithClient:client];
-      [self trackPendingRequest:pendingRequest forSessionID:sessionID];
+      RouteResponse *abandonedResponse = [self trackPendingRequest:pendingRequest forSessionID:sessionID];
+      if (nil != abandonedResponse) {
+        [self writeResponse:abandonedResponse toClient:client];
+        return;
+      }
     }
 
     void (^invoke)(void) = ^{
@@ -709,15 +718,22 @@ static const int64_t FBStaleConnectionSweepIntervalSec = 10;
 
 #pragma mark - Session-scoped request cancellation
 
-- (void)trackPendingRequest:(FBPendingRequest *)pendingRequest forSessionID:(NSString *)sessionID
+// Returns nil once `pendingRequest` is tracked, or the response an already-abandoned session was
+// abandoned with, which the caller must deliver instead of dispatching.
+- (nullable RouteResponse *)trackPendingRequest:(FBPendingRequest *)pendingRequest forSessionID:(NSString *)sessionID
 {
   @synchronized (self.pendingSessionRequests) {
+    RouteResponse *abandonedResponse = self.abandonedSessionResponses[sessionID];
+    if (nil != abandonedResponse) {
+      return abandonedResponse;
+    }
     NSMutableSet<FBPendingRequest *> *pendingRequests = self.pendingSessionRequests[sessionID];
     if (nil == pendingRequests) {
       pendingRequests = [NSMutableSet set];
       self.pendingSessionRequests[sessionID] = pendingRequests;
     }
     [pendingRequests addObject:pendingRequest];
+    return nil;
   }
 }
 
@@ -744,6 +760,8 @@ static const int64_t FBStaleConnectionSweepIntervalSec = 10;
   @synchronized (self.pendingSessionRequests) {
     pendingRequests = [self.pendingSessionRequests[sessionID] copy];
     [self.pendingSessionRequests removeObjectForKey:sessionID];
+    // Recorded before the lock is dropped, so requests admitted from here on are rejected.
+    self.abandonedSessionResponses[sessionID] = response;
   }
   for (FBPendingRequest *pendingRequest in pendingRequests) {
     [self writeResponse:response toClient:pendingRequest.client];
@@ -764,7 +782,11 @@ static const int64_t FBStaleConnectionSweepIntervalSec = 10;
   NSString *key = [NSString stringWithFormat:@"%@ %@", method, pathAndQuery];
   FBPendingRequest *waiter = [[FBPendingRequest alloc] initWithClient:client];
   if (nil != sessionID) {
-    [self trackPendingRequest:waiter forSessionID:sessionID];
+    RouteResponse *abandonedResponse = [self trackPendingRequest:waiter forSessionID:sessionID];
+    if (nil != abandonedResponse) {
+      [self writeResponse:abandonedResponse toClient:client];
+      return;
+    }
   }
 
   BOOL isInFlight = NO;

package/WebDriverAgentLib/Utilities/FBMjpegServer.m

@@ -165,7 +165,7 @@ static NSUInteger FBNormalizedMjpegFramerate(NSUInteger framerate)
         continue;
       }
       [self.pendingFrameCounts setObject:@(pendingFrames + 1) forKey:client];
-      [self.socket writeData:chunk toClient:client completion:^{
+      [self.socket writeData:chunk toClient:client completion:^(BOOL didSucceed) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if (nil == strongSelf) {
           return;

package/WebDriverAgentTests/UnitTests/FBHTTPServerSessionTests.m

@@ -0,0 +1,133 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import <arpa/inet.h>
+#import <stdatomic.h>
+#import <sys/socket.h>
+
+#import "FBHTTPServer.h"
+
+static atomic_int gSessionProbeHits;
+
+@interface FBHTTPServerSessionTests : XCTestCase
+@property (nonatomic, strong) FBHTTPServer *server;
+@property (nonatomic, assign) uint16_t port;
+@end
+
+@implementation FBHTTPServerSessionTests
+
+- (void)setUp
+{
+  [super setUp];
+  atomic_store(&gSessionProbeHits, 0);
+  self.server = [FBHTTPServer new];
+  [self.server get:@"/session/:sessionID/probe" withBlock:^(RouteRequest *request, RouteResponse *response) {
+    atomic_fetch_add(&gSessionProbeHits, 1);
+    [response respondWithString:@"session-probe-ok"];
+  }];
+  self.server.port = 0;
+  NSError *error;
+  XCTAssertTrue([self.server start:&error], @"%@", error);
+  self.port = [[self.server valueForKeyPath:@"socket.port"] unsignedShortValue];
+}
+
+- (void)tearDown
+{
+  [self.server stop:NO];
+  self.server = nil;
+  [super tearDown];
+}
+
+- (NSString *)responseForRawPayload:(NSData *)payload timeout:(NSTimeInterval)timeout
+{
+  int fd = socket(AF_INET, SOCK_STREAM, 0);
+  if (fd < 0) {
+    return nil;
+  }
+  int noSigpipe = 1;
+  setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &noSigpipe, sizeof(noSigpipe));
+  struct timeval tv = { .tv_sec = (long)timeout, .tv_usec = 0 };
+  setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+  struct sockaddr_in addr = { .sin_family = AF_INET, .sin_port = htons(self.port) };
+  addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  if (0 != connect(fd, (struct sockaddr *)&addr, sizeof(addr))) {
+    close(fd);
+    return nil;
+  }
+  send(fd, payload.bytes, payload.length, 0);
+  NSMutableData *received = [NSMutableData data];
+  char chunk[4096];
+  NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:timeout];
+  while (deadline.timeIntervalSinceNow > 0) {
+    ssize_t n = recv(fd, chunk, sizeof(chunk), 0);
+    if (n > 0) {
+      [received appendBytes:chunk length:(NSUInteger)n];
+      // The server keeps the connection open after a success, so don't wait the full timeout
+      // for an EOF that never comes.
+      struct timeval drainTv = { .tv_sec = 0, .tv_usec = 200000 };
+      setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &drainTv, sizeof(drainTv));
+    } else {
+      break;
+    }
+  }
+  close(fd);
+  return [[NSString alloc] initWithData:received encoding:NSUTF8StringEncoding] ?: @"";
+}
+
+- (void)testRequestForAlreadyAbandonedSessionIsRejectedImmediately
+{
+  // A request parsed *after* DELETE /session tore the session down never receives an abandonment
+  // notification of its own, so before this was tracked it queued on the route queue -
+  // potentially forever, if that queue is wedged behind the very request that made the client
+  // delete the session in the first place.
+  RouteResponse *abandonedResponse = [RouteResponse new];
+  [abandonedResponse respondWithString:@"session-was-deleted"];
+  [self.server abandonPendingRequestsForSessionID:@"dead-session" withResponse:abandonedResponse];
+
+  NSString *response = [self responseForRawPayload:(NSData * _Nonnull)[@"GET /session/dead-session/probe HTTP/1.1\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]
+                                            timeout:5.0];
+  XCTAssertTrue([response containsString:@"session-was-deleted"], @"%@", response);
+  XCTAssertEqual(atomic_load(&gSessionProbeHits), 0, @"the route must not run for a deleted session");
+}
+
+- (void)testAbandonedSessionIsRememberedAfterManyLaterAbandonments
+{
+  // Abandoned ids are kept for the server's lifetime; evicting them would let a stale request
+  // queue on a possibly wedged route queue again, which is the hang this rejection prevents.
+  RouteResponse *abandonedResponse = [RouteResponse new];
+  [abandonedResponse respondWithString:@"session-was-deleted"];
+  [self.server abandonPendingRequestsForSessionID:@"dead-session" withResponse:abandonedResponse];
+  for (NSUInteger index = 0; index < 64; ++index) {
+    RouteResponse *otherResponse = [RouteResponse new];
+    [otherResponse respondWithString:@"other-session-was-deleted"];
+    [self.server abandonPendingRequestsForSessionID:[NSString stringWithFormat:@"other-session-%lu", (unsigned long)index]
+                                       withResponse:otherResponse];
+  }
+
+  NSString *response = [self responseForRawPayload:(NSData * _Nonnull)[@"GET /session/dead-session/probe HTTP/1.1\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]
+                                            timeout:5.0];
+  XCTAssertTrue([response containsString:@"session-was-deleted"], @"%@", response);
+  XCTAssertEqual(atomic_load(&gSessionProbeHits), 0, @"the route must not run for a deleted session");
+}
+
+- (void)testRequestForLiveSessionIsStillServed
+{
+  // The rejection above must be scoped to the abandoned identifier only.
+  RouteResponse *abandonedResponse = [RouteResponse new];
+  [abandonedResponse respondWithString:@"session-was-deleted"];
+  [self.server abandonPendingRequestsForSessionID:@"dead-session" withResponse:abandonedResponse];
+
+  NSString *response = [self responseForRawPayload:(NSData * _Nonnull)[@"GET /session/live-session/probe HTTP/1.1\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]
+                                            timeout:5.0];
+  XCTAssertTrue([response containsString:@"session-probe-ok"], @"%@", response);
+  XCTAssertEqual(atomic_load(&gSessionProbeHits), 1);
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "16.11.0",
+  "version": "16.11.2",
   "description": "Package bundling WebDriverAgent",
   "keywords": [
     "Appium",