BREAKING: Drop long-since-unused __httpPeekedData type backward compat

Author: pimterry

src/index.ts

@@ -6,17 +6,6 @@ import * as http2 from 'http2';
 
 import { EventEmitter } from 'events';
 
-declare module 'net' {
-  interface Socket {
-    /**
-     * Only preserved for types backward compat - always undefined in new releases.
-     *
-     * @deprecated
-     */
-    __httpPeekedData?: Buffer;
-  }
-}
-
 function onError(err: any) {}
 
 const TLS_HANDSHAKE_BYTE = 0x16; // SSLv3+ or TLS handshake

test/http.spec.ts

@@ -73,31 +73,24 @@ describe("HTTP", () => {
             throw new Error("Request handler should not be called");
         });
 
-        const serverErrorPromise = new Promise<[any, net.Socket]>((resolve) => {
+        const serverErrorPromise = new Promise<any>((resolve) => {
             // Multiple errors will be fired - we want to check the data from the final
             // error (which will contain the whole packet)
             let lastResult: any;
 
             server.on('clientError', (err: any, socket: net.Socket) => {
                 socket.destroy();
-
-                lastResult = [err, socket];
+                lastResult = err;
                 setImmediate(() => resolve(lastResult));
             });
         });
 
         sendRawRequest(server, 'QQQ http://example.com HTTP/1.1\r\n\r\n');
 
-        let [serverError, failedSocket] = await serverErrorPromise;
+        let serverError = await serverErrorPromise;
 
         expect(serverError.message).to.include('Invalid method');
-
-        const combinedPacket = Buffer.concat([
-            failedSocket.__httpPeekedData,
-            serverError.rawPacket
-        ].filter(Boolean));
-
-        expect(combinedPacket.toString('utf8')).to.equal(
+        expect(serverError.rawPacket.toString('utf8')).to.equal(
             'QQQ http://example.com HTTP/1.1\r\n\r\n'
         );
     });

test/http2.spec.ts

@@ -104,31 +104,24 @@ describe("HTTP/2", () => {
             throw new Error("Request handler should not be called");
         });
 
-        const serverErrorPromise = new Promise<[any, net.Socket]>((resolve) => {
+        const serverErrorPromise = new Promise<any>((resolve) => {
             // Multiple errors will be fired - we want to check the data from the final
             // error (which will contain the whole packet)
             let lastResult: any;
 
             server.on('clientError', (err: any, socket: net.Socket) => {
                 socket.destroy();
-
-                lastResult = [err, socket];
+                lastResult = err;
                 setImmediate(() => resolve(lastResult));
             });
         });
 
         sendRawRequest(server, 'QQQ http://example.com HTTP/1.1\r\n\r\n');
 
-        let [serverError, failedSocket] = await serverErrorPromise;
+        let serverError = await serverErrorPromise;
 
         expect(serverError.message).to.include('Invalid method');
-
-        const combinedPacket = Buffer.concat([
-            failedSocket.__httpPeekedData,
-            serverError.rawPacket
-        ].filter(Boolean));
-
-        expect(combinedPacket.toString('utf8')).to.equal(
+        expect(serverError.rawPacket.toString('utf8')).to.equal(
             'QQQ http://example.com HTTP/1.1\r\n\r\n'
         );
     });

test/https.spec.ts

@@ -120,31 +120,24 @@ describe("HTTPS", () => {
             throw new Error("Request handler should not be called");
         });
 
-        const serverErrorPromise = new Promise<[any, net.Socket]>((resolve) => {
+        const serverErrorPromise = new Promise<any>((resolve) => {
             // Multiple errors will be fired - we want to check the data from the final
             // error (which will contain the whole packet)
             let lastResult: any;
 
             server.on('clientError', (err: any, socket: net.Socket) => {
                 socket.destroy();
-
-                lastResult = [err, socket];
+                lastResult = err;
                 setImmediate(() => resolve(lastResult));
             });
         });
 
         sendRawRequest(server, 'QQQ http://example.com HTTP/1.1\r\n\r\n');
 
-        let [serverError, failedSocket] = await serverErrorPromise;
+        let serverError = await serverErrorPromise;
 
         expect(serverError.message).to.include('Invalid method');
-
-        const combinedPacket = Buffer.concat([
-            failedSocket.__httpPeekedData,
-            serverError.rawPacket
-        ].filter(Boolean));
-
-        expect(combinedPacket.toString('utf8')).to.equal(
+        expect(serverError.rawPacket.toString('utf8')).to.equal(
             'QQQ http://example.com HTTP/1.1\r\n\r\n'
         );
     });