@vita-mojo/mqtt 1.0.26 → 1.0.28

package/client.cjs.js

@@ -173,7 +173,7 @@ function MqttTopic({
       }
     });
     const handler = (msgTopic, message) => {
-      if (msgTopic !== topic) return;
+      if (!isTopicMatch(topic, msgTopic)) return;
       try {
         const payload = JSON.parse(message.toString());
         onChange === null || onChange === void 0 ? void 0 : onChange(payload);
@@ -195,6 +195,24 @@ function MqttTopic({
   }, [mqttClient, onChange, qos, topic]);
   return null;
 }
+function isTopicMatch(filter, topic) {
+  const filterParts = filter.split('/');
+  const topicParts = topic.split('/');
+  for (let i = 0; i < filterParts.length; i++) {
+    const filterPart = filterParts[i];
+    const topicPart = topicParts[i];
+    if (filterPart === '#') {
+      return true;
+    }
+    if (filterPart === '+') {
+      continue;
+    }
+    if (filterPart !== topicPart) {
+      return false;
+    }
+  }
+  return filterParts.length === topicParts.length;
+}
 
 exports.MQTTReconnect = MQTTReconnect;
 exports.MqttProvider = MqttProvider;

package/client.esm.js

@@ -165,7 +165,7 @@ function MqttTopic({
       }
     });
     const handler = (msgTopic, message) => {
-      if (msgTopic !== topic) return;
+      if (!isTopicMatch(topic, msgTopic)) return;
       try {
         const payload = JSON.parse(message.toString());
         onChange === null || onChange === void 0 ? void 0 : onChange(payload);
@@ -187,5 +187,23 @@ function MqttTopic({
   }, [mqttClient, onChange, qos, topic]);
   return null;
 }
+function isTopicMatch(filter, topic) {
+  const filterParts = filter.split('/');
+  const topicParts = topic.split('/');
+  for (let i = 0; i < filterParts.length; i++) {
+    const filterPart = filterParts[i];
+    const topicPart = topicParts[i];
+    if (filterPart === '#') {
+      return true;
+    }
+    if (filterPart === '+') {
+      continue;
+    }
+    if (filterPart !== topicPart) {
+      return false;
+    }
+  }
+  return filterParts.length === topicParts.length;
+}
 
 export { MQTTReconnect, MqttProvider, MqttTopic, useMqtt };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vita-mojo/mqtt",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "peerDependencies": {
     "axios": "*",
     "react": "*"