webpeerjs 0.1.6 → 0.1.8

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
 	
@@ -102,16 +105,23 @@ class webpeerjs{
 	//arr to track on connect event
 	#onConnectQueue
 	
+	//callback to websocket dialable
+	#onWebsocketFn
+	
+	//time tracker for sending message
+	#sendMessageTimeTracker
+	
 	id
 	status
 	IPFS
 	address
 	peers
 	
-	constructor(libp2p,dbstore,onMetrics){
+	constructor(libp2p,dbstore,onMetrics,onWebsocketFn,onDialFn){
 		
 		this.#libp2p = libp2p
 		this.#dbstore = dbstore
+		this.#onWebsocketFn = onWebsocketFn
 		this.#dbstoreData = new Map()
 		this.#discoveredPeers = new Map()
 		this.#webPeersId = []
@@ -129,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
@@ -382,10 +394,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)
 										}
 									}
@@ -581,15 +600,16 @@ class webpeerjs{
 			//const multiaddrs = peer.addresses.map(({ multiaddr }) => multiaddr)
 			//console.log(`changed multiaddrs: peer ${peer.id.toString()} multiaddrs: ${multiaddrs}`)
 			const id = peer.id.toString()
-			const mddrs = []
-			peer.addresses.forEach((addr)=>{
-				const maddr = addr.multiaddr.toString()+'/p2p/'+id
-				if(maddr.includes('webtransport') && maddr.includes('certhash')){
-					mddrs.push(maddr)
+			const addrs = []
+			peer.addresses.forEach((address)=>{
+				const addr = address.multiaddr.toString()+'/p2p/'+id
+				if(addr.includes('webtransport') && addr.includes('certhash')){
+					addrs.push(addr)
 				}
 			})
-			//this.#ListenAddressChange(mddrs)
-			this.address = mddrs
+			if(!config.CONFIG_RUN_ON_TRANSIENT_CONNECTION)addrs.reverse()
+			//this.#ListenAddressChange(addrs)
+			this.address = addrs
 			this.#ping()
 			this.#peerDiscoveryHybrid()
 		})
@@ -668,7 +688,8 @@ class webpeerjs{
 
 		onMetrics((data)=>{
 			const signal = metrics(data)
-			this.#isDialEnabled = signal
+			this.#isDialEnabled = signal.isDialEnabled
+			onDialFn(signal.isAutoDialEnabled)
 			
 		})
 		
@@ -689,6 +710,7 @@ class webpeerjs{
 			this.#peerDiscoveryHybrid()
 			this.#trackHybridPeersConnection()
 			this.#trackWebpeerConnection()
+			this.#garbageCollectionMsgIdTracker()
 		},10e3)
 		
 
@@ -768,6 +790,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)
@@ -803,12 +830,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
@@ -1656,7 +1696,7 @@ class webpeerjs{
 
 	//dial based on known bootsrap peers address using Websocket expected
 	#dialKnownBootstrap(){
-		
+		//console.log('#dialKnownBootstrap()')
 		if(!navigator.onLine)return
 		if(!this.#isDialEnabled)return
 
@@ -1676,6 +1716,7 @@ class webpeerjs{
 			
 			this.#dialedKnownBootstrap.set(id,addrs)
 			this.#isDialWebsocket = true
+			this.#onWebsocketFn(true)
 			if(!this.#isConnected(id)){
 				this.#dialMultiaddress(mddrs)
 			}
@@ -1685,7 +1726,7 @@ class webpeerjs{
 	
 	//dial based on known bootstrap DNS
 	async #dialKnownDNS(){
-
+		//console.log('#dialKnownDNS()')
 		if(!navigator.onLine)return
 		if(!this.#isDialEnabled)return
 
@@ -1718,6 +1759,7 @@ class webpeerjs{
 			
 			this.#dialedKnownBootstrap.set(id,addrs)
 			this.#isDialWebsocket = true
+			this.#onWebsocketFn(true)
 			if(!this.#isConnected(id)){
 				this.#dialMultiaddress(mddrs)
 			}
@@ -1728,7 +1770,7 @@ class webpeerjs{
 	
 	//dial based on known bootstrap DNS using DNS resolver only
 	async #dialKnownDNSonly(){
-
+		console.log('#dialKnownDNSonly()')
 		if(!navigator.onLine)return
 		if(!this.#isDialEnabled)return
 
@@ -1765,6 +1807,7 @@ class webpeerjs{
 		
 		
 		this.#isDialWebsocket = true
+		this.#onWebsocketFn(true)
 		this.#dialedKnownBootstrap.set(id,addrs)
 		
 		this.#dialedKnownBootstrap.set(id,addrs)
@@ -1832,6 +1875,21 @@ class webpeerjs{
 
 		let onMetricsFn = () => {}
 		const onMetrics = f => (onMetricsFn = f)
+
+		let isWebsocket = false
+		let onWebsocketFn = () => {}
+		const onWebsocket = f => (onWebsocketFn = f)
+		onWebsocket((data)=>{
+			isWebsocket = data
+		})
+		
+		let isDial = true
+		let onDialFn = () => {}
+		const onDial = f => (onDialFn = f)
+		onDial((data)=>{
+			//if(isDial!=data)console.warn('isDial',data)
+			isDial = data
+		})
 		
 		let listenaddress = []
 		
@@ -1839,6 +1897,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)
@@ -1847,93 +1908,113 @@ 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));
-		})
+				pc.createDataChannel('webpeerjs');
+				pc.createOffer().then(offer => pc.setLocalDescription(offer));
+			})
+		}
+		
+		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 configuration = {}
+		
+		if(arguments.length > 0){
+			configuration = arguments[0]
+		}else{
+			configuration.rtcConfiguration = {
+				iceServers: ice,
+			}
+		}
 		
 		//create libp2p instance
 		const libp2p = await createLibp2p({
@@ -1944,9 +2025,7 @@ class webpeerjs{
 				webTransport(),
 				webSockets(),
 				webRTC({
-					rtcConfiguration: {
-						iceServers: ice,
-					},
+					rtcConfiguration: configuration.rtcConfiguration,
 				}),
 				circuitRelayTransport({
 					discoverRelays: config.CONFIG_DISCOVER_RELAYS,
@@ -1979,24 +2058,26 @@ class webpeerjs{
 			],
 			connectionGater: {
 				filterMultiaddrForPeer: async (peer, multiaddrTest) => {
-					const multiaddrString = multiaddrTest.toString();
+					const multiaddrString = multiaddrTest.toString()
 					if (
 						multiaddrString.includes("/ip4/127.0.0.1") ||
 						multiaddrString.includes("/ip6/")
 					) {
-						return false;
+						return false
 					}
-					return true;
+					if(multiaddrString.includes("/ws/") || multiaddrString.includes("/wss/"))return isWebsocket
+					return isDial
 				},
 				denyDialMultiaddr: async (multiaddrTest) => {
-					const multiaddrString = multiaddrTest.toString();
+					const multiaddrString = multiaddrTest.toString()
 					if (
 						multiaddrString.includes("/ip4/127.0.0.1") ||
 						multiaddrString.includes("/ip6/")
 					) {
-						return true;
+						return true
 					}
-					return false;
+					if(multiaddrString.includes("/ws/") || multiaddrString.includes("/wss/"))return !isWebsocket
+					return !isDial
 				},
 			},
 			peerDiscovery: [
@@ -2042,7 +2123,7 @@ class webpeerjs{
 		
 		
 		//return webpeerjs class
-		return new webpeerjs(libp2p,dbstore,onMetrics)
+		return new webpeerjs(libp2p,dbstore,onMetrics,onWebsocketFn,onDialFn)
 	}
 }