@leofcoin/peernet 0.11.5 → 0.11.8

package/src/codec/codec-format-interface.js

@@ -92,6 +92,28 @@ export default class FormatInterface {
     else this.decode()
   }
 
+  toString() {
+    return this.encoded.toString()
+  }
+
+  async toArray() {
+    const array = []
+    for await (const value of this.encoded.values()) {
+      array.push(value)
+    }
+    return array
+  }
+
+  fromString(string) {
+    this.encoded = new Uint8Array(string.split(','))
+    this.decode()
+  }
+
+  fromArray(array) {
+    this.encoded = new Uint8Array([...array])
+    this.decode()
+  }
+
   /**
    * @param {Buffer} encoded
    */

package/src/codec/codecs.js

@@ -2,7 +2,7 @@ export default {
   // just a hash
   'disco-hash': {
     codec: parseInt('30', 16),
-    hashAlg: 'dbl-keccak-512', // ,
+    hashAlg: 'dbl-keccak-256', // ,
     // testnet: 'olivia'
   },
   'peernet-peer-response': {
@@ -33,7 +33,7 @@ export default {
   // message
   'peernet-message': {
     codec: parseInt('706d65', 16),
-    hashAlg: 'keccak-512',
+    hashAlg: 'keccak-256',
   },
   // pubsub
   'peernet-ps': {
@@ -74,6 +74,6 @@ export default {
   // chat message
   'chat-message': {
     codec: parseInt('636d', 16),
-    hashAlg: 'dbl-keccak-512',
+    hashAlg: 'dbl-keccak-256',
   },
 }

package/src/handlers/message.js

@@ -22,7 +22,7 @@ export default class MessageHandler {
     identity = JSON.parse(new TextDecoder().decode(identity))
     const wallet = new MultiWallet(this.network)
     wallet.import(identity.multiWIF)
-    return wallet.sign(hasher.hash.slice(0, 32))
+    return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
   }
 
   /**

package/src/hash/hash.js

@@ -11,7 +11,7 @@ export default class PeernetHash {
     else this.name = 'disco-hash'
     if (options.codecs) this.codecs = options.codecs
     if (buffer) {
-      if (Buffer.isBuffer(buffer)) {
+      if (buffer instanceof Uint8Array) {
         this.discoCodec = new Codec(buffer, this.codecs)
         const name = this.discoCodec.name
 
@@ -35,13 +35,9 @@ export default class PeernetHash {
   get prefix() {
     const length = this.length
     const uint8Array = new Uint8Array(length.length + this.discoCodec.codecBuffer.length)
-    for (let i = 0; i < this.discoCodec.codecBuffer.length; i++) {
-      uint8Array[i] = this.discoCodec.codecBuffer[i]
-    }
+    uint8Array.set(length)
+    uint8Array.set(this.discoCodec.codecBuffer, length.length)
 
-    for (let i = uint8Array.length - 1; i < length.length; i++) {
-      uint8Array[i] = length[i]
-    }
     return uint8Array
   }
 
@@ -100,10 +96,11 @@ export default class PeernetHash {
 
     this.codec = this.discoCodec.encode();
     this.codec = this.discoCodec.codecBuffer
-    this.hash = Buffer.concat([
-      this.prefix,
-      this.digest,
-    ])
+    const uint8Array = new Uint8Array(this.digest.length + this.prefix.length)
+    uint8Array.set(this.prefix)
+    uint8Array.set(this.digest, this.prefix.length)
+
+    this.hash = uint8Array
 
     return this.hash
   }

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> */