webpeerjs 0.0.8 → 0.0.10

package/dist/esm/webpeerjs.js

@@ -2,24 +2,29 @@ import { message, encodeMessage, decodeMessage } from 'protons-runtime';
 import { alloc } from 'uint8arrays/alloc';
 import { Key } from 'interface-datastore';
 import { sha256 } from 'multiformats/hashes/sha2';
+import { multiaddr } from '@multiformats/multiaddr';
+import { pipe } from 'it-pipe';
+import 'it-length-prefixed-stream';
+import * as lp from 'it-length-prefixed';
+import map from 'it-map';
 import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client';
 import { createLibp2p } from 'libp2p';
 import { IDBDatastore } from 'datastore-idb';
 import { webTransport } from '@libp2p/webtransport';
+import { webSockets } from '@libp2p/websockets';
 import { noise } from '@chainsafe/libp2p-noise';
 import { yamux } from '@chainsafe/libp2p-yamux';
 import { pubsubPeerDiscovery } from '@libp2p/pubsub-peer-discovery';
 import { circuitRelayTransport } from '@libp2p/circuit-relay-v2';
 import { gossipsub } from '@chainsafe/libp2p-gossipsub';
 import { identify, identifyPush } from '@libp2p/identify';
-import { multiaddr } from '@multiformats/multiaddr';
 import { peerIdFromString } from '@libp2p/peer-id';
 import { kadDHT, removePrivateAddressesMapper } from '@libp2p/kad-dht';
 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_PROTOCOL = '/'+prefix$1+'/1.0.0';
 const CONFIG_DBSTORE_PATH = prefix$1+'-dbstore';
 const CONFIG_MAX_CONNECTIONS = 100;
 const CONFIG_MIN_CONNECTIONS = 0;
@@ -29,20 +34,15 @@ const CONFIG_PEER_DISCOVERY_GLOBAL = '_peer-discovery._p2p._pubsub';
 const CONFIG_PEER_DISCOVERY_WEBPEERJS= prefix$1+'-peer-discovery';
 const CONFIG_PUBSUB_PEER_DISCOVERY = [CONFIG_PEER_DISCOVERY_GLOBAL, CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY, CONFIG_PEER_DISCOVERY_WEBPEERJS];
 const CONFIG_DELEGATED_API = 'https://delegated-ipfs.dev';
+const CONFIG_DNS_RESOLVER = 'https://dns.google/resolve';
+const CONFIG_KNOWN_BOOTSTRAP_DNS = '_dnsaddr.bootstrap.libp2p.io';
+const CONFIG_TIMEOUT_DIAL_KNOWN_PEERS = 15000;
 
 const CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS = [
 	'QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
 	'QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
 	'QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
-	'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-	'12D3KooWPEDBmt7vm6FNNYuqaA4n2qMUZ6wPK5NcRc8t6KpqgRkV',
-	'12D3KooWSHbugDEQeWm2LjtRRMpNgLu6oZ8zkX8XcTwYMAewVekP',
-	'12D3KooWASoxFpwwy8JDdu4Tm57mhESsnbFPogam9VVmhR95FGXr',
-	'12D3KooWHh98YpAkJsn3ULjMjK1n9QVkXmi8Sb3gTDMatHxCmDP5',
-	'12D3KooWS79EhkPU7ESUwgG4vyHHzW9FDNZLoWVth9b5N5NSrvaj',
-	'12D3KooWBbkCD5MpJhMc1mfPAVGEyVkQnyxPKGS7AHwDqQM2JUsk',
-	'12D3KooWKLdecs31Zmo2pLBjR9HY2vWo3VwM4eBm21Czeucbe6FL',
-	'12D3KooWBdF3g6vSJFRPoZQo7BNnkNzaWb59gpyaVzsgtNTVeu8H'
+	'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ'
 	];
 
 const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
@@ -52,13 +52,46 @@ const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
 const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.concat(CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS);
 
 const CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS = [
+{
+    "Peers": [
+        {
+            "Addrs": [
+                "/dns6/sv15.bootstrap.libp2p.io/tcp/443/wss",
+                "/dns4/sv15.bootstrap.libp2p.io/tcp/443/wss"
+            ],
+            "ID": "QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
+            "Schema": "peer"
+        }
+    ]
+},
+{
+    "Peers": [
+        {
+            "Addrs": [
+                "/dns4/am6.bootstrap.libp2p.io/tcp/443/wss",
+                "/dns6/am6.bootstrap.libp2p.io/tcp/443/wss"
+            ],
+            "ID": "QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb",
+            "Schema": "peer"
+        }
+    ]
+},
+{
+    "Peers": [
+        {
+            "Addrs": [
+                "/dns6/sg1.bootstrap.libp2p.io/tcp/443/wss",
+                "/dns4/sg1.bootstrap.libp2p.io/tcp/443/wss"
+            ],
+            "ID": "QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt",
+            "Schema": "peer"
+        }
+    ]
+}
 ];
 
-/* eslint-disable import/export */
-/* eslint-disable complexity */
-/* eslint-disable @typescript-eslint/no-namespace */
-/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
-/* eslint-disable @typescript-eslint/no-empty-interface */
+//this code comes from https://github.com/libp2p/js-libp2p-pubsub-peer-discovery/blob/9d0da565f70e9b2403251c9d11dfc0b9b52babfa/src/peer.ts
+
 var Peer;
 (function (Peer) {
     let _codec;
@@ -243,16 +276,16 @@ function metrics(data){
 		fail = errors+timeouts;
 		const treshold = errors+timeouts+stats.open+stats.pending;
 		
-		if(treshold>40){
+		if(treshold>30){
 			//console.log(`Treeshold hit : ${treshold}`)
 		}
 		
-		if(fail>40){
+		if(fail>30){
 			//console.log(`Open : ${stats.open} , Pending : ${stats.pending} , Succes : ${totals.success} , Fail : ${fail} `)
 
 		}
 		
-		if ((fail-lastfailtreshold)>40){
+		if ((fail-lastfailtreshold)>30){
 			if(isDialEnabled){
 				isDialEnabled = false;
 				const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold});
@@ -333,6 +366,9 @@ class webpeerjs{
 	//message tracker avoid double
 	#msgIdtracker
 	
+	//map of peer exchange data
+	#peerexchangedata
+	
 	id
 	status
 	IPFS
@@ -361,6 +397,7 @@ class webpeerjs{
 		this.#dialQueue = [];
 		this.#isDialEnabled = true;
 		this.#msgIdtracker = [];
+		this.#peerexchangedata = new Map();
 		
 		this.peers = (function(f) {
 			return f
@@ -392,8 +429,8 @@ class webpeerjs{
 			const connect = connections.find((con)=>con.id == id);
 			const addr = connect.addr;
 
-			if(CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) || CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
-				if(!this.#connections.has(id)&&addr.includes('webtransport')){
+			if(CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id)){
+				if((!this.#connections.has(id) || (this.#connections.get(id).includes('/wss/')))&&addr.includes('webtransport')){
 					await this.#dbstore.put(new Key(id), new TextEncoder().encode(addr));
 				}
 			}
@@ -653,9 +690,8 @@ class webpeerjs{
 				count++;
 				this.#trackDisconnect.set(id,count);
 				//console.log(this.#trackDisconnect)
-				if(count>5){
+				if(count>10){
 					if(this.#dbstoreData.has(id)){
-						//await this.#dbstore.delete(new Key(id))
 						this.#dbstoreData.delete(id);
 					}
 					
@@ -668,6 +704,11 @@ class webpeerjs{
 				this.#trackDisconnect.set(id,0);
 			}
 			
+			let peerexchangelist = [];
+			for(const peer of this.#peerexchangedata.values()){
+				peerexchangelist.push(peer.id);
+			}
+			
 			//if this disconnected peer is web peer redial it
 			if(this.#webPeersId.includes(id)){
 				const addr = this.#connections.get(id);
@@ -679,6 +720,15 @@ class webpeerjs{
 			
 			//if this disconnected peer is known bootstrap redial it
 			else if(this.#dialedKnownBootstrap.has(id)){
+				const addr = this.#connections.get(id);
+				if(addr.includes('/wss/'))return
+				let mddrs = [];
+				const addrs = multiaddr(addr);
+				mddrs.push(addrs);
+				this.#dialMultiaddress(mddrs);
+			}
+
+			else if(peerexchangelist.includes(id)){
 				const addr = this.#connections.get(id);
 				let mddrs = [];
 				const addrs = multiaddr(addr);
@@ -712,37 +762,54 @@ class webpeerjs{
 			this.#ping();
 		});
 		
-		this.#libp2p.addEventListener('peer:identify', (evt) => {
+		this.#libp2p.addEventListener('peer:identify', async (evt) => {
 			//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+			
+			const id = evt.detail.peerId.toString();
+			
+			if(CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.includes(id)){
+				const remoteAddr = evt.detail.connection.remoteAddr.toString();
+				if(remoteAddr.includes('/wss/')){
+					 let addrs = [];
+					 let mddrs = [];
+					 for(const peer of evt.detail.listenAddrs){
+						 if(!peer.toString().includes('webtransport'))continue
+						 const addr = peer.toString()+'/p2p/'+id;
+						 const mddr = multiaddr(addr);
+						 addrs.push(addr);
+						 mddrs.push(mddr);
+					 }
+					 this.#dialedKnownBootstrap.set(id,addrs);
+					 await this.#libp2p.hangUp(peerIdFromString(id));
+					 this.#dialMultiaddress(mddrs);
+				}
+			}
+			
 			if(evt.detail.protocols.includes(CONFIG_PROTOCOL)){
-				//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+				//console.log('peer:identify '+evt.detail.peerId.toString(),evt)
 				
 				const id = evt.detail.peerId.toString();
 				let address = [];
 				
 				for(const addrs of evt.detail.listenAddrs){
 					const addr = addrs.toString()+'/p2p/'+id;
+					multiaddr(addr);
 					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.#updatePeers();
-				}
+				
+				
+				const command = 'peer-exchange';
+				this.#dialProtocol(id,command);
+				
 
 			}
 		});
@@ -823,14 +890,67 @@ class webpeerjs{
 
 	//Listen on new peer connection
 	#onConnectFn = () => {}
-	onJoin = f => (this.#onConnectFn = f)
+	onConnect = f => (this.#onConnectFn = f)
 
 
 	//Listen on peer disconnect
 	#onDisconnectFn = () => {}
-	onLeave = f => (this.#onDisconnectFn = f)	
+	onDisconnect = f => (this.#onDisconnectFn = f)	
 
+	joinRoom = room => {
+		if (this.#rooms[room]) {
+			return [
+				this.#rooms[room].sendMessage,
+				this.#rooms[room].listenMessage,
+				this.#rooms[room].onMembersChange
+			]
+			
 
+		}
+
+		if (!room) {
+			throw mkErr('room is required')
+		}
+		
+		//join room version 1 user pupsub via pupsub peer discovery
+		{
+
+			const topics = CONFIG_PUBSUB_PEER_DISCOVERY;
+			
+			this.#rooms[room] = {
+				onMessage : () => {},
+				listenMessage : f => (this.#rooms[room] = {...this.#rooms[room], onMessage: f}),
+				sendMessage : async (message) => {
+					const msgId = (new Date()).getTime();
+					const data = JSON.stringify({prefix:CONFIG_PREFIX,room,message,id:this.#libp2p.peerId.toString(),msgId});
+					const peer = {
+					  publicKey: this.#libp2p.peerId.publicKey,
+					  addrs: [uint8ArrayFromString(data)],
+					};
+					const encodedPeer = Peer.encode(peer);
+					for(const topic of topics){
+						await this.#libp2p.services.pubsub.publish(topic, encodedPeer);
+					}
+				},
+				members : [this.id],
+				onMembers : () => {},
+				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);this.#ping();},
+			};
+		}
+		
+		return [
+			this.#rooms[room].sendMessage,
+			this.#rooms[room].listenMessage,
+			this.#rooms[room].onMembersChange
+		]
+	}
+	
+	dial(addr){
+		let mddrs = [];
+		const mddr = multiaddr(addr);
+		mddrs.push(mddr);
+		this.#dialMultiaddress(mddrs);
+	}
 
 
 	/*
@@ -852,13 +972,96 @@ class webpeerjs{
 	}
 	
 	async #registerProtocol(){
-		const handler = ({ connection, stream, protocol }) => {
-		  // use stream or connection according to the needs
+		
+		const handler = async ({ connection, stream, protocol }) => {
+			try{
+				const output = await pipe(
+					stream.source,
+					(source) => lp.decode(source),
+					(source) => map(source, (buf) => uint8ArrayToString(buf.subarray())),
+					async function (source) {
+					  let string = '';
+					  for await (const msg of source) {
+						string += msg.toString();
+					  }
+					  return string
+					}
+				);
+				
+				const id = connection.remotePeer.toString();
+				
+				let json = JSON.parse(output);
+
+				let jsonMessage = {
+						protocol:CONFIG_PROTOCOL,
+						command:null,
+						data:null
+				};
+				
+				if(json.command === 'peer-exchange'){
+					
+					if(json.protocol == CONFIG_PROTOCOL){
+						const address = [connection.remoteAddr.toString()];
+						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 {
+							if(!this.#webPeersId.includes(id))this.#webPeersId.push(id);
+								
+							//add to connected webpeers
+							this.#onConnectFn(id);
+							const now = new Date().getTime();
+							const metadata = {addrs:address,last:now};
+							this.#connectedPeers.set(id,metadata);
+							this.#updatePeers();
+						}
+					}
+					
+					if(json.data != null){
+						this.#peerexchangedata.set(id,json.data);
+						let mddrs = [];
+						const dataaddr = json.data.addr;
+						const datamddr = multiaddr(dataaddr);
+						const dataid = json.data.id;
+						mddrs.push(datamddr);
+						this.#dialMultiaddress(mddrs);
+						if(!this.#dbstoreData.has(dataid)){
+							//await this.#dbstore.put(new Key(dataid), new TextEncoder().encode(dataaddr))
+							//this.#dbstoreData.set(dataid,dataaddr)
+						}
+					}
+					
+					const keys = Array.from(this.#dbstoreData.keys());
+					const randomKey = Math.floor(Math.random() * keys.length);
+					const key = keys[randomKey];
+					const addr = this.#dbstoreData.get(key);
+					
+					jsonMessage.command = json.command;
+					jsonMessage.data = {id:key,addr};	
+				}
+				
+				const message = JSON.stringify(jsonMessage);
+				//console.log('answer message '+id,message)
+				
+				pipe(
+					message,
+					(source) => map(source, (string) => uint8ArrayFromString(string)),
+					(source) => lp.encode(source),
+					stream.sink
+				);
+			}
+			catch(err){
+				//console.warn(err)
+			}
 		};
 
 		await this.#libp2p.handle(CONFIG_PROTOCOL, handler, {
-		  maxInboundStreams: 5,
-		  maxOutboundStreams: 5
+		  maxInboundStreams: 50,
+		  maxOutboundStreams: 50,
+		  runOnTransientConnection:true
 		});
 
 		await this.#libp2p.register(CONFIG_PROTOCOL, {
@@ -874,37 +1077,129 @@ class webpeerjs{
 
 	}
 	
-	#findHybridPeer(){
-		setTimeout(async()=>{
-			for(const target of CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
-				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)
-
-					//console.info(peerInfo)
-					for await (const event of this.#libp2p.services.aminoDHT.findPeer(peerId)){
-						//console.info('findPeer',event)
-						if (event.name === 'FINAL_PEER'){
-							//console.log(event.peer.id.toString(),event.peer.multiaddrs.toString())
-							let mddrs = [];
-							let addrs = [];
-							const id = event.peer.id.toString();
-							for(const mddr of event.peer.multiaddrs){
-								const peeraddr = mddr.toString()+'/p2p/'+id;
-								const peermddr = multiaddr(peeraddr);
-								addrs.push(peeraddr);
-								mddrs.push(peermddr);
-							}
-							this.#dialedKnownBootstrap.set(id,addrs);
-							if(!this.#isConnected(id)){
-								this.#dialMultiaddress(mddrs);
-							}
+	async #dialProtocol(id,command){
+
+		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;
+		const mddr = multiaddr(addr);
+		
+		let jsonMessage = {
+				protocol:CONFIG_PROTOCOL,
+				command:null,
+				data:null
+		};
+		
+		if(command === 'peer-exchange'){
+			
+			if(this.#peerexchangedata.has(id))return
+			
+			const keys = Array.from(this.#dbstoreData.keys());
+			const randomKey = Math.floor(Math.random() * keys.length);
+			const key = keys[randomKey];
+			const addr = this.#dbstoreData.get(key);
+			
+			jsonMessage.command = command;
+			jsonMessage.data = {id:key,addr};
+		}
+		
+		const message = JSON.stringify(jsonMessage);		
+		//console.log('ask message '+id,message)
+
+		try{
+			
+			const stream = await this.#libp2p.dialProtocol(mddr, CONFIG_PROTOCOL,{runOnTransientConnection:true});
+			
+			const output = await pipe(
+				message,
+				(source) => map(source, (string) => uint8ArrayFromString(string)),
+				(source) => lp.encode(source),
+				stream,
+				(source) => lp.decode(source),
+				(source) => map(source, (buf) => uint8ArrayToString(buf.subarray())),
+				async function (source) {
+				  let string = '';
+				  for await (const msg of source) {
+					string += msg.toString();
+				  }
+				  return string
+				}
+			);
+			
+			const json = JSON.parse(output);
+			if(json.protocol == CONFIG_PROTOCOL){
+				const 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 {
+					if(!this.#webPeersId.includes(id))this.#webPeersId.push(id);
+						
+					//add to connected webpeers
+					this.#onConnectFn(id);
+					const now = new Date().getTime();
+					const metadata = {addrs:address,last:now};
+					this.#connectedPeers.set(id,metadata);
+					this.#updatePeers();
+				}
+			}
+			if(json.command == 'peer-exchange'){
+				if(json.data != null){
+					this.#peerexchangedata.set(id,json.data);
+					let mddrs = [];
+					const dataaddr = json.data.addr;
+					const datamddr = multiaddr(dataaddr);
+					const dataid = json.data.id;
+					mddrs.push(datamddr);
+					this.#dialMultiaddress(mddrs);
+					if(!this.#dbstoreData.has(dataid)){
+						//await this.#dbstore.put(new Key(dataid), new TextEncoder().encode(dataaddr))
+						//this.#dbstoreData.set(dataid,dataaddr)
+					}
+				}
+			}
+		}
+		catch(err){
+			//console.warn(err)
+		}
+	}
+	
+	async #findHybridPeer(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
+		for(const target of CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
+			if(!this.#isConnected(target) && !this.#connections.has(target)){
+				//console.log('findPeer',target)
+				const peerId = peerIdFromString(target);
+				//const peerInfo = await this.#libp2p.services.aminoDHT.findPeer(peerId)
+
+				//console.info(peerInfo)
+				for await (const event of this.#libp2p.services.aminoDHT.findPeer(peerId)){
+					//console.info('findPeer',event)
+					if (event.name === 'FINAL_PEER'){
+						//console.log(event.peer.id.toString(),event.peer.multiaddrs.toString())
+						let mddrs = [];
+						let addrs = [];
+						const id = event.peer.id.toString();
+						for(const mddr of event.peer.multiaddrs){
+							const peeraddr = mddr.toString()+'/p2p/'+id;
+							const peermddr = multiaddr(peeraddr);
+							addrs.push(peeraddr);
+							mddrs.push(peermddr);
+						}
+						this.#dialedKnownBootstrap.set(id,addrs);
+						if(!this.#isConnected(id)){
+							this.#dialMultiaddress(mddrs);
 						}
 					}
 				}
 			}
-		},60e3);
+		}
 	}
 	
 	
@@ -960,13 +1255,25 @@ class webpeerjs{
 			
 			const id = mddrs[0].toString().split('/').pop();
 			
-			const ids = this.#dialQueue.map((arr)=> arr[0].toString().split('/').pop());
+			const queueids = this.#dialQueue.map((arr)=> arr[0].toString().split('/').pop());
 			
 			//if peer id is already in the queque cancel queque
-			if(ids.includes(id)){
+			if(queueids.includes(id)){
 				return
 			}
 			
+			const webPeerCount = this.#connectedPeers.size;
+			const allPeerCount = this.#libp2p.getPeers().length;
+			const nodePeerCount = allPeerCount - webPeerCount;
+			const limitCount = CONFIG_MAX_CONNECTIONS / 2;
+			
+			if(this.#webPeersId.includes(id)){
+				if(webPeerCount>limitCount)return
+			}
+			else {
+				if(nodePeerCount>limitCount)return
+			}
+			
 			if(this.#webPeersId.includes(id) || CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) || CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
 				this.#dialQueue.unshift(mddrs);
 			}
@@ -980,7 +1287,7 @@ class webpeerjs{
 	//dial multiaddr address in queue list
 	#dialQueueList(){
 		
-		if(!this.#isDialEnabled)return
+		if(!this.#isDialEnabled || !navigator.onLine)return
 		
 		const mddrsToDial = 5;
 		
@@ -1045,55 +1352,6 @@ class webpeerjs{
 				await this.#libp2p.services.pubsub.publish(topic, encodedPeer);
 			}
 	}
-
-	
-	joinRoom = room => {
-		if (this.#rooms[room]) {
-			return [
-				this.#rooms[room].sendMessage,
-				this.#rooms[room].listenMessage,
-				this.#rooms[room].onMembersChange
-			]
-			
-
-		}
-
-		if (!room) {
-			throw mkErr('room is required')
-		}
-		
-		//join room version 1 user pupsub via pupsub peer discovery
-		{
-
-			const topics = CONFIG_PUBSUB_PEER_DISCOVERY;
-			
-			this.#rooms[room] = {
-				onMessage : () => {},
-				listenMessage : f => (this.#rooms[room] = {...this.#rooms[room], onMessage: f}),
-				sendMessage : async (message) => {
-					const msgId = (new Date()).getTime();
-					const data = JSON.stringify({prefix:CONFIG_PREFIX,room,message,id:this.#libp2p.peerId.toString(),msgId});
-					const peer = {
-					  publicKey: this.#libp2p.peerId.publicKey,
-					  addrs: [uint8ArrayFromString(data)],
-					};
-					const encodedPeer = Peer.encode(peer);
-					for(const topic of topics){
-						await this.#libp2p.services.pubsub.publish(topic, encodedPeer);
-					}
-				},
-				members : [this.id],
-				onMembers : () => {},
-				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);this.#ping();},
-			};
-		}
-		
-		return [
-			this.#rooms[room].sendMessage,
-			this.#rooms[room].listenMessage,
-			this.#rooms[room].onMembersChange
-		]
-	}
 	
 	
 	//dial discovered peers
@@ -1196,8 +1454,7 @@ class webpeerjs{
 				if(besttime>bestlimit){
 					const addr = remote.toString();
 					const id = peer.toString();
-					if(!this.#webPeersId.includes(id) && !CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) && !this.#dbstoreData.get(id) && !addr.includes('p2p-circuit') && addr.includes('webtransport')){
-						//await this.#dbstore.delete(new Key(id))
+					if(!this.#webPeersId.includes(id) && !CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) && !this.#dbstoreData.has(id) && !addr.includes('p2p-circuit') && addr.includes('webtransport')){
 						await this.#dbstore.put(new Key(id), new TextEncoder().encode(addr));
 						this.#dbstoreData.set(id,addr);
 					}
@@ -1212,26 +1469,31 @@ class webpeerjs{
 			}
 			
 			
-			let peers = [];
-			for(const peer of this.#libp2p.getPeers()){
-				peers.push(peer.toString());
-			}
-			
-			
 			//connect to saved best peer address
 			//working great
 			for(const peer of this.#dbstoreData){
 				const id = peer[0];
 				const addr = peer[1];
-				if(peers.includes(id)){
+				if(this.#isConnected(id)){
 					this.#connectionTrackerStore.set(id,0);
 					continue
 				}else {
 					if(this.#connectionTrackerStore.has(id)){
 						let current = this.#connectionTrackerStore.get(id);
-						if(current>10)continue
 						current++;
 						this.#connectionTrackerStore.set(id,current);
+						if(current>5){
+							if(!this.#connections.has(id) && !CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) && navigator.onLine)
+							{
+								setTimeout(async ()=> {
+									if(this.#dbstoreData.has(id) && !this.#connections.has(id)){
+										this.#dbstoreData.delete(id);
+										await this.#dbstore.delete(new Key(id));
+									}
+								},60*1000);
+							}
+							continue
+						}
 					}
 					else {
 						this.#connectionTrackerStore.set(id,0);
@@ -1246,7 +1508,7 @@ class webpeerjs{
 			//connect to good peer address if it is disconnected
 			const goods = Array.from(this.#dialedGoodPeers.keys());
 			for(const id of goods){
-				if(peers.includes(id)){
+				if(this.#isConnected(id)){
 					this.#dialedGoodPeers.set(id,0);
 					continue
 				}
@@ -1281,62 +1543,52 @@ class webpeerjs{
 			if(peers == 0){
 				this.#dialKnownPeers();
 			}
-		},60*1000);
+		},120*1000);
 	}
 	
 	
 	//dial to all known bootstrap peers and DNS
 	#dialKnownPeers(){
-		//this.#dialKnownBootstrap()
 		setTimeout(()=>{
 			this.#dialSavedKnownID();
-			this.#findHybridPeer();
 			setTimeout(()=>{this.#dialUpdateSavedKnownID();},50000);
+			setTimeout(()=>{this.#findHybridPeer();},60000);
 			setTimeout(()=>{
 				const peers = this.#libp2p.getPeers().length;
 				if(peers == 0){
 					this.#dialKnownID();
-					this.#findHybridPeer();
+					setTimeout(()=>{this.#findHybridPeer();},60000);
 					setTimeout(()=>{
 						const peers = this.#libp2p.getPeers().length;
 						if(peers == 0){
-							//currently not needed
-							//this.#dialKnownDNS()
+							this.#dialKnownBootstrap();
+							setTimeout(()=>{this.#findHybridPeer();},15000);
 							setTimeout(()=>{
-								this.#libp2p.getPeers().length;
-							},15000);
+								const peers = this.#libp2p.getPeers().length;
+								if(peers == 0){
+									this.#dialKnownDNS();
+									setTimeout(()=>{this.#findHybridPeer();},15000);
+									setTimeout(()=>{
+										const peers = this.#libp2p.getPeers().length;
+										if(peers == 0){
+											this.#dialKnownDNSonly();
+											setTimeout(()=>{this.#findHybridPeer();},15000);
+										}
+									},CONFIG_TIMEOUT_DIAL_KNOWN_PEERS);
+								}
+							},CONFIG_TIMEOUT_DIAL_KNOWN_PEERS);
 						}
-					},15000);
+					},CONFIG_TIMEOUT_DIAL_KNOWN_PEERS);
 				}
-			},15000);
+			},CONFIG_TIMEOUT_DIAL_KNOWN_PEERS);
 		},5000);
 	}
 	
-	
-	//dial based on known bootsrap peers address
-	#dialKnownBootstrap(){
-		const bootstrap = CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS;
-		for(const peer of bootstrap){
-			const address = peer.Peers[0].Addrs;
-			const id = peer.Peers[0].ID;
-			let mddrs = [];
-			let addrs = [];
-			for(const addr of address){
-				const peeraddr = addr+'/p2p/'+id;
-				const peermddr = multiaddr(peeraddr);
-				addrs.push(peeraddr);
-				mddrs.push(peermddr);
-			}
-			
-			this.#dialedKnownBootstrap.set(id,addrs);
-			if(!this.#isConnected(id)){
-				this.#dialMultiaddress(mddrs);
-			}
-			
-		}
-	}
-	
 	async #dialSavedKnownID(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
 		let firsttime = true;
 		for(const target of CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
 			if(this.#dbstoreData.has(target)){
@@ -1359,6 +1611,7 @@ class webpeerjs{
 				const api = CONFIG_DELEGATED_API;
 				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
 				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)));
+				if(!peer)continue
 				const address = peer.Addrs;
 				const id = peer.ID;
 				let mddrs = [];
@@ -1379,16 +1632,26 @@ class webpeerjs{
 	}
 	
 	async #dialUpdateSavedKnownID(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
 		let firsttime = true;
 		for(const target of CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
 			if(this.#dbstoreData.has(target)){
 				firsttime = false;
 			}
-			if(!this.#connections.has(target) && this.#isDialEnabled && (this.#dbstoreData.has(target) || firsttime)){
+			if(!this.#connections.has(target) && (this.#dbstoreData.has(target) || firsttime)){
 				//console.log('#dialUpdateSavedKnownID()',target)
 				const api = CONFIG_DELEGATED_API;
 				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
 				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)));
+				if(!peer){
+					if (navigator.onLine) {
+						await this.#dbstore.delete(new Key(target));
+					}
+					continue
+				}
 				const address = peer.Addrs;
 				const id = peer.ID;
 				let mddrs = [];
@@ -1411,6 +1674,10 @@ class webpeerjs{
 	
 	//dial based on known peers ID
 	async #dialKnownID(){
+		
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+		
 		//console.log('#dialKnownID()')
 		const api = CONFIG_DELEGATED_API;
 		const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
@@ -1437,118 +1704,149 @@ class webpeerjs{
 			}
 		}
 	}
-	
+
+
+	//dial based on known bootsrap peers address using Websocket expected
+	#dialKnownBootstrap(){
+		
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
+		const bootstrap = CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS;
+		for(const peer of bootstrap){
+			const address = peer.Peers[0].Addrs;
+			const id = peer.Peers[0].ID;
+			let mddrs = [];
+			let addrs = [];
+			for(const addr of address){
+				if(!addr.includes('wss'))continue
+				const peeraddr = addr+'/p2p/'+id;
+				const peermddr = multiaddr(peeraddr);
+				addrs.push(peeraddr);
+				mddrs.push(peermddr);
+			}
+			
+			this.#dialedKnownBootstrap.set(id,addrs);
+			this.#isDialWebsocket = true;
+			if(!this.#isConnected(id)){
+				this.#dialMultiaddress(mddrs);
+			}
+			
+		}
+	}	
 	
 	//dial based on known bootstrap DNS
-	/*async #dialKnownDNS(){
-		const dnsresolver = config.CONFIG_DNS_RESOLVER
-		const bootstrapdns = config.CONFIG_KNOWN_BOOTSTRAP_DNS
-		const response = await fetch(dnsresolver+'?name='+bootstrapdns+'&type=txt')
-		const json = await response.json()
-		const dns = json.Answer
-		const BOOTSTRAP_PEER_IDS = []
+	async #dialKnownDNS(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
+		const dnsresolver = CONFIG_DNS_RESOLVER;
+		const bootstrapdns = CONFIG_KNOWN_BOOTSTRAP_DNS;
+		const response = await fetch(dnsresolver+'?name='+bootstrapdns+'&type=txt');
+		const json = await response.json();
+		const dns = json.Answer;
+		const BOOTSTRAP_PEER_IDS = [];
 		for(const dnsaddr of dns){
-			const id = dnsaddr.data.split('/').pop()
-			BOOTSTRAP_PEER_IDS.push(id)
+			const id = dnsaddr.data.split('/').pop();
+			BOOTSTRAP_PEER_IDS.push(id);
 		}
-		const api = config.CONFIG_DELEGATED_API
-		const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)
+		const api = CONFIG_DELEGATED_API;
+		const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
 		const peers = await Promise.all(
 			BOOTSTRAP_PEER_IDS.map((peerId) => first(delegatedClient.getPeers(peerIdFromString(peerId)))),
-		)
+		);
 		for(const peer of peers){
-			const address = peer.Addrs
-			const id = peer.ID
-			let mddrs = []
-			let addrs = []
+			const address = peer.Addrs;
+			const id = peer.ID;
+			let mddrs = [];
+			let addrs = [];
 			for(const addr of address){
-				const peeraddr = addr.toString()+'/p2p/'+id.toString()
-				const peermddr = multiaddr(peeraddr)
-				addrs.push(peeraddr)
-				mddrs.push(peermddr)
+				const peeraddr = addr.toString()+'/p2p/'+id.toString();
+				const peermddr = multiaddr(peeraddr);
+				addrs.push(peeraddr);
+				mddrs.push(peermddr);
 			}
 			
-			this.#dialedKnownBootstrap.set(id,addrs)
+			this.#dialedKnownBootstrap.set(id,addrs);
+			this.#isDialWebsocket = true;
 			if(!this.#isConnected(id)){
-				this.#dialMultiaddress(mddrs)
+				this.#dialMultiaddress(mddrs);
 			}
 		}
 		
-	}*/
+	}
 	
 	
 	//dial based on known bootstrap DNS using DNS resolver only
-	/*async #dialKnownDNSonly(){
-		const dnsresolver = config.CONFIG_DNS_RESOLVER
-		const bootstrapdns = config.CONFIG_KNOWN_BOOTSTRAP_DNS
-		const response = await fetch(dnsresolver+'?name='+bootstrapdns+'&type=txt')
-		const json = await response.json()
-		const dns = json.Answer
+	async #dialKnownDNSonly(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
+		const dnsresolver = CONFIG_DNS_RESOLVER;
+		const bootstrapdns = CONFIG_KNOWN_BOOTSTRAP_DNS;
+		const response = await fetch(dnsresolver+'?name='+bootstrapdns+'&type=txt');
+		const json = await response.json();
+		const dns = json.Answer;
 		
 		for(const dnsitem of dns){
-			const arr = dnsitem.data.split('/')
-			const id = arr.pop()
-			const dnsaddr = '_dnsaddr.'+arr[2]
-			this.#dialDNSWebsocketWebtransport(id,dnsaddr)
+			const arr = dnsitem.data.split('/');
+			const id = arr.pop();
+			const dnsaddr = '_dnsaddr.'+arr[2];
+			this.#dialDNSWebsocketWebtransport(id,dnsaddr);
 		}
-	}*/
+	}
 	
 	
 	//dial DNS with webtransport and websocket
-	/*async #dialDNSWebsocketWebtransport(id,dnsaddr){
-		const dnsresolver = config.CONFIG_DNS_RESOLVER
-		const response = await fetch(dnsresolver+'?name='+dnsaddr+'&type=txt')
-		const json = await response.json()
-		const dns = json.Answer
-		let mddrs = []
-		let addrs = []
+	async #dialDNSWebsocketWebtransport(id,dnsaddr){
+		const dnsresolver = CONFIG_DNS_RESOLVER;
+		const response = await fetch(dnsresolver+'?name='+dnsaddr+'&type=txt');
+		const json = await response.json();
+		const dns = json.Answer;
+		let mddrs = [];
+		let addrs = [];
 		for(const dnsitem of dns){
-			const arr = dnsitem.data.split('=')
-			const dnsaddr = arr[1]
-			const maddr = multiaddr(dnsaddr)
-			mddrs.push(maddr)
-			addrs.push(dnsaddr)
+			const arr = dnsitem.data.split('=');
+			const dnsaddr = arr[1];
+			const maddr = multiaddr(dnsaddr);
+			mddrs.push(maddr);
+			addrs.push(dnsaddr);
 		}
 		
 		
-		this.#isDialWebsocket = true
-		this.#dialedKnownBootstrap.set(id,addrs)
+		this.#isDialWebsocket = true;
+		this.#dialedKnownBootstrap.set(id,addrs);
 		
-		this.#dialedKnownBootstrap.set(id,addrs)
+		this.#dialedKnownBootstrap.set(id,addrs);
 		if(!this.#isConnected(id)){
-			this.#dialMultiaddress(mddrs)
-			this.#dialWebsocket(mddrs)
+			this.#dialMultiaddress(mddrs);
+			this.#dialWebsocket(mddrs);
 		}
-	}*/
+	}
 	
 	
 	//dial only webtransport multiaddrs
 	async #dialWebtransport(multiaddrs){
 			const webTransportMadrs = multiaddrs.filter((maddr) => maddr.protoNames().includes('webtransport')&&maddr.protoNames().includes('certhash'));
-			  for (const addr of webTransportMadrs) {
+			  for (const mddr of webTransportMadrs) {
 				try {
-				  //console.log(`attempting to dial webtransport multiaddr: %o`, addr.toString())
-				  await this.#libp2p.dial(addr);
+				  //console.log(`attempting to dial webtransport multiaddr: %o`, mddr.toString())
+				  await this.#libp2p.dial(mddr);
 				  return // if we succeed dialing the peer, no need to try another address
 				} catch (error) {
 				}
 			  }
 	}
-
-	//dial only webtransport multiaddrs
-	/*#dialWebtransport1(multiaddrs){
-			const webTransportMadrs = multiaddrs.filter((maddr) => maddr.protoNames().includes('webtransport')&&maddr.protoNames().includes('certhash'))
-			if(webTransportMadrs.length == 0)return
-			this.#libp2p.dial(webTransportMadrs).then((data)=>{console.warn(data)},(data)=>{console.warn(data)})
-	}*/
 	
 	//dial only websocket multiaddrs
 	async #dialWebsocket(multiaddrs){
 			const webSocketMadrs = multiaddrs.filter((maddr) => maddr.protoNames().includes('wss'));
-			  for (const addr of webSocketMadrs) {
+			  for (const mddr of webSocketMadrs) {
 				try {
-				  //console.log(`attempting to dial websocket multiaddr: %o`, addr)
-				  await this.#libp2p.dial(addr);
+				  //console.log(`attempting to dial websocket multiaddr: %o`, mddr)
+				  await this.#libp2p.dial(mddr);
 				  return // if we succeed dialing the peer, no need to try another address
 				} catch (error) {
 				}
@@ -1586,7 +1884,8 @@ class webpeerjs{
 				],
 			},
 			transports:[
-				webTransport(),		
+				webTransport(),
+				webSockets(),
 				circuitRelayTransport({
 					discoverRelays: CONFIG_DISCOVER_RELAYS,
 					reservationConcurrency: 1,