mqtt-plus 1.4.0 → 1.4.2

package/dst-stage2/mqtt-plus.cjs.js

@@ -3,13 +3,13 @@ const node_stream = require("node:stream");
 const nanoid = require("nanoid");
 const node_buffer = require("node:buffer");
 const PLazy = require("p-lazy");
-const v = require("valibot");
-const CBOR = require("cbor2");
 const sign = require("jose/jwt/sign");
 const verify = require("jose/jwt/verify");
 const pbkdf2 = require("@stablelib/pbkdf2");
 const sha256 = require("@stablelib/sha256");
 const node_events = require("node:events");
+const v = require("valibot");
+const CBOR = require("cbor2");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -26,78 +26,10 @@ function _interopNamespaceDefault(e) {
   n.default = e;
   return Object.freeze(n);
 }
-const v__namespace = /* @__PURE__ */ _interopNamespaceDefault(v);
-const CBOR__namespace = /* @__PURE__ */ _interopNamespaceDefault(CBOR);
 const pbkdf2__namespace = /* @__PURE__ */ _interopNamespaceDefault(pbkdf2);
 const sha256__namespace = /* @__PURE__ */ _interopNamespaceDefault(sha256);
-class RefCountedSubscription {
-  constructor(subscribeFn, unsubscribeFn, lingerMs = 30 * 1e3) {
-    this.subscribeFn = subscribeFn;
-    this.unsubscribeFn = unsubscribeFn;
-    this.lingerMs = lingerMs;
-    this.counts = /* @__PURE__ */ new Map();
-    this.pending = /* @__PURE__ */ new Map();
-    this.lingers = /* @__PURE__ */ new Map();
-  }
-  async subscribe(topic, options = { qos: 2 }) {
-    const count = this.counts.get(topic) ?? 0;
-    this.counts.set(topic, count + 1);
-    const linger = this.lingers.get(topic);
-    if (linger) {
-      clearTimeout(linger);
-      this.lingers.delete(topic);
-      return;
-    }
-    if (count === 0) {
-      const promise = this.subscribeFn(topic, options).finally(() => {
-        this.pending.delete(topic);
-      }).catch((err) => {
-        const count2 = this.counts.get(topic);
-        if (count2) {
-          if (count2 <= 1)
-            this.counts.delete(topic);
-          else
-            this.counts.set(topic, count2 - 1);
-        }
-        throw err;
-      });
-      this.pending.set(topic, promise);
-      return promise;
-    } else {
-      const pending = this.pending.get(topic);
-      if (pending)
-        return pending;
-    }
-  }
-  async unsubscribe(topic) {
-    const count = this.counts.get(topic);
-    if (count) {
-      if (count <= 1) {
-        this.counts.delete(topic);
-        if (this.lingerMs > 0) {
-          const timer = setTimeout(() => {
-            this.lingers.delete(topic);
-            this.unsubscribeFn(topic).catch(() => {
-            });
-          }, this.lingerMs);
-          this.lingers.set(topic, timer);
-        } else
-          await this.unsubscribeFn(topic).catch(() => {
-          });
-      } else
-        this.counts.set(topic, count - 1);
-    }
-  }
-  async flush() {
-    const topics = [...this.lingers.keys()];
-    for (const topic of topics) {
-      clearTimeout(this.lingers.get(topic));
-      this.lingers.delete(topic);
-      await this.unsubscribeFn(topic).catch(() => {
-      });
-    }
-  }
-}
+const v__namespace = /* @__PURE__ */ _interopNamespaceDefault(v);
+const CBOR__namespace = /* @__PURE__ */ _interopNamespaceDefault(CBOR);
 class CreditGate {
   constructor(initialCredit) {
     this.waiters = [];
@@ -887,6 +819,14 @@ class Msg {
     } else
       throw new Error("invalid object: not of any known type");
   }
+  /*  guard for request messages  */
+  isRequest(msg) {
+    return msg instanceof EventEmission || msg instanceof ServiceCallRequest || msg instanceof SourceFetchRequest || msg instanceof SinkPushRequest;
+  }
+  /*  guard for response messages  */
+  isResponse(msg) {
+    return msg instanceof ServiceCallResponse || msg instanceof SinkPushResponse || msg instanceof SinkPushChunk || msg instanceof SinkPushCredit || msg instanceof SourceFetchResponse || msg instanceof SourceFetchChunk || msg instanceof SourceFetchCredit;
+  }
 }
 class MsgTrait extends EncodeTrait {
   constructor() {
@@ -901,6 +841,7 @@ class LogEvent {
     this.msg = msg;
     this.data = data;
   }
+  /*  resolve all pending promises in the log event  */
   async resolve() {
     if (this.msg instanceof Promise)
       this.msg = await this.msg.catch(() => "<resolve-failed>");
@@ -910,6 +851,7 @@ class LogEvent {
           this.data[field] = await this.data[field].catch(() => "<resolve-failed>");
     }
   }
+  /*  render log event as string  */
   toString() {
     const timestamp = new Date(this.timestamp);
     const year = timestamp.getFullYear();
@@ -967,6 +909,8 @@ class BaseTrait extends TraceTrait {
   /*  construct API class  */
   constructor(mqtt, options = {}) {
     super(options);
+    this.onRequest = /* @__PURE__ */ new Map();
+    this.onResponse = /* @__PURE__ */ new Map();
     if (mqtt === null) {
       this.log("info", "establishing proxy MQTT client");
       mqtt = new Proxy({}, {
@@ -998,7 +942,7 @@ class BaseTrait extends TraceTrait {
     this.mqtt.on("message", this._messageHandler);
   }
   /*  destroy API class  */
-  destroy() {
+  async destroy() {
     this.log("info", "un-hooking from MQTT client");
     this.mqtt.off("message", this._messageHandler);
   }
@@ -1057,31 +1001,174 @@ class BaseTrait extends TraceTrait {
     });
   }
   /*  handle incoming MQTT message  */
-  _onMessage(topic, message, packet) {
-    if (typeof message === "string")
-      this.log("info", `received from MQTT topic "${topic}" (type: string, length: ${message.length} chars)`);
+  _onMessage(topic, data, packet) {
+    const topicMatch = this.options.topicMatch(topic);
+    if (topicMatch === null)
+      return;
+    if (typeof data === "string")
+      this.log("info", `received from MQTT topic "${topic}" (type: string, length: ${data.length} chars)`);
     else
-      this.log("info", `received from MQTT topic "${topic}" (type: buffer, length: ${message.byteLength} bytes)`);
-    let parsed;
+      this.log("info", `received from MQTT topic "${topic}" (type: buffer, length: ${data.byteLength} bytes)`);
+    let payload;
     try {
-      const payload = this.codec.decode(message);
-      parsed = this.msg.parse(payload);
-    } catch (_err) {
-      const err = _err instanceof Error ? new Error(`failed to parse message: ${_err.message}`, { cause: _err }) : new Error("failed to parse message");
-      this.error(err);
+      payload = this.codec.decode(data);
+    } catch (err) {
+      this.error(ensureError(err, "failed to parse message into object"));
       return;
     }
-    this.log("debug", `received from MQTT topic "${topic}"`, { message: parsed });
-    this._dispatchMessage(topic, parsed).catch((err) => {
-      this.error(err, `dispatching message from MQTT topic "${topic}" failed`);
-    });
+    let message;
+    try {
+      message = this.msg.parse(payload);
+    } catch (err) {
+      this.error(ensureError(err, "failed to parse object into typed message object"));
+      return;
+    }
+    this.log("debug", `received from MQTT topic "${topic}"`, { message });
+    if (this.msg.isRequest(message)) {
+      const handler = this.onRequest.get(`${topicMatch.operation}:${message.name}`);
+      if (handler !== void 0) {
+        try {
+          handler(message, topicMatch.name);
+        } catch (err) {
+          this.error(ensureError(err, `dispatching request message from MQTT topic "${topic}" failed`));
+        }
+      }
+    } else if (this.msg.isResponse(message)) {
+      const handler = this.onResponse.get(`${topicMatch.operation}:${message.id}`);
+      if (handler !== void 0) {
+        try {
+          handler(message, topicMatch.name);
+        } catch (err) {
+          this.error(ensureError(err, `dispatching response message from MQTT topic "${topic}" failed`));
+        }
+      }
+    }
   }
-  /*  dispatch parsed message to appropriate handler
-      (base implementation, to be overridden in sub-traits)  */
-  async _dispatchMessage(_topic, _parsed) {
+}
+class RefCountedSubscription {
+  constructor(subscribeFn, unsubscribeFn, lingerMs = 30 * 1e3) {
+    this.subscribeFn = subscribeFn;
+    this.unsubscribeFn = unsubscribeFn;
+    this.lingerMs = lingerMs;
+    this.counts = /* @__PURE__ */ new Map();
+    this.pending = /* @__PURE__ */ new Map();
+    this.lingers = /* @__PURE__ */ new Map();
+  }
+  /*  subscribe to a topic (reference-counted)  */
+  async subscribe(topic, options = { qos: 2 }) {
+    const count = this.counts.get(topic) ?? 0;
+    this.counts.set(topic, count + 1);
+    const linger = this.lingers.get(topic);
+    if (linger) {
+      clearTimeout(linger);
+      this.lingers.delete(topic);
+      return;
+    }
+    if (count === 0) {
+      const promise = this.subscribeFn(topic, options).finally(() => {
+        this.pending.delete(topic);
+      }).catch((err) => {
+        const count2 = this.counts.get(topic);
+        if (count2) {
+          if (count2 <= 1)
+            this.counts.delete(topic);
+          else
+            this.counts.set(topic, count2 - 1);
+        }
+        throw err;
+      });
+      this.pending.set(topic, promise);
+      return promise;
+    } else {
+      const pending = this.pending.get(topic);
+      if (pending)
+        return pending.catch((err) => {
+          const count2 = this.counts.get(topic);
+          if (count2) {
+            if (count2 <= 1)
+              this.counts.delete(topic);
+            else
+              this.counts.set(topic, count2 - 1);
+          }
+          throw err;
+        });
+    }
+  }
+  /*  unsubscribe from a topic (reference-counted)  */
+  async unsubscribe(topic) {
+    const count = this.counts.get(topic);
+    if (count) {
+      if (count <= 1) {
+        this.counts.delete(topic);
+        if (this.lingerMs > 0) {
+          const timer = setTimeout(() => {
+            this.lingers.delete(topic);
+            this.unsubscribeFn(topic).catch(() => {
+            });
+          }, this.lingerMs);
+          this.lingers.set(topic, timer);
+        } else
+          await this.unsubscribeFn(topic).catch(() => {
+          });
+      } else
+        this.counts.set(topic, count - 1);
+    }
+  }
+  /*  flush all pending linger timers and unsubscribe  */
+  async flush() {
+    const topics = [...this.lingers.keys()];
+    for (const topic of topics) {
+      clearTimeout(this.lingers.get(topic));
+      this.lingers.delete(topic);
+    }
+    for (const topic of topics)
+      await this.unsubscribeFn(topic).catch(() => {
+      });
+  }
+}
+class SubscriptionTrait extends BaseTrait {
+  constructor() {
+    super(...arguments);
+    this.subscriptions = new RefCountedSubscription((topic, options) => this._subscribeTopic(topic, options), (topic) => this._unsubscribeTopic(topic));
+  }
+  /*  destroy topic trait  */
+  async destroy() {
+    await this.subscriptions.flush();
+    await super.destroy();
   }
 }
-class MetaTrait extends BaseTrait {
+class TimerTrait extends SubscriptionTrait {
+  constructor() {
+    super(...arguments);
+    this.timers = /* @__PURE__ */ new Map();
+  }
+  /*  destroy timer trait  */
+  async destroy() {
+    for (const timer of this.timers.values())
+      clearTimeout(timer);
+    this.timers.clear();
+    await super.destroy();
+  }
+  /*  refresh (or start) a named timer  */
+  timerRefresh(id, onTimeout) {
+    const timer = this.timers.get(id);
+    if (timer !== void 0)
+      clearTimeout(timer);
+    this.timers.set(id, setTimeout(() => {
+      this.timers.delete(id);
+      onTimeout();
+    }, this.options.timeout));
+  }
+  /*  clear a named timer  */
+  timerClear(id) {
+    const timer = this.timers.get(id);
+    if (timer !== void 0) {
+      clearTimeout(timer);
+      this.timers.delete(id);
+    }
+  }
+}
+class MetaTrait extends TimerTrait {
   constructor() {
     super(...arguments);
     this._meta = /* @__PURE__ */ new Map();
@@ -1188,10 +1275,6 @@ class AuthTrait extends MetaTrait {
   }
 }
 class EventTrait extends AuthTrait {
-  constructor() {
-    super(...arguments);
-    this.events = /* @__PURE__ */ new Map();
-  }
   async event(nameOrConfig, ...args) {
     let name;
     let callback;
@@ -1209,12 +1292,12 @@ class EventTrait extends AuthTrait {
       callback = args[0];
     }
     const spool = new Spool();
-    if (this.events.has(name))
+    if (this.onRequest.has(`event-emission:${name}`))
       throw new Error(`event: event "${name}" already registered`);
     const topicS = share ? `$share/${share}/${name}` : name;
     const topicB = this.options.topicMake(topicS, "event-emission");
     const topicD = this.options.topicMake(name, "event-emission", this.options.id);
-    this.events.set(name, (request, topicName) => {
+    this.onRequest.set(`event-emission:${name}`, (request, topicName) => {
       const senderId = request.sender;
       const params = request.params ?? [];
       const info = { sender: senderId ?? "" };
@@ -1236,7 +1319,7 @@ class EventTrait extends AuthTrait {
       });
     });
     spool.roll(() => {
-      this.events.delete(name);
+      this.onRequest.delete(`event-emission:${name}`);
     });
     await run(`subscribe to MQTT topic "${topicB}"`, spool, () => this._subscribeTopic(topicB, { qos: 2, ...options }));
     spool.roll(() => this._unsubscribeTopic(topicB).catch(() => {
@@ -1246,7 +1329,7 @@ class EventTrait extends AuthTrait {
     }));
     return {
       destroy: async () => {
-        if (!this.events.has(name))
+        if (!this.onRequest.has(`event-emission:${name}`))
           throw new Error(`destroy: event "${name}" not registered`);
         await spool.unroll(false)?.catch((err) => {
           this.error(err, `destroy: failed to cleanup: ${err.message}`);
@@ -1259,14 +1342,14 @@ class EventTrait extends AuthTrait {
     let params;
     let receiver;
     let options = {};
-    let meta = {};
+    let meta;
     let dry;
     if (typeof eventOrConfig === "object" && eventOrConfig !== null) {
       event = eventOrConfig.event;
       params = eventOrConfig.params;
       receiver = eventOrConfig.receiver;
       options = eventOrConfig.options ?? {};
-      meta = eventOrConfig.meta ?? {};
+      meta = eventOrConfig.meta;
       dry = eventOrConfig.dry;
     } else {
       event = eventOrConfig;
@@ -1285,29 +1368,8 @@ class EventTrait extends AuthTrait {
         this.error(err, `emitting event "${event}" failed`);
       });
   }
-  /*  dispatch message (Event pattern handling)  */
-  async _dispatchMessage(topic, message) {
-    await super._dispatchMessage(topic, message);
-    const topicMatch = this.options.topicMatch(topic);
-    if (topicMatch !== null && topicMatch.operation === "event-emission" && message instanceof EventEmission) {
-      const handler = this.events.get(message.name);
-      if (handler !== void 0)
-        handler(message, topicMatch.name);
-    }
-  }
 }
 class ServiceTrait extends EventTrait {
-  constructor() {
-    super(...arguments);
-    this.services = /* @__PURE__ */ new Map();
-    this.callCallbacks = /* @__PURE__ */ new Map();
-    this.callSubscriptions = new RefCountedSubscription((topic, options) => this._subscribeTopic(topic, options), (topic) => this._unsubscribeTopic(topic));
-  }
-  /*  destroy service trait  */
-  destroy() {
-    super.destroy();
-    this.callSubscriptions.flush();
-  }
   async service(nameOrConfig, ...args) {
     let name;
     let callback;
@@ -1325,12 +1387,12 @@ class ServiceTrait extends EventTrait {
       callback = args[0];
     }
     const spool = new Spool();
-    if (this.services.has(name))
-      throw new Error(`register: service "${name}" already registered`);
+    if (this.onRequest.has(`service-call-request:${name}`))
+      throw new Error(`service: service "${name}" already registered`);
     const topicS = `$share/${share}/${name}`;
     const topicB = this.options.topicMake(topicS, "service-call-request");
     const topicD = this.options.topicMake(name, "service-call-request", this.options.id);
-    this.services.set(name, (request, topicName) => {
+    this.onRequest.set(`service-call-request:${name}`, (request, topicName) => {
       const requestId = request.id;
       const senderId = request.sender;
       if (senderId === void 0 || senderId === "")
@@ -1364,7 +1426,7 @@ class ServiceTrait extends EventTrait {
       });
     });
     spool.roll(() => {
-      this.services.delete(name);
+      this.onRequest.delete(`service-call-request:${name}`);
     });
     await run(`subscribe to MQTT topic "${topicB}"`, spool, () => this._subscribeTopic(topicB, { qos: 2, ...options }));
     spool.roll(() => this._unsubscribeTopic(topicB).catch(() => {
@@ -1374,8 +1436,8 @@ class ServiceTrait extends EventTrait {
     }));
     return {
       destroy: async () => {
-        if (!this.services.has(name))
-          throw new Error(`destroy: service "${name}" no longer registered`);
+        if (!this.onRequest.has(`service-call-request:${name}`))
+          throw new Error(`destroy: service "${name}" not registered`);
         await spool.unroll(false)?.catch((err) => {
           this.error(err, `destroy: failed to cleanup: ${err.message}`);
         });
@@ -1387,13 +1449,13 @@ class ServiceTrait extends EventTrait {
     let params;
     let receiver;
     let options = {};
-    let meta = {};
+    let meta;
     if (typeof nameOrConfig === "object" && nameOrConfig !== null) {
       name = nameOrConfig.name;
       params = nameOrConfig.params;
       receiver = nameOrConfig.receiver;
       options = nameOrConfig.options ?? {};
-      meta = nameOrConfig.meta ?? {};
+      meta = nameOrConfig.meta;
     } else {
       name = nameOrConfig;
       params = args;
@@ -1401,8 +1463,8 @@ class ServiceTrait extends EventTrait {
     const spool = new Spool();
     const requestId = nanoid.nanoid();
     const responseTopic = this.options.topicMake(name, "service-call-response", this.options.id);
-    await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.callSubscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
-    spool.roll(() => this.callSubscriptions.unsubscribe(responseTopic));
+    await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.subscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
+    spool.roll(() => this.subscriptions.unsubscribe(responseTopic));
     const promise = new Promise((resolve, reject) => {
       let timer = setTimeout(async () => {
         timer = null;
@@ -1415,7 +1477,7 @@ class ServiceTrait extends EventTrait {
           timer = null;
         }
       });
-      this.callCallbacks.set(requestId, async (response) => {
+      this.onResponse.set(`service-call-response:${requestId}`, async (response) => {
         await spool.unroll();
         if (response.error !== void 0)
           reject(new Error(response.error));
@@ -1423,7 +1485,7 @@ class ServiceTrait extends EventTrait {
           resolve(response.result);
       });
       spool.roll(() => {
-        this.callCallbacks.delete(requestId);
+        this.onResponse.delete(`service-call-response:${requestId}`);
       });
     });
     const auth = this.authenticate();
@@ -1434,56 +1496,11 @@ class ServiceTrait extends EventTrait {
     await run(`publish service request as MQTT message to topic "${topic}"`, spool, () => this._publishToTopic(topic, message, { qos: 2, ...options }));
     return promise;
   }
-  /*  dispatch message (Service pattern handling)  */
-  async _dispatchMessage(topic, message) {
-    await super._dispatchMessage(topic, message);
-    const topicMatch = this.options.topicMatch(topic);
-    if (topicMatch !== null && topicMatch.operation === "service-call-request" && message instanceof ServiceCallRequest) {
-      const handler = this.services.get(message.name);
-      if (handler !== void 0)
-        handler(message, topicMatch.name);
-    } else if (topicMatch !== null && topicMatch.operation === "service-call-response" && topicMatch.peerId === this.options.id && message instanceof ServiceCallResponse) {
-      const handler = this.callCallbacks.get(message.id);
-      if (handler !== void 0)
-        handler(message);
-    }
-  }
 }
 class SourceTrait extends ServiceTrait {
   constructor() {
     super(...arguments);
-    this.sources = /* @__PURE__ */ new Map();
-    this.fetchResponseCallbacks = /* @__PURE__ */ new Map();
-    this.fetchChunkCallbacks = /* @__PURE__ */ new Map();
-    this.sourceCreditCallbacks = /* @__PURE__ */ new Map();
     this.sourceCreditGates = /* @__PURE__ */ new Map();
-    this.sourceTimers = /* @__PURE__ */ new Map();
-    this.fetchSubscriptions = new RefCountedSubscription((topic, options) => this._subscribeTopic(topic, options), (topic) => this._unsubscribeTopic(topic));
-  }
-  /*  refresh source timer for a specific request  */
-  _refreshSourceTimer(requestId) {
-    const timer = this.sourceTimers.get(requestId);
-    if (timer !== void 0)
-      clearTimeout(timer);
-    this.sourceTimers.set(requestId, setTimeout(() => {
-      this.sourceTimers.delete(requestId);
-      const gate = this.sourceCreditGates.get(requestId);
-      if (gate !== void 0)
-        gate.abort();
-    }, this.options.timeout));
-  }
-  /*  clear source timer for a specific request  */
-  _clearSourceTimer(requestId) {
-    const timer = this.sourceTimers.get(requestId);
-    if (timer !== void 0) {
-      clearTimeout(timer);
-      this.sourceTimers.delete(requestId);
-    }
-  }
-  /*  destroy source trait  */
-  destroy() {
-    super.destroy();
-    this.fetchSubscriptions.flush();
   }
   async source(nameOrConfig, ...args) {
     let name;
@@ -1502,13 +1519,13 @@ class SourceTrait extends ServiceTrait {
       callback = args[0];
     }
     const spool = new Spool();
-    if (this.sources.has(name))
+    if (this.onRequest.has(`source-fetch-request:${name}`))
       throw new Error(`source: source "${name}" already established`);
     const topicS = `$share/${share}/${name}`;
     const topicReqB = this.options.topicMake(topicS, "source-fetch-request");
     const topicReqD = this.options.topicMake(name, "source-fetch-request", this.options.id);
     const topicCreditD = this.options.topicMake(name, "source-fetch-credit", this.options.id);
-    this.sources.set(name, (request, topicName) => {
+    this.onRequest.set(`source-fetch-request:${name}`, (request, topicName) => {
       const requestId = request.id;
       const params = request.params ?? [];
       const sender = request.sender;
@@ -1529,8 +1546,12 @@ class SourceTrait extends ServiceTrait {
         const message = this.codec.encode(response);
         await this._publishToTopic(responseTopic, message, { qos: 2 });
       };
-      const refreshSourceTimeout = () => this._refreshSourceTimer(requestId);
-      const clearSourceTimeout = () => this._clearSourceTimer(requestId);
+      const refreshSourceTimeout = () => this.timerRefresh(requestId, () => {
+        const gate = this.sourceCreditGates.get(requestId);
+        if (gate !== void 0)
+          gate.abort();
+      });
+      const clearSourceTimeout = () => this.timerClear(requestId);
       refreshSourceTimeout();
       const sendChunk = async (chunk, error, final) => {
         refreshSourceTimeout();
@@ -1542,9 +1563,9 @@ class SourceTrait extends ServiceTrait {
       const creditGate = initialCredit !== void 0 && initialCredit > 0 ? new CreditGate(initialCredit) : void 0;
       if (creditGate) {
         this.sourceCreditGates.set(requestId, creditGate);
-        this.sourceCreditCallbacks.set(requestId, (creditParsed) => {
+        this.onResponse.set(`source-fetch-credit:${requestId}`, (creditParsed) => {
           creditGate.replenish(creditParsed.credit);
-          this._refreshSourceTimer(requestId);
+          refreshSourceTimeout();
         });
       }
       let ackSent = false;
@@ -1582,11 +1603,11 @@ class SourceTrait extends ServiceTrait {
           creditGate.abort();
           this.sourceCreditGates.delete(requestId);
         }
-        this.sourceCreditCallbacks.delete(requestId);
+        this.onResponse.delete(`source-fetch-credit:${requestId}`);
       });
     });
     spool.roll(() => {
-      this.sources.delete(name);
+      this.onRequest.delete(`source-fetch-request:${name}`);
     });
     await run(`subscribe to MQTT topic "${topicReqB}"`, spool, () => this._subscribeTopic(topicReqB, { qos: 2, ...options }));
     spool.roll(() => this._unsubscribeTopic(topicReqB).catch(() => {
@@ -1599,7 +1620,7 @@ class SourceTrait extends ServiceTrait {
     }));
     return {
       destroy: async () => {
-        if (!this.sources.has(name))
+        if (!this.onRequest.has(`source-fetch-request:${name}`))
           throw new Error(`destroy: source "${name}" not established`);
         await spool.unroll(false)?.catch((err) => {
           this.error(err, `destroy: failed to cleanup: ${err.message}`);
@@ -1627,10 +1648,10 @@ class SourceTrait extends ServiceTrait {
     const requestId = nanoid.nanoid();
     const responseTopic = this.options.topicMake(name, "source-fetch-response", this.options.id);
     const chunkTopic = this.options.topicMake(name, "source-fetch-chunk", this.options.id);
-    await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.fetchSubscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
-    spool.roll(() => this.fetchSubscriptions.unsubscribe(responseTopic));
-    await run(`subscribe to MQTT topic "${chunkTopic}"`, spool, () => this.fetchSubscriptions.subscribe(chunkTopic, { qos: options.qos ?? 2 }));
-    spool.roll(() => this.fetchSubscriptions.unsubscribe(chunkTopic));
+    await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.subscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
+    spool.roll(() => this.subscriptions.unsubscribe(responseTopic));
+    await run(`subscribe to MQTT topic "${chunkTopic}"`, spool, () => this.subscriptions.subscribe(chunkTopic, { qos: options.qos ?? 2 }));
+    spool.roll(() => this.subscriptions.unsubscribe(chunkTopic));
     const chunkCredit = this.options.chunkCredit;
     let chunksReceived = 0;
     let creditGranted = chunkCredit;
@@ -1638,7 +1659,7 @@ class SourceTrait extends ServiceTrait {
     const stream = new node_stream.Readable({
       highWaterMark: chunkCredit > 0 ? chunkCredit * this.options.chunkSize : 16 * 1024,
       read: (_size) => {
-        if (chunkCredit <= 0 || !this.fetchChunkCallbacks.has(requestId))
+        if (chunkCredit <= 0 || !this.onResponse.has(`source-fetch-chunk:${requestId}`))
           return;
         const targetId = serverId ?? receiver;
         if (!targetId)
@@ -1681,7 +1702,7 @@ class SourceTrait extends ServiceTrait {
     refreshTimeout();
     stream.once("close", () => spool.unroll());
     stream.once("error", () => spool.unroll());
-    this.fetchResponseCallbacks.set(requestId, (response) => {
+    this.onResponse.set(`source-fetch-response:${requestId}`, (response) => {
       if (response.sender)
         serverId = response.sender;
       metaResolve?.(response.meta);
@@ -1691,7 +1712,7 @@ class SourceTrait extends ServiceTrait {
       } else
         refreshTimeout();
     });
-    this.fetchChunkCallbacks.set(requestId, (response) => {
+    this.onResponse.set(`source-fetch-chunk:${requestId}`, (response) => {
       if (response.sender)
         serverId = response.sender;
       if (response.error) {
@@ -1710,8 +1731,8 @@ class SourceTrait extends ServiceTrait {
       }
     });
     spool.roll(() => {
-      this.fetchResponseCallbacks.delete(requestId);
-      this.fetchChunkCallbacks.delete(requestId);
+      this.onResponse.delete(`source-fetch-response:${requestId}`);
+      this.onResponse.delete(`source-fetch-chunk:${requestId}`);
     });
     const auth = this.authenticate();
     const metaStore = this.metaStore(meta);
@@ -1727,67 +1748,12 @@ class SourceTrait extends ServiceTrait {
     makeMutuallyExclusiveFields(result, "stream", "buffer");
     return result;
   }
-  /*  dispatch message (Source Fetch pattern handling)  */
-  async _dispatchMessage(topic, message) {
-    await super._dispatchMessage(topic, message);
-    const topicMatch = this.options.topicMatch(topic);
-    if (topicMatch !== null && topicMatch.operation === "source-fetch-request" && message instanceof SourceFetchRequest) {
-      const handler = this.sources.get(message.name);
-      if (handler !== void 0)
-        handler(message, topicMatch.name);
-    } else if (topicMatch !== null && topicMatch.operation === "source-fetch-response" && message instanceof SourceFetchResponse) {
-      const handler = this.fetchResponseCallbacks.get(message.id);
-      if (handler !== void 0)
-        handler(message);
-    } else if (topicMatch !== null && topicMatch.operation === "source-fetch-chunk" && message instanceof SourceFetchChunk) {
-      const handler = this.fetchChunkCallbacks.get(message.id);
-      if (handler !== void 0)
-        handler(message);
-    } else if (topicMatch !== null && topicMatch.operation === "source-fetch-credit" && message instanceof SourceFetchCredit) {
-      const handler = this.sourceCreditCallbacks.get(message.id);
-      if (handler !== void 0)
-        handler(message);
-    }
-  }
 }
 class SinkTrait extends SourceTrait {
   constructor() {
     super(...arguments);
-    this.sinks = /* @__PURE__ */ new Map();
     this.pushStreams = /* @__PURE__ */ new Map();
     this.pushSpools = /* @__PURE__ */ new Map();
-    this.pushTimers = /* @__PURE__ */ new Map();
-    this.pushChunkCallbacks = /* @__PURE__ */ new Map();
-    this.pushResponseCallbacks = /* @__PURE__ */ new Map();
-    this.pushCreditCallbacks = /* @__PURE__ */ new Map();
-    this.pushSubscriptions = new RefCountedSubscription((topic, options) => this._subscribeTopic(topic, options), (topic) => this._unsubscribeTopic(topic));
-  }
-  /*  destroy sink trait  */
-  destroy() {
-    super.destroy();
-    this.pushSubscriptions.flush();
-  }
-  /*  refresh push timer for a specific request  */
-  _refreshPushTimer(requestId) {
-    const timer = this.pushTimers.get(requestId);
-    if (timer !== void 0)
-      clearTimeout(timer);
-    this.pushTimers.set(requestId, setTimeout(() => {
-      this.pushTimers.delete(requestId);
-      const stream = this.pushStreams.get(requestId);
-      if (stream !== void 0)
-        stream.destroy(new Error("push stream timeout"));
-      const spool = this.pushSpools.get(requestId);
-      spool?.unroll();
-    }, this.options.timeout));
-  }
-  /*  clear push timer for a specific request  */
-  _clearPushTimer(requestId) {
-    const timer = this.pushTimers.get(requestId);
-    if (timer !== void 0) {
-      clearTimeout(timer);
-      this.pushTimers.delete(requestId);
-    }
   }
   async sink(nameOrConfig, ...args) {
     let name;
@@ -1806,13 +1772,13 @@ class SinkTrait extends SourceTrait {
       callback = args[0];
     }
     const spool = new Spool();
-    if (this.sinks.has(name))
+    if (this.onRequest.has(`sink-push-request:${name}`))
       throw new Error(`sink: sink "${name}" already established`);
     const topicS = `$share/${share}/${name}`;
     const topicReqB = this.options.topicMake(topicS, "sink-push-request");
     const topicReqD = this.options.topicMake(name, "sink-push-request", this.options.id);
     const topicChunkD = this.options.topicMake(name, "sink-push-chunk", this.options.id);
-    this.sinks.set(name, (request, topicName) => {
+    this.onRequest.set(`sink-push-request:${name}`, (request, topicName) => {
       const requestId = request.id;
       const params = request.params ?? [];
       const sender = request.sender;
@@ -1850,8 +1816,14 @@ class SinkTrait extends SourceTrait {
           chunksReceived: 0,
           creditGranted: chunkCredit
         } : void 0;
-        const refreshPushTimeout = () => this._refreshPushTimer(requestId);
-        const clearPushTimeout = () => this._clearPushTimer(requestId);
+        const refreshPushTimeout = () => this.timerRefresh(requestId, () => {
+          const stream = this.pushStreams.get(requestId);
+          if (stream !== void 0)
+            stream.destroy(new Error("push stream timeout"));
+          const spool2 = this.pushSpools.get(requestId);
+          spool2?.unroll();
+        });
+        const clearPushTimeout = () => this.timerClear(requestId);
         const readable = new node_stream.Readable({
           highWaterMark: chunkCredit > 0 ? chunkCredit * this.options.chunkSize : 16 * 1024,
           read: (_size) => {
@@ -1876,7 +1848,7 @@ class SinkTrait extends SourceTrait {
         });
         readable.once("close", () => reqSpool.unroll());
         readable.once("error", () => reqSpool.unroll());
-        this.pushChunkCallbacks.set(requestId, (chunkParsed, chunkTopicName) => {
+        this.onResponse.set(`sink-push-chunk:${requestId}`, (chunkParsed, chunkTopicName) => {
           if (chunkTopicName !== chunkParsed.name)
             throw new Error(`sink name mismatch between topic "${chunkTopicName}" and payload "${chunkParsed.name}"`);
           if (chunkParsed.error !== void 0) {
@@ -1896,7 +1868,7 @@ class SinkTrait extends SourceTrait {
           }
         });
         reqSpool.roll(() => {
-          this.pushChunkCallbacks.delete(requestId);
+          this.onResponse.delete(`sink-push-chunk:${requestId}`);
         });
         refreshPushTimeout();
         reqSpool.roll(() => {
@@ -1919,7 +1891,7 @@ class SinkTrait extends SourceTrait {
       });
     });
     spool.roll(() => {
-      this.sinks.delete(name);
+      this.onRequest.delete(`sink-push-request:${name}`);
     });
     await run(`subscribe to MQTT topic "${topicReqB}"`, spool, () => this._subscribeTopic(topicReqB, { qos: 2, ...options }));
     spool.roll(() => this._unsubscribeTopic(topicReqB).catch(() => {
@@ -1932,7 +1904,7 @@ class SinkTrait extends SourceTrait {
     }));
     return {
       destroy: async () => {
-        if (!this.sinks.has(name))
+        if (!this.onRequest.has(`sink-push-request:${name}`))
           throw new Error(`destroy: sink "${name}" not established`);
         await spool.unroll(false)?.catch((err) => {
           this.error(err, `destroy: failed to cleanup: ${err.message}`);
@@ -1962,8 +1934,8 @@ class SinkTrait extends SourceTrait {
     const spool = new Spool();
     const requestId = nanoid.nanoid();
     const responseTopic = this.options.topicMake(name, "sink-push-response", this.options.id);
-    await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.pushSubscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
-    spool.roll(() => this.pushSubscriptions.unsubscribe(responseTopic));
+    await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.subscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
+    spool.roll(() => this.subscriptions.unsubscribe(responseTopic));
     const abortController = new AbortController();
     const abortSignal = abortController.signal;
     let timer = null;
@@ -1993,7 +1965,7 @@ class SinkTrait extends SourceTrait {
         spool.roll(() => {
           abortSignal.removeEventListener("abort", onAbort);
         });
-        this.pushResponseCallbacks.set(requestId, (response) => {
+        this.onResponse.set(`sink-push-response:${requestId}`, (response) => {
           if (response.error)
             reject(new Error(response.error));
           else {
@@ -2004,13 +1976,13 @@ class SinkTrait extends SourceTrait {
           }
         });
         spool.roll(() => {
-          this.pushResponseCallbacks.delete(requestId);
+          this.onResponse.delete(`sink-push-response:${requestId}`);
         });
-        this.pushCreditCallbacks.set(requestId, (_response) => {
+        this.onResponse.set(`sink-push-credit:${requestId}`, (_response) => {
           refreshTimeout();
         });
         spool.roll(() => {
-          this.pushCreditCallbacks.delete(requestId);
+          this.onResponse.delete(`sink-push-credit:${requestId}`);
         });
         const auth = this.authenticate();
         const metaStore = this.metaStore(meta);
@@ -2021,7 +1993,7 @@ class SinkTrait extends SourceTrait {
           reject(err);
         });
       });
-      this.pushResponseCallbacks.set(requestId, (response) => {
+      this.onResponse.set(`sink-push-response:${requestId}`, (response) => {
         if (response.error)
           abortController.abort(new Error(response.error));
       });
@@ -2029,13 +2001,13 @@ class SinkTrait extends SourceTrait {
         creditGate = new CreditGate(initialCredit);
       if (creditGate) {
         const creditTopic = this.options.topicMake(name, "sink-push-credit", this.options.id);
-        await run(`subscribe to MQTT topic "${creditTopic}"`, spool, () => this.pushSubscriptions.subscribe(creditTopic, { qos: 2 }));
-        spool.roll(() => this.pushSubscriptions.unsubscribe(creditTopic));
+        await run(`subscribe to MQTT topic "${creditTopic}"`, spool, () => this.subscriptions.subscribe(creditTopic, { qos: 2 }));
+        spool.roll(() => this.subscriptions.unsubscribe(creditTopic));
         const gate = creditGate;
         spool.roll(() => {
           gate.abort();
         });
-        this.pushCreditCallbacks.set(requestId, (response) => {
+        this.onResponse.set(`sink-push-credit:${requestId}`, (response) => {
           gate.replenish(response.credit);
           refreshTimeout();
         });
@@ -2063,28 +2035,6 @@ class SinkTrait extends SourceTrait {
       await spool.unroll();
     }
   }
-  /*  dispatch incoming MQTT message  */
-  async _dispatchMessage(topic, message) {
-    await super._dispatchMessage(topic, message);
-    const topicMatch = this.options.topicMatch(topic);
-    if (topicMatch !== null && topicMatch.operation === "sink-push-request" && message instanceof SinkPushRequest) {
-      const handler = this.sinks.get(message.name);
-      if (handler !== void 0)
-        handler(message, topicMatch.name);
-    } else if (topicMatch !== null && topicMatch.operation === "sink-push-response" && message instanceof SinkPushResponse) {
-      const handler = this.pushResponseCallbacks.get(message.id);
-      if (handler !== void 0)
-        handler(message);
-    } else if (topicMatch !== null && topicMatch.operation === "sink-push-chunk" && message instanceof SinkPushChunk) {
-      const handler = this.pushChunkCallbacks.get(message.id);
-      if (handler !== void 0)
-        handler(message, topicMatch.name);
-    } else if (topicMatch !== null && topicMatch.operation === "sink-push-credit" && message instanceof SinkPushCredit) {
-      const handler = this.pushCreditCallbacks.get(message.id);
-      if (handler !== void 0)
-        handler(message);
-    }
-  }
 }
 class MQTTp extends SinkTrait {
 }