@peerbit/shared-log 8.0.7-aa577a5 → 8.0.7-cccc078

package/dist/src/role.js

@@ -1,130 +1,106 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var NoType_1, Observer_1, Replicator_1;
-import { field, variant, vec } from "@dao-xyz/borsh";
-export const overlaps = (x1, x2, y1, y2) => {
+/* import { field, variant, vec } from "@dao-xyz/borsh"; */
+/* export const overlaps = (x1: number, x2: number, y1: number, y2: number) => {
     if (x1 <= y2 && y1 <= x2) {
         return true;
     }
     return false;
-};
-export class Role {
+}; */
+/* export abstract class Role {
+    abstract equals(other: Role): boolean;
 }
+ 
 export const NO_TYPE_VARIANT = new Uint8Array([0]);
-let NoType = NoType_1 = class NoType extends Role {
-    equals(other) {
-        return other instanceof NoType_1;
+
+@variant(0)
+export class NoType extends Role {
+    equals(other: Role) {
+        return other instanceof NoType;
     }
-};
-NoType = NoType_1 = __decorate([
-    variant(0)
-], NoType);
-export { NoType };
+}
+
 export const OBSERVER_TYPE_VARIANT = new Uint8Array([1]);
-let Observer = Observer_1 = class Observer extends Role {
-    equals(other) {
-        return other instanceof Observer_1;
-    }
-};
-Observer = Observer_1 = __decorate([
-    variant(1)
-], Observer);
-export { Observer };
-export const REPLICATOR_TYPE_VARIANT = new Uint8Array([2]);
-export class ReplicationSegment {
-    timestamp;
-    factorNominator;
-    offsetNominator;
-    constructor(properties) {
-        const { factor, timestamp, offset } = properties;
-        if (factor > 1 || factor < 0) {
-            throw new Error("Expecting factor to be between 0 and 1, got: " + factor);
-        }
-        this.timestamp = timestamp ?? BigInt(+new Date());
-        this.factorNominator = Math.round(4294967295 * factor);
-        if (offset > 1 || offset < 0) {
-            throw new Error("Expecting offset to be between 0 and 1, got: " + offset);
-        }
-        this.offsetNominator = Math.round(4294967295 * offset);
+
+@variant(1)
+export class Observer extends Role {
+    equals(other: Role) {
+        return other instanceof Observer;
     }
-    get factor() {
-        return this.factorNominator / 4294967295;
-    }
-    get offset() {
-        return this.offsetNominator / 4294967295;
-    }
-    overlaps(other) {
-        let x1 = this.offset;
-        let x2 = this.offset + this.factor;
-        let y1 = other.offset;
-        let y2 = other.offset + other.factor;
-        if (overlaps(x1, x2, y1, y2)) {
-            return true;
-        }
-        if (x2 > 1 || y2 > 1) {
-            if (x2 > 1) {
-                x1 = 0;
-                x2 = x2 % 1;
-            }
-            if (y2 > 1) {
-                y1 = 0;
-                y2 = y2 % 1;
-            }
-            if (overlaps(x1, x2, y1, y2)) {
-                return true;
-            }
+}
+
+export const REPLICATOR_TYPE_VARIANT = new Uint8Array([2]);*/
+export const SEGMENT_COORDINATE_SCALE = 4294967295;
+/* export class ReplicationSegment {
+
+    @field({ type: "u64" })
+    timestamp: bigint;
+
+    @field({ type: "u32" })
+    start: number;
+
+    @field({ type: 'u32' })
+    end: number;
+
+
+
+    constructor(properties: {
+        start: number;
+        end: number;
+        timestamp: bigint;
+    }) {
+        const { start, end, timestamp } = properties;
+
+        if (start > end) {
+            throw new Error("Range 'start' needs to be lower or equal to 'end'")
         }
-        return false;
+        this.start = Math.round(start * SEGMENT_COORDINATE_SCALE);
+        this.end = Math.round(end * SEGMENT_COORDINATE_SCALE);
+        this.timestamp = timestamp
     }
+
+
+
 }
-__decorate([
-    field({ type: "u64" }),
-    __metadata("design:type", BigInt)
-], ReplicationSegment.prototype, "timestamp", void 0);
-__decorate([
-    field({ type: "u32" }),
-    __metadata("design:type", Number)
-], ReplicationSegment.prototype, "factorNominator", void 0);
-__decorate([
-    field({ type: "u32" }),
-    __metadata("design:type", Number)
-], ReplicationSegment.prototype, "offsetNominator", void 0);
-let Replicator = Replicator_1 = class Replicator extends Role {
-    segments;
-    constructor(properties) {
+ */
+/* abstract class Capacity { }
+
+@variant(2)
+export class Replicator extends Role {
+
+    @field({ type: vec(Capacity) })
+    capacity: Capacity[];
+
+    constructor(properties?: { capacity: Capacity[] }) {
         super();
-        const segment = new ReplicationSegment(properties);
-        this.segments = [segment];
-    }
-    get factor() {
-        return this.segments[0].factor;
-    }
-    get offset() {
-        return this.segments[0].offset;
-    }
-    get timestamp() {
-        return this.segments[0].timestamp;
-    }
-    equals(other) {
-        return (other instanceof Replicator_1 &&
-            other.factor === this.factor &&
-            other.offset === this.offset);
-    }
-};
-__decorate([
-    field({ type: vec(ReplicationSegment) }),
-    __metadata("design:type", Array)
-], Replicator.prototype, "segments", void 0);
-Replicator = Replicator_1 = __decorate([
-    variant(2),
-    __metadata("design:paramtypes", [Object])
-], Replicator);
-export { Replicator };
+        this.capacity = properties?.capacity || [];
+    } */
+/* constructor(properties: {
+    timestamp?: bigint;
+    factor: number;
+    offset: number;
+}) {
+    super();
+    let timestamp = properties.timestamp || BigInt(+new Date);
+    let ranges = getSegmentsFromOffsetAndRange(properties.offset, properties.factor);
+    this.segments = ranges.map(x => new ReplicationSegment({ start: x[0], end: x[1], timestamp }));
+}
+*/
+/* get factor(): number {
+    return this.segments[0]!.factor;
+}
+
+get offset(): number {
+    return this.segments[0]!.offset;
+}
+
+get timestamp(): bigint {
+    return this.segments[0]!.timestamp;
+} */
+/* equals(other: Role) {
+    return (
+        other instanceof Replicator &&
+        other.factor === this.factor &&
+        other.offset === this.offset
+    );
+} */
+/* } */
 //# sourceMappingURL=role.js.map

package/dist/src/role.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.js","sourceRoot":"","sources":["../../src/role.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"role.js","sourceRoot":"","sources":["../../src/role.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAE3D;;;;;KAKK;AAEL;;;;;;;;;;;;;;;;;;;;;;6DAsB6D;AAE7D,MAAM,CAAC,MAAM,wBAAwB,GAAG,UAAU,CAAC;AACnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH;;;;;;;;;;;QAWK;AAEL;;;;;;;;;;EAUE;AACF;;;;;;;;;;IAUI;AAEJ;;;;;;IAMI;AACJ,OAAO"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/shared-log",
-  "version": "8.0.7-aa577a5",
+  "version": "8.0.7-cccc078",
   "description": "Shared log",
   "sideEffects": false,
   "type": "module",
@@ -35,7 +35,7 @@
     }
   },
   "eslintConfig": {
-    "extends": "ipfs",
+    "extends": "peerbit",
     "parserOptions": {
       "project": true,
       "sourceType": "module"
@@ -52,20 +52,21 @@
   "scripts": {
     "clean": "aegir clean",
     "build": "aegir build --no-bundle",
-    "test": "aegir test --target node"
+    "test": "aegir test --target node",
+    "lint": "aegir lint"
   },
   "author": "dao.xyz",
   "license": "MIT",
   "dependencies": {
-    "@dao-xyz/borsh": "^5.2.2",
-    "@peerbit/logger": "1.0.2-aa577a5",
-    "@peerbit/program": "4.0.7-aa577a5",
-    "@peerbit/log": "3.0.34-aa577a5",
-    "@peerbit/rpc": "4.0.7-aa577a5",
-    "@peerbit/time": "2.0.6-aa577a5",
+    "@dao-xyz/borsh": "^5.2.3",
+    "@peerbit/logger": "1.0.2-cccc078",
+    "@peerbit/program": "4.0.7-cccc078",
+    "@peerbit/log": "3.0.34-cccc078",
+    "@peerbit/rpc": "4.0.7-cccc078",
+    "@peerbit/time": "2.0.6-cccc078",
     "p-debounce": "^4.0.0"
   },
   "devDependencies": {
-    "@peerbit/test-utils": "2.0.33-aa577a5"
+    "@peerbit/test-utils": "2.0.33-cccc078"
   }
 }

package/src/blocks.ts

@@ -2,7 +2,7 @@ import { field, variant } from "@dao-xyz/borsh";
 import {
 	BlockRequest,
 	BlockResponse,
-	BlockMessage as IBlockMessage
+	BlockMessage as IBlockMessage,
 } from "@peerbit/blocks";
 import { TransportMessage } from "./message.js";
 

package/src/cpu.ts

@@ -20,8 +20,8 @@ export class CPUUsageIntervalLag implements CPUUsage {
 			windowSize: number;
 			intervalTime: number;
 			upperBoundLag: number;
-		} = { windowSize: 50, intervalTime: 100, upperBoundLag: 1000 }
-	) { }
+		} = { windowSize: 50, intervalTime: 100, upperBoundLag: 1000 },
+	) {}
 	private mean() {
 		return this.sum / this.dt.length;
 	}
@@ -30,14 +30,14 @@ export class CPUUsageIntervalLag implements CPUUsage {
 		return (
 			Math.min(
 				Math.max(this.mean() - this.properties.intervalTime, 0),
-				this.properties.upperBoundLag
+				this.properties.upperBoundLag,
 			) / this.properties.upperBoundLag
 		); // 1 if lagging more than MAX_INTERVAL seconds
 	}
 
 	start() {
 		this.dt = new Array<number>(this.properties.windowSize).fill(
-			this.properties.intervalTime
+			this.properties.intervalTime,
 		);
 		this.sum = this.properties.windowSize * this.properties.intervalTime;
 

package/src/exchange-heads.ts

@@ -1,9 +1,9 @@
-import { variant, field, vec, fixedArray } from "@dao-xyz/borsh";
+import { field, fixedArray, variant, vec } from "@dao-xyz/borsh";
+import { Cache } from "@peerbit/cache";
 import { Entry, EntryType, type ShallowEntry } from "@peerbit/log";
 import { Log } from "@peerbit/log";
 import { logger as loggerFn } from "@peerbit/logger";
 import { TransportMessage } from "./message.js";
-import { Cache } from "@peerbit/cache";
 
 const logger = loggerFn({ module: "exchange-heads" });
 
@@ -91,7 +91,7 @@ const MAX_EXCHANGE_MESSAGE_SIZE = 1e5; // 100kb. Too large size might not be fas
 export const createExchangeHeadsMessages = async (
 	log: Log<any>,
 	heads: Entry<any>[],
-	gidParentCache: Cache<Entry<any>[]>
+	gidParentCache: Cache<Entry<any>[]>,
 ): Promise<ExchangeHeadsMessage<any>[]> => {
 	const messages: ExchangeHeadsMessage<any>[] = [];
 	let size = 0;
@@ -117,8 +117,8 @@ export const createExchangeHeadsMessages = async (
 		current.push(
 			new EntryWithRefs({
 				entry: fromHead,
-				gidRefrences: refs.map((x) => x.meta.gid)
-			})
+				gidRefrences: refs.map((x) => x.meta.gid),
+			}),
 		);
 
 		size += fromHead.size;
@@ -126,8 +126,8 @@ export const createExchangeHeadsMessages = async (
 			size = 0;
 			messages.push(
 				new ExchangeHeadsMessage({
-					heads: current
-				})
+					heads: current,
+				}),
 			);
 			current = [];
 			continue;
@@ -136,8 +136,8 @@ export const createExchangeHeadsMessages = async (
 	if (current.length > 0) {
 		messages.push(
 			new ExchangeHeadsMessage({
-				heads: current
-			})
+				heads: current,
+			}),
 		);
 	}
 	return messages;
@@ -146,7 +146,7 @@ export const createExchangeHeadsMessages = async (
 export const allEntriesWithUniqueGids = async (
 	log: Log<any>,
 	entry: Entry<any>,
-	gidParentCache: Cache<Entry<any>[]>
+	gidParentCache: Cache<Entry<any>[]>,
 ): Promise<Entry<any>[]> => {
 	const cachedValue = gidParentCache.get(entry.hash);
 	if (cachedValue != null) {
@@ -154,23 +154,23 @@ export const allEntriesWithUniqueGids = async (
 	}
 
 	// TODO optimize this
-	const map: Map<string, ShallowEntry> = new Map();
-	let curr: ShallowEntry[] = [entry];
+	const map: Map<string, ShallowEntry | Entry<any>> = new Map();
+	let curr: (Entry<any> | ShallowEntry)[] = [entry];
 	while (curr.length > 0) {
-		const nexts: ShallowEntry[] = [];
+		const nexts: (Entry<any> | ShallowEntry)[] = [];
 		for (const element of curr) {
 			if (!map.has(element.meta.gid)) {
 				map.set(element.meta.gid, element);
 				if (element.meta.type === EntryType.APPEND) {
 					for (const next of element.meta.next) {
-						const indexedEntry = log.entryIndex.getShallow(next);
+						const indexedEntry = await log.entryIndex.getShallow(next);
 						if (!indexedEntry) {
 							logger.error(
 								"Failed to find indexed entry for hash when fetching references: " +
-								next
+									next,
 							);
 						} else {
-							nexts.push(indexedEntry);
+							nexts.push(indexedEntry.value);
 						}
 					}
 				}
@@ -180,8 +180,8 @@ export const allEntriesWithUniqueGids = async (
 	}
 	const value = [
 		...(await Promise.all(
-			[...map.values()].map((x) => log.entryIndex.get(x.hash))
-		))
+			[...map.values()].map((x) => log.entryIndex.get(x.hash)),
+		)),
 	].filter((x) => !!x) as Entry<any>[];
 	gidParentCache.add(entry.hash, value);
 	return value;