@peerbit/pubsub 5.4.7 → 5.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/pubsub",
-  "version": "5.4.7",
+  "version": "5.4.9",
   "description": "Direct streaming for libp2p",
   "type": "module",
   "types": "./dist/src/index.d.ts",
@@ -85,13 +85,13 @@
     "p-defer": "^4.0.0",
     "uint8arraylist": "^3.0.2",
     "uint8arrays": "^5.1.0",
-    "@peerbit/crypto": "3.1.6",
     "@peerbit/any-store-interface": "1.1.4",
     "@peerbit/logger": "2.0.2",
-    "@peerbit/pubsub-interface": "5.2.2",
     "@peerbit/stream": "5.2.3",
-    "@peerbit/stream-interface": "6.0.16",
-    "@peerbit/time": "3.0.1"
+    "@peerbit/pubsub-interface": "5.2.2",
+    "@peerbit/crypto": "3.1.6",
+    "@peerbit/time": "3.0.1",
+    "@peerbit/stream-interface": "6.0.16"
   },
   "scripts": {
     "bench": "TS_NODE_PROJECT=../../../tsconfig.json node --loader ts-node/esm ./benchmark/index.ts",

package/src/index.ts

@@ -417,8 +417,9 @@ export class TopicControlPlane
 	// default) leaves every code path as-is.
 	private readonly nativeTopicControl?: RustTopicControl;
 
-	private debounceSubscribeAggregator: DebouncedAccumulatorCounterMap;
-	private debounceUnsubscribeAggregator: DebouncedAccumulatorCounterMap;
+	private debounceSubscribeAggregator!: DebouncedAccumulatorCounterMap;
+	private debounceUnsubscribeAggregator!: DebouncedAccumulatorCounterMap;
+	private readonly subscriptionDebounceDelay: number;
 
 	private readonly shardCount: number;
 	private readonly shardTopicPrefix: string;
@@ -637,17 +638,23 @@ export class TopicControlPlane
 			Math.max(1, Math.floor(requestedSubscriberCacheMaxEntries)),
 		);
 
+		this.subscriptionDebounceDelay = props?.subscriptionDebounceDelay ?? 50;
+		this.createSubscriptionAggregators();
+	}
+
+	private createSubscriptionAggregators(): void {
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
 		this.debounceSubscribeAggregator = debouncedAccumulatorSetCounter(
-			(set) => this._subscribe([...set.values()]),
-			props?.subscriptionDebounceDelay ?? 50,
+			(set) => this._subscribe([...set.values()], lifecycleRevision),
+			this.subscriptionDebounceDelay,
 			(error) =>
 				logger.error(`Debounced subscribe failed: ${error?.message ?? error}`),
 		);
 		// NOTE: Unsubscribe should update local state immediately and batch only the
 		// best-effort network announcements to avoid teardown stalls (program close).
 		this.debounceUnsubscribeAggregator = debouncedAccumulatorSetCounter(
-			(set) => this._announceUnsubscribe([...set.values()]),
-			props?.subscriptionDebounceDelay ?? 50,
+			(set) => this._announceUnsubscribe([...set.values()], lifecycleRevision),
+			this.subscriptionDebounceDelay,
 			(error) =>
 				logger.error(
 					`Debounced unsubscribe announce failed: ${error?.message ?? error}`,
@@ -713,6 +720,9 @@ export class TopicControlPlane
 		// candidates. In particular, a repeated start must not restore unsigned
 		// self while a signed-protocol peer is connected.
 		if (this.started) return;
+		// close() is terminal. Only a completed stop/start gets a fresh pair;
+		// repeated start() must preserve the active pair's queued reference counts.
+		if (this.topicControlPlaneStopping) this.createSubscriptionAggregators();
 		this.topicControlPlaneStopping = false;
 		if (
 			this.autoTopicRootCandidates &&
@@ -765,6 +775,8 @@ export class TopicControlPlane
 		this.clearAutoTopicRootCandidateUpdateSchedule();
 		this.clearSignedTopicRootCandidateState();
 		this.topicControlPlaneLifecycleRevision += 1;
+		this.debounceSubscribeAggregator.close();
+		this.debounceUnsubscribeAggregator.close();
 		this.reconcileShardOverlaysDirty = false;
 		for (const opening of this.ensureFanoutChannelInFlight.values()) {
 			opening.abortController.abort(
@@ -779,7 +791,7 @@ export class TopicControlPlane
 			);
 		}
 		for (const st of this.fanoutChannels.values()) {
-			if (st.idleCloseTimeout) clearTimeout(st.idleCloseTimeout);
+			this.clearFanoutIdleClose(st);
 			try {
 				st.channel.removeEventListener("data", st.onData as any);
 			} catch {
@@ -823,8 +835,6 @@ export class TopicControlPlane
 		}
 		this.pendingTopicRootQueries.clear();
 
-		this.debounceSubscribeAggregator.close();
-		this.debounceUnsubscribeAggregator.close();
 		await super.stop();
 		this.reconcileShardOverlaysDirty = false;
 	}
@@ -1765,6 +1775,7 @@ export class TopicControlPlane
 
 	private async reconcileShardOverlays() {
 		if (!this.started || this.topicControlPlaneStopping) return;
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
 
 		const byShard = new Map<string, string[]>();
 		for (const topic of this.subscriptions.keys()) {
@@ -1794,7 +1805,7 @@ export class TopicControlPlane
 				const st = this.fanoutChannels.get(shardTopic);
 				if (!st) return;
 				await st.channel.publish(toUint8Array(embedded.bytes()));
-				this.touchFanoutChannel(shardTopic);
+				this.touchFanoutChannel(shardTopic, st.channel, lifecycleRevision);
 			}),
 		);
 	}
@@ -1883,22 +1894,42 @@ export class TopicControlPlane
 
 	private scheduleFanoutIdleClose(topic: string) {
 		const st = this.fanoutChannels.get(topic);
-		if (!st || !st.ephemeral) return;
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
+		if (
+			!st ||
+			!st.ephemeral ||
+			!this.isTopicControlPlaneActive(lifecycleRevision)
+		)
+			return;
 		this.clearFanoutIdleClose(st);
 		if (this.fanoutPublishIdleCloseMs <= 0) return;
-		st.idleCloseTimeout = setTimeout(() => {
-			const cur = this.fanoutChannels.get(topic);
-			if (!cur || !cur.ephemeral) return;
-			const idleMs = Date.now() - cur.lastUsedAt;
+		const timer = setTimeout(() => {
+			// Cancellation can race a queued callback. It must still own this exact
+			// timer, channel state and lifecycle before acting on the topic again.
+			if (
+				!this.isTopicControlPlaneActive(lifecycleRevision) ||
+				this.fanoutChannels.get(topic) !== st ||
+				st.idleCloseTimeout !== timer ||
+				!st.ephemeral
+			)
+				return;
+			st.idleCloseTimeout = undefined;
+			const idleMs = Date.now() - st.lastUsedAt;
 			if (idleMs >= this.fanoutPublishIdleCloseMs) {
 				void this.closeFanoutChannel(topic);
 				return;
 			}
 			this.scheduleFanoutIdleClose(topic);
 		}, this.fanoutPublishIdleCloseMs);
+		st.idleCloseTimeout = timer;
 	}
 
-	private touchFanoutChannel(topic: string) {
+	private touchFanoutChannel(
+		topic: string,
+		channel: FanoutChannel,
+		lifecycleRevision: number,
+	) {
+		if (!this.isFanoutChannelCurrent(topic, channel, lifecycleRevision)) return;
 		const st = this.fanoutChannels.get(topic);
 		if (!st) return;
 		st.lastUsedAt = Date.now();
@@ -3043,7 +3074,7 @@ export class TopicControlPlane
 		join
 			.then(() => {
 				const st = this.fanoutChannels.get(t);
-				if (st === channelState && st.ephemeral) {
+				if (st === channelState && st.ephemeral && isCurrent()) {
 					this.scheduleFanoutIdleClose(t);
 				}
 			})
@@ -3187,8 +3218,12 @@ export class TopicControlPlane
 		return this.debounceSubscribeAggregator.add({ key: topic });
 	}
 
-	private async _subscribe(topics: { key: string; counter: number }[]) {
+	private async _subscribe(
+		topics: { key: string; counter: number }[],
+		lifecycleRevision = this.topicControlPlaneLifecycleRevision,
+	) {
 		if (!this.started) throw new NotStartedError();
+		if (!this.isTopicControlPlaneActive(lifecycleRevision)) return;
 		if (topics.length === 0) return;
 
 		const byShard = new Map<string, string[]>();
@@ -3214,11 +3249,15 @@ export class TopicControlPlane
 		}
 
 		await Promise.all(joins);
+		if (!this.isTopicControlPlaneActive(lifecycleRevision)) return;
 
 		// Announce subscriptions per shard overlay.
 		await Promise.all(
 			[...byShard.entries()].map(async ([shardTopic, userTopics]) => {
 				if (userTopics.length === 0) return;
+				const st = this.fanoutChannels.get(shardTopic);
+				if (!st)
+					throw new Error(`Fanout channel missing for shard: ${shardTopic}`);
 				const msg = new Subscribe({
 					topics: userTopics,
 					requestSubscribers: true,
@@ -3231,11 +3270,19 @@ export class TopicControlPlane
 						skipRecipientValidation: true,
 					} as any,
 				);
-				const st = this.fanoutChannels.get(shardTopic);
-				if (!st)
-					throw new Error(`Fanout channel missing for shard: ${shardTopic}`);
+				if (
+					!this.isFanoutChannelCurrent(
+						shardTopic,
+						st.channel,
+						lifecycleRevision,
+					)
+				)
+					return;
 				await st.channel.publish(toUint8Array(embedded.bytes()));
-				this.touchFanoutChannel(shardTopic);
+				if (
+					this.isFanoutChannelCurrent(shardTopic, st.channel, lifecycleRevision)
+				)
+					this.touchFanoutChannel(shardTopic, st.channel, lifecycleRevision);
 			}),
 		);
 	}
@@ -3291,8 +3338,10 @@ export class TopicControlPlane
 
 	private async _announceUnsubscribe(
 		topics: { key: string; counter: number }[],
+		lifecycleRevision = this.topicControlPlaneLifecycleRevision,
 	) {
 		if (!this.started) throw new NotStartedError();
+		if (!this.isTopicControlPlaneActive(lifecycleRevision)) return;
 
 		const byShard = new Map<string, string[]>();
 		for (const { key: topic } of topics) {
@@ -3305,6 +3354,8 @@ export class TopicControlPlane
 		await Promise.all(
 			[...byShard.entries()].map(async ([shardTopic, userTopics]) => {
 				if (userTopics.length === 0) return;
+				const st = this.fanoutChannels.get(shardTopic);
+				if (!st) return;
 
 				// Announce first.
 				try {
@@ -3317,20 +3368,43 @@ export class TopicControlPlane
 							skipRecipientValidation: true,
 						} as any,
 					);
-					const st = this.fanoutChannels.get(shardTopic);
-					if (st) {
+					if (
+						this.isFanoutChannelCurrent(
+							shardTopic,
+							st.channel,
+							lifecycleRevision,
+						)
+					) {
 						// Best-effort: do not let a stuck proxy publish stall teardown.
 						void st.channel
 							.publish(toUint8Array(embedded.bytes()))
 							.catch(() => {});
-						this.touchFanoutChannel(shardTopic);
+						if (
+							this.isFanoutChannelCurrent(
+								shardTopic,
+								st.channel,
+								lifecycleRevision,
+							)
+						)
+							this.touchFanoutChannel(
+								shardTopic,
+								st.channel,
+								lifecycleRevision,
+							);
 					}
 				} catch {
 					// best-effort
 				}
 
 				// Close shard overlay if no local topics remain.
-				if ((this.shardRefCounts.get(shardTopic) ?? 0) <= 0) {
+				if (
+					this.isFanoutChannelCurrent(
+						shardTopic,
+						st.channel,
+						lifecycleRevision,
+					) &&
+					(this.shardRefCounts.get(shardTopic) ?? 0) <= 0
+				) {
 					try {
 						// Shutdown should be bounded and not depend on network I/O.
 						await this.closeFanoutChannel(shardTopic);
@@ -3347,6 +3421,7 @@ export class TopicControlPlane
 		batches: { session: bigint; timestamp: bigint; topics: string[] }[],
 	) {
 		if (!this.started) throw new NotStartedError();
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
 
 		const byShard = new Map<
 			string,
@@ -3397,7 +3472,7 @@ export class TopicControlPlane
 					const st = this.fanoutChannels.get(shardTopic);
 					if (st) {
 						void st.channel.publishMaybe(toUint8Array(embedded.bytes()));
-						this.touchFanoutChannel(shardTopic);
+						this.touchFanoutChannel(shardTopic, st.channel, lifecycleRevision);
 					}
 				} catch {
 					// best-effort
@@ -3411,6 +3486,7 @@ export class TopicControlPlane
 		shardTopic: string,
 	) {
 		if (!this.started) throw new NotStartedError();
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
 		try {
 			const msg = new PeerUnavailable({
 				publicKeyHash,
@@ -3427,7 +3503,7 @@ export class TopicControlPlane
 			const st = this.fanoutChannels.get(shardTopic);
 			if (st) {
 				void st.channel.publishMaybe(toUint8Array(embedded.bytes()));
-				this.touchFanoutChannel(shardTopic);
+				this.touchFanoutChannel(shardTopic, st.channel, lifecycleRevision);
 			}
 		} catch {
 			// best-effort
@@ -3494,6 +3570,7 @@ export class TopicControlPlane
 		to?: PublicSignKey,
 	): Promise<void> {
 		if (!this.started) throw new NotStartedError();
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
 		if (topic == null) throw new Error("ERR_NOT_VALID_TOPIC");
 		if (topic.length === 0) return;
 
@@ -3545,7 +3622,7 @@ export class TopicControlPlane
 				} else {
 					await st.channel.publish(payload);
 				}
-				this.touchFanoutChannel(shardTopic);
+				this.touchFanoutChannel(shardTopic, st.channel, lifecycleRevision);
 			}),
 		);
 	}
@@ -3563,6 +3640,7 @@ export class TopicControlPlane
 			WithExtraSigners & { signal?: AbortSignal },
 	): Promise<Uint8Array | undefined> {
 		if (!this.started) throw new NotStartedError();
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
 
 		const topicsAll =
 			(options as { topics: string[] }).topics?.map((x) => x.toString()) || [];
@@ -3670,7 +3748,7 @@ export class TopicControlPlane
 					throw new Error(`Fanout channel missing for shard: ${shardTopic}`);
 				}
 				await withAbort(st.channel.publish(payload), options?.signal);
-				this.touchFanoutChannel(shardTopic);
+				this.touchFanoutChannel(shardTopic, st.channel, lifecycleRevision);
 			}),
 		);