socks-wrapper - npm Package Compare versions

Comparing version 0.3.1 to 0.4.0

index.js

@@ -9,28 +9,9 @@ 'use strict';
 
-function getArgs(args) {
-  var res = [9050, 'localhost'];
-  if (typeof args[0] === 'object') {
-    res[3] = args[0];
-  } else {
-    res[0] = args[0];
-    if (typeof args[1] === 'string') {
-      res[1] = args[1];
-      res[2] = args[2];
-    }
-    else {
-      res[2] = args[1];
-    }
-  }
-  return res;
-}
+function SocksWrapper(port, host, options) {
+  net.Socket.call(this, options);
 
-function SocksWrapper() {
-  var args = getArgs(arguments);
-
-  net.Socket.call(this, args[3]);
-
   var self          = this,
       socket        = new net.Socket(),
       socksResponse = null;
-  
+
   function createSocksRequest(port, host) {
@@ -91,3 +72,3 @@ var data = new Buffer(9);
     this.connecting = true;
-    socket.connect(args[0], args[1], function() {
+    socket.connect(port, host, function() {
       var socksRequest = createSocksRequest(options.port, options.host);
@@ -104,12 +85,121 @@ socket.write(socksRequest);
 
-exports.SocksWrapper = SocksWrapper;
+function Socks5Wrapper(port, host, options) {
+  net.Socket.call(this, options);
 
+  var self          = this,
+      socket        = new net.Socket(),
+      socksResponse = null;
+
+  function createSocksRequest(port, host) {
+    var head = new Buffer(4);
+
+    head[0] = 5;
+    head[1] = 1;
+    head[2] = 0;
+
+    if (4 == net.isIP(host)) {
+      var groups = host.split('.');
+      var addr = new Buffer(4);
+      for (var i = 0; i < groups.length; i++) {
+        addr[i] = parseInt(groups[i], 10);
+      }
+      head[3] = 1;
+      head = Buffer.concat([head, addr]);
+    }
+    else {
+      var hostData = new Buffer(host);
+      var sizeByte = new Buffer(1);
+      sizeByte[0] = hostData.length;
+      head[3] = 3;
+      head = Buffer.concat([head, sizeByte, hostData]);
+    }
+
+    var portData = new Buffer(2);
+
+    portData[0] = 0xFF & (port >> 8)
+    portData[1] = 0xFF & port;
+
+    return Buffer.concat([head, portData]);
+  }
+
+  function handleSocksResponse(data) {
+    socksResponse = socksResponse ? Buffer.concat(socksResponse, data) : data;
+
+    if (socksResponse.length < 2) {
+      return;
+    }
+
+    if (socksResponse[1] != 0x00) {
+      socket.destroy();
+      return self.emit('error', { code: socksResponse[1] } )
+    }
+
+    function done(event, data) {
+      socket.removeListener('data', handleSocksResponse);
+
+      self._handle       = socket._handle;
+      self._handle.owner = self;
+      self.readable      = socket.readable;
+      self.writable      = socket.writable;
+      self.connecting    = false;
+
+      self.emit(event, data);
+    }
+
+    if (socksResponse.length >= 10) {
+      const addrType = socksResponse[3];
+      if (addrType === 1) {
+        if (socksResponse.length === 10) {
+          return done('connect');
+        }
+        else {
+          return done('error', { code: 'Bad length (1)' });
+        }
+      }
+
+      if (addrType === 3) {
+        const length = 5 + socksResponse[4] + 2;
+        if (socksResponse.length === length) {
+          return done('connect');
+        }
+        else if (socksResponse.length > length) {
+          return done('error', { code: 'Bad length (2)' });
+        }
+      }
+      else {
+        return done('error', { code: 'Bad address type' });
+      }
+
+    }
+  }
+
+  this.connect = function(options) {
+    this.connecting = true;
+    socket.connect(port, host, () => {
+      socks5Handshake(socket).then(() => {
+        var socksRequest = createSocksRequest(options.port, options.host);
+        socket.write(socksRequest);
+        socket.on('data', handleSocksResponse);
+      }).catch(error => {
+        this.emit('error', error)
+      })
+    });
+
+    socket.on('error', err => { this.emit('error', err) });
+
+    return this;
+  }
+}
+
+
+exports.SocksWrapper = Socks5Wrapper;
+
 util.inherits(SocksWrapper, net.Socket);
+util.inherits(Socks5Wrapper, net.Socket);
 
-exports.HttpAgent = function() {
-  var args = getArgs(arguments);
-  http.Agent.call(this, args[2]);
+exports.HttpAgent = function(port, host, options) {
+  http.Agent.call(this, options);
   this.createConnection = function(options) {
     options.port = options.port || 80;
-    return new SocksWrapper(args[0], args[1]).connect(options);
+    return new Socks5Wrapper(port, host).connect(options);
   }
@@ -120,8 +210,7 @@ }
 
-exports.HttpsAgent = function() {
-  var args = getArgs(arguments);
-  https.Agent.call(this, args[2]);
+exports.HttpsAgent = function(port, host, options) {
+  https.Agent.call(this, options);
   this.createConnection = function(options) {
     options.port = options.port || 443;
-    options.socket = new SocksWrapper(args[0], args[1]).connect(options);
+    options.socket = new Socks5Wrapper(port, host).connect(options);
     return tls.connect(options)
@@ -133,1 +222,30 @@ }
 
+function socks5Handshake(socket) {
+  return new Promise((resolve, reject) => {
+    var req = new Buffer(3);
+
+    req[0] = 5;
+    req[1] = 1;
+    req[2] = 0;
+
+    socket.write(req);
+
+    let received = null;
+
+    function handleData(data) {
+      received = received ? Buffer.concat([received, data]) : data;
+      if (received.length >= 2) {
+        socket.removeListener('data', handleData);
+        if (received.length > 2 || received[0] != 0x05 || received[1] != 0) {
+          reject(received)
+        }
+        else {
+          resolve()
+        }
+      }
+    }
+
+    socket.on('data', handleData);
+  })
+}
+

package.json

 {
   "name": "socks-wrapper",
   "description": "Wrapping net.Socket to work with SOCKS proxies",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "main": "index.js",
@@ -6,0 +6,0 @@ "author": "Weidong Fang <[e-mail]>",

No alert changes

Improved metrics

Total package byte prevSize

9444

increased by46.44%

Lines of code

216

increased by75.61%

No dependency changes