@leofcoin/peernet 0.9.6 → 0.9.9

package/dist/module/peernet.js

@@ -76,7 +76,7 @@ class PeernetClient {
     this.topic = Buffer.from(sha256(`${options.networkName}-${options.networkVersion}`).toString());
 
     const trackers = [
-      'wss://star.leofcoin.org:7575',
+      'wss://star.leofcoin.org',
       'wss://tracker.openwebtorrent.com',
       // 'wss://tracker.sloppyta.co:443/announce',
     ];
@@ -244,7 +244,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.9.4";
+var version = "0.9.7";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -1801,17 +1801,13 @@ class DhtEarth {
     const peerLoc = await this.getCoordinates(address);
 
     for (const provider of providers) {
-      all.push(this.getDistance(peerLoc, provider));
+      if (provider.address === '127.0.0.1') all.push({provider, distance: 0});
+      else all.push(this.getDistance(peerLoc, provider));
     }
 
     all = await Promise.all(all);
-
-    const closestPeer = all.reduce((p, c) => {
-      if (!c.distance || c.distance === NaN) c.distance = 0;
-      if (c.distance < p || p === 0) return c.provider;
-    }, 0);
-
-    return closestPeer;
+    all = all.sort((previous, current) => previous.distance - current.distance);
+    return all[0].provider;
   }
 
   /**

package/package.json

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

package/src/client.js

@@ -24,7 +24,7 @@ export default class PeernetClient {
     this.topic = Buffer.from(sha256(`${options.networkName}-${options.networkVersion}`).toString())
 
     const trackers = [
-      'wss://star.leofcoin.org:7575',
+      'wss://star.leofcoin.org',
       'wss://tracker.openwebtorrent.com',
       // 'wss://tracker.sloppyta.co:443/announce',
     ]
@@ -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/dht/dht.js

@@ -88,17 +88,13 @@ export default class DhtEarth {
     const peerLoc = await this.getCoordinates(address)
 
     for (const provider of providers) {
-      all.push(this.getDistance(peerLoc, provider))
+      if (provider.address === '127.0.0.1') all.push({provider, distance: 0})
+      else all.push(this.getDistance(peerLoc, provider))
     }
 
-    all = await Promise.all(all)
-
-    const closestPeer = all.reduce((p, c) => {
-      if (!c.distance || c.distance === NaN) c.distance = 0
-      if (c.distance < p || p === 0) return c.provider;
-    }, 0)
-
-    return closestPeer;
+    all = await Promise.all(all);
+    all = all.sort((previous, current) => previous.distance - current.distance)
+    return all[0].provider;
   }
 
   /**

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

@@ -345,7 +345,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})))