appium-webdriveragent 16.13.1 → 16.13.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [16.13.2](https://github.com/appium/WebDriverAgent/compare/v16.13.1...v16.13.2) (2026-09-30)
+
+### Bug Fixes
+
+* process received HTTP bytes before handling EOF ([#1277](https://github.com/appium/WebDriverAgent/issues/1277)) ([203fc4f](https://github.com/appium/WebDriverAgent/commit/203fc4f012ab1d90caf0127fe85f119ad85cb0e8))
+
 ## [16.13.1](https://github.com/appium/WebDriverAgent/compare/v16.13.0...v16.13.1) (2026-09-30)
 
 ### Performance Improvements

package/WebDriverAgentLib/Info.plist

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

package/WebDriverAgentLib/Routing/FBHTTPServer.m

@@ -340,18 +340,28 @@ static const int64_t FBStaleConnectionSweepIntervalSec = 10;
 
 - (void)didClientDisconnect:(nw_connection_t)client
 {
-  BOOL isAwaitingResponse;
-  @synchronized (self.connectionBuffers) {
-    isAwaitingResponse = [self.connectionsAwaitingResponse containsObject:client];
-    [self.connectionBuffers removeObjectForKey:client];
-    [self.pendingRequestHeaders removeObjectForKey:client];
-    [self.incompleteRequestStarts removeObjectForKey:client];
-  }
-  // A client that only stopped sending may still read the response to its in-flight request, so
-  // that response's send completion closes the connection instead (it finds no buffer left).
-  if (!isAwaitingResponse) {
-    nw_connection_cancel(client);
-  }
+  // EOF must follow every receive already queued for this client. Otherwise it can
+  // remove the buffer before those bytes have even been appended and parsed.
+  __weak typeof(self) weakSelf = self;
+  dispatch_async(self.bufferProcessingQueue, ^{
+    __strong typeof(weakSelf) strongSelf = weakSelf;
+    if (nil == strongSelf) {
+      nw_connection_cancel(client);
+      return;
+    }
+    BOOL isAwaitingResponse;
+    @synchronized (strongSelf.connectionBuffers) {
+      isAwaitingResponse = [strongSelf.connectionsAwaitingResponse containsObject:client];
+      [strongSelf.connectionBuffers removeObjectForKey:client];
+      [strongSelf.pendingRequestHeaders removeObjectForKey:client];
+      [strongSelf.incompleteRequestStarts removeObjectForKey:client];
+    }
+    // A client that only stopped sending may still read the response to its in-flight request, so
+    // that response's send completion closes the connection instead (it finds no buffer left).
+    if (!isAwaitingResponse) {
+      nw_connection_cancel(client);
+    }
+  });
 }
 
 - (void)client:(nw_connection_t)client didReceiveData:(NSData *)data

package/WebDriverAgentTests/UnitTests/FBHTTPServerTests.m

@@ -14,6 +14,7 @@
 #import <unistd.h>
 
 #import "FBHTTPServer.h"
+#import "FBTCPSocket.h"
 
 static atomic_int gFramingProbeHits;
 
@@ -242,6 +243,32 @@ static NSString *FBCompleteResponse(NSData *data)
   XCTAssertEqual([self serverSocketCountSettlingAt:baseline], baseline);
 }
 
+- (void)testEofWaitsForPreviouslyReceivedBytesToBeParsed
+{
+  FBHTTPServer *server = [FBHTTPServer new];
+  __block NSUInteger calls = 0;
+  [server get:@"/probe" withBlock:^(RouteRequest *request, RouteResponse *response) {
+    calls++;
+  }];
+  dispatch_queue_t queue = [server valueForKey:@"bufferProcessingQueue"];
+  nw_connection_t client = nw_connection_create(nw_endpoint_create_host("127.0.0.1", "1"),
+    nw_parameters_create_secure_tcp(NW_PARAMETERS_DISABLE_PROTOCOL, NW_PARAMETERS_DEFAULT_CONFIGURATION));
+  id<FBTCPSocketDelegate> delegate = (id)server;
+  [delegate didClientConnect:client];
+  dispatch_suspend(queue);
+  @try {
+    NSData *data = [@"GET /probe HTTP/1.1\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding];
+    [delegate client:client didReceiveData:data];
+    [delegate didClientDisconnect:client];
+  } @finally {
+    dispatch_resume(queue);
+  }
+  dispatch_sync(queue, ^{});
+  XCTAssertEqual(calls, 1u);
+  [server stop:YES];
+  nw_connection_cancel(client);
+}
+
 - (void)testHalfClosedClientGetsItsResponseAndIsThenClosed
 {
   // A client may shut down its sending side right after the request and wait for the response.

package/package.json

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