feat: undici agent and socks

Author: ThaUnknown

README.md

@@ -100,7 +100,7 @@ var optionalOpts = {
 
               // UserId used when making a SOCKS 4/4a request. (Optional)
               userid: "someuserid",
-
+              password: "somepassword",
               // SOCKS 5 Specific:
 
               // Authentication used for SOCKS 5 (when it's required) (Optional)
@@ -115,6 +115,7 @@ var optionalOpts = {
           timeout: 10000
       },
       // NodeJS HTTP agents (used to proxy HTTP and Websocket requests in node)
+      // For HTTP trackers this is either an undici Agent if using Node16 or later, or http.Agent if using versions prior to Node 16
       // Populated with Socks.Agent if socksProxy is provided
       httpAgent: {},
       httpsAgent: {}

lib/client/http-tracker.js

@@ -4,6 +4,7 @@ import clone from 'clone'
 import Debug from 'debug'
 import fetch from 'cross-fetch-ponyfill'
 import Socks from 'socks'
+import { socksDispatcher } from 'fetch-socks'
 import { bin2hex, hex2bin, arr2text, text2arr, arr2hex } from 'uint8-util'
 
 import common from '../common.js'
@@ -127,7 +128,11 @@ class HTTPTracker extends Tracker {
     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:'))
+        if (globalThis.fetch) {
+          agent = socksDispatcher(clone(this.client._proxyOpts.socksProxy))
+        } else {
+          agent = new Socks.Agent(clone(this.client._proxyOpts.socksProxy), (parsedUrl.protocol === 'https:'))
+        }
       }
     }
 

package.json

@@ -36,6 +36,7 @@
     "compact2string": "^1.4.1",
     "cross-fetch-ponyfill": "^1.0.1",
     "debug": "^4.1.1",
+    "fetch-socks": "^1.2.0",
     "ip": "^1.1.5",
     "lru": "^3.1.0",
     "minimist": "^1.2.5",
@@ -47,6 +48,7 @@
     "socks": "^2.0.0",
     "string2compact": "^2.0.0",
     "uint8-util": "^2.1.9",
+    "undici": "^5.23.0",
     "unordered-array-remove": "^1.0.2",
     "ws": "^8.0.0"
   },

test/client.js

@@ -4,6 +4,7 @@ import http from 'http'
 import fixtures from 'webtorrent-fixtures'
 import net from 'net'
 import test from 'tape'
+import undici from 'undici'
 
 const peerId1 = Buffer.from('01234567890123456789')
 const peerId2 = Buffer.from('12345678901234567890')
@@ -572,12 +573,29 @@ function testClientStartHttpAgent (t, serverType) {
   t.plan(5)
 
   common.createServer(t, serverType, function (server, announceUrl) {
-    const agent = new http.Agent()
-    let agentUsed = false
-    agent.createConnection = function (opts, fn) {
-      agentUsed = true
-      return net.createConnection(opts, fn)
+    let agent
+    if (global.fetch && serverType !== 'ws') {
+      const connector = undici.buildConnector({ rejectUnauthorized: false })
+      agent = new undici.Agent({
+        connect (opts, cb) {
+          agentUsed = true
+          connector(opts, (err, socket) => {
+            if (err) {
+              cb(err, null)
+            } else {
+              cb(null, socket)
+            }
+          })
+        }
+      })
+    } else {
+      agent = new http.Agent()
+      agent.createConnection = function (opts, fn) {
+        agentUsed = true
+        return net.createConnection(opts, fn)
+      }
     }
+    let agentUsed = false
     const client = new Client({
       infoHash: fixtures.leaves.parsedTorrent.infoHash,
       announce: announceUrl,