fixup: fix socks5 mutual stream destruction logic

Author: addaleax

packages/devtools-proxy-support/src/agent.ts

@@ -145,10 +145,20 @@ export function createAgent(
 
 export function useOrCreateAgent(
   proxyOptions: DevtoolsProxyOptions | AgentWithInitialize,
-  target?: string
+  target?: string,
+  useTargetRegardlessOfExistingAgent = false
 ): AgentWithInitialize | undefined {
   if ('createConnection' in proxyOptions) {
-    return proxyOptions as AgentWithInitialize;
+    const agent = proxyOptions as AgentWithInitialize;
+    if (
+      useTargetRegardlessOfExistingAgent &&
+      target !== undefined &&
+      agent.proxyOptions &&
+      !proxyForUrl(agent.proxyOptions, target)
+    ) {
+      return undefined;
+    }
+    return agent;
   } else {
     if (
       target !== undefined &&

packages/devtools-proxy-support/src/socks5.ts

@@ -331,9 +331,13 @@ class Socks5Server extends EventEmitter implements Tunnel {
       socket.on('error', forwardingErrorHandler);
 
       socket.once('close', () => {
+        if (!channel?.destroyed) channel.destroy();
         this.logger.emit('socks5:forwarded-socket-closed', { ...logMetadata });
         this.connections.delete(socket as Socket);
       });
+      channel.once('close', () => {
+        if (!socket?.destroyed) socket?.destroy();
+      });
 
       socket.pipe(channel).pipe(socket);
     } catch (err) {
@@ -392,7 +396,7 @@ export function createSocks5Tunnel(
     return new ExistingTunnel(socks5OnlyProxyOptions);
   }
 
-  const agent = useOrCreateAgent(proxyOptions, target);
+  const agent = useOrCreateAgent(proxyOptions, target, true);
   if (!agent) return undefined;
 
   let generateCredentials = false;