Use SocksProxyAgent

Author: bl00m

lib/client/http-tracker.js

@@ -1,9 +1,8 @@
 import arrayRemove from 'unordered-array-remove'
 import bencode from 'bencode'
-import clone from 'clone'
 import Debug from 'debug'
 import get from 'simple-get'
-import Socks from 'socks'
+import { SocksProxyAgent } from 'socks-proxy-agent'
 import { bin2hex, hex2bin, arr2text, text2arr, arr2hex } from 'uint8-util'
 
 import common from '../common.js'
@@ -118,8 +117,20 @@ class HTTPTracker extends Tracker {
     let agent
     if (this.client._proxyOpts) {
       agent = parsedUrl.protocol === 'https:' ? this.client._proxyOpts.httpsAgent : this.client._proxyOpts.httpAgent
+
       if (!agent && this.client._proxyOpts.socksProxy) {
-        agent = new Socks.Agent(clone(this.client._proxyOpts.socksProxy), (parsedUrl.protocol === 'https:'))
+        const socksOpts = this.client._proxyOpts.socksProxy.proxy
+
+        const socksURI = new URL(`socks${socksOpts.type}://`)
+        socksURI.hostname = socksOpts.ipaddress
+        socksURI.port = socksOpts.port
+
+        if (socksOpts.authentication) {
+          socksURI.username = socksOpts.authentication.username
+          socksURI.password = socksOpts.authentication.password
+        }
+
+        agent = new SocksProxyAgent(socksURI.href)
       }
     }
 

lib/client/websocket-tracker.js

@@ -1,8 +1,7 @@
-import clone from 'clone'
 import Debug from 'debug'
 import Peer from '@thaunknown/simple-peer/lite.js'
 import Socket from '@thaunknown/simple-websocket'
-import Socks from 'socks'
+import { SocksProxyAgent } from 'socks-proxy-agent'
 import { arr2text, arr2hex, hex2bin, bin2hex, randomBytes } from 'uint8-util'
 
 import common from '../common.js'
@@ -184,8 +183,20 @@ class WebSocketTracker extends Tracker {
       let agent
       if (this.client._proxyOpts) {
         agent = parsedUrl.protocol === 'wss:' ? this.client._proxyOpts.httpsAgent : this.client._proxyOpts.httpAgent
+
         if (!agent && this.client._proxyOpts.socksProxy) {
-          agent = new Socks.Agent(clone(this.client._proxyOpts.socksProxy), (parsedUrl.protocol === 'wss:'))
+          const socksOpts = this.client._proxyOpts.socksProxy.proxy
+
+          const socksURI = new URL(`socks${socksOpts.type}://`)
+          socksURI.hostname = socksOpts.ipaddress
+          socksURI.port = socksOpts.port
+
+          if (socksOpts.authentication) {
+            socksURI.username = socksOpts.authentication.username
+            socksURI.password = socksOpts.authentication.password
+          }
+
+          agent = new SocksProxyAgent(socksURI.href)
         }
       }
       this.socket = socketPool[this.announceUrl] = new Socket({ url: this.announceUrl, agent })

package.json

@@ -45,6 +45,7 @@
     "run-series": "^1.1.9",
     "simple-get": "^4.0.0",
     "socks": "^2.0.0",
+    "socks-proxy-agent": "^8.0.2",
     "string2compact": "^2.0.0",
     "uint8-util": "^2.1.9",
     "unordered-array-remove": "^1.0.2",