fix : fix bug room members is mixed

nuzulul · Jun 24, 2024 · 521db2c · 521db2c
1 parent 330d45e
commit 521db2c
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 170 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpeerjs",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Simple peer-to-peer with IPFS",
   "main": "./dist/umd/webpeerjs.js",
   "module": "./src/webpeerjs.js",

diff --git a/src/webpeerjs.js b/src/webpeerjs.js
@@ -327,13 +327,18 @@ class webpeerjs{
 							}
 
 							if(rooms){
-								for(const room of Object.keys(this.#rooms)){
-									//update room members
-									if(!this.#rooms[room].members.includes(id)){
-										if(this.#connectedPeers.has(id)){
-											this.#rooms[room].members.push(id)
-											this.#rooms[room].onMembers(this.#rooms[room].members)
+								for(const room of rooms){
+
+									if(this.#rooms[room]){
+
+										//update room members
+										if(!this.#rooms[room].members.includes(id)){
+											if(this.#connectedPeers.has(id)){
+												this.#rooms[room].members.push(id)
+												this.#rooms[room].onMembers(this.#rooms[room].members)
+											}
 										}
+
 									}
 								}
 							}
@@ -1072,7 +1077,7 @@ class webpeerjs{
 	//announce and ping via pupsub peer discovery
 	async #announce(){
 			const 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:this.#rooms})
+			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,
 			  addrs: [uint8ArrayFromString(data)],
@@ -1084,7 +1089,7 @@ class webpeerjs{
 	}
 	async #ping(){
 			const 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:this.#rooms})
+			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,
 			  addrs: [uint8ArrayFromString(data)],

diff --git a/test/project/.gitignore b/test/project/.gitignore
diff --git a/test/project/counter.js b/test/project/counter.js
diff --git a/test/project/index.html b/test/project/index.html
@@ -2,12 +2,46 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>WebpeerJS</title>
   </head>
   <body>
-    <div id="app"></div>
-    <script type="module" src="/main.js"></script>
+    <h3>Basic Connection Demo of <a href="https://github.com/nuzulul/webpeerjs">WebpeerJS</a></h3>
+	<div id="app"><ul id="myList"></ul></div>
+
+	<script type="module">
+
+        import { webpeerjs } from 'webpeerjs'
+
+		void async function main() {
+
+			function write(input){
+				const node = document.createElement("li")
+				const textnode = document.createTextNode(input)
+				node.appendChild(textnode)
+				document.getElementById("myList").appendChild(node)
+			}
+
+			const node = await webpeerjs.createWebpeer()
+
+			write(`My node id : ${node.id}`)
+
+			const room = 'myroom'
+
+			write(`joinRoom : ${room}`)
+
+			const [broadcast,listen,members] = node.joinRoom(room)
+
+			listen((message,id) => {
+				write(`Message from ${id} : ${message}`)
+			})
+
+			members((data) => {
+				write(`Members update : ${data}`)
+				broadcast('hello')
+			})
+
+		}()
+	</script>
   </body>
-</html>
+</html>
diff --git a/test/project/javascript.svg b/test/project/javascript.svg
diff --git a/test/project/main.js b/test/project/main.js
diff --git a/test/project/public/vite.svg b/test/project/public/vite.svg
diff --git a/test/project/style.css b/test/project/style.css