@peerbit/pubsub 5.4.6 → 5.4.8

package/src/index.ts

@@ -397,6 +397,7 @@ export class TopicControlPlane
 		{
 			targets: Set<string>;
 			topics: Set<string>;
+			isCurrent: () => boolean;
 			timer: ReturnType<typeof setTimeout>;
 		}
 	> = new Map();
@@ -416,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;
@@ -636,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}`,
@@ -712,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 &&
@@ -764,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(
@@ -822,8 +835,6 @@ export class TopicControlPlane
 		}
 		this.pendingTopicRootQueries.clear();
 
-		this.debounceSubscribeAggregator.close();
-		this.debounceUnsubscribeAggregator.close();
 		await super.stop();
 		this.reconcileShardOverlaysDirty = false;
 	}
@@ -2062,17 +2073,32 @@ export class TopicControlPlane
 		]);
 	}
 
+	private isTopicControlPlaneActive(lifecycleRevision: number): boolean {
+		return (
+			lifecycleRevision === this.topicControlPlaneLifecycleRevision &&
+			this.started &&
+			!this.stopping &&
+			!this.topicControlPlaneStopping
+		);
+	}
+
 	private assertTopicControlPlaneActive(lifecycleRevision: number): void {
-		if (
-			lifecycleRevision !== this.topicControlPlaneLifecycleRevision ||
-			!this.started ||
-			this.stopping ||
-			this.topicControlPlaneStopping
-		) {
+		if (!this.isTopicControlPlaneActive(lifecycleRevision)) {
 			throw new NotStartedError();
 		}
 	}
 
+	private isFanoutChannelCurrent(
+		shardTopic: string,
+		channel: FanoutChannel,
+		lifecycleRevision: number,
+	): boolean {
+		return (
+			this.isTopicControlPlaneActive(lifecycleRevision) &&
+			this.fanoutChannels.get(shardTopic)?.channel === channel
+		);
+	}
+
 	private syncTopicRootCandidateResolutionSignal(
 		candidateGeneration = this.getTopicRootCandidateGeneration(),
 	): AbortSignal {
@@ -2851,8 +2877,11 @@ export class TopicControlPlane
 			return;
 		}
 		const channel = new FanoutChannel(this.fanout, { topic: t, root });
+		const isCurrent = () =>
+			this.isFanoutChannelCurrent(t, channel, lifecycleRevision);
 
 		const onPayload = (payload: Uint8Array) => {
+			if (!isCurrent()) return;
 			let dm: DataMessage;
 			try {
 				dm = DataMessage.from(new Uint8ArrayList(payload));
@@ -2912,24 +2941,38 @@ export class TopicControlPlane
 
 			void (async () => {
 				const msgId = await getMsgId(payload);
-				const seen = this.seenCache.get(msgId);
-				this.seenCache.add(msgId, seen ? seen + 1 : 1);
-				if (seen) return;
+				if (!isCurrent()) return;
+				const previouslySeen = this.seenCache.get(msgId);
+				if (previouslySeen) {
+					this.seenCache.add(msgId, previouslySeen + 1);
+					return;
+				}
 
 				// fanout-delivered frames bypass the inbound stream decode, so
 				// the nested envelope is verified natively here when possible
 				this.seedNativeWireVerification(dm, payload);
-				if ((await this.verifyAndProcess(dm)) === false) {
+				if ((await this.verifyAndProcess(dm, isCurrent)) === false) {
 					return;
 				}
+				if (!isCurrent()) return;
+				// Only a verified frame owned by this exact channel may consume the
+				// shared dedupe slot. A stale verifier cannot suppress its replacement's
+				// copy. Concurrent verifiers recheck here before dispatching once.
+				const seen = this.seenCache.get(msgId);
+				this.seenCache.add(msgId, seen ? seen + 1 : 1);
+				if (seen) return;
 				const sender = dm.header.signatures!.signatures[0]!.publicKey!;
 				await this.processShardPubSubMessage({
 					pubsubMessage,
 					message: dm,
 					from: sender,
 					shardTopic: t,
+					isCurrent,
 				});
-			})();
+			})().catch((error) => {
+				if (error instanceof NotStartedError && !isCurrent()) return;
+				logError(error);
+			});
 		};
 
 		const onData = (ev?: CustomEvent<FanoutTreeDataEvent>) => {
@@ -3035,6 +3078,11 @@ export class TopicControlPlane
 		if (!st) return;
 		this.fanoutChannels.delete(t);
 		this.clearFanoutIdleClose(st);
+		const pendingResponse = this.pendingSubscriberResponses.get(t);
+		if (pendingResponse) {
+			clearTimeout(pendingResponse.timer);
+			this.pendingSubscriberResponses.delete(t);
+		}
 		try {
 			st.channel.removeEventListener("data", st.onData as any);
 		} catch {
@@ -3149,8 +3197,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[]>();
@@ -3176,11 +3228,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,
@@ -3193,11 +3249,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);
 			}),
 		);
 	}
@@ -3253,8 +3317,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) {
@@ -3267,6 +3333,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 {
@@ -3279,20 +3347,39 @@ 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);
 					}
 				} 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);
@@ -3955,17 +4042,36 @@ export class TopicControlPlane
 		targetHash: string,
 		topics: string[],
 	) {
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
+		const st = this.fanoutChannels.get(shardTopic);
+		if (!st) return;
+		const isCurrent = () =>
+			this.isFanoutChannelCurrent(shardTopic, st.channel, lifecycleRevision);
+		if (!isCurrent()) return;
+		const onError = (error: Error) => {
+			if (error instanceof NotStartedError && !isCurrent()) return;
+			logError(error);
+		};
 		let entry = this.pendingSubscriberResponses.get(shardTopic);
+		if (entry && !entry.isCurrent()) {
+			clearTimeout(entry.timer);
+			this.pendingSubscriberResponses.delete(shardTopic);
+			entry = undefined;
+		}
 		if (!entry) {
 			const created = {
 				targets: new Set<string>(),
 				topics: new Set<string>(),
+				isCurrent,
 				timer: setTimeout(
 					() => {
+						if (this.pendingSubscriberResponses.get(shardTopic) !== created) {
+							return;
+						}
 						this.pendingSubscriberResponses.delete(shardTopic);
-						if (created.targets.size === 0) return;
+						if (!isCurrent() || created.targets.size === 0) return;
 						void this.flushSubscriberResponses(shardTopic, created).catch(
-							logErrorIfStarted,
+							onError,
 						);
 					},
 					150 + Math.floor(Math.random() * 150),
@@ -3976,7 +4082,8 @@ export class TopicControlPlane
 			void this.flushSubscriberResponses(shardTopic, {
 				targets: new Set([targetHash]),
 				topics: new Set(topics),
-			}).catch(logErrorIfStarted);
+				isCurrent,
+			}).catch(onError);
 			return;
 		}
 		entry.targets.add(targetHash);
@@ -3985,9 +4092,13 @@ export class TopicControlPlane
 
 	private async flushSubscriberResponses(
 		shardTopic: string,
-		entry: { targets: Set<string>; topics: Set<string> },
+		entry: {
+			targets: Set<string>;
+			topics: Set<string>;
+			isCurrent: () => boolean;
+		},
 	) {
-		if (!this.started) return;
+		if (!entry.isCurrent()) return;
 		// Re-filter: our subscriptions may have changed within the window.
 		const topics = this.getSubscriptionOverlap([...entry.topics]);
 		if (topics.length === 0) return;
@@ -4003,6 +4114,7 @@ export class TopicControlPlane
 				skipRecipientValidation: true,
 			} as any,
 		);
+		if (!entry.isCurrent()) return;
 		const payload = toUint8Array(embedded.bytes());
 		const [firstTarget] = entry.targets;
 		if (entry.targets.size === 1 && firstTarget) {
@@ -4019,8 +4131,12 @@ export class TopicControlPlane
 		targetHash: string,
 		payload: Uint8Array,
 	) {
+		const lifecycleRevision = this.topicControlPlaneLifecycleRevision;
 		const st = this.fanoutChannels.get(shardTopic);
 		if (!st) return;
+		const isCurrent = () =>
+			this.isFanoutChannelCurrent(shardTopic, st.channel, lifecycleRevision);
+		if (!isCurrent()) return;
 		const hints = this.getUnifiedRouteHints(shardTopic, targetHash);
 		const fanoutHint = hints.find(
 			(hint): hint is Extract<RouteHint, { kind: "fanout-token" }> =>
@@ -4032,16 +4148,25 @@ export class TopicControlPlane
 					timeoutMs: 5_000,
 				});
 				return;
-			} catch {
+			} catch (error) {
+				if (!isCurrent()) {
+					if (error instanceof NotStartedError) return;
+					throw error;
+				}
 				// ignore and fall back
 			}
 		}
 		try {
 			await st.channel.unicastToAck(targetHash, payload, { timeoutMs: 5_000 });
 			return;
-		} catch {
+		} catch (error) {
+			if (!isCurrent()) {
+				if (error instanceof NotStartedError) return;
+				throw error;
+			}
 			// ignore and fall back
 		}
+		if (!isCurrent()) return;
 		await st.channel.publishMaybe(payload);
 	}
 
@@ -4227,8 +4352,10 @@ export class TopicControlPlane
 		message: DataMessage;
 		from: PublicSignKey;
 		shardTopic: string;
+		isCurrent?: () => boolean;
 	}): Promise<void> {
-		const { pubsubMessage, message, from, shardTopic } = input;
+		const { pubsubMessage, message, from, shardTopic, isCurrent } = input;
+		if (isCurrent?.() === false) return;
 
 		if (pubsubMessage instanceof PubSubData) {
 			this.dispatchEvent(
@@ -4295,6 +4422,7 @@ export class TopicControlPlane
 				}
 			}
 
+			if (isCurrent?.() === false) return;
 			if (pubsubMessage.requestSubscribers) {
 				const overlap = this.getSubscriptionOverlap(pubsubMessage.topics);
 				if (overlap.length > 0) {
@@ -4425,6 +4553,7 @@ export class TopicControlPlane
 				} as any,
 			);
 			const payload = toUint8Array(embedded.bytes());
+			if (isCurrent?.() === false) return;
 			await this.sendFanoutUnicastOrBroadcast(shardTopic, senderKey, payload);
 			return;
 		}