chore: re-implement skipped windows test

package.json

@@ -43,8 +43,7 @@
     "@npmcli/template-oss": "4.21.3",
     "minipass-fetch": "^3.0.3",
     "nock": "^13.2.7",
-    "semver": "^7.5.4",
-    "simple-socks": "^3.1.0",
+    "socksv5": "^0.0.6",
     "tap": "^16.3.0"
   },
   "repository": {

test/agent.js

@@ -2,12 +2,9 @@
 
 const t = require('tap')
 const timers = require('timers/promises')
-const semver = require('semver')
 const dns = require('dns')
 const { createSetup, mockConnect } = require('./fixtures/setup.js')
 
-const isWindows = process.platform === 'win32'
-
 const agentTest = (t, opts) => {
   const { setup, hasProxy, isSocks } = createSetup(opts)
   t.test('single request basic', async (t) => {
@@ -174,12 +171,7 @@ const agentTest = (t, opts) => {
       })
 
       if (isSocks) {
-        // weird bug that fails with a message about node internals starting with this specific
-        // node version in windows. skipping this test for now to ship these agent updates.
-        const skipThis = semver.gte(process.version, '18.17.1') && isWindows && !opts.serverTls
-        if (!skipThis) {
-          await t.rejects(client.get('/'))
-        }
+        await t.rejects(client.get('/'))
       } else {
         const res = await client.get('/')
         t.equal(res.status, 500)

test/fixtures/server.js

@@ -9,6 +9,7 @@ const http = require('http')
 const https = require('https')
 const timers = require('timers/promises')
 const fetch = require('minipass-fetch')
+const socks = require('socksv5')
 
 const parseAuthHeader = (header) => {
   const reqAuth = header.slice('Basic '.length)
@@ -270,29 +271,16 @@ class HttpsProxy extends HttpProxy {
 }
 
 class SocksProxy extends Server {
-  #failConnect
-
-  constructor (t, { protocol = 'socks:', simpleSocks, failConnect, ...options } = {}) {
+  constructor (t, { protocol = 'socks:', failConnect, ...options } = {}) {
     super(t, {
       ...options,
       protocol,
-      connectionEvent: 'handshake',
-      createServer: ({ auth }) => simpleSocks.createServer({
-        authenticate: (username, password, _, callback) => {
-          const args = auth ? [auth(username, password) ? null : new Error('Invalid auth')] : []
-          return setImmediate(callback, ...args)
-        },
-      }),
+      createServer: ({ auth }) => socks.createServer({
+        auths: [auth
+          ? socks.auth.UserPassword((user, password, cb) => cb(auth(user, password)))
+          : socks.auth.None()],
+      }, (_, accept, deny) => failConnect ? deny() : accept())._srv,
     })
-
-    this.#failConnect = failConnect
-    this.server.on('proxyConnect', this.#proxyConnect)
-  }
-
-  #proxyConnect = (_, socket) => {
-    if (this.#failConnect) {
-      socket.destroy(new Error('failConnect!'))
-    }
   }
 }
 

test/fixtures/setup.js

@@ -42,7 +42,6 @@ const createSetup = ({ serverTls, proxyTls, ...baseOpts }) => {
           ...baseOpts.proxy,
           ...opts.proxy,
           agent: new Agent(omit(agentOpts, 'timeouts')),
-          simpleSocks: await import('simple-socks').then(r => r.default),
         })
         await proxy.start()
         t.comment(`Proxy: ${proxy.address} ${proxy.hostAddress}`)