webpeerjs 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpeerjs",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "WebPEER.js is decentralized P2P JS library for communication between applications in browser.",
   "main": "./dist/umd/webpeerjs.js",
   "module": "./src/webpeerjs.js",

package/src/config.js

@@ -6,7 +6,7 @@ export const CONFIG_PROTOCOL = '/'+prefix+'/1.0.0'
 export const CONFIG_BLOCKSTORE_PATH = prefix+'-blockstore'
 export const CONFIG_DATASTORE_PATH = prefix+'-datastore'
 export const CONFIG_DBSTORE_PATH = prefix+'-dbstore'
-export const CONFIG_MAX_CONNECTIONS = 50
+export const CONFIG_MAX_CONNECTIONS = 30
 export const CONFIG_MIN_CONNECTIONS = 0
 export const CONFIG_DISCOVER_RELAYS = 1
 export const CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY = 'universal-connectivity-browser-peer-discovery'

package/src/webpeerjs.js

@@ -217,18 +217,22 @@ class webpeerjs{
 				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)
+					if(this.#lastTimeReceiveData < 10*1000){
+						//reset this last seen
+						const now = new Date().getTime()
+						const metadata = {addrs:address,last:now}
+						this.#connectedPeers.set(id,metadata)
+					}
 				}
-				else if(this.#lastTimeReceiveData < 10*1000){
-					//add to connected webpeers
-					this.#onConnectFnUpdate(id)
-					const now = new Date().getTime()
-					const metadata = {addrs:address,last:now}
-					this.#connectedPeers.set(id,metadata)
-					this.#updatePeers()
+				else {
+					if(this.#lastTimeReceiveData < 10*1000){
+						//add to connected webpeers
+						this.#onConnectFnUpdate(id)
+						const now = new Date().getTime()
+						const metadata = {addrs:address,last:now}
+						this.#connectedPeers.set(id,metadata)
+						this.#updatePeers()
+					}
 				}
 
 			}
@@ -273,20 +277,24 @@ class webpeerjs{
 						if(this.#webPeersId.includes(senderPeerId)){
 							
 							if(this.#connectedPeers.has(senderPeerId)){
-								//reset this last seen
-								const address = this.#connectedPeers.get(senderPeerId).addrs
-								const now = new Date().getTime()
-								const metadata = {addrs:address,last:now}
-								this.#connectedPeers.set(senderPeerId,metadata)
+								if(this.#lastTimeReceiveData < 10*1000){
+									//reset this last seen
+									const address = this.#connectedPeers.get(senderPeerId).addrs
+									const now = new Date().getTime()
+									const metadata = {addrs:address,last:now}
+									this.#connectedPeers.set(senderPeerId,metadata)
+								}
 							}
-							else if(this.#lastTimeReceiveData < 10*1000){
-								//add to connected webpeers
-								this.#onConnectFnUpdate(senderPeerId)
-								const address = this.#webPeersAddrs.get(senderPeerId)
-								const now = new Date().getTime()
-								const metadata = {addrs:address,last:now}
-								this.#connectedPeers.set(senderPeerId,metadata)
-								this.#updatePeers()
+							else {
+								if(this.#lastTimeReceiveData < 10*1000){
+									//add to connected webpeers
+									this.#onConnectFnUpdate(senderPeerId)
+									const address = this.#webPeersAddrs.get(senderPeerId)
+									const now = new Date().getTime()
+									const metadata = {addrs:address,last:now}
+									this.#connectedPeers.set(senderPeerId,metadata)
+									this.#updatePeers()
+								}
 							}
 
 							//dial if not connected
@@ -374,6 +382,13 @@ class webpeerjs{
 								}
 								this.#updatePeers()
 							}else{
+								//reset this last seen
+								let addr = this.#connectedPeers.get(id).addrs
+								if(address)addr = address
+								const now = new Date().getTime()
+								const metadata = {addrs:addr,last:now}
+								this.#connectedPeers.set(id,metadata)
+								//update address
 								if(address){
 									if(address.length > 0){
 										this.#webPeersAddrs.set(id,address)
@@ -1116,6 +1131,7 @@ class webpeerjs{
 
 		if(!navigator.onLine)return
 		if(!this.#isDialEnabled)return
+		if(this.#connectedPeers.size > 5)return
 
 		for(const target of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
 			if(!this.#isConnected(target) && !this.#connections.has(target)){
@@ -1150,7 +1166,7 @@ class webpeerjs{
 	
 	//check the last seen in web peer
 	#trackLastSeen(){
-		const timeout = 10*1000
+		const timeout = 20*1000
 		const forcetimeout = 60*1000
 		const now = new Date().getTime()
 		
@@ -1160,7 +1176,7 @@ class webpeerjs{
 			const last = peer[1].last
 			const time = now-last
 			if((time>timeout && !this.#isConnected(id))||(time>forcetimeout)){
-				
+				//console.log('time',time)
 				this.#connectedPeers.delete(id)
 				this.#updatePeers()
 				this.#onDisconnectFn(id)
@@ -1221,20 +1237,11 @@ class webpeerjs{
 			}
 			else{
 				if((nodePeerCount>(limitCount-5))||(allPeerCount>(config.CONFIG_MAX_CONNECTIONS-5))){
-					//close random peers
-					let peers = []
-					for(const peer of this.#libp2p.getPeers()){
-						peers.push(peer.toString())
-					}
-					const randomKey = Math.floor(Math.random() * peers.length)
-					const randompeerid = peers[randomKey]
-					if(!config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
-						await this.#libp2p.hangUp(peerIdFromString(randompeerid))
-					}
+					return
 				}
 			}
 			
-			if(this.#webPeersId.includes(id) || config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) || config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
+			if(this.#webPeersId.includes(id) || config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
 				this.#dialQueue.unshift(mddrs)
 			}
 			else{
@@ -1416,19 +1423,9 @@ class webpeerjs{
 				}
 			}
 		},45*1000)
-	}
-	
-	
-	//track for good connection
-	async #connectionTracker(){
-		
-		for await (const { key, value } of this.#dbstore.query({})) {
-			const id = key.toString().split('/')[1]
-			const addr = new TextDecoder().decode(value)
-			this.#dbstoreData.set(id,addr)
-		}	
+	}	
 		
-		setInterval(async ()=>{
+	async #checkConnectionAll(){
 			
 			//save peer address if connection is good
 			const connections = this.#libp2p.getConnections()
@@ -1456,12 +1453,26 @@ class webpeerjs{
 				
 			}
 			
+			const shuffle = (array) => { 
+			  for (let i = array.length - 1; i > 0; i--) { 
+				const j = Math.floor(Math.random() * (i + 1)); 
+				[array[i], array[j]] = [array[j], array[i]]; 
+			  } 
+			  return array; 
+			}; 
 			
 			//connect to saved best peer address
 			//working great
-			for(const peer of this.#dbstoreData){
-				const id = peer[0]
-				const addr = peer[1]
+			const bestall = Array.from(this.#dbstoreData.keys())
+			const bestshuffle = shuffle(bestall)
+			const best = bestshuffle.slice(0, 10)
+			for(const hybrid of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
+				if(best.includes(hybrid))continue
+				if(!bestall.includes(hybrid))continue
+				best.unshift(hybrid)
+			}
+			for(const id of best){
+				const addr = this.#dbstoreData.get(id)
 				if(this.#isConnected(id)){
 					this.#connectionTrackerStore.set(id,0)
 					continue
@@ -1489,6 +1500,7 @@ class webpeerjs{
 					let mddrs = []
 					const mddr = multiaddr(addr)
 					mddrs.push(mddr)
+					//console.log(id,addr)
 					this.#dialMultiaddress(mddrs)
 				}
 			}
@@ -1514,7 +1526,20 @@ class webpeerjs{
 					}
 				}
 			}
-			
+	}
+	//track for good connection
+	async #connectionTracker(){
+		
+		for await (const { key, value } of this.#dbstore.query({})) {
+			const id = key.toString().split('/')[1]
+			const addr = new TextDecoder().decode(value)
+			this.#dbstoreData.set(id,addr)
+		}		
+		
+		this.#checkConnectionAll()
+		
+		setInterval(async ()=>{	
+			this.#checkConnectionAll()
 		},15*1000)
 	}
 
@@ -1982,40 +2007,47 @@ class webpeerjs{
 			})
 		}
 		
-		let ice = await checkice(stunurls,turnurls,turnusername,turncredential,5000)
-		
-		//console.log(ice)
-		
-		//recheck ice
-		if(!ice[0] && !ice[1]){
-			ice = await checkice(stunurlsbackup,turnurlsbackup,turnusernamebackup,turncredentialbackup,5000)
-		}else if (ice[0] && !ice[1]){
-			ice = await checkice(stunurls,turnurlsbackup,turnusernamebackup,turncredentialbackup,5000)
-		}else if (!ice[0] && ice[1]){
-			ice = await checkice(stunurlsbackup,turnurls,turnusername,turncredential,5000)
-		}
-		
-		//console.log(ice)
-		
-		//final ice remove false value
-		ice.forEach(function(value, index) {
-		  if(!value){
-			  this.splice(index, 1)
-		  }
-		}, ice);
-		
-		//console.log(ice)
+		let ice = []
 		
 		let configuration = {}
 		
 		if(arguments.length > 0){
 			configuration = arguments[0]
-		}else{
+		}
+		
+		//set rtc configuration
+		if(configuration.rtcConfiguration === undefined){
+			
+			ice = await checkice(stunurls,turnurls,turnusername,turncredential,5000)
+
+			//console.log(ice)
+			
+			//recheck ice
+			if(!ice[0] && !ice[1]){
+				ice = await checkice(stunurlsbackup,turnurlsbackup,turnusernamebackup,turncredentialbackup,5000)
+			}else if (ice[0] && !ice[1]){
+				ice = await checkice(stunurls,turnurlsbackup,turnusernamebackup,turncredentialbackup,5000)
+			}else if (!ice[0] && ice[1]){
+				ice = await checkice(stunurlsbackup,turnurls,turnusername,turncredential,5000)
+			}
+			
+			//console.log(ice)
+			
+			//final ice remove false value
+			ice.forEach(function(value, index) {
+			  if(!value){
+				  this.splice(index, 1)
+			  }
+			}, ice);
+			
+			//console.log(ice)
+			
 			configuration.rtcConfiguration = {
 				iceServers: ice,
 			}
 		}
 		
+		
 		//create libp2p instance
 		const libp2p = await createLibp2p({
 			addresses: {