Update httpolyglot to drop __httpPeekedData entirely

custom-typings/node-type-extensions.d.ts

@@ -29,10 +29,6 @@ declare module "net" {
         // into a single response & error event.
         clientErrorInProgress?: { rawPacket?: Buffer; }
 
-        // Data that was peeked by httpolyglot, and thereby probably lost from the
-        // HTTP parser errors, but which might be useful for debugging later
-        __httpPeekedData?: Buffer;
-
         // Our recordings of various timestamps, used for monitoring &
         // performance analysis later on
         __timingInfo?: {

package.json

@@ -161,7 +161,7 @@
   "dependencies": {
     "@graphql-tools/schema": "^8.5.0",
     "@graphql-tools/utils": "^8.8.0",
-    "@httptoolkit/httpolyglot": "^2.1.1",
+    "@httptoolkit/httpolyglot": "^2.2.0",
     "@httptoolkit/subscriptions-transport-ws": "^0.11.2",
     "@httptoolkit/websocket-stream": "^6.0.1",
     "@types/cors": "^2.8.6",

src/server/mockttp-server.ts

@@ -919,9 +919,7 @@ ${await this.suggestRule(request)}`
             // (e.g. Q as first char) then this packet data does get thrown! Eugh. In that case,
             // we need to avoid using both by accident, so we use just the non-peeked data instead
             // if the initial data is _exactly_ identical.
-            rawPacket: !error.rawPacket || socket.__httpPeekedData?.equals(error.rawPacket)
-                ? undefined
-                : error.rawPacket
+            rawPacket: error.rawPacket
         };
 
         setImmediate(async () => {
@@ -934,20 +932,8 @@ ${await this.suggestRule(request)}`
                 timingEvents: { startTime: Date.now(), startTimestamp: now() } as TimingEvents
             };
 
-            // Initially _httpMessage is undefined, until at least one request has been parsed.
-            // Later it's set to the current ServerResponse, and then null when the socket is
-            // detached, but never back to undefined. Avoids issues with using old peeked data
-            // on subsequent requests within keep-alive connections.
-            const isFirstRequest = (socket as any)._httpMessage === undefined;
-
-            // HTTPolyglot's byte-peeking can sometimes lose the initial byte from the parser's
-            // exposed buffer. If that's happened, we need to get it back:
-            const rawPacket = Buffer.concat(
-                [
-                    isFirstRequest && socket.__httpPeekedData,
-                    socket.clientErrorInProgress?.rawPacket
-                ].filter((data) => !!data) as Buffer[]
-            );
+            const rawPacket = socket.clientErrorInProgress?.rawPacket
+                ?? Buffer.from([]);
 
             // For packets where we get more than just httpolyglot-peeked data, guess-parse them:
             const parsedRequest = rawPacket.byteLength > 1