fix(desktop): improve MQTT wildcard topic matching for '#'

emqx · Aug 28, 2024 · 5632e97 · 5632e97
1 parent 29aaa8d
commit 5632e97
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/database/services/MessageService.ts b/src/database/services/MessageService.ts
@@ -63,7 +63,7 @@ export default class MessageService {
     if (topic && topic !== '#') {
       topic = topic.replace(/[\\%_]/g, '\\$&')
       if (topic.startsWith('$share/')) topic = topic.split('/').slice(2).join('/')
-      if (topic.includes('#')) topic = topic.replace('/#', '%')
+      if (topic.includes('#') && topic.endsWith('/#')) topic = topic.replace('#', '%')
       /*
         Known Issue: '+' wildcard handling in MQTT topics is incorrect.
         '+' is replaced with '%' for SQL LIKE, causing multi-level match.
@@ -127,7 +127,7 @@ export default class MessageService {
     if (topic && topic !== '#') {
       topic = topic.replace(/[\\%_]/g, '\\$&')
       if (topic.startsWith('$share/')) topic = topic.split('/').slice(2).join('/')
-      if (topic.includes('#')) topic = topic.replace('/#', '%')
+      if (topic.includes('#') && topic.endsWith('/#')) topic = topic.replace('#', '%')
       if (topic.includes('+')) topic = topic.replace('+', '%')
       query.andWhere('msg.topic LIKE :topic ESCAPE "\\"', { topic })
     }