webpeerjs 0.0.5 → 0.0.7

package/src/utils.js

@@ -12,6 +12,10 @@ const prefix = config.CONFIG_PREFIX
 
 export const mkErr = msg => new Error(`${prefix}: ${msg}`)
 
+export function mkDebug(error){
+	return
+}
+
 export {PBPeer}
 
 export function uint8ArrayToString(uint8Array){
@@ -82,6 +86,7 @@ let lastStats = {
 
 let isDialEnabled = true
 let lastfailtreshold = 0
+let fail = 0
 
 export function metrics(data){
 	try{
@@ -134,29 +139,29 @@ export function metrics(data){
 		
 		lastStats = webTransportEvents
 		
-		const fail = errors+timeouts
+		fail = errors+timeouts
 		const treshold = errors+timeouts+stats.open+stats.pending
 		
-		if(treshold>60){
+		if(treshold>40){
 			//console.log(`Treeshold hit : ${treshold}`)
 		}
 		
-		if(fail>60){
+		if(fail>40){
 			//console.log(`Open : ${stats.open} , Pending : ${stats.pending} , Succes : ${totals.success} , Fail : ${fail} `)
 
 		}
 		
-		if ((fail-lastfailtreshold)>30){
+		if ((fail-lastfailtreshold)>40){
 			if(isDialEnabled){
 				isDialEnabled = false
 				const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold})
-				console.warn(str)
+				console.warn('dial disabled')
 				setTimeout(()=>{
 					if(!isDialEnabled){
 						isDialEnabled = true
 						lastfailtreshold = fail
 						const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold})
-						console.warn(str)
+						console.warn('dial enabled')
 					}
 				},6*60*1000)
 			}

package/src/webpeerjs.js

@@ -8,7 +8,8 @@ import {
 	Key,
 	msgIdFnStrictNoSign,
 	metrics,
-	getDigest
+	getDigest,
+	mkDebug
 } from './utils'
 import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client'
 import { createLibp2p } from 'libp2p'
@@ -129,20 +130,27 @@ class webpeerjs{
 		
 		
 		//listen to peer connect event
-		this.#libp2p.addEventListener("peer:connect", (evt) => {
-			
-			//console.log(`Connected to ${connection.toString()}`);
+		this.#libp2p.addEventListener("peer:connect",async (evt) => {
 			
 			const connection = evt.detail;
 			const id = evt.detail.toString()
 			
+			//console.log('peer:connect '+id,evt)
+			
 			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
+
+			if(config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) || config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
+				if(!this.#connections.has(id)&&addr.includes('webtransport')){
+					await this.#dbstore.put(new Key(id), new TextEncoder().encode(addr))
+				}
+			}
+
 			this.#connections.set(id,addr)
 			
 			//required by joinRoom version 1 to announce via universal connectivity
-			if(connection.toString() === config.CONFIG_KNOWN_BOOTSTRAP_PEER_IDS[0]){
+			if(config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
 				setTimeout(()=>{
 					this.#announce()
 					setTimeout(()=>{
@@ -151,6 +159,31 @@ class webpeerjs{
 				},1000)
 			}
 			
+			if(this.#webPeersId.includes(id)){
+				
+				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)
+				}
+				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.#connectedPeersArr.length = 0
+					for(const peer of this.#connectedPeers){	
+						const item = {id:peer[0],address:peer[1].addrs}
+						this.#connectedPeersArr.push(item)
+					}
+				}
+
+			}
+			
 		});
 
 
@@ -187,6 +220,11 @@ class webpeerjs{
 								const now = new Date().getTime()
 								const metadata = {addrs:address,last:now}
 								this.#connectedPeers.set(senderPeerId,metadata)
+								this.#connectedPeersArr.length = 0
+								for(const peer of this.#connectedPeers){	
+									const item = {id:peer[0],address:peer[1].addrs}
+									this.#connectedPeersArr.push(item)
+								}
 							}
 
 							//dial if not connected
@@ -302,7 +340,7 @@ class webpeerjs{
 								}
 								
 								//update connected webpeers
-								const now = new Date().getTime()
+								/*const now = new Date().getTime()
 								const metadata = {addrs:address,last:now}
 								this.#connectedPeers.set(id,metadata)
 								this.#webPeersAddrs.set(id,address)
@@ -310,14 +348,14 @@ class webpeerjs{
 								for(const peer of this.#connectedPeers){	
 									const item = {id:peer[0],address:peer[1].addrs}
 									this.#connectedPeersArr.push(item)
-								}
+								}*/
 									
 							}
 						}
 
 					}catch(err){
 						//console.log('from '+event.detail.from.toString())
-						console.debug(err)
+						mkDebug(err)
 					}
 				}else{
 					const json = JSON.parse(topic)
@@ -368,7 +406,7 @@ class webpeerjs{
 							const mddr = multiaddr(addr)
 							mddrs.push(mddr)
 						}
-						//this.#dialMultiaddress(mddrs)
+						this.#dialMultiaddress(mddrs)
 					}
 				}
 			}
@@ -432,7 +470,7 @@ class webpeerjs{
 				let mddrs = []
 				const addrs = multiaddr(addr)
 				mddrs.push(addrs)
-				this.#dialMultiaddress(mddrs)
+				//this.#dialMultiaddress(mddrs)
 			}
 		});
 		
@@ -454,6 +492,45 @@ class webpeerjs{
 			this.#ping()
 		})
 		
+		this.#libp2p.addEventListener('peer:identify', (evt) => {
+			//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+			if(evt.detail.protocols.includes(config.CONFIG_PROTOCOL)){
+				//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+				
+				const id = evt.detail.peerId.toString()
+				let address = []
+				
+				for(const addrs of evt.detail.listenAddrs){
+					const addr = addrs.toString()+'/p2p/'+id
+					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.#connectedPeersArr.length = 0
+					for(const peer of this.#connectedPeers){	
+						const item = {id:peer[0],address:peer[1].addrs}
+						this.#connectedPeersArr.push(item)
+					}
+				}
+
+			}
+		})
+		
 		//dial known peers from configuration
 		this.#dialKnownPeers()
 	
@@ -468,6 +545,9 @@ class webpeerjs{
 		
 		//dial random discovered peers
 		//this.#dialdiscoveredpeers()
+		
+		this.#registerProtocol()
+		
 
 		onMetrics((data)=>{
 			const signal = metrics(data)
@@ -487,16 +567,7 @@ class webpeerjs{
 		setInterval(()=>{
 			this.#trackLastSeen()
 		},5e3)
-
-		setInterval(async()=>{
-			/*const peerId = peerIdFromString('QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN')
-			//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(event)
-			}*/
-		},5e3)
+		
 
 		/*setTimeout(async()=>{
 			try{
@@ -517,6 +588,14 @@ class webpeerjs{
 			}
 		},60e3)*/
 		
+		/*setTimeout(async()=>{
+			const key = uint8ArrayFromString(config.CONFIG_PREFIX)
+			const value = uint8ArrayFromString(this.id)
+			for await (const event of this.#libp2p.services.aminoDHT.put(key,value)){
+				console.log('put',event)
+			}
+		},30e3)*/
+		
 	}
 
 
@@ -542,6 +621,62 @@ class webpeerjs{
 	PRIVATE FUNCTION
 	*/
 	
+	async #registerProtocol(){
+		const handler = ({ connection, stream, protocol }) => {
+		  // use stream or connection according to the needs
+		}
+
+		await this.#libp2p.handle(config.CONFIG_PROTOCOL, handler, {
+		  maxInboundStreams: 5,
+		  maxOutboundStreams: 5
+		})
+
+		await this.#libp2p.register(config.CONFIG_PROTOCOL, {
+		  onConnect: (peer, connection) => {
+			// handle connect
+			//console.log('handle connect',peer)
+		  },
+		  onDisconnect: (peer, connection) => {
+			// handle disconnect
+			//console.log('handle disconnect',peer)
+		  }
+		})
+
+	}
+	
+	#findHybridPeer(){
+		setTimeout(async()=>{
+			for(const target of config.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)
+							}
+						}
+					}
+				}
+			}
+		},60e3)
+	}
+	
 	
 	//check the last seen in web peer
 	#trackLastSeen(){
@@ -603,7 +738,7 @@ class webpeerjs{
 				return
 			}
 			
-			if(this.#webPeersId.includes(id) || id == config.CONFIG_KNOWN_BOOTSTRAP_PEER_IDS[0] ){
+			if(this.#webPeersId.includes(id) || config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) || config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
 				this.#dialQueue.unshift(mddrs)
 			}
 			else{
@@ -618,7 +753,7 @@ class webpeerjs{
 		
 		if(!this.#isDialEnabled)return
 		
-		const mddrsToDial = 3
+		const mddrsToDial = 5
 		
 		let queue = []
 		for(const item of this.#libp2p.getDialQueue()){
@@ -636,6 +771,8 @@ class webpeerjs{
 				
 				if(this.#isConnected(id))continue
 				if(queue.includes(id)){continue;}
+				
+				//console.log('dial',id)
 
 				//dial with webtransport
 				this.#dialWebtransport(mddrs)
@@ -718,7 +855,7 @@ class webpeerjs{
 				},
 				members : [this.id],
 				onMembers : () => {},
-				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members)},
+				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);this.#ping()},
 			}
 		}
 		
@@ -755,13 +892,15 @@ class webpeerjs{
 	#dialRandomBootstrap(){
 		setInterval(()=>{
 			//const keys = Array.from(this.#dialedKnownBootstrap.keys())
-			const keys = config.CONFIG_KNOWN_BOOTSTRAP_PEER_IDS
+			const keys = config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS
 			const randomKey = Math.floor(Math.random() * keys.length)
 			let ids = []
 			ids.push(keys[randomKey])
 			
 			//universal connectivity id for webpeer discovery and joinRoom version 1 to work
-			ids.push(config.CONFIG_KNOWN_BOOTSTRAP_PEER_IDS[0])
+			for(const id of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
+				ids.push(id)
+			}
 			
 			for(const id of ids){
 				if(id == undefined)continue
@@ -828,7 +967,7 @@ class webpeerjs{
 				if(besttime>bestlimit){
 					const addr = remote.toString()
 					const id = peer.toString()
-					if(!this.#webPeersId.includes(id) && !config.CONFIG_KNOWN_BOOTSTRAP_PEER_IDS.includes(id) && !this.#dbstoreData.get(id) && !addr.includes('p2p-circuit')){
+					if(!this.#webPeersId.includes(id) && !config.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))
 						await this.#dbstore.put(new Key(id), new TextEncoder().encode(addr))
 						this.#dbstoreData.set(id,addr)
@@ -897,7 +1036,7 @@ class webpeerjs{
 				}
 			}
 			
-		},30*1000)
+		},15*1000)
 	}
 
 	
@@ -920,27 +1059,32 @@ class webpeerjs{
 	//dial to all known bootstrap peers and DNS
 	#dialKnownPeers(){
 		//this.#dialKnownBootstrap()
-		//setTimeout(()=>{
-			//const peers = this.#libp2p.getPeers().length
-			//if(peers == 0){
-				//currently not needed
-				this.#dialKnownID()
-				setTimeout(()=>{
-					const peers = this.#libp2p.getPeers().length
-					if(peers == 0){
-						//currently not needed
-						//this.#dialKnownDNS()
-						setTimeout(()=>{
-							const peers = this.#libp2p.getPeers().length
-							if(peers == 0){
-								//currently not needed
-								//this.#dialKnownDNSonly()
-							}
-						},15000)
-					}
-				},15000)
-			//}
-		//},15000)
+		setTimeout(()=>{
+			this.#dialSavedKnownID()
+			this.#findHybridPeer()
+			setTimeout(()=>{this.#dialUpdateSavedKnownID()},50000)
+			setTimeout(()=>{
+				const peers = this.#libp2p.getPeers().length
+				if(peers == 0){
+					this.#dialKnownID()
+					this.#findHybridPeer()
+					setTimeout(()=>{
+						const peers = this.#libp2p.getPeers().length
+						if(peers == 0){
+							//currently not needed
+							//this.#dialKnownDNS()
+							setTimeout(()=>{
+								const peers = this.#libp2p.getPeers().length
+								if(peers == 0){
+									//currently not needed
+									//this.#dialKnownDNSonly()
+								}
+							},15000)
+						}
+					},15000)
+				}
+			},15000)
+		},5000)
 	}
 	
 	
@@ -967,12 +1111,81 @@ class webpeerjs{
 		}
 	}
 	
+	async #dialSavedKnownID(){
+		let firsttime = true
+		for(const target of config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
+			if(this.#dbstoreData.has(target)){
+				firsttime = false
+				let mddrs = []
+				let addrs = []
+				const id = target
+				const peeraddr = this.#dbstoreData.get(target)
+				const peermddr = multiaddr(peeraddr)
+				addrs.push(peeraddr)
+				mddrs.push(peermddr)
+				this.#dialedKnownBootstrap.set(id,addrs)
+				if(!this.#isConnected(id)){
+					this.#dialMultiaddress(mddrs)
+				}
+			}
+		}
+		if(firsttime){
+			for(const target of config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
+				const api = config.CONFIG_DELEGATED_API
+				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)
+				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)))
+				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)
+				}
+				
+				this.#dialedKnownBootstrap.set(id,addrs)
+				if(!this.#isConnected(id)){
+					this.#dialMultiaddress(mddrs)
+				}	
+			}
+		}
+	}
+	
+	async #dialUpdateSavedKnownID(){
+		for(const target of config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
+			if(!this.#connections.has(target) && this.#isDialEnabled && this.#dbstoreData.has(target)){
+				//console.log('#dialUpdateSavedKnownID()',target)
+				const api = config.CONFIG_DELEGATED_API
+				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)
+				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)))
+				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)
+				}
+				
+				this.#dialedKnownBootstrap.set(id,addrs)
+				if(!this.#isConnected(id)){
+					this.#dialMultiaddress(mddrs)
+				}	
+			}
+		}
+	}
+	
 	
 	//dial based on known peers ID
 	async #dialKnownID(){
+		//console.log('#dialKnownID()')
 		const api = config.CONFIG_DELEGATED_API
 		const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)
-		const BOOTSTRAP_PEER_IDS = config.CONFIG_KNOWN_BOOTSTRAP_PEER_IDS
+		const BOOTSTRAP_PEER_IDS = config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS
 		const peers = await Promise.all(
 			BOOTSTRAP_PEER_IDS.map((peerId) => first(delegatedClient.getPeers(peerIdFromString(peerId)))),
 		)
@@ -1090,7 +1303,7 @@ class webpeerjs{
 				  return // if we succeed dialing the peer, no need to try another address
 				} catch (error) {
 				  //console.log(`failed to dial webtransport multiaddr: %o`, addr.toString())
-				  console.debug(error)
+				  mkDebug(error)
 				}
 			  }
 	}
@@ -1112,7 +1325,7 @@ class webpeerjs{
 				  return // if we succeed dialing the peer, no need to try another address
 				} catch (error) {
 				  //console.log(`failed to dial websocket multiaddr: %o`, addr)
-				  console.debug(error)
+				  mkDebug(error)
 				}
 			  }
 	}
@@ -1122,7 +1335,7 @@ class webpeerjs{
 	static async createWebpeer(){
 
 		// all libp2p debug logs
-		localStorage.setItem('debug', 'libp2p:*')
+		//localStorage.setItem('debug', 'libp2p:*')
 		
 		const dbstore = new IDBDatastore(config.CONFIG_DBSTORE_PATH)
 		await dbstore.open()