Use SocksClient

Author: bl00m

lib/client/udp-tracker.js

@@ -2,7 +2,7 @@ import arrayRemove from 'unordered-array-remove'
 import clone from 'clone'
 import Debug from 'debug'
 import dgram from 'dgram'
-import Socks from 'socks'
+import { SocksClient } from 'socks'
 import { concat, hex2arr, randomBytes } from 'uint8-util'
 
 import common from '../common.js'
@@ -93,8 +93,8 @@ class UDPTracker extends Tracker {
     const proxyOpts = this.client._proxyOpts && clone(this.client._proxyOpts.socksProxy)
     if (proxyOpts) {
       if (!proxyOpts.proxy) proxyOpts.proxy = {}
-      // UDP requests uses the associate command
-      proxyOpts.proxy.command = 'associate'
+      // UDP requests uses the associate type
+      proxyOpts.proxy.type = 'associate'
       if (!proxyOpts.target) {
         // This should contain client IP and port but can be set to 0 if we don't have this information
         proxyOpts.target = {
@@ -104,20 +104,20 @@ class UDPTracker extends Tracker {
       }
 
       if (proxyOpts.proxy.type === 5) {
-        Socks.createConnection(proxyOpts, onGotConnection)
+        SocksClient.createConnection(proxyOpts)
+          .then(info => onGotConnection(info.socket, info))
+          .catch(onError)
       } else {
         debug('Ignoring Socks proxy for UDP request because type 5 is required')
-        onGotConnection(null)
+        onGotConnection()
       }
     } else {
-      onGotConnection(null)
+      onGotConnection()
     }
 
     this.cleanupFns.push(cleanup)
 
-    function onGotConnection (err, s, info) {
-      if (err) return onError(err)
-
+    function onGotConnection (s, info) {
       proxySocket = s
       socket = dgram.createSocket('udp4')
       relay = info
@@ -260,7 +260,10 @@ class UDPTracker extends Tracker {
 
     function send (message, proxyInfo) {
       if (proxyInfo) {
-        const pack = Socks.createUDPFrame({ host: hostname, port }, message)
+        const pack = SocksClient.createUDPFrame({
+          remoteHost: { host: hostname, port },
+          data: message
+        })
         socket.send(pack, 0, pack.length, proxyInfo.port, proxyInfo.host)
       } else {
         socket.send(message, 0, message.length, port, hostname)