From 4d0d59b16d80de31922d1e9f094823a45c8d4987 Mon Sep 17 00:00:00 2001
From: nuzulul <nuzulz@gmail.com>
Date: Sat, 15 Jun 2024 15:00:00 +0700
Subject: [PATCH] fix:fix #dbstore put parameter

---
 src/webpeerjs.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/webpeerjs.js b/src/webpeerjs.js
index 68d3052..b70dd5c 100644
--- a/src/webpeerjs.js
+++ b/src/webpeerjs.js
@@ -141,8 +141,8 @@ class webpeerjs{
 			const connect = connections.find((con)=>con.id == id)
 			const addr = connect.addr
 
-			if(config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id)){
-				if(!this.#connections.has(id)){
+			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))
 				}
 			}
@@ -150,7 +150,7 @@ class webpeerjs{
 			this.#connections.set(id,addr)
 			
 			//required by joinRoom version 1 to announce via universal connectivity
-			if(config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(connection.toString())){
+			if(config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
 				setTimeout(()=>{
 					this.#announce()
 					setTimeout(()=>{
@@ -547,11 +547,11 @@ class webpeerjs{
 	PRIVATE FUNCTION
 	*/
 	
-	#findPublicPeer(){
+	#findHybridPeer(){
 		setTimeout(async()=>{
 			for(const target of config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
-				//console.log('findPeer',target)
 				if(!this.#isConnected(target)){
+					//console.log('findPeer',target)
 					const peerId = peerIdFromString(target)
 					//const peerInfo = await this.#libp2p.services.aminoDHT.findPeer(peerId)
 
@@ -868,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_PEERS_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)
@@ -962,12 +962,13 @@ class webpeerjs{
 		//this.#dialKnownBootstrap()
 		setTimeout(()=>{
 			this.#dialSavedKnownID()
+			this.#findHybridPeer()
 			setTimeout(()=>{this.#dialUpdateSavedKnownID()},60000)
 			setTimeout(()=>{
 				const peers = this.#libp2p.getPeers().length
 				if(peers == 0){
 					this.#dialKnownID()
-					this.#findPublicPeer()
+					this.#findHybridPeer()
 					setTimeout(()=>{
 						const peers = this.#libp2p.getPeers().length
 						if(peers == 0){