mqtt-plus 1.4.25 → 1.4.26

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

@@ -1,3 +1,7 @@
+Object.defineProperties(exports, {
+	__esModule: { value: true },
+	[Symbol.toStringTag]: { value: "Module" }
+});
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -15,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -146,6 +150,7 @@ var ReadableTee = class extends node_stream.Readable {
 	}
 };
 async function sendBufferAsChunks(buffer, chunkSize, sendChunk, creditGate, abortSignal) {
+	if (!(Number.isFinite(chunkSize) && chunkSize > 0)) throw new Error("invalid chunk size");
 	if (buffer.byteLength === 0) await sendChunk(void 0, void 0, true);
 	else for (let i = 0; i < buffer.byteLength; i += chunkSize) {
 		if (abortSignal?.aborted) throw abortSignal.reason ?? /* @__PURE__ */ new Error("aborted");
@@ -157,6 +162,7 @@ async function sendBufferAsChunks(buffer, chunkSize, sendChunk, creditGate, abor
 	}
 }
 async function sendStreamAsChunks(readable, chunkSize, sendChunk, creditGate, abortSignal) {
+	if (!(Number.isFinite(chunkSize) && chunkSize > 0)) throw new Error("invalid chunk size");
 	let pending;
 	for await (const raw of readable) {
 		if (abortSignal?.aborted) throw abortSignal.reason ?? /* @__PURE__ */ new Error("aborted");
@@ -179,11 +185,17 @@ async function sendStreamAsChunks(readable, chunkSize, sendChunk, creditGate, ab
 		await sendChunk(pending, void 0, true);
 	} else await sendChunk(void 0, void 0, true);
 }
+function alignHandlerParams(params, handler) {
+	if (typeof handler !== "function") return params;
+	const arity = handler.length - 1;
+	if (params.length >= arity) return params;
+	return [...params, ...Array(arity - params.length).fill(void 0)];
+}
 function makeMutuallyExclusiveFields(obj, f1Name, f2Name, onConsumed) {
 	if (!(typeof obj === "object" && obj !== null)) throw new Error("invalid object");
 	let consumed;
-	const f1Value = obj[f1Name];
-	const f2Value = obj[f2Name];
+	let f1Value = obj[f1Name];
+	let f2Value = obj[f2Name];
 	Object.defineProperty(obj, f1Name, {
 		get: () => {
 			if (consumed === "f2") throw new Error(`field "${f1Name}" is mutually exclusive with field "${f2Name}" and "${f2Name}" was already consumed`);
@@ -191,7 +203,10 @@ function makeMutuallyExclusiveFields(obj, f1Name, f2Name, onConsumed) {
 			consumed = "f1";
 			return f1Value;
 		},
-		enumerable: true,
+		set: (value) => {
+			f1Value = value;
+		},
+		enumerable: false,
 		configurable: true
 	});
 	Object.defineProperty(obj, f2Name, {
@@ -201,7 +216,10 @@ function makeMutuallyExclusiveFields(obj, f1Name, f2Name, onConsumed) {
 			consumed = "f2";
 			return f2Value;
 		},
-		enumerable: true,
+		set: (value) => {
+			f2Value = value;
+		},
+		enumerable: false,
 		configurable: true
 	});
 }
@@ -285,8 +303,10 @@ function ensureError(error, prefix, debug = false) {
 	} else return new Error(msg);
 }
 function runFinally(isAsync, onfinally, description) {
-	if (!onfinally) if (isAsync) return Promise.resolve();
-	else return;
+	if (!onfinally) {
+		if (isAsync) return Promise.resolve();
+		else return;
+	}
 	let result;
 	try {
 		result = onfinally();
@@ -302,8 +322,10 @@ function runFinally(isAsync, onfinally, description) {
 	return result;
 }
 function runUnroll(isAsync, spool) {
-	if (!spool) if (isAsync) return Promise.resolve();
-	else return;
+	if (!spool) {
+		if (isAsync) return Promise.resolve();
+		else return;
+	}
 	let result = spool.unroll();
 	if (!isAsync && result instanceof Promise) throw new Error("spool unroll returned Promise in non-async context");
 	if (isAsync && !(result instanceof Promise)) result = Promise.resolve(result);
@@ -317,9 +339,12 @@ function runSettle(isAsync, pending, spool, onfinally, description) {
 		} catch (arg) {
 			failure = ensureError(arg, description);
 		}
-		if (pending || failure !== void 0) {
+		if (pending !== void 0 || failure !== void 0) {
 			runUnroll(false, spool);
-			if (!pending && failure !== void 0) throw failure;
+			if (failure !== void 0) {
+				if (pending !== void 0) pending.suppressed = failure;
+				else throw failure;
+			}
 		}
 	} else return (async () => {
 		let failure;
@@ -328,12 +353,34 @@ function runSettle(isAsync, pending, spool, onfinally, description) {
 		} catch (arg) {
 			failure = ensureError(arg, description);
 		}
-		if (pending || failure !== void 0) {
+		if (pending !== void 0 || failure !== void 0) {
 			await runUnroll(true, spool);
-			if (!pending && failure !== void 0) throw failure;
+			if (failure !== void 0) {
+				if (pending !== void 0) pending.suppressed = failure;
+				else throw failure;
+			}
 		}
 	})();
 }
+function runFail(error, spool, onfinally, description) {
+	const attach = (arg) => {
+		error.suppressed = ensureError(arg, description);
+	};
+	let result = void 0;
+	try {
+		result = onfinally?.();
+	} catch (arg) {
+		attach(arg);
+	}
+	if (result instanceof Promise) return result.catch(attach).then(() => spool?.unroll()).then(() => {
+		throw error;
+	});
+	const unrolled = spool?.unroll();
+	if (unrolled instanceof Promise) return unrolled.then(() => {
+		throw error;
+	});
+	throw error;
+}
 function run(...args) {
 	let description;
 	let spool;
@@ -379,25 +426,18 @@ function run(...args) {
 	try {
 		result = action();
 	} catch (arg) {
-		let error = ensureError(arg, description);
-		if (oncatch) {
-			try {
-				result = oncatch(error);
-			} catch (arg) {
-				error = ensureError(arg, description);
-				runSettle(false, true, spool, onfinally, description);
-				throw error;
-			}
-			if (spool && oncleanup) spool.roll(result, oncleanup);
-			runSettle(false, false, spool, onfinally, description);
-			return result;
+		const error = ensureError(arg, description);
+		if (!oncatch) return runFail(error, spool, onfinally, description);
+		try {
+			result = oncatch(error);
+		} catch (arg) {
+			return runFail(ensureError(arg, description), spool, onfinally, description);
 		}
-		runSettle(false, true, spool, onfinally, description);
-		throw error;
+		oncatch = void 0;
 	}
 	if (result instanceof Promise) return result.then(async (result) => {
 		if (spool && oncleanup) spool.roll(result, oncleanup);
-		await runSettle(true, false, spool, onfinally, description);
+		await runSettle(true, void 0, spool, onfinally, description);
 		return result;
 	}, async (arg) => {
 		let error = ensureError(arg, description);
@@ -407,19 +447,19 @@ function run(...args) {
 				result = await oncatch(error);
 			} catch (arg) {
 				error = ensureError(arg, description);
-				await runSettle(true, true, spool, onfinally, description);
+				await runSettle(true, error, spool, onfinally, description);
 				throw error;
 			}
 			if (spool && oncleanup) spool.roll(result, oncleanup);
-			await runSettle(true, false, spool, onfinally, description);
+			await runSettle(true, void 0, spool, onfinally, description);
 			return result;
 		}
-		await runSettle(true, true, spool, onfinally, description);
+		await runSettle(true, error, spool, onfinally, description);
 		throw error;
 	});
 	else {
 		if (spool && oncleanup) spool.roll(result, oncleanup);
-		runSettle(false, false, spool, onfinally, description);
+		runSettle(false, void 0, spool, onfinally, description);
 		return result;
 	}
 }
@@ -430,9 +470,9 @@ var OptionsTrait = class {
 		this.options = {
 			id: "",
 			codec: "cbor",
-			timeout: 10 * 1e3,
+			timeout: 1e4,
 			share: "",
-			chunkSize: 16 * 1024,
+			chunkSize: 16384,
 			chunkCredit: 4,
 			topicMake: (name, operation, peerId) => {
 				return `${name}/${operation}/${peerId ?? "any"}`;
@@ -447,6 +487,9 @@ var OptionsTrait = class {
 			},
 			...options
 		};
+		if (!(Number.isFinite(this.options.timeout) && this.options.timeout > 0)) throw new Error("options: \"timeout\" must be a positive number");
+		if (!(Number.isInteger(this.options.chunkSize) && this.options.chunkSize > 0)) throw new Error("options: \"chunkSize\" must be a positive integer");
+		if (!(Number.isInteger(this.options.chunkCredit) && this.options.chunkCredit >= 0)) throw new Error("options: \"chunkCredit\" must be a non-negative integer");
 	}
 };
 //#endregion
@@ -564,6 +607,8 @@ var versionToNum = (str) => {
 	if (minor > 99) throw new Error("invalid version string: minor version exceeds 99");
 	return parseInt(m[1], 10) * 100 + minor;
 };
+var VERSION = "1.4";
+var MIN_VERSION = "1.4";
 var version = versionToNum("1.4");
 var minVersion = versionToNum("1.4");
 //#endregion
@@ -959,13 +1004,13 @@ var BaseTrait = class extends TraceTrait {
 				};
 			} });
 		}
-		this.mqtt = mqtt;
+		this._mqtt = mqtt;
 		if (this.options.id === "") {
 			const clientId = mqtt.isFakeProxy ? void 0 : mqtt.options?.clientId;
 			this.options.id = typeof clientId === "string" && clientId !== "" ? clientId : (0, nanoid.nanoid)();
 		}
 		this.log("info", "hooking into MQTT client");
-		this.messageHandler = (topic, message, packet) => {
+		this._messageHandler = (topic, message, packet) => {
 			if (this.destroyed) return;
 			let input;
 			if (this.options.codec === "json") input = message.toString();
@@ -976,12 +1021,12 @@ var BaseTrait = class extends TraceTrait {
 			}
 			this._onMessage(topic, input, packet);
 		};
-		this.mqtt.on("message", this.messageHandler);
+		this._mqtt.on("message", this._messageHandler);
 	}
 	async destroy() {
 		this.destroyed = true;
 		this.log("info", "un-hooking from MQTT client");
-		this.mqtt.off("message", this.messageHandler);
+		this._mqtt.off("message", this._messageHandler);
 		this.onRequest.clear();
 		this.onResponse.clear();
 	}
@@ -1000,7 +1045,7 @@ var BaseTrait = class extends TraceTrait {
 	async subscribeTopic(topic, options = {}) {
 		this.log("info", `subscribing to MQTT topic "${topic}"`);
 		return new Promise((resolve, reject) => {
-			this.mqtt.subscribe(topic, {
+			this._mqtt.subscribe(topic, {
 				qos: 2,
 				...options
 			}, (err, granted) => {
@@ -1018,7 +1063,7 @@ var BaseTrait = class extends TraceTrait {
 	async unsubscribeTopic(topic) {
 		this.log("info", `unsubscribing from MQTT topic "${topic}"`);
 		return new Promise((resolve, reject) => {
-			this.mqtt.unsubscribe(topic, (err, _packet) => {
+			this._mqtt.unsubscribe(topic, (err, _packet) => {
 				if (err) {
 					this.error(err, `unsubscribing from MQTT topic "${topic}" failed`);
 					reject(err);
@@ -1042,7 +1087,7 @@ var BaseTrait = class extends TraceTrait {
 		this.log("debug", `publishing to MQTT topic "${topic}"`, { message: messageOnDemand });
 		return new Promise((resolve, reject) => {
 			const messageData = typeof message === "string" ? message : Buffer.from(message.buffer, message.byteOffset, message.byteLength);
-			this.mqtt.publish(topic, messageData, options, (err) => {
+			this._mqtt.publish(topic, messageData, options, (err) => {
 				if (err) {
 					this.error(err, `publishing to MQTT topic "${topic}" failed`);
 					reject(err);
@@ -1077,7 +1122,10 @@ var BaseTrait = class extends TraceTrait {
 			return;
 		}
 		this.log("debug", `received from MQTT topic "${topic}"`, { message });
-		if (topicMatch.peerId !== void 0 && message.receiver !== void 0 && message.receiver !== topicMatch.peerId) this.log("warning", `receiver mismatch on direct topic "${topic}" (expected "${topicMatch.peerId}", got "${message.receiver}")`);
+		if (topicMatch.peerId !== void 0 && message.receiver !== void 0 && message.receiver !== topicMatch.peerId) {
+			this.log("warning", `receiver mismatch -- dropped message from direct topic "${topic}" (expected "${topicMatch.peerId}", got "${message.receiver}")`);
+			return;
+		}
 		if (this.msg.isRequest(message)) {
 			const handler = this.onRequest.get(`${message.type}:${message.name}`);
 			if (handler !== void 0) Promise.resolve().then(() => {
@@ -1100,7 +1148,7 @@ var BaseTrait = class extends TraceTrait {
 //#endregion
 //#region dst-stage1/mqtt-plus-subscription.js
 var RefCountedSubscription = class {
-	constructor(subscribeFn, unsubscribeFn, lingerMs = 30 * 1e3) {
+	constructor(subscribeFn, unsubscribeFn, lingerMs = 3e4) {
 		this.subscribeFn = subscribeFn;
 		this.unsubscribeFn = unsubscribeFn;
 		this.lingerMs = lingerMs;
@@ -1116,12 +1164,14 @@ var RefCountedSubscription = class {
 	}
 	decrementCount(topic) {
 		const count = this.counts.get(topic);
-		if (count !== void 0) if (count <= 1) {
-			this.counts.delete(topic);
-			return 0;
-		} else {
-			this.counts.set(topic, count - 1);
-			return count - 1;
+		if (count !== void 0) {
+			if (count <= 1) {
+				this.counts.delete(topic);
+				return 0;
+			} else {
+				this.counts.set(topic, count - 1);
+				return count - 1;
+			}
 		}
 	}
 	clearCount(topic) {
@@ -1160,21 +1210,23 @@ var RefCountedSubscription = class {
 		}
 	}
 	async unsubscribe(topic) {
-		if (this.decrementCount(topic) === 0) if (this.lingerMs > 0 && !topic.startsWith("$share/")) {
-			const timer = setTimeout(() => {
-				this.lingers.delete(topic);
+		if (this.decrementCount(topic) === 0) {
+			if (this.lingerMs > 0 && !topic.startsWith("$share/")) {
+				const timer = setTimeout(() => {
+					this.lingers.delete(topic);
+					const promise = this.unsubscribeFn(topic).catch(() => {}).finally(() => {
+						this.unsubbing.delete(topic);
+					});
+					this.unsubbing.set(topic, promise);
+				}, this.lingerMs);
+				this.lingers.set(topic, timer);
+			} else {
 				const promise = this.unsubscribeFn(topic).catch(() => {}).finally(() => {
 					this.unsubbing.delete(topic);
 				});
 				this.unsubbing.set(topic, promise);
-			}, this.lingerMs);
-			this.lingers.set(topic, timer);
-		} else {
-			const promise = this.unsubscribeFn(topic).catch(() => {}).finally(() => {
-				this.unsubbing.delete(topic);
-			});
-			this.unsubbing.set(topic, promise);
-			await promise;
+				await promise;
+			}
 		}
 	}
 	async flush() {
@@ -1443,7 +1495,7 @@ var EventTrait = class extends AuthTrait {
 				this.log("warning", `event name mismatch -- dropped request for "${name}" (topic: "${topicName}", payload: "${request.name}")`, { requestId });
 				return;
 			}
-			const params = request.params ?? [];
+			const params = alignHandlerParams(request.params ?? [], callback);
 			if (this.eventControllers.has(requestId)) {
 				this.log("warning", `duplicate event request id -- dropped request for event "${name}"`, { requestId });
 				return;
@@ -1567,7 +1619,7 @@ var ServiceTrait = class extends EventTrait {
 			if (request.receiver && request.receiver !== this.options.id) return;
 			const requestId = request.id;
 			const senderId = request.sender;
-			const params = request.params ?? [];
+			const params = alignHandlerParams(request.params ?? [], callback);
 			if (senderId === void 0 || senderId === "") {
 				this.error(/* @__PURE__ */ new Error("invalid request: missing sender"));
 				return;
@@ -1671,7 +1723,9 @@ var ServiceTrait = class extends EventTrait {
 		const settle = () => {
 			if (settled) return false;
 			settled = true;
-			spool.unroll();
+			spool.unroll(false)?.catch((err) => {
+				this.error(ensureError(err, `cleanup after call of service "${name}" failed`));
+			});
 			return true;
 		};
 		const promise = new Promise((resolve, reject) => {
@@ -1778,7 +1832,7 @@ var SourceTrait = class extends ServiceTrait {
 		this.onRequest.set(`source-fetch-request:${name}`, async (request, topicName) => {
 			if (request.receiver && request.receiver !== this.options.id) return;
 			const requestId = request.id;
-			const params = request.params ?? [];
+			const params = alignHandlerParams(request.params ?? [], callback);
 			const sender = request.sender;
 			const receiver = request.receiver;
 			const reqSpool = new Spool();
@@ -1831,11 +1885,16 @@ var SourceTrait = class extends ServiceTrait {
 					if (current.size === 0) this.sourceRequests.delete(name);
 				}
 			});
-			abortSignal.addEventListener("abort", () => {
-				if (info.stream instanceof node_stream.Readable && !info.stream.destroyed) info.stream.destroy(ensureError(abortSignal.reason));
-			}, { once: true });
+			const noopError = () => {};
+			const destroyStream = () => {
+				if (info.stream instanceof node_stream.Readable && !info.stream.destroyed) {
+					info.stream.on("error", noopError);
+					info.stream.destroy(ensureError(abortSignal.reason));
+				}
+			};
+			abortSignal.addEventListener("abort", destroyStream, { once: true });
 			reqSpool.roll(() => {
-				if (abortSignal.aborted && info.stream instanceof node_stream.Readable && !info.stream.destroyed) info.stream.destroy(ensureError(abortSignal.reason));
+				if (abortSignal.aborted) destroyStream();
 			});
 			let abortReject;
 			const abortPromise = new Promise((_resolve, reject) => {
@@ -1982,7 +2041,7 @@ var SourceTrait = class extends ServiceTrait {
 		const sourceNameMismatchError = (kind, actualName) => /* @__PURE__ */ new Error(`${kind} name mismatch (expected "${name}", got "${actualName}")`);
 		await this.subscribeTopicAndSpool(spool, responseTopic, { qos: options.qos ?? 2 });
 		const chunkCredit = this.options.chunkCredit;
-		const maxBufferedBytes = chunkCredit > 0 ? chunkCredit * this.options.chunkSize : 16 * 1024;
+		const maxBufferedBytes = chunkCredit > 0 ? chunkCredit * this.options.chunkSize : 16384;
 		let chunksReceived = 0;
 		let creditGranted = chunkCredit;
 		let responderId = receiver;
@@ -2220,7 +2279,7 @@ var SinkTrait = class extends SourceTrait {
 		this.onRequest.set(`sink-push-request:${name}`, async (request, topicName) => {
 			if (request.receiver && request.receiver !== this.options.id) return;
 			const requestId = request.id;
-			const params = request.params ?? [];
+			const params = alignHandlerParams(request.params ?? [], callback);
 			const sender = request.sender;
 			const receiver = request.receiver;
 			const reqSpool = new Spool();
@@ -2281,7 +2340,7 @@ var SinkTrait = class extends SourceTrait {
 					chunksReceived: 0,
 					creditGranted: chunkCredit
 				} : void 0;
-				const maxBufferedBytes = chunkCredit > 0 ? chunkCredit * this.options.chunkSize : 16 * 1024;
+				const maxBufferedBytes = chunkCredit > 0 ? chunkCredit * this.options.chunkSize : 16384;
 				let streamEnded = false;
 				const pushTimerId = `sink-push-recv:${requestId}`;
 				const refreshPushTimeout = () => this.timerRefresh(pushTimerId, () => {
@@ -2511,8 +2570,12 @@ var SinkTrait = class extends SourceTrait {
 		});
 		if (data instanceof node_stream.Readable) {
 			const stream = data;
+			const noopError = () => {};
 			abortSignal.addEventListener("abort", () => {
-				if (!stream.destroyed) stream.destroy(ensureError(abortSignal.reason));
+				if (!stream.destroyed) {
+					stream.on("error", noopError);
+					stream.destroy(ensureError(abortSignal.reason));
+				}
 			}, { once: true });
 		}
 		const pushTimerId = `sink-push-send:${requestId}`;
@@ -2546,18 +2609,21 @@ var SinkTrait = class extends SourceTrait {
 			pushFinalizeReject = reject;
 		});
 		pushFinalize.catch(() => {});
+		const failPush = (error) => {
+			abortController.abort(error);
+			if (!pushAcked) {
+				pushInitialSettled = true;
+				pushInitialReject(error);
+			} else if (!pushFinalized) {
+				pushFinalized = true;
+				pushFinalizeReject(error);
+			}
+		};
 		const lockResponder = (kind, sender) => {
 			if (sender === void 0 || sender === "") {
 				const error = /* @__PURE__ */ new Error(`received ${kind} without sender`);
 				remoteErrorObject = error;
-				abortController.abort(error);
-				if (!pushAcked) {
-					pushInitialSettled = true;
-					pushInitialReject(error);
-				} else if (!pushFinalized) {
-					pushFinalized = true;
-					pushFinalizeReject(error);
-				}
+				failPush(error);
 				return false;
 			}
 			if (responderId === void 0) responderId = sender;
@@ -2575,37 +2641,25 @@ var SinkTrait = class extends SourceTrait {
 			if (response.name !== name) {
 				const error = /* @__PURE__ */ new Error(`sink response name mismatch (expected "${name}", got "${response.name}")`);
 				remoteErrorObject = error;
-				abortController.abort(error);
-				if (!pushAcked) {
-					pushInitialSettled = true;
-					pushInitialReject(error);
-				} else if (!pushFinalized) {
-					pushFinalized = true;
-					pushFinalizeReject(error);
-				}
+				failPush(error);
 				return;
 			}
 			if (!lockResponder("sink response", response.sender)) return;
 			if (response.error) {
 				const error = new Error(response.error);
 				remoteErrorObject = error;
-				abortController.abort(error);
-				if (!pushAcked) {
-					pushInitialSettled = true;
-					pushInitialReject(error);
-				} else if (!pushFinalized) {
-					pushFinalized = true;
-					pushFinalizeReject(error);
-				}
+				failPush(error);
 			} else if (!pushAcked) {
 				initialCredit = response.credit;
 				pushAcked = true;
 				pushInitialSettled = true;
 				pushInitialResolve();
-			} else if (!pushFinalized) if (pushDataComplete) {
-				pushFinalized = true;
-				pushFinalizeResolve();
-			} else pushTerminalReceived = true;
+			} else if (!pushFinalized) {
+				if (pushDataComplete) {
+					pushFinalized = true;
+					pushFinalizeResolve();
+				} else pushTerminalReceived = true;
+			}
 		});
 		spool.roll(() => {
 			this.onResponse.delete(`sink-push-response:${requestId}`);
@@ -2614,28 +2668,14 @@ var SinkTrait = class extends SourceTrait {
 			if (response.name !== name) {
 				const error = /* @__PURE__ */ new Error(`sink credit name mismatch (expected "${name}", got "${response.name}")`);
 				remoteErrorObject = error;
-				abortController.abort(error);
-				if (!pushAcked) {
-					pushInitialSettled = true;
-					pushInitialReject(error);
-				} else if (!pushFinalized) {
-					pushFinalized = true;
-					pushFinalizeReject(error);
-				}
+				failPush(error);
 				return;
 			}
 			if (!lockResponder("sink credit", response.sender)) return;
 			if (response.credit === 0) {
 				cancelledByReceiver = true;
 				const error = /* @__PURE__ */ new Error(`push to sink "${name}" cancelled by receiver`);
-				abortController.abort(error);
-				if (!pushAcked) {
-					pushInitialSettled = true;
-					pushInitialReject(error);
-				} else if (!pushFinalized) {
-					pushFinalized = true;
-					pushFinalizeReject(error);
-				}
+				failPush(error);
 				return;
 			}
 			if (creditGate !== void 0) {
@@ -2644,11 +2684,7 @@ var SinkTrait = class extends SourceTrait {
 			} else if (pushAcked && initialCredit === void 0) {
 				const error = /* @__PURE__ */ new Error(`push to sink "${name}" received unsolicited credit (credit-flow disabled)`);
 				remoteErrorObject = error;
-				abortController.abort(error);
-				if (!pushFinalized) {
-					pushFinalized = true;
-					pushFinalizeReject(error);
-				}
+				failPush(error);
 			} else pendingCredit += response.credit;
 		});
 		spool.roll(() => {
@@ -2735,7 +2771,7 @@ var SinkTrait = class extends SourceTrait {
 				}
 			} catch {}
 			if (pushAcked && !remoteErrorObject) await new Promise((resolve) => {
-				setImmediate(resolve);
+				setTimeout(resolve, 0);
 			});
 			if (remoteErrorObject) throw remoteErrorObject;
 			throw err;
@@ -2748,4 +2784,9 @@ var SinkTrait = class extends SourceTrait {
 //#region dst-stage1/mqtt-plus.js
 var MQTTp = class extends SinkTrait {};
 //#endregion
-module.exports = MQTTp;
+exports.MIN_VERSION = MIN_VERSION;
+exports.VERSION = VERSION;
+exports.default = MQTTp;
+exports.minVersion = minVersion;
+exports.version = version;
+exports.versionToNum = versionToNum;