mqtt-plus 1.4.10 → 1.4.11

package/AGENTS.md

@@ -33,11 +33,13 @@ npm start sample        # run sample/sample.ts via `tsx`
 
 npm start clean         # remove dst-stage1/ and dst-stage2/
 npm start distclean     # remove node_modules/ and package-lock.json
+npm start publish       # publish to npm (restricted to maintainer host)
 
 ```
 
-Tests require a Mosquitto MQTT broker under run-time; the `mosquitto`
-npm package provides one that the test suite starts/stops automatically.
+Tests require an MQTT broker under run-time; the test suite starts/stops
+one automatically. If Docker is available, a Mosquitto broker is used;
+otherwise, the Aedes in-process broker serves as the fallback.
 
 Build Pipeline
 --------------
@@ -51,7 +53,7 @@ Two-stage build:
    `mqtt-plus.esm.js`, `mqtt-plus.cjs.js`, `mqtt-plus.umd.js`.
    UMD build includes Node polyfills (events, stream, buffer).
 
-Configuration lives in `etc/`: `tsc.json`, `vite.mts`, `eslint.mts`, `knip.jsonc`, `stx.conf`, `d2.mts`.
+Configuration lives in `etc/`: `tsc.json`, `vite.mts`, `eslint.mts`, `knip.jsonc`, `stx.conf`, `d2.mts`, `d2.theme.d2`, `logo.ai`, `logo.svg`.
 
 Architecture
 ------------
@@ -70,6 +72,7 @@ the bottom of this chain:
   ↓ TraceTrait          — EventEmitter + structured logging
   ↓ BaseTrait           — MQTT client hookup, subscription management, message routing
   ↓ SubscriptionTrait   — ref-counted MQTT topic subscription management
+  ↓ TimerTrait          — named timer management (refresh/clear)
   ↓ MetaTrait           — instance/per-request metadata
   ↓ AuthTrait           — JWT authentication (jose), role-based access
   ↓ EventTrait          — Event Emission pattern (event/emit)
@@ -98,6 +101,7 @@ Each trait lives in its own file: `src/mqtt-plus-<trait>.ts`.
 | `src/mqtt-plus-trace.ts`        | TraceTrait — EventEmitter and structured logging |
 | `src/mqtt-plus-base.ts`         | BaseTrait — MQTT client connection, subscription management, message routing |
 | `src/mqtt-plus-subscription.ts` | SubscriptionTrait — ref-counted MQTT topic subscription management |
+| `src/mqtt-plus-timer.ts`        | TimerTrait — named timer management (refresh/clear) |
 | `src/mqtt-plus-meta.ts`         | MetaTrait — instance and per-request metadata management |
 | `src/mqtt-plus-auth.ts`         | AuthTrait — JWT authentication (jose) and role-based access control |
 | `src/mqtt-plus-event.ts`        | EventTrait — Event Emission communication pattern (event/emit) |

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 ChangeLog
 =========
 
+1.4.11 (2026-03-05)
+-------------------
+
+- IMPROVEMENT: improve error handling and use error ensure function consistently
+- IMPROVEMENT: improve cleanup handling and correctly track resources
+- IMPROVEMENT: improve typing and fix overloads
+- IMPROVEMENT: avoid warning in Vite
+- BUGFIX: fix building for Vite compatibility
+- BUGFIX: avoid unhandled rejection error
+- BUGFIX: fix test
+- UPDATE: update documentation
+- UPDATE: upgrade NPM dependencies
+- CLEANUP: rename emit() parameter "event" to "name" for consistency
+- CLEANUP: cleanup code
+
 1.4.10 (2026-03-01)
 -------------------
 

package/doc/mqtt-plus-api.md

@@ -65,7 +65,7 @@ describing the available events, services, sources, and sinks.
 Destruction
 -----------
 
-    destroy(): void
+    destroy(): Promise<void>
 
 Clean up the MQTT+ instance by removing all event listeners.
 Call this method when the instance is no longer needed.
@@ -265,18 +265,18 @@ Event Emission
 
     /*  (simplified TypeScript API method signature)  */
     emit(
-        event:     string,
+        name:      string,
         ...params: any[]
     ): void
     emit({
-        event:     string,
+        name:      string,
         params:    any[],
         receiver?: string,
         options?:  MQTT::IClientPublishOptions,
         meta?:     Record<string, any>
     }): void
     emit({
-        event:     string,
+        name:      string,
         params:    any[],
         receiver?: string,
         options?:  MQTT::IClientPublishOptions,
@@ -300,8 +300,8 @@ Emit an event to all subscribers or a specific subscriber ("fire and forget").
 - The remote `event()` `callback` is called with `params` and its
   return value is silently ignored.
 
-- Internally, publishes to the MQTT topic by `topicMake(event, "event-emission", peerId)`
-  (default: `${event}/event-emission/any` or `${event}/event-emission/${peerId}`).
+- Internally, publishes to the MQTT topic by `topicMake(name, "event-emission", peerId)`
+  (default: `${name}/event-emission/any` or `${name}/event-emission/${peerId}`).
 
 - *Dry-Run Publishing for MQTT Last-Will:*
   When you need to set up an MQTT "last will" message (automatically published
@@ -315,7 +315,7 @@ Emit an event to all subscribers or a specific subscriber ("fire and forget").
     const mqttpDry = new MQTTp<API>(null, { id: "my-client" })
     const will = mqttpDry.emit({
         dry:    true,
-        event:  "example/connection",
+        name:   "example/connection",
         params: [ "close" ],
         [...]
     })

package/doc/mqtt-plus-internals.md

@@ -122,8 +122,6 @@ Exactly one of `result` or `error` is present.
 |----------|------------------------|----------|-------------------------------|
 | `name`   | `string`               | yes      | Sink endpoint name            |
 | `error`  | `string`               | no       | Error message (nak) or absent (ack) |
-| `auth`   | `string[]`             | no       | JWT tokens (max 8)            |
-| `meta`   | `Record<string, any>`  | no       | Arbitrary metadata            |
 | `credit` | `integer`              | no       | Initial flow control credit (min 1) |
 
 ### `sink-push-chunk`
@@ -158,7 +156,6 @@ Exactly one of `result` or `error` is present.
 |----------|------------------------|----------|-------------------------------|
 | `name`   | `string`               | yes      | Source endpoint name          |
 | `error`  | `string`               | no       | Error message (nak) or absent (ack) |
-| `auth`   | `string[]`             | no       | JWT tokens (max 8)            |
 | `meta`   | `Record<string, any>`  | no       | Arbitrary metadata            |
 
 ### `source-fetch-chunk`

package/dst-stage1/mqtt-plus-base.d.ts

@@ -1,4 +1,4 @@
-import { MqttClient, type IClientSubscribeOptions, type IClientPublishOptions } from "mqtt";
+import { type MqttClient, type IClientSubscribeOptions, type IClientPublishOptions } from "mqtt";
 import type { APISchema, Registration } from "./mqtt-plus-api";
 import type { APIOptions } from "./mqtt-plus-options";
 import { TraceTrait } from "./mqtt-plus-trace";

package/dst-stage1/mqtt-plus-event.d.ts

@@ -11,16 +11,16 @@ export declare class EventTrait<T extends APISchema = APISchema> extends AuthTra
         share?: string;
         auth?: AuthOption;
     }): Promise<Registration>;
-    emit<K extends EventKeys<T> & string>(event: K, ...params: Parameters<T[K]>): void;
+    emit<K extends EventKeys<T> & string>(name: K, ...params: Parameters<T[K]>): void;
     emit<K extends EventKeys<T> & string>(config: {
-        event: K;
+        name: K;
         params: Parameters<T[K]>;
         receiver?: string;
         options?: IClientPublishOptions;
         meta?: Record<string, any>;
     }): void;
     emit<K extends EventKeys<T> & string>(config: {
-        event: K;
+        name: K;
         params: Parameters<T[K]>;
         receiver?: string;
         options?: IClientPublishOptions;

package/dst-stage1/mqtt-plus-event.js

@@ -92,7 +92,7 @@ export class EventTrait extends AuthTrait {
     }
     emit(eventOrConfig, ...args) {
         /*  determine actual parameters  */
-        let event;
+        let name;
         let params;
         let receiver;
         let options = {};
@@ -100,7 +100,7 @@ export class EventTrait extends AuthTrait {
         let dry;
         if (typeof eventOrConfig === "object" && eventOrConfig !== null) {
             /*  object-based API  */
-            event = eventOrConfig.event;
+            name = eventOrConfig.name;
             params = eventOrConfig.params;
             receiver = eventOrConfig.receiver;
             options = eventOrConfig.options ?? {};
@@ -109,7 +109,7 @@ export class EventTrait extends AuthTrait {
         }
         else {
             /*  positional API  */
-            event = eventOrConfig;
+            name = eventOrConfig;
             params = args;
         }
         /*  generate unique request id  */
@@ -117,10 +117,10 @@ export class EventTrait extends AuthTrait {
         /*  generate encoded message  */
         const auth = this.authenticate();
         const metaStore = this.metaStore(meta);
-        const request = this.msg.makeEventEmission(requestId, event, params, this.options.id, receiver, auth, metaStore);
+        const request = this.msg.makeEventEmission(requestId, name, params, this.options.id, receiver, auth, metaStore);
         const message = this.codec.encode(request);
         /*  generate corresponding MQTT topic  */
-        const topic = this.options.topicMake(event, "event-emission", receiver);
+        const topic = this.options.topicMake(name, "event-emission", receiver);
         /*  produce result  */
         if (dry)
             /*  return publish information  */
@@ -128,7 +128,7 @@ export class EventTrait extends AuthTrait {
         else
             /*  publish message to MQTT topic  */
             this.publishToTopic(topic, message, { qos: 2, ...options }).catch((err) => {
-                this.error(err, `emitting event "${event}" failed`);
+                this.error(err, `emitting event "${name}" failed`);
             });
     }
 }

package/dst-stage1/mqtt-plus-sink.js

@@ -178,6 +178,7 @@ export class SinkTrait extends SourceTrait {
                 reqSpool.roll(() => { clearPushTimeout(); });
                 /*  prepare info object  */
                 const promise = streamToBuffer(readable);
+                promise.catch(() => { }); /*  avoid unhandled promise rejection  */
                 const info = {
                     sender,
                     stream: readable,
@@ -262,10 +263,19 @@ export class SinkTrait extends SourceTrait {
         /*  define abort controller and signal  */
         const abortController = new AbortController();
         const abortSignal = abortController.signal;
+        /*  ensure stream gets destroyed on abort  */
+        if (data instanceof Readable) {
+            const stream = data;
+            abortSignal.addEventListener("abort", () => {
+                if (!stream.destroyed)
+                    stream.destroy(ensureError(abortSignal.reason));
+            }, { once: true });
+        }
         /*  utility function for timeout refresh  */
         const pushTimerId = `sink-push-send:${requestId}`;
         const refreshTimeout = () => this.timerRefresh(pushTimerId, () => {
-            abortController.abort(new Error(`push to sink "${name}" timed out`));
+            const error = new Error(`push to sink "${name}" timed out`);
+            abortController.abort(error);
             spool.unroll();
         });
         spool.roll(() => { this.timerClear(pushTimerId); });
@@ -274,6 +284,7 @@ export class SinkTrait extends SourceTrait {
         /*  send request and wait for response before sending chunks  */
         let initialCredit;
         let creditGate;
+        let remoteError = false;
         try {
             await new Promise((resolve, reject) => {
                 /*  handle abort signal  */
@@ -304,8 +315,10 @@ export class SinkTrait extends SourceTrait {
             });
             /*  override handler for mid-stream (error) responses  */
             this.onResponse.set(`sink-push-response:${requestId}`, (response) => {
-                if (response.error)
+                if (response.error) {
+                    remoteError = true;
                     abortController.abort(new Error(response.error));
+                }
             });
             /*  create credit gate for flow control (if server granted credit)  */
             if (initialCredit !== undefined && initialCredit > 0)
@@ -342,12 +355,13 @@ export class SinkTrait extends SourceTrait {
                 await sendBufferAsChunks(data, this.options.chunkSize, sendChunk, creditGate, abortSignal);
         }
         catch (err) {
-            /*  send error chunk only if receiver is known
+            const error = ensureError(err);
+            abortController.abort(error);
+            /*  send error chunk only if receiver is known and error did not originate from receiver
                 (otherwise the sink already received the error via the nak response)  */
-            if (receiver !== undefined) {
-                const error = ensureError(err).message;
+            if (receiver !== undefined && !remoteError) {
                 const chunkTopic = this.options.topicMake(name, "sink-push-chunk", receiver);
-                const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, undefined, error, true, this.options.id, receiver);
+                const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, undefined, error.message, true, this.options.id, receiver);
                 const message = this.codec.encode(chunkMsg);
                 await this.publishToTopic(chunkTopic, message, { qos: 2, ...options }).catch(() => { });
             }

package/dst-stage1/mqtt-plus-source.d.ts

@@ -6,6 +6,7 @@ import { ServiceTrait } from "./mqtt-plus-service";
 import type { AuthOption } from "./mqtt-plus-auth";
 export declare class SourceTrait<T extends APISchema = APISchema> extends ServiceTrait<T> {
     private sourceCreditGates;
+    private sourceControllers;
     destroy(): Promise<void>;
     source<K extends SourceKeys<T> & string>(name: K, callback: WithInfo<T[K], InfoSource>): Promise<Registration>;
     source<K extends SourceKeys<T> & string>(config: {

package/dst-stage1/mqtt-plus-source.js

@@ -34,9 +34,13 @@ export class SourceTrait extends ServiceTrait {
         super(...arguments);
         /*  source state  */
         this.sourceCreditGates = new Map();
+        this.sourceControllers = new Map();
     }
     /*  destroy source trait  */
     async destroy() {
+        for (const controller of this.sourceControllers.values())
+            controller.abort(new Error("source destroyed"));
+        this.sourceControllers.clear();
         for (const gate of this.sourceCreditGates.values())
             gate.abort();
         this.sourceCreditGates.clear();
@@ -98,14 +102,25 @@ export class SourceTrait extends ServiceTrait {
             };
             /*  define abort controller and signal  */
             const abortController = new AbortController();
+            this.sourceControllers.set(requestId, abortController);
             const abortSignal = abortController.signal;
+            /*  ensure stream gets destroyed on abort  */
+            abortSignal.addEventListener("abort", () => {
+                if (info.stream instanceof Readable && !info.stream.destroyed)
+                    info.stream.destroy(ensureError(abortSignal.reason));
+            }, { once: true });
             /*  utility functions for timeout management  */
             const sourceTimerId = `source-fetch-send:${requestId}`;
             const refreshSourceTimeout = () => this.timerRefresh(sourceTimerId, () => {
-                abortController.abort(new Error(`source fetch "${name}" timed out`));
+                const error = new Error(`source fetch "${name}" timed out`);
+                abortController.abort(error);
                 const gate = this.sourceCreditGates.get(requestId);
-                if (gate !== undefined)
+                if (gate !== undefined) {
                     gate.abort();
+                    this.sourceCreditGates.delete(requestId);
+                }
+                this.sourceControllers.delete(requestId);
+                this.onResponse.delete(`source-fetch-credit:${requestId}`);
             });
             const clearSourceTimeout = () => this.timerClear(sourceTimerId);
             refreshSourceTimeout();
@@ -158,8 +173,7 @@ export class SourceTrait extends ServiceTrait {
             catch (err) {
                 /*  cleanup stream resource (if provided by handler)  */
                 const error = ensureError(err, `handler for source "${name}" failed`);
-                if (info.stream instanceof Readable && !info.stream.destroyed)
-                    info.stream.destroy(error);
+                abortController.abort(error);
                 /*  send error as nak response or as error chunk  */
                 this.error(error);
                 if (ackSent)
@@ -174,6 +188,7 @@ export class SourceTrait extends ServiceTrait {
                     creditGate.abort();
                     this.sourceCreditGates.delete(requestId);
                 }
+                this.sourceControllers.delete(requestId);
                 this.onResponse.delete(`source-fetch-credit:${requestId}`);
             }
         });
@@ -248,6 +263,7 @@ export class SourceTrait extends ServiceTrait {
         });
         /*  create promise for collecting stream chunks  */
         const buffer = streamToBuffer(stream);
+        buffer.catch(() => { }); /*  avoid unhandled promise rejection  */
         /*  create promise for meta (resolved on first chunk)  */
         let metaResolve;
         const metaP = new Promise((resolve) => {

package/dst-stage1/mqtt-plus-timer.d.ts

@@ -3,6 +3,6 @@ import { SubscriptionTrait } from "./mqtt-plus-subscription";
 export declare class TimerTrait<T extends APISchema = APISchema> extends SubscriptionTrait<T> {
     private timers;
     destroy(): Promise<void>;
-    protected timerRefresh(id: string, onTimeout: () => void): void;
+    protected timerRefresh(id: string, onTimeout: () => void | Promise<void>): void;
     protected timerClear(id: string): void;
 }

package/dst-stage1/mqtt-plus-timer.js

@@ -22,6 +22,7 @@
 **  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 import { SubscriptionTrait } from "./mqtt-plus-subscription";
+import { ensureError } from "./mqtt-plus-error";
 /*  Timer trait with reusable timer management  */
 export class TimerTrait extends SubscriptionTrait {
     constructor() {
@@ -41,9 +42,14 @@ export class TimerTrait extends SubscriptionTrait {
         const timer = this.timers.get(id);
         if (timer !== undefined)
             clearTimeout(timer);
-        this.timers.set(id, setTimeout(() => {
+        this.timers.set(id, setTimeout(async () => {
             this.timers.delete(id);
-            onTimeout();
+            try {
+                await onTimeout();
+            }
+            catch (err) {
+                this.error(ensureError(err), `timer "${id}" failed`);
+            }
         }, this.options.timeout));
     }
     /*  clear a named timer  */

package/dst-stage1/mqtt-plus-util.js

@@ -49,7 +49,9 @@ export class CreditGate {
             /*  wait for credit to be replenished  */
             await new Promise((resolve, reject) => {
                 const onAbort = () => {
-                    this.waiters.splice(this.waiters.indexOf(waiter), 1);
+                    const idx = this.waiters.indexOf(waiter);
+                    if (idx !== -1)
+                        this.waiters.splice(idx, 1);
                     reject(abortSignal?.reason ?? new Error("aborted"));
                 };
                 if (abortSignal)

package/dst-stage1/mqtt-plus.d.ts

@@ -2,6 +2,6 @@ import type { APISchema } from "./mqtt-plus-api";
 import { SinkTrait } from "./mqtt-plus-sink";
 export type * from "./mqtt-plus-api";
 export type * from "./mqtt-plus-info";
-export * from "./mqtt-plus-version";
+export type * from "./mqtt-plus-version";
 export default class MQTTp<T extends APISchema = APISchema> extends SinkTrait<T> {
 }

package/dst-stage1/mqtt-plus.js

@@ -22,7 +22,6 @@
 **  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 import { SinkTrait } from "./mqtt-plus-sink";
-export * from "./mqtt-plus-version";
 /*  export the default API class  */
 export default class MQTTp extends SinkTrait {
 }

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

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const node_stream = require("node:stream");
 const nanoid = require("nanoid");
 const node_buffer = require("node:buffer");
@@ -50,7 +49,9 @@ class CreditGate {
     else
       await new Promise((resolve, reject) => {
         const onAbort = () => {
-          this.waiters.splice(this.waiters.indexOf(waiter), 1);
+          const idx = this.waiters.indexOf(waiter);
+          if (idx !== -1)
+            this.waiters.splice(idx, 1);
           reject(abortSignal?.reason ?? new Error("aborted"));
         };
         if (abortSignal)
@@ -1213,9 +1214,13 @@ class TimerTrait extends SubscriptionTrait {
     const timer = this.timers.get(id);
     if (timer !== void 0)
       clearTimeout(timer);
-    this.timers.set(id, setTimeout(() => {
+    this.timers.set(id, setTimeout(async () => {
       this.timers.delete(id);
-      onTimeout();
+      try {
+        await onTimeout();
+      } catch (err) {
+        this.error(ensureError(err), `timer "${id}" failed`);
+      }
     }, this.options.timeout));
   }
   /*  clear a named timer  */
@@ -1399,34 +1404,34 @@ class EventTrait extends AuthTrait {
     return this.makeRegistration(spool, "event", name, `event-emission:${name}`);
   }
   emit(eventOrConfig, ...args) {
-    let event;
+    let name;
     let params;
     let receiver;
     let options = {};
     let meta;
     let dry;
     if (typeof eventOrConfig === "object" && eventOrConfig !== null) {
-      event = eventOrConfig.event;
+      name = eventOrConfig.name;
       params = eventOrConfig.params;
       receiver = eventOrConfig.receiver;
       options = eventOrConfig.options ?? {};
       meta = eventOrConfig.meta;
       dry = eventOrConfig.dry;
     } else {
-      event = eventOrConfig;
+      name = eventOrConfig;
       params = args;
     }
     const requestId = nanoid.nanoid();
     const auth = this.authenticate();
     const metaStore = this.metaStore(meta);
-    const request = this.msg.makeEventEmission(requestId, event, params, this.options.id, receiver, auth, metaStore);
+    const request = this.msg.makeEventEmission(requestId, name, params, this.options.id, receiver, auth, metaStore);
     const message = this.codec.encode(request);
-    const topic = this.options.topicMake(event, "event-emission", receiver);
+    const topic = this.options.topicMake(name, "event-emission", receiver);
     if (dry)
       return { topic, payload: message, options: { qos: 2, ...options } };
     else
       this.publishToTopic(topic, message, { qos: 2, ...options }).catch((err) => {
-        this.error(err, `emitting event "${event}" failed`);
+        this.error(err, `emitting event "${name}" failed`);
       });
   }
 }
@@ -1552,9 +1557,13 @@ class SourceTrait extends ServiceTrait {
   constructor() {
     super(...arguments);
     this.sourceCreditGates = /* @__PURE__ */ new Map();
+    this.sourceControllers = /* @__PURE__ */ new Map();
   }
   /*  destroy source trait  */
   async destroy() {
+    for (const controller of this.sourceControllers.values())
+      controller.abort(new Error("source destroyed"));
+    this.sourceControllers.clear();
     for (const gate of this.sourceCreditGates.values())
       gate.abort();
     this.sourceCreditGates.clear();
@@ -1604,13 +1613,23 @@ class SourceTrait extends ServiceTrait {
         await this.publishToTopic(responseTopic, message, { qos: options.qos ?? 2 });
       };
       const abortController = new AbortController();
+      this.sourceControllers.set(requestId, abortController);
       const abortSignal = abortController.signal;
+      abortSignal.addEventListener("abort", () => {
+        if (info.stream instanceof node_stream.Readable && !info.stream.destroyed)
+          info.stream.destroy(ensureError(abortSignal.reason));
+      }, { once: true });
       const sourceTimerId = `source-fetch-send:${requestId}`;
       const refreshSourceTimeout = () => this.timerRefresh(sourceTimerId, () => {
-        abortController.abort(new Error(`source fetch "${name}" timed out`));
+        const error = new Error(`source fetch "${name}" timed out`);
+        abortController.abort(error);
         const gate = this.sourceCreditGates.get(requestId);
-        if (gate !== void 0)
+        if (gate !== void 0) {
           gate.abort();
+          this.sourceCreditGates.delete(requestId);
+        }
+        this.sourceControllers.delete(requestId);
+        this.onResponse.delete(`source-fetch-credit:${requestId}`);
       });
       const clearSourceTimeout = () => this.timerClear(sourceTimerId);
       refreshSourceTimeout();
@@ -1652,8 +1671,7 @@ class SourceTrait extends ServiceTrait {
           await sendBufferAsChunks(await info.buffer, this.options.chunkSize, sendChunk, creditGate, abortSignal);
       } catch (err) {
         const error = ensureError(err, `handler for source "${name}" failed`);
-        if (info.stream instanceof node_stream.Readable && !info.stream.destroyed)
-          info.stream.destroy(error);
+        abortController.abort(error);
         this.error(error);
         if (ackSent)
           await sendChunk(void 0, error.message, true).catch(() => {
@@ -1667,6 +1685,7 @@ class SourceTrait extends ServiceTrait {
           creditGate.abort();
           this.sourceCreditGates.delete(requestId);
         }
+        this.sourceControllers.delete(requestId);
         this.onResponse.delete(`source-fetch-credit:${requestId}`);
       }
     });
@@ -1730,6 +1749,8 @@ class SourceTrait extends ServiceTrait {
       }
     });
     const buffer = streamToBuffer(stream);
+    buffer.catch(() => {
+    });
     let metaResolve;
     const metaP = new Promise((resolve) => {
       metaResolve = resolve;
@@ -1944,6 +1965,8 @@ class SinkTrait extends SourceTrait {
           clearPushTimeout();
         });
         const promise = streamToBuffer(readable);
+        promise.catch(() => {
+        });
         const info = {
           sender,
           stream: readable,
@@ -2014,9 +2037,17 @@ class SinkTrait extends SourceTrait {
     spool.roll(() => this.subscriptions.unsubscribe(responseTopic));
     const abortController = new AbortController();
     const abortSignal = abortController.signal;
+    if (data instanceof node_stream.Readable) {
+      const stream = data;
+      abortSignal.addEventListener("abort", () => {
+        if (!stream.destroyed)
+          stream.destroy(ensureError(abortSignal.reason));
+      }, { once: true });
+    }
     const pushTimerId = `sink-push-send:${requestId}`;
     const refreshTimeout = () => this.timerRefresh(pushTimerId, () => {
-      abortController.abort(new Error(`push to sink "${name}" timed out`));
+      const error = new Error(`push to sink "${name}" timed out`);
+      abortController.abort(error);
       spool.unroll();
     });
     spool.roll(() => {
@@ -2025,6 +2056,7 @@ class SinkTrait extends SourceTrait {
     refreshTimeout();
     let initialCredit;
     let creditGate;
+    let remoteError = false;
     try {
       await new Promise((resolve, reject) => {
         const onAbort = () => {
@@ -2057,8 +2089,10 @@ class SinkTrait extends SourceTrait {
         });
       });
       this.onResponse.set(`sink-push-response:${requestId}`, (response) => {
-        if (response.error)
+        if (response.error) {
+          remoteError = true;
           abortController.abort(new Error(response.error));
+        }
       });
       if (initialCredit !== void 0 && initialCredit > 0)
         creditGate = new CreditGate(initialCredit);
@@ -2090,10 +2124,11 @@ class SinkTrait extends SourceTrait {
       else if (data instanceof Uint8Array)
         await sendBufferAsChunks(data, this.options.chunkSize, sendChunk, creditGate, abortSignal);
     } catch (err) {
-      if (receiver !== void 0) {
-        const error = ensureError(err).message;
+      const error = ensureError(err);
+      abortController.abort(error);
+      if (receiver !== void 0 && !remoteError) {
         const chunkTopic = this.options.topicMake(name, "sink-push-chunk", receiver);
-        const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, void 0, error, true, this.options.id, receiver);
+        const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, void 0, error.message, true, this.options.id, receiver);
         const message = this.codec.encode(chunkMsg);
         await this.publishToTopic(chunkTopic, message, { qos: 2, ...options }).catch(() => {
         });
@@ -2106,7 +2141,4 @@ class SinkTrait extends SourceTrait {
 }
 class MQTTp extends SinkTrait {
 }
-exports.VERSION = VERSION;
-exports.default = MQTTp;
-exports.version = version;
-exports.versionToNum = versionToNum;
+module.exports = MQTTp;