@hive-p2p/server 1.0.55 → 1.0.57

package/core/arbiter.mjs

@@ -6,7 +6,8 @@ import { GOSSIP, UNICAST, LOG_CSS } from './config.mjs';
 // Lowered each second by 100ms until 0 (avoid attacker growing balances on multiple disconnected peers)
 
 const BYTES_COUNT_PERIOD 			= 10_000; 		// 10 seconds
-const MAX_BYTES_PER_PERIOD 			= 1_000_000; 	// 1MB per period
+const MAX_UNICAST_BYTES_PER_PERIOD 	= 1_000_000; 	// 1MB per period
+const MAX_GOSSIP_BYTES_PER_PERIOD 	= 100_000; 		// 100KB per period
 
 const MAX_TRUST 	= 		3_600_000; 		// +3600 seconds = 1 hour of good behavior
 export const TRUST_VALUES = {
@@ -37,7 +38,7 @@ export class Arbiter {
 	 * - trustBalance = milliseconds of ban if negative
 	 * @type {Record<string, number>} */
 	trustBalances = {};
-	bytesCounters = { gossip: 0, unicast: 0 };
+	bytesCounters = { gossip: {}, unicast: {} };
 	bytesCounterResetIn = 0;
 
 	/** @param {string} selfId @param {import('./crypto-codex.mjs').CryptoCodex} cryptoCodex @param {number} verbose */
@@ -55,7 +56,7 @@ export class Arbiter {
 		// RESET GOSSIP BYTES COUNTER
 		if (this.bytesCounterResetIn - 1_000 > 0) return;
 		this.bytesCounterResetIn = BYTES_COUNT_PERIOD;
-		this.bytesCounters = { gossip: 0, unicast: 0 };
+		this.bytesCounters = { gossip: {}, unicast: {} };
 	}
 
 	/** Call from HiveP2P module only!
@@ -76,10 +77,14 @@ export class Arbiter {
 	// MESSAGE VERIFICATION
 	/** @param {string} peerId @param {number} byteLength @param {'gossip' | 'unicast'} type */
 	countMessageBytes(peerId, byteLength, type) {
-		if (!this.bytesCounters[type]) this.bytesCounters[type] = 0;
-		this.bytesCounters[type] += byteLength;
-		if (this.bytesCounters[type] < MAX_BYTES_PER_PERIOD) return true;
-		return this.adjustTrust(peerId, type === 'gossip' ? TRUST_VALUES.GOSSIP_FLOOD : TRUST_VALUES.UNICAST_FLOOD, 'Message flood detected');
+		if (!this.bytesCounters[type][peerId]) this.bytesCounters[type][peerId] = 0;
+		this.bytesCounters[type][peerId] += byteLength;
+		const [maxByte, penality] = type === 'gossip'
+		? [MAX_GOSSIP_BYTES_PER_PERIOD, TRUST_VALUES.GOSSIP_FLOOD]
+		: [MAX_UNICAST_BYTES_PER_PERIOD, TRUST_VALUES.UNICAST_FLOOD];
+		// If under the limit, return true -> else apply penality and return undefined
+		if (this.bytesCounters[type][peerId] < maxByte) return true;
+		return this.adjustTrust(peerId, penality, `Message ${type} flood detected`);
 	}
 	/** Call from HiveP2P module only! @param {string} from @param {any} message @param {Uint8Array} serialized @param {number} [powCheckFactor] default: 0.01 (1%) */
 	async digestMessage(from, message, serialized, powCheckFactor = .01) {
@@ -87,19 +92,14 @@ export class Arbiter {
 		if (!this.#signatureControl(from, message, serialized)) return;
 		if (!this.#lengthControl(from, topic ? 'gossip' : 'unicast', serialized, expectedEnd)) return;
 
-		if (topic) this.#hopsControl(from, message);
-		else this.#routeLengthControl(from, message);
+		const routeOrHopsOk = topic ? this.#hopsControl(from, message) : this.#routeLengthControl(from, message);
+		if (!routeOrHopsOk) return;
 		
 		if (this.isBanished(from) || this.isBanished(senderId)) return;
-		if (this.trustBalances[senderId] > TRUST_VALUES.VALID_POW) return;
+		if (this.trustBalances[senderId] > TRUST_VALUES.VALID_POW) return true; // we check only low trust balances
 		if (Math.random() < powCheckFactor) await this.#powControl(senderId, pubkey);
 		return true;
 	}
-	/** @param {string} from @param {'gossip' | 'unicast'} type */
-	#lengthControl(from, type, serialized, expectedEnd) {
-		if (!expectedEnd || serialized.length === expectedEnd) return true;
-		this.adjustTrust(from, TRUST_VALUES.WRONG_LENGTH, `${type} message length mismatch`);
-	}
 	/** @param {string} from @param {import('./gossip.mjs').GossipMessage} message @param {Uint8Array} serialized */
 	#signatureControl(from, message, serialized) {
 		try {
@@ -115,14 +115,19 @@ export class Arbiter {
 		}
 		this.adjustTrust(from, TRUST_VALUES.WRONG_SIGNATURE, 'Gossip signature invalid');
 	}
+	/** @param {string} from @param {'gossip' | 'unicast'} type */
+	#lengthControl(from, type, serialized, expectedEnd) {
+		if (!expectedEnd || serialized.length === expectedEnd) return true;
+		this.adjustTrust(from, TRUST_VALUES.WRONG_LENGTH, `${type} message length mismatch`);
+	}
 	/** GOSSIP only @param {string} from @param {import('./gossip.mjs').GossipMessage} message */
 	#hopsControl(from, message) {
-		if (message.HOPS <= (GOSSIP.HOPS[message.topic] || GOSSIP.HOPS.default)) return;
+		if (message.HOPS <= (GOSSIP.HOPS[message.topic] || GOSSIP.HOPS.default)) return true;
 		this.adjustTrust(from, TRUST_VALUES.HOPS_EXCEEDED, 'Gossip HOPS exceeded');
 	}
 	/** UNICAST only @param {string} from @param {import('./unicast.mjs').DirectMessage} message */
 	#routeLengthControl(from, message) {
-		if (message.route.length <= UNICAST.MAX_HOPS) return;
+		if (message.route.length <= UNICAST.MAX_HOPS) return true;
 		this.adjustTrust(from, TRUST_VALUES.HOPS_EXCEEDED, 'Unicast HOPS exceeded');
 	}
 	/** ONLY APPLY AFTER #signatureControl() - @param {string} senderId @param {Uint8Array} pubkey */

package/core/config.mjs

@@ -45,7 +45,7 @@ export const SIMULATION = {
 
 export const NODE = {
 	/** 0: none, 1: errors, 2: +important info, 3: +debug, 4: +everything | Can be bypass by some constructors */
-	DEFAULT_VERBOSE: 1,
+	DEFAULT_VERBOSE: 2,
 	/** Timeout for upgrading a "connecting" peer to "connected" | Default: 15_000 (15 seconds) */
 	CONNECTION_UPGRADE_TIMEOUT: 15_000,
 	/** Flag to indicate if we are running in a browser environment | DON'T MODIFY THIS VALUE */

package/core/gossip.mjs

@@ -102,7 +102,7 @@ export class Gossip {
 		else this.callbacks[callbackType].push(callback);
 	}
 	/** Gossip a message to all connected peers > will be forwarded to all peers
-	 * @param {string | Uint8Array | Object} data @param {string} topic @param {number} [HOPS] */
+	 * @param {string | Uint8Array | Object} data @param {string} topic default: 'gossip' @param {number} [HOPS] */
 	broadcastToAll(data, topic = 'gossip', HOPS) {
 		const hops = HOPS || GOSSIP.HOPS[topic] || GOSSIP.HOPS.default;
 		const serializedMessage = this.cryptoCodex.createGossipMessage(topic, data, hops, this.peerStore.neighborsList);

package/core/node.mjs

@@ -160,7 +160,7 @@ export class Node {
 	}
 	
 	/** Broadcast a message to all connected peers or to a specified peer
-	 * @param {string | Uint8Array | Object} data @param {string} topic  @param {string} [targetId] default: broadcast to all
+	 * @param {string | Uint8Array | Object} data @param {string} topic default: 'gossip' @param {string} [targetId] default: broadcast to all
 	 * @param {number} [timestamp] default: CLOCK.time @param {number} [HOPS] default: GOSSIP.HOPS[topic] || GOSSIP.HOPS.default */
 	broadcast(data, topic, HOPS) { this.gossip.broadcastToAll(data, topic, HOPS); }
 	
@@ -201,7 +201,7 @@ export class Node {
 	onMessageData(callback) { this.messager.on('message', callback); }
 
 	/** Triggered when a new gossip message is received.
-	 * @param {function} callback can use arguments: (senderId:string, topic:string, data:any) */
+	 * @param {function} callback can use arguments: (senderId:string, data:any, HOPS:number) */
 	onGossipData(callback) { this.gossip.on('gossip', callback); }
 
 	/** Triggered when a new signal offer is received from another peer.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hive-p2p/server",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "publishConfig": {
     "access": "public"
   },