mqtt-plus 1.4.13 → 1.4.14

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 ChangeLog
 =========
 
+1.4.14 (2026-03-11)
+-------------------
+
+- CLEANUP: align resource handling in source trait with sink trait
+
 1.4.13 (2026-03-10)
 -------------------
 

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

@@ -115,6 +115,8 @@ export class SinkTrait extends SourceTrait {
                 /*  utility functions for timeout management  */
                 const pushTimerId = `sink-push-recv:${requestId}`;
                 const refreshPushTimeout = () => this.timerRefresh(pushTimerId, () => {
+                    if (streamEnded)
+                        return;
                     const stream = this.pushStreams.get(requestId);
                     if (stream !== undefined)
                         stream.destroy(new Error("push stream timeout"));
@@ -150,6 +152,7 @@ export class SinkTrait extends SourceTrait {
                         return;
                     if (chunkParsed.error !== undefined) {
                         streamEnded = true;
+                        clearPushTimeout();
                         readable.destroy(new Error(chunkParsed.error));
                     }
                     else {
@@ -161,6 +164,7 @@ export class SinkTrait extends SourceTrait {
                         }
                         if (chunkParsed.final) {
                             streamEnded = true;
+                            clearPushTimeout();
                             readable.push(null);
                         }
                     }
@@ -286,6 +290,7 @@ export class SinkTrait extends SourceTrait {
         let remoteError = false;
         let pushAcked = false;
         let pushFinalized = false;
+        let pushDataFinalSent = false;
         let pushFinalizeResolve;
         let pushFinalizeReject;
         const pushFinalize = new Promise((resolve, reject) => {
@@ -355,6 +360,8 @@ export class SinkTrait extends SourceTrait {
                 const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, chunk, error, final, this.options.id, receiver);
                 const message = this.codec.encode(chunkMsg);
                 await this.publishToTopic(chunkTopic, message, { qos: 2, ...options });
+                if (error === undefined && final)
+                    pushDataFinalSent = true;
             };
             /*  iterate over all chunks of the buffer  */
             if (data instanceof Readable)
@@ -378,8 +385,9 @@ export class SinkTrait extends SourceTrait {
             const error = ensureError(err);
             abortController.abort(error);
             /*  send error chunk only if push was acked and error did not originate from receiver
-                (before ack, the sink has no chunk handler yet and will time out on its own)  */
-            if (pushAcked && !remoteError) {
+                (before ack, the sink has no chunk handler yet and will time out on its own;
+                after final data chunk, no additional terminal chunk should be sent)  */
+            if (pushAcked && !remoteError && !pushDataFinalSent) {
                 const chunkTopic = this.options.topicMake(name, "sink-push-request", receiver);
                 const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, undefined, error.message, true, this.options.id, receiver);
                 const message = this.codec.encode(chunkMsg);

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

@@ -98,6 +98,12 @@ export class SourceTrait extends ServiceTrait {
                 const message = this.codec.encode(response);
                 await this.publishToTopic(responseTopic, message, { qos: options.qos ?? 2 });
             };
+            /*  create a resource spool for request cleanup  */
+            const reqSpool = new Spool();
+            reqSpool.roll(() => {
+                this.onResponse.delete(`source-fetch-credit:${requestId}`);
+                this.sourceControllers.delete(requestId);
+            });
             /*  define abort controller and signal  */
             const abortController = new AbortController();
             this.sourceControllers.set(requestId, abortController);
@@ -117,11 +123,11 @@ export class SourceTrait extends ServiceTrait {
                     gate.abort();
                     this.sourceCreditGates.delete(requestId);
                 }
-                this.sourceControllers.delete(requestId);
-                this.onResponse.delete(`source-fetch-credit:${requestId}`);
+                reqSpool.unroll();
             });
             const clearSourceTimeout = () => this.timerClear(sourceTimerId);
             refreshSourceTimeout();
+            reqSpool.roll(() => { clearSourceTimeout(); });
             /*  callback for creating and sending a chunk message  */
             const sendChunk = async (chunk, error, final) => {
                 refreshSourceTimeout();
@@ -132,6 +138,7 @@ export class SourceTrait extends ServiceTrait {
             /*  call the handler callback  */
             let ackSent = false;
             let creditGate;
+            let cancelledByFetcher = false;
             try {
                 if (topicName !== request.name)
                     throw new Error(`source name mismatch (topic: "${topicName}", payload: "${request.name}")`);
@@ -143,12 +150,18 @@ export class SourceTrait extends ServiceTrait {
                 const initialCredit = request.credit;
                 creditGate = (initialCredit !== undefined && initialCredit > 0)
                     ? new CreditGate(initialCredit) : undefined;
-                if (creditGate)
+                if (creditGate) {
                     this.sourceCreditGates.set(requestId, creditGate);
+                    reqSpool.roll(() => {
+                        creditGate.abort();
+                        this.sourceCreditGates.delete(requestId);
+                    });
+                }
                 /*  register credit/cancel handler (unconditional for cancel support)  */
                 this.onResponse.set(`source-fetch-credit:${requestId}`, (creditParsed) => {
                     if (creditParsed.credit === 0) {
                         /*  cancel signal from fetcher  */
+                        cancelledByFetcher = true;
                         abortController.abort(new Error(`source fetch "${name}" cancelled by fetcher`));
                         return;
                     }
@@ -178,22 +191,19 @@ export class SourceTrait extends ServiceTrait {
                 /*  cleanup stream resource (if provided by handler)  */
                 const error = ensureError(err, `handler for source "${name}" failed`);
                 abortController.abort(error);
-                /*  send error as nak response or as error chunk  */
-                this.error(error);
-                if (ackSent)
-                    await sendChunk(undefined, error.message, true).catch(() => { });
-                else
-                    await sendResponse(error.message).catch(() => { });
+                /*  on explicit fetcher cancellation, abort silently without emitting error responses  */
+                if (!cancelledByFetcher) {
+                    /*  send error as nak response or as error chunk  */
+                    this.error(error);
+                    if (ackSent)
+                        await sendChunk(undefined, error.message, true).catch(() => { });
+                    else
+                        await sendResponse(error.message).catch(() => { });
+                }
             }
             finally {
                 /*  cleanup resources  */
-                clearSourceTimeout();
-                if (creditGate) {
-                    creditGate.abort();
-                    this.sourceCreditGates.delete(requestId);
-                }
-                this.sourceControllers.delete(requestId);
-                this.onResponse.delete(`source-fetch-credit:${requestId}`);
+                await reqSpool.unroll();
             }
         });
         spool.roll(() => { this.onRequest.delete(`source-fetch-request:${name}`); });

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

@@ -1626,6 +1626,11 @@ class SourceTrait extends ServiceTrait {
         const message = this.codec.encode(response);
         await this.publishToTopic(responseTopic, message, { qos: options.qos ?? 2 });
       };
+      const reqSpool = new Spool();
+      reqSpool.roll(() => {
+        this.onResponse.delete(`source-fetch-credit:${requestId}`);
+        this.sourceControllers.delete(requestId);
+      });
       const abortController = new AbortController();
       this.sourceControllers.set(requestId, abortController);
       const abortSignal = abortController.signal;
@@ -1642,11 +1647,13 @@ class SourceTrait extends ServiceTrait {
           gate.abort();
           this.sourceCreditGates.delete(requestId);
         }
-        this.sourceControllers.delete(requestId);
-        this.onResponse.delete(`source-fetch-credit:${requestId}`);
+        reqSpool.unroll();
       });
       const clearSourceTimeout = () => this.timerClear(sourceTimerId);
       refreshSourceTimeout();
+      reqSpool.roll(() => {
+        clearSourceTimeout();
+      });
       const sendChunk = async (chunk, error, final) => {
         refreshSourceTimeout();
         const chunkMsg = this.msg.makeSourceFetchChunk(requestId, name, chunk, error, final, this.options.id, sender);
@@ -1655,6 +1662,7 @@ class SourceTrait extends ServiceTrait {
       };
       let ackSent = false;
       let creditGate;
+      let cancelledByFetcher = false;
       try {
         if (topicName !== request.name)
           throw new Error(`source name mismatch (topic: "${topicName}", payload: "${request.name}")`);
@@ -1664,10 +1672,16 @@ class SourceTrait extends ServiceTrait {
           throw new Error(`source "${name}" failed authentication`);
         const initialCredit = request.credit;
         creditGate = initialCredit !== void 0 && initialCredit > 0 ? new CreditGate(initialCredit) : void 0;
-        if (creditGate)
+        if (creditGate) {
           this.sourceCreditGates.set(requestId, creditGate);
+          reqSpool.roll(() => {
+            creditGate.abort();
+            this.sourceCreditGates.delete(requestId);
+          });
+        }
         this.onResponse.set(`source-fetch-credit:${requestId}`, (creditParsed) => {
           if (creditParsed.credit === 0) {
+            cancelledByFetcher = true;
             abortController.abort(new Error(`source fetch "${name}" cancelled by fetcher`));
             return;
           }
@@ -1690,21 +1704,17 @@ class SourceTrait extends ServiceTrait {
       } catch (err) {
         const error = ensureError(err, `handler for source "${name}" failed`);
         abortController.abort(error);
-        this.error(error);
-        if (ackSent)
-          await sendChunk(void 0, error.message, true).catch(() => {
-          });
-        else
-          await sendResponse(error.message).catch(() => {
-          });
-      } finally {
-        clearSourceTimeout();
-        if (creditGate) {
-          creditGate.abort();
-          this.sourceCreditGates.delete(requestId);
+        if (!cancelledByFetcher) {
+          this.error(error);
+          if (ackSent)
+            await sendChunk(void 0, error.message, true).catch(() => {
+            });
+          else
+            await sendResponse(error.message).catch(() => {
+            });
         }
-        this.sourceControllers.delete(requestId);
-        this.onResponse.delete(`source-fetch-credit:${requestId}`);
+      } finally {
+        await reqSpool.unroll();
       }
     });
     spool.roll(() => {
@@ -1929,6 +1939,8 @@ class SinkTrait extends SourceTrait {
         } : void 0;
         const pushTimerId = `sink-push-recv:${requestId}`;
         const refreshPushTimeout = () => this.timerRefresh(pushTimerId, () => {
+          if (streamEnded)
+            return;
           const stream = this.pushStreams.get(requestId);
           if (stream !== void 0)
             stream.destroy(new Error("push stream timeout"));
@@ -1965,6 +1977,7 @@ class SinkTrait extends SourceTrait {
             return;
           if (chunkParsed.error !== void 0) {
             streamEnded = true;
+            clearPushTimeout();
             readable.destroy(new Error(chunkParsed.error));
           } else {
             refreshPushTimeout();
@@ -1975,6 +1988,7 @@ class SinkTrait extends SourceTrait {
             }
             if (chunkParsed.final) {
               streamEnded = true;
+              clearPushTimeout();
               readable.push(null);
             }
           }
@@ -2087,6 +2101,7 @@ class SinkTrait extends SourceTrait {
     let remoteError = false;
     let pushAcked = false;
     let pushFinalized = false;
+    let pushDataFinalSent = false;
     let pushFinalizeResolve;
     let pushFinalizeReject;
     const pushFinalize = new Promise((resolve, reject) => {
@@ -2158,6 +2173,8 @@ class SinkTrait extends SourceTrait {
         const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, chunk, error, final, this.options.id, receiver);
         const message = this.codec.encode(chunkMsg);
         await this.publishToTopic(chunkTopic, message, { qos: 2, ...options });
+        if (error === void 0 && final)
+          pushDataFinalSent = true;
       };
       if (data instanceof node_stream.Readable)
         await sendStreamAsChunks(data, this.options.chunkSize, sendChunk, creditGate, abortSignal);
@@ -2177,7 +2194,7 @@ class SinkTrait extends SourceTrait {
     } catch (err) {
       const error = ensureError(err);
       abortController.abort(error);
-      if (pushAcked && !remoteError) {
+      if (pushAcked && !remoteError && !pushDataFinalSent) {
         const chunkTopic = this.options.topicMake(name, "sink-push-request", receiver);
         const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, void 0, error.message, true, this.options.id, receiver);
         const message = this.codec.encode(chunkMsg);

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

@@ -1605,6 +1605,11 @@ class SourceTrait extends ServiceTrait {
         const message = this.codec.encode(response);
         await this.publishToTopic(responseTopic, message, { qos: options.qos ?? 2 });
       };
+      const reqSpool = new Spool();
+      reqSpool.roll(() => {
+        this.onResponse.delete(`source-fetch-credit:${requestId}`);
+        this.sourceControllers.delete(requestId);
+      });
       const abortController = new AbortController();
       this.sourceControllers.set(requestId, abortController);
       const abortSignal = abortController.signal;
@@ -1621,11 +1626,13 @@ class SourceTrait extends ServiceTrait {
           gate.abort();
           this.sourceCreditGates.delete(requestId);
         }
-        this.sourceControllers.delete(requestId);
-        this.onResponse.delete(`source-fetch-credit:${requestId}`);
+        reqSpool.unroll();
       });
       const clearSourceTimeout = () => this.timerClear(sourceTimerId);
       refreshSourceTimeout();
+      reqSpool.roll(() => {
+        clearSourceTimeout();
+      });
       const sendChunk = async (chunk, error, final) => {
         refreshSourceTimeout();
         const chunkMsg = this.msg.makeSourceFetchChunk(requestId, name, chunk, error, final, this.options.id, sender);
@@ -1634,6 +1641,7 @@ class SourceTrait extends ServiceTrait {
       };
       let ackSent = false;
       let creditGate;
+      let cancelledByFetcher = false;
       try {
         if (topicName !== request.name)
           throw new Error(`source name mismatch (topic: "${topicName}", payload: "${request.name}")`);
@@ -1643,10 +1651,16 @@ class SourceTrait extends ServiceTrait {
           throw new Error(`source "${name}" failed authentication`);
         const initialCredit = request.credit;
         creditGate = initialCredit !== void 0 && initialCredit > 0 ? new CreditGate(initialCredit) : void 0;
-        if (creditGate)
+        if (creditGate) {
           this.sourceCreditGates.set(requestId, creditGate);
+          reqSpool.roll(() => {
+            creditGate.abort();
+            this.sourceCreditGates.delete(requestId);
+          });
+        }
         this.onResponse.set(`source-fetch-credit:${requestId}`, (creditParsed) => {
           if (creditParsed.credit === 0) {
+            cancelledByFetcher = true;
             abortController.abort(new Error(`source fetch "${name}" cancelled by fetcher`));
             return;
           }
@@ -1669,21 +1683,17 @@ class SourceTrait extends ServiceTrait {
       } catch (err) {
         const error = ensureError(err, `handler for source "${name}" failed`);
         abortController.abort(error);
-        this.error(error);
-        if (ackSent)
-          await sendChunk(void 0, error.message, true).catch(() => {
-          });
-        else
-          await sendResponse(error.message).catch(() => {
-          });
-      } finally {
-        clearSourceTimeout();
-        if (creditGate) {
-          creditGate.abort();
-          this.sourceCreditGates.delete(requestId);
+        if (!cancelledByFetcher) {
+          this.error(error);
+          if (ackSent)
+            await sendChunk(void 0, error.message, true).catch(() => {
+            });
+          else
+            await sendResponse(error.message).catch(() => {
+            });
         }
-        this.sourceControllers.delete(requestId);
-        this.onResponse.delete(`source-fetch-credit:${requestId}`);
+      } finally {
+        await reqSpool.unroll();
       }
     });
     spool.roll(() => {
@@ -1908,6 +1918,8 @@ class SinkTrait extends SourceTrait {
         } : void 0;
         const pushTimerId = `sink-push-recv:${requestId}`;
         const refreshPushTimeout = () => this.timerRefresh(pushTimerId, () => {
+          if (streamEnded)
+            return;
           const stream = this.pushStreams.get(requestId);
           if (stream !== void 0)
             stream.destroy(new Error("push stream timeout"));
@@ -1944,6 +1956,7 @@ class SinkTrait extends SourceTrait {
             return;
           if (chunkParsed.error !== void 0) {
             streamEnded = true;
+            clearPushTimeout();
             readable.destroy(new Error(chunkParsed.error));
           } else {
             refreshPushTimeout();
@@ -1954,6 +1967,7 @@ class SinkTrait extends SourceTrait {
             }
             if (chunkParsed.final) {
               streamEnded = true;
+              clearPushTimeout();
               readable.push(null);
             }
           }
@@ -2066,6 +2080,7 @@ class SinkTrait extends SourceTrait {
     let remoteError = false;
     let pushAcked = false;
     let pushFinalized = false;
+    let pushDataFinalSent = false;
     let pushFinalizeResolve;
     let pushFinalizeReject;
     const pushFinalize = new Promise((resolve, reject) => {
@@ -2137,6 +2152,8 @@ class SinkTrait extends SourceTrait {
         const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, chunk, error, final, this.options.id, receiver);
         const message = this.codec.encode(chunkMsg);
         await this.publishToTopic(chunkTopic, message, { qos: 2, ...options });
+        if (error === void 0 && final)
+          pushDataFinalSent = true;
       };
       if (data instanceof Readable)
         await sendStreamAsChunks(data, this.options.chunkSize, sendChunk, creditGate, abortSignal);
@@ -2156,7 +2173,7 @@ class SinkTrait extends SourceTrait {
     } catch (err) {
       const error = ensureError(err);
       abortController.abort(error);
-      if (pushAcked && !remoteError) {
+      if (pushAcked && !remoteError && !pushDataFinalSent) {
         const chunkTopic = this.options.topicMake(name, "sink-push-request", receiver);
         const chunkMsg = this.msg.makeSinkPushChunk(requestId, name, void 0, error.message, true, this.options.id, receiver);
         const message = this.codec.encode(chunkMsg);