mqtt-plus 1.4.22 → 1.4.24

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

@@ -76,7 +76,8 @@ export class TimerTrait extends SubscriptionTrait {
                     ac.abort();
                 resolve();
             }, durationMs);
-            timer.unref();
+            if (typeof timer.unref === "function")
+                timer.unref();
             if (signal !== undefined) {
                 if (ac !== undefined)
                     signal.addEventListener("abort", () => {
@@ -101,7 +102,8 @@ export class TimerTrait extends SubscriptionTrait {
                     ac.abort();
                 reject(new Error(info));
             }, durationMs);
-            timer.unref();
+            if (typeof timer.unref === "function")
+                timer.unref();
             if (signal !== undefined) {
                 if (ac !== undefined)
                     signal.addEventListener("abort", () => {

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

@@ -309,6 +309,31 @@ function runUnroll(isAsync, spool) {
 	if (isAsync && !(result instanceof Promise)) result = Promise.resolve(result);
 	return result;
 }
+function runSettle(isAsync, pending, spool, onfinally, description) {
+	if (!isAsync) {
+		let failure;
+		try {
+			runFinally(false, onfinally, description);
+		} catch (arg) {
+			failure = ensureError(arg, description);
+		}
+		if (pending || failure !== void 0) {
+			runUnroll(false, spool);
+			if (!pending && failure !== void 0) throw failure;
+		}
+	} else return (async () => {
+		let failure;
+		try {
+			await runFinally(true, onfinally, description);
+		} catch (arg) {
+			failure = ensureError(arg, description);
+		}
+		if (pending || failure !== void 0) {
+			await runUnroll(true, spool);
+			if (!pending && failure !== void 0) throw failure;
+		}
+	})();
+}
 function run(...args) {
 	let description;
 	let spool;
@@ -360,40 +385,41 @@ function run(...args) {
 				result = oncatch(error);
 			} catch (arg) {
 				error = ensureError(arg, description);
-				runFinally(false, onfinally, description);
-				runUnroll(false, spool);
+				runSettle(false, true, spool, onfinally, description);
 				throw error;
 			}
-			runFinally(false, onfinally, description);
+			if (spool && oncleanup) spool.roll(result, oncleanup);
+			runSettle(false, false, spool, onfinally, description);
 			return result;
 		}
-		runFinally(false, onfinally, description);
-		runUnroll(false, spool);
+		runSettle(false, true, spool, onfinally, description);
 		throw error;
 	}
 	if (result instanceof Promise) return result.then(async (result) => {
-		await runFinally(true, onfinally, description);
 		if (spool && oncleanup) spool.roll(result, oncleanup);
+		await runSettle(true, false, spool, onfinally, description);
 		return result;
 	}, async (arg) => {
 		let error = ensureError(arg, description);
-		if (oncatch) try {
-			const result = await oncatch(error);
-			await runFinally(true, onfinally, description);
+		if (oncatch) {
+			let result;
+			try {
+				result = await oncatch(error);
+			} catch (arg) {
+				error = ensureError(arg, description);
+				await runSettle(true, true, spool, onfinally, description);
+				throw error;
+			}
+			if (spool && oncleanup) spool.roll(result, oncleanup);
+			await runSettle(true, false, spool, onfinally, description);
 			return result;
-		} catch (arg) {
-			error = ensureError(arg, description);
-			await runFinally(true, onfinally, description);
-			await runUnroll(true, spool);
-			throw error;
 		}
-		await runFinally(true, onfinally, description);
-		await runUnroll(true, spool);
+		await runSettle(true, true, spool, onfinally, description);
 		throw error;
 	});
 	else {
-		runFinally(false, onfinally, description);
 		if (spool && oncleanup) spool.roll(result, oncleanup);
+		runSettle(false, false, spool, onfinally, description);
 		return result;
 	}
 }
@@ -402,7 +428,7 @@ function run(...args) {
 var OptionsTrait = class {
 	constructor(options = {}) {
 		this.options = {
-			id: (0, nanoid.nanoid)(),
+			id: "",
 			codec: "cbor",
 			timeout: 10 * 1e3,
 			share: "",
@@ -425,7 +451,7 @@ var OptionsTrait = class {
 };
 //#endregion
 //#region dst-stage1/mqtt-plus-codec.js
-var JSONX = class {
+var JSONX = class JSONX {
 	static uint8ArrayToBase64(arr) {
 		return node_buffer.Buffer.from(arr.buffer, arr.byteOffset, arr.byteLength).toString("base64");
 	}
@@ -433,10 +459,13 @@ var JSONX = class {
 		return new Uint8Array(node_buffer.Buffer.from(base64, "base64"));
 	}
 	static stringify(obj) {
-		return JSON.stringify(obj, (_, value) => value instanceof Uint8Array ? { __Uint8Array: this.uint8ArrayToBase64(value) } : value);
+		return JSON.stringify(obj, function(key, value) {
+			const orig = this[key];
+			return orig instanceof node_buffer.Buffer ? { __Buffer: JSONX.uint8ArrayToBase64(orig) } : orig instanceof Uint8Array ? { __Uint8Array: JSONX.uint8ArrayToBase64(orig) } : value;
+		});
 	}
 	static parse(json) {
-		return JSON.parse(json, (_, value) => typeof value?.__Uint8Array === "string" ? this.base64ToUint8Array(value.__Uint8Array) : value);
+		return JSON.parse(json, (_, value) => typeof value?.__Buffer === "string" ? node_buffer.Buffer.from(value.__Buffer, "base64") : typeof value?.__Uint8Array === "string" ? this.base64ToUint8Array(value.__Uint8Array) : value);
 	}
 };
 var Codec = class {
@@ -931,13 +960,20 @@ var BaseTrait = class extends TraceTrait {
 			} });
 		}
 		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) => {
 			if (this.destroyed) return;
 			let input;
 			if (this.options.codec === "json") input = message.toString();
 			else if (this.options.codec === "cbor") input = Buffer.isBuffer(message) ? new Uint8Array(message.buffer, message.byteOffset, message.byteLength) : message;
-			else throw new Error("invalid codec configured");
+			else {
+				this.error(/* @__PURE__ */ new Error("invalid codec configured"));
+				return;
+			}
 			this._onMessage(topic, input, packet);
 		};
 		this.mqtt.on("message", this.messageHandler);
@@ -967,10 +1003,14 @@ var BaseTrait = class extends TraceTrait {
 			this.mqtt.subscribe(topic, {
 				qos: 2,
 				...options
-			}, (err, _granted) => {
+			}, (err, granted) => {
 				if (err) {
 					this.error(err, `subscribing to MQTT topic "${topic}" failed`);
 					reject(err);
+				} else if (Array.isArray(granted) && granted.some((grant) => typeof grant?.qos === "number" && grant.qos >= 128)) {
+					const error = /* @__PURE__ */ new Error(`broker rejected subscription to MQTT topic "${topic}" (grant codes: ${granted.map((grant) => grant?.qos).join(", ")})`);
+					this.error(error, `subscribing to MQTT topic "${topic}" failed`);
+					reject(error);
 				} else resolve();
 			});
 		});
@@ -1012,7 +1052,13 @@ var BaseTrait = class extends TraceTrait {
 	}
 	_onMessage(topic, data, _packet) {
 		if (this.destroyed) return;
-		const topicMatch = this.options.topicMatch(topic);
+		let topicMatch;
+		try {
+			topicMatch = this.options.topicMatch(topic);
+		} catch (err) {
+			this.error(ensureError(err, "failed to match MQTT topic"));
+			return;
+		}
 		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: ${data.byteLength} bytes)`);
@@ -1114,7 +1160,7 @@ var RefCountedSubscription = class {
 		}
 	}
 	async unsubscribe(topic) {
-		if (this.decrementCount(topic) === 0) if (this.lingerMs > 0) {
+		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(() => {
@@ -1208,7 +1254,7 @@ var TimerTrait = class extends SubscriptionTrait {
 				if (ac !== void 0) ac.abort();
 				resolve();
 			}, durationMs);
-			timer.unref();
+			if (typeof timer.unref === "function") timer.unref();
 			if (signal !== void 0) {
 				if (ac !== void 0) signal.addEventListener("abort", () => {
 					if (timer !== null) clearTimeout(timer);
@@ -1232,7 +1278,7 @@ var TimerTrait = class extends SubscriptionTrait {
 				if (ac !== void 0) ac.abort();
 				reject(new Error(info));
 			}, durationMs);
-			timer.unref();
+			if (typeof timer.unref === "function") timer.unref();
 			if (signal !== void 0) {
 				if (ac !== void 0) signal.addEventListener("abort", () => {
 					if (timer !== null) clearTimeout(timer);
@@ -1413,7 +1459,7 @@ var EventTrait = class extends AuthTrait {
 			if (request.receiver) info.receiver = request.receiver;
 			if (request.meta) info.meta = request.meta;
 			try {
-				if (auth) info.authenticated = await this.authenticated(senderId, request.auth, auth, `event "${name}"`);
+				if (auth !== void 0) info.authenticated = await this.authenticated(senderId, request.auth, auth, `event "${name}"`);
 				await callback(...params, info);
 			} catch (result) {
 				const error = ensureError(result);
@@ -1554,7 +1600,7 @@ var ServiceTrait = class extends EventTrait {
 			armServiceTimeout();
 			let removeAbortListener;
 			try {
-				if (auth) info.authenticated = await this.authenticated(senderId, request.auth, auth, `service "${name}"`);
+				if (auth !== void 0) info.authenticated = await this.authenticated(senderId, request.auth, auth, `service "${name}"`);
 				const abortPromise = new Promise((_resolve, reject) => {
 					const onAbort = () => {
 						reject(ensureError(abortSignal.reason));
@@ -1692,8 +1738,11 @@ var SourceTrait = class extends ServiceTrait {
 		this.sourceControllers = /* @__PURE__ */ new Map();
 		this.sourceSpools = /* @__PURE__ */ new Map();
 		this.sourceRequests = /* @__PURE__ */ new Map();
+		this.fetchAborts = /* @__PURE__ */ new Map();
 	}
 	async destroy() {
+		for (const abort of this.fetchAborts.values()) abort(/* @__PURE__ */ new Error("instance destroyed"));
+		this.fetchAborts.clear();
 		for (const controller of this.sourceControllers.values()) controller.abort(/* @__PURE__ */ new Error("source destroyed"));
 		for (const gate of this.sourceCreditGates.values()) gate.abort();
 		for (const spool of [...this.sourceSpools.values()]) await spool.unroll();
@@ -1733,10 +1782,6 @@ var SourceTrait = class extends ServiceTrait {
 			const sender = request.sender;
 			const receiver = request.receiver;
 			const reqSpool = new Spool();
-			this.sourceSpools.set(requestId, reqSpool);
-			reqSpool.roll(() => {
-				this.sourceSpools.delete(requestId);
-			});
 			if (sender === void 0 || sender === "") {
 				this.error(/* @__PURE__ */ new Error("invalid request: missing sender"));
 				await reqSpool.unroll();
@@ -1763,6 +1808,10 @@ var SourceTrait = class extends ServiceTrait {
 			reqSpool.roll(() => {
 				this.sourceControllers.delete(requestId);
 			});
+			this.sourceSpools.set(requestId, reqSpool);
+			reqSpool.roll(() => {
+				this.sourceSpools.delete(requestId);
+			});
 			const info = {
 				sender,
 				signal: abortSignal
@@ -1848,7 +1897,7 @@ var SourceTrait = class extends ServiceTrait {
 				reqSpool.roll(() => {
 					this.onResponse.delete(`source-fetch-credit:${requestId}`);
 				});
-				if (auth) info.authenticated = await this.authenticated(sender, request.auth, auth, `source "${name}"`);
+				if (auth !== void 0) info.authenticated = await this.authenticated(sender, request.auth, auth, `source "${name}"`);
 				const callbackPromise = Promise.resolve(callback(...params, info));
 				callbackPromise.catch(() => {});
 				await Promise.race([callbackPromise, abortPromise]);
@@ -2007,6 +2056,10 @@ var SourceTrait = class extends ServiceTrait {
 			metaReject(error);
 			stream.destroy(error);
 		};
+		this.fetchAborts.set(requestId, endWithError);
+		spool.roll(() => {
+			this.fetchAborts.delete(requestId);
+		});
 		let cancelled = false;
 		const cancelAndUnroll = (reason) => {
 			if (!cancelled && !streamEnded) {
@@ -2223,7 +2276,7 @@ var SinkTrait = class extends SourceTrait {
 			try {
 				if (topicName !== request.name) throw new Error(`sink name mismatch (topic: "${topicName}", payload: "${request.name}")`);
 				let authenticated = void 0;
-				if (auth) authenticated = await this.authenticated(sender, request.auth, auth, `sink "${name}"`);
+				if (auth !== void 0) authenticated = await this.authenticated(sender, request.auth, auth, `sink "${name}"`);
 				const creditState = chunkCredit > 0 ? {
 					chunksReceived: 0,
 					creditGranted: chunkCredit
@@ -2233,7 +2286,11 @@ var SinkTrait = class extends SourceTrait {
 				const pushTimerId = `sink-push-recv:${requestId}`;
 				const refreshPushTimeout = () => this.timerRefresh(pushTimerId, () => {
 					if (streamEnded || this.destroying) return;
-					abortController.abort(/* @__PURE__ */ new Error("push stream timeout"));
+					const error = /* @__PURE__ */ new Error("push stream timeout");
+					abortController.abort(error);
+					streamEnded = true;
+					const stream = this.pushStreams.get(requestId);
+					if (stream !== void 0 && !stream.destroyed) stream.destroy(error);
 					if (sender && !errorResponseSent) {
 						errorResponseSent = true;
 						const cancelMsg = this.msg.makeSinkPushCredit(requestId, name, 0, this.options.id, sender);
@@ -2513,6 +2570,7 @@ var SinkTrait = class extends SourceTrait {
 			pushInitialResolve = resolve;
 			pushInitialReject = reject;
 		});
+		pushInitial.catch(() => {});
 		this.onResponse.set(`sink-push-response:${requestId}`, (response) => {
 			if (response.name !== name) {
 				const error = /* @__PURE__ */ new Error(`sink response name mismatch (expected "${name}", got "${response.name}")`);

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

@@ -282,6 +282,31 @@ function runUnroll(isAsync, spool) {
 	if (isAsync && !(result instanceof Promise)) result = Promise.resolve(result);
 	return result;
 }
+function runSettle(isAsync, pending, spool, onfinally, description) {
+	if (!isAsync) {
+		let failure;
+		try {
+			runFinally(false, onfinally, description);
+		} catch (arg) {
+			failure = ensureError(arg, description);
+		}
+		if (pending || failure !== void 0) {
+			runUnroll(false, spool);
+			if (!pending && failure !== void 0) throw failure;
+		}
+	} else return (async () => {
+		let failure;
+		try {
+			await runFinally(true, onfinally, description);
+		} catch (arg) {
+			failure = ensureError(arg, description);
+		}
+		if (pending || failure !== void 0) {
+			await runUnroll(true, spool);
+			if (!pending && failure !== void 0) throw failure;
+		}
+	})();
+}
 function run(...args) {
 	let description;
 	let spool;
@@ -333,40 +358,41 @@ function run(...args) {
 				result = oncatch(error);
 			} catch (arg) {
 				error = ensureError(arg, description);
-				runFinally(false, onfinally, description);
-				runUnroll(false, spool);
+				runSettle(false, true, spool, onfinally, description);
 				throw error;
 			}
-			runFinally(false, onfinally, description);
+			if (spool && oncleanup) spool.roll(result, oncleanup);
+			runSettle(false, false, spool, onfinally, description);
 			return result;
 		}
-		runFinally(false, onfinally, description);
-		runUnroll(false, spool);
+		runSettle(false, true, spool, onfinally, description);
 		throw error;
 	}
 	if (result instanceof Promise) return result.then(async (result) => {
-		await runFinally(true, onfinally, description);
 		if (spool && oncleanup) spool.roll(result, oncleanup);
+		await runSettle(true, false, spool, onfinally, description);
 		return result;
 	}, async (arg) => {
 		let error = ensureError(arg, description);
-		if (oncatch) try {
-			const result = await oncatch(error);
-			await runFinally(true, onfinally, description);
+		if (oncatch) {
+			let result;
+			try {
+				result = await oncatch(error);
+			} catch (arg) {
+				error = ensureError(arg, description);
+				await runSettle(true, true, spool, onfinally, description);
+				throw error;
+			}
+			if (spool && oncleanup) spool.roll(result, oncleanup);
+			await runSettle(true, false, spool, onfinally, description);
 			return result;
-		} catch (arg) {
-			error = ensureError(arg, description);
-			await runFinally(true, onfinally, description);
-			await runUnroll(true, spool);
-			throw error;
 		}
-		await runFinally(true, onfinally, description);
-		await runUnroll(true, spool);
+		await runSettle(true, true, spool, onfinally, description);
 		throw error;
 	});
 	else {
-		runFinally(false, onfinally, description);
 		if (spool && oncleanup) spool.roll(result, oncleanup);
+		runSettle(false, false, spool, onfinally, description);
 		return result;
 	}
 }
@@ -375,7 +401,7 @@ function run(...args) {
 var OptionsTrait = class {
 	constructor(options = {}) {
 		this.options = {
-			id: nanoid(),
+			id: "",
 			codec: "cbor",
 			timeout: 10 * 1e3,
 			share: "",
@@ -398,7 +424,7 @@ var OptionsTrait = class {
 };
 //#endregion
 //#region dst-stage1/mqtt-plus-codec.js
-var JSONX = class {
+var JSONX = class JSONX {
 	static uint8ArrayToBase64(arr) {
 		return Buffer$1.from(arr.buffer, arr.byteOffset, arr.byteLength).toString("base64");
 	}
@@ -406,10 +432,13 @@ var JSONX = class {
 		return new Uint8Array(Buffer$1.from(base64, "base64"));
 	}
 	static stringify(obj) {
-		return JSON.stringify(obj, (_, value) => value instanceof Uint8Array ? { __Uint8Array: this.uint8ArrayToBase64(value) } : value);
+		return JSON.stringify(obj, function(key, value) {
+			const orig = this[key];
+			return orig instanceof Buffer$1 ? { __Buffer: JSONX.uint8ArrayToBase64(orig) } : orig instanceof Uint8Array ? { __Uint8Array: JSONX.uint8ArrayToBase64(orig) } : value;
+		});
 	}
 	static parse(json) {
-		return JSON.parse(json, (_, value) => typeof value?.__Uint8Array === "string" ? this.base64ToUint8Array(value.__Uint8Array) : value);
+		return JSON.parse(json, (_, value) => typeof value?.__Buffer === "string" ? Buffer$1.from(value.__Buffer, "base64") : typeof value?.__Uint8Array === "string" ? this.base64ToUint8Array(value.__Uint8Array) : value);
 	}
 };
 var Codec = class {
@@ -904,13 +933,20 @@ var BaseTrait = class extends TraceTrait {
 			} });
 		}
 		this.mqtt = mqtt;
+		if (this.options.id === "") {
+			const clientId = mqtt.isFakeProxy ? void 0 : mqtt.options?.clientId;
+			this.options.id = typeof clientId === "string" && clientId !== "" ? clientId : nanoid();
+		}
 		this.log("info", "hooking into MQTT client");
 		this.messageHandler = (topic, message, packet) => {
 			if (this.destroyed) return;
 			let input;
 			if (this.options.codec === "json") input = message.toString();
 			else if (this.options.codec === "cbor") input = Buffer.isBuffer(message) ? new Uint8Array(message.buffer, message.byteOffset, message.byteLength) : message;
-			else throw new Error("invalid codec configured");
+			else {
+				this.error(/* @__PURE__ */ new Error("invalid codec configured"));
+				return;
+			}
 			this._onMessage(topic, input, packet);
 		};
 		this.mqtt.on("message", this.messageHandler);
@@ -940,10 +976,14 @@ var BaseTrait = class extends TraceTrait {
 			this.mqtt.subscribe(topic, {
 				qos: 2,
 				...options
-			}, (err, _granted) => {
+			}, (err, granted) => {
 				if (err) {
 					this.error(err, `subscribing to MQTT topic "${topic}" failed`);
 					reject(err);
+				} else if (Array.isArray(granted) && granted.some((grant) => typeof grant?.qos === "number" && grant.qos >= 128)) {
+					const error = /* @__PURE__ */ new Error(`broker rejected subscription to MQTT topic "${topic}" (grant codes: ${granted.map((grant) => grant?.qos).join(", ")})`);
+					this.error(error, `subscribing to MQTT topic "${topic}" failed`);
+					reject(error);
 				} else resolve();
 			});
 		});
@@ -985,7 +1025,13 @@ var BaseTrait = class extends TraceTrait {
 	}
 	_onMessage(topic, data, _packet) {
 		if (this.destroyed) return;
-		const topicMatch = this.options.topicMatch(topic);
+		let topicMatch;
+		try {
+			topicMatch = this.options.topicMatch(topic);
+		} catch (err) {
+			this.error(ensureError(err, "failed to match MQTT topic"));
+			return;
+		}
 		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: ${data.byteLength} bytes)`);
@@ -1087,7 +1133,7 @@ var RefCountedSubscription = class {
 		}
 	}
 	async unsubscribe(topic) {
-		if (this.decrementCount(topic) === 0) if (this.lingerMs > 0) {
+		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(() => {
@@ -1181,7 +1227,7 @@ var TimerTrait = class extends SubscriptionTrait {
 				if (ac !== void 0) ac.abort();
 				resolve();
 			}, durationMs);
-			timer.unref();
+			if (typeof timer.unref === "function") timer.unref();
 			if (signal !== void 0) {
 				if (ac !== void 0) signal.addEventListener("abort", () => {
 					if (timer !== null) clearTimeout(timer);
@@ -1205,7 +1251,7 @@ var TimerTrait = class extends SubscriptionTrait {
 				if (ac !== void 0) ac.abort();
 				reject(new Error(info));
 			}, durationMs);
-			timer.unref();
+			if (typeof timer.unref === "function") timer.unref();
 			if (signal !== void 0) {
 				if (ac !== void 0) signal.addEventListener("abort", () => {
 					if (timer !== null) clearTimeout(timer);
@@ -1386,7 +1432,7 @@ var EventTrait = class extends AuthTrait {
 			if (request.receiver) info.receiver = request.receiver;
 			if (request.meta) info.meta = request.meta;
 			try {
-				if (auth) info.authenticated = await this.authenticated(senderId, request.auth, auth, `event "${name}"`);
+				if (auth !== void 0) info.authenticated = await this.authenticated(senderId, request.auth, auth, `event "${name}"`);
 				await callback(...params, info);
 			} catch (result) {
 				const error = ensureError(result);
@@ -1527,7 +1573,7 @@ var ServiceTrait = class extends EventTrait {
 			armServiceTimeout();
 			let removeAbortListener;
 			try {
-				if (auth) info.authenticated = await this.authenticated(senderId, request.auth, auth, `service "${name}"`);
+				if (auth !== void 0) info.authenticated = await this.authenticated(senderId, request.auth, auth, `service "${name}"`);
 				const abortPromise = new Promise((_resolve, reject) => {
 					const onAbort = () => {
 						reject(ensureError(abortSignal.reason));
@@ -1665,8 +1711,11 @@ var SourceTrait = class extends ServiceTrait {
 		this.sourceControllers = /* @__PURE__ */ new Map();
 		this.sourceSpools = /* @__PURE__ */ new Map();
 		this.sourceRequests = /* @__PURE__ */ new Map();
+		this.fetchAborts = /* @__PURE__ */ new Map();
 	}
 	async destroy() {
+		for (const abort of this.fetchAborts.values()) abort(/* @__PURE__ */ new Error("instance destroyed"));
+		this.fetchAborts.clear();
 		for (const controller of this.sourceControllers.values()) controller.abort(/* @__PURE__ */ new Error("source destroyed"));
 		for (const gate of this.sourceCreditGates.values()) gate.abort();
 		for (const spool of [...this.sourceSpools.values()]) await spool.unroll();
@@ -1706,10 +1755,6 @@ var SourceTrait = class extends ServiceTrait {
 			const sender = request.sender;
 			const receiver = request.receiver;
 			const reqSpool = new Spool();
-			this.sourceSpools.set(requestId, reqSpool);
-			reqSpool.roll(() => {
-				this.sourceSpools.delete(requestId);
-			});
 			if (sender === void 0 || sender === "") {
 				this.error(/* @__PURE__ */ new Error("invalid request: missing sender"));
 				await reqSpool.unroll();
@@ -1736,6 +1781,10 @@ var SourceTrait = class extends ServiceTrait {
 			reqSpool.roll(() => {
 				this.sourceControllers.delete(requestId);
 			});
+			this.sourceSpools.set(requestId, reqSpool);
+			reqSpool.roll(() => {
+				this.sourceSpools.delete(requestId);
+			});
 			const info = {
 				sender,
 				signal: abortSignal
@@ -1821,7 +1870,7 @@ var SourceTrait = class extends ServiceTrait {
 				reqSpool.roll(() => {
 					this.onResponse.delete(`source-fetch-credit:${requestId}`);
 				});
-				if (auth) info.authenticated = await this.authenticated(sender, request.auth, auth, `source "${name}"`);
+				if (auth !== void 0) info.authenticated = await this.authenticated(sender, request.auth, auth, `source "${name}"`);
 				const callbackPromise = Promise.resolve(callback(...params, info));
 				callbackPromise.catch(() => {});
 				await Promise.race([callbackPromise, abortPromise]);
@@ -1980,6 +2029,10 @@ var SourceTrait = class extends ServiceTrait {
 			metaReject(error);
 			stream.destroy(error);
 		};
+		this.fetchAborts.set(requestId, endWithError);
+		spool.roll(() => {
+			this.fetchAborts.delete(requestId);
+		});
 		let cancelled = false;
 		const cancelAndUnroll = (reason) => {
 			if (!cancelled && !streamEnded) {
@@ -2196,7 +2249,7 @@ var SinkTrait = class extends SourceTrait {
 			try {
 				if (topicName !== request.name) throw new Error(`sink name mismatch (topic: "${topicName}", payload: "${request.name}")`);
 				let authenticated = void 0;
-				if (auth) authenticated = await this.authenticated(sender, request.auth, auth, `sink "${name}"`);
+				if (auth !== void 0) authenticated = await this.authenticated(sender, request.auth, auth, `sink "${name}"`);
 				const creditState = chunkCredit > 0 ? {
 					chunksReceived: 0,
 					creditGranted: chunkCredit
@@ -2206,7 +2259,11 @@ var SinkTrait = class extends SourceTrait {
 				const pushTimerId = `sink-push-recv:${requestId}`;
 				const refreshPushTimeout = () => this.timerRefresh(pushTimerId, () => {
 					if (streamEnded || this.destroying) return;
-					abortController.abort(/* @__PURE__ */ new Error("push stream timeout"));
+					const error = /* @__PURE__ */ new Error("push stream timeout");
+					abortController.abort(error);
+					streamEnded = true;
+					const stream = this.pushStreams.get(requestId);
+					if (stream !== void 0 && !stream.destroyed) stream.destroy(error);
 					if (sender && !errorResponseSent) {
 						errorResponseSent = true;
 						const cancelMsg = this.msg.makeSinkPushCredit(requestId, name, 0, this.options.id, sender);
@@ -2486,6 +2543,7 @@ var SinkTrait = class extends SourceTrait {
 			pushInitialResolve = resolve;
 			pushInitialReject = reject;
 		});
+		pushInitial.catch(() => {});
 		this.onResponse.set(`sink-push-response:${requestId}`, (response) => {
 			if (response.name !== name) {
 				const error = /* @__PURE__ */ new Error(`sink response name mismatch (expected "${name}", got "${response.name}")`);