webpeerjs 0.0.9 → 0.0.10

package/README.md

@@ -1,15 +1,16 @@
 # WebpeerJS
-> Simple peer-to-peer with [IPFS](https://ipfs.tech/). Build completely P2P web applications, no trackers or relay servers required.
+> Simple peer-to-peer in the browser.
 
-WebpeerJS enables browser to browser connectivity without a central server.
+Build completely P2P web applications, no trackers or relay servers required. [WebpeerJS](https://github.com/nuzulul/webpeerjs) enables browser to browser connectivity without a central server. Connecting people safely, privately, openly and reliably.
 
 [Live Demo](https://nuzulul.github.io/webpeerjs/demo/)
 
 ## Features
 
 * ✅ Decentralized Network
-* ✅ Broadcast Message
+* ✅ Unlimited Peers
 * ✅ Works in The Browser
+* ✅ Broadcast Message / Room
 
 ## Install
 
@@ -21,6 +22,8 @@ npm i webpeerjs
 
 Browser `<script>` tag :
 
+Uses built-in JS files from [latest release](https://github.com/nuzulul/webpeerjs/releases/latest) or [CDN](https://www.jsdelivr.com/package/npm/webpeerjs) will make it's exports available as `webpeerjs` in the global namespace.
+
 ```
 <script src="https://cdn.jsdelivr.net/npm/webpeerjs@0.0/dist/umd/webpeerjs.min.js"></script>
 ```
@@ -36,7 +39,7 @@ void async function main() {
 	
 	console.log(`My node id : ${node.id}`)
 	
-	const [broadcast,listen,members] = node.joinRoom('myroom')
+	const [broadcast,listen,members] = node.joinRoom('globalroom')
 	
 	listen((message,id) => {
 		console.log(`Message from ${id} : ${message}`)

package/dist/esm/webpeerjs.js

@@ -11,6 +11,7 @@ import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-
 import { createLibp2p } from 'libp2p';
 import { IDBDatastore } from 'datastore-idb';
 import { webTransport } from '@libp2p/webtransport';
+import { webSockets } from '@libp2p/websockets';
 import { noise } from '@chainsafe/libp2p-noise';
 import { yamux } from '@chainsafe/libp2p-yamux';
 import { pubsubPeerDiscovery } from '@libp2p/pubsub-peer-discovery';
@@ -33,20 +34,15 @@ const CONFIG_PEER_DISCOVERY_GLOBAL = '_peer-discovery._p2p._pubsub';
 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_DNS_RESOLVER = 'https://dns.google/resolve';
+const CONFIG_KNOWN_BOOTSTRAP_DNS = '_dnsaddr.bootstrap.libp2p.io';
+const CONFIG_TIMEOUT_DIAL_KNOWN_PEERS = 15000;
 
 const CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS = [
 	'QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
 	'QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
 	'QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
-	'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-	'12D3KooWPEDBmt7vm6FNNYuqaA4n2qMUZ6wPK5NcRc8t6KpqgRkV',
-	'12D3KooWSHbugDEQeWm2LjtRRMpNgLu6oZ8zkX8XcTwYMAewVekP',
-	'12D3KooWASoxFpwwy8JDdu4Tm57mhESsnbFPogam9VVmhR95FGXr',
-	'12D3KooWHh98YpAkJsn3ULjMjK1n9QVkXmi8Sb3gTDMatHxCmDP5',
-	'12D3KooWS79EhkPU7ESUwgG4vyHHzW9FDNZLoWVth9b5N5NSrvaj',
-	'12D3KooWBbkCD5MpJhMc1mfPAVGEyVkQnyxPKGS7AHwDqQM2JUsk',
-	'12D3KooWKLdecs31Zmo2pLBjR9HY2vWo3VwM4eBm21Czeucbe6FL',
-	'12D3KooWBdF3g6vSJFRPoZQo7BNnkNzaWb59gpyaVzsgtNTVeu8H'
+	'QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ'
 	];
 
 const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
@@ -56,13 +52,46 @@ const CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS = [
 const CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS = CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.concat(CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS);
 
 const CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS = [
+{
+    "Peers": [
+        {
+            "Addrs": [
+                "/dns6/sv15.bootstrap.libp2p.io/tcp/443/wss",
+                "/dns4/sv15.bootstrap.libp2p.io/tcp/443/wss"
+            ],
+            "ID": "QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
+            "Schema": "peer"
+        }
+    ]
+},
+{
+    "Peers": [
+        {
+            "Addrs": [
+                "/dns4/am6.bootstrap.libp2p.io/tcp/443/wss",
+                "/dns6/am6.bootstrap.libp2p.io/tcp/443/wss"
+            ],
+            "ID": "QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb",
+            "Schema": "peer"
+        }
+    ]
+},
+{
+    "Peers": [
+        {
+            "Addrs": [
+                "/dns6/sg1.bootstrap.libp2p.io/tcp/443/wss",
+                "/dns4/sg1.bootstrap.libp2p.io/tcp/443/wss"
+            ],
+            "ID": "QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt",
+            "Schema": "peer"
+        }
+    ]
+}
 ];
 
-/* eslint-disable import/export */
-/* eslint-disable complexity */
-/* eslint-disable @typescript-eslint/no-namespace */
-/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
-/* eslint-disable @typescript-eslint/no-empty-interface */
+//this code comes from https://github.com/libp2p/js-libp2p-pubsub-peer-discovery/blob/9d0da565f70e9b2403251c9d11dfc0b9b52babfa/src/peer.ts
+
 var Peer;
 (function (Peer) {
     let _codec;
@@ -401,7 +430,7 @@ class webpeerjs{
 			const addr = connect.addr;
 
 			if(CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id)){
-				if(!this.#connections.has(id)&&addr.includes('webtransport')){
+				if((!this.#connections.has(id) || (this.#connections.get(id).includes('/wss/')))&&addr.includes('webtransport')){
 					await this.#dbstore.put(new Key(id), new TextEncoder().encode(addr));
 				}
 			}
@@ -692,6 +721,7 @@ class webpeerjs{
 			//if this disconnected peer is known bootstrap redial it
 			else if(this.#dialedKnownBootstrap.has(id)){
 				const addr = this.#connections.get(id);
+				if(addr.includes('/wss/'))return
 				let mddrs = [];
 				const addrs = multiaddr(addr);
 				mddrs.push(addrs);
@@ -732,8 +762,29 @@ class webpeerjs{
 			this.#ping();
 		});
 		
-		this.#libp2p.addEventListener('peer:identify', (evt) => {
+		this.#libp2p.addEventListener('peer:identify', async (evt) => {
 			//console.log('peer:identify '+evt.detail.peerId.toString(),evt.detail)
+			
+			const id = evt.detail.peerId.toString();
+			
+			if(CONFIG_KNOWN_BOOTSTRAP_PUBLIC_IDS.includes(id)){
+				const remoteAddr = evt.detail.connection.remoteAddr.toString();
+				if(remoteAddr.includes('/wss/')){
+					 let addrs = [];
+					 let mddrs = [];
+					 for(const peer of evt.detail.listenAddrs){
+						 if(!peer.toString().includes('webtransport'))continue
+						 const addr = peer.toString()+'/p2p/'+id;
+						 const mddr = multiaddr(addr);
+						 addrs.push(addr);
+						 mddrs.push(mddr);
+					 }
+					 this.#dialedKnownBootstrap.set(id,addrs);
+					 await this.#libp2p.hangUp(peerIdFromString(id));
+					 this.#dialMultiaddress(mddrs);
+				}
+			}
+			
 			if(evt.detail.protocols.includes(CONFIG_PROTOCOL)){
 				//console.log('peer:identify '+evt.detail.peerId.toString(),evt)
 				
@@ -1116,37 +1167,39 @@ class webpeerjs{
 		}
 	}
 	
-	#findHybridPeer(){
-		setTimeout(async()=>{
-			for(const target of CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
-				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)
-
-					//console.info(peerInfo)
-					for await (const event of this.#libp2p.services.aminoDHT.findPeer(peerId)){
-						//console.info('findPeer',event)
-						if (event.name === 'FINAL_PEER'){
-							//console.log(event.peer.id.toString(),event.peer.multiaddrs.toString())
-							let mddrs = [];
-							let addrs = [];
-							const id = event.peer.id.toString();
-							for(const mddr of event.peer.multiaddrs){
-								const peeraddr = mddr.toString()+'/p2p/'+id;
-								const peermddr = multiaddr(peeraddr);
-								addrs.push(peeraddr);
-								mddrs.push(peermddr);
-							}
-							this.#dialedKnownBootstrap.set(id,addrs);
-							if(!this.#isConnected(id)){
-								this.#dialMultiaddress(mddrs);
-							}
+	async #findHybridPeer(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
+		for(const target of CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS){
+			if(!this.#isConnected(target) && !this.#connections.has(target)){
+				//console.log('findPeer',target)
+				const peerId = peerIdFromString(target);
+				//const peerInfo = await this.#libp2p.services.aminoDHT.findPeer(peerId)
+
+				//console.info(peerInfo)
+				for await (const event of this.#libp2p.services.aminoDHT.findPeer(peerId)){
+					//console.info('findPeer',event)
+					if (event.name === 'FINAL_PEER'){
+						//console.log(event.peer.id.toString(),event.peer.multiaddrs.toString())
+						let mddrs = [];
+						let addrs = [];
+						const id = event.peer.id.toString();
+						for(const mddr of event.peer.multiaddrs){
+							const peeraddr = mddr.toString()+'/p2p/'+id;
+							const peermddr = multiaddr(peeraddr);
+							addrs.push(peeraddr);
+							mddrs.push(peermddr);
+						}
+						this.#dialedKnownBootstrap.set(id,addrs);
+						if(!this.#isConnected(id)){
+							this.#dialMultiaddress(mddrs);
 						}
 					}
 				}
 			}
-		},60e3);
+		}
 	}
 	
 	
@@ -1490,65 +1543,47 @@ class webpeerjs{
 			if(peers == 0){
 				this.#dialKnownPeers();
 			}
-		},60*1000);
+		},120*1000);
 	}
 	
 	
 	//dial to all known bootstrap peers and DNS
 	#dialKnownPeers(){
-		//this.#dialKnownBootstrap()
 		setTimeout(()=>{
 			this.#dialSavedKnownID();
-			this.#findHybridPeer();
 			setTimeout(()=>{this.#dialUpdateSavedKnownID();},50000);
+			setTimeout(()=>{this.#findHybridPeer();},60000);
 			setTimeout(()=>{
 				const peers = this.#libp2p.getPeers().length;
 				if(peers == 0){
 					this.#dialKnownID();
-					this.#findHybridPeer();
+					setTimeout(()=>{this.#findHybridPeer();},60000);
 					setTimeout(()=>{
 						const peers = this.#libp2p.getPeers().length;
 						if(peers == 0){
-							//currently not needed
-							//this.#dialKnownDNS()
+							this.#dialKnownBootstrap();
+							setTimeout(()=>{this.#findHybridPeer();},15000);
 							setTimeout(()=>{
-								this.#libp2p.getPeers().length;
-							},15000);
+								const peers = this.#libp2p.getPeers().length;
+								if(peers == 0){
+									this.#dialKnownDNS();
+									setTimeout(()=>{this.#findHybridPeer();},15000);
+									setTimeout(()=>{
+										const peers = this.#libp2p.getPeers().length;
+										if(peers == 0){
+											this.#dialKnownDNSonly();
+											setTimeout(()=>{this.#findHybridPeer();},15000);
+										}
+									},CONFIG_TIMEOUT_DIAL_KNOWN_PEERS);
+								}
+							},CONFIG_TIMEOUT_DIAL_KNOWN_PEERS);
 						}
-					},15000);
+					},CONFIG_TIMEOUT_DIAL_KNOWN_PEERS);
 				}
-			},15000);
+			},CONFIG_TIMEOUT_DIAL_KNOWN_PEERS);
 		},5000);
 	}
 	
-	
-	//dial based on known bootsrap peers address
-	#dialKnownBootstrap(){
-
-		if(!navigator.onLine)return
-		if(!this.#isDialEnabled)return
-
-		const bootstrap = CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS;
-		for(const peer of bootstrap){
-			const address = peer.Peers[0].Addrs;
-			const id = peer.Peers[0].ID;
-			let mddrs = [];
-			let addrs = [];
-			for(const addr of address){
-				const peeraddr = addr+'/p2p/'+id;
-				const peermddr = multiaddr(peeraddr);
-				addrs.push(peeraddr);
-				mddrs.push(peermddr);
-			}
-			
-			this.#dialedKnownBootstrap.set(id,addrs);
-			if(!this.#isConnected(id)){
-				this.#dialMultiaddress(mddrs);
-			}
-			
-		}
-	}
-	
 	async #dialSavedKnownID(){
 
 		if(!navigator.onLine)return
@@ -1669,118 +1704,149 @@ class webpeerjs{
 			}
 		}
 	}
-	
+
+
+	//dial based on known bootsrap peers address using Websocket expected
+	#dialKnownBootstrap(){
+		
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
+		const bootstrap = CONFIG_KNOWN_BOOTSTRAP_PEERS_ADDRS;
+		for(const peer of bootstrap){
+			const address = peer.Peers[0].Addrs;
+			const id = peer.Peers[0].ID;
+			let mddrs = [];
+			let addrs = [];
+			for(const addr of address){
+				if(!addr.includes('wss'))continue
+				const peeraddr = addr+'/p2p/'+id;
+				const peermddr = multiaddr(peeraddr);
+				addrs.push(peeraddr);
+				mddrs.push(peermddr);
+			}
+			
+			this.#dialedKnownBootstrap.set(id,addrs);
+			this.#isDialWebsocket = true;
+			if(!this.#isConnected(id)){
+				this.#dialMultiaddress(mddrs);
+			}
+			
+		}
+	}	
 	
 	//dial based on known bootstrap DNS
-	/*async #dialKnownDNS(){
-		const dnsresolver = config.CONFIG_DNS_RESOLVER
-		const bootstrapdns = config.CONFIG_KNOWN_BOOTSTRAP_DNS
-		const response = await fetch(dnsresolver+'?name='+bootstrapdns+'&type=txt')
-		const json = await response.json()
-		const dns = json.Answer
-		const BOOTSTRAP_PEER_IDS = []
+	async #dialKnownDNS(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
+		const dnsresolver = CONFIG_DNS_RESOLVER;
+		const bootstrapdns = CONFIG_KNOWN_BOOTSTRAP_DNS;
+		const response = await fetch(dnsresolver+'?name='+bootstrapdns+'&type=txt');
+		const json = await response.json();
+		const dns = json.Answer;
+		const BOOTSTRAP_PEER_IDS = [];
 		for(const dnsaddr of dns){
-			const id = dnsaddr.data.split('/').pop()
-			BOOTSTRAP_PEER_IDS.push(id)
+			const id = dnsaddr.data.split('/').pop();
+			BOOTSTRAP_PEER_IDS.push(id);
 		}
-		const api = config.CONFIG_DELEGATED_API
-		const delegatedClient = createDelegatedRoutingV1HttpApiClient(api)
+		const api = CONFIG_DELEGATED_API;
+		const delegatedClient = createDelegatedRoutingV1HttpApiClient(api);
 		const peers = await Promise.all(
 			BOOTSTRAP_PEER_IDS.map((peerId) => first(delegatedClient.getPeers(peerIdFromString(peerId)))),
-		)
+		);
 		for(const peer of peers){
-			const address = peer.Addrs
-			const id = peer.ID
-			let mddrs = []
-			let addrs = []
+			const address = peer.Addrs;
+			const id = peer.ID;
+			let mddrs = [];
+			let addrs = [];
 			for(const addr of address){
-				const peeraddr = addr.toString()+'/p2p/'+id.toString()
-				const peermddr = multiaddr(peeraddr)
-				addrs.push(peeraddr)
-				mddrs.push(peermddr)
+				const peeraddr = addr.toString()+'/p2p/'+id.toString();
+				const peermddr = multiaddr(peeraddr);
+				addrs.push(peeraddr);
+				mddrs.push(peermddr);
 			}
 			
-			this.#dialedKnownBootstrap.set(id,addrs)
+			this.#dialedKnownBootstrap.set(id,addrs);
+			this.#isDialWebsocket = true;
 			if(!this.#isConnected(id)){
-				this.#dialMultiaddress(mddrs)
+				this.#dialMultiaddress(mddrs);
 			}
 		}
 		
-	}*/
+	}
 	
 	
 	//dial based on known bootstrap DNS using DNS resolver only
-	/*async #dialKnownDNSonly(){
-		const dnsresolver = config.CONFIG_DNS_RESOLVER
-		const bootstrapdns = config.CONFIG_KNOWN_BOOTSTRAP_DNS
-		const response = await fetch(dnsresolver+'?name='+bootstrapdns+'&type=txt')
-		const json = await response.json()
-		const dns = json.Answer
+	async #dialKnownDNSonly(){
+
+		if(!navigator.onLine)return
+		if(!this.#isDialEnabled)return
+
+		const dnsresolver = CONFIG_DNS_RESOLVER;
+		const bootstrapdns = CONFIG_KNOWN_BOOTSTRAP_DNS;
+		const response = await fetch(dnsresolver+'?name='+bootstrapdns+'&type=txt');
+		const json = await response.json();
+		const dns = json.Answer;
 		
 		for(const dnsitem of dns){
-			const arr = dnsitem.data.split('/')
-			const id = arr.pop()
-			const dnsaddr = '_dnsaddr.'+arr[2]
-			this.#dialDNSWebsocketWebtransport(id,dnsaddr)
+			const arr = dnsitem.data.split('/');
+			const id = arr.pop();
+			const dnsaddr = '_dnsaddr.'+arr[2];
+			this.#dialDNSWebsocketWebtransport(id,dnsaddr);
 		}
-	}*/
+	}
 	
 	
 	//dial DNS with webtransport and websocket
-	/*async #dialDNSWebsocketWebtransport(id,dnsaddr){
-		const dnsresolver = config.CONFIG_DNS_RESOLVER
-		const response = await fetch(dnsresolver+'?name='+dnsaddr+'&type=txt')
-		const json = await response.json()
-		const dns = json.Answer
-		let mddrs = []
-		let addrs = []
+	async #dialDNSWebsocketWebtransport(id,dnsaddr){
+		const dnsresolver = CONFIG_DNS_RESOLVER;
+		const response = await fetch(dnsresolver+'?name='+dnsaddr+'&type=txt');
+		const json = await response.json();
+		const dns = json.Answer;
+		let mddrs = [];
+		let addrs = [];
 		for(const dnsitem of dns){
-			const arr = dnsitem.data.split('=')
-			const dnsaddr = arr[1]
-			const maddr = multiaddr(dnsaddr)
-			mddrs.push(maddr)
-			addrs.push(dnsaddr)
+			const arr = dnsitem.data.split('=');
+			const dnsaddr = arr[1];
+			const maddr = multiaddr(dnsaddr);
+			mddrs.push(maddr);
+			addrs.push(dnsaddr);
 		}
 		
 		
-		this.#isDialWebsocket = true
-		this.#dialedKnownBootstrap.set(id,addrs)
+		this.#isDialWebsocket = true;
+		this.#dialedKnownBootstrap.set(id,addrs);
 		
-		this.#dialedKnownBootstrap.set(id,addrs)
+		this.#dialedKnownBootstrap.set(id,addrs);
 		if(!this.#isConnected(id)){
-			this.#dialMultiaddress(mddrs)
-			this.#dialWebsocket(mddrs)
+			this.#dialMultiaddress(mddrs);
+			this.#dialWebsocket(mddrs);
 		}
-	}*/
+	}
 	
 	
 	//dial only webtransport multiaddrs
 	async #dialWebtransport(multiaddrs){
 			const webTransportMadrs = multiaddrs.filter((maddr) => maddr.protoNames().includes('webtransport')&&maddr.protoNames().includes('certhash'));
-			  for (const addr of webTransportMadrs) {
+			  for (const mddr of webTransportMadrs) {
 				try {
-				  //console.log(`attempting to dial webtransport multiaddr: %o`, addr.toString())
-				  await this.#libp2p.dial(addr);
+				  //console.log(`attempting to dial webtransport multiaddr: %o`, mddr.toString())
+				  await this.#libp2p.dial(mddr);
 				  return // if we succeed dialing the peer, no need to try another address
 				} catch (error) {
 				}
 			  }
 	}
-
-	//dial only webtransport multiaddrs
-	/*#dialWebtransport1(multiaddrs){
-			const webTransportMadrs = multiaddrs.filter((maddr) => maddr.protoNames().includes('webtransport')&&maddr.protoNames().includes('certhash'))
-			if(webTransportMadrs.length == 0)return
-			this.#libp2p.dial(webTransportMadrs).then((data)=>{console.warn(data)},(data)=>{console.warn(data)})
-	}*/
 	
 	//dial only websocket multiaddrs
 	async #dialWebsocket(multiaddrs){
 			const webSocketMadrs = multiaddrs.filter((maddr) => maddr.protoNames().includes('wss'));
-			  for (const addr of webSocketMadrs) {
+			  for (const mddr of webSocketMadrs) {
 				try {
-				  //console.log(`attempting to dial websocket multiaddr: %o`, addr)
-				  await this.#libp2p.dial(addr);
+				  //console.log(`attempting to dial websocket multiaddr: %o`, mddr)
+				  await this.#libp2p.dial(mddr);
 				  return // if we succeed dialing the peer, no need to try another address
 				} catch (error) {
 				}
@@ -1818,7 +1884,8 @@ class webpeerjs{
 				],
 			},
 			transports:[
-				webTransport(),		
+				webTransport(),
+				webSockets(),
 				circuitRelayTransport({
 					discoverRelays: CONFIG_DISCOVER_RELAYS,
 					reservationConcurrency: 1,