fix(ws): ignored host option and default hostname in browser

Fixes #1730
mqttjs · May 3, 2024 · c6580a6 · c6580a6
1 parent 0c72b5a
commit c6580a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/lib/connect/tcp.ts b/src/lib/connect/tcp.ts
@@ -2,7 +2,6 @@ import { StreamBuilder } from '../shared'
 
 import net from 'net'
 import _debug from 'debug'
-import { Duplex } from 'readable-stream'
 
 const debug = _debug('mqttjs:tcp')
 /*

diff --git a/src/lib/connect/ws.ts b/src/lib/connect/ws.ts
@@ -28,16 +28,15 @@ function buildUrl(opts: IClientOptions, client: MqttClient) {
 
 function setDefaultOpts(opts: IClientOptions) {
 	const options = opts
-	if (!opts.hostname) {
-		options.hostname = 'localhost'
-	}
+
 	if (!opts.port) {
 		if (opts.protocol === 'wss') {
 			options.port = 443
 		} else {
 			options.port = 80
 		}
 	}
+
 	if (!opts.path) {
 		options.path = '/'
 	}
@@ -141,6 +140,9 @@ function createBrowserWebSocket(client: MqttClient, opts: IClientOptions) {
 const streamBuilder: StreamBuilder = (client, opts) => {
 	debug('streamBuilder')
 	const options = setDefaultOpts(opts)
+
+	options.hostname = options.hostname || options.host || 'localhost'
+
 	const url = buildUrl(options, client)
 	const socket = createWebSocket(client, url, options)
 	const webSocketStream = Ws.createWebSocketStream(