fix(cli): fix user properties option of pub command

cli/src/lib/pub.ts

@@ -4,11 +4,13 @@ import pump from 'pump'
 import concat from 'concat-stream'
 import { Writable } from 'readable-stream'
 import split2 from 'split2'
+import { IClientPublishOptions } from 'mqtt'
 
-const send = (options: any) => {
+const send = (options: any, pubOptions: IClientPublishOptions) => {
   const client = mqtt.connect(options)
   client.on('connect', () => {
-    client.publish(options.topic, options.message, options, (err) => {
+    const { topic, message } = options
+    client.publish(topic, message, pubOptions, (err) => {
       if (err) {
         console.warn(err)
       }
@@ -21,13 +23,13 @@ const send = (options: any) => {
   })
 }
 
-const multisend = (options: any) => {
+const multisend = (options: any, pubOptions: IClientPublishOptions) => {
   const client = mqtt.connect(options)
   const sender = new Writable({
     objectMode: true,
   })
   sender._write = (line, _enc, cb) => {
-    client.publish(options.topic, line.trim(), options, cb)
+    client.publish(options.topic, line.trim(), pubOptions, cb)
   }
 
   client.on('connect', () => {
@@ -42,11 +44,7 @@ const multisend = (options: any) => {
 
 const pub = (options: any) => {
   options.protocolVersion = options.mqttVersion
-  if (options.protocolVersion === 5) {
-    if (options.userProperties) {
-      options.properties = { userProperties: options.userProperties }
-    }
-  } else if (options.protocolVersion === 3) {
+  if (options.protocolVersion === 3) {
     options.protocolId = 'MQIsdp'
   }
 
@@ -78,19 +76,32 @@ const pub = (options: any) => {
     options.will.retain = options.willRetain
   }
 
+  const pubOptions: IClientPublishOptions = {}
+
+  if (typeof options.qos === 'number') {
+    pubOptions.qos = options.qos
+  }
+  if (typeof options.retain === 'boolean') {
+    pubOptions.retain = options.retain
+  }
+  if (options.protocolVersion === 5) {
+    const { userProperties } = options
+    userProperties && (pubOptions.properties = { userProperties })
+  }
+
   if (options.stdin) {
     if (options.multiline) {
-      multisend(options)
+      multisend(options, pubOptions)
     } else {
       process.stdin.pipe(
         concat((data) => {
           options.message = data
-          send(options)
+          send(options, pubOptions)
         }),
       )
     }
   } else {
-    send(options)
+    send(options, pubOptions)
   }
 }