@leofcoin/peernet 0.11.7 → 0.11.8

package/dist/commonjs/{http-906864ff.js → http-12850e18.js}

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 var Koa__default = /*#__PURE__*/_interopDefaultLegacy(Koa);
 
-var version = "0.11.6";
+var version = "0.11.7";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),

package/dist/commonjs/peernet.js

@@ -307,6 +307,7 @@ class Peer {
   #senderMap = new Map()
   #iceCompleteTimer
   #channel
+  #peerId
 
   get connection() {
     return this.#connection
@@ -333,12 +334,17 @@ constructor(options = {}) {
       down: 0
     };
 
-    this.channelName = options.channelName || Buffer.from(Math.random().toString(36).slice(-12)).toString('hex');
-    console.log(this.channelName);
+    this.channelName = options.channelName;
+
+    this.#peerId = options.peerId;
     this.options = options;
     this.#init();
    }
 
+   get peerId() {
+     return this.#peerId
+   }
+
    set socketClient(value) {
      // this.socketClient?.pubsub.unsubscribe('signal', this._in)
      this._socketClient = value;
@@ -357,6 +363,7 @@ constructor(options = {}) {
    request(data) {
     return new Promise((resolve, reject) => {
       const id = Math.random().toString(36).slice(-12);
+      // TODO: get rid of JSON
       data = new TextEncoder().encode(JSON.stringify({id, data}));
       const _onData = message => {
         message = JSON.parse(new TextDecoder().decode(message.data));
@@ -405,7 +412,7 @@ constructor(options = {}) {
            if (message.to) {
              if (message.to === this.id) pubsub.publish('peer:data', message);
            } else pubsub.publish('peer:data', message);
-           this.bw.down += message.length;
+           this.bw.down += message.length || message.byteLength;
          };
          this.channel = message.channel;
        };
@@ -423,7 +430,7 @@ constructor(options = {}) {
           if (message.to) {
             if (message.to === this.id) pubsub.publish('peer:data', message);
           } else pubsub.publish('peer:data', message);
-          this.bw.down += message.length;
+          this.bw.down += message.length || message.byteLength;
         };
 
        const offer = await this.#connection.createOffer();
@@ -526,7 +533,7 @@ class Client {
     }
     const peers = await this.socketClient.peernet.join({id: this.id});
     for (const id of peers) {
-      if (id !== this.id && !this.#connections[id]) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id});
+      if (id !== this.id && !this.#connections[id]) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
     }
     this.setupListeners();
 
@@ -585,7 +592,7 @@ class Client {
                 delete this.#connections[id];
               }
               // reconnect
-              if (id !== this.id) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id});
+              if (id !== this.id) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
             }
 
           }
@@ -615,7 +622,7 @@ class Client {
       delete this.#connections[id];
     }
     // RTCPeerConnection
-    this.#connections[id] = new Peer({initiator: true, channelName: `${this.id}:${id}`, socketClient: this.socketClient, id: this.id, to: id});
+    this.#connections[id] = new Peer({initiator: true, channelName: `${this.id}:${id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
     console.log(`peer ${id} joined`);
   }
 
@@ -1636,7 +1643,7 @@ class Peernet {
 					protocol: 'peernet-v0.1.0', host: '127.0.0.1', port: options.port
 				});
 			} else {
-				const http = await Promise.resolve().then(function () { return require('./http-906864ff.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-12850e18.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -1719,6 +1726,7 @@ class Peernet {
    * @param {PeernetPeer} peer - peernet peer
    */
   async _protoHandler(message, peer, from) {
+
     const {id, proto} = message;
     this.bw.down += proto.encoded.length;
 
@@ -1769,8 +1777,7 @@ class Peernet {
 
           this.bw.up += node.encoded.length;
         }
-      } else if (proto.name === 'peernet-ps' &&
-                 this._getPeerId(peer.id) !== this.id.toString()) {
+      } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString());
       }
     // }
@@ -1785,12 +1792,11 @@ class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new dht({hash});
     this.client.id;
-    for (const peer of this.connections) {
-      const node = await this.prepareMessage(peer.id, data.encoded);
-
-      const result = await peer.request(node.encoded);
-
-      let proto = protoFor(result.data);
+    const walk = async peer => {
+      const node = await this.prepareMessage(peer.peerId, data.encoded);
+      let result = await peer.request(node.encoded);
+      result = new Uint8Array(Object.values(result));
+      let proto = protoFor(result);
 
       if (proto.name !== 'peernet-message') throw encapsulatedError()
       const from = proto.decoded.from;
@@ -1813,8 +1819,14 @@ class Peernet {
       };
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash);
+    };
+    let walks = [];
+    for (const peer of this.connections) {
+      if (peer.peerId !== this.id) {
+        walks.push(walk(peer));
+      }
     }
-    return
+    return Promise.all(walks)
   }
 
   /**
@@ -1885,7 +1897,7 @@ class Peernet {
     const id = closestPeer.id.toString();
     if (this.connections) {
       let closest = this.connections.filter((peer) => {
-        if (peer.id === id) return peer
+        if (peer.peerId === id) return peer
       });
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -1894,7 +1906,7 @@ class Peernet {
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
         closest = this.connections.filter((peer) => {
-          if (peer.id === id) return peer
+          if (peer.peerId === id) return peer
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
@@ -2037,8 +2049,8 @@ class Peernet {
     data = new PsMessage({data, topic});
     for (const peer of this.connections) {
       if (peer.connected) {
-        if (peer.id !== this.peerId) {
-          const node = await this.prepareMessage(peer.id, data.encoded);
+        if (peer.peerId !== this.peerId) {
+          const node = await this.prepareMessage(peer.peerId, data.encoded);
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }
       } else {
@@ -2063,7 +2075,7 @@ class Peernet {
   }
 
   async removePeer(peer) {
-    delete this.client.connections[peer.id];
+    delete this.client.connections[peer.peerId];
   }
 
   get Buffer() {

package/dist/module/peernet.js

@@ -264,6 +264,7 @@ class Peer {
   #senderMap = new Map()
   #iceCompleteTimer
   #channel
+  #peerId
 
   get connection() {
     return this.#connection
@@ -290,12 +291,17 @@ constructor(options = {}) {
       down: 0
     };
 
-    this.channelName = options.channelName || Buffer.from(Math.random().toString(36).slice(-12)).toString('hex');
-    console.log(this.channelName);
+    this.channelName = options.channelName;
+
+    this.#peerId = options.peerId;
     this.options = options;
     this.#init();
    }
 
+   get peerId() {
+     return this.#peerId
+   }
+
    set socketClient(value) {
      // this.socketClient?.pubsub.unsubscribe('signal', this._in)
      this._socketClient = value;
@@ -314,6 +320,7 @@ constructor(options = {}) {
    request(data) {
     return new Promise((resolve, reject) => {
       const id = Math.random().toString(36).slice(-12);
+      // TODO: get rid of JSON
       data = new TextEncoder().encode(JSON.stringify({id, data}));
       const _onData = message => {
         message = JSON.parse(new TextDecoder().decode(message.data));
@@ -362,7 +369,7 @@ constructor(options = {}) {
            if (message.to) {
              if (message.to === this.id) pubsub.publish('peer:data', message);
            } else pubsub.publish('peer:data', message);
-           this.bw.down += message.length;
+           this.bw.down += message.length || message.byteLength;
          };
          this.channel = message.channel;
        };
@@ -380,7 +387,7 @@ constructor(options = {}) {
           if (message.to) {
             if (message.to === this.id) pubsub.publish('peer:data', message);
           } else pubsub.publish('peer:data', message);
-          this.bw.down += message.length;
+          this.bw.down += message.length || message.byteLength;
         };
 
        const offer = await this.#connection.createOffer();
@@ -483,7 +490,7 @@ class Client {
     }
     const peers = await this.socketClient.peernet.join({id: this.id});
     for (const id of peers) {
-      if (id !== this.id && !this.#connections[id]) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id});
+      if (id !== this.id && !this.#connections[id]) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
     }
     this.setupListeners();
 
@@ -542,7 +549,7 @@ class Client {
                 delete this.#connections[id];
               }
               // reconnect
-              if (id !== this.id) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id});
+              if (id !== this.id) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
             }
 
           }
@@ -572,7 +579,7 @@ class Client {
       delete this.#connections[id];
     }
     // RTCPeerConnection
-    this.#connections[id] = new Peer({initiator: true, channelName: `${this.id}:${id}`, socketClient: this.socketClient, id: this.id, to: id});
+    this.#connections[id] = new Peer({initiator: true, channelName: `${this.id}:${id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
     console.log(`peer ${id} joined`);
   }
 
@@ -2308,6 +2315,7 @@ class Peernet {
    * @param {PeernetPeer} peer - peernet peer
    */
   async _protoHandler(message, peer, from) {
+
     const {id, proto} = message;
     this.bw.down += proto.encoded.length;
 
@@ -2358,8 +2366,7 @@ class Peernet {
 
           this.bw.up += node.encoded.length;
         }
-      } else if (proto.name === 'peernet-ps' &&
-                 this._getPeerId(peer.id) !== this.id.toString()) {
+      } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString());
       }
     // }
@@ -2374,12 +2381,11 @@ class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new DHTMessage({hash});
     this.client.id;
-    for (const peer of this.connections) {
-      const node = await this.prepareMessage(peer.id, data.encoded);
-
-      const result = await peer.request(node.encoded);
-
-      let proto = protoFor(result.data);
+    const walk = async peer => {
+      const node = await this.prepareMessage(peer.peerId, data.encoded);
+      let result = await peer.request(node.encoded);
+      result = new Uint8Array(Object.values(result));
+      let proto = protoFor(result);
 
       if (proto.name !== 'peernet-message') throw encapsulatedError()
       const from = proto.decoded.from;
@@ -2402,8 +2408,14 @@ class Peernet {
       };
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash);
+    };
+    let walks = [];
+    for (const peer of this.connections) {
+      if (peer.peerId !== this.id) {
+        walks.push(walk(peer));
+      }
     }
-    return
+    return Promise.all(walks)
   }
 
   /**
@@ -2474,7 +2486,7 @@ class Peernet {
     const id = closestPeer.id.toString();
     if (this.connections) {
       let closest = this.connections.filter((peer) => {
-        if (peer.id === id) return peer
+        if (peer.peerId === id) return peer
       });
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -2483,7 +2495,7 @@ class Peernet {
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
         closest = this.connections.filter((peer) => {
-          if (peer.id === id) return peer
+          if (peer.peerId === id) return peer
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
@@ -2626,8 +2638,8 @@ class Peernet {
     data = new PsMessage({data, topic});
     for (const peer of this.connections) {
       if (peer.connected) {
-        if (peer.id !== this.peerId) {
-          const node = await this.prepareMessage(peer.id, data.encoded);
+        if (peer.peerId !== this.peerId) {
+          const node = await this.prepareMessage(peer.peerId, data.encoded);
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }
       } else {
@@ -2652,7 +2664,7 @@ class Peernet {
   }
 
   async removePeer(peer) {
-    delete this.client.connections[peer.id];
+    delete this.client.connections[peer.peerId];
   }
 
   get Buffer() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@leofcoin/generate-account": "^1.0.2",
     "@leofcoin/multi-wallet": "^2.1.2",
-    "@leofcoin/peernet-swarm": "^0.1.9",
+    "@leofcoin/peernet-swarm": "^0.1.12",
     "@leofcoin/storage": "^2.3.0",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",

package/src/peernet.js

@@ -257,6 +257,7 @@ export default class Peernet {
    * @param {PeernetPeer} peer - peernet peer
    */
   async _protoHandler(message, peer, from) {
+
     const {id, proto} = message
     this.bw.down += proto.encoded.length
 
@@ -309,8 +310,7 @@ export default class Peernet {
 
           this.bw.up += node.encoded.length
         }
-      } else if (proto.name === 'peernet-ps' &&
-                 this._getPeerId(peer.id) !== this.id.toString()) {
+      } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString())
       }
     // }
@@ -325,12 +325,11 @@ export default class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new DHTMessage({hash})
     const clientId = this.client.id
-    for (const peer of this.connections) {
-      const node = await this.prepareMessage(peer.id, data.encoded)
-
-      const result = await peer.request(node.encoded)
-
-      let proto = protoFor(result.data)
+    const walk = async peer => {
+      const node = await this.prepareMessage(peer.peerId, data.encoded)
+      let result = await peer.request(node.encoded)
+      result = new Uint8Array(Object.values(result))
+      let proto = protoFor(result)
 
       if (proto.name !== 'peernet-message') throw encapsulatedError()
       const from = proto.decoded.from
@@ -354,7 +353,13 @@ export default class Peernet {
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash)
     }
-    return
+    let walks = []
+    for (const peer of this.connections) {
+      if (peer.peerId !== this.id) {
+        walks.push(walk(peer))
+      }
+    }
+    return Promise.all(walks)
   }
 
   /**
@@ -425,7 +430,7 @@ export default class Peernet {
     const id = closestPeer.id.toString()
     if (this.connections) {
       let closest = this.connections.filter((peer) => {
-        if (peer.id === id) return peer
+        if (peer.peerId === id) return peer
       })
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -434,7 +439,7 @@ export default class Peernet {
       if (closest[0]) data = await closest[0].request(node.encoded)
       else {
         closest = this.connections.filter((peer) => {
-          if (peer.id === id) return peer
+          if (peer.peerId === id) return peer
         })
         if (closest[0]) data = await closest[0].request(node.encoded)
       }
@@ -578,8 +583,8 @@ export default class Peernet {
     data = new PsMessage({data, topic})
     for (const peer of this.connections) {
       if (peer.connected) {
-        if (peer.id !== this.peerId) {
-          const node = await this.prepareMessage(peer.id, data.encoded)
+        if (peer.peerId !== this.peerId) {
+          const node = await this.prepareMessage(peer.peerId, data.encoded)
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
         }
       } else {
@@ -604,7 +609,7 @@ export default class Peernet {
   }
 
   async removePeer(peer) {
-    delete this.client.connections[peer.id]
+    delete this.client.connections[peer.peerId]
   }
 
   get Buffer() {

package/test4.js

@@ -0,0 +1,7 @@
+const Client = require('./dist/commonjs/peernet.js')
+
+const client = new Client({root: '.peernet/test4'})
+
+pubsub.subscribe('peer:connected', async peer => {
+  await peernet.get("ba5xcadcnub27naa7zrcvtmyruviahaiwvupatfgjkvdgcehuif7clissf")
+})

package/webpack.config.js

@@ -17,7 +17,7 @@ module.exports = [{
   })
 ],
 optimization: {
-  minimize: true
+  minimize: false
 },
 resolve: {
         extensions: [ '.ts', '.js' ],

package/dist/browser/peernet.js.LICENSE.txt

@@ -1,40 +0,0 @@
-/*!
- * Determine if an object is a Buffer
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-
-/*!
- * assert.js - assertions for javascript
- * Copyright (c) 2018, Christopher Jeffrey (MIT License).
- * https://github.com/chjj/bsert
- */
-
-/*!
- * base32.js - base32 for bcrypto
- * Copyright (c) 2014-2019, Christopher Jeffrey (MIT License).
- * https://github.com/bcoin-org/bcrypto
- *
- * Parts of this software are based on bitcoin/bitcoin:
- *   Copyright (c) 2009-2019, The Bitcoin Core Developers (MIT License).
- *   Copyright (c) 2009-2019, The Bitcoin Developers (MIT License).
- *   https://github.com/bitcoin/bitcoin
- *
- * Resources:
- *   https://tools.ietf.org/html/rfc4648
- *   https://github.com/bitcoin/bitcoin/blob/11d486d/src/utilstrencodings.cpp#L230
- */
-
-/*! For license information please see browser.js.LICENSE.txt */
-
-/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */