webpeerjs 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpeerjs",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "WebPEER.js is decentralized P2P JS library for communication between applications in browser.",
   "main": "./dist/umd/webpeerjs.js",
   "module": "./src/webpeerjs.js",
@@ -19,8 +19,8 @@
     "start": "npm run dev",
     "dev": "vite serve test",
     "demo": "vite serve demo",
-    "eslint": "eslint ./src",
-    "eslint:fix": "eslint ./src --fix",
+    "eslint": "eslint -c ./config/eslint.config.mjs ./src",
+    "eslint:fix": "eslint -c ./config/eslint.config.mjs ./src --fix",
     "removedir": "node -e \"var fs = require('fs'); try{process.argv.slice(1).map((fpath) => fs.rmdirSync(fpath, { recursive: true }))}catch(err){console.log(`Dist not found`)}; process.exit(0);\"",
     "build-all": "tsc -p config/tsconfig-rollup.json && rollup -c temp/config/rollup.config.build.js && echo {\"type\": \"commonjs\"}>dist\\umd\\package.json && echo {\"type\": \"module\"}>dist\\esm\\package.json",
     "build-types": "tsc -p config/tsconfig-esm.json",

package/src/config.js

@@ -13,7 +13,7 @@ export const CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY = 'universal-connectiv
 export const CONFIG_PEER_DISCOVERY_GLOBAL = '_peer-discovery._p2p._pubsub'
 export const CONFIG_PEER_DISCOVERY_WEBPEERJS= prefix+'-peer-discovery'
 export const CONFIG_PUBSUB_PEER_DISCOVERY_HYBRID = [CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY]
-export const CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER = [CONFIG_PEER_DISCOVERY_GLOBAL, CONFIG_PEER_DISCOVERY_WEBPEERJS]
+export const CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER = [CONFIG_PEER_DISCOVERY_WEBPEERJS]
 export const CONFIG_PUPSUB_PEER_DATA = ['_'+prefix+'-peer-data_']
 export const CONFIG_PUPSUB_TOPIC = prefix+'-room'
 export const CONFIG_DELEGATED_API = 'https://delegated-ipfs.dev'

package/src/utils.js

@@ -27,7 +27,8 @@ const prefix = config.CONFIG_PREFIX
 
 export const mkErr = msg => new Error(`${prefix}: ${msg}`)
 
-export function mkDebug(error){
+export function mkDebug(msg){
+	console.debug(msg)
 	return
 }
 
@@ -167,14 +168,14 @@ export function metrics(data){
 		if ((fail-lastfailtreshold)>30){
 			if(isDialEnabled){
 				isDialEnabled = false
-				const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold})
-				console.warn('dial disabled')
+				//const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold})
+				console.warn('Peer dial is temporary disabled')
 				setTimeout(()=>{
 					if(!isDialEnabled){
 						isDialEnabled = true
 						lastfailtreshold = fail
-						const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold})
-						console.warn('dial enabled')
+						//const str = JSON.stringify({isDialEnabled,fail,lastfailtreshold})
+						console.warn('Peer dial is enabled')
 					}
 				},6*60*1000)
 			}

package/src/webpeerjs.js

@@ -10,11 +10,10 @@ import {
 	Key,
 	msgIdFnStrictNoSign,
 	metrics,
-	getDigest,
+	//getDigest,
 	mkDebug,
 	multiaddr,
 	pipe,
-	lpStream,
 	lp,
 	map
 } from './utils'
@@ -96,6 +95,13 @@ class webpeerjs{
 	//map of peer exchange data
 	#peerexchangedata
 	
+	//track last connect to webpeer network
+	#lastTimeConnectToNetwork
+	#lastTimeReceiveData
+	
+	//arr to track on connect event
+	#onConnectQueue
+	
 	id
 	status
 	IPFS
@@ -125,6 +131,9 @@ class webpeerjs{
 		this.#isDialEnabled = true
 		this.#msgIdtracker = []
 		this.#peerexchangedata = new Map()
+		this.#lastTimeConnectToNetwork = new Date().getTime()
+		this.#lastTimeReceiveData = new Date().getTime()
+		this.#onConnectQueue = []
 		
 		this.peers = (function(f) {
 			return f
@@ -154,7 +163,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)
@@ -185,6 +194,14 @@ class webpeerjs{
 			
 			if(this.#webPeersId.includes(id)){
 				
+				setTimeout(()=>{
+					this.#ping()
+				},10000)
+
+				setTimeout(()=>{
+					this.#ping()
+				},15000)
+				
 				let address = [addr]
 
 				if(this.#connectedPeers.has(id)){
@@ -193,9 +210,9 @@ 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.#onConnectFn(id)
+					this.#onConnectFnUpdate(id)
 					const now = new Date().getTime()
 					const metadata = {addrs:address,last:now}
 					this.#connectedPeers.set(id,metadata)
@@ -217,12 +234,29 @@ class webpeerjs{
 			if (event.detail.type !== 'signed') {
 			  return
 			}
+			
 			if(config.CONFIG_JOIN_ROOM_VERSION == 1){
 				const topic = event.detail.topic
 				const senderPeerId = event.detail.from.toString()
 				
 					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()
+							const limit = 15*1000
+							const lastConnectTime = now - this.#lastTimeConnectToNetwork
+							if(lastConnectTime > limit){
+								//console.log('need re announce')
+								this.#announce()
+							}
+							this.#lastTimeConnectToNetwork = now
+						}
+						
 						//if it is webpeer 
 						if(this.#webPeersId.includes(senderPeerId)){
 							
@@ -233,9 +267,9 @@ 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.#onConnectFn(senderPeerId)
+								this.#onConnectFnUpdate(senderPeerId)
 								const address = this.#webPeersAddrs.get(senderPeerId)
 								const now = new Date().getTime()
 								const metadata = {addrs:address,last:now}
@@ -279,6 +313,20 @@ class webpeerjs{
 						
 						//parse the message over pupsub peer discovery
 						const peer = PBPeer.decode(event.detail.data)
+						
+						//detect libp2p pupsub peer discovery
+						if(peer.addrs.length > 1 && this.#libp2p.getPeers().length < config.CONFIG_MAX_CONNECTIONS){
+							let mddrs = []
+							for(const uaddr of peer.addrs){
+								const mddr = multiaddr(uaddr)
+								if(mddr.toString().includes('webtransport') && mddr.toString().includes('certhash')){
+									mddrs.push(mddr)
+								}
+							}
+							this.#dialMultiaddress(mddrs)
+							//console.log('dial '+senderPeerId,mddrs.toString())
+						}
+						
 						const msg = uint8ArrayToString(peer.addrs[0])
 						const json = JSON.parse(msg)
 						const prefix = json.prefix
@@ -288,25 +336,37 @@ class webpeerjs{
 						const msgId = json.msgId
 						const signal = json.signal
 						const id = json.id
-						//console.log(`from ${id}:${signal} = ${message}`)
+						const address = json.address
+						//console.log(`from ${id}:${signal} = ${msg}`)
+						
 						if(id != senderPeerId)return
-						let address = json.address
 						
 						//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.#onConnectFn(id)
-								address = []
+								this.#onConnectFnUpdate(id)
 								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)
+									}
+								}								
 							}
 
 							
@@ -366,13 +426,16 @@ class webpeerjs{
 						}
 						else if(prefix === 'hybrid'){
 							
-							if(address.length>0 && !this.#connections.has(id)){
+							//console.log('hybrid' +id,address)
+							const limit = config.CONFIG_MAX_CONNECTIONS / 2
+							if(address.length>0 && ((!this.#connections.has(id))||(this.#connectedPeers.size < limit))){
 								let mddrs = []
 								for(const addr of address){
 									const mddr = multiaddr(addr)
 									mddrs.push(mddr)
 								}
 								this.#dialMultiaddress(mddrs)
+								//console.log('dial '+id,mddrs.toString())
 							}
 							
 						}
@@ -451,7 +514,12 @@ class webpeerjs{
 				count++
 				this.#trackDisconnect.set(id,count)
 				//console.log(this.#trackDisconnect)
-				if(count>10){
+				if(count>5){
+					if(config.CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.includes(id)){
+						return
+					}
+				}
+				else if(count>10){
 					if(this.#dbstoreData.has(id)){
 						this.#dbstoreData.delete(id)
 					}
@@ -619,6 +687,8 @@ class webpeerjs{
 		
 		setInterval(()=>{
 			this.#peerDiscoveryHybrid()
+			this.#trackHybridPeersConnection()
+			this.#trackWebpeerConnection()
 		},10e3)
 		
 
@@ -738,6 +808,58 @@ 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){
+			if(this.#isConnected(id))isConnectedToHybridPeers = true
+		}
+		if(!isConnectedToHybridPeers){
+			for(const id of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
+				if(this.status !== 'connected' && this.#connections.has(id))
+				{
+					let mddrs = []
+					const addr = this.#connections.get(id)
+					const mddr = multiaddr(addr)
+					mddrs.push(mddr)
+					this.#dialMultiaddress(mddrs)
+				}
+			}
+		}
+	}
+	
+	//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)){
+			this.#onConnectQueue.push(id)
+			this.#onConnectFn(id)
+			setTimeout(()=>{
+				const index = this.#onConnectQueue.indexOf(id)
+				if (index > -1) {
+					this.#onConnectQueue.splice(index, 1)
+				}
+			},5000)
+		}
+	}
 
 	#updatePeers(){
 		this.#connectedPeersArr.length = 0
@@ -756,7 +878,7 @@ class webpeerjs{
 	
 	async #registerProtocol(){
 		
-		const handler = async ({ connection, stream, protocol }) => {
+		const handler = async ({ connection, stream }) => {
 			try{
 				const output = await pipe(
 					stream.source,
@@ -795,7 +917,7 @@ class webpeerjs{
 							if(!this.#webPeersId.includes(id))this.#webPeersId.push(id)
 								
 							//add to connected webpeers
-							this.#onConnectFn(id)
+							this.#onConnectFnUpdate(id)
 							const now = new Date().getTime()
 							const metadata = {addrs:address,last:now}
 							this.#connectedPeers.set(id,metadata)
@@ -837,7 +959,7 @@ class webpeerjs{
 				)
 			}
 			catch(err){
-				//console.warn(err)
+				mkDebug(err)
 			}
 		}
 
@@ -848,14 +970,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)
-		  }
+		  }*/
 		})
 
 	}
@@ -922,7 +1044,7 @@ class webpeerjs{
 					if(!this.#webPeersId.includes(id))this.#webPeersId.push(id)
 						
 					//add to connected webpeers
-					this.#onConnectFn(id)
+					this.#onConnectFnUpdate(id)
 					const now = new Date().getTime()
 					const metadata = {addrs:address,last:now}
 					this.#connectedPeers.set(id,metadata)
@@ -946,7 +1068,7 @@ class webpeerjs{
 			}
 		}
 		catch(err){
-			//console.warn(err)
+			mkDebug(err)
 		}
 	}
 	
@@ -988,7 +1110,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()
 		
@@ -1045,6 +1167,8 @@ class webpeerjs{
 				return
 			}
 			
+			if(this.status === 'connected' && config.CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.includes(id))return
+			
 			const webPeerCount = this.#connectedPeers.size
 			const allPeerCount = this.#libp2p.getPeers().length
 			const nodePeerCount = allPeerCount - webPeerCount
@@ -1056,7 +1180,7 @@ class webpeerjs{
 				}
 			}
 			else{
-				if(nodePeerCount>limitCount){
+				if((nodePeerCount>(limitCount-5))||(allPeerCount>(config.CONFIG_MAX_CONNECTIONS-5))){
 					//close random peers
 					let peers = []
 					for(const peer of this.#libp2p.getPeers()){
@@ -1064,7 +1188,9 @@ class webpeerjs{
 					}
 					const randomKey = Math.floor(Math.random() * peers.length)
 					const randompeerid = peers[randomKey]
-					await this.#libp2p.hangUp(peerIdFromString(randompeerid))
+					if(!config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
+						await this.#libp2p.hangUp(peerIdFromString(randompeerid))
+					}
 				}
 			}
 			
@@ -1081,7 +1207,7 @@ class webpeerjs{
 	//dial multiaddr address in queue list
 	#dialQueueList(){
 		
-		if(!this.#isDialEnabled || !navigator.onLine)return
+		if(!this.#isDialEnabled || !navigator.onLine || (document.visibilityState === 'hidden' && ('ontouchstart' in document.documentElement)) )return
 		
 		const mddrsToDial = 5
 		
@@ -1802,7 +1928,7 @@ class webpeerjs{
 			};
 
 			pc.onicecandidateerror = (e) => {
-				//console.error(e);
+				console.debug(e);
 			};
 
 			pc.createDataChannel('webpeerjs');
@@ -1875,7 +2001,7 @@ class webpeerjs{
 			},
 			peerDiscovery: [
 				pubsubPeerDiscovery({
-					interval: 10_000,
+					interval: 5_000,
 					topics: config.CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER,
 					listenOnly: false,
 				}),