webpeerjs 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpeerjs",
-  "version": "0.1.7",
+  "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",
@@ -32,17 +32,17 @@
     "url": "git+https://github.com/nuzulul/webpeerjs.git"
   },
   "keywords": [
-    "p2p",
+    "webpeer",
+	"p2p",
+	"p2p-network",
+	"webpeer-network",
     "ipfs",
 	"libp2p",
     "peer",
     "peer-to-peer",
     "decentralized",
     "browser-to-browser",
-	"dapp",
 	"distributed",
-	"decentralized-web",
-	"distributed-web",
 	"serverless"
   ],
   "author": {

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/utils.js

@@ -121,6 +121,7 @@ let lastStats = {
 }
 
 let fail = 0
+let lastfail = 0
 let isDialEnabled = true
 let lastfailtreshold = 0
 let isAutoDialEnabled = true
@@ -185,6 +186,20 @@ export function metrics(data){
 		
 		fail = errors+timeouts
 		//const treshold = errors+timeouts+stats.open+stats.pending
+		//console.log('fail',fail)
+		
+		//detect fail timeout, in chrome fail webtransport get reset after 5 minutes
+		if(lastfail>fail){
+			setTimeout(()=>{
+				if(isAutoDialEnabled){
+					lastfailtresholdauto = lastfailtresholdauto+(lastfail-fail)
+				}
+				if(isDialEnabled){
+					lastfailtreshold = lastfailtreshold+(lastfail-fail)
+				}
+			},5*60*1000)
+		}
+		lastfail = fail
 		
 		if ((fail-lastfailtreshold)>config.CONFIG_DIAL_MAX_ERROR_LIMIT){
 			if(isDialEnabled){

package/src/webpeerjs.js

@@ -92,6 +92,9 @@ class webpeerjs{
 	//message tracker avoid double
 	#msgIdtracker
 	
+	//inbound message time tracker
+	#msgTimeTracker
+	
 	//map of peer exchange data
 	#peerexchangedata
 	
@@ -105,6 +108,9 @@ class webpeerjs{
 	//callback to websocket dialable
 	#onWebsocketFn
 	
+	//time tracker for sending message
+	#sendMessageTimeTracker
+	
 	id
 	status
 	IPFS
@@ -133,11 +139,13 @@ class webpeerjs{
 		this.#trackDisconnect = new Map()
 		this.#dialQueue = []
 		this.#isDialEnabled = true
-		this.#msgIdtracker = []
+		this.#msgIdtracker = new Map()
 		this.#peerexchangedata = new Map()
 		this.#lastTimeConnectToNetwork = new Date().getTime()
 		this.#lastTimeReceiveData = new Date().getTime()
 		this.#onConnectQueue = []
+		this.#msgTimeTracker = new Map()
+		this.#sendMessageTimeTracker = 0
 		
 		this.peers = (function(f) {
 			return f
@@ -209,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()
+					}
 				}
 
 			}
@@ -265,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
@@ -366,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)
@@ -386,10 +409,17 @@ class webpeerjs{
 									}
 
 									//inbound message
+									//use #msgIdtracker to prevent double message
+									//use #msgTimeTracker to limit inbound message 1msg/s
 									if(message){
 										const msgID = msgId+id
-										if(!this.#msgIdtracker.includes(msgID)){
-											this.#msgIdtracker.push(msgID)
+										let oldmsgtime = 0
+										let newmsgtime = new Date().getTime()
+										if(this.#msgTimeTracker.has(id))oldmsgtime = this.#msgTimeTracker.get(id)
+										const msgtimelimit = 1000
+										if(!this.#msgIdtracker.has(msgID) && newmsgtime-oldmsgtime>msgtimelimit){
+											this.#msgIdtracker.set(msgID,newmsgtime)
+											this.#msgTimeTracker.set(id,newmsgtime)
 											this.#rooms[room].onMessage(message,id)
 										}
 									}
@@ -695,6 +725,7 @@ class webpeerjs{
 			this.#peerDiscoveryHybrid()
 			this.#trackHybridPeersConnection()
 			this.#trackWebpeerConnection()
+			this.#garbageCollectionMsgIdTracker()
 		},10e3)
 		
 
@@ -774,6 +805,11 @@ class webpeerjs{
 				onMessage : () => {},
 				listenMessage : f => (this.#rooms[room] = {...this.#rooms[room], onMessage: f}),
 				sendMessage : async (message) => {
+					const now = (new Date()).getTime()
+					if(now-this.#sendMessageTimeTracker < 1000){
+						throw mkErr('can not send more than 1 message/s')
+					}
+					this.#sendMessageTimeTracker = now
 					const msgId = (new Date()).getTime()
 					const data = JSON.stringify({prefix:config.CONFIG_PREFIX,room,message,id:this.#libp2p.peerId.toString(),msgId})
 					const arr = uint8ArrayFromString(data)
@@ -809,12 +845,25 @@ class webpeerjs{
 		mddrs.push(mddr)
 		this.#dialMultiaddress(mddrs)
 	}
+	
+	plugin(callback){
+		callback(this)
+	}
 
 
 	/*
 	PRIVATE FUNCTION
 	*/
 	
+	#garbageCollectionMsgIdTracker(){
+		const limit = 60*1000
+		for(const msg of this.#msgIdtracker){
+			if(msg[1] > limit){
+				this.#msgIdtracker.delete(msg[0])
+			}
+		}
+	}
+	
 	//track hybrid peer connection and try to dial if not connected at least 1
 	#trackHybridPeersConnection(){
 		let isConnectedToHybridPeers = false
@@ -1082,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)){
@@ -1116,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()
 		
@@ -1126,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)
@@ -1187,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{
@@ -1382,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()
@@ -1422,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
@@ -1455,6 +1500,7 @@ class webpeerjs{
 					let mddrs = []
 					const mddr = multiaddr(addr)
 					mddrs.push(mddr)
+					//console.log(id,addr)
 					this.#dialMultiaddress(mddrs)
 				}
 			}
@@ -1480,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)
 	}
 
@@ -1863,6 +1922,9 @@ class webpeerjs{
 			listenaddress.push('/webrtc')
 		}
 		
+		const stunurls = config.CONFIG_WEBRTC_STUN_URLS
+		const stunurlsbackup = config.CONFIG_WEBRTC_STUN_URLS_BACKUP
+		
 		const turnurls = atob(config.CONFIG_WEBRTC_TURN_HOST)
 		const turnusername = atob(config.CONFIG_WEBRTC_TURN_USER)
 		const turncredential = atob(config.CONFIG_WEBRTC_TURN_PWD)
@@ -1871,94 +1933,120 @@ class webpeerjs{
 		const turnusernamebackup = atob(config.CONFIG_WEBRTC_TURN_USER_BACKUP)
 		const turncredentialbackup = atob(config.CONFIG_WEBRTC_TURN_PWD_BACKUP)
 		
-		const ice = await new Promise((resolve)=>{
-			
-			let stun = false
-			let turn = false
-			
-			const timeout = setTimeout(()=>{
-				let ice = []
-				if(stun){
-					ice.push(stun)
-				}else{
-					const backup = {
-						urls: config.CONFIG_WEBRTC_STUN_URLS_BACKUP
-					}
-					ice.push(backup)
-				}
-				if(turn){
-					ice.push(turn)
-				}else{
-					const backup = 	{
-						urls: turnurlsbackup, 
-						username: turnusernamebackup, 
-						credential: turncredentialbackup
-					}
-					ice.push(backup)
-				}
-				resolve(ice)
-			},5000)
-			
-			function check(){
-				if(stun && turn){
+		async function checkice(stunurls,turnurls,turnusername,turncredential,time){
+			return new Promise((resolve)=>{
+				
+				let stun = false
+				let turn = false
+				
+				const timeout = setTimeout(()=>{
 					let ice = []
 					ice.push(stun)
 					ice.push(turn)
-					clearTimeout(timeout)
 					resolve(ice)
+				},time)
+				
+				function check(){
+					if(stun && turn){
+						let ice = []
+						ice.push(stun)
+						ice.push(turn)
+						clearTimeout(timeout)
+						resolve(ice)
+					}
 				}
-			}
-			
-			//test ice servers
-			
-			const iceServers = [
-				{
-					urls: config.CONFIG_WEBRTC_STUN_URLS
-				},
-				{
-					urls: turnurls, 
-					username: turnusername, 
-					credential: turncredential
-				}
-			];
+				
+				//test ice servers
+				
+				const iceServers = [
+					{
+						urls: stunurls
+					},
+					{
+						urls: turnurls, 
+						username: turnusername, 
+						credential: turncredential
+					}
+				];
 
-			const pc = new RTCPeerConnection({
-				iceServers
-			});
+				const pc = new RTCPeerConnection({
+					iceServers
+				});
 
-			pc.onicecandidate = (e) => {
-				if (!e.candidate) return;
+				pc.onicecandidate = (e) => {
+					if (!e.candidate) return;
 
-				//console.log(e.candidate.candidate);
+					//console.log(e.candidate.candidate);
 
-				// stun works
-				if(e.candidate.type == "srflx"){
-					//console.log('publicip',e.candidate.address);
-					stun = 	{
-								urls: config.CONFIG_WEBRTC_STUN_URLS
-							}
-					check()
-				}
+					// stun works
+					if(e.candidate.type == "srflx"){
+						//console.log('publicip',e.candidate.address);
+						stun = 	{
+									urls: stunurls
+								}
+						check()
+					}
 
-				// turn works
-				if(e.candidate.type == "relay"){
-					turn =  {
-								urls: turnurls, 
-								username: turnusername, 
-								credential: turncredential
-							}
-					check()
-				}
-			};
+					// turn works
+					if(e.candidate.type == "relay"){
+						turn =  {
+									urls: turnurls, 
+									username: turnusername, 
+									credential: turncredential
+								}
+						check()
+					}
+				};
 
-			pc.onicecandidateerror = (e) => {
-				console.debug(e);
-			};
+				pc.onicecandidateerror = (e) => {
+					console.debug(e);
+				};
 
-			pc.createDataChannel('webpeerjs');
-			pc.createOffer().then(offer => pc.setLocalDescription(offer));
-		})
-		//console.log(ice)
+				pc.createDataChannel('webpeerjs');
+				pc.createOffer().then(offer => pc.setLocalDescription(offer));
+			})
+		}
+		
+		let ice = []
+		
+		let configuration = {}
+		
+		if(arguments.length > 0){
+			configuration = arguments[0]
+		}
+		
+		//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({
@@ -1969,9 +2057,7 @@ class webpeerjs{
 				webTransport(),
 				webSockets(),
 				webRTC({
-					rtcConfiguration: {
-						iceServers: ice,
-					},
+					rtcConfiguration: configuration.rtcConfiguration,
 				}),
 				circuitRelayTransport({
 					discoverRelays: config.CONFIG_DISCOVER_RELAYS,