u8-mqtt 0.0.24 → 0.0.28

package/esm/node/index.mjs

@@ -394,6 +394,50 @@ function mqtt_decode_pingxxx(ns) {
   return ns[0xc] = ns[0xd] = pkt => pkt
 }
 
+function mqtt_decode_disconnect(ns) {
+  const _disconnect_reason_ = bind_reason_lookup([
+    // 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'],
+  ]);
+
+
+  return ns[0xe] = (pkt, u8_body) => {
+    if (u8_body && 5 <= pkt.mqtt_level) {
+      const rdr = new mqtt_type_reader(u8_body, 0);
+      pkt.reason = rdr.u8_reason(_disconnect_reason_);
+      pkt.props = rdr.props();
+    }
+    return pkt }
+}
+
 function mqtt_decode_auth(ns) {
   const _auth_reason_ = bind_reason_lookup([
     // MQTT 5.0
@@ -775,13 +819,15 @@ function mqtt_session_ctx(mqtt_level) {
 
     let std_pkt_api = {
       utf8(u8) { return as_utf8( u8 || this.payload ) },
-      json(u8) { return JSON.parse( as_utf8( u8 || this.payload ) || null ) },
+      json(u8) { return JSON.parse( this.utf8(u8) || null ) },
+      text(u8) { return this.utf8(u8) },
     };
 
     mqtt_session_ctx.ctx = ctx =
       _bind_mqtt_session_ctx(
         [ // lst_decode_ops
           mqtt_decode_connack,
+          mqtt_decode_disconnect,
           mqtt_decode_publish,
           mqtt_decode_puback,
           mqtt_decode_pubxxx,
@@ -939,10 +985,21 @@ function _mqtt_topic_router() {
       let rte = parse(
         topic_route.replace(/[+#]$/, '*'));
 
+      rte.key = topic_route;
       rte.tgt = fn;
       pri_lsts[priority ? 0 : 1].push(rte);
       return this}
 
+  , remove(topic_route, priority) {
+      let lst = pri_lsts[priority ? 0 : 1];
+      lst = lst.filter(e => e.key !== topic_route);
+      pri_lsts[priority ? 0 : 1] = lst;}
+
+  , clear(priority) {
+      pri_lsts[priority ? 0 : 1] = [];
+      if (null == priority) {
+        pri_lsts[1] = [];} }
+
   , async invoke(pkt, ctx) {
       ctx.idx = 0;
 
@@ -967,7 +1024,10 @@ function * _mqtt_routes_iter(all_route_lists, topic) {
 
 
 function _mqtt_route_match_one(topic, {keys, pattern, tgt}) {
-  let match = pattern.exec('/'+topic);
+  let match = '/' !== topic[0]
+    ? pattern.exec('/'+topic)
+    : pattern.exec(topic);
+
   if (null === match) {
     return}
 
@@ -1128,16 +1188,27 @@ class MQTTBaseClient {
     pkt = _as_topics(pkt, ex);
     return this._send('unsubscribe', pkt, pkt)}
 
+  get on_topic() {return this.router.add}
+
   // alias: sub_topic
   subscribe_topic(topic_route, ...args) {
-    let topic = topic_route.replace(/[:*].*$/, '#');
-    this.on_topic(topic_route, true, args.pop() );// handler
+    let topic = this.topic_for(topic_route);
+    this.router.add(topic_route, true, args.pop() );// handler
     this.subscribe([[ topic ]], args.pop() );// ex
     return this}
 
+  // alias: unsub_topic
+  unsubscribe_topic(topic_route) {
+    let topic = this.topic_for(topic_route);
+    this.router.remove(topic_route, true);
+    return this.unsubscribe([[ topic ]]) }
+
+  topic_for(topic_route) {
+    return topic_route.replace(/[:*].*$/, '#')}
+
 
   // alias: pub
-  publish(pkt, encode) {return _pub(this, pkt, encode)}
+  publish(pkt, fn_encode) {return _pub(this, pkt, fn_encode)}
   post(topic, payload) {return _pub.m(this, topic, payload)}
   send(topic, payload) {return _pub.mq(this, topic, payload)}
   store(topic, payload) {return _pub.mqr(this, topic, payload)}
@@ -1146,9 +1217,9 @@ class MQTTBaseClient {
   json_send(topic, msg) {return _pub.oq(this, topic, msg)}
   json_store(topic, msg) {return _pub.oqr(this, topic, msg)}
 
-  obj_post(topic, msg, encode) {return _pub.o(this, topic, msg, encode)}
-  obj_send(topic, msg, encode) {return _pub.oq(this, topic, msg, encode)}
-  obj_store(topic, msg, encode) {return _pub.oqr(this, topic, msg, encode)}
+  obj_post(topic, msg, fn_encode) {return _pub.o(this, topic, msg, fn_encode)}
+  obj_send(topic, msg, fn_encode) {return _pub.oq(this, topic, msg, fn_encode)}
+  obj_store(topic, msg, fn_encode) {return _pub.oqr(this, topic, msg, fn_encode)}
 
 
 
@@ -1185,18 +1256,19 @@ class MQTTBaseClient {
   /* async _send(type, pkt) -- provided by _conn_ and transport */
 
   _init_router(opt) {
-    let router = _mqtt_topic_router();
-    this.on_topic = router.add;
-    return this.router = router}
+    return this.router = _mqtt_topic_router()}
 
   _init_dispatch(opt) {
     let router = this._init_router(opt, this);
 
     let tgt ={
       __proto__: opt.on_mqtt_type || {}
-    , mqtt_publish: router.invoke};
+    , router};
 
-    return _mqtt_dispatch(this, tgt) } }
+    if (! tgt.mqtt_publish) {
+      tgt.mqtt_publish = router.invoke;}
+
+    return _mqtt_dispatch(this, tgt)} }
 
 
  {
@@ -1205,7 +1277,8 @@ class MQTTBaseClient {
     pub: p.publish
   , sub: p.subscribe
   , unsub: p.unsubscribe
-  , sub_topic: p.subscribe_topic} );
+  , sub_topic: p.subscribe_topic
+  , unsub_topic: p.unsubscribe_topic} );
 
   /*
     p.on_mqtt_type = {
@@ -1214,6 +1287,7 @@ class MQTTBaseClient {
       mqtt_connack(pkt, ctx) ::
       mqtt_disconnect(pkt, ctx) ::
 
+      mqtt_publish(pkt, ctx)
       mqtt_subscribe(pkt, ctx) ::
       mqtt_unsubscribe(pkt, ctx) ::
 
@@ -1231,16 +1305,22 @@ function _as_topics(pkt, ex) {
   return ex ? {...pkt, ...ex} : pkt}
 
 
-function _pub(self, pkt, encode) {
+function _pub(self, pkt, fn_encode) {
   if (undefined === pkt.payload) {
     let {msg} = pkt;
-    if (undefined === msg) {
-      let arg = pkt.arg || 'payload';
-      return v => _pub(self, {...pkt, [arg]: v}, encode)}
+    switch (typeof msg) {
+      case 'function':
+        fn_encode = msg;
+        msg = undefined;
+
+      case 'undefined':
+        let arg = pkt.arg || 'payload';
+        return v => _pub(self, {...pkt, [arg]: v}, fn_encode)
 
-    pkt.payload = encode
-      ? encode(msg)
-      : JSON.stringify(msg);}
+      default:
+        pkt.payload = fn_encode
+          ? fn_encode(msg)
+          : JSON.stringify(msg);} }
 
   return self._send('publish', pkt,
     pkt.qos ? pkt : void 0 ) }// key
@@ -1254,12 +1334,12 @@ function _pub(self, pkt, encode) {
   , mqr: (self, topic, payload) =>
       _pub(self, {topic, payload, qos:1, retain: 1})
 
-  , o: (self, topic, msg, encode) =>
-      _pub(self, {topic, msg, arg: 'msg', qos:0}, encode)
-  , oq: (self, topic, msg, encode) =>
-      _pub(self, {topic, msg, arg: 'msg', qos:1}, encode)
-  , oqr: (self, topic, msg, encode) =>
-      _pub(self, {topic, msg, arg: 'msg', qos:1, retain: 1}, encode)} ); }
+  , o: (self, topic, msg, fn_encode) =>
+      _pub(self, {topic, msg, arg: 'msg', qos:0}, fn_encode)
+  , oq: (self, topic, msg, fn_encode) =>
+      _pub(self, {topic, msg, arg: 'msg', qos:1}, fn_encode)
+  , oqr: (self, topic, msg, fn_encode) =>
+      _pub(self, {topic, msg, arg: 'msg', qos:1, retain: 1}, fn_encode)} ); }
 
 class MQTTCoreClient extends MQTTBaseClient {
   static _with_session(mqtt_session) {
@@ -1322,7 +1402,7 @@ class MQTTCoreClient extends MQTTBaseClient {
   
   with_tcp(port, hostname) {
     if (!Number.isFinite(port)) {
-      ({port, host: hostname} = port);}
+      ({port, hostname} = new URL(port));}
 
     let sock = connect(port, hostname);
     return this.with_stream(sock)}
@@ -1333,7 +1413,6 @@ class MQTTCoreClient extends MQTTBaseClient {
     if (undefined === write_stream) {
       write_stream = read_stream;}
 
-    read_stream.once('end', this._conn_.reset);
     return this.with_async_iter(read_stream,
       u8_pkt => write_stream.write(u8_pkt)) }