webpeerjs 0.0.2 → 0.0.3

package/dist/umd/package.json

@@ -1 +1 @@
-{"type": "commonjs","types": "webpeerjs.d.ts"} 
+{"type": "commonjs"} 

package/dist/umd/webpeerjs.js

@@ -43220,6 +43220,7 @@
 							const json = JSON.parse(msg);
 							const prefix = json.prefix;
 							const room = json.room;
+							const rooms = json.rooms;
 							const message = json.message;
 							const signal = json.signal;
 							const id = json.id;
@@ -43253,7 +43254,9 @@
 									if(this.#rooms[room]){
 										
 										//inbound message
-										this.#rooms[room].onMessage(message,id);
+										if(message){
+											this.#rooms[room].onMessage(message,id);
+										}
 										
 										//update room members
 										if(!this.#rooms[room].members.includes(id)){
@@ -43263,15 +43266,26 @@
 									}
 								}
 								
+								if(rooms){
+									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(signal){
 									
 									//repply announce with ping
 									if(signal == 'announce'){
-										setTimeout(()=>{this.#ping();},1000);
+										setTimeout(()=>{this.#ping('yes');},1000);
+										//console.log('rooms',rooms)
 									}
 									
 									if(signal == 'ping'){
-										//do nothing
+										//console.log('rooms',rooms)
 									}
 									
 									//update connected webpeers
@@ -43590,7 +43604,7 @@
 		//announce and ping via pupsub peer discovery
 		async #announce(){
 				const topics = CONFIG_PUBSUB_PEER_DISCOVERY;
-				const data = JSON.stringify({prefix:CONFIG_PREFIX,signal:'announce',id:this.#libp2p.peerId.toString(),address:this.address});
+				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,
 				  addrs: [uint8ArrayFromString(data)],
@@ -43602,7 +43616,7 @@
 		}
 		async #ping(){
 				const topics = CONFIG_PUBSUB_PEER_DISCOVERY;
-				const data = JSON.stringify({prefix:CONFIG_PREFIX,signal:'ping',id:this.#libp2p.peerId.toString(),address:this.address});
+				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,
 				  addrs: [uint8ArrayFromString(data)],

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "webpeerjs",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Simple peer-to-peer with IPFS",
   "main": "./dist/umd/webpeerjs.js",
-  "module": "./dist/esm/webpeerjs.js",
+  "module": "./src/webpeerjs.js",
   "imports": {
-    "#/pubsub-peer-discovery/*.js": "@libp2p/pubsub-peer-discovery/dist/src/*.js"
+    "#/pubsub-peer-discovery/*.js": "./node_modules/@libp2p/pubsub-peer-discovery/dist/src/*.js"
   },
   "exports": {
     ".": {
-      "import": "./dist/esm/webpeerjs.js",
+      "import": "./src/webpeerjs.js",
       "require": "./dist/umd/webpeerjs.js"
     }
   },
@@ -25,7 +25,7 @@
     "eslint:fix": "eslint ./src --fix",
 	
     "removedir": "node -e \"var fs = require('fs'); try{process.argv.slice(1).map((fpath) => fs.rmdirSync(fpath, { recursive: true }))}catch(err){console.log(`Dist not found`)}; process.exit(0);\"",
-    "build-all": "tsc -p config/tsconfig-rollup.json && rollup -c temp/config/rollup.config.build.js && echo {\"type\": \"commonjs\",\"types\": \"webpeerjs.d.ts\"}>dist\\umd\\package.json && echo {\"type\": \"module\",\"types\": \"webpeerjs.d.ts\"}>dist\\esm\\package.json",
+    "build-all": "tsc -p config/tsconfig-rollup.json && rollup -c temp/config/rollup.config.build.js && echo {\"type\": \"commonjs\"}>dist\\umd\\package.json && echo {\"type\": \"module\"}>dist\\esm\\package.json",
     "build-types": "tsc -p config/tsconfig-esm.json",
     "build": "npm run removedir dist temp && npm run build-all && npm run build-types",
 	

package/src/config.d.ts

@@ -0,0 +1,22 @@
+export const CONFIG_PREFIX: "webpeerjs";
+export const CONFIG_BLOCKSTORE_PATH: string;
+export const CONFIG_DATASTORE_PATH: string;
+export const CONFIG_DBSTORE_PATH: string;
+export const CONFIG_MAX_CONNECTIONS: 50;
+export const CONFIG_MIN_CONNECTIONS: 0;
+export const CONFIG_DISCOVER_RELAYS: 2;
+export const CONFIG_PEER_DISCOVERY_UNIVERSAL_CONNECTIVITY: "universal-connectivity-browser-peer-discovery";
+export const CONFIG_PUBSUB_PEER_DISCOVERY: string[];
+export const CONFIG_PUPSUB_TOPIC: string;
+export const CONFIG_DELEGATED_API: "https://delegated-ipfs.dev";
+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_KNOWN_BOOTSTRAP_PEERS_ADDRS: {
+    Peers: {
+        Addrs: string[];
+        ID: string;
+        Schema: string;
+    }[];
+}[];
+export const CONFIG_KNOWN_BOOTSTRAP_PEER_IDS: string[];

package/src/package.json

@@ -0,0 +1 @@
+{"type": "module"}

package/src/utils.d.ts

@@ -0,0 +1,8 @@
+export function uint8ArrayToString(uint8Array: any): string;
+export function uint8ArrayFromString(string: any): Uint8Array;
+export function first(farr: any): Promise<any>;
+export function msgIdFnStrictNoSign(msg: any): Promise<Uint8Array>;
+export function metrics(data: any): boolean | undefined;
+export function mkErr(msg: any): Error;
+import { Key } from 'interface-datastore';
+export { PBPeer, Key };

package/src/webpeerjs.js

@@ -217,6 +217,7 @@ class webpeerjs{
 						const json = JSON.parse(msg)
 						const prefix = json.prefix
 						const room = json.room
+						const rooms = json.rooms
 						const message = json.message
 						const signal = json.signal
 						const id = json.id
@@ -250,7 +251,9 @@ class webpeerjs{
 								if(this.#rooms[room]){
 									
 									//inbound message
-									this.#rooms[room].onMessage(message,id)
+									if(message){
+										this.#rooms[room].onMessage(message,id)
+									}
 									
 									//update room members
 									if(!this.#rooms[room].members.includes(id)){
@@ -260,15 +263,26 @@ class webpeerjs{
 								}
 							}
 							
+							if(rooms){
+								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(signal){
 								
 								//repply announce with ping
 								if(signal == 'announce'){
-									setTimeout(()=>{this.#ping()},1000)
+									setTimeout(()=>{this.#ping('yes')},1000)
+									//console.log('rooms',rooms)
 								}
 								
 								if(signal == 'ping'){
-									//do nothing
+									//console.log('rooms',rooms)
 								}
 								
 								//update connected webpeers
@@ -593,7 +607,7 @@ class webpeerjs{
 	//announce and ping via pupsub peer discovery
 	async #announce(){
 			const topics = config.CONFIG_PUBSUB_PEER_DISCOVERY
-			const data = JSON.stringify({prefix:config.CONFIG_PREFIX,signal:'announce',id:this.#libp2p.peerId.toString(),address:this.address})
+			const data = JSON.stringify({prefix:config.CONFIG_PREFIX,signal:'announce',id:this.#libp2p.peerId.toString(),address:this.address,rooms:this.#rooms})
 			const peer = {
 			  publicKey: this.#libp2p.peerId.publicKey,
 			  addrs: [uint8ArrayFromString(data)],
@@ -605,7 +619,7 @@ class webpeerjs{
 	}
 	async #ping(){
 			const topics = config.CONFIG_PUBSUB_PEER_DISCOVERY
-			const data = JSON.stringify({prefix:config.CONFIG_PREFIX,signal:'ping',id:this.#libp2p.peerId.toString(),address:this.address})
+			const data = JSON.stringify({prefix:config.CONFIG_PREFIX,signal:'ping',id:this.#libp2p.peerId.toString(),address:this.address,rooms:this.#rooms})
 			const peer = {
 			  publicKey: this.#libp2p.peerId.publicKey,
 			  addrs: [uint8ArrayFromString(data)],