webpeerjs 0.1.1 → 0.1.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webpeerjs",
-  "version": "0.1.1",
-  "description": "Simple peer-to-peer with IPFS",
+  "version": "0.1.3",
+  "description": "WebPEER.js is decentralized P2P JS library for communication between applications in browser.",
   "main": "./dist/umd/webpeerjs.js",
   "module": "./src/webpeerjs.js",
   "exports": {
@@ -34,10 +34,16 @@
   "keywords": [
     "p2p",
     "ipfs",
+	"libp2p",
     "peer",
-    "peer to peer",
+    "peer-to-peer",
     "decentralized",
-    "browser to browser"
+    "browser-to-browser",
+	"dapp",
+	"distributed",
+	"decentralized-web",
+	"distributed-web",
+	"serverless"
   ],
   "author": {
     "name": "Nuzulul Zulkarnain",

package/src/config.js

@@ -1,4 +1,4 @@
-//! WebpeerJS -- https://github.com/nuzulul/webpeerjs
+//! WebPEER.js -- https://github.com/nuzulul/webpeerjs
 const prefix = 'webpeerjs'
 export const CONFIG_PREFIX = prefix
 export const CONFIG_PROTOCOL = '/'+prefix+'/1.0.0'
@@ -11,7 +11,8 @@ export const CONFIG_DISCOVER_RELAYS = 1
 export const CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY = 'universal-connectivity-browser-peer-discovery'
 export const CONFIG_PEER_DISCOVERY_GLOBAL = '_peer-discovery._p2p._pubsub'
 export const CONFIG_PEER_DISCOVERY_WEBPEERJS= prefix+'-peer-discovery'
-export const CONFIG_PUBSUB_PEER_DISCOVERY = [CONFIG_PEER_DISCOVERY_GLOBAL, CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY, CONFIG_PEER_DISCOVERY_WEBPEERJS]
+export const CONFIG_PUBSUB_PEER_DISCOVERY_HYBRID = [CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY]
+export const CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER = [CONFIG_PEER_DISCOVERY_GLOBAL, CONFIG_PEER_DISCOVERY_WEBPEERJS]
 export const CONFIG_PUPSUB_PEER_DATA = ['_'+prefix+'-peer-data_']
 export const CONFIG_PUPSUB_TOPIC = prefix+'-room'
 export const CONFIG_DELEGATED_API = 'https://delegated-ipfs.dev'
@@ -19,6 +20,7 @@ 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 = true
 
 // this list comes from https://github.com/ipfs/kubo/blob/196887cbe5fbcd41243c1dfb0db681a1cc2914ff/config/bootstrap_peers.go
 export const CONFIG_KNOWN_DEFAULT_BOOTSTRAP_ADDRESSES = [

package/src/peer.js

@@ -1,3 +1,5 @@
+//! WebPEER.js -- https://github.com/nuzulul/webpeerjs
+
 //this code comes from https://github.com/libp2p/js-libp2p-pubsub-peer-discovery/blob/9d0da565f70e9b2403251c9d11dfc0b9b52babfa/src/peer.ts
 
 import { decodeMessage, encodeMessage, message } from 'protons-runtime';

package/src/umd.js

@@ -1,3 +1,4 @@
+//! WebPEER.js -- https://github.com/nuzulul/webpeerjs
 import {webpeerjs} from './webpeerjs';
 
 export default webpeerjs;

package/src/utils.js

@@ -1,3 +1,4 @@
+//! 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,4 @@
-//! WebpeerJS -- https://github.com/nuzulul/webpeerjs
+//! WebPEER.js -- https://github.com/nuzulul/webpeerjs
 import * as config from  './config'
 import { 
 	mkErr,
@@ -145,7 +145,10 @@ class webpeerjs{
 		for(const topic of config.CONFIG_PUPSUB_PEER_DATA){
 			this.#libp2p.services.pubsub.subscribe(topic)
 		}
-		
+
+		for(const topic of config.CONFIG_PUBSUB_PEER_DISCOVERY_HYBRID){
+			this.#libp2p.services.pubsub.subscribe(topic)
+		}		
 		
 		//listen to peer connect event
 		this.#libp2p.addEventListener("peer:connect",async (evt) => {
@@ -170,8 +173,10 @@ class webpeerjs{
 			//required by joinRoom version 1 to announce via universal connectivity
 			if(config.CONFIG_KNOWN_BOOTSTRAP_HYBRID_IDS.includes(id)){
 				setTimeout(()=>{
+					this.#peerDiscoveryHybrid()
 					this.#announce()
 					setTimeout(()=>{
+						this.#peerDiscoveryHybrid()
 						this.#announce()
 					},5000)
 				},1000)
@@ -358,6 +363,18 @@ class webpeerjs{
 									
 							}
 						}
+						else if(prefix === 'hybrid'){
+							
+							if(address.length>0 && !this.#connections.has(id)){
+								let mddrs = []
+								for(const addr of address){
+									const mddr = multiaddr(addr)
+									mddrs.push(mddr)
+								}
+								this.#dialMultiaddress(mddrs)
+							}
+							
+						}
 
 					}catch(err){
 						//console.log('from '+event.detail.from.toString())
@@ -498,13 +515,14 @@ 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)
 				}
 			})
 			//this.#ListenAddressChange(mddrs)
 			this.address = mddrs
 			this.#ping()
+			this.#peerDiscoveryHybrid()
 		})
 		
 		this.#libp2p.addEventListener('peer:identify', async (evt) => {
@@ -598,6 +616,10 @@ class webpeerjs{
 			this.#trackLastSeen()
 		},5e3)
 		
+		setInterval(()=>{
+			this.#peerDiscoveryHybrid()
+		},10e3)
+		
 
 		/*setTimeout(async()=>{
 			try{
@@ -662,7 +684,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 : () => {},
@@ -670,9 +699,14 @@ class webpeerjs{
 				sendMessage : async (message) => {
 					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
+					if(arr.byteLength > sizelimit){
+						throw mkErr('data too large')
+					}
 					const peer = {
 					  publicKey: this.#libp2p.peerId.publicKey,
-					  addrs: [uint8ArrayFromString(data)],
+					  addrs: [arr],
 					}
 					const encodedPeer = PBPeer.encode(peer)
 					for(const topic of topics){
@@ -807,9 +841,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, {
@@ -856,7 +890,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,
@@ -1075,9 +1109,29 @@ class webpeerjs{
 	}
 	
 
-	//announce and ping via pupsub peer discovery
+	//announce and ping via pupsub peer discovery hybrid
+	async #peerDiscoveryHybrid(){
+			const topics = config.CONFIG_PUBSUB_PEER_DISCOVERY_HYBRID
+			const data = JSON.stringify({prefix:'hybrid',id:this.#libp2p.peerId.toString(),address:this.address})
+			const peer = {
+			  publicKey: this.#libp2p.peerId.publicKey,
+			  addrs: [uint8ArrayFromString(data)],
+			}
+			const encodedPeer = PBPeer.encode(peer)
+			for(const topic of topics){
+				await this.#libp2p.services.pubsub.publish(topic, encodedPeer)
+			}
+	}
+	
 	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,
@@ -1088,8 +1142,16 @@ class webpeerjs{
 				await this.#libp2p.services.pubsub.publish(topic, encodedPeer)
 			}
 	}
+	
 	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,
@@ -1633,17 +1695,29 @@ class webpeerjs{
 		let onMetricsFn = () => {}
 		const onMetrics = f => (onMetricsFn = f)
 		
+		let listenaddress = []
+		
+		if(config.CONFIG_RUN_ON_TRANSIENT_CONNECTION == false){
+			listenaddress.push('/webrtc')
+		}
+		
 		//create libp2p instance
 		const libp2p = await createLibp2p({
 			addresses: {
-				listen: [
-					'/webrtc'
-				],
+				listen: listenaddress,
 			},
 			transports:[
 				webTransport(),
 				webSockets(),
-				webRTC(),
+				webRTC({
+					rtcConfiguration: {
+					  iceServers: [
+						{
+						  urls: ['stun:stun.l.google.com:19302', 'stun:global.stun.twilio.com:3478'],
+						},
+					  ],
+					},
+				}),
 				circuitRelayTransport({
 					discoverRelays: config.CONFIG_DISCOVER_RELAYS,
 					reservationConcurrency: 1,
@@ -1669,8 +1743,8 @@ class webpeerjs{
 			connectionEncryption: [noise()],
 			streamMuxers: [
 				yamux({
-					maxInboundStreams: 20,
-					maxOutboundStreams: 20,
+					maxInboundStreams: 100,
+					maxOutboundStreams: 100,
 				})
 			],
 			connectionGater: {
@@ -1698,7 +1772,7 @@ class webpeerjs{
 			peerDiscovery: [
 				pubsubPeerDiscovery({
 					interval: 10_000,
-					topics: config.CONFIG_PUBSUB_PEER_DISCOVERY,
+					topics: config.CONFIG_PUBSUB_PEER_DISCOVERY_WEBPEER,
 					listenOnly: false,
 				}),
 				
@@ -1708,7 +1782,7 @@ class webpeerjs{
 					allowPublishToZeroTopicPeers: true,
 					msgIdFn: msgIdFnStrictNoSign,
 					ignoreDuplicatePublishError: true,
-					runOnTransientConnection:false,
+					runOnTransientConnection:config.CONFIG_RUN_ON_TRANSIENT_CONNECTION,
 				}),
 				identify: identify(),
 				identifyPush: identifyPush(),