@peerbit/shared-log 10.0.4 → 10.0.5-8abb258

package/package.json

@@ -1,75 +1,72 @@
 {
-	"name": "@peerbit/shared-log",
-	"version": "10.0.4",
-	"description": "Shared log",
-	"sideEffects": false,
-	"type": "module",
-	"types": "./dist/src/index.d.ts",
-	"typesVersions": {
-		"*": {
-			"*": [
-				"*",
-				"dist/*",
-				"dist/src/*",
-				"dist/src/*/index"
-			],
-			"src/*": [
-				"*",
-				"dist/*",
-				"dist/src/*",
-				"dist/src/*/index"
-			]
-		}
-	},
-	"files": [
-		"src",
-		"dist",
-		"!dist/e2e",
-		"!dist/test",
-		"!**/*.tsbuildinfo"
-	],
-	"browser": {
-		"./dist/src/sync/wasm-init.js": "./dist/src/sync/wasm-init.browser.js"
-	},
-	"exports": {
-		".": {
-			"types": "./dist/src/index.d.ts",
-			"import": "./dist/src/index.js"
-		}
-	},
-	"eslintConfig": {
-		"extends": "peerbit",
-		"parserOptions": {
-			"project": true,
-			"sourceType": "module"
-		},
-		"ignorePatterns": [
-			"!.aegir.js",
-			"test/ts-use",
-			"*.d.ts"
-		]
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"scripts": {
-		"clean": "aegir clean",
-		"build": "aegir build --no-bundle",
-		"test": "aegir test --target node",
-		"lint": "aegir lint"
-	},
-	"author": "dao.xyz",
-	"license": "MIT",
-	"dependencies": {
-		"@dao-xyz/borsh": "^5.2.3",
-		"@peerbit/logger": "1.0.3",
-		"@peerbit/program": "5.1.0",
-		"@peerbit/log": "4.0.23",
-		"@peerbit/rpc": "5.0.21",
-		"@peerbit/time": "2.0.7",
-		"@peerbit/riblt": "1.0.3"
-	},
-	"devDependencies": {
-		"@peerbit/test-utils": "^2.1.11"
-	}
+  "name": "@peerbit/shared-log",
+  "version": "10.0.5-8abb258",
+  "description": "Shared log",
+  "sideEffects": false,
+  "type": "module",
+  "types": "./dist/src/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "*",
+        "dist/*",
+        "dist/src/*",
+        "dist/src/*/index"
+      ],
+      "src/*": [
+        "*",
+        "dist/*",
+        "dist/src/*",
+        "dist/src/*/index"
+      ]
+    }
+  },
+  "files": [
+    "src",
+    "dist",
+    "!dist/e2e",
+    "!dist/test",
+    "!**/*.tsbuildinfo"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/src/index.d.ts",
+      "import": "./dist/src/index.js"
+    }
+  },
+  "eslintConfig": {
+    "extends": "peerbit",
+    "parserOptions": {
+      "project": true,
+      "sourceType": "module"
+    },
+    "ignorePatterns": [
+      "!.aegir.js",
+      "test/ts-use",
+      "*.d.ts"
+    ]
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "clean": "aegir clean",
+    "build": "aegir build --no-bundle",
+    "test": "aegir test --target node",
+    "lint": "aegir lint"
+  },
+  "author": "dao.xyz",
+  "license": "MIT",
+  "dependencies": {
+    "@dao-xyz/borsh": "^5.2.3",
+    "@peerbit/logger": "1.0.3-8abb258",
+    "@peerbit/program": "5.1.0-8abb258",
+    "@peerbit/log": "4.0.23-8abb258",
+    "@peerbit/rpc": "5.0.21-8abb258",
+    "@peerbit/time": "2.0.7-8abb258",
+    "@peerbit/riblt": "1.0.3-8abb258"
+  },
+  "devDependencies": {
+    "@peerbit/test-utils": "2.1.11-8abb258"
+  }
 }

package/src/index.ts

@@ -2037,7 +2037,7 @@ export class SharedLog<
 							if (isLeader) {
 								for (const entry of entries) {
 									this.pruneDebouncedFn.delete(entry.entry.hash);
-									this._requestIPruneSent.delete(entry.entry.hash);
+									this.removePruneRequestSent(entry.entry.hash);
 									this._requestIPruneResponseReplicatorSet.delete(
 										entry.entry.hash,
 									);
@@ -2130,13 +2130,17 @@ export class SharedLog<
 				}
 			} else if (msg instanceof RequestIPrune) {
 				const hasAndIsLeader: string[] = [];
+				const from = context.from.hashcode();
+
 				for (const hash of msg.hashes) {
+					this.removePruneRequestSent(hash, from);
+
 					// if we expect the remote to be owner of this entry because we are to prune ourselves, then we need to remove the remote
 					// this is due to that the remote has previously indicated to be a replicator to help us prune but now has changed their mind
 					const outGoingPrunes =
 						this._requestIPruneResponseReplicatorSet.get(hash);
 					if (outGoingPrunes) {
-						outGoingPrunes.delete(context.from.hashcode());
+						outGoingPrunes.delete(from);
 					}
 
 					const indexedEntry = await this.log.entryIndex.getShallow(hash);
@@ -2170,6 +2174,8 @@ export class SharedLog<
 					}
 
 					if (isLeader) {
+						//console.log("IS  LEADER", this.node.identity.publicKey.hashcode(), hash);
+
 						hasAndIsLeader.push(hash);
 
 						hasAndIsLeader.length > 0 &&
@@ -2205,13 +2211,20 @@ export class SharedLog<
 										context.from!.hashcode(),
 										entry.meta.gid,
 									);
+									this.removePruneRequestSent(entry.hash, from);
 									let isLeader = false;
-									await this.findLeaders(
+									await this._waitForReplicators(
 										await this.createCoordinates(
 											entry,
 											decodeReplicas(entry).getValue(this),
 										),
 										entry,
+										[
+											{
+												key: this.node.identity.publicKey.hashcode(),
+												replicator: true,
+											},
+										],
 										{
 											onLeader: (key) => {
 												isLeader =
@@ -3171,6 +3184,20 @@ export class SharedLog<
 		return new AbsoluteReplicas(maxValue);
 	}
 
+	private removePruneRequestSent(hash: string, to?: string) {
+		if (!to) {
+			this._requestIPruneSent.delete(hash);
+		} else {
+			let set = this._requestIPruneSent.get(hash);
+			if (set) {
+				set.delete(to);
+				if (set.size === 0) {
+					this._requestIPruneSent.delete(hash);
+				}
+			}
+		}
+	}
+
 	prune(
 		entries: Map<
 			string,
@@ -3184,7 +3211,7 @@ export class SharedLog<
 		if (options?.unchecked) {
 			return [...entries.values()].map((x) => {
 				this._gidPeersHistory.delete(x.entry.meta.gid);
-				this._requestIPruneSent.delete(x.entry.hash);
+				this.removePruneRequestSent(x.entry.hash);
 				this._requestIPruneResponseReplicatorSet.delete(x.entry.hash);
 				return this.log.remove(x.entry, {
 					recursively: true,
@@ -3192,6 +3219,10 @@ export class SharedLog<
 			});
 		}
 
+		if (this.closed) {
+			return [];
+		}
+
 		// ask network if they have they entry,
 		// so I can delete it
 
@@ -3227,7 +3258,6 @@ export class SharedLog<
 			const deferredPromise: DeferredPromise<void> = pDefer();
 
 			const clear = () => {
-				//pendingPrev?.clear();
 				const pending = this._pendingDeletes.get(entry.hash);
 				if (pending?.promise === deferredPromise) {
 					this._pendingDeletes.delete(entry.hash);
@@ -3239,6 +3269,10 @@ export class SharedLog<
 				clear();
 				cleanupTimer.push(
 					setTimeout(async () => {
+						this._gidPeersHistory.delete(entry.meta.gid);
+						this.removePruneRequestSent(entry.hash);
+						this._requestIPruneResponseReplicatorSet.delete(entry.hash);
+
 						if (
 							await this.isLeader({
 								entry,
@@ -3251,10 +3285,6 @@ export class SharedLog<
 							return;
 						}
 
-						this._gidPeersHistory.delete(entry.meta.gid);
-						this._requestIPruneSent.delete(entry.hash);
-						this._requestIPruneResponseReplicatorSet.delete(entry.hash);
-
 						return this.log
 							.remove(entry, {
 								recursively: true,
@@ -3267,7 +3297,7 @@ export class SharedLog<
 							})
 							.finally(async () => {
 								this._gidPeersHistory.delete(entry.meta.gid);
-								this._requestIPruneSent.delete(entry.hash);
+								this.removePruneRequestSent(entry.hash);
 								this._requestIPruneResponseReplicatorSet.delete(entry.hash);
 								// TODO in the case we become leader again here we need to re-add the entry
 
@@ -3286,7 +3316,7 @@ export class SharedLog<
 
 			const reject = (e: any) => {
 				clear();
-				this._requestIPruneSent.delete(entry.hash);
+				this.removePruneRequestSent(entry.hash);
 				this._requestIPruneResponseReplicatorSet.delete(entry.hash);
 				deferredPromise.reject(e);
 			};
@@ -3301,9 +3331,7 @@ export class SharedLog<
 
 			this._pendingDeletes.set(entry.hash, {
 				promise: deferredPromise,
-				clear: () => {
-					clear();
-				},
+				clear,
 				reject,
 				resolve: async (publicKeyHash: string) => {
 					const minReplicasObj = this.getClampedReplicas(minReplicas);
@@ -3363,8 +3391,8 @@ export class SharedLog<
 					set = new Set();
 					this._requestIPruneSent.set(entry, set);
 				}
-
-				/* if (set.has(to)) {
+				/* TODO why can we not have this statement? 
+				if (set.has(to)) {
 					continue;
 				} */
 				set.add(to);
@@ -3390,64 +3418,10 @@ export class SharedLog<
 			emitMessages(v, k);
 		}
 
-		/* const fn = async () => {
-			this.rpc.send(
-				new RequestIPrune({
-					hashes: filteredEntries.map(x => x.hash),
-				}),
-				{
-					mode: new SilentDelivery({
-						to: [...await this.getReplicators()],
-						redundancy: 1,
-					}),
-					priority: 1,
-				},
-			)
-		};
-		fn() */
-
-		/* const onPeersChange = async (
-			e?: CustomEvent<ReplicatorJoinEvent>,
-			reason?: string,
-		) => {
-			if (
-				true  // e.detail.publicKey.equals(this.node.identity.publicKey) === false  // TODO proper condition
-			) {
-				
-				const peerToEntryMap = await this.groupByLeaders(
-					filteredEntries
-						.filter((x) => !readyToDelete.has(x.hash))
-						.map((x) => {
-							return { entry: x, replicas: maxReplicasValue }; // TODO choose right maxReplicasValue, should it really be for all entries combined?
-						}),
-				);
-				for (const receiver of peerToEntryMap.keys()) {
-					if (receiver === this.node.identity.publicKey.hashcode()) {
-						continue;
-					}
-					const peerEntries = peerToEntryMap.get(receiver);
-					if (peerEntries && peerEntries.length > 0) {
-						emitMessages(
-							peerEntries.map((x) => filteredEntries[x].hash),
-							receiver,
-						);
-					}
-				}
-			}
-		}; */
-
-		// check joining peers
-		/* this.events.addEventListener("replication:change", onPeersChange);
-		this.events.addEventListener("replicator:mature", onPeersChange);
-		this.events.addEventListener("replicator:join", onPeersChange); */
-
 		let cleanup = () => {
 			for (const timer of cleanupTimer) {
 				clearTimeout(timer);
 			}
-			/* this.events.removeEventListener("replication:change", onPeersChange);
-			this.events.removeEventListener("replicator:mature", onPeersChange);
-			this.events.removeEventListener("replicator:join", onPeersChange); */
 			this._closeController.signal.removeEventListener("abort", cleanup);
 		};
 
@@ -3565,15 +3539,14 @@ export class SharedLog<
 						if (!set.has(entryReplicated.hash)) {
 							set.set(entryReplicated.hash, entryReplicated);
 						}
+					}
+				}
 
-						/* for (const entry of coordinates) {
-							let arr = set.get(entry.hash);
-							if (!arr) {
-								arr = [];
-								set.set(entry.hash, arr);
-							}
-							arr.push(entry);
-						} */
+				if (oldPeersSet) {
+					for (const oldPeer of oldPeersSet) {
+						if (!currentPeers.has(oldPeer)) {
+							this.removePruneRequestSent(entryReplicated.hash);
+						}
 					}
 				}
 
@@ -3591,13 +3564,14 @@ export class SharedLog<
 						});
 					}
 
+					// console.log("DELETE RESPONSE AS LEADER", this.node.identity.publicKey.hashcode(), entryReplicated.hash)
 					this.responseToPruneDebouncedFn.delete(entryReplicated.hash); // don't allow others to prune because of expecting me to replicating this entry
 				} else {
 					this.pruneDebouncedFn.delete(entryReplicated.hash);
 					await this._pendingDeletes
 						.get(entryReplicated.hash)
 						?.reject(new Error("Failed to delete, is leader again"));
-					this._requestIPruneSent.delete(entryReplicated.hash);
+					this.removePruneRequestSent(entryReplicated.hash);
 				}
 			}
 			for (const [target, entries] of uncheckedDeliver) {

package/src/sync/rateless-iblt.ts

@@ -3,7 +3,7 @@ import { Cache } from "@peerbit/cache";
 import { type PublicSignKey, randomBytes, toBase64 } from "@peerbit/crypto";
 import { type Index } from "@peerbit/indexer-interface";
 import type { Entry, Log } from "@peerbit/log";
-import init, { DecoderWrapper, EncoderWrapper } from "@peerbit/riblt";
+import { DecoderWrapper, EncoderWrapper } from "@peerbit/riblt";
 import type { RPC, RequestContext } from "@peerbit/rpc";
 import { SilentDelivery } from "@peerbit/stream-interface";
 import type { SyncableKey, Syncronizer } from ".";
@@ -16,9 +16,6 @@ import {
 	matchEntriesInRangeQuery,
 } from "../ranges.js";
 import { SimpleSyncronizer } from "./simple.js";
-import "./wasm-init.js";
-
-await init();
 
 type NumberOrBigint = number | bigint;
 

package/src/sync/simple.ts

@@ -178,7 +178,7 @@ export class SimpleSyncronizer<R extends "u32" | "u64">
 			)) {
 				await this.rpc.send(message, {
 					mode: new SilentDelivery({ to: [context.from!], redundancy: 1 }),
-					priority: 1,
+					// dont set priority 1 here because this will block other messages that should higher priority
 				});
 			}
 

package/dist/src/sync/wasm-init.browser.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=wasm-init.browser.d.ts.map

package/dist/src/sync/wasm-init.browser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wasm-init.browser.d.ts","sourceRoot":"","sources":["../../../src/sync/wasm-init.browser.ts"],"names":[],"mappings":""}

package/dist/src/sync/wasm-init.browser.js

@@ -1,3 +0,0 @@
-"use strict";
-// nothing to do since 'fetch' works as expected in the browsere
-//# sourceMappingURL=wasm-init.browser.js.map

package/dist/src/sync/wasm-init.browser.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wasm-init.browser.js","sourceRoot":"","sources":["../../../src/sync/wasm-init.browser.ts"],"names":[],"mappings":";AAAA,gEAAgE"}

package/dist/src/sync/wasm-init.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=wasm-init.d.ts.map

package/dist/src/sync/wasm-init.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wasm-init.d.ts","sourceRoot":"","sources":["../../../src/sync/wasm-init.ts"],"names":[],"mappings":""}

package/dist/src/sync/wasm-init.js

@@ -1,13 +0,0 @@
-// Override globalThis.fetch to intercept .wasm requests
-import { readFile } from "fs/promises";
-const defaultFetch = globalThis.fetch.bind(globalThis);
-globalThis.fetch = async (url, options) => {
-    // If you have multiple wasm files, you might use some logic to handle them.
-    // Here, we assume any request ending in `.wasm` is local on disk at the same path.
-    if (url.toString().endsWith(".wasm")) {
-        // Return a NodeResponse that looks enough like a fetch Response
-        return readFile(url);
-    }
-    return defaultFetch(url, options);
-};
-//# sourceMappingURL=wasm-init.js.map

package/dist/src/sync/wasm-init.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wasm-init.js","sourceRoot":"","sources":["../../../src/sync/wasm-init.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACtD,UAAU,CAAC,KAAa,GAAG,KAAK,EAAE,GAAQ,EAAE,OAAY,EAAE,EAAE;IAC5D,4EAA4E;IAC5E,mFAAmF;IACnF,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,gEAAgE;QAChE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC,CAAC"}

package/src/sync/wasm-init.browser.ts

@@ -1 +0,0 @@
-// nothing to do since 'fetch' works as expected in the browsere

package/src/sync/wasm-init.ts

@@ -1,14 +0,0 @@
-// Override globalThis.fetch to intercept .wasm requests
-import { readFile } from "fs/promises";
-
-const defaultFetch = globalThis.fetch.bind(globalThis);
-(globalThis.fetch as any) = async (url: any, options: any) => {
-	// If you have multiple wasm files, you might use some logic to handle them.
-	// Here, we assume any request ending in `.wasm` is local on disk at the same path.
-	if (url.toString().endsWith(".wasm")) {
-		// Return a NodeResponse that looks enough like a fetch Response
-		return readFile(url);
-	}
-
-	return defaultFetch(url, options);
-};