Find a new solution to avoid losing peeked data

README.md

@@ -7,9 +7,9 @@ A module for serving HTTP, HTTPS and HTTP/2 connections, all over the same port.
 Forked from the original [`httpolyglot`](https://github.com/mscdex/httpolyglot) to fix various issues required for [HTTP Toolkit](https://httptoolkit.com), including:
 
 * Support for HTTP/2
-* Fixing `tlsClientError`: https://github.com/mscdex/httpolyglot/pull/11.
-* Exposing the lost bytes from https://github.com/mscdex/httpolyglot/issues/13 on the socket, as `__httpPeekedData`.
-* Dropping support for old versions of Node (and thereby simplifying the code somewhat)
+* Fixing `tlsClientError`: https://github.com/mscdex/httpolyglot/pull/11
+* Include initially sniffed bytes aren't lost in subsequent `clientError` events (https://github.com/mscdex/httpolyglot/issues/13)
+* Dropping support for very old versions of Node (and thereby simplifying the code somewhat)
 * Converting to TypeScript
 * Event subscription support (subscribe to `server.on(x, ...)` to hear about `x` from _all_ internal servers - HTTP/2, HTTP/1, TLS and net)
 

src/index.ts

@@ -112,7 +112,7 @@ export class Server extends net.Server {
   }
 
   private connectionListener(socket: net.Socket) {
-    const data = socket.read(1);
+    const data = socket.read();
 
     if (data === null) {
       socket.removeListener('error', onError);
@@ -137,11 +137,6 @@ export class Server extends net.Server {
           // reading until we get the whole stream:
           this.http2Listener(socket);
         } else {
-          // The above unshift isn't always sufficient to invisibly replace the
-          // read data. The rawPacket property on errors in the clientError event
-          // for plain HTTP servers loses this data - this prop makes it available.
-          // Bit of a hacky fix, but sufficient to allow for manual workarounds.
-          socket.__httpPeekedData = data;
           this._httpServer.emit('connection', socket);
         }
       }