mqtt-plus 1.4.22 → 1.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":                           "mqtt-plus",
-    "version":                        "1.4.22",
+    "version":                        "1.4.23",
     "description":                    "MQTT Communication Patterns",
     "keywords":                       [   "mqtt",
                                           "event", "emit",

package/src/mqtt-plus-base.ts

@@ -28,6 +28,7 @@ import { type MqttClient,
     type IClientSubscribeOptions,
     type IClientPublishOptions,
     type IPublishPacket }               from "mqtt"
+import { nanoid }                       from "nanoid"
 
 /*  internal requirements  */
 import type { APISchema, Registration } from "./mqtt-plus-api"
@@ -79,6 +80,19 @@ export class BaseTrait<T extends APISchema = APISchema> extends TraceTrait<T> {
         /*  store MQTT client  */
         this.mqtt = mqtt
 
+        /*  resolve the instance "id": if the user did not provide an
+            explicit one, fetch the "clientId" from the underlying MQTT
+            client, and only as a last resort fall back to a generated id
+            (e.g. for the fake proxy MQTT client without a real clientId)  */
+        if (this.options.id === "") {
+            const clientId = (mqtt as any).isFakeProxy
+                ? undefined
+                : mqtt.options?.clientId
+            this.options.id = (typeof clientId === "string" && clientId !== "")
+                ? clientId
+                : nanoid()
+        }
+
         /*  hook into the MQTT message processing  */
         this.log("info", "hooking into MQTT client")
         this.messageHandler = (topic, message, packet) => {

package/src/mqtt-plus-options.ts

@@ -22,9 +22,6 @@
 **  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-/*  external requirements  */
-import { nanoid }           from "nanoid"
-
 /*  internal requirements  */
 import type { APISchema }   from "./mqtt-plus-api"
 
@@ -55,7 +52,7 @@ export class OptionsTrait<_T extends APISchema = APISchema> {
     ) {
         /*  determine options and provide defaults  */
         this.options = {
-            id:          nanoid(),
+            id:          "", /*  intentionally resolved later in BaseTrait  */
             codec:       "cbor",
             timeout:     10 * 1000,
             share:       "",