u8-mqtt 0.6.3 → 0.6.4

package/code/router_path.jsy

@@ -45,34 +45,38 @@ function mqtt_topic_path_router() ::
         if fn :: throw new TypeError()
         fn = _ignore
 
-      let rte = _rxp_parse @ as_topic_path @ topic_route
-
-      rte.key = topic_route
-      rte.tgt = fn
-      pri_lsts[priority ? 0 : 1].push(rte)
+      let route = _rxp_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 ::
@@ -82,26 +86,33 @@ function mqtt_topic_path_router() ::
 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)
+    for let route of route_list ::
+      let match = route.pattern.exec(topic)
       if match ::
-        let params = keys
-          ? keys.reduce @
+        let params = route.keys
+          ? route.keys.reduce @
               (o, k, i) => (o[k] = match[1+i], o)
               {}
           : match.groups ?? match
-        yield [tgt, params]
+        yield [route.tgt, params, 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
+      if (route === query) continue
+      if (route.topic === query.topic) ::
+        if (null == query.tgt) continue
+        if (route.tgt === query.tgt) continue
+
+      lst[idx_tip++] = route
+
+    // truncate remaining list
+    if (lst.splice(idx_tip).length)
+      ans = true
+
+  return ans
 

package/code/with_topic_router.jsy

@@ -39,7 +39,10 @@ export 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
 

package/esm/basic-v4.js

@@ -1102,7 +1102,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.3';
+const version = '0.6.4';
 
 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.3';
+const version = '0.6.4';
 
 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.3-deno';
+const version = '0.6.4-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.3-deno';
+const version = '0.6.4-deno';
 
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v5);

package/esm/deno/full-v4.js

@@ -731,7 +731,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
 
@@ -784,34 +787,38 @@ 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) {
@@ -821,28 +828,35 @@ function mqtt_topic_path_router() {
 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);
+    for (let route of route_list) {
+      let match = route.pattern.exec(topic);
       if (match) {
-        let params = keys
-          ? keys.reduce(
+        let params = route.keys
+          ? route.keys.reduce(
               (o, k, i) => (o[k] = match[1+i], o)
             , {})
           : match.groups ?? match;
-        yield [tgt, params];} } } }
+        yield [route.tgt, params, 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
+      if (route === query) continue
+      if (route.topic === query.topic) {
+        if (null == query.tgt) continue
+        if (route.tgt === query.tgt) continue}
+
+      lst[idx_tip++] = route;}
+
+    // truncate remaining list
+    if (lst.splice(idx_tip).length)
+      ans = true;}
+
+  return ans}
 
 function decode_varint(u8, i0=0, invalid) {
   let shift=0, i=i0, b=u8[i++], n=(b & 0x7f);
@@ -1457,7 +1471,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.3-deno';
+const version = '0.6.4-deno';
 
 const MQTTClient_v4 = /* #__PURE__ */
   with_topic_path_router(