u8-mqtt 0.6.5 → 0.6.7

package/esm/node/full-v5.mjs

@@ -871,7 +871,7 @@ function parse(input, loose) {
 
 	return {
 		keys: keys,
-		pattern: new RegExp('^' + pattern + (loose ? '(?=$|\/)' : '\/?$'), 'i')
+		pattern: new RegExp('^' + pattern + ('\/?$'), 'i')
 	};
 }
 
@@ -897,6 +897,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)
@@ -936,6 +937,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
@@ -1004,6 +1007,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
@@ -1047,21 +1061,21 @@ function * _routes_iter(all_route_lists, topic) {
 
 
 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
-      let skip = route === query;
-      if (!skip && route.topic === query.topic)
-        skip = (null == query.tgt) || (route.tgt === query.tgt);
+      if (route.topic === query.topic) {
+        if (null == query.tgt || route.tgt === query.tgt) {
+          // skip matching routes to remove from compacted list
+          n_removed++;
+          continue} }
 
-      if (!skip) lst[idx_tip++] = route;}
+      lst[idx_tip++] = route;}
 
     // truncate remaining list
     lst.length = idx_tip;}
-
-  return ans}
+  return n_removed}
 
 function decode_varint(u8, i0=0, invalid) {
   let shift=0, i=i0, b=u8[i++], n=(b & 0x7f);
@@ -1271,8 +1285,9 @@ class MQTTBase {
     return this.conn.on_conn(pkt, response)}
 
   async disconnect(pkt={}) {
-    let response = await this._send0('disconnect', pkt);
-    return this.conn.on_dis(pkt, response)}
+    let response = this._send0('disconnect', pkt);
+    await this.conn.on_dis(pkt, response);
+    return await response}
 
   async auth(pkt={}) {
     let response = await this._send0('auth', pkt, 'auth');
@@ -1437,11 +1452,12 @@ function _mqtt_conn(opt, client, [on_mqtt, pkt_future]) {
         _dfn_send0.e(err); }// send error to uses of _send0 (connect, auth)
       _abort.e(err); // abort in-progress connections
 
-      delete conn.is_set;
-      conn.ready = handshake();
-      client.conn_emit('on_disconnect', false===err, err);}
+      if (conn.is_set) {
+        delete conn.is_set;
+        conn.ready = handshake();
+        client.conn_emit('on_disconnect', false===err, err);} }
 
-  , abort() {
+  , abort(err) {
       _dfn_ready.e(err); // abort all messages awaiting ready state
       return conn.reset(err)}
 
@@ -1555,7 +1571,7 @@ class MQTTCore extends MQTTBase {
 
   // on_ready(client) ::
   // on_reconnect(client) ::
-  on_disconnect(client, intentional) {
+  on_disconnect(client, intentional, err) {
     if (! intentional) {
       return client.on_reconnect?.()} }
 
@@ -1565,12 +1581,12 @@ class MQTTCore extends MQTTBase {
     if (opt.toFixed) {opt ={delay: opt};}
     return this.with({
       on_reconnect() {
-        this.delay(opt.delay || 2000)
+        this.delay(opt.delay || 2000, opt.jitter)
           .then(this.reconnect)
           .then(opt.reconnect, opt.error);} }) }
 
-  delay(ms) {
-    return new Promise(done => setTimeout(done, ms)) }
+  delay(ms, ms_jitter=0.2*ms) {
+    return new Promise(done => setTimeout(done, 0 | (ms + ms_jitter*Math.random()))) }
 
   with_async_iter(async_iter, write_u8_pkt) {
     this.conn.setup(async_iter,
@@ -1666,6 +1682,9 @@ class MQTTCore extends MQTTBase {
         websock.onmessage = evt =>(
           on_mqtt_chunk(new Uint8Array(evt.data)) );
 
+        websock.onerror = evt => {
+          conn.reset(new Error('websocket error'));};
+
         websock.onclose = evt => {
           if (! evt.wasClean) {
             var err = new Error('websocket close');
@@ -1676,7 +1695,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.5-node';
+const version = '0.6.7-node';
 
 const MQTTClient_v4 = /* #__PURE__ */
   with_topic_path_router(