@leofcoin/peernet 0.11.4 → 0.11.7

package/dist/commonjs/{codec-8c8c652f.js → codec-45796010.js}

@@ -16,7 +16,7 @@ var codecs = {
   // just a hash
   'disco-hash': {
     codec: parseInt('30', 16),
-    hashAlg: 'dbl-keccak-512', // ,
+    hashAlg: 'dbl-keccak-256', // ,
     // testnet: 'olivia'
   },
   'peernet-peer-response': {
@@ -47,7 +47,7 @@ var codecs = {
   // message
   'peernet-message': {
     codec: parseInt('706d65', 16),
-    hashAlg: 'keccak-512',
+    hashAlg: 'keccak-256',
   },
   // pubsub
   'peernet-ps': {
@@ -88,7 +88,7 @@ var codecs = {
   // chat message
   'chat-message': {
     codec: parseInt('636d', 16),
-    hashAlg: 'dbl-keccak-512',
+    hashAlg: 'dbl-keccak-256',
   },
 };
 

package/dist/commonjs/codec-format-interface.js

@@ -3,7 +3,7 @@
 var bs32 = require('@vandeurenglenn/base32');
 var bs58 = require('@vandeurenglenn/base58');
 var isHex = require('@vandeurenglenn/is-hex');
-var codec = require('./codec-8c8c652f.js');
+var codec = require('./codec-45796010.js');
 var hash = require('./hash.js');
 require('varint');
 require('keccak');
@@ -102,6 +102,28 @@ 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/dist/commonjs/codec.js

@@ -4,7 +4,7 @@ require('varint');
 require('@vandeurenglenn/base32');
 require('@vandeurenglenn/base58');
 require('@vandeurenglenn/is-hex');
-var codec = require('./codec-8c8c652f.js');
+var codec = require('./codec-45796010.js');
 
 
 

package/dist/commonjs/dht-response.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('@vandeurenglenn/base32');
 require('@vandeurenglenn/base58');
 require('@vandeurenglenn/is-hex');
-require('./codec-8c8c652f.js');
+require('./codec-45796010.js');
 require('varint');
 require('./hash.js');
 require('keccak');

package/dist/commonjs/dht.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('@vandeurenglenn/base32');
 require('@vandeurenglenn/base58');
 require('@vandeurenglenn/is-hex');
-require('./codec-8c8c652f.js');
+require('./codec-45796010.js');
 require('varint');
 require('./hash.js');
 require('keccak');

package/dist/commonjs/hash.js

@@ -5,7 +5,7 @@ var varint = require('varint');
 var bs32 = require('@vandeurenglenn/base32');
 var bs58 = require('@vandeurenglenn/base58');
 var isHex = require('@vandeurenglenn/is-hex');
-var codec = require('./codec-8c8c652f.js');
+var codec = require('./codec-45796010.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -21,7 +21,7 @@ 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.PeernetCodec(buffer, this.codecs);
         const name = this.discoCodec.name;
 
@@ -45,13 +45,9 @@ 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
   }
 
@@ -110,10 +106,11 @@ 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/dist/commonjs/{http-da1c8d33.js → http-906864ff.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.3";
+var version = "0.11.6";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),

package/dist/commonjs/peernet-message.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('@vandeurenglenn/base32');
 require('@vandeurenglenn/base58');
 require('@vandeurenglenn/is-hex');
-require('./codec-8c8c652f.js');
+require('./codec-45796010.js');
 require('varint');
 require('./hash.js');
 require('keccak');

package/dist/commonjs/peernet.js

@@ -9,7 +9,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 var request = require('./request.js');
 var response = require('./response.js');
 var fetch = require('node-fetch');
-var codec = require('./codec-8c8c652f.js');
+var codec = require('./codec-45796010.js');
 var hash = require('./hash.js');
 var generateAccount = require('@leofcoin/generate-account');
 var bs58check = require('bs58check');
@@ -1437,7 +1437,7 @@ 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))
   }
 
   /**
@@ -1563,7 +1563,15 @@ class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return this.client.connections
+    return Object.keys(this.client.connections)
+  }
+
+  get connections() {
+    return Object.values(this.client.connections)
+  }
+
+  get peerEntries() {
+    return Object.entries(this.client.connections)
   }
 
   /**
@@ -1628,7 +1636,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-da1c8d33.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-906864ff.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -1777,7 +1785,7 @@ class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new dht({hash});
     this.client.id;
-    for (const peer of this.peers) {
+    for (const peer of this.connections) {
       const node = await this.prepareMessage(peer.id, data.encoded);
 
       const result = await peer.request(node.encoded);
@@ -1875,9 +1883,9 @@ class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
 
     const id = closestPeer.id.toString();
-    if (this.peers) {
-      let closest = this.peers.filter((peer) => {
-        if (this._getPeerId(peer.id) === id) return peer
+    if (this.connections) {
+      let closest = this.connections.filter((peer) => {
+        if (peer.id === id) return peer
       });
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -1885,8 +1893,8 @@ class Peernet {
       const node = await this.prepareMessage(id, data.encoded);
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
-        closest = this.peers.filter((peer) => {
-          if (peer.id.toString() === id) return peer
+        closest = this.connections.filter((peer) => {
+          if (peer.id === id) return peer
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
@@ -2027,9 +2035,9 @@ class Peernet {
     if (data instanceof Uint8Array === false) data = new TextEncoder().encode(JSON.stringify(data));
     const id = Math.random().toString(36).slice(-12);
     data = new PsMessage({data, topic});
-    for (const peer of this.peers) {
-      if (peer.connection._connected) {
-        if (peer.id.toString() !== this.peerId.toString()) {
+    for (const peer of this.connections) {
+      if (peer.connected) {
+        if (peer.id !== this.peerId) {
           const node = await this.prepareMessage(peer.id, data.encoded);
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }

package/dist/commonjs/request.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('@vandeurenglenn/base32');
 require('@vandeurenglenn/base58');
 require('@vandeurenglenn/is-hex');
-require('./codec-8c8c652f.js');
+require('./codec-45796010.js');
 require('varint');
 require('./hash.js');
 require('keccak');

package/dist/commonjs/response.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('@vandeurenglenn/base32');
 require('@vandeurenglenn/base58');
 require('@vandeurenglenn/is-hex');
-require('./codec-8c8c652f.js');
+require('./codec-45796010.js');
 require('varint');
 require('./hash.js');
 require('keccak');

package/dist/module/peernet.js

@@ -630,7 +630,7 @@ var codecs = {
   // just a hash
   'disco-hash': {
     codec: parseInt('30', 16),
-    hashAlg: 'dbl-keccak-512', // ,
+    hashAlg: 'dbl-keccak-256', // ,
     // testnet: 'olivia'
   },
   'peernet-peer-response': {
@@ -661,7 +661,7 @@ var codecs = {
   // message
   'peernet-message': {
     codec: parseInt('706d65', 16),
-    hashAlg: 'keccak-512',
+    hashAlg: 'keccak-256',
   },
   // pubsub
   'peernet-ps': {
@@ -702,7 +702,7 @@ var codecs = {
   // chat message
   'chat-message': {
     codec: parseInt('636d', 16),
-    hashAlg: 'dbl-keccak-512',
+    hashAlg: 'dbl-keccak-256',
   },
 };
 
@@ -831,7 +831,7 @@ 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 PeernetCodec(buffer, this.codecs);
         const name = this.discoCodec.name;
 
@@ -855,13 +855,9 @@ 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
   }
 
@@ -920,10 +916,11 @@ 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
   }
@@ -1062,6 +1059,28 @@ 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
    */
@@ -2015,7 +2034,7 @@ 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))
   }
 
   /**
@@ -2141,7 +2160,15 @@ class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return this.client.connections
+    return Object.keys(this.client.connections)
+  }
+
+  get connections() {
+    return Object.values(this.client.connections)
+  }
+
+  get peerEntries() {
+    return Object.entries(this.client.connections)
   }
 
   /**
@@ -2347,7 +2374,7 @@ class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new DHTMessage({hash});
     this.client.id;
-    for (const peer of this.peers) {
+    for (const peer of this.connections) {
       const node = await this.prepareMessage(peer.id, data.encoded);
 
       const result = await peer.request(node.encoded);
@@ -2445,9 +2472,9 @@ class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
 
     const id = closestPeer.id.toString();
-    if (this.peers) {
-      let closest = this.peers.filter((peer) => {
-        if (this._getPeerId(peer.id) === id) return peer
+    if (this.connections) {
+      let closest = this.connections.filter((peer) => {
+        if (peer.id === id) return peer
       });
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -2455,8 +2482,8 @@ class Peernet {
       const node = await this.prepareMessage(id, data.encoded);
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
-        closest = this.peers.filter((peer) => {
-          if (peer.id.toString() === id) return peer
+        closest = this.connections.filter((peer) => {
+          if (peer.id === id) return peer
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
@@ -2597,9 +2624,9 @@ class Peernet {
     if (data instanceof Uint8Array === false) data = new TextEncoder().encode(JSON.stringify(data));
     const id = Math.random().toString(36).slice(-12);
     data = new PsMessage({data, topic});
-    for (const peer of this.peers) {
-      if (peer.connection._connected) {
-        if (peer.id.toString() !== this.peerId.toString()) {
+    for (const peer of this.connections) {
+      if (peer.connected) {
+        if (peer.id !== this.peerId) {
           const node = await this.prepareMessage(peer.id, data.encoded);
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }

package/package.json

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

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

@@ -108,7 +108,15 @@ export default class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return this.client.connections
+    return Object.keys(this.client.connections)
+  }
+
+  get connections() {
+    return Object.values(this.client.connections)
+  }
+
+  get peerEntries() {
+    return Object.entries(this.client.connections)
   }
 
   /**
@@ -317,7 +325,7 @@ 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.peers) {
+    for (const peer of this.connections) {
       const node = await this.prepareMessage(peer.id, data.encoded)
 
       const result = await peer.request(node.encoded)
@@ -415,9 +423,9 @@ export default class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
 
     const id = closestPeer.id.toString()
-    if (this.peers) {
-      let closest = this.peers.filter((peer) => {
-        if (this._getPeerId(peer.id) === id) return peer
+    if (this.connections) {
+      let closest = this.connections.filter((peer) => {
+        if (peer.id === id) return peer
       })
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -425,8 +433,8 @@ export default class Peernet {
       const node = await this.prepareMessage(id, data.encoded)
       if (closest[0]) data = await closest[0].request(node.encoded)
       else {
-        closest = this.peers.filter((peer) => {
-          if (peer.id.toString() === id) return peer
+        closest = this.connections.filter((peer) => {
+          if (peer.id === id) return peer
         })
         if (closest[0]) data = await closest[0].request(node.encoded)
       }
@@ -568,9 +576,9 @@ export default class Peernet {
     if (data instanceof Uint8Array === false) data = new TextEncoder().encode(JSON.stringify(data))
     const id = Math.random().toString(36).slice(-12)
     data = new PsMessage({data, topic})
-    for (const peer of this.peers) {
-      if (peer.connection._connected) {
-        if (peer.id.toString() !== this.peerId.toString()) {
+    for (const peer of this.connections) {
+      if (peer.connected) {
+        if (peer.id !== this.peerId) {
           const node = await this.prepareMessage(peer.id, data.encoded)
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
         }