@hive-p2p/server 1.0.77 → 1.0.79

package/core/ice-offer-manager.mjs

@@ -1,11 +1,13 @@
 import { CLOCK } from '../services/clock.mjs';
 import { NODE, TRANSPORTS, LOG_CSS } from './config.mjs';
 import { xxHash32 } from '../libs/xxhash32.mjs';
-async function getWrtc() {
+
+// WE SHOULD LOAD WRTC ONLY WHEN NEEDED ! => Now done in node.mjs
+/*async function getWrtc() {
     if (typeof globalThis.RTCPeerConnection !== 'undefined') return undefined;
     return (await import('wrtc')).default;
 }
-const wrtc = await getWrtc();
+const wrtc = await getWrtc();*/
 
 /** - 'OfferObj' Definition
  * @typedef {Object} OfferObj
@@ -20,6 +22,7 @@ const wrtc = await getWrtc();
 
 export class OfferManager { // Manages the creation of SDP offers and handling of answers
 	id;
+	wrtc;
 	verbose;
 	stunUrls;
 
@@ -36,6 +39,9 @@ export class OfferManager { // Manages the creation of SDP offers and handling o
 	offersToCreate = TRANSPORTS.MAX_SDP_OFFERS;
 	/** @type {Record<string, OfferObj>} key: offerHash **/ offers = {};
 
+	/** WRTC assignment, this is made to avoid import of wrtc while importing hive-p2P lib */
+	assignTransportWrtc(w) { this.wrtc = w; }
+	/** WRTC Should be assigned before calling tick() */
 	tick() { // called in peerStore to avoid multiple intervals
 		const now = CLOCK.time;
 		// CLEAR EXPIRED CREATOR OFFER INSTANCES
@@ -90,7 +96,7 @@ export class OfferManager { // Manages the creation of SDP offers and handling o
 	};
 	#createOffererInstance(expiration) {
 		const iceCompleteTimeout = TRANSPORTS.ICE_COMPLETE_TIMEOUT || 1_000;
-		const instance = new TRANSPORTS.PEER({ initiator: true, trickle: false, iceCompleteTimeout, wrtc, config: { iceServers: this.stunUrls } });
+		const instance = new TRANSPORTS.PEER({ initiator: true, trickle: false, iceCompleteTimeout, wrtc: this.wrtc, config: { iceServers: this.stunUrls } });
 		instance.on('error', error => this.#onError(error));
 		instance.on('signal', data => { // trickle: false => only one signal event with the full offer
 			const { candidate, type } = data; // with trickle, we need to adapt the approach.
@@ -183,7 +189,7 @@ export class OfferManager { // Manages the creation of SDP offers and handling o
 			
 			// type === 'offer' => CREATE ANSWERER INSTANCE
 			const iceCompleteTimeout = TRANSPORTS.ICE_COMPLETE_TIMEOUT || 1_000;
-			const instance = new TRANSPORTS.PEER({ initiator: false, trickle: false, iceCompleteTimeout, wrtc, config: { iceServers: this.stunUrls } });
+			const instance = new TRANSPORTS.PEER({ initiator: false, trickle: false, iceCompleteTimeout, wrtc: this.wrtc, config: { iceServers: this.stunUrls } });
 			instance.on('error', (error) => this.#onError(error));
 			instance.on('signal', (data) => this.onSignalAnswer(remoteId, data, offerHash));
 			instance.on('connect', () => this.onConnect(remoteId, instance));

package/core/node.mjs

@@ -144,13 +144,23 @@ export class Node {
 	get publicUrl() { return this.services?.publicUrl; }
 	get time() { return CLOCK.time; }
 
+	async #getWrtc() {
+		if (typeof RTCPeerConnection !== 'undefined') return undefined;
+		return (await import('wrtc')).default;
+	}
 	async start() {
+		const w = await this.#getWrtc();
+		this.offerManager.assignTransportWrtc(w);
+
 		await CLOCK.sync(this.verbose);
 		this.started = true;
 		if (SIMULATION.AVOID_INTERVALS) return true; // SIMULATOR CASE
 
 		this.arbiterInterval = setInterval(() => this.arbiter.tick(), 1000);
-		this.peerStoreInterval = setInterval(() => { this.peerStore.cleanupExpired(); this.peerStore.offerManager.tick(); }, 2500);
+		this.peerStoreInterval = setInterval(() => {
+			this.peerStore.cleanupExpired();
+			this.peerStore.offerManager.tick();
+		}, 2500);
 		if (this.publicUrl) return true;
 		
 		this.enhancerInterval = setInterval(() => this.topologist.tick(), DISCOVERY.LOOP_DELAY);

package/package.json

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

package/services/converter.mjs

@@ -8,16 +8,32 @@ export class Converter {
 	textDecoder = new TextDecoder();
 	buffer2 = new ArrayBuffer(2); view2 = new DataView(this.buffer2);
 	buffer4 = new ArrayBuffer(4); view4 = new DataView(this.buffer4);
+	buffer6 = new ArrayBuffer(6); view6 = new DataView(this.buffer6);
 	buffer8 = new ArrayBuffer(8); view8 = new DataView(this.buffer8);
 	hexMap = { '0': 0, '1': 1, '2': 2, '3': 3, '4': 4, '5': 5, '6': 6, '7': 7, '8': 8, '9': 9, 'A': 10, 'B': 11, 'C': 12, 'D': 13, 'E': 14, 'F': 15, 'a': 10, 'b': 11, 'c': 12, 'd': 13, 'e': 14, 'f': 15 };
 
 	// ... TO BYTES
 	/** Number should be between 0 and 65535 @param {number} num - Integer to convert to 2 bytes Uint8Array */
-	numberTo2Bytes(num) { this.view2.setUint16(0, num, true); return new Uint8Array(this.buffer2); }
+	numberTo2Bytes(num) {
+		this.view2.setUint16(0, num, true);
+		return new Uint8Array(this.buffer2);
+	}
 	/** Number should be between 0 and 4294967295 @param {number} num - Integer to convert to 4 bytes Uint8Array */
-	numberTo4Bytes(num) { this.view4.setUint32(0, num, true); return new Uint8Array(this.buffer4); }
+	numberTo4Bytes(num) {
+		this.view4.setUint32(0, num, true);
+		return new Uint8Array(this.buffer4);
+	}
+	/** Number should be between 0 and 281474976710655 (2^48-1) @param {number} num - Integer to convert to 6 bytes Uint8Array */
+	numberTo6Bytes(num) {
+		this.view6.setUint32(0, num % 0x100000000, true); // lower 4 bytes
+		this.view6.setUint16(4, Math.floor(num / 0x100000000), true); // upper 2 bytes
+		return new Uint8Array(this.buffer6);
+	}
 	/** Number should be between 0 and 18446744073709551615 @param {number} num - Integer to convert to 8 bytes Uint8Array */
-	numberTo8Bytes(num) { this.view8.setBigUint64(0, BigInt(num), true); return new Uint8Array(this.buffer8); }
+	numberTo8Bytes(num) {
+		this.view8.setBigUint64(0, BigInt(num), true);
+		return new Uint8Array(this.buffer8);
+	}
 	stringToBytes(str = 'toto') { return this.textEncoder.encode(str); }
 	/** @param {string} hex - Hex string to convert to Uint8Array */
     hexToBytes(hex) {
@@ -38,11 +54,25 @@ export class Converter {
 
 	// BYTES TO ...
 	/** @param {Uint8Array} uint8Array - Uint8Array to convert to number */
-    bytes2ToNumber(uint8Array) { for (let i = 0; i < 2; i++) this.view2.setUint8(i, uint8Array[i]); return this.view2.getUint16(0, true); }
+    bytes2ToNumber(uint8Array) {
+		for (let i = 0; i < 2; i++) this.view2.setUint8(i, uint8Array[i]);
+		return this.view2.getUint16(0, true);
+	}
 	/** @param {Uint8Array} uint8Array - Uint8Array to convert to number */
-	bytes4ToNumber(uint8Array) { for (let i = 0; i < 4; i++) this.view4.setUint8(i, uint8Array[i]); return this.view4.getUint32(0, true); }
+	bytes4ToNumber(uint8Array) {
+		for (let i = 0; i < 4; i++) this.view4.setUint8(i, uint8Array[i]);
+		return this.view4.getUint32(0, true);
+	}
+	/** @param {Uint8Array} uint8Array - Uint8Array to convert to number */
+	bytes6ToNumber(uint8Array) {
+		for (let i = 0; i < 6; i++) this.view6.setUint8(i, uint8Array[i]);
+		return this.view6.getUint32(0, true) + this.view6.getUint16(4, true) * 0x100000000;
+	}
 	/** @param {Uint8Array} uint8Array - Uint8Array to convert to number */
-	bytes8ToNumber(uint8Array) { for (let i = 0; i < 8; i++) this.view8.setUint8(i, uint8Array[i]); return Number(this.view8.getBigUint64(0, true)); }
+	bytes8ToNumber(uint8Array) {
+		for (let i = 0; i < 8; i++) this.view8.setUint8(i, uint8Array[i]);
+		return Number(this.view8.getBigUint64(0, true));
+	}
 	/** @param {Uint8Array} uint8Array - Uint8Array to convert to string */
 	bytesToString(uint8Array) { return this.textDecoder.decode(uint8Array); }
 	/** @param {Uint8Array} uint8Array - Uint8Array to convert to string */