@peerbit/shared-log 13.2.27 → 13.2.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/shared-log",
-  "version": "13.2.27",
+  "version": "13.2.28",
   "description": "Shared log",
   "sideEffects": false,
   "type": "module",
@@ -64,34 +64,34 @@
     "uint8arrays": "^5.1.0",
     "@peerbit/any-store": "2.2.14",
     "@peerbit/blocks-interface": "2.1.5",
-    "@peerbit/blocks": "4.2.10",
     "@peerbit/cache": "3.1.1",
     "@peerbit/crypto": "3.1.5",
-    "@peerbit/indexer-interface": "3.0.9",
-    "@peerbit/log": "6.2.16",
+    "@peerbit/blocks": "4.2.10",
+    "@peerbit/diagnostics": "0.0.1",
     "@peerbit/indexer-sqlite3": "3.0.14",
+    "@peerbit/log": "6.2.16",
     "@peerbit/logger": "2.0.1",
-    "@peerbit/program": "6.0.48",
-    "@peerbit/diagnostics": "0.0.1",
     "@peerbit/pubsub": "5.4.0",
-    "@peerbit/riblt": "1.2.0",
+    "@peerbit/indexer-interface": "3.0.9",
+    "@peerbit/stream-interface": "6.0.15",
     "@peerbit/pubsub-interface": "5.2.0",
-    "@peerbit/rpc": "6.1.16",
+    "@peerbit/riblt": "1.2.0",
     "@peerbit/time": "3.0.1",
-    "@peerbit/stream-interface": "6.0.15"
+    "@peerbit/program": "6.0.48",
+    "@peerbit/rpc": "6.1.16"
   },
   "optionalDependencies": {
-    "@peerbit/shared-log-rust": "0.1.4",
-    "@peerbit/native-backbone": "0.2.5"
+    "@peerbit/native-backbone": "0.2.5",
+    "@peerbit/shared-log-rust": "0.1.4"
   },
   "devDependencies": {
     "@types/libsodium-wrappers": "^0.7.14",
     "@types/pidusage": "^2.0.5",
     "uuid": "^11.1.1",
-    "@peerbit/indexer-rust": "1.0.7",
     "@peerbit/any-store-rust": "0.1.4",
-    "@peerbit/test-utils": "3.1.22",
-    "peerbit": "5.3.22"
+    "@peerbit/indexer-rust": "1.0.7",
+    "peerbit": "5.3.22",
+    "@peerbit/test-utils": "3.1.22"
   },
   "repository": {
     "type": "git",

package/src/index.ts

@@ -1494,8 +1494,8 @@ const createRepairFrontierByMode = () =>
 	>(REPAIR_DISPATCH_MODES.map((mode) => [mode, new Map()]));
 
 const createRepairActiveTargetsByMode = () =>
-	new Map<RepairDispatchMode, Set<string>>(
-		REPAIR_DISPATCH_MODES.map((mode) => [mode, new Set()]),
+	new Map<RepairDispatchMode, Map<string, object>>(
+		REPAIR_DISPATCH_MODES.map((mode) => [mode, new Map()]),
 	);
 
 const createRepairFrontierBypassKnownPeersByMode = () =>
@@ -3246,7 +3246,7 @@ export class SharedLog<
 	>;
 	private _repairFrontierActiveTargetsByMode!: Map<
 		RepairDispatchMode,
-		Set<string>
+		Map<string, object>
 	>;
 	private _repairFrontierBypassKnownPeersByMode!: Map<
 		RepairDispatchMode,
@@ -7821,7 +7821,11 @@ export class SharedLog<
 		) {
 			return;
 		}
-		activeTargets.add(target);
+		const runnerToken = {};
+		activeTargets.set(target, runnerToken);
+		const isCurrentRunner = () =>
+			activeTargets.get(target) === runnerToken &&
+			this.isRepairLifecycleActive(repairLifecycleController);
 		const retrySchedule = resolveRepairRetrySchedule(
 			mode,
 			retryScheduleMs,
@@ -7840,12 +7844,12 @@ export class SharedLog<
 			let attemptIndex = 0;
 			try {
 				for (;;) {
-					if (!this.isRepairLifecycleActive(repairLifecycleController)) {
+					if (!isCurrentRunner()) {
 						return;
 					}
 					const pending = this._repairFrontierByMode.get(mode)?.get(target);
 					if (!pending || pending.size === 0) {
-						if (!this.isRepairLifecycleActive(repairLifecycleController)) {
+						if (!isCurrentRunner()) {
 							return;
 						}
 						this._repairFrontierBypassKnownPeersByMode
@@ -7872,7 +7876,7 @@ export class SharedLog<
 						continue;
 					}
 
-					if (!this.isRepairLifecycleActive(repairLifecycleController)) {
+					if (!isCurrentRunner()) {
 						return;
 					}
 					await this.sendMaybeMissingEntriesNow(
@@ -7889,7 +7893,7 @@ export class SharedLog<
 						},
 						repairLifecycleController,
 					);
-					if (!this.isRepairLifecycleActive(repairLifecycleController)) {
+					if (!isCurrentRunner()) {
 						return;
 					}
 
@@ -7911,21 +7915,25 @@ export class SharedLog<
 					}
 				}
 			} finally {
-				activeTargets.delete(target);
-				if (
-					this.isRepairLifecycleActive(repairLifecycleController) &&
-					(this._repairFrontierByMode.get(mode)?.get(target)?.size || 0) > 0
-				) {
-					this.ensureRepairFrontierRunner(
-						mode,
-						target,
-						retryScheduleMs,
-						repairLifecycleController,
-					);
+				if (activeTargets.get(target) === runnerToken) {
+					activeTargets.delete(target);
+					if (
+						this.isRepairLifecycleActive(repairLifecycleController) &&
+						(this._repairFrontierByMode.get(mode)?.get(target)?.size || 0) > 0
+					) {
+						this.ensureRepairFrontierRunner(
+							mode,
+							target,
+							retryScheduleMs,
+							repairLifecycleController,
+						);
+					}
 				}
 			}
 		})().catch((error: any) => {
-			activeTargets.delete(target);
+			if (activeTargets.get(target) === runnerToken) {
+				activeTargets.delete(target);
+			}
 			if (this.isRepairLifecycleActive(repairLifecycleController)) {
 				logger.error(error);
 			}