mqtt-plus 1.4.13 → 1.4.14

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":                           "mqtt-plus",
-    "version":                        "1.4.13",
+    "version":                        "1.4.14",
     "description":                    "MQTT Communication Patterns",
     "keywords":                       [   "mqtt",
                                           "event", "emit",

package/src/mqtt-plus-sink.ts

@@ -162,6 +162,8 @@ export class SinkTrait<T extends APISchema = APISchema> extends SourceTrait<T> {
                 /*  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"))
@@ -201,6 +203,7 @@ export class SinkTrait<T extends APISchema = APISchema> extends SourceTrait<T> {
                         return
                     if (chunkParsed.error !== undefined) {
                         streamEnded = true
+                        clearPushTimeout()
                         readable.destroy(new Error(chunkParsed.error))
                     }
                     else {
@@ -212,6 +215,7 @@ export class SinkTrait<T extends APISchema = APISchema> extends SourceTrait<T> {
                         }
                         if (chunkParsed.final) {
                             streamEnded = true
+                            clearPushTimeout()
                             readable.push(null)
                         }
                     }
@@ -382,6 +386,7 @@ export class SinkTrait<T extends APISchema = APISchema> extends SourceTrait<T> {
         let remoteError           = false
         let pushAcked             = false
         let pushFinalized         = false
+        let pushDataFinalSent     = false
         let pushFinalizeResolve!: () => void
         let pushFinalizeReject!:  (reason?: any) => void
         const pushFinalize        = new Promise<void>((resolve, reject) => {
@@ -465,6 +470,8 @@ export class SinkTrait<T extends APISchema = APISchema> extends SourceTrait<T> {
                     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  */
@@ -491,8 +498,9 @@ export class SinkTrait<T extends APISchema = APISchema> extends SourceTrait<T> {
             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)

package/src/mqtt-plus-source.ts

@@ -142,6 +142,13 @@ export class SourceTrait<T extends APISchema = APISchema> extends ServiceTrait<T
                 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)
@@ -163,11 +170,11 @@ export class SourceTrait<T extends APISchema = APISchema> extends ServiceTrait<T
                     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 (
@@ -185,6 +192,7 @@ export class SourceTrait<T extends APISchema = APISchema> extends ServiceTrait<T
             /*  call the handler callback  */
             let ackSent = false
             let creditGate: CreditGate | undefined
+            let cancelledByFetcher = false
             try {
                 if (topicName !== request.name)
                     throw new Error(`source name mismatch (topic: "${topicName}", payload: "${request.name}")`)
@@ -197,13 +205,19 @@ export class SourceTrait<T extends APISchema = APISchema> extends ServiceTrait<T
                 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: SourceFetchCredit) => {
                     if (creditParsed.credit === 0) {
                         /*  cancel signal from fetcher  */
+                        cancelledByFetcher = true
                         abortController.abort(new Error(`source fetch "${name}" cancelled by fetcher`))
                         return
                     }
@@ -238,22 +252,19 @@ export class SourceTrait<T extends APISchema = APISchema> extends ServiceTrait<T
                 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}`) })