u8-mqtt 0.4.0 → 0.4.1

package/cjs/v5.cjs

@@ -819,9 +819,10 @@ const with_topic_router = mqtt_topic_router =>
       return super._aliases() +
         ' sub_topic:subscribe_topic unsub_topic:unsubscribe_topic'}
 
-    _init_router(opt) {
-      return mqtt_topic_router(opt, this)}
-
+    _init_router(opt, client, target) {
+      let router = this.router = target.router =
+        mqtt_topic_router(opt, this);
+      return router?.invoke}
     get on_topic() {return this.router.add}
 
     _sub_chain(topic, ex, topic_prefix) {
@@ -857,14 +858,20 @@ const mqtt_topic = topic_route =>
     .replace(/[*].*$/, '#')
     .replace(/:\w+\??/g, '+');
 
-const as_topic_path = topic_route =>(
+/* From the [MQTT v5 Spec](https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Topic_Names_and)
+4.7.1.2 Multi-level wildcard -- (‘#’ U+0023)
+... MUST be specified either on its own or following a topic level separator.
+In either case it MUST be the last character specified in the Topic Filter
+
+4.7.1.3 Single-level wildcard -- (‘+’ U+002B)
+...it MUST occupy an entire level of the filter.
+*/
+
+const as_topic_path = (topic_route, id) =>(
+  id=1,
   topic_route
-    .replace(/#$/, '*') // replace MQTT # wildcard at end
-    .split(/([^\/]*[+][^\/]*)/) // split on MQTT + match tokens
-    .reduce (( sz, v, idx ) => sz +(
-      idx & 1 // even entires are body, odd are MQTT + tokens
-        ? `:$${1 + idx>>1}` // replace with `:$#` sequential ids, using ? for partial entries
-        : v ) ) );// pass through body
+    .replace(/#$/, '*' )// replace MQTT '#' multi-level wildcard at end
+    .replace(/\+/g, () => `:$${id++}` ) );// replace MQTT '+' single-level wildcards
 
 function _ignore(pkt, params, ctx) {ctx.done = true;}
 
@@ -1358,15 +1365,10 @@ class MQTTBase {
 
   _init_dispatch(opt) {
     this.constructor?._once_();
-    let router = this.router =
-      this._init_router?.(opt, this);
-
-    let tgt ={
-      __proto__: opt.on_mqtt_type || {}
-    , router};
-
-    tgt.mqtt_publish ||= router?.invoke;
-    return _mqtt_dispatch(this, tgt)}
+    let target ={__proto__: opt.on_mqtt_type};
+    target.mqtt_publish ||=
+      this._init_router?.(opt, this, target);
+    return _mqtt_dispatch(this, target)}
 
   static _aliases() {
     return ' pub:publish sub:subscribe unsub:unsubscribe '}
@@ -1629,7 +1631,7 @@ class MQTTCore extends MQTTBase {
 
     return this} }
 
-const version = '0.4.0';
+const version = '0.4.1';
 
 const MQTTClient_v4 = /* #__PURE__ */
   with_topic_path_router(