@burgrp/mqtt-mtl 1.0.2 → 1.1.0

package/mqtt-mtl.js

@@ -10,16 +10,34 @@ module.exports = brokerUrl => {
             connection: mqtt.connect(brokerUrl),
 
             listeners: [],
+            nextListenerId: 0,
+            subscriptions: {},
 
             publish(topic, message) {
                 this.connection.publish(topic, message);
             },
 
             subscribe(topic, listener) {
-                this.connection.subscribe(topic);
 
-                let parsedTopic = topic.split("/");
-                this.listeners.push((actTopic, actMessage) => {
+                if (!(topic instanceof Object)) {
+                    topic = {
+                        strict: topic,
+                        loose: topic
+                    }
+                }
+
+                if (!this.subscriptions[topic.loose]) {
+                    this.connection.subscribe(topic.loose);
+                    this.subscriptions[topic.loose] = 1;
+                } else {
+                    this.subscriptions[topic.loose]++;
+                }
+
+                let parsedTopic = topic.strict.split("/");
+
+                let id = this.nextListenerId++;
+
+                this.listeners[id] = (actTopic, actMessage) => {
                     let parsedActTopic = actTopic.split("/");
                     let matches = true;
                     for (let i in parsedTopic) {
@@ -35,14 +53,28 @@ module.exports = brokerUrl => {
                     if (matches) {
                         listener(actTopic, actMessage);
                     }
-                });
+                };
+
+                return id;
+            },
+
+            unsubscribe(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) => {
-            broker.listeners.forEach(l => l(topic, message));
+            for (listener of Object.values(broker.listeners)) {
+                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.2",
+  "version": "1.1.0",
   "description": "Selective multi-topic listener extension to mqtt library",
   "main": "mqtt-mtl.js",
   "scripts": {