webpeerjs 0.1.5 → 0.1.7

package/src/webpeerjs.js

@@ -10,11 +10,10 @@ import {
 	Key,
 	msgIdFnStrictNoSign,
 	metrics,
-	getDigest,
+	//getDigest,
 	mkDebug,
 	multiaddr,
 	pipe,
-	lpStream,
 	lp,
 	map
 } from './utils'
@@ -98,20 +97,25 @@ class webpeerjs{
 	
 	//track last connect to webpeer network
 	#lastTimeConnectToNetwork
+	#lastTimeReceiveData
 	
 	//arr to track on connect event
 	#onConnectQueue
 	
+	//callback to websocket dialable
+	#onWebsocketFn
+	
 	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 = []
@@ -132,6 +136,7 @@ class webpeerjs{
 		this.#msgIdtracker = []
 		this.#peerexchangedata = new Map()
 		this.#lastTimeConnectToNetwork = new Date().getTime()
+		this.#lastTimeReceiveData = new Date().getTime()
 		this.#onConnectQueue = []
 		
 		this.peers = (function(f) {
@@ -162,7 +167,7 @@ class webpeerjs{
 		//listen to peer connect event
 		this.#libp2p.addEventListener("peer:connect",async (evt) => {
 			
-			const connection = evt.detail;
+			//const connection = evt.detail;
 			const id = evt.detail.toString()
 			
 			//console.log('peer:connect '+id,evt)
@@ -209,7 +214,7 @@ class webpeerjs{
 					const metadata = {addrs:address,last:now}
 					this.#connectedPeers.set(id,metadata)
 				}
-				else{
+				else if(this.#lastTimeReceiveData < 10*1000){
 					//add to connected webpeers
 					this.#onConnectFnUpdate(id)
 					const now = new Date().getTime()
@@ -240,6 +245,10 @@ class webpeerjs{
 				
 					try{
 						
+						if(topic === config.CONFIG_PUPSUB_PEER_DATA || config.CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER.includes(topic) || config.CONFIG_RUN_ON_TRANSIENT_CONNECTION){
+							this.#lastTimeReceiveData = new Date().getTime()
+						}
+						
 						//track last connect to webpeer network
 						if(config.CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER.includes(topic)){
 							const now = new Date().getTime()
@@ -262,7 +271,7 @@ class webpeerjs{
 								const metadata = {addrs:address,last:now}
 								this.#connectedPeers.set(senderPeerId,metadata)
 							}
-							else{
+							else if(this.#lastTimeReceiveData < 10*1000){
 								//add to connected webpeers
 								this.#onConnectFnUpdate(senderPeerId)
 								const address = this.#webPeersAddrs.get(senderPeerId)
@@ -339,18 +348,29 @@ class webpeerjs{
 						//detect special webpeer identity
 						if(prefix === config.CONFIG_PREFIX){
 
+							this.#lastTimeReceiveData = new Date().getTime()
+							
 							//add to webpeers id
 							if(!this.#webPeersId.includes(id))this.#webPeersId.push(id)
 							
 							//add to connected webpeers
 							if(!this.#connectedPeers.has(id)){
 								this.#onConnectFnUpdate(id)
-								address = []
 								const now = new Date().getTime()
 								const metadata = {addrs:address,last:now}
 								this.#connectedPeers.set(id,metadata)
-								this.#webPeersAddrs.set(id,address)
+								if(address){
+									if(address.length > 0){
+										this.#webPeersAddrs.set(id,address)
+									}
+								}
 								this.#updatePeers()
+							}else{
+								if(address){
+									if(address.length > 0){
+										this.#webPeersAddrs.set(id,address)
+									}
+								}								
 							}
 
 							
@@ -565,15 +585,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()
 		})
@@ -652,7 +673,8 @@ class webpeerjs{
 
 		onMetrics((data)=>{
 			const signal = metrics(data)
-			this.#isDialEnabled = signal
+			this.#isDialEnabled = signal.isDialEnabled
+			onDialFn(signal.isAutoDialEnabled)
 			
 		})
 		
@@ -672,6 +694,7 @@ class webpeerjs{
 		setInterval(()=>{
 			this.#peerDiscoveryHybrid()
 			this.#trackHybridPeersConnection()
+			this.#trackWebpeerConnection()
 		},10e3)
 		
 
@@ -792,6 +815,7 @@ class webpeerjs{
 	PRIVATE FUNCTION
 	*/
 	
+	//track hybrid peer connection and try to dial if not connected at least 1
 	#trackHybridPeersConnection(){
 		let isConnectedToHybridPeers = false
 		for(const id of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
@@ -811,6 +835,24 @@ class webpeerjs{
 		}
 	}
 	
+	//track webpeer connection and try to dial if not connected to network using saved webpeer address
+	#trackWebpeerConnection(){
+		if(this.status === 'connected')return
+		if(this.#webPeersAddrs.size < 1)return
+		
+		const keys = Array.from(this.#webPeersAddrs.keys())
+		const randomKey = Math.floor(Math.random() * keys.length)
+		const key = keys[randomKey]
+		const addrs = this.#webPeersAddrs.get(key)
+		
+		let mddrs = []
+		for(const addr of addrs){
+			const mddr = multiaddr(addr)
+			mddrs.push(mddr)
+		}
+		this.#dialMultiaddress(mddrs)
+	}
+	
 	//prevent double on connect event
 	#onConnectFnUpdate(id){
 		if(!this.#onConnectQueue.includes(id)){
@@ -842,7 +884,7 @@ class webpeerjs{
 	
 	async #registerProtocol(){
 		
-		const handler = async ({ connection, stream, protocol }) => {
+		const handler = async ({ connection, stream }) => {
 			try{
 				const output = await pipe(
 					stream.source,
@@ -923,7 +965,7 @@ class webpeerjs{
 				)
 			}
 			catch(err){
-				//console.warn(err)
+				mkDebug(err)
 			}
 		}
 
@@ -934,14 +976,14 @@ class webpeerjs{
 		})
 
 		await this.#libp2p.register(config.CONFIG_PROTOCOL, {
-		  onConnect: (peer, connection) => {
-			// handle connect
+		  /*onConnect: (peer, connection) => {
+			//handle connect
 			//console.log('handle connect',peer)
 		  },
 		  onDisconnect: (peer, connection) => {
-			// handle disconnect
+			//handle disconnect
 			//console.log('handle disconnect',peer)
-		  }
+		  }*/
 		})
 
 	}
@@ -1032,7 +1074,7 @@ class webpeerjs{
 			}
 		}
 		catch(err){
-			//console.warn(err)
+			mkDebug(err)
 		}
 	}
 	
@@ -1074,7 +1116,7 @@ class webpeerjs{
 	
 	//check the last seen in web peer
 	#trackLastSeen(){
-		const timeout = 25*1000
+		const timeout = 10*1000
 		const forcetimeout = 60*1000
 		const now = new Date().getTime()
 		
@@ -1620,7 +1662,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
 
@@ -1640,6 +1682,7 @@ class webpeerjs{
 			
 			this.#dialedKnownBootstrap.set(id,addrs)
 			this.#isDialWebsocket = true
+			this.#onWebsocketFn(true)
 			if(!this.#isConnected(id)){
 				this.#dialMultiaddress(mddrs)
 			}
@@ -1649,7 +1692,7 @@ class webpeerjs{
 	
 	//dial based on known bootstrap DNS
 	async #dialKnownDNS(){
-
+		//console.log('#dialKnownDNS()')
 		if(!navigator.onLine)return
 		if(!this.#isDialEnabled)return
 
@@ -1682,6 +1725,7 @@ class webpeerjs{
 			
 			this.#dialedKnownBootstrap.set(id,addrs)
 			this.#isDialWebsocket = true
+			this.#onWebsocketFn(true)
 			if(!this.#isConnected(id)){
 				this.#dialMultiaddress(mddrs)
 			}
@@ -1692,7 +1736,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
 
@@ -1729,6 +1773,7 @@ class webpeerjs{
 		
 		
 		this.#isDialWebsocket = true
+		this.#onWebsocketFn(true)
 		this.#dialedKnownBootstrap.set(id,addrs)
 		
 		this.#dialedKnownBootstrap.set(id,addrs)
@@ -1796,6 +1841,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 = []
 		
@@ -1892,12 +1952,13 @@ class webpeerjs{
 			};
 
 			pc.onicecandidateerror = (e) => {
-				//console.error(e);
+				console.debug(e);
 			};
 
 			pc.createDataChannel('webpeerjs');
 			pc.createOffer().then(offer => pc.setLocalDescription(offer));
 		})
+		//console.log(ice)
 		
 		//create libp2p instance
 		const libp2p = await createLibp2p({
@@ -1943,29 +2004,31 @@ 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: [
 				pubsubPeerDiscovery({
-					interval: 10_000,
+					interval: 5_000,
 					topics: config.CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER,
 					listenOnly: false,
 				}),
@@ -2006,7 +2069,7 @@ class webpeerjs{
 		
 		
 		//return webpeerjs class
-		return new webpeerjs(libp2p,dbstore,onMetrics)
+		return new webpeerjs(libp2p,dbstore,onMetrics,onWebsocketFn,onDialFn)
 	}
 }