hive-p2p 1.0.113 → 1.0.114

package/core/arbiter.mjs

@@ -69,7 +69,7 @@ export class Arbiter {
 		if (peerId === this.id) return; // self
 		if (delta) this.trustBalances[peerId] = Math.min(MAX_TRUST, (this.trustBalances[peerId] || 0) + delta);
 		if (delta && this.verbose > 3) console.log(`%c(Arbiter: ${this.id}) ${peerId} +${delta}ms (${reason}). Updated: ${this.trustBalances[peerId]}ms.`, LOG_CSS.ARBITER);
-		if (this.isBanished(peerId) && this.verbose > 1) console.log(`%c(Arbiter: ${this.id}) Peer ${peerId} is now banished.`, LOG_CSS.ARBITER);
+		if (this.isBanished(peerId) && this.verbose > 1) console.log(`%c(Arbiter: ${this.id}) Peer ${peerId} is now banished. (${reason})`, LOG_CSS.ARBITER);
 	}
 	/** MANUAL BAN (if enabled) @param {string} peerId */
 	setBanished(peerId) {
@@ -134,7 +134,7 @@ export class Arbiter {
 	}
 	/** UNICAST only @param {string} from @param {import('./unicast.mjs').DirectMessage} message */
 	#routeLengthControl(from, message) {
-		if (message.route.length <= UNICAST.MAX_HOPS) return true;
+		if (message.route.length <= UNICAST.MAX_HOPS + 1) return true;
 		this.adjustTrust(from, TRUST_VALUES.HOPS_EXCEEDED, 'Unicast HOPS exceeded');
 	}
 	/** ONLY APPLY AFTER #signatureControl() - @param {string} senderId @param {Uint8Array} pubkey */

package/core/crypto-codex.mjs

@@ -293,13 +293,13 @@ export class CryptoCodex {
 			const initialMessageEnd = signatureStart + IDENTITY.SIGNATURE_LENGTH;
 			const signature = serialized.slice(signatureStart, initialMessageEnd);
 			const isPatched = (serialized.length > initialMessageEnd);
-
-			if (!isPatched) return new DirectMessage(type, timestamp, neighbors, route, pubkey, deserializedData, signature, signatureStart, initialMessageEnd);
-
-			const rerouterPubkey = serialized.slice(initialMessageEnd, initialMessageEnd + 32);
-			const newRoute = this.#bytesToIds(serialized.slice(initialMessageEnd + 32, serialized.length - IDENTITY.SIGNATURE_LENGTH));
-			const rerouterSignature = serialized.slice(serialized.length - IDENTITY.SIGNATURE_LENGTH);
-			return new DirectMessage(type, timestamp, neighbors, route, pubkey, deserializedData, signature, signatureStart, serialized.length, rerouterPubkey, newRoute, rerouterSignature);
+			//if (!isPatched) return new DirectMessage(type, timestamp, neighbors, route, pubkey, deserializedData, signature, signatureStart, initialMessageEnd);
+			
+			const expectedEnd = isPatched ? serialized.length : initialMessageEnd;
+			const rerouterPk = 	isPatched ? serialized.slice(initialMessageEnd, initialMessageEnd + 32) : undefined;
+			const newRoute = 	isPatched ? this.#bytesToIds(serialized.slice(initialMessageEnd + 32, serialized.length - IDENTITY.SIGNATURE_LENGTH)) : undefined;
+			const rerouterSig = isPatched ? serialized.slice(serialized.length - IDENTITY.SIGNATURE_LENGTH) : undefined;
+			return new DirectMessage(type, timestamp, neighbors, route, pubkey, deserializedData, signature, signatureStart, expectedEnd, rerouterPk, newRoute, rerouterSig);
 		} catch (/** @type {any} */ error) { if (this.verbose > 1) console.warn(`Error deserializing ${type || 'unknown'} unicast message:`, error.stack); }
 		return null;
 	}