webpeerjs 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpeerjs",
-  "version": "0.1.5",
+  "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",

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'
@@ -98,6 +97,7 @@ class webpeerjs{
 	
 	//track last connect to webpeer network
 	#lastTimeConnectToNetwork
+	#lastTimeReceiveData
 	
 	//arr to track on connect event
 	#onConnectQueue
@@ -132,6 +132,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 +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)
@@ -209,7 +210,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 +241,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 +267,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 +344,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)
+									}
+								}								
 							}
 
 							
@@ -672,6 +688,7 @@ class webpeerjs{
 		setInterval(()=>{
 			this.#peerDiscoveryHybrid()
 			this.#trackHybridPeersConnection()
+			this.#trackWebpeerConnection()
 		},10e3)
 		
 
@@ -792,6 +809,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 +829,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 +878,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 +959,7 @@ class webpeerjs{
 				)
 			}
 			catch(err){
-				//console.warn(err)
+				mkDebug(err)
 			}
 		}
 
@@ -934,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)
-		  }
+		  }*/
 		})
 
 	}
@@ -1032,7 +1068,7 @@ class webpeerjs{
 			}
 		}
 		catch(err){
-			//console.warn(err)
+			mkDebug(err)
 		}
 	}
 	
@@ -1074,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()
 		
@@ -1892,7 +1928,7 @@ class webpeerjs{
 			};
 
 			pc.onicecandidateerror = (e) => {
-				//console.error(e);
+				console.debug(e);
 			};
 
 			pc.createDataChannel('webpeerjs');
@@ -1965,7 +2001,7 @@ class webpeerjs{
 			},
 			peerDiscovery: [
 				pubsubPeerDiscovery({
-					interval: 10_000,
+					interval: 5_000,
 					topics: config.CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER,
 					listenOnly: false,
 				}),