u8-mqtt 0.3.0 → 0.3.2-0

package/code/core.jsy

@@ -3,6 +3,7 @@ import { MQTTBase } from './base.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 ) },
@@ -27,7 +28,7 @@ export class MQTTCore extends MQTTBase ::
     return this
 
   //log_conn(evt, arg, err_arg) ::
-  //console.info @ '[[u8-mqtt log: %s]]', evt, arg, err_arg
+  //  console.info @ '[[u8-mqtt log: %s]]', evt, arg, err_arg
 
   on_live(client, is_reconnect) ::
     if is_reconnect ::
@@ -69,30 +70,55 @@ export class MQTTCore extends MQTTBase ::
     return this
 
 
+
   #IF PLAT_DENO
-    with_tcp(port, hostname) ::
-      if !Number.isFinite(port) ::
-        ({port, hostname} = new URL(port))
+    with_tcp(...opt) ::
+      opt = this._conn_opt(opt)
+      opt.transport = 'tcp'
+      return this._use_conn @=>
+        this.with_deno_iter @
+          Deno.connect(opt)
 
-      return this._use_conn @::
-        let conn = Deno.connect @:
-          port, hostname, transport: 'tcp'
+    with_tls(...opt) ::
+      opt = this._conn_opt(opt)
+      return this._use_conn @=>
+        this.with_deno_iter @
+          Deno.connectTls(opt)
 
-        this.with_async_iter @
-          conn.then @ Deno.iter,
-          async u8_pkt => (await conn).write(u8_pkt)
+    with_deno_iter(conn) ::
+      return this.with_async_iter @
+        conn.then(Deno.iter),
+        async u8_pkt =>
+          (await conn).write(u8_pkt)
 
-        return this
+    _conn_opt([a0, a1, a2]) ::
+      // (port, hostname, options) or (url, options)
+      if Number.isFinite(a0) ::
+        return {...a2, port: a0, hostname: a1}
 
+      a0 = new URL(a0)
+      return {...a1, port: a0.port, hostname: a0.hostname}
 
   #IF PLAT_NODEJS
-    with_tcp(port, hostname) ::
-      if !Number.isFinite(port) ::
-        ({port, hostname} = new URL(port))
+    with_tcp(...opt) ::
+      opt = this._conn_opt(opt)
+      console.log @: opt
+      return this._use_conn @=>
+        this.with_stream @
+          tcp_connect(opt)
 
+    with_tls(...opt) ::
+      opt = this._conn_opt(opt)
       return this._use_conn @=>
         this.with_stream @
-          tcp_connect(port, hostname)
+          tls_connect(opt)
+
+    _conn_opt([a0, a1, a2]) ::
+      // (port, hostname, options) or (url, options)
+      if Number.isFinite(a0) ::
+        return {...a2, port: a0, host: a1}
+      a0 = new URL(a0)
+      return {...a1, port: a0.port, host: a0.hostname}
 
 
   with_stream(read_stream, write_stream) ::

package/code/{index.mjs → index.js}

@@ -1,7 +1,8 @@
 export {
+  version,
   MQTTClient_v5, mqtt_v5,
   MQTTClient_v4, mqtt_v4, mqtt_v4 as default, // u8-mqtt-packet version 5 can also parse version 4 (3.1.1) packets
-} from './v5.mjs'
+} from './v5.js'
 
 export * from './core.jsy'
 export * from './base.jsy'

package/code/{v4.mjs → v4.js}

@@ -1,5 +1,6 @@
 import mqtt_opts_v4 from 'u8-mqtt-packet/esm/codec_v4_client.js'
 import MQTTCore from './core.jsy'
+export * from './version.js'
 
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v4)

package/code/{v5.mjs → v5.js}

@@ -1,5 +1,6 @@
 import mqtt_opts_v5 from 'u8-mqtt-packet/esm/codec_v5_client.js'
 import MQTTCore from './core.jsy'
+export * from './version.js'
 
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v5)

package/code/version.js

@@ -0,0 +1 @@
+export const version = 'GITREPO'

package/esm/deno/index.js

@@ -867,8 +867,6 @@ function mqtt_pkt_ctx(mqtt_level, opts, pkt_ctx) {
   }
 }
 
-Object.freeze({ao_done: true});
-
 function ao_defer_ctx(as_res = (...args) => args) {
   let y,n,_pset = (a,b) => { y=a, n=b; };
   return p =>(
@@ -1448,7 +1446,7 @@ class MQTTCore extends MQTTBase {
     return this}
 
   //log_conn(evt, arg, err_arg) ::
-  //console.info @ '[[u8-mqtt log: %s]]', evt, arg, err_arg
+  //  console.info @ '[[u8-mqtt log: %s]]', evt, arg, err_arg
 
   on_live(client, is_reconnect) {
     if (is_reconnect) {
@@ -1490,23 +1488,48 @@ class MQTTCore extends MQTTBase {
     return this}
 
 
+
   
-  with_tcp(port, hostname) {
-    if (!Number.isFinite(port)) {
-      ({port, hostname} = new URL(port));}
+  with_tcp(...opt) {
+    opt = this._conn_opt(opt);
+    opt.transport = 'tcp';
+    return this._use_conn (() =>
+      this.with_deno_iter(
+        Deno.connect(opt)) ) }
+
+  with_tls(...opt) {
+    opt = this._conn_opt(opt);
+    return this._use_conn (() =>
+      this.with_deno_iter(
+        Deno.connectTls(opt)) ) }
+
+  with_deno_iter(conn) {
+    return this.with_async_iter(
+      conn.then(Deno.iter),
+      async u8_pkt =>
+        (await conn).write(u8_pkt)) }
+
+  _conn_opt([a0, a1, a2]) {
+    // (port, hostname, options) or (url, options)
+    if (Number.isFinite(a0)) {
+      return {...a2, port: a0, hostname: a1}}
+
+    a0 = new URL(a0);
+    return {...a1, port: a0.port, hostname: a0.hostname}}
+
+  
+
+
+
+
+
+
+
 
-    return this._use_conn (() => {
-      let conn = Deno.connect({
-        port, hostname, transport: 'tcp'});
 
-      this.with_async_iter(
-        conn.then(Deno.iter,)
-        , async u8_pkt => (await conn).write(u8_pkt));
 
-      return this}) }
 
 
-  
 
 
 
@@ -1559,6 +1582,8 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
+const version = '0.3.2-0';
+
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v5);
 
@@ -1571,5 +1596,5 @@ const mqtt_v4 = opt =>
 const mqtt_v5 = opt =>
   new MQTTClient_v5(opt);
 
-export { MQTTBase, MQTTClient_v4, MQTTClient_v5, MQTTCore, MQTTError, _mqtt_cmdid_dispatch, _mqtt_conn, _mqtt_dispatch, _mqtt_route_match_one, _mqtt_route_remove, _mqtt_routes_iter, _mqtt_topic_router, ao_defer_v, mqtt_v4 as default, mqtt_v4, mqtt_v5 };
+export { MQTTBase, MQTTClient_v4, MQTTClient_v5, MQTTCore, MQTTError, _mqtt_cmdid_dispatch, _mqtt_conn, _mqtt_dispatch, _mqtt_route_match_one, _mqtt_route_remove, _mqtt_routes_iter, _mqtt_topic_router, ao_defer_v, mqtt_v4 as default, mqtt_v4, mqtt_v5, version };
 //# sourceMappingURL=index.js.map