u8-mqtt 0.6.2 → 0.6.4

package/esm/v5.js

@@ -1,39 +1,18 @@
 function encode_varint(n, a=[]) {
-  do {
-    const ni = n & 0x7f;
-    n >>>= 7;
-    a.push( ni | (0===n ? 0 : 0x80) );
-  } while (n > 0)
+  a.push((n<0x80 ? 0 : 0x80) | (n & 0x7f));
+  for(; ( n>>>=7 ) > 0 ;)
+    a.push((n<0x80 ? 0 : 0x80) | (n & 0x7f));
   return a
 }
 
+function decode_varint$1(u8, i0=0, invalid) {
+  let shift=0, i=i0, b=u8[i++], n=(b & 0x7f);
+  for(; b & 0x80;)
+    n |= ((b=u8[i++]) & 0x7f) << (shift += 7);
 
-/*
-export function decode_varint_loop(u8, i=0) {
-  let i0 = i
-  let shift = 0, n = (u8[i] & 0x7f)
-  while ( 0x80 & u8[i++] )
-    n |= (u8[i] & 0x7f) << (shift += 7)
-
-  return [n, i, i0]
-}
-*/
-
-
-function decode_varint$1(u8, i=0) {
-  let i0 = i;
-  // unrolled for a max of 4 chains
-  let n = (u8[i] & 0x7f) <<  0;
-  if ( 0x80 & u8[i++] ) {
-    n |= (u8[i] & 0x7f) <<  7;
-    if ( 0x80 & u8[i++] ) {
-      n |= (u8[i] & 0x7f) << 14;
-      if ( 0x80 & u8[i++] ) {
-        n |= (u8[i] & 0x7f) << 21;
-      }
-    }
-  }
-  return [n, i, i0]
+  return (u8.length < i)
+    ? [invalid, i0, i0] // fail: insuffecient u8 bytes to decode
+    : [n, i, i0] // successful value
 }
 
 function add_mqtt_props(mqtt_props, entries) {
@@ -80,19 +59,18 @@ const init_mqtt_props = () =>
 const mqtt_props = /* #__PURE__ */
   init_mqtt_props();
 
-class U8_Reason extends Number {
-  static of(v, pkt_kind, by_kind) {
-    let self = new this(v);
-    self.reason = by_kind?.[pkt_kind]?.get(v) || pkt_kind;
-    return self
+class mqtt_reason extends Number {
+  constructor(v, reason) {
+    super(v);
+    this.reason = `:${(this.ok = v<0x80) ? 'ok' : 'fail'}:${reason}`;
   }
 }
 
 class mqtt_reader_v4 {
-  static of(buf) { return this.prototype.of(buf) }
-  of(buf) {
+  static for(pkt, u8_body) { return new this().of(u8_body, {pkt}) }
+  of(buf, opt) {
     let step = (width, k) => (k=0|step.k, step.k=k+width, k);
-    return {__proto__: this, buf, step}
+    return {__proto__: this, buf, step, ...opt}
   }
 
   has_more() {
@@ -135,7 +113,7 @@ class mqtt_reader_v4 {
   reason(pkt_kind) {
     let v = this.buf[this.step(1)];
     if (null != v)
-      return U8_Reason.of(v, pkt_kind, this._reasons_by)
+      return new mqtt_reason(v, this._reason_for?.(v, pkt_kind))
   }
 
   flush() {
@@ -149,7 +127,7 @@ class mqtt_reader_v4 {
 let mqtt_reader_v5$1 = class mqtt_reader_v5 extends mqtt_reader_v4 {
   props() {
     let {buf, step} = this;
-    let [n, vi, vi0] = decode_varint$1(buf, step.k|0);
+    let [n, vi, vi0] = decode_varint$1(buf, step.k|0, 0);
     step(n + vi - vi0);
     if (0 === n) return null
 
@@ -158,7 +136,7 @@ let mqtt_reader_v5$1 = class mqtt_reader_v5 extends mqtt_reader_v4 {
       let v, pk = fork.u8(), pt = mqtt_props.get( pk );
       if (!pt) {
         res._unknown_ = pk;
-        this.warn(`unknown property: ${pk}`);
+        this.warn?.(`unknown property: ${pk}`);
         break
       }
 
@@ -178,8 +156,6 @@ let mqtt_reader_v5$1 = class mqtt_reader_v5 extends mqtt_reader_v4 {
     return vec
   }
 
-  warn(msg) { console.warn('[u8-mqtt-packet] '+msg); }
-
   /*
   vbuf() {
     let {buf, step} = this
@@ -191,28 +167,99 @@ let mqtt_reader_v5$1 = class mqtt_reader_v5 extends mqtt_reader_v4 {
   */
 };
 
-function mqtt_reader_info(mqtt_reader, ... info_fn_list) {
-  mqtt_reader = class extends mqtt_reader {
-    static reasons(pkt_type, ...reason_entries) {
-      let proto = this.prototype;
-      proto._reasons_by = {... proto._reasons_by};
-
-      let lut = (proto._reasons_by[pkt_type] ||= new Map());
-      for (let [u8, reason] of reason_entries)
-        lut.set( u8, reason );
+function with_reasons(mqtt_reader, by_kind) {
+  for (let [k,lut] of Object.entries(by_kind))
+    by_kind[k] = new Map(lut);
 
-      return this
+  return class extends mqtt_reader {
+    _reason_for(v, pkt_kind) {
+      return by_kind[pkt_kind]?.get(v) || by_kind.all.get(v)
     }
-  };
+    warn(msg) {
+      let pkt = this.pkt;
+      pkt.warn ? pkt.warn(msg, pkt)
+        : console.warn('[u8-mqtt-packet] '+msg);
+    }
+  }
+}
 
-  for (let fn_info of info_fn_list)
-    fn_info(mqtt_reader);
 
-  return mqtt_reader
-}
+const reasons_v4 =  {
+  connack: [
+    [ 0x01, 'conn refused: unacceptable protocol version'],
+    [ 0x02, 'conn refused: identifier rejected'],
+    [ 0x03, 'conn refused: server unavailable'],
+    [ 0x04, 'conn refused: bad user name or password'],
+    [ 0x05, 'conn refused: not authorized'],
+  ],
+  suback: [
+    [ 0x00, 'qos=0'],
+    [ 0x01, 'qos=1'],
+    [ 0x02, 'qos=2'],
+  ],
+  unsuback: [
+    [ 0x11, 'no subscription existed'],
+  ],
+  puback: [
+    [ 0x10, 'no matching subscribers'],
+  ],
+  all: [
+    [ 0, ''], // Success
+    [ 0x80, 'unspecified error'], // disconnect puback suback unsuback
+    [ 0x83, 'implementation specific error'], // connack disconnect puback suback unsuback
+    [ 0x87, 'not authorized'], // connack disconnect puback suback unsuback
+    [ 0x8F, 'topic filter invalid'], // disconnect suback unsuback
+    [ 0x91, 'packet identifier in use'], // puback suback unsuback
+    [ 0x92, 'packet identifier not found' ], // pubxxx
+  ]};
+
+const reasons_v5 =  {
+  ... reasons_v4,
+  auth: [
+    [ 0x18, 'continue authentication' ],
+    [ 0x19, 're-authenticate' ],
+  ],
+  disconnect: [
+    [ 0x04, 'disconnect with will message'],
+  ],
+  all: [
+    ... reasons_v4.all,
+    [ 0x81, 'malformed packet'], // connack disconnect
+    [ 0x82, 'protocol error'], // connack disconnect
+    [ 0x84, 'unsupported protocol version'], // connack
+    [ 0x85, 'client identifier not valid'], // connack
+    [ 0x86, 'bad user name or password'], // connack
+    [ 0x88, 'server unavailable'], // connack
+    [ 0x89, 'server busy'], // connack disconnect
+    [ 0x8A, 'banned'], // connack
+    [ 0x8B, 'server shutting down'], // disconnect
+    [ 0x8C, 'bad authentication method'], // connack
+    [ 0x8D, 'keep alive timeout'], // disconnect
+    [ 0x8E, 'session taken over'], // disconnect
+    [ 0x90, 'topic name invalid'], // connack disconnect puback
+    [ 0x93, 'receive maximum exceeded'], // disconnect
+    [ 0x94, 'topic alias invalid'], // disconnect
+    [ 0x95, 'packet too large'], // connack disconnect
+    [ 0x96, 'message rate too high'], // disconnect
+    [ 0x97, 'quota exceeded'], // connack disconnect puback suback
+    [ 0x98, 'administrative action'], // disconnect
+    [ 0x99, 'payload format invalid'], // connack disconnect puback
+    [ 0x9A, 'retain not supported'], // connack disconnect
+    [ 0x9B, 'qoS not supported'], // connack disconnect
+    [ 0x9C, 'use another server'], // connack disconnect
+    [ 0x9D, 'server moved'], // connack disconnect
+    [ 0x9E, 'shared subscriptions not supported'], // disconnect suback
+    [ 0x9F, 'connection rate exceeded'], // connack disconnect
+    [ 0xA0, 'maximum connect time'], // disconnect
+    [ 0xA1, 'subscription identifiers not supported'], // disconnect suback
+    [ 0xA2, 'wildcard subscriptions not supported'], // disconnect suback
+  ]};
+
+const mqtt_reader_v5 = /* #__PURE__ */
+  with_reasons(mqtt_reader_v5$1, reasons_v5);
 
 class mqtt_writer_v4 {
-  static of() { return this.prototype.of() }
+  static for(pkt) { return new this().of() }
   of() { return {__proto__: this, $:[]} }
 
   static init() { return this }
@@ -326,245 +373,6 @@ class mqtt_writer_v5 extends mqtt_writer_v4 {
   }
 }
 
-function mqtt_decode_connack(ns, mqtt_reader) {
-  class _connack_flags_ extends Number {
-    get session_present() { return this & 0x01 !== 0 }
-  }
-
-  return ns[0x2] = (pkt, u8_body) => {
-    let rdr = mqtt_reader.of(u8_body);
-
-    pkt.flags =
-      rdr.flags(_connack_flags_);
-
-    pkt.reason = rdr.reason(pkt.type);
-    if (5 <= pkt.mqtt_level)
-      pkt.props = rdr.props();
-    return pkt }
-}
-
-
-function _connack_v4(mqtt_reader) {
-  mqtt_reader.reasons('connack',
-    // MQTT 3.1.1
-    [ 0x00, 'Success'],
-    [ 0x01, 'Connection refused, unacceptable protocol version'],
-    [ 0x02, 'Connection refused, identifier rejected'],
-    [ 0x03, 'Connection refused, server unavailable'],
-    [ 0x04, 'Connection refused, bad user name or password'],
-    [ 0x05, 'Connection refused, not authorized'],
-  );
-}
-
-function _connack_v5(mqtt_reader) {
-  _connack_v4(mqtt_reader);
-
-  mqtt_reader.reasons('connack',
-    // MQTT 5.0
-    [ 0x81, 'Malformed Packet'],
-    [ 0x82, 'Protocol Error'],
-    [ 0x83, 'Implementation specific error'],
-    [ 0x84, 'Unsupported Protocol Version'],
-    [ 0x85, 'Client Identifier not valid'],
-    [ 0x86, 'Bad User Name or Password'],
-    [ 0x87, 'Not authorized'],
-    [ 0x88, 'Server unavailable'],
-    [ 0x89, 'Server busy'],
-    [ 0x8A, 'Banned'],
-    [ 0x8C, 'Bad authentication method'],
-    [ 0x90, 'Topic Name invalid'],
-    [ 0x95, 'Packet too large'],
-    [ 0x97, 'Quota exceeded'],
-    [ 0x99, 'Payload format invalid'],
-    [ 0x9A, 'Retain not supported'],
-    [ 0x9B, 'QoS not supported'],
-    [ 0x9C, 'Use another server'],
-    [ 0x9D, 'Server moved'],
-    [ 0x9F, 'Connection rate exceeded'],
-  );
-}
-
-function mqtt_decode_publish(ns, mqtt_reader) {
-  return ns[0x3] = (pkt, u8_body) => {
-    let {hdr} = pkt;
-    pkt.dup = Boolean(hdr & 0x8);
-    pkt.retain = Boolean(hdr & 0x1);
-    let qos = pkt.qos = (hdr>>1) & 0x3;
-
-    let rdr = mqtt_reader.of(u8_body);
-    pkt.topic = rdr.utf8();
-    if (0 !== qos)
-      pkt.pkt_id = rdr.u16();
-
-    if (5 <= pkt.mqtt_level)
-      pkt.props = rdr.props();
-
-    pkt.payload = rdr.flush();
-    return pkt }
-}
-
-function mqtt_decode_puback(ns, mqtt_reader) {
-  return ns[0x4] = (pkt, u8_body) => {
-    let rdr = mqtt_reader.of(u8_body);
-
-    pkt.pkt_id = rdr.u16();
-    if (5 <= pkt.mqtt_level) {
-      pkt.reason = rdr.reason(pkt.type);
-      pkt.props = rdr.props();
-    }
-
-    return pkt }
-}
-
-
-function _puback_v5(mqtt_reader) {
-  mqtt_reader.reasons('puback',
-    // MQTT 5.0
-    [ 0x00, 'Success'],
-    [ 0x10, 'No matching subscribers'],
-    [ 0x80, 'Unspecified error'],
-    [ 0x83, 'Implementation specific error'],
-    [ 0x87, 'Not authorized'],
-    [ 0x90, 'Topic Name invalid'],
-    [ 0x91, 'Packet identifier in use'],
-    [ 0x97, 'Quota exceeded'],
-    [ 0x99, 'Payload format invalid'],
-  );
-}
-
-function _mqtt_decode_suback(mqtt_reader) {
-  return (pkt, u8_body) => {
-    let rdr = mqtt_reader.of(u8_body);
-
-    pkt.pkt_id = rdr.u16();
-    if (5 <= pkt.mqtt_level)
-      pkt.props = rdr.props();
-
-    let answers = pkt.answers = [];
-    while (rdr.has_more())
-      answers.push(
-        rdr.reason(pkt.type) );
-
-    return pkt }
-}
-
-function mqtt_decode_suback(ns, mqtt_reader) {
-  return ns[0x9] = _mqtt_decode_suback(mqtt_reader)
-}
-
-function _suback_v4(mqtt_reader) {
-  mqtt_reader.reasons('suback',
-    // MQTT 3.1.1
-    [ 0x00, 'Granted QoS 0'],
-    [ 0x01, 'Granted QoS 1'],
-    [ 0x02, 'Granted QoS 2'],
-  );
-}
-
-function _suback_v5(mqtt_reader) {
-  _suback_v4(mqtt_reader);
-
-  mqtt_reader.reasons('suback',
-    // MQTT 5.0
-    [ 0x80, 'Unspecified error'],
-    [ 0x83, 'Implementation specific error'],
-    [ 0x87, 'Not authorized'],
-    [ 0x8F, 'Topic Filter invalid'],
-    [ 0x91, 'Packet Identifier in use'],
-    [ 0x97, 'Quota exceeded'],
-    [ 0x9E, 'Shared Subscriptions not supported'],
-    [ 0xA1, 'Subscription Identifiers not supported'],
-    [ 0xA2, 'Wildcard Subscriptions not supported'],
-  );
-}
-
-function mqtt_decode_unsuback(ns, mqtt_reader) {
-  return ns[0xb] = _mqtt_decode_suback(mqtt_reader)
-}
-
-function _unsuback_v4(mqtt_reader) {
-  mqtt_reader.reasons('unsuback',
-    // MQTT 3.1.1
-    [ 0x00, 'Success'],
-    [ 0x11, 'No subscription existed'],
-    [ 0x80, 'Unspecified error'],
-    [ 0x83, 'Implementation specific error'],
-    [ 0x87, 'Not authorized'],
-    [ 0x8F, 'Topic Filter invalid'],
-    [ 0x91, 'Packet Identifier in use'],
-  );
-}
-
-function mqtt_decode_pingxxx(ns) {
-  return ns[0xc] = ns[0xd] = pkt => pkt
-}
-
-function mqtt_decode_disconnect(ns, mqtt_reader) {
-  return ns[0xe] = (pkt, u8_body) => {
-    if (u8_body && 5 <= pkt.mqtt_level) {
-      let rdr = mqtt_reader.of(u8_body);
-      pkt.reason = rdr.reason(pkt.type);
-      pkt.props = rdr.props();
-    }
-    return pkt }
-}
-
-
-function _disconnect_v5(mqtt_reader) {
-  mqtt_reader.reasons('disconnect',
-    // MQTT 5.0
-    [ 0x00, 'Normal disconnection'],
-    [ 0x04, 'Disconnect with Will Message'],
-    [ 0x80, 'Unspecified error'],
-    [ 0x81, 'Malformed Packet'],
-    [ 0x82, 'Protocol Error'],
-    [ 0x83, 'Implementation specific error'],
-    [ 0x87, 'Not authorized'],
-    [ 0x89, 'Server busy'],
-    [ 0x8B, 'Server shutting down'],
-    [ 0x8D, 'Keep Alive timeout'],
-    [ 0x8E, 'Session taken over'],
-    [ 0x8F, 'Topic Filter invalid'],
-    [ 0x90, 'Topic Name invalid'],
-    [ 0x93, 'Receive Maximum exceeded'],
-    [ 0x94, 'Topic Alias invalid'],
-    [ 0x95, 'Packet too large'],
-    [ 0x96, 'Message rate too high'],
-    [ 0x97, 'Quota exceeded'],
-    [ 0x98, 'Administrative action'],
-    [ 0x99, 'Payload format invalid'],
-    [ 0x9A, 'Retain not supported'],
-    [ 0x9B, 'QoS not supported'],
-    [ 0x9C, 'Use another server'],
-    [ 0x9D, 'Server moved'],
-    [ 0x9E, 'Shared Subscriptions not supported'],
-    [ 0x9F, 'Connection rate exceeded'],
-    [ 0xA0, 'Maximum connect time'],
-    [ 0xA1, 'Subscription Identifiers not supported'],
-    [ 0xA2, 'Wildcard Subscriptions not supported'],
-  );
-}
-
-function mqtt_decode_auth(ns, mqtt_reader) {
-  return ns[0xf] = (pkt, u8_body) => {
-    if ( 5 <= pkt.mqtt_level ) {
-      let rdr = mqtt_reader.of(u8_body);
-      pkt.reason = rdr.reason(pkt.type);
-      pkt.props = rdr.props();
-    }
-    return pkt }
-}
-
-
-function _auth_v5(mqtt_reader) {
-  mqtt_reader.reasons('auth',
-    // MQTT 5.0
-    [ 0x00, 'Success' ],
-    [ 0x18, 'Continue authentication' ],
-    [ 0x19, 'Re-authenticate' ],
-  );
-}
-
 function mqtt_encode_connect(ns, mqtt_writer) {
   const _c_mqtt_proto = new Uint8Array([
     0, 4, 0x4d, 0x51, 0x54, 0x54 ]);
@@ -583,7 +391,7 @@ function mqtt_encode_connect(ns, mqtt_writer) {
       | ( will.retain ? 0x20 : 0 );
 
   return ns.connect = ( mqtt_level, pkt ) => {
-    let wrt = mqtt_writer.of(pkt);
+    let wrt = mqtt_writer.for(pkt);
 
     wrt.push(_c_mqtt_proto);
     wrt.u8( mqtt_level );
@@ -621,10 +429,27 @@ function mqtt_encode_connect(ns, mqtt_writer) {
   }
 }
 
+function mqtt_decode_connack(ns, mqtt_reader) {
+  class _connack_flags_ extends Number {
+    get session_present() { return this & 0x01 !== 0 }
+  }
+
+  return ns[0x2] = (pkt, u8_body) => {
+    let rdr = mqtt_reader.for(pkt, u8_body);
+
+    pkt.flags =
+      rdr.flags(_connack_flags_);
+
+    pkt.reason = rdr.reason(pkt.type);
+    if (5 <= pkt.mqtt_level)
+      pkt.props = rdr.props();
+    return pkt }
+}
+
 function mqtt_encode_publish(ns, mqtt_writer) {
   return ns.publish = ( mqtt_level, pkt ) => {
     let qos = (pkt.qos & 0x3) << 1;
-    let wrt = mqtt_writer.of(pkt);
+    let wrt = mqtt_writer.for(pkt);
 
     wrt.utf8(pkt.topic);
     if (0 !== qos)
@@ -642,9 +467,28 @@ function mqtt_encode_publish(ns, mqtt_writer) {
   }
 }
 
+function mqtt_decode_publish(ns, mqtt_reader) {
+  return ns[0x3] = (pkt, u8_body) => {
+    let {hdr} = pkt;
+    pkt.dup = Boolean(hdr & 0x8);
+    pkt.retain = Boolean(hdr & 0x1);
+    let qos = pkt.qos = (hdr>>1) & 0x3;
+
+    let rdr = mqtt_reader.for(pkt, u8_body);
+    pkt.topic = rdr.utf8();
+    if (0 !== qos)
+      pkt.pkt_id = rdr.u16();
+
+    if (5 <= pkt.mqtt_level)
+      pkt.props = rdr.props();
+
+    pkt.payload = rdr.flush();
+    return pkt }
+}
+
 function mqtt_encode_puback(ns, mqtt_writer) {
   return ns.puback = ( mqtt_level, pkt ) => {
-    let wrt = mqtt_writer.of(pkt);
+    let wrt = mqtt_writer.for(pkt);
 
     wrt.u16(pkt.pkt_id);
     if (5 <= mqtt_level) {
@@ -656,6 +500,20 @@ function mqtt_encode_puback(ns, mqtt_writer) {
   }
 }
 
+
+function mqtt_decode_puback(ns, mqtt_reader) {
+  return ns[0x4] = (pkt, u8_body) => {
+    let rdr = mqtt_reader.for(pkt, u8_body);
+
+    pkt.pkt_id = rdr.u16();
+    if (5 <= pkt.mqtt_level) {
+      pkt.reason = rdr.reason(pkt.type);
+      pkt.props = rdr.props();
+    }
+
+    return pkt }
+}
+
 function mqtt_encode_subscribe(ns, mqtt_writer) {
   const _enc_subscribe_flags = opts => 0
       | ( opts.qos & 0x3 )
@@ -663,7 +521,7 @@ function mqtt_encode_subscribe(ns, mqtt_writer) {
       | ( (opts.retain_handling & 0x3) << 2 );
 
   return ns.subscribe = ( mqtt_level, pkt ) => {
-    let wrt = mqtt_writer.of(pkt);
+    let wrt = mqtt_writer.for(pkt);
 
     wrt.u16(pkt.pkt_id);
     if (5 <= mqtt_level)
@@ -689,9 +547,25 @@ function mqtt_encode_subscribe(ns, mqtt_writer) {
   }
 }
 
+function mqtt_decode_xxsuback(ns, mqtt_reader) {
+  return ns[0x9] = ns[0xb] = (pkt, u8_body) => {
+    let rdr = mqtt_reader.for(pkt, u8_body);
+
+    pkt.pkt_id = rdr.u16();
+    if (5 <= pkt.mqtt_level)
+      pkt.props = rdr.props();
+
+    let answers = pkt.answers = [];
+    while (rdr.has_more())
+      answers.push(
+        rdr.reason(pkt.type) );
+
+    return pkt }
+}
+
 function mqtt_encode_unsubscribe(ns, mqtt_writer) {
   return ns.unsubscribe = ( mqtt_level, pkt ) => {
-    let wrt = mqtt_writer.of(pkt);
+    let wrt = mqtt_writer.for(pkt);
 
     wrt.u16(pkt.pkt_id);
     if (5 <= mqtt_level)
@@ -709,9 +583,14 @@ function mqtt_encode_pingxxx(ns) {
   ns.pingresp = () => new Uint8Array([ 0xd0, 0 ]);
 }
 
+
+function mqtt_decode_pingxxx(ns) {
+  return ns[0xc] = ns[0xd] = pkt => pkt
+}
+
 function mqtt_encode_disconnect(ns, mqtt_writer) {
   return ns.disconnect = ( mqtt_level, pkt ) => {
-    let wrt = mqtt_writer.of(pkt);
+    let wrt = mqtt_writer.for(pkt);
 
     if (pkt && 5 <= mqtt_level) {
       if (pkt.reason || pkt.props) {
@@ -724,6 +603,17 @@ function mqtt_encode_disconnect(ns, mqtt_writer) {
   }
 }
 
+
+function mqtt_decode_disconnect(ns, mqtt_reader) {
+  return ns[0xe] = (pkt, u8_body) => {
+    if (u8_body && 5 <= pkt.mqtt_level) {
+      let rdr = mqtt_reader.for(pkt, u8_body);
+      pkt.reason = rdr.reason(pkt.type);
+      pkt.props = rdr.props();
+    }
+    return pkt }
+}
+
 function mqtt_encode_auth(ns, mqtt_writer) {
   return ns.auth = ( mqtt_level, pkt ) => {
     if (5 > mqtt_level)
@@ -738,12 +628,21 @@ function mqtt_encode_auth(ns, mqtt_writer) {
   }
 }
 
+function mqtt_decode_auth(ns, mqtt_reader) {
+  return ns[0xf] = (pkt, u8_body) => {
+    if ( 5 <= pkt.mqtt_level ) {
+      let rdr = mqtt_reader.of(u8_body);
+      pkt.reason = rdr.reason(pkt.type);
+      pkt.props = rdr.props();
+    }
+    return pkt }
+}
+
 const mqtt_decode_v5 =  [
   mqtt_decode_connack,
   mqtt_decode_publish,
   mqtt_decode_puback,
-  mqtt_decode_suback,
-  mqtt_decode_unsuback,
+  mqtt_decode_xxsuback,
   mqtt_decode_pingxxx,
   mqtt_decode_disconnect,
   mqtt_decode_auth,
@@ -761,18 +660,6 @@ const mqtt_encode_v5 =  [
   mqtt_encode_auth,
 ];
 
-const mqtt_reader_v5 = /* #__PURE__ */
-  mqtt_reader_info(
-    mqtt_reader_v5$1,
-    _connack_v5,
-    _puback_v5,
-    _suback_v5,
-    _unsuback_v4,
-    _disconnect_v5,
-    _auth_v5,
-  );
-
-
 const mqtt_opts_v5 = 
   { decode_fns: mqtt_decode_v5,
     mqtt_reader: mqtt_reader_v5,
@@ -864,7 +751,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
 
@@ -917,34 +807,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) {
@@ -954,70 +848,68 @@ 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}
-
-/*
-export function decode_varint_loop(u8, i=0) {
-  let i0 = i
-  let shift = 0, n = (u8[i] & 0x7f)
-  while ( 0x80 & u8[i++] )
-    n |= (u8[i] & 0x7f) << (shift += 7)
-
-  return [n, i, i0]
-}
-*/
-
-
-function decode_varint(u8, i=0) {
-  let i0 = i;
-  // unrolled for a max of 4 chains
-  let n = (u8[i] & 0x7f) <<  0;
-  if ( 0x80 & u8[i++] ) {
-    n |= (u8[i] & 0x7f) <<  7;
-    if ( 0x80 & u8[i++] ) {
-      n |= (u8[i] & 0x7f) << 14;
-      if ( 0x80 & u8[i++] ) {
-        n |= (u8[i] & 0x7f) << 21;
-      }
-    }
-  }
-  return [n, i, i0]
+    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);
+  for(; b & 0x80;)
+    n |= ((b=u8[i++]) & 0x7f) << (shift += 7);
+
+  return (u8.length < i)
+    ? [invalid, i0, i0] // fail: insuffecient u8 bytes to decode
+    : [n, i, i0] // successful value
 }
 
 function mqtt_raw_dispatch(opt) {
-  let u8 = new Uint8Array(0);
+  let u8 = new Uint8Array(0), len_tip=0;
   return u8_buf => {
     u8 = 0 === u8.byteLength
       ? u8_buf : _u8_join(u8, u8_buf);
 
     let res = [];
-    while (1) {
-      let [len_body, len_vh] = decode_varint(u8, 1);
-      let len_pkt = len_body + len_vh;
 
-      if ( u8.byteLength < len_pkt )
-        return res
+    // wait for at least len_tip bytes for next (tip) message
+    while ( u8.byteLength >= len_tip ) {
+
+      // if varint is incomplete, return len_body=NaN
+      let [len_body, len_vh] = decode_varint(u8, 1, NaN);
+      let len_pkt = len_body + len_vh; // may be NaN
+
+      if (!( len_pkt <= u8.byteLength )) {
+        // incomplete packet cases:
+        // - len_pkt is less than available bytes
+        // - len_pkt is NaN from decode_varint() due to lack of data
+        len_tip = len_pkt || 0; // 0 when NaN
+        break
+      }
 
       let b0 = u8[0];
       let u8_body = 0 === len_body ? null
@@ -1029,6 +921,8 @@ function mqtt_raw_dispatch(opt) {
       if (null != pkt)
         res.push( pkt );
     }
+
+    return res
   }
 }
 
@@ -1039,16 +933,17 @@ function _u8_join(a, b) {
   return r
 }
 
-const _pkt_types = ['~', 'connect', 'connack', 'publish', 'puback', 'pubrec', 'pubrel', 'pubcomp', 'subscribe', 'suback', 'unsubscribe', 'unsuback', 'pingreq', 'pingresp', 'disconnect', 'auth'];
+const _pkt_types =  ['~', 'connect', 'connack', 'publish', 'puback', 'pubrec', 'pubrel', 'pubcomp', 'subscribe', 'suback', 'unsubscribe', 'unsuback', 'pingreq', 'pingresp', 'disconnect', 'auth'];
+
+
+function mqtt_pkt_ctx(mqtt_level, opts, pkt_api=opts.pkt_ctx) {
+  let _as_pkt_ctx = pkt_api => ({
+        __proto__: pkt_api,
+        get hdr() { return this.b0 & 0xf },
+        get id() { return this.b0 >>> 4 },
+        get type() { return _pkt_types[this.b0 >>> 4] },
+        mqtt_level });
 
-function mqtt_pkt_ctx(mqtt_level, opts, pkt_ctx) {
-  pkt_ctx = {
-    __proto__: pkt_ctx || opts.pkt_ctx,
-    mqtt_level,
-    get hdr() { return this.b0 & 0xf },
-    get id() { return this.b0 >>> 4 },
-    get type() { return _pkt_types[this.b0 >>> 4] },
-  };
 
   let op, _decode_by_id=[], _encode_by_type={};
   for (op of opts.encode_fns)
@@ -1057,10 +952,10 @@ function mqtt_pkt_ctx(mqtt_level, opts, pkt_ctx) {
     op(_decode_by_id, opts.mqtt_reader);
 
   return {
-    pkt_ctx,
+    pkt_api, pkt_ctx: _as_pkt_ctx(pkt_api),
 
-    encode_pkt(type, pkt) {
-      return _encode_by_type[type]( mqtt_level, pkt ) },
+    encode_pkt: (type, pkt) =>
+      _encode_by_type[type]( mqtt_level, pkt ),
 
     decode_pkt(b0, u8_body) {
       if (b0.map) // Uint8Array in first arg
@@ -1069,12 +964,10 @@ function mqtt_pkt_ctx(mqtt_level, opts, pkt_ctx) {
       let fn_decode = _decode_by_id[b0>>>4] || _decode_by_id[0];
       return fn_decode?.({__proto__: this.pkt_ctx, b0}, u8_body) },
 
-    mqtt_stream() {
-      let self = { __proto__: this, pkt_ctx: { __proto__: pkt_ctx } };
-      self.pkt_ctx._base_ = self.pkt_ctx;
+    mqtt_stream(pkt_api=this.pkt_api) {
+      let self = { __proto__: this, pkt_ctx: _as_pkt_ctx(pkt_api) };
       self.decode = mqtt_raw_dispatch(self);
-      return self
-    },
+      return self },
   }
 }
 
@@ -1598,7 +1491,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.6.2';
+const version = '0.6.4';
 
 const MQTTClient_v4 = /* #__PURE__ */
   with_topic_path_router(