webpeerjs 0.0.2 → 0.0.4

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "webpeerjs",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Simple peer-to-peer with IPFS",
   "main": "./dist/umd/webpeerjs.js",
   "module": "./dist/esm/webpeerjs.js",
-  "imports": {
-    "#/pubsub-peer-discovery/*.js": "@libp2p/pubsub-peer-discovery/dist/src/*.js"
-  },
   "exports": {
     ".": {
       "import": "./dist/esm/webpeerjs.js",
@@ -25,7 +22,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/peer.js

@@ -0,0 +1,64 @@
+/* eslint-disable import/export */
+/* eslint-disable complexity */
+/* eslint-disable @typescript-eslint/no-namespace */
+/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
+/* eslint-disable @typescript-eslint/no-empty-interface */
+import { decodeMessage, encodeMessage, message } from 'protons-runtime';
+import { alloc as uint8ArrayAlloc } from 'uint8arrays/alloc';
+export var Peer;
+(function (Peer) {
+    let _codec;
+    Peer.codec = () => {
+        if (_codec == null) {
+            _codec = message((obj, w, opts = {}) => {
+                if (opts.lengthDelimited !== false) {
+                    w.fork();
+                }
+                if ((obj.publicKey != null && obj.publicKey.byteLength > 0)) {
+                    w.uint32(10);
+                    w.bytes(obj.publicKey);
+                }
+                if (obj.addrs != null) {
+                    for (const value of obj.addrs) {
+                        w.uint32(18);
+                        w.bytes(value);
+                    }
+                }
+                if (opts.lengthDelimited !== false) {
+                    w.ldelim();
+                }
+            }, (reader, length) => {
+                const obj = {
+                    publicKey: uint8ArrayAlloc(0),
+                    addrs: []
+                };
+                const end = length == null ? reader.len : reader.pos + length;
+                while (reader.pos < end) {
+                    const tag = reader.uint32();
+                    switch (tag >>> 3) {
+                        case 1: {
+                            obj.publicKey = reader.bytes();
+                            break;
+                        }
+                        case 2: {
+                            obj.addrs.push(reader.bytes());
+                            break;
+                        }
+                        default: {
+                            reader.skipType(tag & 7);
+                            break;
+                        }
+                    }
+                }
+                return obj;
+            });
+        }
+        return _codec;
+    };
+    Peer.encode = (obj) => {
+        return encodeMessage(obj, Peer.codec());
+    };
+    Peer.decode = (buf) => {
+        return decodeMessage(buf, Peer.codec());
+    };
+})(Peer || (Peer = {}));

package/src/utils.js

@@ -1,6 +1,6 @@
 import * as config from  './config'
 
-import { Peer as PBPeer } from '#/pubsub-peer-discovery/peer.js'
+import { Peer as PBPeer } from './peer'
 
 import { Key } from 'interface-datastore'
 

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)],