@leofcoin/peernet 0.9.8 → 0.9.11

package/dist/module/peernet.js

@@ -15,6 +15,7 @@ import MultiWallet from '@leofcoin/multi-wallet';
 
 class PeernetPeer {
   constructor(id, connection) {
+    this._events = {};
     this.id = id;
     this.connection = connection;
 
@@ -48,13 +49,27 @@ class PeernetPeer {
   }
 
   on(event = 'peernet.data', cb) {
+    this._events[event] = cb;
     pubsub.subscribe(event, cb);
     // this.connection.on(event, cb)
   }
 
   removeListener(event = 'data', cb) {
+    delete this._events[event];
     pubsub.unsubscribe(event, cb);
   }
+
+  close() {
+    for (const event of Object.keys(this._events)) {
+      pubsub.unsubscribe(event, this._events[event]);
+    }
+    this._events = [];
+
+    for (const event of this.connection._events.data) {
+      this.connection.removeListener('data', event);
+    }
+    this.connection.destroy();
+  }
 }
 
 /**
@@ -89,6 +104,10 @@ class PeernetClient {
 
     this.p2p.on('peerclose', (peer) => {
       // TODO: close peernetPeer
+      const peernetPeer = connections.get(peer.id);
+      if (peernetPeer) {
+        peernetPeer.close();
+      }
       connections.delete(peer.id);
       pubsub.publish('peer:disconnected', peer);
     });
@@ -244,7 +263,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.9.7";
+var version = "0.9.10";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -1672,7 +1691,7 @@ class PeerDiscovery {
       const connections = peernet.peerMap.get(id);
       if (connections.indexOf(peer.id) === -1) {
         connections.push(peer.id);
-        peernet.peerMap.set(from, connections);
+        peernet.peerMap.set(peer.id, connections);
       }
     }
     return id
@@ -2113,18 +2132,18 @@ class Peernet {
     this.peerId = id;
 
     pubsub.subscribe('peer:discovered', async (peer) => {
-      this._peerHandler.discover(peer);
       peer.on('peernet.data', async (message) => {
         const id = message.id;
         message = new PeernetMessage(Buffer.from(message.data.data));
         const proto = protoFor(message.decoded.data);
         await this._protoHandler({id, proto}, peer);
-        const fulldId = this._getPeerId(peer.id);
-        if (fulldId && this._discovered.indexOf(peer.id) === -1) {
-          this._discovered.push(peer.id);
-          pubsub.publish('peer:connected', peer);
-        }
       });
+      await this._peerHandler.discover(peer);
+      const fulldId = this._getPeerId(peer.id);
+      if (fulldId && this._discovered.indexOf(peer.id) === -1) {
+        this._discovered.push(peer.id);
+        pubsub.publish('peer:connected', peer);
+      }
     });
     pubsub.subscribe('peer:disconnected', async (peer) => {
       let index = this._discovered.indexOf(peer.id);
@@ -2157,6 +2176,9 @@ class Peernet {
      * @type {PeernetClient}
      */
     this.client = new PeernetClient({...options, id});
+    if (globalThis.onbeforeunload) {
+      globalThisaddEventListener('beforeunload', async () => this.client.close());
+    }
     return this
   }
 
@@ -2254,7 +2276,7 @@ class Peernet {
         }
 
         if (data) {
-          data = new DataMessageResponse({hash, data: Buffer.from(data)});
+          data = new DataMessageResponse({hash, data: data.decoded ? Buffer.from(JSON.stringify(data)) : Buffer.from(data)});
 
           const node = await this.prepareMessage(from, data.encoded);
           peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.9.8",
+  "version": "0.9.11",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",

package/src/client.js

@@ -37,6 +37,10 @@ export default class PeernetClient {
 
     this.p2p.on('peerclose', (peer) => {
       // TODO: close peernetPeer
+      const peernetPeer = connections.get(peer.id)
+      if (peernetPeer) {
+        peernetPeer.close()
+      }
       connections.delete(peer.id)
       pubsub.publish('peer:disconnected', peer)
     })

package/src/discovery/peer-discovery.js

@@ -33,7 +33,7 @@ export default class PeerDiscovery {
       const connections = peernet.peerMap.get(id)
       if (connections.indexOf(peer.id) === -1) {
         connections.push(peer.id)
-        peernet.peerMap.set(from, connections)
+        peernet.peerMap.set(peer.id, connections)
       }
     }
     return id

package/src/peer.js

@@ -1,5 +1,6 @@
 export default class PeernetPeer {
   constructor(id, connection) {
+    this._events = {}
     this.id = id
     this.connection = connection
 
@@ -33,11 +34,25 @@ export default class PeernetPeer {
   }
 
   on(event = 'peernet.data', cb) {
+    this._events[event] = cb
     pubsub.subscribe(event, cb)
     // this.connection.on(event, cb)
   }
 
   removeListener(event = 'data', cb) {
+    delete this._events[event]
     pubsub.unsubscribe(event, cb)
   }
+
+  close() {
+    for (const event of Object.keys(this._events)) {
+      pubsub.unsubscribe(event, this._events[event])
+    }
+    this._events = []
+
+    for (const event of this.connection._events.data) {
+      this.connection.removeListener('data', event)
+    }
+    this.connection.destroy()
+  }
 }

package/src/peernet.js

@@ -204,19 +204,19 @@ export default class Peernet {
     this.peerId = id
 
     pubsub.subscribe('peer:discovered', async (peer) => {
-      this._peerHandler.discover(peer)
       peer.on('peernet.data', async (message) => {
-        const id = message.id
-        message = new PeernetMessage(Buffer.from(message.data.data))
-        const proto = protoFor(message.decoded.data)
-        await this._protoHandler({id, proto}, peer)
-        const fulldId = this._getPeerId(peer.id)
-        if (fulldId && this._discovered.indexOf(peer.id) === -1) {
-          this._discovered.push(peer.id)
-          pubsub.publish('peer:connected', peer)
-        }
-      })
-    })
+        const id = message.id;
+        message = new PeernetMessage(Buffer.from(message.data.data));
+        const proto = protoFor(message.decoded.data);
+        await this._protoHandler({id, proto}, peer);
+      });
+      await this._peerHandler.discover(peer);
+      const fulldId = this._getPeerId(peer.id);
+      if (fulldId && this._discovered.indexOf(peer.id) === -1) {
+        this._discovered.push(peer.id);
+        pubsub.publish('peer:connected', peer);
+      }
+    });
     pubsub.subscribe('peer:disconnected', async (peer) => {
       let index = this._discovered.indexOf(peer.id)
       if (index !== -1) this._discovered.splice(index, 1)
@@ -248,6 +248,9 @@ export default class Peernet {
      * @type {PeernetClient}
      */
     this.client = new Client({...options, id})
+    if (globalThis.onbeforeunload) {
+      globalThisaddEventListener('beforeunload', async () => this.client.close());
+    }
     return this
   }
 
@@ -345,7 +348,7 @@ export default class Peernet {
         }
 
         if (data) {
-          data = new DataMessageResponse({hash, data: Buffer.from(data)})
+          data = new DataMessageResponse({hash, data: data.decoded ? Buffer.from(JSON.stringify(data)) : Buffer.from(data)});
 
           const node = await this.prepareMessage(from, data.encoded)
           peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))