u8-mqtt 0.0.26 → 0.1.0

package/code/base.jsy

@@ -48,13 +48,24 @@ export 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, fn_encode) :: return _pub(this, pkt, fn_encode)
@@ -105,9 +116,7 @@ export class MQTTBaseClient ::
   /* async _send(type, pkt) -- provided by _conn_ and transport */
 
   _init_router(opt) ::
-    let router = _mqtt_topic_router(this)
-    this.on_topic = router.add
-    return this.router = router
+    return this.router = _mqtt_topic_router(this)
 
   _init_dispatch(opt) ::
     let router = this._init_router(opt, this)
@@ -129,6 +138,7 @@ export class MQTTBaseClient ::
     sub: p.subscribe
     unsub: p.unsubscribe
     sub_topic: p.subscribe_topic
+    unsub_topic: p.unsubscribe_topic
 
   /*
     p.on_mqtt_type = {
@@ -155,7 +165,7 @@ function _as_topics(pkt, ex) ::
   return ex ? {...pkt, ...ex} : pkt
 
 
-function _pub(self, pkt, fn_encode) ::
+async function _pub(self, pkt, fn_encode) ::
   if undefined === pkt.payload ::
     let {msg} = pkt
     switch typeof msg ::
@@ -169,7 +179,7 @@ function _pub(self, pkt, fn_encode) ::
 
       default:
         pkt.payload = fn_encode
-          ? fn_encode(msg)
+          ? await fn_encode(msg)
           : JSON.stringify(msg)
 
   return self._send @ 'publish', pkt,

package/code/core.jsy

@@ -50,10 +50,10 @@ export class MQTTCoreClient extends MQTTBaseClient ::
   #IF PLAT_DENO
     with_tcp(port, hostname) ::
       if !Number.isFinite(port) ::
-        ({port, host: hostname} = port)
+        ({port, hostname} = new URL(port))
 
       Deno.connect @:
-        port: port || 1883, hostname, transport: 'tcp'
+        port, hostname, transport: 'tcp'
       .then @\ conn =>
         this.with_async_iter @
           Deno.iter(conn),
@@ -65,7 +65,7 @@ export class MQTTCoreClient extends MQTTBaseClient ::
   #IF PLAT_NODEJS
     with_tcp(port, hostname) ::
       if !Number.isFinite(port) ::
-        ({port, host: hostname} = port)
+        ({port, hostname} = new URL(port))
 
       let sock = tcp_connect(port, hostname)
       return this.with_stream(sock)

package/code/session.mjs

@@ -30,7 +30,8 @@ export 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 =