webpeerjs 0.0.8 → 0.0.9

package/src/webpeerjs.js

@@ -9,7 +9,12 @@ import {
 	msgIdFnStrictNoSign,
 	metrics,
 	getDigest,
-	mkDebug
+	mkDebug,
+	multiaddr,
+	pipe,
+	lpStream,
+	lp,
+	map
 } from './utils'
 import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client'
 import { createLibp2p } from 'libp2p'
@@ -21,7 +26,6 @@ import { pubsubPeerDiscovery } from '@libp2p/pubsub-peer-discovery'
 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 { kadDHT, removePrivateAddressesMapper } from '@libp2p/kad-dht'
 import { simpleMetrics } from '@libp2p/simple-metrics'
@@ -84,6 +88,9 @@ class webpeerjs{
 	//message tracker avoid double
 	#msgIdtracker
 	
+	//map of peer exchange data
+	#peerexchangedata
+	
 	id
 	status
 	IPFS
@@ -112,6 +119,7 @@ class webpeerjs{
 		this.#dialQueue = []
 		this.#isDialEnabled = true
 		this.#msgIdtracker = []
+		this.#peerexchangedata = new Map()
 		
 		this.peers = (function(f) {
 			return f
@@ -143,7 +151,7 @@ class webpeerjs{
 			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(config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id)){
 				if(!this.#connections.has(id)&&addr.includes('webtransport')){
 					await this.#dbstore.put(new Key(id), new TextEncoder().encode(addr))
 				}
@@ -410,9 +418,8 @@ class webpeerjs{
 				count++
 				this.#trackDisconnect.set(id,count)
 				//console.log(this.#trackDisconnect)
-				if(count>5){
+				if(count>10){
 					if(this.#dbstoreData.has(id)){
-						//await this.#dbstore.delete(new Key(id))
 						this.#dbstoreData.delete(id)
 					}
 					
@@ -425,6 +432,11 @@ class webpeerjs{
 				this.#trackDisconnect.set(id,0)
 			}
 			
+			let peerexchangelist = []
+			for(const peer of this.#peerexchangedata.values()){
+				peerexchangelist.push(peer.id)
+			}
+			
 			//if this disconnected peer is web peer redial it
 			if(this.#webPeersId.includes(id)){
 				const addr = this.#connections.get(id)
@@ -442,6 +454,14 @@ class webpeerjs{
 				mddrs.push(addrs)
 				this.#dialMultiaddress(mddrs)
 			}
+
+			else if(peerexchangelist.includes(id)){
+				const addr = this.#connections.get(id)
+				let mddrs = []
+				const addrs = multiaddr(addr)
+				mddrs.push(addrs)
+				this.#dialMultiaddress(mddrs)
+			}
 			
 			//redial if this disconnected peer is regular peer
 			else{
@@ -474,34 +494,32 @@ class webpeerjs{
 		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)
+				//console.log('peer:identify '+evt.detail.peerId.toString(),evt)
 				
 				const id = evt.detail.peerId.toString()
 				let address = []
+				let mddrs = []
 				
 				for(const addrs of evt.detail.listenAddrs){
 					const addr = addrs.toString()+'/p2p/'+id
+					const mddr = multiaddr(addr)
 					if(addr.includes('webtransport')){
 						address.push(addr)
+						mddrs.push(mddr)
 					}
 				}
 				
-				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.#updatePeers()
-				}
+				
+				
+				const command = 'peer-exchange'
+				this.#dialProtocol(id,command)
+				
 
 			}
 		})
@@ -582,14 +600,67 @@ class webpeerjs{
 
 	//Listen on new peer connection
 	#onConnectFn = () => {}
-	onJoin = f => (this.#onConnectFn = f)
+	onConnect = f => (this.#onConnectFn = f)
 
 
 	//Listen on peer disconnect
 	#onDisconnectFn = () => {}
-	onLeave = f => (this.#onDisconnectFn = f)	
+	onDisconnect = f => (this.#onDisconnectFn = f)	
 
+	joinRoom = room => {
+		if (this.#rooms[room]) {
+			return [
+				this.#rooms[room].sendMessage,
+				this.#rooms[room].listenMessage,
+				this.#rooms[room].onMembersChange
+			]
+			
 
+		}
+
+		if (!room) {
+			throw mkErr('room is required')
+		}
+		
+		//join room version 1 user pupsub via pupsub peer discovery
+		if(config.CONFIG_JOIN_ROOM_VERSION == 1){
+
+			const topics = config.CONFIG_PUBSUB_PEER_DISCOVERY
+			
+			this.#rooms[room] = {
+				onMessage : () => {},
+				listenMessage : f => (this.#rooms[room] = {...this.#rooms[room], onMessage: f}),
+				sendMessage : async (message) => {
+					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)],
+					}
+					const encodedPeer = PBPeer.encode(peer)
+					for(const topic of topics){
+						await this.#libp2p.services.pubsub.publish(topic, encodedPeer)
+					}
+				},
+				members : [this.id],
+				onMembers : () => {},
+				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);this.#ping()},
+			}
+		}
+		
+		return [
+			this.#rooms[room].sendMessage,
+			this.#rooms[room].listenMessage,
+			this.#rooms[room].onMembersChange
+		]
+	}
+	
+	dial(addr){
+		let mddrs = []
+		const mddr = multiaddr(addr)
+		mddrs.push(mddr)
+		this.#dialMultiaddress(mddrs)
+	}
 
 
 	/*
@@ -611,13 +682,96 @@ class webpeerjs{
 	}
 	
 	async #registerProtocol(){
-		const handler = ({ connection, stream, protocol }) => {
-		  // use stream or connection according to the needs
+		
+		const handler = async ({ connection, stream, protocol }) => {
+			try{
+				const output = await pipe(
+					stream.source,
+					(source) => lp.decode(source),
+					(source) => map(source, (buf) => uint8ArrayToString(buf.subarray())),
+					async function (source) {
+					  let string = ''
+					  for await (const msg of source) {
+						string += msg.toString()
+					  }
+					  return string
+					}
+				)
+				
+				const id = connection.remotePeer.toString()
+				
+				let json = JSON.parse(output)
+
+				let jsonMessage = {
+						protocol:config.CONFIG_PROTOCOL,
+						command:null,
+						data:null
+				}
+				
+				if(json.command === 'peer-exchange'){
+					
+					if(json.protocol == config.CONFIG_PROTOCOL){
+						const address = [connection.remoteAddr.toString()]
+						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{
+							if(!this.#webPeersId.includes(id))this.#webPeersId.push(id)
+								
+							//add to connected webpeers
+							this.#onConnectFn(id)
+							const now = new Date().getTime()
+							const metadata = {addrs:address,last:now}
+							this.#connectedPeers.set(id,metadata)
+							this.#updatePeers()
+						}
+					}
+					
+					if(json.data != null){
+						this.#peerexchangedata.set(id,json.data)
+						let mddrs = []
+						const dataaddr = json.data.addr
+						const datamddr = multiaddr(dataaddr)
+						const dataid = json.data.id
+						mddrs.push(datamddr)
+						this.#dialMultiaddress(mddrs)
+						if(!this.#dbstoreData.has(dataid)){
+							//await this.#dbstore.put(new Key(dataid), new TextEncoder().encode(dataaddr))
+							//this.#dbstoreData.set(dataid,dataaddr)
+						}
+					}
+					
+					const keys = Array.from(this.#dbstoreData.keys())
+					const randomKey = Math.floor(Math.random() * keys.length)
+					const key = keys[randomKey]
+					const addr = this.#dbstoreData.get(key)
+					
+					jsonMessage.command = json.command
+					jsonMessage.data = {id:key,addr}	
+				}
+				
+				const message = JSON.stringify(jsonMessage)
+				//console.log('answer message '+id,message)
+				
+				pipe(
+					message,
+					(source) => map(source, (string) => uint8ArrayFromString(string)),
+					(source) => lp.encode(source),
+					stream.sink
+				)
+			}
+			catch(err){
+				//console.warn(err)
+			}
 		}
 
 		await this.#libp2p.handle(config.CONFIG_PROTOCOL, handler, {
-		  maxInboundStreams: 5,
-		  maxOutboundStreams: 5
+		  maxInboundStreams: 50,
+		  maxOutboundStreams: 50,
+		  runOnTransientConnection:true
 		})
 
 		await this.#libp2p.register(config.CONFIG_PROTOCOL, {
@@ -633,6 +787,96 @@ class webpeerjs{
 
 	}
 	
+	async #dialProtocol(id,command){
+
+		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
+		const mddr = multiaddr(addr)
+		
+		let jsonMessage = {
+				protocol:config.CONFIG_PROTOCOL,
+				command:null,
+				data:null
+		}
+		
+		if(command === 'peer-exchange'){
+			
+			if(this.#peerexchangedata.has(id))return
+			
+			const keys = Array.from(this.#dbstoreData.keys())
+			const randomKey = Math.floor(Math.random() * keys.length)
+			const key = keys[randomKey]
+			const addr = this.#dbstoreData.get(key)
+			
+			jsonMessage.command = command
+			jsonMessage.data = {id:key,addr}
+		}
+		
+		const message = JSON.stringify(jsonMessage)		
+		//console.log('ask message '+id,message)
+
+		try{
+			
+			const stream = await this.#libp2p.dialProtocol(mddr, config.CONFIG_PROTOCOL,{runOnTransientConnection:true})
+			
+			const output = await pipe(
+				message,
+				(source) => map(source, (string) => uint8ArrayFromString(string)),
+				(source) => lp.encode(source),
+				stream,
+				(source) => lp.decode(source),
+				(source) => map(source, (buf) => uint8ArrayToString(buf.subarray())),
+				async function (source) {
+				  let string = ''
+				  for await (const msg of source) {
+					string += msg.toString()
+				  }
+				  return string
+				}
+			)
+			
+			const json = JSON.parse(output)
+			if(json.protocol == config.CONFIG_PROTOCOL){
+				const 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{
+					if(!this.#webPeersId.includes(id))this.#webPeersId.push(id)
+						
+					//add to connected webpeers
+					this.#onConnectFn(id)
+					const now = new Date().getTime()
+					const metadata = {addrs:address,last:now}
+					this.#connectedPeers.set(id,metadata)
+					this.#updatePeers()
+				}
+			}
+			if(json.command == 'peer-exchange'){
+				if(json.data != null){
+					this.#peerexchangedata.set(id,json.data)
+					let mddrs = []
+					const dataaddr = json.data.addr
+					const datamddr = multiaddr(dataaddr)
+					const dataid = json.data.id
+					mddrs.push(datamddr)
+					this.#dialMultiaddress(mddrs)
+					if(!this.#dbstoreData.has(dataid)){
+						//await this.#dbstore.put(new Key(dataid), new TextEncoder().encode(dataaddr))
+						//this.#dbstoreData.set(dataid,dataaddr)
+					}
+				}
+			}
+		}
+		catch(err){
+			//console.warn(err)
+		}
+	}
+	
 	#findHybridPeer(){
 		setTimeout(async()=>{
 			for(const target of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
@@ -719,13 +963,25 @@ class webpeerjs{
 			
 			const id = mddrs[0].toString().split('/').pop()
 			
-			const ids = this.#dialQueue.map((arr)=> arr[0].toString().split('/').pop())
+			const queueids = this.#dialQueue.map((arr)=> arr[0].toString().split('/').pop())
 			
 			//if peer id is already in the queque cancel queque
-			if(ids.includes(id)){
+			if(queueids.includes(id)){
 				return
 			}
 			
+			const webPeerCount = this.#connectedPeers.size
+			const allPeerCount = this.#libp2p.getPeers().length
+			const nodePeerCount = allPeerCount - webPeerCount
+			const limitCount = config.CONFIG_MAX_CONNECTIONS / 2
+			
+			if(this.#webPeersId.includes(id)){
+				if(webPeerCount>limitCount)return
+			}
+			else{
+				if(nodePeerCount>limitCount)return
+			}
+			
 			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)
 			}
@@ -739,7 +995,7 @@ class webpeerjs{
 	//dial multiaddr address in queue list
 	#dialQueueList(){
 		
-		if(!this.#isDialEnabled)return
+		if(!this.#isDialEnabled || !navigator.onLine)return
 		
 		const mddrsToDial = 5
 		
@@ -804,55 +1060,6 @@ class webpeerjs{
 				await this.#libp2p.services.pubsub.publish(topic, encodedPeer)
 			}
 	}
-
-	
-	joinRoom = room => {
-		if (this.#rooms[room]) {
-			return [
-				this.#rooms[room].sendMessage,
-				this.#rooms[room].listenMessage,
-				this.#rooms[room].onMembersChange
-			]
-			
-
-		}
-
-		if (!room) {
-			throw mkErr('room is required')
-		}
-		
-		//join room version 1 user pupsub via pupsub peer discovery
-		if(config.CONFIG_JOIN_ROOM_VERSION == 1){
-
-			const topics = config.CONFIG_PUBSUB_PEER_DISCOVERY
-			
-			this.#rooms[room] = {
-				onMessage : () => {},
-				listenMessage : f => (this.#rooms[room] = {...this.#rooms[room], onMessage: f}),
-				sendMessage : async (message) => {
-					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)],
-					}
-					const encodedPeer = PBPeer.encode(peer)
-					for(const topic of topics){
-						await this.#libp2p.services.pubsub.publish(topic, encodedPeer)
-					}
-				},
-				members : [this.id],
-				onMembers : () => {},
-				onMembersChange : f => {this.#rooms[room] = {...this.#rooms[room], onMembers: f};this.#rooms[room].onMembers(this.#rooms[room].members);this.#ping()},
-			}
-		}
-		
-		return [
-			this.#rooms[room].sendMessage,
-			this.#rooms[room].listenMessage,
-			this.#rooms[room].onMembersChange
-		]
-	}
 	
 	
 	//dial discovered peers
@@ -955,8 +1162,7 @@ class webpeerjs{
 				if(besttime>bestlimit){
 					const addr = remote.toString()
 					const id = peer.toString()
-					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))
+					if(!this.#webPeersId.includes(id) && !config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) && !this.#dbstoreData.has(id) && !addr.includes('p2p-circuit') && addr.includes('webtransport')){
 						await this.#dbstore.put(new Key(id), new TextEncoder().encode(addr))
 						this.#dbstoreData.set(id,addr)
 					}
@@ -971,26 +1177,31 @@ class webpeerjs{
 			}
 			
 			
-			let peers = []
-			for(const peer of this.#libp2p.getPeers()){
-				peers.push(peer.toString())
-			}
-			
-			
 			//connect to saved best peer address
 			//working great
 			for(const peer of this.#dbstoreData){
 				const id = peer[0]
 				const addr = peer[1]
-				if(peers.includes(id)){
+				if(this.#isConnected(id)){
 					this.#connectionTrackerStore.set(id,0)
 					continue
 				}else{
 					if(this.#connectionTrackerStore.has(id)){
 						let current = this.#connectionTrackerStore.get(id)
-						if(current>10)continue
 						current++
 						this.#connectionTrackerStore.set(id,current)
+						if(current>5){
+							if(!this.#connections.has(id) && !config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) && navigator.onLine)
+							{
+								setTimeout(async ()=> {
+									if(this.#dbstoreData.has(id) && !this.#connections.has(id)){
+										this.#dbstoreData.delete(id)
+										await this.#dbstore.delete(new Key(id))
+									}
+								},60*1000)
+							}
+							continue
+						}
 					}
 					else{
 						this.#connectionTrackerStore.set(id,0)
@@ -1005,7 +1216,7 @@ class webpeerjs{
 			//connect to good peer address if it is disconnected
 			const goods = Array.from(this.#dialedGoodPeers.keys())
 			for(const id of goods){
-				if(peers.includes(id)){
+				if(this.#isConnected(id)){
 					this.#dialedGoodPeers.set(id,0)
 					continue
 				}
@@ -1078,6 +1289,10 @@ class webpeerjs{
 	
 	//dial based on known bootsrap peers address
 	#dialKnownBootstrap(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
 		const bootstrap = config.CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS
 		for(const peer of bootstrap){
 			const address = peer.Peers[0].Addrs
@@ -1100,6 +1315,10 @@ class webpeerjs{
 	}
 	
 	async #dialSavedKnownID(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
 		let firsttime = true
 		for(const target of config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
 			if(this.#dbstoreData.has(target)){
@@ -1122,6 +1341,7 @@ class webpeerjs{
 				const api = config.CONFIG_DELEGATED_API
 				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)
 				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)))
+				if(!peer)continue
 				const address = peer.Addrs
 				const id = peer.ID
 				let mddrs = []
@@ -1142,16 +1362,26 @@ class webpeerjs{
 	}
 	
 	async #dialUpdateSavedKnownID(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
 		let firsttime = true
 		for(const target of config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
 			if(this.#dbstoreData.has(target)){
 				firsttime = false
 			}
-			if(!this.#connections.has(target) && this.#isDialEnabled && (this.#dbstoreData.has(target) || firsttime)){
+			if(!this.#connections.has(target) && (this.#dbstoreData.has(target) || firsttime)){
 				//console.log('#dialUpdateSavedKnownID()',target)
 				const api = config.CONFIG_DELEGATED_API
 				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)
 				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)))
+				if(!peer){
+					if (navigator.onLine) {
+						await this.#dbstore.delete(new Key(target))
+					}
+					continue
+				}
 				const address = peer.Addrs
 				const id = peer.ID
 				let mddrs = []
@@ -1174,6 +1404,10 @@ class webpeerjs{
 	
 	//dial based on known peers ID
 	async #dialKnownID(){
+		
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+		
 		//console.log('#dialKnownID()')
 		const api = config.CONFIG_DELEGATED_API
 		const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)