u8-mqtt 0.5.3 → 0.6.1

package/code/core.jsy

@@ -1,41 +1,69 @@
 import mqtt_pkt_ctx from 'u8-mqtt-packet/esm/codec_bind.js'
+import { _isfn } from './_utils.jsy'
 import { MQTTBase } from './base.jsy'
+import { _mqtt_conn } from './_conn.jsy'
 
 #IF PLAT_NODEJS
   import {connect as tcp_connect} from 'node:net'
   import {connect as tls_connect} from 'node:tls'
 
-const pkt_api = {
-  utf8(u8) { return new TextDecoder('utf-8').decode(u8 || this.payload ) },
-  json(u8) { return JSON.parse( this.utf8(u8) || null ) },
-  text(u8) { return this.utf8(u8) },
-}
+const pkt_api = @{}
+  utf8(u8) :: return new TextDecoder('utf-8').decode(u8 || this.payload )
+  json(u8) :: return JSON.parse( this.utf8(u8) || null )
+  text(u8) :: return this.utf8(u8)
+
+const opt_default = @{}
+  sess_stg: globalThis.sessionStorage
 
 export class MQTTCore extends MQTTBase ::
+  constructor(opt) ::
+    opt = {...opt_default, ...opt}
+    super()
+    this.with(opt)
+    // settings for MQTTCore
+    this.sess_stg = opt.sess_stg
+    // setup connection and dispatch
+    this.conn = _mqtt_conn @ opt, this,
+      this._init_dispatch(opt)
+
+  with(fns_ns) ::
+    for let [k,v] of Object.entries(fns_ns) ::
+      if _isfn(v) :: this[k] = v
+    return this
+
+
   static mqtt_ctx(mqtt_level, mqtt_opts, pkt_ctx=pkt_api) ::
-    let self = class extends this {}
-    self.prototype.mqtt_ctx =
+    let klass = class extends this {}
+    klass.prototype.mqtt_ctx =
       mqtt_pkt_ctx(mqtt_level, mqtt_opts, pkt_ctx)
-    return self
+    return klass
+
+
+  async conn_emit(evt, arg, err_arg) ::
+    this.log_conn?.(evt, arg, err_arg)
+    try ::
+      let fn_evt = this[await evt] // microtask break using `await evt`
+      if fn_evt ::
+        await fn_evt.call(this, this, arg, err_arg)
+      else if err_arg :: throw err_arg
+    catch err ::
+      this.on_error(err, evt)
+
+  on_error(err, evt) ::
+    console.warn @ '[[u8-mqtt error: %s]]', evt, err
+  log_conn(evt, arg, err_arg) ::
+    console.info @ '[[u8-mqtt conn: %s]]', evt, arg, err_arg
 
 
   // automatic Client Id for connect()
   init_client_id(parts=['u8-mqtt--','']) ::
-    let sess_stg=this.sess_stg
+    let sess_stg = this.sess_stg
     let key, cid = sess_stg?.getItem(key=parts.join(' '))
     if ! cid ::
       cid = parts.join @ Math.random().toString(36).slice(2)
       sess_stg?.setItem(key, cid)
     return cid
 
-  get sess_stg() :: return globalThis.sessionStorage
-
-
-  //on_error(err, evt) ::
-  //  console.warn @ '[[u8-mqtt error: %s]]', evt, err
-
-  //log_conn(evt, arg, err_arg) ::
-  //  console.info @ '[[u8-mqtt log: %s]]', evt, arg, err_arg
 
   on_live(client, is_reconnect) ::
     if is_reconnect ::
@@ -61,19 +89,16 @@ export class MQTTCore extends MQTTBase ::
     return new Promise @ done => setTimeout(done, ms)
 
   with_async_iter(async_iter, write_u8_pkt) ::
-    let on_mqtt_chunk = this._conn_.set @
-      this.mqtt_ctx,
-      write_u8_pkt
-
-    this._msg_loop = @!>
-      try ::
-        async_iter = await async_iter
-        for await (let chunk of async_iter)
-          on_mqtt_chunk(chunk)
-        this._conn_.reset()
-      catch err ::
-        this._conn_.reset(err)
-
+    this.conn.setup @ async_iter,
+      write_u8_pkt,
+      async (on_mqtt_chunk, conn) => ::
+        try ::
+          async_iter = await async_iter
+          for await (let chunk of async_iter)
+            on_mqtt_chunk(chunk)
+          conn.reset()
+        catch err ::
+          conn.reset(err)
     return this
 
 
@@ -92,11 +117,11 @@ export class MQTTCore extends MQTTBase ::
         this.with_deno_iter @
           Deno.connectTls(opt)
 
-    with_deno_iter(conn) ::
+    with_deno_iter(transport) ::
       return this.with_async_iter @
-        conn.then(Deno.iter),
-        async u8_pkt =>
-          (await conn).write(u8_pkt)
+        transport.then(Deno.iter),
+        transport.then @ write_stream =>
+          u8_pkt => write_stream.write(u8_pkt)
 
     _conn_opt([a0, a1, a2]) ::
       // (port, hostname, options) or (url, options)
@@ -144,29 +169,26 @@ export class MQTTCore extends MQTTBase ::
 
     websock.binaryType = 'arraybuffer'
 
-    let ready, {readyState} = websock
+    let ws_ready, readyState = websock.readyState
     if 1 !== readyState ::
       if 0 !== readyState ::
-        throw new Error @ 'Invalid WebSocket readyState'
-
-      ready = new Promise @ fn => websock.onopen = fn
+        throw new Error @ 'WS readyState'
 
+      ws_ready = new Promise @ ready => websock.onopen = ready
 
-    let {_conn_} = this
-    let on_mqtt_chunk = _conn_.set @
-      this.mqtt_ctx,
-      async u8_pkt => @
-        await ready
-        websock.send(u8_pkt)
+    this.conn.setup @ ws_ready,
+      u8_pkt => websock.send(u8_pkt),
+      (on_mqtt_chunk, conn) => ::
+        websock.onmessage = evt => @
+          on_mqtt_chunk @ new Uint8Array(evt.data)
 
-    websock.onmessage = evt => @ on_mqtt_chunk @ new Uint8Array(evt.data)
-    websock.onclose = evt => ::
-      if ! evt.wasClean ::
-        var err = new Error('websocket connection close')
-        err.code = evt.code
-        err.reason = evt.reason
+        websock.onclose = evt => ::
+          if ! evt.wasClean ::
+            var err = new Error('websocket close')
+            err.code = evt.code
+            err.reason = evt.reason
 
-      _conn_.reset(err)
+          conn.reset(err)
 
     return this
 

package/code/router_path.jsy

@@ -2,6 +2,7 @@
 //  [regexparam]: https://github.com/lukeed/regexparam
 
 import {parse as _rxp_parse} from 'regexparam'
+import {_isfn} from './_utils.jsy'
 import {with_topic_router} from './with_topic_router.jsy'
 
 export const with_topic_path_router = /* #__PURE__ */
@@ -40,7 +41,7 @@ function mqtt_topic_path_router() ::
       let fn = args.pop()
       let priority = args.pop()
 
-      if 'function' !== typeof fn ::
+      if ! _isfn(fn) ::
         if fn :: throw new TypeError()
         fn = _ignore