u8-mqtt 0.3.1 → 0.3.2-0

package/README.md

@@ -83,8 +83,8 @@ Built for small footprint with ES Modules (ESM) using embedded [u8-mqtt-packet][
 |---------:|-----:|----------------|-------------|
 |  187.0KB |  12x | [MQTT.js][]    | `curl -sL https://cdn.jsdelivr.net/npm/mqtt@4.0.1/dist/mqtt.min.js \| wc -c`
 |   32.3KB |   2x | [paho][]       | `curl -sL https://cdn.jsdelivr.net/npm/paho-mqtt@1.1.0/paho-mqtt.min.js \| wc -c`
-|   19.9KB | 1.3x | [u8-mqtt][] v5 | `cat ./u8-mqtt/esm/web/v5.min.mjs \| wc -c`
-|   15.5KB |   1x | [u8-mqtt][] v4 | `cat ./u8-mqtt/esm/web/v4.min.mjs \| wc -c`
+|   19.9KB | 1.3x | [u8-mqtt][] v5 | `cat ./u8-mqtt/esm/web/v5.min.js \| wc -c`
+|   15.5KB |   1x | [u8-mqtt][] v4 | `cat ./u8-mqtt/esm/web/v4.min.js \| wc -c`
 
  [MQTT.js]: https://github.com/mqttjs/MQTT.js/
  [paho]: https://github.com/eclipse/paho.mqtt.javascript/

package/cjs/index.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var node_net = require('node:net');
+var node_tls = require('node:tls');
 
 function encode_varint(n, a=[]) {
   do {
@@ -873,8 +874,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 =>(
@@ -1454,7 +1453,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) {
@@ -1496,6 +1495,7 @@ class MQTTCore extends MQTTBase {
     return this}
 
 
+
   
 
 
@@ -1504,6 +1504,18 @@ class MQTTCore extends MQTTBase {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1513,13 +1525,25 @@ class MQTTCore extends MQTTBase {
 
 
   
-  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(
+        node_net.connect(opt)) ) }
 
+  with_tls(...opt) {
+    opt = this._conn_opt(opt);
     return this._use_conn (() =>
       this.with_stream(
-        node_net.connect(port, hostname)) ) }
+        node_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) {
@@ -1565,7 +1589,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-var version = "0.3.1";
+const version = '0.3.2-0';
 
 const MQTTClient_v4 = /* #__PURE__ */
   MQTTCore.mqtt_ctx(4, mqtt_opts_v5);
@@ -1592,7 +1616,7 @@ exports._mqtt_route_remove = _mqtt_route_remove;
 exports._mqtt_routes_iter = _mqtt_routes_iter;
 exports._mqtt_topic_router = _mqtt_topic_router;
 exports.ao_defer_v = ao_defer_v;
-exports["default"] = mqtt_v4;
+exports.default = mqtt_v4;
 exports.mqtt_v4 = mqtt_v4;
 exports.mqtt_v5 = mqtt_v5;
 exports.version = version;