Allow using an array of relay keys (#148)

holepunchto · Oct 17, 2023 · 3994426 · 3994426
1 parent 7087c01
commit 3994426
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/connect.js b/lib/connect.js
@@ -33,7 +33,7 @@ module.exports = function connect (dht, publicKey, opts = {}) {
   if (pool && pool.has(publicKey)) return pool.get(publicKey)
 
   const keyPair = opts.keyPair || dht.defaultKeyPair
-  const relayThrough = typeof opts.relayThrough === 'function' ? opts.relayThrough() : (opts.relayThrough || null)
+  const relayThrough = selectRelay(opts.relayThrough || null)
   const encryptedSocket = (opts.createSecretStream || defaultCreateSecretStream)(true, null, {
     publicKey: keyPair.publicKey,
     remotePublicKey: publicKey,
@@ -757,4 +757,11 @@ function isRelay (relaySocket, socket, port, host) {
   return port === stream.remotePort && host === stream.remoteHost
 }
 
+function selectRelay (relayThrough) {
+  if (typeof relayThrough === 'function') relayThrough = relayThrough()
+  if (relayThrough === null) return null
+  if (Array.isArray(relayThrough)) return relayThrough[Math.floor(Math.random() * relayThrough.length)]
+  return relayThrough
+}
+
 function noop () {}
diff --git a/lib/server.js b/lib/server.js
@@ -263,7 +263,7 @@ module.exports = class Server extends EventEmitter {
       }
     }
 
-    const relayThrough = typeof this.relayThrough === 'function' ? this.relayThrough() : this.relayThrough
+    const relayThrough = selectRelay(this.relayThrough)
 
     if (relayThrough) hs.relayToken = relay.token()
 
@@ -620,4 +620,11 @@ function isRelay (relaySocket, socket, port, host) {
   return port === stream.remotePort && host === stream.remoteHost
 }
 
+function selectRelay (relayThrough) {
+  if (typeof relayThrough === 'function') relayThrough = relayThrough()
+  if (relayThrough === null) return null
+  if (Array.isArray(relayThrough)) return relayThrough[Math.floor(Math.random() * relayThrough.length)]
+  return relayThrough
+}
+
 function noop () {}