fix: make broker URL retrieval method safer

moscajs · Oct 5, 2023 · 12482fd · 12482fd
1 parent 0f7170a
commit 12482fd
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -159,11 +159,18 @@ export function getBrokerUrl(
 ): string {
   const protocol = getClientTransport(request)
   if (!request?.connDetails) {
-    const address = !request
-      ? (stream as NetSocket)?.address()
-      : request.socket.address()
+    let address = {}
+    if (isNetSocket(stream) && isNetSocketAddress(stream.address())) {
+      address = stream.address()
+    } else if (
+      typeof request?.socket?.address === 'function' &&
+      isNetSocketAddress(request.socket.address())
+    ) {
+      address = request.socket.address()
+    }
+
     return isNetSocketAddress(address)
-      ? `${protocol}://${address?.address}:${address.port}`
+      ? `${protocol}://${address.address}:${address.port}`
       : `${protocol}://localhost:1883`
   }
   const { isTls, isWebsocket, serverIpAddress, serverPort } =