@peerbit/shared-log 13.1.15 → 13.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/shared-log",
-  "version": "13.1.15",
+  "version": "13.1.16",
   "description": "Shared log",
   "sideEffects": false,
   "type": "module",
@@ -63,18 +63,18 @@
     "uint8arrays": "^5.1.0",
     "@peerbit/any-store": "2.2.9",
     "@peerbit/blocks-interface": "2.0.11",
-    "@peerbit/blocks": "4.1.7",
-    "@peerbit/cache": "3.0.0",
     "@peerbit/crypto": "3.1.1",
+    "@peerbit/blocks": "4.1.8",
     "@peerbit/indexer-interface": "3.0.3",
-    "@peerbit/log": "6.0.34",
-    "@peerbit/program": "6.0.28",
-    "@peerbit/logger": "2.0.1",
+    "@peerbit/cache": "3.0.0",
     "@peerbit/indexer-sqlite3": "3.0.6",
-    "@peerbit/pubsub": "5.2.9",
+    "@peerbit/log": "6.0.35",
+    "@peerbit/logger": "2.0.1",
+    "@peerbit/program": "6.0.29",
+    "@peerbit/pubsub": "5.2.10",
     "@peerbit/pubsub-interface": "5.1.3",
+    "@peerbit/rpc": "6.0.33",
     "@peerbit/riblt": "1.2.0",
-    "@peerbit/rpc": "6.0.32",
     "@peerbit/stream-interface": "6.0.9",
     "@peerbit/time": "3.0.0"
   },
@@ -82,7 +82,7 @@
     "@types/libsodium-wrappers": "^0.7.14",
     "@types/pidusage": "^2.0.5",
     "uuid": "^10.0.0",
-    "@peerbit/test-utils": "3.0.32"
+    "@peerbit/test-utils": "3.0.33"
   },
   "repository": {
     "type": "git",

package/src/index.ts

@@ -70,7 +70,7 @@ import {
 } from "@peerbit/time";
 import pDefer, { type DeferredPromise } from "p-defer";
 import PQueue from "p-queue";
-import { concat } from "uint8arrays";
+import { concat, fromString } from "uint8arrays";
 import { BlocksMessage } from "./blocks.js";
 import { type CPUUsage, CPUUsageIntervalLag } from "./cpu.js";
 import {
@@ -2065,6 +2065,14 @@ export class SharedLog<
 			) => void;
 		},
 	) {
+		const entryRangeId = (entry: Entry<T>) =>
+			sha256Sync(
+				concat([
+					this.log.id,
+					fromString(entry.hash),
+					fromString(this.node.identity.publicKey.hashcode()),
+				]),
+			);
 		let range:
 			| ReplicationRangeMessage<any>[]
 			| ReplicationOptions<R>
@@ -2074,6 +2082,7 @@ export class SharedLog<
 			range = rangeOrEntry;
 		} else if (rangeOrEntry instanceof Entry) {
 			range = {
+				id: entryRangeId(rangeOrEntry),
 				factor: 1,
 				offset: await this.domain.fromEntry(rangeOrEntry),
 				normalized: false,
@@ -2084,6 +2093,7 @@ export class SharedLog<
 			for (const entry of rangeOrEntry) {
 				if (entry instanceof Entry) {
 					ranges.push({
+						id: entryRangeId(entry),
 						factor: 1,
 						offset: await this.domain.fromEntry(entry),
 						normalized: false,
@@ -3514,26 +3524,18 @@ export class SharedLog<
 					const frontierTargets = this._repairFrontierByMode.get(mode);
 					for (const target of pendingPeersByMode.get(mode) ?? []) {
 						const replacement = nextTargets.get(target);
-						if (mode === "join-authoritative") {
-							// Authoritative join repair is receipt-driven: a later sweep can have a
-							// narrower transient leader view, but it must not forget unconfirmed
-							// hashes that were already queued for this joiner.
-							if (replacement && replacement.size > 0) {
-								const existing = frontierTargets?.get(target);
-								if (existing && existing.size > 0) {
-									for (const [hash, entry] of replacement) {
-										existing.set(hash, entry);
-									}
-								} else {
-									frontierTargets?.set(target, replacement);
+						// These repairs are receipt-driven: a later sweep can have a narrower
+						// transient leader view, but it must not forget unconfirmed hashes
+						// that were already queued for this target.
+						if (replacement && replacement.size > 0) {
+							const existing = frontierTargets?.get(target);
+							if (existing && existing.size > 0) {
+								for (const [hash, entry] of replacement) {
+									existing.set(hash, entry);
 								}
+							} else {
+								frontierTargets?.set(target, replacement);
 							}
-							continue;
-						}
-						if (replacement && replacement.size > 0) {
-							frontierTargets?.set(target, replacement);
-						} else {
-							frontierTargets?.delete(target);
 						}
 					}
 				}
@@ -6072,7 +6074,7 @@ export class SharedLog<
 
 			await this.replicate(entriesToReplicate, {
 				rebalance: assumeSynced ? false : true,
-				checkDuplicates: true,
+				checkDuplicates: assumeSynced ? false : true,
 				mergeSegments:
 					typeof options.replicate !== "boolean" && options.replicate
 						? options.replicate.mergeSegments