Merge branch 'main' into more-client-end-test-changes

Author: robertsLando

.airtap.yml

@@ -0,0 +1,8 @@
+providers:
+  - airtap-playwright
+ui: mocha-bdd
+browsers:
+  - name: chromium
+    supports:
+      headless: true
+

.airtaprc.yml

@@ -42,5 +42,12 @@ jobs:
       env:
         CI: true
         DEBUG: "mqttjs"
+    
+    - name: Test Browser
+      timeout-minutes: 2
+      run: |
+        npm run browser-build
+        npm run unit-test:browser
+  
 
 

.github/workflows/mqttjs-test.yml

@@ -17,5 +17,6 @@ test/typescript/*.js
 test/typescript/*.map
 # VS Code stuff
 **/typings/**
-
+.vscode/
 .npmrc
+

.gitignore

@@ -15,7 +15,7 @@ const host = 'ws://localhost:8080'
 
 const options = {
   keepalive: 30,
-  clientId: clientId,
+  clientId,
   protocolId: 'MQTT',
   protocolVersion: 4,
   clean: true,

examples/ws/client.js

@@ -21,7 +21,7 @@ const proxyOpts = url.parse(proxy)
 proxyOpts.secureEndpoint = parsed.protocol ? parsed.protocol === 'wss:' : true
 const agent = new HttpsProxyAgent(proxyOpts)
 const wsOptions = {
-  agent: agent
+  agent
   // other wsOptions
   // foo:'bar'
 }
@@ -34,7 +34,7 @@ const mqttOptions = {
   connectTimeout: 30 * 1000,
   clean: true,
   clientId: 'testClient',
-  wsOptions: wsOptions
+  wsOptions
 }
 
 const client = mqtt.connect(parsed, mqttOptions)

examples/wss/client_with_proxy.js

@@ -638,11 +638,11 @@ MqttClient.prototype.publish = function (topic, message, opts, callback) {
     }
     const packet = {
       cmd: 'publish',
-      topic: topic,
+      topic,
       payload: message,
       qos: opts.qos,
       retain: opts.retain,
-      messageId: messageId,
+      messageId,
       dup: opts.dup
     }
 
@@ -675,7 +675,7 @@ MqttClient.prototype.publish = function (topic, message, opts, callback) {
       {
         invoke: publishProc,
         cbStorePut: opts.cbStorePut,
-        callback: callback
+        callback
       }
     )
   }
@@ -750,7 +750,7 @@ MqttClient.prototype.subscribe = function () {
         that._resubscribeTopics[topic].qos < opts.qos ||
         resubscribe) {
         const currentOpts = {
-          topic: topic,
+          topic,
           qos: opts.qos
         }
         if (version === 5) {
@@ -805,7 +805,7 @@ MqttClient.prototype.subscribe = function () {
       qos: 1,
       retain: false,
       dup: false,
-      messageId: messageId
+      messageId
     }
 
     if (opts.properties) {
@@ -854,7 +854,7 @@ MqttClient.prototype.subscribe = function () {
     this._storeProcessingQueue.push(
       {
         invoke: subscribeProc,
-        callback: callback
+        callback
       }
     )
   }
@@ -911,7 +911,7 @@ MqttClient.prototype.unsubscribe = function () {
     const packet = {
       cmd: 'unsubscribe',
       qos: 1,
-      messageId: messageId
+      messageId
     }
 
     if (typeof topic === 'string') {
@@ -945,7 +945,7 @@ MqttClient.prototype.unsubscribe = function () {
     this._storeProcessingQueue.push(
       {
         invoke: unsubscribeProc,
-        callback: callback
+        callback
       }
     )
   }
@@ -1054,7 +1054,7 @@ MqttClient.prototype.end = function (force, opts, cb) {
 MqttClient.prototype.removeOutgoingMessage = function (messageId) {
   const cb = this.outgoing[messageId] ? this.outgoing[messageId].cb : null
   delete this.outgoing[messageId]
-  this.outgoingStore.del({ messageId: messageId }, function () {
+  this.outgoingStore.del({ messageId }, function () {
     cb(new Error('Message removed'))
   })
   return this
@@ -1297,7 +1297,7 @@ MqttClient.prototype._storePacket = function (packet, cb, cbStorePut) {
   }
   // check that the packet is not a qos of 0, or that the command is not a publish
   if (((storePacket.qos || 0) === 0 && this.queueQoSZero) || storePacket.cmd !== 'publish') {
-    this.queue.push({ packet: storePacket, cb: cb })
+    this.queue.push({ packet: storePacket, cb })
   } else if (storePacket.qos > 0) {
     cb = this.outgoing[storePacket.messageId] ? this.outgoing[storePacket.messageId].cb : null
     this.outgoingStore.put(storePacket, function (err) {
@@ -1533,10 +1533,10 @@ MqttClient.prototype._handlePublish = function (packet, done) {
         if (error) { return that.emit('error', error) }
         if (validReasonCodes.indexOf(code) === -1) { return that.emit('error', new Error('Wrong reason code for pubrec')) }
         if (code) {
-          that._sendPacket({ cmd: 'pubrec', messageId: messageId, reasonCode: code }, done)
+          that._sendPacket({ cmd: 'pubrec', messageId, reasonCode: code }, done)
         } else {
           that.incomingStore.put(packet, function () {
-            that._sendPacket({ cmd: 'pubrec', messageId: messageId }, done)
+            that._sendPacket({ cmd: 'pubrec', messageId }, done)
           })
         }
       })
@@ -1556,7 +1556,7 @@ MqttClient.prototype._handlePublish = function (packet, done) {
           if (err) {
             return done && done(err)
           }
-          that._sendPacket({ cmd: 'puback', messageId: messageId, reasonCode: code }, done)
+          that._sendPacket({ cmd: 'puback', messageId, reasonCode: code }, done)
         })
       })
       break
@@ -1642,7 +1642,7 @@ MqttClient.prototype._handleAck = function (packet) {
       response = {
         cmd: 'pubrel',
         qos: 2,
-        messageId: messageId
+        messageId
       }
       const pubrecRC = packet.reasonCode
 
@@ -1703,7 +1703,7 @@ MqttClient.prototype._handlePubrel = function (packet, callback) {
   const messageId = packet.messageId
   const that = this
 
-  const comp = { cmd: 'pubcomp', messageId: messageId }
+  const comp = { cmd: 'pubcomp', messageId }
 
   that.incomingStore.get(packet, function (err, pub) {
     if (!err) {

lib/client.js

@@ -114,7 +114,7 @@ function buildStream (client, opts) {
   const url = buildUrl(opts, client)
   my = opts.my
   my.connectSocket({
-    url: url,
+    url,
     protocols: websocketSubProtocol
   })
 

lib/connect/ali.js

@@ -4,7 +4,7 @@ const MqttClient = require('../client')
 const Store = require('../store')
 const DefaultMessageIdProvider = require('../default-message-id-provider')
 const UniqueMessageIdProvider = require('../unique-message-id-provider')
-const IS_BROWSER = require('../is-browser').IS_BROWSER
+const { IS_BROWSER } = require('../is-browser')
 const url = require('url')
 const xtend = require('xtend')
 const debug = require('debug')('mqttjs')

lib/connect/index.js

@@ -5,7 +5,7 @@ const WS = require('ws')
 const debug = require('debug')('mqttjs:ws')
 const duplexify = require('duplexify')
 const Transform = require('readable-stream').Transform
-const IS_BROWSER = require('../is-browser').IS_BROWSER
+const { IS_BROWSER } = require('../is-browser')
 
 const WSS_OPTIONS = [
   'rejectUnauthorized',
@@ -100,9 +100,9 @@ function createWebSocket (client, url, opts) {
 
 function createBrowserWebSocket (client, opts) {
   const websocketSubProtocol =
-  (opts.protocolId === 'MQIsdp') && (opts.protocolVersion === 3)
-    ? 'mqttv3.1'
-    : 'mqtt'
+    (opts.protocolId === 'MQIsdp') && (opts.protocolVersion === 3)
+      ? 'mqttv3.1'
+      : 'mqtt'
 
   const url = buildUrl(opts, client)
   /* global WebSocket */