webpeerjs 0.0.6 → 0.0.8

package/README.md

@@ -3,9 +3,28 @@
 
 WebpeerJS enables browser to browser connectivity without a central server.
 
-[Demo](https://nuzulul.github.io/webpeerjs/demo/)
+[Live Demo](https://nuzulul.github.io/webpeerjs/demo/)
 
-## Example
+## Features
+
+* ✅ Decentralized Network
+* ✅ Broadcast Message
+
+## Install
+
+NPM :
+
+```
+npm i webpeerjs
+```
+
+CDN :
+
+```
+<script src="https://cdn.jsdelivr.net/npm/webpeerjs@0.0/dist/umd/webpeerjs.min.js"></script>
+```
+
+## Usage
 
 ```
 import { webpeerjs } from 'webpeerjs'
@@ -16,7 +35,7 @@ void async function main() {
 	
 	console.log(`My node id : ${node.id}`)
 	
-	const [send,listen,members] = node.joinRoom('myroom')
+	const [broadcast,listen,members] = node.joinRoom('myroom')
 	
 	listen((message,id) => {
 		console.log(`Message from ${id} : ${message}`)
@@ -24,35 +43,26 @@ void async function main() {
 	
 	members((data) => {
 		console.log(`Members : ${data}`)
-		send('hello')
+		broadcast('hello')
 	})
 	
 }()
 ```
 
-## Install
-
-NPM :
-
-```
-npm i webpeerjs
-```
-
-CDN :
-
-```
-<script src="https://cdn.jsdelivr.net/npm/webpeerjs@0.0/dist/umd/webpeerjs.min.js"></script>
-```
-
 ## API
 
-- `createWebpeer()` Create a new local node.
-- `id` The unique ID of the local node as an identity in the global network.
-- `joinRoom()` Adding a local node to the room, returns an array of three functions (Sender, onListen, onMembers).
+- `createWebpeer()` Create a new node.
+- `id` The unique ID of the node as an identity in the global network.
+- `joinRoom()` Adding the node to the room, returns an array of three functions (Broadcaster, onListenMessage, onMembersUpdate).
 - `peers` Get all connected peers.
+- `status` Get the node status, returns `connected` or `unconnected`.
+
+## Related
 
-## License
+- [simple-peer](https://github.com/feross/simple-peer) - Simple WebRTC video, voice, and data channels.
+- [peerjs](https://github.com/peers/peerjs) - Simple peer-to-peer with WebRTC.
+- [trystero](https://github.com/dmotz/trystero) - Build instant multiplayer webapps, no server required.
 
-MIT License
+## Maintainers
 
-Copyright (c) 2024 [Nuzulul Zulkarnain](https://github.com/nuzulul)
+[Nuzulul Zulkarnain](https://github.com/nuzulul)

package/dist/esm/webpeerjs.d.ts

@@ -2,7 +2,7 @@ export class webpeerjs {
     static createWebpeer(): Promise<webpeerjs>;
     constructor(libp2p: any, dbstore: any, onMetrics: any);
     id: any;
-    status: any;
+    status: string;
     IPFS: {
         libp2p: any;
         discoveredPeers: Map<any, any>;

package/dist/esm/webpeerjs.js

@@ -19,6 +19,7 @@ import { simpleMetrics } from '@libp2p/simple-metrics';
 
 const prefix$1 = 'webpeerjs';
 const CONFIG_PREFIX = prefix$1;
+const CONFIG_PROTOCOL = '/'+prefix$1+'/0.0.1';
 const CONFIG_DBSTORE_PATH = prefix$1+'-dbstore';
 const CONFIG_MAX_CONNECTIONS = 100;
 const CONFIG_MIN_CONNECTIONS = 0;
@@ -29,15 +30,11 @@ const CONFIG_PEER_DISCOVERY_WEBPEERJS= prefix$1+'-peer-discovery';
 const CONFIG_PUBSUB_PEER_DISCOVERY = [CONFIG_PEER_DISCOVERY_GLOBAL, CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY, CONFIG_PEER_DISCOVERY_WEBPEERJS];
 const CONFIG_DELEGATED_API = 'https://delegated-ipfs.dev';
 
-const CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS = [
-];
-
-const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
+const CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS = [
 	'QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
 	'QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
 	'QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
 	'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-	'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr',
 	'12D3KooWPEDBmt7vm6FNNYuqaA4n2qMUZ6wPK5NcRc8t6KpqgRkV',
 	'12D3KooWSHbugDEQeWm2LjtRRMpNgLu6oZ8zkX8XcTwYMAewVekP',
 	'12D3KooWASoxFpwwy8JDdu4Tm57mhESsnbFPogam9VVmhR95FGXr',
@@ -50,6 +47,11 @@ const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
 
 const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
 	'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr'
+];
+
+const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.concat(CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS);
+
+const CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS = [
 ];
 
 /* eslint-disable import/export */
@@ -241,16 +243,16 @@ function metrics(data){
 		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});
@@ -367,6 +369,8 @@ class webpeerjs{
 		this.status = (function(libp2p) {
 			return libp2p.status
 		})(this.#libp2p);
+		
+		this.status = 'unconnected';
 
 		this.IPFS = (function(libp2p,discoveredPeers) {
 			const obj = {libp2p,discoveredPeers};
@@ -379,11 +383,11 @@ class webpeerjs{
 		//listen to peer connect event
 		this.#libp2p.addEventListener("peer:connect",async (evt) => {
 			
-			//console.log(`Connected to ${connection.toString()}`);
-			
 			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;
@@ -406,6 +410,27 @@ 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.#updatePeers();
+				}
+
+			}
+			
 		});
 
 
@@ -442,11 +467,7 @@ 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);
-								}
+								this.#updatePeers();
 							}
 
 							//dial if not connected
@@ -510,11 +531,7 @@ class webpeerjs{
 								const metadata = {addrs:address,last:now};
 								this.#connectedPeers.set(id,metadata);
 								this.#webPeersAddrs.set(id,address);
-								this.#connectedPeersArr.length = 0;
-								for(const peer of this.#connectedPeers){	
-									const item = {id:peer[0],address:peer[1].addrs};
-									this.#connectedPeersArr.push(item);
-								}
+								this.#updatePeers();
 							}
 
 							
@@ -560,17 +577,6 @@ class webpeerjs{
 								if(signal == 'ping'){
 									//console.log('rooms',rooms)
 								}
-								
-								//update connected webpeers
-								const now = new Date().getTime();
-								const metadata = {addrs:address,last:now};
-								this.#connectedPeers.set(id,metadata);
-								this.#webPeersAddrs.set(id,address);
-								this.#connectedPeersArr.length = 0;
-								for(const peer of this.#connectedPeers){	
-									const item = {id:peer[0],address:peer[1].addrs};
-									this.#connectedPeersArr.push(item);
-								}
 									
 							}
 						}
@@ -621,10 +627,12 @@ class webpeerjs{
 				if(multiaddrs.toString().includes('certhash')&& multiaddrs.toString().includes('webtransport') && multiaddrs.toString().includes('p2p-circuit')){
 					//console.log(addrs)
 					if(!this.#connections.has(id)){
+						let mddrs = [];
 						for(const addr of addrs){
-							multiaddr(addr);
+							const mddr = multiaddr(addr);
+							mddrs.push(mddr);
 						}
-						//this.#dialMultiaddress(mddrs)
+						this.#dialMultiaddress(mddrs);
 					}
 				}
 			}
@@ -681,10 +689,8 @@ class webpeerjs{
 			//redial if this disconnected peer is regular peer
 			else {
 				const addr = this.#connections.get(id);
-				let mddrs = [];
-				const addrs = multiaddr(addr);
-				mddrs.push(addrs);
-				this.#dialMultiaddress(mddrs);
+				multiaddr(addr);
+				//this.#dialMultiaddress(mddrs)
 			}
 		});
 		
@@ -706,6 +712,41 @@ 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_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.#updatePeers();
+				}
+
+			}
+		});
+		
 		//dial known peers from configuration
 		this.#dialKnownPeers();
 	
@@ -721,6 +762,8 @@ class webpeerjs{
 		//dial random discovered peers
 		//this.#dialdiscoveredpeers()
 		
+		this.#registerProtocol();
+		
 
 		onMetrics((data)=>{
 			const signal = metrics(data);
@@ -761,6 +804,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)*/
+		
 	}
 
 
@@ -785,11 +836,48 @@ class webpeerjs{
 	/*
 	PRIVATE FUNCTION
 	*/
+
+	#updatePeers(){
+		this.#connectedPeersArr.length = 0;
+		for(const peer of this.#connectedPeers){	
+			const item = {id:peer[0],address:peer[1].addrs};
+			this.#connectedPeersArr.push(item);
+		}
+		if(this.#connectedPeers.size > 0){
+			this.status = 'connected';
+		}
+		else {
+			this.status = 'unconnected';
+		}
+	}
+	
+	async #registerProtocol(){
+		const handler = ({ connection, stream, protocol }) => {
+		  // use stream or connection according to the needs
+		};
+
+		await this.#libp2p.handle(CONFIG_PROTOCOL, handler, {
+		  maxInboundStreams: 5,
+		  maxOutboundStreams: 5
+		});
+
+		await this.#libp2p.register(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_KNOWN_BOOTSTRAP_HYBRID_IDS){
-				if(!this.#isConnected(target)){
+				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)
@@ -816,13 +904,14 @@ class webpeerjs{
 					}
 				}
 			}
-		},30e3);
+		},60e3);
 	}
 	
 	
 	//check the last seen in web peer
 	#trackLastSeen(){
 		const timeout = 25*1000;
+		const forcetimeout = 60*1000;
 		const now = new Date().getTime();
 		
 		//if webpeer last seen grather then timeout send onDisconnect
@@ -830,13 +919,10 @@ class webpeerjs{
 			const id = peer[0];
 			const last = peer[1].last;
 			const time = now-last;
-			if(time>timeout){
+			if((time>timeout && !this.#isConnected(id))||(time>forcetimeout)){
+				
 				this.#connectedPeers.delete(id);
-				this.#connectedPeersArr.length = 0;
-				for(const peer of this.#connectedPeers){	
-					const item = {id:peer[0],address:peer[1].addrs};
-					this.#connectedPeersArr.push(item);
-				}
+				this.#updatePeers();
 				this.#onDisconnectFn(id);
 				
 				//remove id from room member
@@ -848,6 +934,7 @@ class webpeerjs{
 						this.#rooms[room].onMembers(this.#rooms[room].members);
 					}
 				}
+				
 			}
 		}
 	}
@@ -895,7 +982,7 @@ class webpeerjs{
 		
 		if(!this.#isDialEnabled)return
 		
-		const mddrsToDial = 3;
+		const mddrsToDial = 5;
 		
 		let queue = [];
 		for(const item of this.#libp2p.getDialQueue()){
@@ -913,6 +1000,8 @@ class webpeerjs{
 				
 				if(this.#isConnected(id))continue
 				if(queue.includes(id)){continue;}
+				
+				//console.log('dial',id)
 
 				//dial with webtransport
 				this.#dialWebtransport(mddrs);
@@ -995,7 +1084,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();},
 			};
 		}
 		
@@ -1202,7 +1291,7 @@ class webpeerjs{
 		setTimeout(()=>{
 			this.#dialSavedKnownID();
 			this.#findHybridPeer();
-			setTimeout(()=>{this.#dialUpdateSavedKnownID();},60000);
+			setTimeout(()=>{this.#dialUpdateSavedKnownID();},50000);
 			setTimeout(()=>{
 				const peers = this.#libp2p.getPeers().length;
 				if(peers == 0){
@@ -1290,8 +1379,13 @@ class webpeerjs{
 	}
 	
 	async #dialUpdateSavedKnownID(){
+		let firsttime = true;
 		for(const target of CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
-			if(!this.#connections.has(target)){
+			if(this.#dbstoreData.has(target)){
+				firsttime = false;
+			}
+			if(!this.#connections.has(target) && this.#isDialEnabled && (this.#dbstoreData.has(target) || firsttime)){
+				//console.log('#dialUpdateSavedKnownID()',target)
 				const api = CONFIG_DELEGATED_API;
 				const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
 				const peer = await first(delegatedClient.getPeers(peerIdFromString(target)));

package/dist/umd/webpeerjs.js

@@ -6,6 +6,7 @@
 
 	const prefix$1 = 'webpeerjs';
 	const CONFIG_PREFIX = prefix$1;
+	const CONFIG_PROTOCOL = '/'+prefix$1+'/0.0.1';
 	const CONFIG_DBSTORE_PATH = prefix$1+'-dbstore';
 	const CONFIG_MAX_CONNECTIONS = 100;
 	const CONFIG_MIN_CONNECTIONS = 0;
@@ -16,15 +17,11 @@
 	const CONFIG_PUBSUB_PEER_DISCOVERY = [CONFIG_PEER_DISCOVERY_GLOBAL, CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY, CONFIG_PEER_DISCOVERY_WEBPEERJS];
 	const CONFIG_DELEGATED_API = 'https://delegated-ipfs.dev';
 
-	const CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS = [
-	];
-
-	const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
+	const CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS = [
 		'QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
 		'QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
 		'QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
 		'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-		'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr',
 		'12D3KooWPEDBmt7vm6FNNYuqaA4n2qMUZ6wPK5NcRc8t6KpqgRkV',
 		'12D3KooWSHbugDEQeWm2LjtRRMpNgLu6oZ8zkX8XcTwYMAewVekP',
 		'12D3KooWASoxFpwwy8JDdu4Tm57mhESsnbFPogam9VVmhR95FGXr',
@@ -37,6 +34,11 @@
 
 	const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
 		'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr'
+	];
+
+	const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.concat(CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS);
+
+	const CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS = [
 	];
 
 	/**
@@ -3350,16 +3352,16 @@
 			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});
@@ -46152,6 +46154,8 @@
 			this.status = (function(libp2p) {
 				return libp2p.status
 			})(this.#libp2p);
+			
+			this.status = 'unconnected';
 
 			this.IPFS = (function(libp2p,discoveredPeers) {
 				const obj = {libp2p,discoveredPeers};
@@ -46164,11 +46168,11 @@
 			//listen to peer connect event
 			this.#libp2p.addEventListener("peer:connect",async (evt) => {
 				
-				//console.log(`Connected to ${connection.toString()}`);
-				
 				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;
@@ -46191,6 +46195,27 @@
 					},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.#updatePeers();
+					}
+
+				}
+				
 			});
 
 
@@ -46227,11 +46252,7 @@
 									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);
-									}
+									this.#updatePeers();
 								}
 
 								//dial if not connected
@@ -46295,11 +46316,7 @@
 									const metadata = {addrs:address,last:now};
 									this.#connectedPeers.set(id,metadata);
 									this.#webPeersAddrs.set(id,address);
-									this.#connectedPeersArr.length = 0;
-									for(const peer of this.#connectedPeers){	
-										const item = {id:peer[0],address:peer[1].addrs};
-										this.#connectedPeersArr.push(item);
-									}
+									this.#updatePeers();
 								}
 
 								
@@ -46345,17 +46362,6 @@
 									if(signal == 'ping'){
 										//console.log('rooms',rooms)
 									}
-									
-									//update connected webpeers
-									const now = new Date().getTime();
-									const metadata = {addrs:address,last:now};
-									this.#connectedPeers.set(id,metadata);
-									this.#webPeersAddrs.set(id,address);
-									this.#connectedPeersArr.length = 0;
-									for(const peer of this.#connectedPeers){	
-										const item = {id:peer[0],address:peer[1].addrs};
-										this.#connectedPeersArr.push(item);
-									}
 										
 								}
 							}
@@ -46406,10 +46412,12 @@
 					if(multiaddrs.toString().includes('certhash')&& multiaddrs.toString().includes('webtransport') && multiaddrs.toString().includes('p2p-circuit')){
 						//console.log(addrs)
 						if(!this.#connections.has(id)){
+							let mddrs = [];
 							for(const addr of addrs){
-								multiaddr(addr);
+								const mddr = multiaddr(addr);
+								mddrs.push(mddr);
 							}
-							//this.#dialMultiaddress(mddrs)
+							this.#dialMultiaddress(mddrs);
 						}
 					}
 				}
@@ -46466,10 +46474,8 @@
 				//redial if this disconnected peer is regular peer
 				else {
 					const addr = this.#connections.get(id);
-					let mddrs = [];
-					const addrs = multiaddr(addr);
-					mddrs.push(addrs);
-					this.#dialMultiaddress(mddrs);
+					multiaddr(addr);
+					//this.#dialMultiaddress(mddrs)
 				}
 			});
 			
@@ -46491,6 +46497,41 @@
 				this.#ping();
 			});
 			
+			this.#libp2p.addEventListener('peer:identify', (evt) => {
+				//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+				if(evt.detail.protocols.includes(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.#updatePeers();
+					}
+
+				}
+			});
+			
 			//dial known peers from configuration
 			this.#dialKnownPeers();
 		
@@ -46506,6 +46547,8 @@
 			//dial random discovered peers
 			//this.#dialdiscoveredpeers()
 			
+			this.#registerProtocol();
+			
 
 			onMetrics((data)=>{
 				const signal = metrics(data);
@@ -46546,6 +46589,14 @@
 				}
 			},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)*/
+			
 		}
 
 
@@ -46570,11 +46621,48 @@
 		/*
 		PRIVATE FUNCTION
 		*/
+
+		#updatePeers(){
+			this.#connectedPeersArr.length = 0;
+			for(const peer of this.#connectedPeers){	
+				const item = {id:peer[0],address:peer[1].addrs};
+				this.#connectedPeersArr.push(item);
+			}
+			if(this.#connectedPeers.size > 0){
+				this.status = 'connected';
+			}
+			else {
+				this.status = 'unconnected';
+			}
+		}
+		
+		async #registerProtocol(){
+			const handler = ({ connection, stream, protocol }) => {
+			  // use stream or connection according to the needs
+			};
+
+			await this.#libp2p.handle(CONFIG_PROTOCOL, handler, {
+			  maxInboundStreams: 5,
+			  maxOutboundStreams: 5
+			});
+
+			await this.#libp2p.register(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_KNOWN_BOOTSTRAP_HYBRID_IDS){
-					if(!this.#isConnected(target)){
+					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)
@@ -46601,13 +46689,14 @@
 						}
 					}
 				}
-			},30e3);
+			},60e3);
 		}
 		
 		
 		//check the last seen in web peer
 		#trackLastSeen(){
 			const timeout = 25*1000;
+			const forcetimeout = 60*1000;
 			const now = new Date().getTime();
 			
 			//if webpeer last seen grather then timeout send onDisconnect
@@ -46615,13 +46704,10 @@
 				const id = peer[0];
 				const last = peer[1].last;
 				const time = now-last;
-				if(time>timeout){
+				if((time>timeout && !this.#isConnected(id))||(time>forcetimeout)){
+					
 					this.#connectedPeers.delete(id);
-					this.#connectedPeersArr.length = 0;
-					for(const peer of this.#connectedPeers){	
-						const item = {id:peer[0],address:peer[1].addrs};
-						this.#connectedPeersArr.push(item);
-					}
+					this.#updatePeers();
 					this.#onDisconnectFn(id);
 					
 					//remove id from room member
@@ -46633,6 +46719,7 @@
 							this.#rooms[room].onMembers(this.#rooms[room].members);
 						}
 					}
+					
 				}
 			}
 		}
@@ -46680,7 +46767,7 @@
 			
 			if(!this.#isDialEnabled)return
 			
-			const mddrsToDial = 3;
+			const mddrsToDial = 5;
 			
 			let queue = [];
 			for(const item of this.#libp2p.getDialQueue()){
@@ -46698,6 +46785,8 @@
 					
 					if(this.#isConnected(id))continue
 					if(queue.includes(id)){continue;}
+					
+					//console.log('dial',id)
 
 					//dial with webtransport
 					this.#dialWebtransport(mddrs);
@@ -46780,7 +46869,7 @@
 					},
 					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();},
 				};
 			}
 			
@@ -46987,7 +47076,7 @@
 			setTimeout(()=>{
 				this.#dialSavedKnownID();
 				this.#findHybridPeer();
-				setTimeout(()=>{this.#dialUpdateSavedKnownID();},60000);
+				setTimeout(()=>{this.#dialUpdateSavedKnownID();},50000);
 				setTimeout(()=>{
 					const peers = this.#libp2p.getPeers().length;
 					if(peers == 0){
@@ -47075,8 +47164,13 @@
 		}
 		
 		async #dialUpdateSavedKnownID(){
+			let firsttime = true;
 			for(const target of CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
-				if(!this.#connections.has(target)){
+				if(this.#dbstoreData.has(target)){
+					firsttime = false;
+				}
+				if(!this.#connections.has(target) && this.#isDialEnabled && (this.#dbstoreData.has(target) || firsttime)){
+					//console.log('#dialUpdateSavedKnownID()',target)
 					const api = CONFIG_DELEGATED_API;
 					const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
 					const peer = await first$1(delegatedClient.getPeers(peerIdFromString(target)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpeerjs",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Simple peer-to-peer with IPFS",
   "main": "./dist/umd/webpeerjs.js",
   "module": "./dist/esm/webpeerjs.js",

package/src/config.js

@@ -1,5 +1,6 @@
 const prefix = 'webpeerjs'
 export const CONFIG_PREFIX = prefix
+export const CONFIG_PROTOCOL = '/'+prefix+'/0.0.1'
 export const CONFIG_BLOCKSTORE_PATH = prefix+'-blockstore'
 export const CONFIG_DATASTORE_PATH = prefix+'-datastore'
 export const CONFIG_DBSTORE_PATH = prefix+'-dbstore'
@@ -16,15 +17,11 @@ export const CONFIG_DNS_RESOLVER = 'https://dns.google/resolve'
 export const CONFIG_KNOWN_BOOTSTRAP_DNS = '_dnsaddr.bootstrap.libp2p.io'
 export const CONFIG_JOIN_ROOM_VERSION = 1
 
-export const CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS = [
-]
-
-export const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
+export const CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS = [
 	'QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
 	'QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
 	'QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
 	'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-	'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr',
 	'12D3KooWPEDBmt7vm6FNNYuqaA4n2qMUZ6wPK5NcRc8t6KpqgRkV',
 	'12D3KooWSHbugDEQeWm2LjtRRMpNgLu6oZ8zkX8XcTwYMAewVekP',
 	'12D3KooWASoxFpwwy8JDdu4Tm57mhESsnbFPogam9VVmhR95FGXr',
@@ -37,4 +34,9 @@ export const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = [
 
 export const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
 	'12D3KooWFhXabKDwALpzqMbto94sB7rvmZ6M28hs9Y9xSopDKwQr'
+]
+
+export const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.concat(CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS)
+
+export const CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS = [
 ]

package/src/utils.js

@@ -142,16 +142,16 @@ export function metrics(data){
 		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})

package/src/webpeerjs.js

@@ -120,6 +120,8 @@ class webpeerjs{
 		this.status = (function(libp2p) {
 			return libp2p.status
 		})(this.#libp2p);
+		
+		this.status = 'unconnected'
 
 		this.IPFS = (function(libp2p,discoveredPeers) {
 			const obj = {libp2p,discoveredPeers}
@@ -132,11 +134,11 @@ class webpeerjs{
 		//listen to peer connect event
 		this.#libp2p.addEventListener("peer:connect",async (evt) => {
 			
-			//console.log(`Connected to ${connection.toString()}`);
-			
 			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
@@ -159,6 +161,27 @@ 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.#updatePeers()
+				}
+
+			}
+			
 		});
 
 
@@ -195,11 +218,7 @@ 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)
-								}
+								this.#updatePeers()
 							}
 
 							//dial if not connected
@@ -263,11 +282,7 @@ class webpeerjs{
 								const metadata = {addrs:address,last:now}
 								this.#connectedPeers.set(id,metadata)
 								this.#webPeersAddrs.set(id,address)
-								this.#connectedPeersArr.length = 0
-								for(const peer of this.#connectedPeers){	
-									const item = {id:peer[0],address:peer[1].addrs}
-									this.#connectedPeersArr.push(item)
-								}
+								this.#updatePeers()
 							}
 
 							
@@ -313,17 +328,6 @@ class webpeerjs{
 								if(signal == 'ping'){
 									//console.log('rooms',rooms)
 								}
-								
-								//update connected webpeers
-								const now = new Date().getTime()
-								const metadata = {addrs:address,last:now}
-								this.#connectedPeers.set(id,metadata)
-								this.#webPeersAddrs.set(id,address)
-								this.#connectedPeersArr.length = 0
-								for(const peer of this.#connectedPeers){	
-									const item = {id:peer[0],address:peer[1].addrs}
-									this.#connectedPeersArr.push(item)
-								}
 									
 							}
 						}
@@ -381,7 +385,7 @@ class webpeerjs{
 							const mddr = multiaddr(addr)
 							mddrs.push(mddr)
 						}
-						//this.#dialMultiaddress(mddrs)
+						this.#dialMultiaddress(mddrs)
 					}
 				}
 			}
@@ -445,7 +449,7 @@ class webpeerjs{
 				let mddrs = []
 				const addrs = multiaddr(addr)
 				mddrs.push(addrs)
-				this.#dialMultiaddress(mddrs)
+				//this.#dialMultiaddress(mddrs)
 			}
 		});
 		
@@ -467,6 +471,41 @@ 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.#updatePeers()
+				}
+
+			}
+		})
+		
 		//dial known peers from configuration
 		this.#dialKnownPeers()
 	
@@ -482,6 +521,8 @@ class webpeerjs{
 		//dial random discovered peers
 		//this.#dialdiscoveredpeers()
 		
+		this.#registerProtocol()
+		
 
 		onMetrics((data)=>{
 			const signal = metrics(data)
@@ -522,6 +563,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)*/
+		
 	}
 
 
@@ -546,11 +595,48 @@ class webpeerjs{
 	/*
 	PRIVATE FUNCTION
 	*/
+
+	#updatePeers(){
+		this.#connectedPeersArr.length = 0
+		for(const peer of this.#connectedPeers){	
+			const item = {id:peer[0],address:peer[1].addrs}
+			this.#connectedPeersArr.push(item)
+		}
+		if(this.#connectedPeers.size > 0){
+			this.status = 'connected'
+		}
+		else{
+			this.status = 'unconnected'
+		}
+	}
+	
+	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)){
+				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)
@@ -577,13 +663,14 @@ class webpeerjs{
 					}
 				}
 			}
-		},30e3)
+		},60e3)
 	}
 	
 	
 	//check the last seen in web peer
 	#trackLastSeen(){
 		const timeout = 25*1000
+		const forcetimeout = 60*1000
 		const now = new Date().getTime()
 		
 		//if webpeer last seen grather then timeout send onDisconnect
@@ -591,13 +678,10 @@ class webpeerjs{
 			const id = peer[0]
 			const last = peer[1].last
 			const time = now-last
-			if(time>timeout){
+			if((time>timeout && !this.#isConnected(id))||(time>forcetimeout)){
+				
 				this.#connectedPeers.delete(id)
-				this.#connectedPeersArr.length = 0
-				for(const peer of this.#connectedPeers){	
-					const item = {id:peer[0],address:peer[1].addrs}
-					this.#connectedPeersArr.push(item)
-				}
+				this.#updatePeers()
 				this.#onDisconnectFn(id)
 				
 				//remove id from room member
@@ -609,6 +693,7 @@ class webpeerjs{
 						this.#rooms[room].onMembers(this.#rooms[room].members)
 					}
 				}
+				
 			}
 		}
 	}
@@ -656,7 +741,7 @@ class webpeerjs{
 		
 		if(!this.#isDialEnabled)return
 		
-		const mddrsToDial = 3
+		const mddrsToDial = 5
 		
 		let queue = []
 		for(const item of this.#libp2p.getDialQueue()){
@@ -674,6 +759,8 @@ class webpeerjs{
 				
 				if(this.#isConnected(id))continue
 				if(queue.includes(id)){continue;}
+				
+				//console.log('dial',id)
 
 				//dial with webtransport
 				this.#dialWebtransport(mddrs)
@@ -756,7 +843,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()},
 			}
 		}
 		
@@ -963,7 +1050,7 @@ class webpeerjs{
 		setTimeout(()=>{
 			this.#dialSavedKnownID()
 			this.#findHybridPeer()
-			setTimeout(()=>{this.#dialUpdateSavedKnownID()},60000)
+			setTimeout(()=>{this.#dialUpdateSavedKnownID()},50000)
 			setTimeout(()=>{
 				const peers = this.#libp2p.getPeers().length
 				if(peers == 0){
@@ -1055,8 +1142,13 @@ class webpeerjs{
 	}
 	
 	async #dialUpdateSavedKnownID(){
+		let firsttime = true
 		for(const target of config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS){
-			if(!this.#connections.has(target)){
+			if(this.#dbstoreData.has(target)){
+				firsttime = false
+			}
+			if(!this.#connections.has(target) && this.#isDialEnabled && (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)))