u8-mqtt 0.6.3 → 0.6.5

package/cjs/v5.cjs

@@ -673,16 +673,20 @@ const mqtt_opts_v5 =
     encode_fns: mqtt_encode_v5,
     mqtt_writer: mqtt_writer_v5, };
 
-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);
@@ -758,7 +762,10 @@ const with_topic_router = mqtt_topic_router =>
     // alias: unsub_topic
     unsubscribe_topic(topic_route, ...args) {
       let router = this.router;
-      router.remove(topic_route, true);
+
+      let fn = args.at(-1)?.call ? args.pop() : null;
+      router.remove(topic_route, true, fn);
+
       let topic = router.mqtt_topic(topic_route);
       return this.unsubscribe(topic, ...args ) }// topic_prefix
 
@@ -811,65 +818,79 @@ function mqtt_topic_path_router() {
         if (fn) {throw new TypeError()}
         fn = _ignore;}
 
-      let rte = parse(as_topic_path(topic_route));
-
-      rte.key = topic_route;
-      rte.tgt = fn;
-      pri_lsts[priority ? 0 : 1].push(rte);
+      let route = parse(as_topic_path(topic_route));
+      route.topic = topic_route;
+      route.tgt = fn;
+      pri_lsts[priority ? 0 : 1].push(route);
       return this}
 
-  , remove(topic_route, priority) {
-      let lst = pri_lsts[priority ? 0 : 1];
-      return _route_remove([lst], topic_route)}
+  , remove(query, ...args) {
+      let lst = pri_lsts;
+      if ('boolean' === typeof args[0]) {
+        lst = [pri_lsts[args.shift() ? 0 : 1]];}
+
+      if ('string' === typeof query) {
+        query ={topic: query, tgt: args.pop()}; }
+      return _route_remove(lst, query)}
 
   , clear(priority) {
-      pri_lsts[priority ? 0 : 1] = [];
       if (null == priority) {
-        pri_lsts[1] = []; } }// null clears both lists
+        pri_lsts = [[],[]]; }// null clears both lists
+      else {
+        pri_lsts[priority ? 0 : 1] = [];} }
 
   , async invoke(pkt, ctx) {
       ctx.idx = 0;
       ctx.rm = rm;
 
-      for (let [fn, params] of find(pkt.topic)) {
+      for (let [fn, params, route] of find(pkt.topic)) {
         let res = await fn(pkt, params, ctx);
 
         if (rm === res) {
-          _route_remove(pri_lsts, fn);}
+          _route_remove(pri_lsts, route);}
 
-        if (ctx.done) {
-          break}
+        if (ctx.done) {break}
         else ctx.idx++;}
 
       if (1 === pkt.qos) {
         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 {keys, pattern, tgt} of route_list) {
-      let match = pattern.exec(topic);
-      if (match) {
-        let params = keys
-          ? keys.reduce(
-              (o, k, i) => (o[k] = match[1+i], o)
-            , {})
-          : match.groups ?? match;
-        yield [tgt, params];} } } }
+  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 fn_match = route =>(
-    route===query
-    || route.tgt===query
-    || route.key===query);
+  let ans = false;
   for (let lst of all_route_lists) {
-    let i = lst.findIndex(fn_match);
-    if (0 <= i) {
-      lst.splice(i,1);
-      return true} }
-  return false}
+    let idx_tip = 0;
+    for (let route of lst) {
+      // skip matching routes to remove from compacted list
+      let skip = route === query;
+      if (!skip && route.topic === query.topic)
+        skip = (null == query.tgt) || (route.tgt === query.tgt);
+
+      if (!skip) lst[idx_tip++] = route;}
+
+    // truncate remaining list
+    lst.length = idx_tip;}
+
+  return ans}
 
 function decode_varint(u8, i0=0, invalid) {
   let shift=0, i=i0, b=u8[i++], n=(b & 0x7f);
@@ -1484,7 +1505,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.3-node';
+const version = '0.6.5-node';
 
 const MQTTClient_v4 = /* #__PURE__ */
   with_topic_path_router(