webpeerjs 0.0.4 → 0.0.6

package/src/webpeerjs.js

@@ -4,11 +4,14 @@ import {
 	PBPeer,
 	uint8ArrayToString,
 	uint8ArrayFromString,
-	//first,
+	first,
 	Key,
 	msgIdFnStrictNoSign,
-	metrics } from './utils'
-//import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client'
+	metrics,
+	getDigest,
+	mkDebug
+} from './utils'
+import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client'
 import { createLibp2p } from 'libp2p'
 import { IDBDatastore } from 'datastore-idb'
 import { webTransport } from '@libp2p/webtransport'
@@ -19,7 +22,7 @@ import { circuitRelayTransport } from '@libp2p/circuit-relay-v2'
 import { gossipsub } from '@chainsafe/libp2p-gossipsub'
 import { identify, identifyPush } from '@libp2p/identify'
 import { multiaddr } from '@multiformats/multiaddr'
-//import { peerIdFromString } from '@libp2p/peer-id'
+import { peerIdFromString } from '@libp2p/peer-id'
 import { kadDHT, removePrivateAddressesMapper } from '@libp2p/kad-dht'
 import { simpleMetrics } from '@libp2p/simple-metrics'
 
@@ -78,6 +81,9 @@ class webpeerjs{
 	//is dial enabled
 	#isDialEnabled
 	
+	//message tracker avoid double
+	#msgIdtracker
+	
 	id
 	status
 	IPFS
@@ -105,6 +111,7 @@ class webpeerjs{
 		this.#trackDisconnect = new Map()
 		this.#dialQueue = []
 		this.#isDialEnabled = true
+		this.#msgIdtracker = []
 		
 		this.peers = (function(f) {
 			return f
@@ -123,7 +130,7 @@ class webpeerjs{
 		
 		
 		//listen to peer connect event
-		this.#libp2p.addEventListener("peer:connect", (evt) => {
+		this.#libp2p.addEventListener("peer:connect",async (evt) => {
 			
 			//console.log(`Connected to ${connection.toString()}`);
 			
@@ -133,12 +140,22 @@ class webpeerjs{
 			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(()=>{
+						this.#announce()
+					},5000)
 				},1000)
 			}
 			
@@ -150,6 +167,7 @@ class webpeerjs{
 			
 			//console.log('on:'+event.detail.topic,event.detail.data)
 			//console.log('from '+event.detail.from.toString(),event)
+			//console.log('ontopic:'+event.detail.topic)
 			
 			if (event.detail.type !== 'signed') {
 			  return
@@ -177,6 +195,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
@@ -219,6 +242,7 @@ class webpeerjs{
 						const room = json.room
 						const rooms = json.rooms
 						const message = json.message
+						const msgId = json.msgId
 						const signal = json.signal
 						const id = json.id
 						//console.log(`from ${id}:${signal} = ${message}`)
@@ -250,16 +274,21 @@ class webpeerjs{
 							if(room){
 								if(this.#rooms[room]){
 									
-									//inbound message
-									if(message){
-										this.#rooms[room].onMessage(message,id)
-									}
-									
 									//update room members
 									if(!this.#rooms[room].members.includes(id)){
 										this.#rooms[room].members.push(id)
 										this.#rooms[room].onMembers(this.#rooms[room].members)
 									}
+
+									//inbound message
+									if(message){
+										const msgID = msgId+id
+										if(!this.#msgIdtracker.includes(msgID)){
+											this.#msgIdtracker.push(msgID)
+											this.#rooms[room].onMessage(message,id)
+										}
+									}
+									
 								}
 							}
 							
@@ -301,7 +330,7 @@ class webpeerjs{
 
 					}catch(err){
 						//console.log('from '+event.detail.from.toString())
-						console.debug(err)
+						mkDebug(err)
 					}
 				}else{
 					const json = JSON.parse(topic)
@@ -452,6 +481,7 @@ class webpeerjs{
 		
 		//dial random discovered peers
 		//this.#dialdiscoveredpeers()
+		
 
 		onMetrics((data)=>{
 			const signal = metrics(data)
@@ -459,14 +489,39 @@ class webpeerjs{
 			
 		})
 		
-		setInterval(()=>{
+		setTimeout(()=>{
 			this.#dialQueueList()
-		},5e3)
+			setInterval(()=>{
+				this.#dialQueueList()
+			},5e3)
+		},10e3)
+		
+
 		
 		setInterval(()=>{
 			this.#trackLastSeen()
 		},5e3)
 		
+
+		/*setTimeout(async()=>{
+			try{
+				//console.log('getClosestPeers')
+				const digest = await getDigest()
+				//console.log('digest',digest)
+				for await (const event of this.#libp2p.services.aminoDHT.getClosestPeers(digest)){
+					if (event.name === 'FINAL_PEER'){
+						//event.peer.multiaddrs.forEach((ma) => {
+							//console.log(event.peer.id.toString(),ma.toString())
+						//})
+						//console.log(event.peer.id.toString(),event.peer.multiaddrs.toString())
+					}
+				}
+			}
+			catch(err){
+				console.error('query error', err)
+			}
+		},60e3)*/
+		
 	}
 
 
@@ -492,6 +547,39 @@ class webpeerjs{
 	PRIVATE FUNCTION
 	*/
 	
+	#findHybridPeer(){
+		setTimeout(async()=>{
+			for(const target of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
+				if(!this.#isConnected(target)){
+					//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)
+							}
+						}
+					}
+				}
+			}
+		},30e3)
+	}
+	
 	
 	//check the last seen in web peer
 	#trackLastSeen(){
@@ -553,7 +641,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{
@@ -655,7 +743,8 @@ class webpeerjs{
 				onMessage : () => {},
 				listenMessage : f => (this.#rooms[room] = {...this.#rooms[room], onMessage: f}),
 				sendMessage : async (message) => {
-					const data = JSON.stringify({prefix:config.CONFIG_PREFIX,room,message,id:this.#libp2p.peerId.toString()})
+					const msgId = (new Date()).getTime()
+					const data = JSON.stringify({prefix:config.CONFIG_PREFIX,room,message,id:this.#libp2p.peerId.toString(),msgId})
 					const peer = {
 					  publicKey: this.#libp2p.peerId.publicKey,
 					  addrs: [uint8ArrayFromString(data)],
@@ -704,13 +793,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
@@ -737,14 +828,16 @@ class webpeerjs{
 					else{
 						const bootstrap = config.CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS
 						const index = bootstrap.findIndex((peer)=>peer.Peers[0].ID == id)
-						const addrs = bootstrap[index].Peers[0].Addrs
-						let mddrs = []
-						for(const addr of addrs){
-							const peeraddr = addr+'/p2p/'+id
-							const mddr = multiaddr(peeraddr)
-							mddrs.push(mddr)
+						if(index > -1){
+							const addrs = bootstrap[index].Peers[0].Addrs
+							let mddrs = []
+							for(const addr of addrs){
+								const peeraddr = addr+'/p2p/'+id
+								const mddr = multiaddr(peeraddr)
+								mddrs.push(mddr)
+							}
+							this.#dialMultiaddress(mddrs)
 						}
-						this.#dialMultiaddress(mddrs)
 					}
 				}
 			}
@@ -775,7 +868,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)
@@ -844,7 +937,7 @@ class webpeerjs{
 				}
 			}
 			
-		},30*1000)
+		},15*1000)
 	}
 
 	
@@ -866,28 +959,33 @@ class webpeerjs{
 	
 	//dial to all known bootstrap peers and DNS
 	#dialKnownPeers(){
-		this.#dialKnownBootstrap()
+		//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)
+			this.#dialSavedKnownID()
+			this.#findHybridPeer()
+			setTimeout(()=>{this.#dialUpdateSavedKnownID()},60000)
+			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)
 	}
 	
 	
@@ -914,12 +1012,80 @@ 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)){
+				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(){
+	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)))),
 		)
@@ -941,7 +1107,7 @@ class webpeerjs{
 				this.#dialMultiaddress(mddrs)
 			}
 		}
-	}*/
+	}
 	
 	
 	//dial based on known bootstrap DNS
@@ -1037,7 +1203,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)
 				}
 			  }
 	}
@@ -1059,7 +1225,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)
 				}
 			  }
 	}
@@ -1069,7 +1235,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()
@@ -1113,7 +1279,7 @@ class webpeerjs{
 				autoDialConcurrency:0,
 				autoDialMaxQueueLength:0,
 				autoDialPriority:1000,
-				autoDialDiscoveredPeersDebounce:30e3,
+				autoDialDiscoveredPeersDebounce:60e3,
 				maxParallelDials: 3,
 				dialTimeout: 5e3,
 				maxIncomingPendingConnections: 5,
@@ -1125,8 +1291,8 @@ class webpeerjs{
 			connectionEncryption: [noise()],
 			streamMuxers: [
 				yamux({
-					maxInboundStreams: 50,
-					maxOutboundStreams: 50,
+					maxInboundStreams: 20,
+					maxOutboundStreams: 20,
 				})
 			],
 			connectionGater: {
@@ -1164,6 +1330,7 @@ class webpeerjs{
 					allowPublishToZeroTopicPeers: true,
 					msgIdFn: msgIdFnStrictNoSign,
 					ignoreDuplicatePublishError: true,
+					runOnTransientConnection:true,
 				}),
 				identify: identify(),
 				identifyPush: identifyPush(),