webpeerjs 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpeerjs",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "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/config.js

@@ -1,11 +1,12 @@
 //! WebPEER.js -- https://github.com/nuzulul/webpeerjs
+
 const prefix = 'webpeerjs'
 export const CONFIG_PREFIX = prefix
 export const CONFIG_PROTOCOL = '/'+prefix+'/1.0.0'
 export const CONFIG_BLOCKSTORE_PATH = prefix+'-blockstore'
 export const CONFIG_DATASTORE_PATH = prefix+'-datastore'
 export const CONFIG_DBSTORE_PATH = prefix+'-dbstore'
-export const CONFIG_MAX_CONNECTIONS = 100
+export const CONFIG_MAX_CONNECTIONS = 50
 export const CONFIG_MIN_CONNECTIONS = 0
 export const CONFIG_DISCOVER_RELAYS = 1
 export const CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY = 'universal-connectivity-browser-peer-discovery'
@@ -20,6 +21,16 @@ 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_TIMEOUT_DIAL_KNOWN_PEERS = 15000
+export const CONFIG_RUN_ON_TRANSIENT_CONNECTION = false
+export const CONFIG_WEBRTC_STUN_URLS = 'stun:stun.l.google.com:19302'
+export const CONFIG_WEBRTC_STUN_URLS_BACKUP = 'stun:global.stun.twilio.com:3478'
+export const CONFIG_WEBRTC_TURN_HOST = 'dHVybjpyZWxheTEuZXhwcmVzc3R1cm4uY29tOjM0Nzg='
+export const CONFIG_WEBRTC_TURN_USER = 'ZWZJSllZNjdDNElRMzFZQUlP'
+export const CONFIG_WEBRTC_TURN_PWD = 'Vk01SmdhODlkYjJaWU9aSA=='
+export const CONFIG_WEBRTC_TURN_HOST_BACKUP = 'dHVybjpzdGFuZGFyZC5yZWxheS5tZXRlcmVkLmNhOjgw'
+export const CONFIG_WEBRTC_TURN_USER_BACKUP = 'ZmZlNmIxOThjOGMxYjM5ODg1OWFiOGY4'
+export const CONFIG_WEBRTC_TURN_PWD_BACKUP = 'aWpkQjVTcTIwREVsZzdDRg=='
+export const CONFIG_MESSAGE_SIZE_LIMIT = 10240 // 10KB
 
 // this list comes from https://github.com/ipfs/kubo/blob/196887cbe5fbcd41243c1dfb0db681a1cc2914ff/config/bootstrap_peers.go
 export const CONFIG_KNOWN_DEFAULT_BOOTSTRAP_ADDRESSES = [

package/src/utils.js

@@ -1,4 +1,5 @@
 //! WebPEER.js -- https://github.com/nuzulul/webpeerjs
+
 import * as config from  './config'
 import { Peer as PBPeer } from './peer'
 import { Key } from 'interface-datastore'

package/src/webpeerjs.js

@@ -1,4 +1,5 @@
 //! WebPEER.js -- https://github.com/nuzulul/webpeerjs
+
 import * as config from  './config'
 import { 
 	mkErr,
@@ -515,7 +516,7 @@ class webpeerjs{
 			const mddrs = []
 			peer.addresses.forEach((addr)=>{
 				const maddr = addr.multiaddr.toString()+'/p2p/'+id
-				if(maddr.includes('webtransport') && maddr.includes('certhash') && maddr.includes('webrtc')){
+				if(maddr.includes('webtransport') && maddr.includes('certhash')){
 					mddrs.push(maddr)
 				}
 			})
@@ -684,7 +685,14 @@ class webpeerjs{
 		//join room version 1 user pupsub via pupsub peer discovery
 		if(config.CONFIG_JOIN_ROOM_VERSION == 1){
 
-			const topics = config.CONFIG_PUPSUB_PEER_DATA
+			let topics = []
+			
+			if(config.CONFIG_RUN_ON_TRANSIENT_CONNECTION == true){
+				topics = config.CONFIG_PUBSUB_PEER_DISCOVERY_HYBRID
+			}
+			else{
+				topics = config.CONFIG_PUPSUB_PEER_DATA
+			}
 			
 			this.#rooms[room] = {
 				onMessage : () => {},
@@ -693,9 +701,9 @@ class webpeerjs{
 					const msgId = (new Date()).getTime()
 					const data = JSON.stringify({prefix:config.CONFIG_PREFIX,room,message,id:this.#libp2p.peerId.toString(),msgId})
 					const arr = uint8ArrayFromString(data)
-					const sizelimit = 102400 // 100KB
+					const sizelimit = config.CONFIG_MESSAGE_SIZE_LIMIT
 					if(arr.byteLength > sizelimit){
-						throw mkErr('data too large')
+						throw mkErr('message too large')
 					}
 					const peer = {
 					  publicKey: this.#libp2p.peerId.publicKey,
@@ -834,9 +842,9 @@ class webpeerjs{
 		}
 
 		await this.#libp2p.handle(config.CONFIG_PROTOCOL, handler, {
-		  maxInboundStreams: 50,
-		  maxOutboundStreams: 50,
-		  runOnTransientConnection:false
+		  maxInboundStreams: 100,
+		  maxOutboundStreams: 100,
+		  runOnTransientConnection:config.CONFIG_RUN_ON_TRANSIENT_CONNECTION
 		})
 
 		await this.#libp2p.register(config.CONFIG_PROTOCOL, {
@@ -883,7 +891,7 @@ class webpeerjs{
 
 		try{
 			
-			const stream = await this.#libp2p.dialProtocol(mddr, config.CONFIG_PROTOCOL,{runOnTransientConnection:false})
+			const stream = await this.#libp2p.dialProtocol(mddr, config.CONFIG_PROTOCOL,{runOnTransientConnection:config.CONFIG_RUN_ON_TRANSIENT_CONNECTION})
 			
 			const output = await pipe(
 				message,
@@ -1025,7 +1033,7 @@ class webpeerjs{
 
 	
 	//add multiaddr address to queue list
-	#dialMultiaddress(mddrs){
+	async #dialMultiaddress(mddrs){
 		if(mddrs.length>0){
 			
 			const id = mddrs[0].toString().split('/').pop()
@@ -1043,10 +1051,21 @@ class webpeerjs{
 			const limitCount = config.CONFIG_MAX_CONNECTIONS / 2
 			
 			if(this.#webPeersId.includes(id)){
-				if(webPeerCount>limitCount)return
+				if(webPeerCount>limitCount){
+					return
+				}
 			}
 			else{
-				if(nodePeerCount>limitCount)return
+				if(nodePeerCount>limitCount){
+					//close random peers
+					let peers = []
+					for(const peer of this.#libp2p.getPeers()){
+						peers.push(peer.toString())
+					}
+					const randomKey = Math.floor(Math.random() * peers.length)
+					const randompeerid = peers[randomKey]
+					await this.#libp2p.hangUp(peerIdFromString(randompeerid))
+				}
 			}
 			
 			if(this.#webPeersId.includes(id) || config.CONFIG_KNOWN_BOOTSTRAP_PEERS_IDS.includes(id) || config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
@@ -1117,7 +1136,14 @@ class webpeerjs{
 	}
 	
 	async #announce(){
-			const topics = config.CONFIG_PUPSUB_PEER_DATA
+			let topics = []
+			
+			if(config.CONFIG_RUN_ON_TRANSIENT_CONNECTION == true){
+				topics = config.CONFIG_PUBSUB_PEER_DISCOVERY_HYBRID
+			}
+			else{
+				topics = config.CONFIG_PUPSUB_PEER_DATA
+			}
 			const data = JSON.stringify({prefix:config.CONFIG_PREFIX,signal:'announce',id:this.#libp2p.peerId.toString(),address:this.address,rooms:Object.keys(this.#rooms)})
 			const peer = {
 			  publicKey: this.#libp2p.peerId.publicKey,
@@ -1130,7 +1156,14 @@ class webpeerjs{
 	}
 	
 	async #ping(){
-			const topics = config.CONFIG_PUPSUB_PEER_DATA
+			let topics = []
+			
+			if(config.CONFIG_RUN_ON_TRANSIENT_CONNECTION == true){
+				topics = config.CONFIG_PUBSUB_PEER_DISCOVERY_HYBRID
+			}
+			else{
+				topics = config.CONFIG_PUPSUB_PEER_DATA
+			}
 			const data = JSON.stringify({prefix:config.CONFIG_PREFIX,signal:'ping',id:this.#libp2p.peerId.toString(),address:this.address,rooms:Object.keys(this.#rooms)})
 			const peer = {
 			  publicKey: this.#libp2p.peerId.publicKey,
@@ -1340,13 +1373,13 @@ class webpeerjs{
 	#dialKnownPeers(){
 		setTimeout(()=>{
 			this.#dialSavedKnownID()
-			setTimeout(()=>{this.#dialUpdateSavedKnownID()},50000)
-			setTimeout(()=>{this.#findHybridPeer()},60000)
+			setTimeout(()=>{this.#dialUpdateSavedKnownID()},20000)
+			setTimeout(()=>{this.#findHybridPeer()},30000)
 			setTimeout(()=>{
 				const peers = this.#libp2p.getPeers().length
 				if(peers == 0){
 					this.#dialKnownID()
-					setTimeout(()=>{this.#findHybridPeer()},60000)
+					setTimeout(()=>{this.#findHybridPeer()},30000)
 					setTimeout(()=>{
 						const peers = this.#libp2p.getPeers().length
 						if(peers == 0){
@@ -1674,23 +1707,119 @@ class webpeerjs{
 		let onMetricsFn = () => {}
 		const onMetrics = f => (onMetricsFn = f)
 		
+		let listenaddress = []
+		
+		if(config.CONFIG_RUN_ON_TRANSIENT_CONNECTION == false){
+			listenaddress.push('/webrtc')
+		}
+		
+		const turnurls = atob(config.CONFIG_WEBRTC_TURN_HOST)
+		const turnusername = atob(config.CONFIG_WEBRTC_TURN_USER)
+		const turncredential = atob(config.CONFIG_WEBRTC_TURN_PWD)
+
+		const turnurlsbackup = atob(config.CONFIG_WEBRTC_TURN_HOST_BACKUP)
+		const turnusernamebackup = atob(config.CONFIG_WEBRTC_TURN_USER_BACKUP)
+		const turncredentialbackup = atob(config.CONFIG_WEBRTC_TURN_PWD_BACKUP)
+		
+		const ice = await new Promise((resolve)=>{
+			
+			let stun = false
+			let turn = false
+			
+			const timeout = setTimeout(()=>{
+				let ice = []
+				if(stun){
+					ice.push(stun)
+				}else{
+					const backup = {
+						urls: config.CONFIG_WEBRTC_STUN_URLS_BACKUP
+					}
+					ice.push(backup)
+				}
+				if(turn){
+					ice.push(turn)
+				}else{
+					const backup = 	{
+						urls: turnurlsbackup, 
+						username: turnusernamebackup, 
+						credential: turncredentialbackup
+					}
+					ice.push(backup)
+				}
+				resolve(ice)
+			},5000)
+			
+			function check(){
+				if(stun && turn){
+					let ice = []
+					ice.push(stun)
+					ice.push(turn)
+					clearTimeout(timeout)
+					resolve(ice)
+				}
+			}
+			
+			//test ice servers
+			
+			const iceServers = [
+				{
+					urls: config.CONFIG_WEBRTC_STUN_URLS
+				},
+				{
+					urls: turnurls, 
+					username: turnusername, 
+					credential: turncredential
+				}
+			];
+
+			const pc = new RTCPeerConnection({
+				iceServers
+			});
+
+			pc.onicecandidate = (e) => {
+				if (!e.candidate) return;
+
+				//console.log(e.candidate.candidate);
+
+				// stun works
+				if(e.candidate.type == "srflx"){
+					//console.log('publicip',e.candidate.address);
+					stun = 	{
+								urls: config.CONFIG_WEBRTC_STUN_URLS
+							}
+					check()
+				}
+
+				// turn works
+				if(e.candidate.type == "relay"){
+					turn =  {
+								urls: turnurls, 
+								username: turnusername, 
+								credential: turncredential
+							}
+					check()
+				}
+			};
+
+			pc.onicecandidateerror = (e) => {
+				//console.error(e);
+			};
+
+			pc.createDataChannel('webpeerjs');
+			pc.createOffer().then(offer => pc.setLocalDescription(offer));
+		})
+		
 		//create libp2p instance
 		const libp2p = await createLibp2p({
 			addresses: {
-				listen: [
-					'/webrtc'
-				],
+				listen: listenaddress,
 			},
 			transports:[
 				webTransport(),
 				webSockets(),
 				webRTC({
 					rtcConfiguration: {
-					  iceServers: [
-						{
-						  urls: ['stun:stun.l.google.com:19302', 'stun:global.stun.twilio.com:3478'],
-						},
-					  ],
+						iceServers: ice,
 					},
 				}),
 				circuitRelayTransport({
@@ -1718,8 +1847,8 @@ class webpeerjs{
 			connectionEncryption: [noise()],
 			streamMuxers: [
 				yamux({
-					maxInboundStreams: 20,
-					maxOutboundStreams: 20,
+					maxInboundStreams: 100,
+					maxOutboundStreams: 100,
 				})
 			],
 			connectionGater: {
@@ -1757,7 +1886,7 @@ class webpeerjs{
 					allowPublishToZeroTopicPeers: true,
 					msgIdFn: msgIdFnStrictNoSign,
 					ignoreDuplicatePublishError: true,
-					runOnTransientConnection:false,
+					runOnTransientConnection:config.CONFIG_RUN_ON_TRANSIENT_CONNECTION,
 				}),
 				identify: identify(),
 				identifyPush: identifyPush(),