socks 2.3.1 → 2.4.1

package/build/client/socksclient.js

@@ -1,13 +1,15 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SocksClientError = exports.SocksClient = void 0;
 const events_1 = require("events");
 const net = require("net");
 const ip = require("ip");
@@ -16,14 +18,15 @@ const constants_1 = require("../common/constants");
 const helpers_1 = require("../common/helpers");
 const receivebuffer_1 = require("../common/receivebuffer");
 const util_1 = require("../common/util");
+Object.defineProperty(exports, "SocksClientError", { enumerable: true, get: function () { return util_1.SocksClientError; } });
 class SocksClient extends events_1.EventEmitter {
     constructor(options) {
         super();
-        this._options = Object.assign({}, options);
+        this.options = Object.assign({}, options);
         // Validate SocksClientOptions
         helpers_1.validateSocksClientOptions(options);
         // Default state
-        this.state = constants_1.SocksClientState.Created;
+        this.setState(constants_1.SocksClientState.Created);
     }
     /**
      * Creates a new SOCKS connection.
@@ -81,6 +84,7 @@ class SocksClient extends events_1.EventEmitter {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             let sock;
             try {
+                // tslint:disable-next-line:no-increment-decrement
                 for (let i = 0; i < options.proxies.length; i++) {
                     const nextProxy = options.proxies[i];
                     // If we've reached the last proxy in the chain, the destination is the actual destination, otherwise it's the next proxy.
@@ -88,14 +92,13 @@ class SocksClient extends events_1.EventEmitter {
                         ? options.destination
                         : {
                             host: options.proxies[i + 1].ipaddress,
-                            port: options.proxies[i + 1].port
+                            port: options.proxies[i + 1].port,
                         };
                     // Creates the next connection in the chain.
                     const result = yield SocksClient.createConnection({
                         command: 'connect',
                         proxy: nextProxy,
-                        destination: nextDestination
-                        // Initial connection ignores this as sock is undefined. Subsequent connections re-use the first proxy socket to form a chain.
+                        destination: nextDestination,
                     });
                     // If sock is undefined, assign it here.
                     if (!sock) {
@@ -173,75 +176,73 @@ class SocksClient extends events_1.EventEmitter {
             frameNumber,
             remoteHost: {
                 host: remoteHost,
-                port: remotePort
+                port: remotePort,
             },
-            data: buff.readBuffer()
+            data: buff.readBuffer(),
         };
     }
-    /**
-     * Gets the SocksClient internal state.
-     */
-    get state() {
-        return this._state;
-    }
     /**
      * Internal state setter. If the SocksClient is in an error state, it cannot be changed to a non error state.
      */
-    set state(newState) {
-        if (this._state !== constants_1.SocksClientState.Error) {
-            this._state = newState;
+    setState(newState) {
+        if (this.state !== constants_1.SocksClientState.Error) {
+            this.state = newState;
         }
     }
     /**
      * Starts the connection establishment to the proxy and destination.
-     * @param existing_socket Connected socket to use instead of creating a new one (internal use).
+     * @param existingSocket Connected socket to use instead of creating a new one (internal use).
      */
-    connect(existing_socket) {
-        this._onDataReceived = (data) => this.onDataReceived(data);
-        this._onClose = () => this.onClose();
-        this._onError = (err) => this.onError(err);
-        this._onConnect = () => this.onConnect();
+    connect(existingSocket) {
+        this.onDataReceived = (data) => this.onDataReceivedHandler(data);
+        this.onClose = () => this.onCloseHandler();
+        this.onError = (err) => this.onErrorHandler(err);
+        this.onConnect = () => this.onConnectHandler();
         // Start timeout timer (defaults to 30 seconds)
-        const timer = setTimeout(() => this.onEstablishedTimeout(), this._options.timeout || constants_1.DEFAULT_TIMEOUT);
+        const timer = setTimeout(() => this.onEstablishedTimeout(), this.options.timeout || constants_1.DEFAULT_TIMEOUT);
         // check whether unref is available as it differs from browser to NodeJS (#33)
         if (timer.unref && typeof timer.unref === 'function') {
             timer.unref();
         }
         // If an existing socket is provided, use it to negotiate SOCKS handshake. Otherwise create a new Socket.
-        if (existing_socket) {
-            this._socket = existing_socket;
+        if (existingSocket) {
+            this.socket = existingSocket;
         }
         else {
-            this._socket = new net.Socket();
+            this.socket = new net.Socket();
         }
         // Attach Socket error handlers.
-        this._socket.once('close', this._onClose);
-        this._socket.once('error', this._onError);
-        this._socket.once('connect', this._onConnect);
-        this._socket.on('data', this._onDataReceived);
-        this.state = constants_1.SocksClientState.Connecting;
-        this._receiveBuffer = new receivebuffer_1.ReceiveBuffer();
-        if (existing_socket) {
-            this._socket.emit('connect');
+        this.socket.once('close', this.onClose);
+        this.socket.once('error', this.onError);
+        this.socket.once('connect', this.onConnect);
+        this.socket.on('data', this.onDataReceived);
+        this.setState(constants_1.SocksClientState.Connecting);
+        this.receiveBuffer = new receivebuffer_1.ReceiveBuffer();
+        if (existingSocket) {
+            this.socket.emit('connect');
         }
         else {
-            this._socket.connect(this._options.proxy.port, this._options.proxy.host || this._options.proxy.ipaddress);
-            if (this._options.set_tcp_nodelay !== undefined &&
-                this._options.set_tcp_nodelay !== null) {
-                this._socket.setNoDelay(!!this._options.set_tcp_nodelay);
+            this.socket.connect(this.getSocketOptions());
+            if (this.options.set_tcp_nodelay !== undefined &&
+                this.options.set_tcp_nodelay !== null) {
+                this.socket.setNoDelay(!!this.options.set_tcp_nodelay);
             }
         }
         // Listen for established event so we can re-emit any excess data received during handshakes.
-        this.prependOnceListener('established', info => {
+        this.prependOnceListener('established', (info) => {
             setImmediate(() => {
-                if (this._receiveBuffer.length > 0) {
-                    const excessData = this._receiveBuffer.get(this._receiveBuffer.length);
+                if (this.receiveBuffer.length > 0) {
+                    const excessData = this.receiveBuffer.get(this.receiveBuffer.length);
                     info.socket.emit('data', excessData);
                 }
                 info.socket.resume();
             });
         });
     }
+    // Socket options (defaults host/port to options.proxy.host/options.proxy.port)
+    getSocketOptions() {
+        return Object.assign(Object.assign({}, this.options.socket_options), { host: this.options.proxy.host || this.options.proxy.ipaddress, port: this.options.proxy.port });
+    }
     /**
      * Handles internal Socks timeout callback.
      * Note: If the Socks client is not BoundWaitingForConnection or Established, the connection will be closed.
@@ -249,33 +250,33 @@ class SocksClient extends events_1.EventEmitter {
     onEstablishedTimeout() {
         if (this.state !== constants_1.SocksClientState.Established &&
             this.state !== constants_1.SocksClientState.BoundWaitingForConnection) {
-            this._closeSocket(constants_1.ERRORS.ProxyConnectionTimedOut);
+            this.closeSocket(constants_1.ERRORS.ProxyConnectionTimedOut);
         }
     }
     /**
      * Handles Socket connect event.
      */
-    onConnect() {
-        this.state = constants_1.SocksClientState.Connected;
+    onConnectHandler() {
+        this.setState(constants_1.SocksClientState.Connected);
         // Send initial handshake.
-        if (this._options.proxy.type === 4) {
+        if (this.options.proxy.type === 4) {
             this.sendSocks4InitialHandshake();
         }
         else {
             this.sendSocks5InitialHandshake();
         }
-        this.state = constants_1.SocksClientState.SentInitialHandshake;
+        this.setState(constants_1.SocksClientState.SentInitialHandshake);
     }
     /**
      * Handles Socket data event.
      * @param data
      */
-    onDataReceived(data) {
+    onDataReceivedHandler(data) {
         /*
           All received data is appended to a ReceiveBuffer.
           This makes sure that all the data we need is received before we attempt to process it.
         */
-        this._receiveBuffer.append(data);
+        this.receiveBuffer.append(data);
         // Process data that we have.
         this.processData();
     }
@@ -284,10 +285,10 @@ class SocksClient extends events_1.EventEmitter {
      */
     processData() {
         // If we have enough data to process the next step in the SOCKS handshake, proceed.
-        if (this._receiveBuffer.length >= this._nextRequiredPacketBufferSize) {
+        if (this.receiveBuffer.length >= this.nextRequiredPacketBufferSize) {
             // Sent initial handshake, waiting for response.
             if (this.state === constants_1.SocksClientState.SentInitialHandshake) {
-                if (this._options.proxy.type === 4) {
+                if (this.options.proxy.type === 4) {
                     // Socks v4 only has one handshake response.
                     this.handleSocks4FinalHandshakeResponse();
                 }
@@ -306,7 +307,7 @@ class SocksClient extends events_1.EventEmitter {
                 // Socks BIND established. Waiting for remote connection via proxy.
             }
             else if (this.state === constants_1.SocksClientState.BoundWaitingForConnection) {
-                if (this._options.proxy.type === 4) {
+                if (this.options.proxy.type === 4) {
                     this.handleSocks4IncomingConnectionResponse();
                 }
                 else {
@@ -317,7 +318,7 @@ class SocksClient extends events_1.EventEmitter {
                 // do nothing (prevents closing of the socket)
             }
             else {
-                this._closeSocket(constants_1.ERRORS.InternalError);
+                this.closeSocket(constants_1.ERRORS.InternalError);
             }
         }
     }
@@ -325,56 +326,56 @@ class SocksClient extends events_1.EventEmitter {
      * Handles Socket close event.
      * @param had_error
      */
-    onClose() {
-        this._closeSocket(constants_1.ERRORS.SocketClosed);
+    onCloseHandler() {
+        this.closeSocket(constants_1.ERRORS.SocketClosed);
     }
     /**
      * Handles Socket error event.
      * @param err
      */
-    onError(err) {
-        this._closeSocket(err.message);
+    onErrorHandler(err) {
+        this.closeSocket(err.message);
     }
     /**
      * Removes internal event listeners on the underlying Socket.
      */
     removeInternalSocketHandlers() {
         // Pauses data flow of the socket (this is internally resumed after 'established' is emitted)
-        this._socket.pause();
-        this._socket.removeListener('data', this._onDataReceived);
-        this._socket.removeListener('close', this._onClose);
-        this._socket.removeListener('error', this._onError);
-        this._socket.removeListener('connect', this.onConnect);
+        this.socket.pause();
+        this.socket.removeListener('data', this.onDataReceived);
+        this.socket.removeListener('close', this.onClose);
+        this.socket.removeListener('error', this.onError);
+        this.socket.removeListener('connect', this.onConnect);
     }
     /**
      * Closes and destroys the underlying Socket. Emits an error event.
      * @param err { String } An error string to include in error event.
      */
-    _closeSocket(err) {
+    closeSocket(err) {
         // Make sure only one 'error' event is fired for the lifetime of this SocksClient instance.
         if (this.state !== constants_1.SocksClientState.Error) {
             // Set internal state to Error.
-            this.state = constants_1.SocksClientState.Error;
+            this.setState(constants_1.SocksClientState.Error);
             // Destroy Socket
-            this._socket.destroy();
+            this.socket.destroy();
             // Remove internal listeners
             this.removeInternalSocketHandlers();
             // Fire 'error' event.
-            this.emit('error', new util_1.SocksClientError(err, this._options));
+            this.emit('error', new util_1.SocksClientError(err, this.options));
         }
     }
     /**
      * Sends initial Socks v4 handshake request.
      */
     sendSocks4InitialHandshake() {
-        const userId = this._options.proxy.userId || '';
+        const userId = this.options.proxy.userId || '';
         const buff = new smart_buffer_1.SmartBuffer();
         buff.writeUInt8(0x04);
-        buff.writeUInt8(constants_1.SocksCommand[this._options.command]);
-        buff.writeUInt16BE(this._options.destination.port);
+        buff.writeUInt8(constants_1.SocksCommand[this.options.command]);
+        buff.writeUInt16BE(this.options.destination.port);
         // Socks 4 (IPv4)
-        if (net.isIPv4(this._options.destination.host)) {
-            buff.writeBuffer(ip.toBuffer(this._options.destination.host));
+        if (net.isIPv4(this.options.destination.host)) {
+            buff.writeBuffer(ip.toBuffer(this.options.destination.host));
             buff.writeStringNT(userId);
             // Socks 4a (hostname)
         }
@@ -384,42 +385,42 @@ class SocksClient extends events_1.EventEmitter {
             buff.writeUInt8(0x00);
             buff.writeUInt8(0x01);
             buff.writeStringNT(userId);
-            buff.writeStringNT(this._options.destination.host);
+            buff.writeStringNT(this.options.destination.host);
         }
-        this._nextRequiredPacketBufferSize =
+        this.nextRequiredPacketBufferSize =
             constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks4Response;
-        this._socket.write(buff.toBuffer());
+        this.socket.write(buff.toBuffer());
     }
     /**
      * Handles Socks v4 handshake response.
      * @param data
      */
     handleSocks4FinalHandshakeResponse() {
-        const data = this._receiveBuffer.get(8);
+        const data = this.receiveBuffer.get(8);
         if (data[1] !== constants_1.Socks4Response.Granted) {
-            this._closeSocket(`${constants_1.ERRORS.Socks4ProxyRejectedConnection} - (${constants_1.Socks4Response[data[1]]})`);
+            this.closeSocket(`${constants_1.ERRORS.Socks4ProxyRejectedConnection} - (${constants_1.Socks4Response[data[1]]})`);
         }
         else {
             // Bind response
-            if (constants_1.SocksCommand[this._options.command] === constants_1.SocksCommand.bind) {
+            if (constants_1.SocksCommand[this.options.command] === constants_1.SocksCommand.bind) {
                 const buff = smart_buffer_1.SmartBuffer.fromBuffer(data);
                 buff.readOffset = 2;
                 const remoteHost = {
                     port: buff.readUInt16BE(),
-                    host: ip.fromLong(buff.readUInt32BE())
+                    host: ip.fromLong(buff.readUInt32BE()),
                 };
                 // If host is 0.0.0.0, set to proxy host.
                 if (remoteHost.host === '0.0.0.0') {
-                    remoteHost.host = this._options.proxy.ipaddress;
+                    remoteHost.host = this.options.proxy.ipaddress;
                 }
-                this.state = constants_1.SocksClientState.BoundWaitingForConnection;
-                this.emit('bound', { socket: this._socket, remoteHost });
+                this.setState(constants_1.SocksClientState.BoundWaitingForConnection);
+                this.emit('bound', { remoteHost, socket: this.socket });
                 // Connect response
             }
             else {
-                this.state = constants_1.SocksClientState.Established;
+                this.setState(constants_1.SocksClientState.Established);
                 this.removeInternalSocketHandlers();
-                this.emit('established', { socket: this._socket });
+                this.emit('established', { socket: this.socket });
             }
         }
     }
@@ -428,20 +429,20 @@ class SocksClient extends events_1.EventEmitter {
      * @param data
      */
     handleSocks4IncomingConnectionResponse() {
-        const data = this._receiveBuffer.get(8);
+        const data = this.receiveBuffer.get(8);
         if (data[1] !== constants_1.Socks4Response.Granted) {
-            this._closeSocket(`${constants_1.ERRORS.Socks4ProxyRejectedIncomingBoundConnection} - (${constants_1.Socks4Response[data[1]]})`);
+            this.closeSocket(`${constants_1.ERRORS.Socks4ProxyRejectedIncomingBoundConnection} - (${constants_1.Socks4Response[data[1]]})`);
         }
         else {
             const buff = smart_buffer_1.SmartBuffer.fromBuffer(data);
             buff.readOffset = 2;
             const remoteHost = {
                 port: buff.readUInt16BE(),
-                host: ip.fromLong(buff.readUInt32BE())
+                host: ip.fromLong(buff.readUInt32BE()),
             };
-            this.state = constants_1.SocksClientState.Established;
+            this.setState(constants_1.SocksClientState.Established);
             this.removeInternalSocketHandlers();
-            this.emit('established', { socket: this._socket, remoteHost });
+            this.emit('established', { remoteHost, socket: this.socket });
         }
     }
     /**
@@ -452,7 +453,7 @@ class SocksClient extends events_1.EventEmitter {
         buff.writeUInt8(0x05);
         // We should only tell the proxy we support user/pass auth if auth info is actually provided.
         // Note: As of Tor v0.3.5.7+, if user/pass auth is an option from the client, by default it will always take priority.
-        if (this._options.proxy.userId || this._options.proxy.password) {
+        if (this.options.proxy.userId || this.options.proxy.password) {
             buff.writeUInt8(2);
             buff.writeUInt8(constants_1.Socks5Auth.NoAuth);
             buff.writeUInt8(constants_1.Socks5Auth.UserPass);
@@ -461,22 +462,22 @@ class SocksClient extends events_1.EventEmitter {
             buff.writeUInt8(1);
             buff.writeUInt8(constants_1.Socks5Auth.NoAuth);
         }
-        this._nextRequiredPacketBufferSize =
+        this.nextRequiredPacketBufferSize =
             constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5InitialHandshakeResponse;
-        this._socket.write(buff.toBuffer());
-        this.state = constants_1.SocksClientState.SentInitialHandshake;
+        this.socket.write(buff.toBuffer());
+        this.setState(constants_1.SocksClientState.SentInitialHandshake);
     }
     /**
      * Handles initial Socks v5 handshake response.
      * @param data
      */
     handleInitialSocks5HandshakeResponse() {
-        const data = this._receiveBuffer.get(2);
+        const data = this.receiveBuffer.get(2);
         if (data[0] !== 0x05) {
-            this._closeSocket(constants_1.ERRORS.InvalidSocks5IntiailHandshakeSocksVersion);
+            this.closeSocket(constants_1.ERRORS.InvalidSocks5IntiailHandshakeSocksVersion);
         }
         else if (data[1] === 0xff) {
-            this._closeSocket(constants_1.ERRORS.InvalidSocks5InitialHandshakeNoAcceptedAuthType);
+            this.closeSocket(constants_1.ERRORS.InvalidSocks5InitialHandshakeNoAcceptedAuthType);
         }
         else {
             // If selected Socks v5 auth method is no auth, send final handshake request.
@@ -488,7 +489,7 @@ class SocksClient extends events_1.EventEmitter {
                 this.sendSocks5UserPassAuthentication();
             }
             else {
-                this._closeSocket(constants_1.ERRORS.InvalidSocks5InitialHandshakeUnknownAuthType);
+                this.closeSocket(constants_1.ERRORS.InvalidSocks5InitialHandshakeUnknownAuthType);
             }
         }
     }
@@ -498,28 +499,28 @@ class SocksClient extends events_1.EventEmitter {
      * Note: No auth and user/pass are currently supported.
      */
     sendSocks5UserPassAuthentication() {
-        const userId = this._options.proxy.userId || '';
-        const password = this._options.proxy.password || '';
+        const userId = this.options.proxy.userId || '';
+        const password = this.options.proxy.password || '';
         const buff = new smart_buffer_1.SmartBuffer();
         buff.writeUInt8(0x01);
         buff.writeUInt8(Buffer.byteLength(userId));
         buff.writeString(userId);
         buff.writeUInt8(Buffer.byteLength(password));
         buff.writeString(password);
-        this._nextRequiredPacketBufferSize =
+        this.nextRequiredPacketBufferSize =
             constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5UserPassAuthenticationResponse;
-        this._socket.write(buff.toBuffer());
-        this.state = constants_1.SocksClientState.SentAuthentication;
+        this.socket.write(buff.toBuffer());
+        this.setState(constants_1.SocksClientState.SentAuthentication);
     }
     /**
      * Handles Socks v5 auth handshake response.
      * @param data
      */
     handleInitialSocks5AuthenticationHandshakeResponse() {
-        this.state = constants_1.SocksClientState.ReceivedAuthenticationResponse;
-        const data = this._receiveBuffer.get(2);
+        this.setState(constants_1.SocksClientState.ReceivedAuthenticationResponse);
+        const data = this.receiveBuffer.get(2);
         if (data[1] !== 0x00) {
-            this._closeSocket(constants_1.ERRORS.Socks5AuthenticationFailed);
+            this.closeSocket(constants_1.ERRORS.Socks5AuthenticationFailed);
         }
         else {
             this.sendSocks5CommandRequest();
@@ -531,27 +532,27 @@ class SocksClient extends events_1.EventEmitter {
     sendSocks5CommandRequest() {
         const buff = new smart_buffer_1.SmartBuffer();
         buff.writeUInt8(0x05);
-        buff.writeUInt8(constants_1.SocksCommand[this._options.command]);
+        buff.writeUInt8(constants_1.SocksCommand[this.options.command]);
         buff.writeUInt8(0x00);
         // ipv4, ipv6, domain?
-        if (net.isIPv4(this._options.destination.host)) {
+        if (net.isIPv4(this.options.destination.host)) {
             buff.writeUInt8(constants_1.Socks5HostType.IPv4);
-            buff.writeBuffer(ip.toBuffer(this._options.destination.host));
+            buff.writeBuffer(ip.toBuffer(this.options.destination.host));
         }
-        else if (net.isIPv6(this._options.destination.host)) {
+        else if (net.isIPv6(this.options.destination.host)) {
             buff.writeUInt8(constants_1.Socks5HostType.IPv6);
-            buff.writeBuffer(ip.toBuffer(this._options.destination.host));
+            buff.writeBuffer(ip.toBuffer(this.options.destination.host));
         }
         else {
             buff.writeUInt8(constants_1.Socks5HostType.Hostname);
-            buff.writeUInt8(this._options.destination.host.length);
-            buff.writeString(this._options.destination.host);
+            buff.writeUInt8(this.options.destination.host.length);
+            buff.writeString(this.options.destination.host);
         }
-        buff.writeUInt16BE(this._options.destination.port);
-        this._nextRequiredPacketBufferSize =
+        buff.writeUInt16BE(this.options.destination.port);
+        this.nextRequiredPacketBufferSize =
             constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5ResponseHeader;
-        this._socket.write(buff.toBuffer());
-        this.state = constants_1.SocksClientState.SentFinalHandshake;
+        this.socket.write(buff.toBuffer());
+        this.setState(constants_1.SocksClientState.SentFinalHandshake);
     }
     /**
      * Handles Socks v5 final handshake response.
@@ -559,9 +560,9 @@ class SocksClient extends events_1.EventEmitter {
      */
     handleSocks5FinalHandshakeResponse() {
         // Peek at available data (we need at least 5 bytes to get the hostname length)
-        const header = this._receiveBuffer.peek(5);
+        const header = this.receiveBuffer.peek(5);
         if (header[0] !== 0x05 || header[1] !== constants_1.Socks5Response.Granted) {
-            this._closeSocket(`${constants_1.ERRORS.InvalidSocks5FinalHandshakeRejected} - ${constants_1.Socks5Response[header[1]]}`);
+            this.closeSocket(`${constants_1.ERRORS.InvalidSocks5FinalHandshakeRejected} - ${constants_1.Socks5Response[header[1]]}`);
         }
         else {
             // Read address type
@@ -572,18 +573,18 @@ class SocksClient extends events_1.EventEmitter {
             if (addressType === constants_1.Socks5HostType.IPv4) {
                 // Check if data is available.
                 const dataNeeded = constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5ResponseIPv4;
-                if (this._receiveBuffer.length < dataNeeded) {
-                    this._nextRequiredPacketBufferSize = dataNeeded;
+                if (this.receiveBuffer.length < dataNeeded) {
+                    this.nextRequiredPacketBufferSize = dataNeeded;
                     return;
                 }
-                buff = smart_buffer_1.SmartBuffer.fromBuffer(this._receiveBuffer.get(dataNeeded).slice(4));
+                buff = smart_buffer_1.SmartBuffer.fromBuffer(this.receiveBuffer.get(dataNeeded).slice(4));
                 remoteHost = {
                     host: ip.fromLong(buff.readUInt32BE()),
-                    port: buff.readUInt16BE()
+                    port: buff.readUInt16BE(),
                 };
                 // If given host is 0.0.0.0, assume remote proxy ip instead.
                 if (remoteHost.host === '0.0.0.0') {
-                    remoteHost.host = this._options.proxy.ipaddress;
+                    remoteHost.host = this.options.proxy.ipaddress;
                 }
                 // Hostname
             }
@@ -591,55 +592,57 @@ class SocksClient extends events_1.EventEmitter {
                 const hostLength = header[4];
                 const dataNeeded = constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5ResponseHostname(hostLength); // header + host length + host + port
                 // Check if data is available.
-                if (this._receiveBuffer.length < dataNeeded) {
-                    this._nextRequiredPacketBufferSize = dataNeeded;
+                if (this.receiveBuffer.length < dataNeeded) {
+                    this.nextRequiredPacketBufferSize = dataNeeded;
                     return;
                 }
-                buff = smart_buffer_1.SmartBuffer.fromBuffer(this._receiveBuffer.get(dataNeeded).slice(5) // Slice at 5 to skip host length
-                );
+                buff = smart_buffer_1.SmartBuffer.fromBuffer(this.receiveBuffer.get(dataNeeded).slice(5));
                 remoteHost = {
                     host: buff.readString(hostLength),
-                    port: buff.readUInt16BE()
+                    port: buff.readUInt16BE(),
                 };
                 // IPv6
             }
             else if (addressType === constants_1.Socks5HostType.IPv6) {
                 // Check if data is available.
                 const dataNeeded = constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5ResponseIPv6;
-                if (this._receiveBuffer.length < dataNeeded) {
-                    this._nextRequiredPacketBufferSize = dataNeeded;
+                if (this.receiveBuffer.length < dataNeeded) {
+                    this.nextRequiredPacketBufferSize = dataNeeded;
                     return;
                 }
-                buff = smart_buffer_1.SmartBuffer.fromBuffer(this._receiveBuffer.get(dataNeeded).slice(4));
+                buff = smart_buffer_1.SmartBuffer.fromBuffer(this.receiveBuffer.get(dataNeeded).slice(4));
                 remoteHost = {
                     host: ip.toString(buff.readBuffer(16)),
-                    port: buff.readUInt16BE()
+                    port: buff.readUInt16BE(),
                 };
             }
             // We have everything we need
-            this.state = constants_1.SocksClientState.ReceivedFinalResponse;
+            this.setState(constants_1.SocksClientState.ReceivedFinalResponse);
             // If using CONNECT, the client is now in the established state.
-            if (constants_1.SocksCommand[this._options.command] === constants_1.SocksCommand.connect) {
-                this.state = constants_1.SocksClientState.Established;
+            if (constants_1.SocksCommand[this.options.command] === constants_1.SocksCommand.connect) {
+                this.setState(constants_1.SocksClientState.Established);
                 this.removeInternalSocketHandlers();
-                this.emit('established', { socket: this._socket });
+                this.emit('established', { socket: this.socket });
             }
-            else if (constants_1.SocksCommand[this._options.command] === constants_1.SocksCommand.bind) {
+            else if (constants_1.SocksCommand[this.options.command] === constants_1.SocksCommand.bind) {
                 /* If using BIND, the Socks client is now in BoundWaitingForConnection state.
                    This means that the remote proxy server is waiting for a remote connection to the bound port. */
-                this.state = constants_1.SocksClientState.BoundWaitingForConnection;
-                this._nextRequiredPacketBufferSize =
+                this.setState(constants_1.SocksClientState.BoundWaitingForConnection);
+                this.nextRequiredPacketBufferSize =
                     constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5ResponseHeader;
-                this.emit('bound', { socket: this._socket, remoteHost });
+                this.emit('bound', { remoteHost, socket: this.socket });
                 /*
                   If using Associate, the Socks client is now Established. And the proxy server is now accepting UDP packets at the
                   given bound port. This initial Socks TCP connection must remain open for the UDP relay to continue to work.
                 */
             }
-            else if (constants_1.SocksCommand[this._options.command] === constants_1.SocksCommand.associate) {
-                this.state = constants_1.SocksClientState.Established;
+            else if (constants_1.SocksCommand[this.options.command] === constants_1.SocksCommand.associate) {
+                this.setState(constants_1.SocksClientState.Established);
                 this.removeInternalSocketHandlers();
-                this.emit('established', { socket: this._socket, remoteHost });
+                this.emit('established', {
+                    remoteHost,
+                    socket: this.socket,
+                });
             }
         }
     }
@@ -648,9 +651,9 @@ class SocksClient extends events_1.EventEmitter {
      */
     handleSocks5IncomingConnectionResponse() {
         // Peek at available data (we need at least 5 bytes to get the hostname length)
-        const header = this._receiveBuffer.peek(5);
+        const header = this.receiveBuffer.peek(5);
         if (header[0] !== 0x05 || header[1] !== constants_1.Socks5Response.Granted) {
-            this._closeSocket(`${constants_1.ERRORS.Socks5ProxyRejectedIncomingBoundConnection} - ${constants_1.Socks5Response[header[1]]}`);
+            this.closeSocket(`${constants_1.ERRORS.Socks5ProxyRejectedIncomingBoundConnection} - ${constants_1.Socks5Response[header[1]]}`);
         }
         else {
             // Read address type
@@ -661,18 +664,18 @@ class SocksClient extends events_1.EventEmitter {
             if (addressType === constants_1.Socks5HostType.IPv4) {
                 // Check if data is available.
                 const dataNeeded = constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5ResponseIPv4;
-                if (this._receiveBuffer.length < dataNeeded) {
-                    this._nextRequiredPacketBufferSize = dataNeeded;
+                if (this.receiveBuffer.length < dataNeeded) {
+                    this.nextRequiredPacketBufferSize = dataNeeded;
                     return;
                 }
-                buff = smart_buffer_1.SmartBuffer.fromBuffer(this._receiveBuffer.get(dataNeeded).slice(4));
+                buff = smart_buffer_1.SmartBuffer.fromBuffer(this.receiveBuffer.get(dataNeeded).slice(4));
                 remoteHost = {
                     host: ip.fromLong(buff.readUInt32BE()),
-                    port: buff.readUInt16BE()
+                    port: buff.readUInt16BE(),
                 };
                 // If given host is 0.0.0.0, assume remote proxy ip instead.
                 if (remoteHost.host === '0.0.0.0') {
-                    remoteHost.host = this._options.proxy.ipaddress;
+                    remoteHost.host = this.options.proxy.ipaddress;
                 }
                 // Hostname
             }
@@ -680,38 +683,37 @@ class SocksClient extends events_1.EventEmitter {
                 const hostLength = header[4];
                 const dataNeeded = constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5ResponseHostname(hostLength); // header + host length + port
                 // Check if data is available.
-                if (this._receiveBuffer.length < dataNeeded) {
-                    this._nextRequiredPacketBufferSize = dataNeeded;
+                if (this.receiveBuffer.length < dataNeeded) {
+                    this.nextRequiredPacketBufferSize = dataNeeded;
                     return;
                 }
-                buff = smart_buffer_1.SmartBuffer.fromBuffer(this._receiveBuffer.get(dataNeeded).slice(5) // Slice at 5 to skip host length
-                );
+                buff = smart_buffer_1.SmartBuffer.fromBuffer(this.receiveBuffer.get(dataNeeded).slice(5));
                 remoteHost = {
                     host: buff.readString(hostLength),
-                    port: buff.readUInt16BE()
+                    port: buff.readUInt16BE(),
                 };
                 // IPv6
             }
             else if (addressType === constants_1.Socks5HostType.IPv6) {
                 // Check if data is available.
                 const dataNeeded = constants_1.SOCKS_INCOMING_PACKET_SIZES.Socks5ResponseIPv6;
-                if (this._receiveBuffer.length < dataNeeded) {
-                    this._nextRequiredPacketBufferSize = dataNeeded;
+                if (this.receiveBuffer.length < dataNeeded) {
+                    this.nextRequiredPacketBufferSize = dataNeeded;
                     return;
                 }
-                buff = smart_buffer_1.SmartBuffer.fromBuffer(this._receiveBuffer.get(dataNeeded).slice(4));
+                buff = smart_buffer_1.SmartBuffer.fromBuffer(this.receiveBuffer.get(dataNeeded).slice(4));
                 remoteHost = {
                     host: ip.toString(buff.readBuffer(16)),
-                    port: buff.readUInt16BE()
+                    port: buff.readUInt16BE(),
                 };
             }
-            this.state = constants_1.SocksClientState.Established;
+            this.setState(constants_1.SocksClientState.Established);
             this.removeInternalSocketHandlers();
-            this.emit('established', { socket: this._socket, remoteHost });
+            this.emit('established', { remoteHost, socket: this.socket });
         }
     }
     get socksClientOptions() {
-        return Object.assign({}, this._options);
+        return Object.assign({}, this.options);
     }
 }
 exports.SocksClient = SocksClient;