u8-mqtt 0.6.4 → 0.6.6

package/code/router_path.jsy

@@ -60,6 +60,17 @@ function mqtt_topic_path_router() ::
         query = @{} topic: query, tgt: args.pop()
       return _route_remove(lst, query)
 
+    count(topic_route) ::
+      if ! topic_route ::
+        return pri_lsts.reduce((r,l) => r+l.length, 0)
+
+      let count = 0
+      for let lst of pri_lsts ::
+        for let route of lst ::
+          if topic_route === route.topic ::
+            count++
+      return count
+
     clear(priority) ::
       if null == priority ::
         pri_lsts = [[],[]] // null clears both lists
@@ -83,36 +94,38 @@ function mqtt_topic_path_router() ::
         await ctx.mqtt.puback(pkt)
 
 
+const _regexparam = @{}
+  get wild() :: return this['*']
+  set wild(v) :: return this['*']=wild
+
 function * _routes_iter(all_route_lists, topic) ::
   topic = topic.replace(/^[\/]*/, '/') // ensure '/' prefix for regexparam library
-  for let route_list of all_route_lists ::
-    for let route of route_list ::
-      let match = route.pattern.exec(topic)
-      if match ::
-        let params = route.keys
-          ? route.keys.reduce @
-              (o, k, i) => (o[k] = match[1+i], o)
-              {}
-          : match.groups ?? match
+  for let route of all_route_lists.flat() ::
+    let match = route?.pattern.exec(topic)
+    if match ::
+      let keys = route.keys
+      if (keys) ::
+        let k, i=0, params={__proto__:_regexparam}
+        for (k of keys) ::
+          params[k] = match[++i]
         yield [route.tgt, params, route]
+      else ::
+        yield [route.tgt, match.groups ?? match, route]
 
 
 function _route_remove(all_route_lists, query) ::
-  let ans = false
+  let n_removed = 0
   for let lst of all_route_lists ::
     let idx_tip = 0
-    for (let route of lst) ::
-      // skip matching routes to remove from compacted list
-      if (route === query) continue
-      if (route.topic === query.topic) ::
-        if (null == query.tgt) continue
-        if (route.tgt === query.tgt) continue
+    for let route of lst ::
+      if route.topic === query.topic ::
+        if null == query.tgt || route.tgt === query.tgt ::
+          // skip matching routes to remove from compacted list
+          n_removed++
+          continue
 
       lst[idx_tip++] = route
 
     // truncate remaining list
-    if (lst.splice(idx_tip).length)
-      ans = true
-
-  return ans
-
+    lst.length = idx_tip
+  return n_removed

package/code/with_topic_router.jsy

@@ -3,6 +3,7 @@ class AbstractTopicRouter ::
   async invoke(pkt, ctx) ::
   add(topic_route, ...args) ::
   remove(topic_route, priority) ::
+  count(topic_route) ::
   clear(priority) ::
   find(topic) :: // optional
   mqtt_topic(topic_route)
@@ -42,6 +43,8 @@ export const with_topic_router = mqtt_topic_router =>
 
       let fn = args.at(-1)?.call ? args.pop() : null
       router.remove @ topic_route, true, fn
+      if 0 !== router.count @ topic_route ::
+        return null
 
       let topic = router.mqtt_topic(topic_route)
       return this.unsubscribe @ topic, ...args // topic_prefix

package/esm/basic-v4.js

@@ -1102,7 +1102,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.4';
+const version = '0.6.6';
 
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v4);

package/esm/basic-v5.js

@@ -1296,7 +1296,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.4';
+const version = '0.6.6';
 
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v5);

package/esm/deno/basic-v4.js

@@ -1102,7 +1102,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.4-deno';
+const version = '0.6.6-deno';
 
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v4);

package/esm/deno/basic-v5.js

@@ -1296,7 +1296,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.4-deno';
+const version = '0.6.6-deno';
 
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v5);

package/esm/deno/full-v4.js

@@ -646,16 +646,20 @@ const mqtt_opts_v4 =
     encode_fns: mqtt_encode_v4,
     mqtt_writer: mqtt_writer_v4, };
 
-function parse(str, loose) {
-	if (str instanceof RegExp) return { keys:false, pattern:str };
-	var c, o, tmp, ext, keys=[], pattern='', arr = str.split('/');
+/**
+ * @param {string|RegExp} input The route pattern
+ * @param {boolean} [loose] Allow open-ended matching. Ignored with `RegExp` input.
+ */
+function parse(input, loose) {
+	if (input instanceof RegExp) return { keys:false, pattern:input };
+	var c, o, tmp, ext, keys=[], pattern='', arr = input.split('/');
 	arr[0] || arr.shift();
 
 	while (tmp = arr.shift()) {
 		c = tmp[0];
 		if (c === '*') {
-			keys.push('wild');
-			pattern += '/(.*)';
+			keys.push(c);
+			pattern += tmp[1] === '?' ? '(?:/(.*))?' : '/(.*)';
 		} else if (c === ':') {
 			o = tmp.indexOf('?', 1);
 			ext = tmp.indexOf('.', 1);
@@ -695,6 +699,7 @@ class AbstractTopicRouter ::
   async invoke(pkt, ctx) ::
   add(topic_route, ...args) ::
   remove(topic_route, priority) ::
+  count(topic_route) ::
   clear(priority) ::
   find(topic) :: // optional
   mqtt_topic(topic_route)
@@ -734,6 +739,8 @@ const with_topic_router = mqtt_topic_router =>
 
       let fn = args.at(-1)?.call ? args.pop() : null;
       router.remove(topic_route, true, fn);
+      if (0 !== router.count(topic_route) ) {
+        return null}
 
       let topic = router.mqtt_topic(topic_route);
       return this.unsubscribe(topic, ...args ) }// topic_prefix
@@ -802,6 +809,17 @@ function mqtt_topic_path_router() {
         query ={topic: query, tgt: args.pop()}; }
       return _route_remove(lst, query)}
 
+  , count(topic_route) {
+      if (! topic_route) {
+        return pri_lsts.reduce((r,l) => r+l.length, 0)}
+
+      let count = 0;
+      for (let lst of pri_lsts) {
+        for (let route of lst) {
+          if (topic_route === route.topic) {
+            count++;} } }
+      return count}
+
   , clear(priority) {
       if (null == priority) {
         pri_lsts = [[],[]]; }// null clears both lists
@@ -825,38 +843,41 @@ function mqtt_topic_path_router() {
         await ctx.mqtt.puback(pkt);} } } }
 
 
+const _regexparam ={
+  get wild() {return this['*']}
+, set wild(v) {return this['*']=wild} };
+
 function * _routes_iter(all_route_lists, topic) {
   topic = topic.replace(/^[\/]*/, '/'); // ensure '/' prefix for regexparam library
-  for (let route_list of all_route_lists) {
-    for (let route of route_list) {
-      let match = route.pattern.exec(topic);
-      if (match) {
-        let params = route.keys
-          ? route.keys.reduce(
-              (o, k, i) => (o[k] = match[1+i], o)
-            , {})
-          : match.groups ?? match;
-        yield [route.tgt, params, route];} } } }
+  for (let route of all_route_lists.flat()) {
+    let match = route?.pattern.exec(topic);
+    if (match) {
+      let keys = route.keys;
+      if (keys) {
+        let k, i=0, params={__proto__:_regexparam};
+        for (k of keys) {
+          params[k] = match[++i];}
+        yield [route.tgt, params, route];}
+      else {
+        yield [route.tgt, match.groups ?? match, route];} } } }
 
 
 function _route_remove(all_route_lists, query) {
-  let ans = false;
+  let n_removed = 0;
   for (let lst of all_route_lists) {
     let idx_tip = 0;
     for (let route of lst) {
-      // skip matching routes to remove from compacted list
-      if (route === query) continue
       if (route.topic === query.topic) {
-        if (null == query.tgt) continue
-        if (route.tgt === query.tgt) continue}
+        if (null == query.tgt || route.tgt === query.tgt) {
+          // skip matching routes to remove from compacted list
+          n_removed++;
+          continue} }
 
       lst[idx_tip++] = route;}
 
     // truncate remaining list
-    if (lst.splice(idx_tip).length)
-      ans = true;}
-
-  return ans}
+    lst.length = idx_tip;}
+  return n_removed}
 
 function decode_varint(u8, i0=0, invalid) {
   let shift=0, i=i0, b=u8[i++], n=(b & 0x7f);
@@ -1471,7 +1492,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.4-deno';
+const version = '0.6.6-deno';
 
 const MQTTClient_v4 = /* #__PURE__ */
   with_topic_path_router(