webpeerjs 0.0.10 → 0.1.0

package/README.md

@@ -1,16 +1,16 @@
 # WebpeerJS
-> Simple peer-to-peer in the browser.
+> Simple peer-to-peer communication between applications in browser.
 
-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.
+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. Let's create a next generation internet that is fair, free and open.
 
-[Live Demo](https://nuzulul.github.io/webpeerjs/demo/)
+[Basic Connection Demo](https://nuzulul.github.io/webpeerjs/demo/)
 
 ## Features
 
-* ✅ Decentralized Network
+* ✅ Decentralized P2P
 * ✅ Unlimited Peers
-* ✅ Works in The Browser
-* ✅ Broadcast Message / Room
+* ✅ Works in Browsers
+* ✅ Broadcast Message
 
 ## Install
 
@@ -25,7 +25,7 @@ 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>
+<script src="https://cdn.jsdelivr.net/npm/webpeerjs@0.1/dist/umd/webpeerjs.min.js"></script>
 ```
 
 ## Usage
@@ -55,22 +55,16 @@ void async function main() {
 
 ## API
 
-- `createWebpeer()` Create a new node.
-- `id` The unique ID of the node as an identity in the global network.
-- `status` Get the node status, returns `connected` or `unconnected`.
-- `peers` Get all connected peers.
-- `joinRoom(namespace)` Join to the room, returns an array of three functions (Broadcaster, onListenBroadcast, onMembersUpdate).
+- `createWebpeer()` - Create a new node.
+- `id` - The unique ID of the node as an identity in the global network.
+- `status` - Get the node status, returns `connected` or `unconnected`.
+- `peers` - Get all connected peers.
+- `joinRoom(namespace)` - Join to the room, returns an array of three functions (Broadcaster, onListenBroadcast, onMembersUpdate).
 
 ## API Docs
 
 [https://nuzulul.github.io/webpeerjs](https://nuzulul.github.io/webpeerjs)
 
-## Related
-
-- [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.
-
 ## License
 
 MIT

package/dist/esm/webpeerjs.js

@@ -12,6 +12,8 @@ import { createLibp2p } from 'libp2p';
 import { IDBDatastore } from 'datastore-idb';
 import { webTransport } from '@libp2p/webtransport';
 import { webSockets } from '@libp2p/websockets';
+import { webRTC } from '@libp2p/webrtc';
+import { dcutr } from '@libp2p/dcutr';
 import { noise } from '@chainsafe/libp2p-noise';
 import { yamux } from '@chainsafe/libp2p-yamux';
 import { pubsubPeerDiscovery } from '@libp2p/pubsub-peer-discovery';
@@ -33,6 +35,7 @@ const CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY = 'universal-connectivity-bro
 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_PUPSUB_PEER_DATA = ['_'+prefix$1+'-peer-data_'];
 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';
@@ -416,6 +419,10 @@ class webpeerjs{
 		
 		this.id = this.#libp2p.peerId.toString();
 		
+		for(const topic of CONFIG_PUPSUB_PEER_DATA){
+			this.#libp2p.services.pubsub.subscribe(topic);
+		}
+		
 		
 		//listen to peer connect event
 		this.#libp2p.addEventListener("peer:connect",async (evt) => {
@@ -482,9 +489,9 @@ class webpeerjs{
 			  return
 			}
 			{
-				const topic = event.detail.topic;
+				event.detail.topic;
 				const senderPeerId = event.detail.from.toString();
-				if(CONFIG_PUBSUB_PEER_DISCOVERY.includes(topic)){
+				
 					try{
 						
 						//if it is webpeer 
@@ -520,15 +527,17 @@ class webpeerjs{
 									const addrs = this.#discoveredPeers.get(senderPeerId);
 									let mddrs = [];
 									for(const addr of addrs){
+										if(!addr.includes('webrtc'))continue
 										const mddr = multiaddr(addr);
 										mddrs.push(mddr);
 									}
 									this.#dialMultiaddress(mddrs);
 								}
-								else {
+								else if(this.#connectedPeers.has(senderPeerId)){
 									const addrs = this.#connectedPeers.get(senderPeerId).addrs;
 									let mddrs = [];
 									for(const addr of addrs){
+										if(!addr.includes('webrtc'))continue
 										const mddr = multiaddr(addr);
 										mddrs.push(mddr);
 									}
@@ -577,8 +586,10 @@ class webpeerjs{
 									
 									//update room members
 									if(!this.#rooms[room].members.includes(id)){
-										this.#rooms[room].members.push(id);
-										this.#rooms[room].onMembers(this.#rooms[room].members);
+										if(this.#connectedPeers.has(id)){
+											this.#rooms[room].members.push(id);
+											this.#rooms[room].onMembers(this.#rooms[room].members);
+										}
 									}
 
 									//inbound message
@@ -597,8 +608,10 @@ class webpeerjs{
 								for(const room of Object.keys(this.#rooms)){
 									//update room members
 									if(!this.#rooms[room].members.includes(id)){
-										this.#rooms[room].members.push(id);
-										this.#rooms[room].onMembers(this.#rooms[room].members);
+										if(this.#connectedPeers.has(id)){
+											this.#rooms[room].members.push(id);
+											this.#rooms[room].onMembers(this.#rooms[room].members);
+										}
 									}
 								}
 							}
@@ -607,7 +620,7 @@ class webpeerjs{
 								
 								//repply announce with ping
 								if(signal == 'announce'){
-									setTimeout(()=>{this.#ping('yes');},1000);
+									setTimeout(()=>{this.#ping('');},1000);
 									//console.log('rooms',rooms)
 								}
 								
@@ -620,12 +633,7 @@ class webpeerjs{
 
 					}catch(err){
 					}
-				}else {
-					const json = JSON.parse(topic);
-					const room = json.room;
-					const message = new TextDecoder().decode(event.detail.data);
-					this.#rooms[room].onMessage(message);
-				}
+				
 			}
 			
 		});
@@ -666,6 +674,7 @@ class webpeerjs{
 					if(!this.#connections.has(id)){
 						let mddrs = [];
 						for(const addr of addrs){
+							if(!addr.includes('webrtc'))continue
 							const mddr = multiaddr(addr);
 							mddrs.push(mddr);
 						}
@@ -753,7 +762,7 @@ class webpeerjs{
 			const mddrs = [];
 			peer.addresses.forEach((addr)=>{
 				const maddr = addr.multiaddr.toString()+'/p2p/'+id;
-				if(maddr.includes('webtransport') && maddr.includes('certhash')){
+				if(maddr.includes('webtransport') && maddr.includes('certhash') && maddr.includes('webrtc')){
 					mddrs.push(maddr);
 				}
 			});
@@ -915,7 +924,7 @@ class webpeerjs{
 		//join room version 1 user pupsub via pupsub peer discovery
 		{
 
-			const topics = CONFIG_PUBSUB_PEER_DISCOVERY;
+			const topics = CONFIG_PUPSUB_PEER_DATA;
 			
 			this.#rooms[room] = {
 				onMessage : () => {},
@@ -969,6 +978,7 @@ class webpeerjs{
 		else {
 			this.status = 'unconnected';
 		}
+		this.#ping();
 	}
 	
 	async #registerProtocol(){
@@ -1061,7 +1071,7 @@ class webpeerjs{
 		await this.#libp2p.handle(CONFIG_PROTOCOL, handler, {
 		  maxInboundStreams: 50,
 		  maxOutboundStreams: 50,
-		  runOnTransientConnection:true
+		  runOnTransientConnection:false
 		});
 
 		await this.#libp2p.register(CONFIG_PROTOCOL, {
@@ -1108,7 +1118,7 @@ class webpeerjs{
 
 		try{
 			
-			const stream = await this.#libp2p.dialProtocol(mddr, CONFIG_PROTOCOL,{runOnTransientConnection:true});
+			const stream = await this.#libp2p.dialProtocol(mddr, CONFIG_PROTOCOL,{runOnTransientConnection:false});
 			
 			const output = await pipe(
 				message,
@@ -1125,7 +1135,7 @@ class webpeerjs{
 				  return string
 				}
 			);
-			
+			//console.log(output)
 			const json = JSON.parse(output);
 			if(json.protocol == CONFIG_PROTOCOL){
 				const address = [addr];
@@ -1329,7 +1339,7 @@ class webpeerjs{
 
 	//announce and ping via pupsub peer discovery
 	async #announce(){
-			const topics = CONFIG_PUBSUB_PEER_DISCOVERY;
+			const topics = CONFIG_PUPSUB_PEER_DATA;
 			const data = JSON.stringify({prefix:CONFIG_PREFIX,signal:'announce',id:this.#libp2p.peerId.toString(),address:this.address,rooms:this.#rooms});
 			const peer = {
 			  publicKey: this.#libp2p.peerId.publicKey,
@@ -1341,7 +1351,7 @@ class webpeerjs{
 			}
 	}
 	async #ping(){
-			const topics = CONFIG_PUBSUB_PEER_DISCOVERY;
+			const topics = CONFIG_PUPSUB_PEER_DATA;
 			const data = JSON.stringify({prefix:CONFIG_PREFIX,signal:'ping',id:this.#libp2p.peerId.toString(),address:this.address,rooms:this.#rooms});
 			const peer = {
 			  publicKey: this.#libp2p.peerId.publicKey,
@@ -1881,11 +1891,13 @@ class webpeerjs{
 		const libp2p = await createLibp2p({
 			addresses: {
 				listen: [
+					'/webrtc'
 				],
 			},
 			transports:[
 				webTransport(),
 				webSockets(),
+				webRTC(),
 				circuitRelayTransport({
 					discoverRelays: CONFIG_DISCOVER_RELAYS,
 					reservationConcurrency: 1,
@@ -1950,7 +1962,7 @@ class webpeerjs{
 					allowPublishToZeroTopicPeers: true,
 					msgIdFn: msgIdFnStrictNoSign,
 					ignoreDuplicatePublishError: true,
-					runOnTransientConnection:true,
+					runOnTransientConnection:false,
 				}),
 				identify: identify(),
 				identifyPush: identifyPush(),
@@ -1959,7 +1971,7 @@ class webpeerjs{
 					peerInfoMapper: removePrivateAddressesMapper,
 					clientMode: false
 				}),
-
+				dcutr: dcutr()
 			},
 			peerStore: {
 				persistence: true,