webpeerjs 0.0.6 → 0.0.7

package/dist/esm/webpeerjs.js

@@ -19,6 +19,7 @@ import { simpleMetrics } from '@libp2p/simple-metrics';
 
 const prefix$1 = 'webpeerjs';
 const CONFIG_PREFIX = prefix$1;
+const CONFIG_PROTOCOL = '/'+prefix$1+'/0.0.1';
 const CONFIG_DBSTORE_PATH = prefix$1+'-dbstore';
 const CONFIG_MAX_CONNECTIONS = 100;
 const CONFIG_MIN_CONNECTIONS = 0;
@@ -37,7 +38,6 @@ const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
 	'QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
 	'QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
 	'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-	'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr',
 	'12D3KooWPEDBmt7vm6FNNYuqaA4n2qMUZ6wPK5NcRc8t6KpqgRkV',
 	'12D3KooWSHbugDEQeWm2LjtRRMpNgLu6oZ8zkX8XcTwYMAewVekP',
 	'12D3KooWASoxFpwwy8JDdu4Tm57mhESsnbFPogam9VVmhR95FGXr',
@@ -45,7 +45,8 @@ const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
 	'12D3KooWS79EhkPU7ESUwgG4vyHHzW9FDNZLoWVth9b5N5NSrvaj',
 	'12D3KooWBbkCD5MpJhMc1mfPAVGEyVkQnyxPKGS7AHwDqQM2JUsk',
 	'12D3KooWKLdecs31Zmo2pLBjR9HY2vWo3VwM4eBm21Czeucbe6FL',
-	'12D3KooWBdF3g6vSJFRPoZQo7BNnkNzaWb59gpyaVzsgtNTVeu8H'
+	'12D3KooWBdF3g6vSJFRPoZQo7BNnkNzaWb59gpyaVzsgtNTVeu8H',
+	'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr'
 	];
 
 const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
@@ -241,16 +242,16 @@ function metrics(data){
 		fail = errors+timeouts;
 		const treshold = errors+timeouts+stats.open+stats.pending;
 		
-		if(treshold>60){
+		if(treshold>40){
 			//console.log(`Treeshold hit : ${treshold}`)
 		}
 		
-		if(fail>60){
+		if(fail>40){
 			//console.log(`Open : ${stats.open} , Pending : ${stats.pending} , Succes : ${totals.success} , Fail : ${fail} `)
 
 		}
 		
-		if ((fail-lastfailtreshold)>30){
+		if ((fail-lastfailtreshold)>40){
 			if(isDialEnabled){
 				isDialEnabled = false;
 				const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold});
@@ -379,11 +380,11 @@ class webpeerjs{
 		//listen to peer connect event
 		this.#libp2p.addEventListener("peer:connect",async (evt) => {
 			
-			//console.log(`Connected to ${connection.toString()}`);
-			
 			evt.detail;
 			const id = evt.detail.toString();
 			
+			//console.log('peer:connect '+id,evt)
+			
 			const connections = this.#libp2p.getConnections().map((con)=>{return {id:con.remotePeer.toString(),addr:con.remoteAddr.toString()}});
 			const connect = connections.find((con)=>con.id == id);
 			const addr = connect.addr;
@@ -406,6 +407,31 @@ class webpeerjs{
 				},1000);
 			}
 			
+			if(this.#webPeersId.includes(id)){
+				
+				let address = [addr];
+
+				if(this.#connectedPeers.has(id)){
+					//reset this last seen
+					const now = new Date().getTime();
+					const metadata = {addrs:address,last:now};
+					this.#connectedPeers.set(id,metadata);
+				}
+				else {
+					//add to connected webpeers
+					this.#onConnectFn(id);
+					const now = new Date().getTime();
+					const metadata = {addrs:address,last:now};
+					this.#connectedPeers.set(id,metadata);
+					this.#connectedPeersArr.length = 0;
+					for(const peer of this.#connectedPeers){	
+						const item = {id:peer[0],address:peer[1].addrs};
+						this.#connectedPeersArr.push(item);
+					}
+				}
+
+			}
+			
 		});
 
 
@@ -562,15 +588,15 @@ class webpeerjs{
 								}
 								
 								//update connected webpeers
-								const now = new Date().getTime();
-								const metadata = {addrs:address,last:now};
-								this.#connectedPeers.set(id,metadata);
-								this.#webPeersAddrs.set(id,address);
-								this.#connectedPeersArr.length = 0;
+								/*const now = new Date().getTime()
+								const metadata = {addrs:address,last:now}
+								this.#connectedPeers.set(id,metadata)
+								this.#webPeersAddrs.set(id,address)
+								this.#connectedPeersArr.length = 0
 								for(const peer of this.#connectedPeers){	
-									const item = {id:peer[0],address:peer[1].addrs};
-									this.#connectedPeersArr.push(item);
-								}
+									const item = {id:peer[0],address:peer[1].addrs}
+									this.#connectedPeersArr.push(item)
+								}*/
 									
 							}
 						}
@@ -621,10 +647,12 @@ class webpeerjs{
 				if(multiaddrs.toString().includes('certhash')&& multiaddrs.toString().includes('webtransport') && multiaddrs.toString().includes('p2p-circuit')){
 					//console.log(addrs)
 					if(!this.#connections.has(id)){
+						let mddrs = [];
 						for(const addr of addrs){
-							multiaddr(addr);
+							const mddr = multiaddr(addr);
+							mddrs.push(mddr);
 						}
-						//this.#dialMultiaddress(mddrs)
+						this.#dialMultiaddress(mddrs);
 					}
 				}
 			}
@@ -681,10 +709,8 @@ class webpeerjs{
 			//redial if this disconnected peer is regular peer
 			else {
 				const addr = this.#connections.get(id);
-				let mddrs = [];
-				const addrs = multiaddr(addr);
-				mddrs.push(addrs);
-				this.#dialMultiaddress(mddrs);
+				multiaddr(addr);
+				//this.#dialMultiaddress(mddrs)
 			}
 		});
 		
@@ -706,6 +732,45 @@ class webpeerjs{
 			this.#ping();
 		});
 		
+		this.#libp2p.addEventListener('peer:identify', (evt) => {
+			//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+			if(evt.detail.protocols.includes(CONFIG_PROTOCOL)){
+				//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+				
+				const id = evt.detail.peerId.toString();
+				let address = [];
+				
+				for(const addrs of evt.detail.listenAddrs){
+					const addr = addrs.toString()+'/p2p/'+id;
+					if(addr.includes('webtransport')){
+						address.push(addr);
+					}
+				}
+				
+				if(!this.#webPeersId.includes(id))this.#webPeersId.push(id);
+
+				if(this.#connectedPeers.has(id)){
+					//reset this last seen
+					const now = new Date().getTime();
+					const metadata = {addrs:address,last:now};
+					this.#connectedPeers.set(id,metadata);
+				}
+				else {
+					//add to connected webpeers
+					this.#onConnectFn(id);
+					const now = new Date().getTime();
+					const metadata = {addrs:address,last:now};
+					this.#connectedPeers.set(id,metadata);
+					this.#connectedPeersArr.length = 0;
+					for(const peer of this.#connectedPeers){	
+						const item = {id:peer[0],address:peer[1].addrs};
+						this.#connectedPeersArr.push(item);
+					}
+				}
+
+			}
+		});
+		
 		//dial known peers from configuration
 		this.#dialKnownPeers();
 	
@@ -721,6 +786,8 @@ class webpeerjs{
 		//dial random discovered peers
 		//this.#dialdiscoveredpeers()
 		
+		this.#registerProtocol();
+		
 
 		onMetrics((data)=>{
 			const signal = metrics(data);
@@ -761,6 +828,14 @@ class webpeerjs{
 			}
 		},60e3)*/
 		
+		/*setTimeout(async()=>{
+			const key = uint8ArrayFromString(config.CONFIG_PREFIX)
+			const value = uint8ArrayFromString(this.id)
+			for await (const event of this.#libp2p.services.aminoDHT.put(key,value)){
+				console.log('put',event)
+			}
+		},30e3)*/
+		
 	}
 
 
@@ -786,10 +861,33 @@ class webpeerjs{
 	PRIVATE FUNCTION
 	*/
 	
+	async #registerProtocol(){
+		const handler = ({ connection, stream, protocol }) => {
+		  // use stream or connection according to the needs
+		};
+
+		await this.#libp2p.handle(CONFIG_PROTOCOL, handler, {
+		  maxInboundStreams: 5,
+		  maxOutboundStreams: 5
+		});
+
+		await this.#libp2p.register(CONFIG_PROTOCOL, {
+		  onConnect: (peer, connection) => {
+			// handle connect
+			//console.log('handle connect',peer)
+		  },
+		  onDisconnect: (peer, connection) => {
+			// handle disconnect
+			//console.log('handle disconnect',peer)
+		  }
+		});
+
+	}
+	
 	#findHybridPeer(){
 		setTimeout(async()=>{
 			for(const target of CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
-				if(!this.#isConnected(target)){
+				if(!this.#isConnected(target) && !this.#connections.has(target) && this.#isDialEnabled ){
 					//console.log('findPeer',target)
 					const peerId = peerIdFromString(target);
 					//const peerInfo = await this.#libp2p.services.aminoDHT.findPeer(peerId)
@@ -816,7 +914,7 @@ class webpeerjs{
 					}
 				}
 			}
-		},30e3);
+		},60e3);
 	}
 	
 	
@@ -895,7 +993,7 @@ class webpeerjs{
 		
 		if(!this.#isDialEnabled)return
 		
-		const mddrsToDial = 3;
+		const mddrsToDial = 5;
 		
 		let queue = [];
 		for(const item of this.#libp2p.getDialQueue()){
@@ -913,6 +1011,8 @@ class webpeerjs{
 				
 				if(this.#isConnected(id))continue
 				if(queue.includes(id)){continue;}
+				
+				//console.log('dial',id)
 
 				//dial with webtransport
 				this.#dialWebtransport(mddrs);
@@ -995,7 +1095,7 @@ class webpeerjs{
 				},
 				members : [this.id],
 				onMembers : () => {},
-				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);},
+				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);this.#ping();},
 			};
 		}
 		
@@ -1202,7 +1302,7 @@ class webpeerjs{
 		setTimeout(()=>{
 			this.#dialSavedKnownID();
 			this.#findHybridPeer();
-			setTimeout(()=>{this.#dialUpdateSavedKnownID();},60000);
+			setTimeout(()=>{this.#dialUpdateSavedKnownID();},50000);
 			setTimeout(()=>{
 				const peers = this.#libp2p.getPeers().length;
 				if(peers == 0){
@@ -1291,7 +1391,8 @@ class webpeerjs{
 	
 	async #dialUpdateSavedKnownID(){
 		for(const target of CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
-			if(!this.#connections.has(target)){
+			if(!this.#connections.has(target) && this.#isDialEnabled && this.#dbstoreData.has(target)){
+				//console.log('#dialUpdateSavedKnownID()',target)
 				const api = CONFIG_DELEGATED_API;
 				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
 				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)));

package/dist/umd/webpeerjs.js

@@ -6,6 +6,7 @@
 
 	const prefix$1 = 'webpeerjs';
 	const CONFIG_PREFIX = prefix$1;
+	const CONFIG_PROTOCOL = '/'+prefix$1+'/0.0.1';
 	const CONFIG_DBSTORE_PATH = prefix$1+'-dbstore';
 	const CONFIG_MAX_CONNECTIONS = 100;
 	const CONFIG_MIN_CONNECTIONS = 0;
@@ -24,7 +25,6 @@
 		'QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
 		'QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
 		'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-		'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr',
 		'12D3KooWPEDBmt7vm6FNNYuqaA4n2qMUZ6wPK5NcRc8t6KpqgRkV',
 		'12D3KooWSHbugDEQeWm2LjtRRMpNgLu6oZ8zkX8XcTwYMAewVekP',
 		'12D3KooWASoxFpwwy8JDdu4Tm57mhESsnbFPogam9VVmhR95FGXr',
@@ -32,7 +32,8 @@
 		'12D3KooWS79EhkPU7ESUwgG4vyHHzW9FDNZLoWVth9b5N5NSrvaj',
 		'12D3KooWBbkCD5MpJhMc1mfPAVGEyVkQnyxPKGS7AHwDqQM2JUsk',
 		'12D3KooWKLdecs31Zmo2pLBjR9HY2vWo3VwM4eBm21Czeucbe6FL',
-		'12D3KooWBdF3g6vSJFRPoZQo7BNnkNzaWb59gpyaVzsgtNTVeu8H'
+		'12D3KooWBdF3g6vSJFRPoZQo7BNnkNzaWb59gpyaVzsgtNTVeu8H',
+		'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr'
 		];
 
 	const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
@@ -3350,16 +3351,16 @@
 			fail = errors+timeouts;
 			const treshold = errors+timeouts+stats.open+stats.pending;
 			
-			if(treshold>60){
+			if(treshold>40){
 				//console.log(`Treeshold hit : ${treshold}`)
 			}
 			
-			if(fail>60){
+			if(fail>40){
 				//console.log(`Open : ${stats.open} , Pending : ${stats.pending} , Succes : ${totals.success} , Fail : ${fail} `)
 
 			}
 			
-			if ((fail-lastfailtreshold)>30){
+			if ((fail-lastfailtreshold)>40){
 				if(isDialEnabled){
 					isDialEnabled = false;
 					const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold});
@@ -46164,11 +46165,11 @@
 			//listen to peer connect event
 			this.#libp2p.addEventListener("peer:connect",async (evt) => {
 				
-				//console.log(`Connected to ${connection.toString()}`);
-				
 				evt.detail;
 				const id = evt.detail.toString();
 				
+				//console.log('peer:connect '+id,evt)
+				
 				const connections = this.#libp2p.getConnections().map((con)=>{return {id:con.remotePeer.toString(),addr:con.remoteAddr.toString()}});
 				const connect = connections.find((con)=>con.id == id);
 				const addr = connect.addr;
@@ -46191,6 +46192,31 @@
 					},1000);
 				}
 				
+				if(this.#webPeersId.includes(id)){
+					
+					let address = [addr];
+
+					if(this.#connectedPeers.has(id)){
+						//reset this last seen
+						const now = new Date().getTime();
+						const metadata = {addrs:address,last:now};
+						this.#connectedPeers.set(id,metadata);
+					}
+					else {
+						//add to connected webpeers
+						this.#onConnectFn(id);
+						const now = new Date().getTime();
+						const metadata = {addrs:address,last:now};
+						this.#connectedPeers.set(id,metadata);
+						this.#connectedPeersArr.length = 0;
+						for(const peer of this.#connectedPeers){	
+							const item = {id:peer[0],address:peer[1].addrs};
+							this.#connectedPeersArr.push(item);
+						}
+					}
+
+				}
+				
 			});
 
 
@@ -46347,15 +46373,15 @@
 									}
 									
 									//update connected webpeers
-									const now = new Date().getTime();
-									const metadata = {addrs:address,last:now};
-									this.#connectedPeers.set(id,metadata);
-									this.#webPeersAddrs.set(id,address);
-									this.#connectedPeersArr.length = 0;
+									/*const now = new Date().getTime()
+									const metadata = {addrs:address,last:now}
+									this.#connectedPeers.set(id,metadata)
+									this.#webPeersAddrs.set(id,address)
+									this.#connectedPeersArr.length = 0
 									for(const peer of this.#connectedPeers){	
-										const item = {id:peer[0],address:peer[1].addrs};
-										this.#connectedPeersArr.push(item);
-									}
+										const item = {id:peer[0],address:peer[1].addrs}
+										this.#connectedPeersArr.push(item)
+									}*/
 										
 								}
 							}
@@ -46406,10 +46432,12 @@
 					if(multiaddrs.toString().includes('certhash')&& multiaddrs.toString().includes('webtransport') && multiaddrs.toString().includes('p2p-circuit')){
 						//console.log(addrs)
 						if(!this.#connections.has(id)){
+							let mddrs = [];
 							for(const addr of addrs){
-								multiaddr(addr);
+								const mddr = multiaddr(addr);
+								mddrs.push(mddr);
 							}
-							//this.#dialMultiaddress(mddrs)
+							this.#dialMultiaddress(mddrs);
 						}
 					}
 				}
@@ -46466,10 +46494,8 @@
 				//redial if this disconnected peer is regular peer
 				else {
 					const addr = this.#connections.get(id);
-					let mddrs = [];
-					const addrs = multiaddr(addr);
-					mddrs.push(addrs);
-					this.#dialMultiaddress(mddrs);
+					multiaddr(addr);
+					//this.#dialMultiaddress(mddrs)
 				}
 			});
 			
@@ -46491,6 +46517,45 @@
 				this.#ping();
 			});
 			
+			this.#libp2p.addEventListener('peer:identify', (evt) => {
+				//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+				if(evt.detail.protocols.includes(CONFIG_PROTOCOL)){
+					//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+					
+					const id = evt.detail.peerId.toString();
+					let address = [];
+					
+					for(const addrs of evt.detail.listenAddrs){
+						const addr = addrs.toString()+'/p2p/'+id;
+						if(addr.includes('webtransport')){
+							address.push(addr);
+						}
+					}
+					
+					if(!this.#webPeersId.includes(id))this.#webPeersId.push(id);
+
+					if(this.#connectedPeers.has(id)){
+						//reset this last seen
+						const now = new Date().getTime();
+						const metadata = {addrs:address,last:now};
+						this.#connectedPeers.set(id,metadata);
+					}
+					else {
+						//add to connected webpeers
+						this.#onConnectFn(id);
+						const now = new Date().getTime();
+						const metadata = {addrs:address,last:now};
+						this.#connectedPeers.set(id,metadata);
+						this.#connectedPeersArr.length = 0;
+						for(const peer of this.#connectedPeers){	
+							const item = {id:peer[0],address:peer[1].addrs};
+							this.#connectedPeersArr.push(item);
+						}
+					}
+
+				}
+			});
+			
 			//dial known peers from configuration
 			this.#dialKnownPeers();
 		
@@ -46506,6 +46571,8 @@
 			//dial random discovered peers
 			//this.#dialdiscoveredpeers()
 			
+			this.#registerProtocol();
+			
 
 			onMetrics((data)=>{
 				const signal = metrics(data);
@@ -46546,6 +46613,14 @@
 				}
 			},60e3)*/
 			
+			/*setTimeout(async()=>{
+				const key = uint8ArrayFromString(config.CONFIG_PREFIX)
+				const value = uint8ArrayFromString(this.id)
+				for await (const event of this.#libp2p.services.aminoDHT.put(key,value)){
+					console.log('put',event)
+				}
+			},30e3)*/
+			
 		}
 
 
@@ -46571,10 +46646,33 @@
 		PRIVATE FUNCTION
 		*/
 		
+		async #registerProtocol(){
+			const handler = ({ connection, stream, protocol }) => {
+			  // use stream or connection according to the needs
+			};
+
+			await this.#libp2p.handle(CONFIG_PROTOCOL, handler, {
+			  maxInboundStreams: 5,
+			  maxOutboundStreams: 5
+			});
+
+			await this.#libp2p.register(CONFIG_PROTOCOL, {
+			  onConnect: (peer, connection) => {
+				// handle connect
+				//console.log('handle connect',peer)
+			  },
+			  onDisconnect: (peer, connection) => {
+				// handle disconnect
+				//console.log('handle disconnect',peer)
+			  }
+			});
+
+		}
+		
 		#findHybridPeer(){
 			setTimeout(async()=>{
 				for(const target of CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
-					if(!this.#isConnected(target)){
+					if(!this.#isConnected(target) && !this.#connections.has(target) && this.#isDialEnabled ){
 						//console.log('findPeer',target)
 						const peerId = peerIdFromString(target);
 						//const peerInfo = await this.#libp2p.services.aminoDHT.findPeer(peerId)
@@ -46601,7 +46699,7 @@
 						}
 					}
 				}
-			},30e3);
+			},60e3);
 		}
 		
 		
@@ -46680,7 +46778,7 @@
 			
 			if(!this.#isDialEnabled)return
 			
-			const mddrsToDial = 3;
+			const mddrsToDial = 5;
 			
 			let queue = [];
 			for(const item of this.#libp2p.getDialQueue()){
@@ -46698,6 +46796,8 @@
 					
 					if(this.#isConnected(id))continue
 					if(queue.includes(id)){continue;}
+					
+					//console.log('dial',id)
 
 					//dial with webtransport
 					this.#dialWebtransport(mddrs);
@@ -46780,7 +46880,7 @@
 					},
 					members : [this.id],
 					onMembers : () => {},
-					onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);},
+					onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);this.#ping();},
 				};
 			}
 			
@@ -46987,7 +47087,7 @@
 			setTimeout(()=>{
 				this.#dialSavedKnownID();
 				this.#findHybridPeer();
-				setTimeout(()=>{this.#dialUpdateSavedKnownID();},60000);
+				setTimeout(()=>{this.#dialUpdateSavedKnownID();},50000);
 				setTimeout(()=>{
 					const peers = this.#libp2p.getPeers().length;
 					if(peers == 0){
@@ -47076,7 +47176,8 @@
 		
 		async #dialUpdateSavedKnownID(){
 			for(const target of CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
-				if(!this.#connections.has(target)){
+				if(!this.#connections.has(target) && this.#isDialEnabled && this.#dbstoreData.has(target)){
+					//console.log('#dialUpdateSavedKnownID()',target)
 					const api = CONFIG_DELEGATED_API;
 					const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
 					const peer = await first$1(delegatedClient.getPeers(peerIdFromString(target)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpeerjs",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Simple peer-to-peer with IPFS",
   "main": "./dist/umd/webpeerjs.js",
   "module": "./dist/esm/webpeerjs.js",

package/src/config.js

@@ -1,5 +1,6 @@
 const prefix = 'webpeerjs'
 export const CONFIG_PREFIX = prefix
+export const CONFIG_PROTOCOL = '/'+prefix+'/0.0.1'
 export const CONFIG_BLOCKSTORE_PATH = prefix+'-blockstore'
 export const CONFIG_DATASTORE_PATH = prefix+'-datastore'
 export const CONFIG_DBSTORE_PATH = prefix+'-dbstore'
@@ -24,7 +25,6 @@ export const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
 	'QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
 	'QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
 	'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-	'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr',
 	'12D3KooWPEDBmt7vm6FNNYuqaA4n2qMUZ6wPK5NcRc8t6KpqgRkV',
 	'12D3KooWSHbugDEQeWm2LjtRRMpNgLu6oZ8zkX8XcTwYMAewVekP',
 	'12D3KooWASoxFpwwy8JDdu4Tm57mhESsnbFPogam9VVmhR95FGXr',
@@ -32,7 +32,8 @@ export const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
 	'12D3KooWS79EhkPU7ESUwgG4vyHHzW9FDNZLoWVth9b5N5NSrvaj',
 	'12D3KooWBbkCD5MpJhMc1mfPAVGEyVkQnyxPKGS7AHwDqQM2JUsk',
 	'12D3KooWKLdecs31Zmo2pLBjR9HY2vWo3VwM4eBm21Czeucbe6FL',
-	'12D3KooWBdF3g6vSJFRPoZQo7BNnkNzaWb59gpyaVzsgtNTVeu8H'
+	'12D3KooWBdF3g6vSJFRPoZQo7BNnkNzaWb59gpyaVzsgtNTVeu8H',
+	'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr'
 	]
 
 export const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [

package/src/utils.js

@@ -142,16 +142,16 @@ export function metrics(data){
 		fail = errors+timeouts
 		const treshold = errors+timeouts+stats.open+stats.pending
 		
-		if(treshold>60){
+		if(treshold>40){
 			//console.log(`Treeshold hit : ${treshold}`)
 		}
 		
-		if(fail>60){
+		if(fail>40){
 			//console.log(`Open : ${stats.open} , Pending : ${stats.pending} , Succes : ${totals.success} , Fail : ${fail} `)
 
 		}
 		
-		if ((fail-lastfailtreshold)>30){
+		if ((fail-lastfailtreshold)>40){
 			if(isDialEnabled){
 				isDialEnabled = false
 				const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold})

package/src/webpeerjs.js

@@ -132,11 +132,11 @@ class webpeerjs{
 		//listen to peer connect event
 		this.#libp2p.addEventListener("peer:connect",async (evt) => {
 			
-			//console.log(`Connected to ${connection.toString()}`);
-			
 			const connection = evt.detail;
 			const id = evt.detail.toString()
 			
+			//console.log('peer:connect '+id,evt)
+			
 			const connections = this.#libp2p.getConnections().map((con)=>{return {id:con.remotePeer.toString(),addr:con.remoteAddr.toString()}})
 			const connect = connections.find((con)=>con.id == id)
 			const addr = connect.addr
@@ -159,6 +159,31 @@ class webpeerjs{
 				},1000)
 			}
 			
+			if(this.#webPeersId.includes(id)){
+				
+				let address = [addr]
+
+				if(this.#connectedPeers.has(id)){
+					//reset this last seen
+					const now = new Date().getTime()
+					const metadata = {addrs:address,last:now}
+					this.#connectedPeers.set(id,metadata)
+				}
+				else{
+					//add to connected webpeers
+					this.#onConnectFn(id)
+					const now = new Date().getTime()
+					const metadata = {addrs:address,last:now}
+					this.#connectedPeers.set(id,metadata)
+					this.#connectedPeersArr.length = 0
+					for(const peer of this.#connectedPeers){	
+						const item = {id:peer[0],address:peer[1].addrs}
+						this.#connectedPeersArr.push(item)
+					}
+				}
+
+			}
+			
 		});
 
 
@@ -315,7 +340,7 @@ class webpeerjs{
 								}
 								
 								//update connected webpeers
-								const now = new Date().getTime()
+								/*const now = new Date().getTime()
 								const metadata = {addrs:address,last:now}
 								this.#connectedPeers.set(id,metadata)
 								this.#webPeersAddrs.set(id,address)
@@ -323,7 +348,7 @@ class webpeerjs{
 								for(const peer of this.#connectedPeers){	
 									const item = {id:peer[0],address:peer[1].addrs}
 									this.#connectedPeersArr.push(item)
-								}
+								}*/
 									
 							}
 						}
@@ -381,7 +406,7 @@ class webpeerjs{
 							const mddr = multiaddr(addr)
 							mddrs.push(mddr)
 						}
-						//this.#dialMultiaddress(mddrs)
+						this.#dialMultiaddress(mddrs)
 					}
 				}
 			}
@@ -445,7 +470,7 @@ class webpeerjs{
 				let mddrs = []
 				const addrs = multiaddr(addr)
 				mddrs.push(addrs)
-				this.#dialMultiaddress(mddrs)
+				//this.#dialMultiaddress(mddrs)
 			}
 		});
 		
@@ -467,6 +492,45 @@ class webpeerjs{
 			this.#ping()
 		})
 		
+		this.#libp2p.addEventListener('peer:identify', (evt) => {
+			//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+			if(evt.detail.protocols.includes(config.CONFIG_PROTOCOL)){
+				//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+				
+				const id = evt.detail.peerId.toString()
+				let address = []
+				
+				for(const addrs of evt.detail.listenAddrs){
+					const addr = addrs.toString()+'/p2p/'+id
+					if(addr.includes('webtransport')){
+						address.push(addr)
+					}
+				}
+				
+				if(!this.#webPeersId.includes(id))this.#webPeersId.push(id)
+
+				if(this.#connectedPeers.has(id)){
+					//reset this last seen
+					const now = new Date().getTime()
+					const metadata = {addrs:address,last:now}
+					this.#connectedPeers.set(id,metadata)
+				}
+				else{
+					//add to connected webpeers
+					this.#onConnectFn(id)
+					const now = new Date().getTime()
+					const metadata = {addrs:address,last:now}
+					this.#connectedPeers.set(id,metadata)
+					this.#connectedPeersArr.length = 0
+					for(const peer of this.#connectedPeers){	
+						const item = {id:peer[0],address:peer[1].addrs}
+						this.#connectedPeersArr.push(item)
+					}
+				}
+
+			}
+		})
+		
 		//dial known peers from configuration
 		this.#dialKnownPeers()
 	
@@ -482,6 +546,8 @@ class webpeerjs{
 		//dial random discovered peers
 		//this.#dialdiscoveredpeers()
 		
+		this.#registerProtocol()
+		
 
 		onMetrics((data)=>{
 			const signal = metrics(data)
@@ -522,6 +588,14 @@ class webpeerjs{
 			}
 		},60e3)*/
 		
+		/*setTimeout(async()=>{
+			const key = uint8ArrayFromString(config.CONFIG_PREFIX)
+			const value = uint8ArrayFromString(this.id)
+			for await (const event of this.#libp2p.services.aminoDHT.put(key,value)){
+				console.log('put',event)
+			}
+		},30e3)*/
+		
 	}
 
 
@@ -547,10 +621,33 @@ class webpeerjs{
 	PRIVATE FUNCTION
 	*/
 	
+	async #registerProtocol(){
+		const handler = ({ connection, stream, protocol }) => {
+		  // use stream or connection according to the needs
+		}
+
+		await this.#libp2p.handle(config.CONFIG_PROTOCOL, handler, {
+		  maxInboundStreams: 5,
+		  maxOutboundStreams: 5
+		})
+
+		await this.#libp2p.register(config.CONFIG_PROTOCOL, {
+		  onConnect: (peer, connection) => {
+			// handle connect
+			//console.log('handle connect',peer)
+		  },
+		  onDisconnect: (peer, connection) => {
+			// handle disconnect
+			//console.log('handle disconnect',peer)
+		  }
+		})
+
+	}
+	
 	#findHybridPeer(){
 		setTimeout(async()=>{
 			for(const target of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
-				if(!this.#isConnected(target)){
+				if(!this.#isConnected(target) && !this.#connections.has(target) && this.#isDialEnabled ){
 					//console.log('findPeer',target)
 					const peerId = peerIdFromString(target)
 					//const peerInfo = await this.#libp2p.services.aminoDHT.findPeer(peerId)
@@ -577,7 +674,7 @@ class webpeerjs{
 					}
 				}
 			}
-		},30e3)
+		},60e3)
 	}
 	
 	
@@ -656,7 +753,7 @@ class webpeerjs{
 		
 		if(!this.#isDialEnabled)return
 		
-		const mddrsToDial = 3
+		const mddrsToDial = 5
 		
 		let queue = []
 		for(const item of this.#libp2p.getDialQueue()){
@@ -674,6 +771,8 @@ class webpeerjs{
 				
 				if(this.#isConnected(id))continue
 				if(queue.includes(id)){continue;}
+				
+				//console.log('dial',id)
 
 				//dial with webtransport
 				this.#dialWebtransport(mddrs)
@@ -756,7 +855,7 @@ class webpeerjs{
 				},
 				members : [this.id],
 				onMembers : () => {},
-				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members)},
+				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);this.#ping()},
 			}
 		}
 		
@@ -963,7 +1062,7 @@ class webpeerjs{
 		setTimeout(()=>{
 			this.#dialSavedKnownID()
 			this.#findHybridPeer()
-			setTimeout(()=>{this.#dialUpdateSavedKnownID()},60000)
+			setTimeout(()=>{this.#dialUpdateSavedKnownID()},50000)
 			setTimeout(()=>{
 				const peers = this.#libp2p.getPeers().length
 				if(peers == 0){
@@ -1056,7 +1155,8 @@ class webpeerjs{
 	
 	async #dialUpdateSavedKnownID(){
 		for(const target of config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
-			if(!this.#connections.has(target)){
+			if(!this.#connections.has(target) && this.#isDialEnabled && this.#dbstoreData.has(target)){
+				//console.log('#dialUpdateSavedKnownID()',target)
 				const api = config.CONFIG_DELEGATED_API
 				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)
 				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)))