Fix a couple of issues in the RC (#1709)

* Provide a domain to the socket

* fix auth error

* failing to return socket

* changelog

Author: Half-Shot

changelog.d/1709.bugfix

@@ -0,0 +1 @@
+Fix the bridge pooling so it supports TLS.

src/irc/ConnectionInstance.ts

@@ -428,18 +428,19 @@ export class ConnectionInstance {
 
         // Returns: A promise which resolves to a ConnectionInstance
         const retryConnection = async () => {
-
+            const domain = server.randomDomain();
             const redisConn = opts.useRedisPool && await opts.useRedisPool.createOrGetIrcSocket(ident, {
                 ...connectionOpts,
                 clientId: ident,
                 port: connectionOpts.port ?? 6667,
                 localAddress: connectionOpts.localAddress ?? undefined,
                 localPort: connectionOpts.localPort ?? undefined,
                 family: connectionOpts.family ?? undefined,
+                host: domain,
             });
 
             const nodeClient = new Client(
-                server.randomDomain(), opts.nick, connectionOpts, redisConn?.state, redisConn,
+                domain, opts.nick, connectionOpts, redisConn?.state, redisConn,
             );
             const inst = new ConnectionInstance(
                 nodeClient, server.domain, opts.nick, {

src/pool-service/IrcConnectionPool.ts

@@ -74,7 +74,6 @@ export class IrcConnectionPool {
     }
 
     private async createConnectionForOpts(opts: ConnectionCreateArgs): Promise<Socket> {
-        let socket: Socket;
         if (opts.secure) {
             let secureOpts: tls.ConnectionOptions = {
                 ...opts,
@@ -89,11 +88,12 @@ export class IrcConnectionPool {
                 };
             }
 
-            socket = await new Promise((resolve, reject) => {
+            return await new Promise((resolve, reject) => {
                 // Taken from https://github.com/matrix-org/node-irc/blob/0764733af7c324ee24f8c2a3c26fe9d1614be344/src/irc.ts#L1231
                 const sock = tls.connect(secureOpts, () => {
                     if (sock.authorized) {
                         resolve(sock);
+                        return;
                     }
                     let valid = false;
                     const err = sock.authorizationError.toString();
@@ -125,7 +125,7 @@ export class IrcConnectionPool {
             });
         }
         return new Promise((resolve, reject) => {
-            socket = createConnection(opts, () => resolve(socket)) as Socket;
+            const socket = createConnection(opts, () => resolve(socket)) as Socket;
             socket.once('error', (error) => {
                 reject(error);
             });