regex subscribe, qos2

MichaelDvP · Jan 9, 2024 · fcf9f83 · fcf9f83
1 parent 36f2a68
commit fcf9f83
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -42,28 +42,28 @@ function convertID2topic(id, pattern, prefix, namespace, removePrefix) {
  */
 function pattern2RegEx(pattern, adapter) {
     pattern = convertTopic2id(pattern, true, adapter.config.prefix, adapter.namespace);
-    pattern = pattern.replace(/#/g, '*');
+    if (pattern === '#') {
+        return '.*';
+    }
+    if (pattern === '+') {
+        return '[^.]*';
+    }
     pattern = pattern.replace(/\$/g, '\\$');
     pattern = pattern.replace(/\^/g, '\\^');
-
-    if (pattern !== '*') {
-        if (pattern[0] === '*' && pattern[pattern.length - 1] !== '*') {
-            pattern += '$';
-        }
-        if (pattern[0] !== '*' && pattern[pattern.length - 1] === '*') {
-            pattern = `^${pattern}`;
-        }
-        if (pattern[0] === '+') {
-            pattern = `^[^.]*${pattern.substring(1)}`;
-        }
-        if (pattern[pattern.length - 1] === '+') {
-            pattern = `${pattern.substring(0, pattern.length - 1)}[^.]*$`;
-        }
-    } else {
-        return '.*';
+    if (pattern.length > 2 && (
+        (pattern[0] === '#' && pattern[1] !== '.') ||
+        (pattern[0] === '+' && pattern[1] !== '.') ||
+        (pattern[pattern.length - 1] === '#' && pattern[pattern.length - 2] !== '.') ||
+        (pattern[pattern.length - 1] === '+' && pattern[pattern.length - 2] !== '.'))) {
+        return '';
     }
+    pattern = '^' + pattern + '$';
+    pattern = pattern.replace(/#/g, '*');
     pattern = pattern.replace(/\./g, '\\.');
-    pattern = pattern.replace(/\\\.\*/g, '\\..*');
+    if (pattern[1] === '*') {
+        pattern = '^.' + pattern.substring(1);
+    }
+    pattern = pattern.replace(/\\\.\*/g, '(\\..*)?');
     pattern = pattern.replace(/\+/g, '[^.]*');
     return pattern;
 }

diff --git a/lib/server.js b/lib/server.js
@@ -1219,7 +1219,7 @@ function MQTTServer(adapter, states) {
                                 message.dup = true;
                                 clients[clientId].publish(message);
                             } else if (message.cmd === 'pubrel') {
-                                clients[clientId].pubrec({
+                                clients[clientId].pubrel({
                                     messageId: message.messageId
                                 });
                             }