@burgrp/mqtt-mtl 1.0.3 → 1.1.1

package/mqtt-mtl.js

@@ -7,58 +7,59 @@ module.exports = brokerUrl => {
     if (!brokers[brokerUrl]) {
         let broker = {
 
-            connection: mqtt.connect(brokerUrl),
+            connection: mqtt.connect(brokerUrl, {
+                protocolVersion: 5
+            }),
 
-            listeners: [],
-            nextListenerId: 0,
+            listeners: {},
+            nextListenerId: 1,
 
             publish(topic, message) {
                 this.connection.publish(topic, message);
             },
 
             subscribe(topic, listener) {
-                this.connection.subscribe(topic);
-
-                let parsedTopic = topic.split("/");
 
                 let id = this.nextListenerId++;
 
-                this.listeners[id] = (actTopic, actMessage) => {
-                    let parsedActTopic = actTopic.split("/");
-                    let matches = true;
-                    for (let i in parsedTopic) {
-                        if (parsedTopic[i] === parsedActTopic[i] || parsedTopic[i] === "+") {
-                            continue;
-                        }
-                        if (parsedTopic[i] === "#") {
-                            break;
-                        }
-                        matches = false;
-                        break;
-                    }
-                    if (matches) {
-                        listener(actTopic, actMessage);
+                this.listeners[id] = listener;
+
+                this.connection.subscribe(topic, {
+                    properties: {
+                        subscriptionIdentifier: id
                     }
-                };
+                });
 
                 return id;
             },
 
             unsubscribe(listenerId) {
-                delete this.listeners[listenerId];
+                //TODO: unsubscribe from MQTT if it's last subscription in this.subscriptions[]
+                //delete this.listeners[listenerId];
+                throw new Error("Not implemented yet");
             }
         }
 
         brokers[brokerUrl] = broker;
 
-        broker.connection.on("message", (topic, message) => {
-            for (listener of Object.values(broker.listeners)) {
-                try {
-                    listener(topic, message);
-                } catch(e) {
-                    console.error("Unhandled MQTT listener exception:", e);
+        broker.connection.on("message", (topic, message, packet) => {
+
+            let ids = (packet.properties && packet.properties.subscriptionIdentifier) || [];
+            if (!(ids instanceof Array)) {
+                ids = [ids];
+            }
+
+            for (let id of ids) {
+                let listener = broker.listeners[id];
+                if (listener) {
+                    try {
+                        listener(topic, message);
+                    } catch (e) {
+                        console.error("Unhandled MQTT listener exception:", e);
+                    }
                 }
             }
+
         });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@burgrp/mqtt-mtl",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "description": "Selective multi-topic listener extension to mqtt library",
   "main": "mqtt-mtl.js",
   "scripts": {