@leofcoin/peernet 0.9.4 → 0.9.7

package/dist/browser/peernet.js

@@ -261,7 +261,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.9.3";
+var version = "0.9.6";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -1818,17 +1818,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;
   }
 
   /**
@@ -2000,11 +1996,11 @@ class Peernet {
   }
 
   addProto(name, proto) {
-    if (!globalThis.peernet.protos[name]) globalThis.peernet.protos[name] = proto;
+    if (!this.protos[name]) this.protos[name] = proto;
   }
 
-  addCodec(name, proto) {
-    if (!globalThis.peernet.codecs[name]) globalThis.peernet.codecs[name] = proto;
+  addCodec(name, codec) {
+    if (!this.codecs[name]) this.codecs[name] = codec;
   }
 
   async addStore(name, prefix, root, isPrivate = true) {
@@ -2088,7 +2084,9 @@ class Peernet {
       'peernet-ps': PsMessage,
       'chat-message': ChatMessage,
     };
+
     this.protos = globalThis.peernet.protos;
+    this.codecs = codecs;
 
     this._messageHandler = new MessageHandler(this.network);
 

package/dist/commonjs/codec-73adfc0f.js

@@ -0,0 +1,205 @@
+'use strict';
+
+var varint = require('varint');
+var bs32 = require('bs32');
+var bs58 = require('bs58');
+var isHex = require('is-hex');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var varint__default = /*#__PURE__*/_interopDefaultLegacy(varint);
+var bs32__default = /*#__PURE__*/_interopDefaultLegacy(bs32);
+var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
+var isHex__default = /*#__PURE__*/_interopDefaultLegacy(isHex);
+
+var codecs = {
+  // just a hash
+  'disco-hash': {
+    codec: '30',
+    hashAlg: 'dbl-keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  'peernet-peer-response': {
+    codec: '707072',
+    hashAlg: 'keccak-256',
+  },
+  'peernet-peer': {
+    codec: '7070',
+    hashAlg: 'keccak-256',
+  },
+  'peernet-dht': {
+    codec: '706468',
+    hashAlg: 'keccak-256',
+  },
+  'peernet-dht-response': {
+    codec: '706472',
+    hashAlg: 'keccak-256',
+  },
+  // data
+  'peernet-data': {
+    codec: '706461',
+    hashAlg: 'keccak-256',
+  },
+  'peernet-data-response': {
+    codec: '70646172',
+    hashAlg: 'keccak-256',
+  },
+  // message
+  'peernet-message': {
+    codec: '706d65',
+    hashAlg: 'keccak-512',
+  },
+  // pubsub
+  'peernet-ps': {
+    codec: '707073',
+    hashAlg: 'keccak-256',
+  },
+  'peernet-response': {
+    codec: '7072',
+    hashAlg: 'keccak-256',
+  },
+  'peernet-request': {
+    codec: '707271',
+    hashAlg: 'keccak-256',
+  },
+  // normal block
+  'leofcoin-block': {
+    codec: '6c62',
+    hashAlg: 'dbl-keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  'leofcoin-tx': {
+    codec: '6c74',
+    hashAlg: 'dbl-keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  // itx
+  'leofcoin-itx': {
+    codec: '6c69',
+    hashAlg: 'keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  // peer reputation
+  'leofcoin-pr': {
+    codec: '6c70',
+    hashAlg: 'keccak-256', // ,
+    // testnet: 'olivia'
+  },
+  // chat message
+  'chat-message': {
+    codec: '636d',
+    hashAlg: 'dbl-keccak-512',
+  },
+};
+
+class PeernetCodec {
+  get codecs() {
+    return {...globalThis.peernet.codecs, ...codecs}
+  }
+  constructor(buffer) {
+    if (buffer) {
+      if (Buffer.isBuffer(buffer)) {
+        const codec = varint__default['default'].decode(buffer);
+        const name = this.getCodecName(codec);
+
+        if (name) {
+          this.name = name;
+          this.encoded = buffer;
+          this.decode(buffer);
+        } else {
+          this.encode(buffer);
+        }
+      }
+      if (typeof buffer === 'string') {
+        if (this.codecs[buffer]) this.fromName(buffer);
+        else if (isHex__default['default'](buffer)) this.fromHex(buffer);
+        else if (bs32__default['default'].test(buffer)) this.fromBs32(buffer);
+        else this.fromBs58(buffer);
+      }
+      if (!isNaN(buffer)) if (this.codecs[this.getCodecName(buffer)]) this.fromCodec(buffer);
+    }
+  }
+
+  fromEncoded(encoded) {
+    const codec = varint__default['default'].decode(encoded);
+    const name = this.getCodecName(codec);
+    this.name = name;
+    this.encoded = encoded;
+    this.decode(encoded);
+  }
+
+  fromHex(hex) {
+    this.encoded = Buffer.from(hex, 'hex');
+    this.decode();
+  }
+
+  fromBs32(input) {
+    this.encoded = bs32__default['default'].decode(input);
+    this.decode();
+  }
+
+  fromBs58(input) {
+    this.encoded = bs58__default['default'].decode(input);
+    this.decode();
+  }
+
+  getCodec(name) {
+    return this.codecs[name].codec
+  }
+
+  getCodecName(codec) {
+    return Object.keys(this.codecs).reduce((p, c) => {
+      if (parseInt(Buffer.from(`${this.getCodec(c)}`, 'hex').toString('hex'), 16) === codec) return c;
+      else return p;
+    }, undefined)
+  }
+
+  getHashAlg(name) {
+    return this.codecs[name].hashAlg
+  }
+
+  fromCodec(codec) {
+    this.name = this.getCodecName(codec);
+    this.hashAlg = this.getHashAlg(this.name);
+
+    this.codec = this.getCodec(this.name);
+    this.codecBuffer = Buffer.from(varint__default['default'].encode(parseInt(Buffer.from(`${this.codec}`, 'hex').toString('hex'), 16)), 'hex');
+  }
+
+  fromName(name) {
+    const codec = this.getCodec(name);
+    this.name = name;
+    this.codec = codec;
+    this.hashAlg = this.getHashAlg(name);
+    this.codecBuffer = Buffer.from(varint__default['default'].encode(parseInt(Buffer.from(`${codec}`, 'hex').toString('hex'), 16)), 'hex');
+  }
+
+  toBs32() {
+    this.encode();
+    return bs32__default['default'].encode(this.encoded)
+  }
+
+  toBs58() {
+    this.encode();
+    return bs58__default['default'].encode(this.encoded)
+  }
+
+  toHex() {
+    return this.encoded.toString('hex')
+  }
+
+  decode() {
+    const codec = varint__default['default'].decode(this.encoded);
+    this.fromCodec(codec);
+    this.name = this.getCodecName(codec);
+  }
+
+  encode() {
+    const codec = Buffer.from(varint__default['default'].encode(parseInt(Buffer.from(`${this.codec}`, 'hex').toString('hex'), 16)), 'hex');
+    this.encoded = codec;
+    return this.encoded
+  }
+}
+
+exports.PeernetCodec = PeernetCodec;
+exports.codecs = codecs;

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

@@ -3,7 +3,7 @@
 var bs32 = require('bs32');
 var bs58 = require('bs58');
 var isHex = require('is-hex');
-var codec = require('./codec.js');
+var codec = require('./codec-73adfc0f.js');
 var hash = require('./hash.js');
 require('varint');
 require('keccak');
@@ -26,7 +26,7 @@ class FormatInterface {
     if (options.name) this.name = options.name;
     this.hashFormat = options.hashFormat || 'bs32';
     if (Buffer.isBuffer(buffer)) {
-      const codec$1 = new codec(buffer);
+      const codec$1 = new codec.PeernetCodec(buffer);
       if (codec$1.name) {
         this.fromEncoded(buffer);
       } else {
@@ -64,7 +64,7 @@ class FormatInterface {
    */
   decode() {
     let encoded = this.encoded;
-    const discoCodec = new codec(this.encoded.toString('hex'));
+    const discoCodec = new codec.PeernetCodec(this.encoded.toString('hex'));
     encoded = encoded.slice(discoCodec.codecBuffer.length);
     this.name = discoCodec.name;
     this.decoded = this.protoDecode(encoded);
@@ -76,7 +76,7 @@ class FormatInterface {
    */
   encode(decoded) {
     if (!decoded) decoded = this.decoded;
-    const codec$1 = new codec(this.name);
+    const codec$1 = new codec.PeernetCodec(this.name);
     this.encoded = Buffer.concat([codec$1.codecBuffer, this.protoEncode(decoded)]);
     return this.encoded
   }
@@ -85,7 +85,7 @@ class FormatInterface {
    * @param {Buffer} encoded
    */
   fromEncoded(encoded) {
-    const codec$1 = new codec(encoded);
+    const codec$1 = new codec.PeernetCodec(encoded);
     this.name = codec$1.name;
     this.encoded = encoded;
     this.decode();

package/dist/commonjs/codec.js

@@ -1,204 +1,11 @@
 'use strict';
 
-var varint = require('varint');
-var bs32 = require('bs32');
-var bs58 = require('bs58');
-var isHex = require('is-hex');
+require('varint');
+require('bs32');
+require('bs58');
+require('is-hex');
+var codec = require('./codec-73adfc0f.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var varint__default = /*#__PURE__*/_interopDefaultLegacy(varint);
-var bs32__default = /*#__PURE__*/_interopDefaultLegacy(bs32);
-var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
-var isHex__default = /*#__PURE__*/_interopDefaultLegacy(isHex);
 
-var codecs = {
-  // just a hash
-  'disco-hash': {
-    codec: '30',
-    hashAlg: 'dbl-keccak-512', // ,
-    // testnet: 'olivia'
-  },
-  'peernet-peer-response': {
-    codec: '707072',
-    hashAlg: 'keccak-256',
-  },
-  'peernet-peer': {
-    codec: '7070',
-    hashAlg: 'keccak-256',
-  },
-  'peernet-dht': {
-    codec: '706468',
-    hashAlg: 'keccak-256',
-  },
-  'peernet-dht-response': {
-    codec: '706472',
-    hashAlg: 'keccak-256',
-  },
-  // data
-  'peernet-data': {
-    codec: '706461',
-    hashAlg: 'keccak-256',
-  },
-  'peernet-data-response': {
-    codec: '70646172',
-    hashAlg: 'keccak-256',
-  },
-  // message
-  'peernet-message': {
-    codec: '706d65',
-    hashAlg: 'keccak-512',
-  },
-  // pubsub
-  'peernet-ps': {
-    codec: '707073',
-    hashAlg: 'keccak-256',
-  },
-  'peernet-response': {
-    codec: '7072',
-    hashAlg: 'keccak-256',
-  },
-  'peernet-request': {
-    codec: '707271',
-    hashAlg: 'keccak-256',
-  },
-  // normal block
-  'leofcoin-block': {
-    codec: '6c62',
-    hashAlg: 'dbl-keccak-512', // ,
-    // testnet: 'olivia'
-  },
-  'leofcoin-tx': {
-    codec: '6c74',
-    hashAlg: 'dbl-keccak-512', // ,
-    // testnet: 'olivia'
-  },
-  // itx
-  'leofcoin-itx': {
-    codec: '6c69',
-    hashAlg: 'keccak-512', // ,
-    // testnet: 'olivia'
-  },
-  // peer reputation
-  'leofcoin-pr': {
-    codec: '6c70',
-    hashAlg: 'keccak-256', // ,
-    // testnet: 'olivia'
-  },
-  // chat message
-  'chat-message': {
-    codec: '636d',
-    hashAlg: 'dbl-keccak-512',
-  },
-};
-
-class PeernetCodec {
-  get codecs() {
-    return {...globalThis.peernet.codecs, ...codecs}
-  }
-  constructor(buffer) {
-    if (buffer) {
-      if (Buffer.isBuffer(buffer)) {
-        const codec = varint__default['default'].decode(buffer);
-        const name = this.getCodecName(codec);
-
-        if (name) {
-          this.name = name;
-          this.encoded = buffer;
-          this.decode(buffer);
-        } else {
-          this.encode(buffer);
-        }
-      }
-      if (typeof buffer === 'string') {
-        if (this.codecs[buffer]) this.fromName(buffer);
-        else if (isHex__default['default'](buffer)) this.fromHex(buffer);
-        else if (bs32__default['default'].test(buffer)) this.fromBs32(buffer);
-        else this.fromBs58(buffer);
-      }
-      if (!isNaN(buffer)) if (this.codecs[this.getCodecName(buffer)]) this.fromCodec(buffer);
-    }
-  }
-
-  fromEncoded(encoded) {
-    const codec = varint__default['default'].decode(encoded);
-    const name = this.getCodecName(codec);
-    this.name = name;
-    this.encoded = encoded;
-    this.decode(encoded);
-  }
-
-  fromHex(hex) {
-    this.encoded = Buffer.from(hex, 'hex');
-    this.decode();
-  }
-
-  fromBs32(input) {
-    this.encoded = bs32__default['default'].decode(input);
-    this.decode();
-  }
-
-  fromBs58(input) {
-    this.encoded = bs58__default['default'].decode(input);
-    this.decode();
-  }
-
-  getCodec(name) {
-    return this.codecs[name].codec
-  }
-
-  getCodecName(codec) {
-    return Object.keys(this.codecs).reduce((p, c) => {
-      if (parseInt(Buffer.from(`${this.getCodec(c)}`, 'hex').toString('hex'), 16) === codec) return c;
-      else return p;
-    }, undefined)
-  }
-
-  getHashAlg(name) {
-    return this.codecs[name].hashAlg
-  }
-
-  fromCodec(codec) {
-    this.name = this.getCodecName(codec);
-    this.hashAlg = this.getHashAlg(this.name);
-
-    this.codec = this.getCodec(this.name);
-    this.codecBuffer = Buffer.from(varint__default['default'].encode(parseInt(Buffer.from(`${this.codec}`, 'hex').toString('hex'), 16)), 'hex');
-  }
-
-  fromName(name) {
-    const codec = this.getCodec(name);
-    this.name = name;
-    this.codec = codec;
-    this.hashAlg = this.getHashAlg(name);
-    this.codecBuffer = Buffer.from(varint__default['default'].encode(parseInt(Buffer.from(`${codec}`, 'hex').toString('hex'), 16)), 'hex');
-  }
-
-  toBs32() {
-    this.encode();
-    return bs32__default['default'].encode(this.encoded)
-  }
-
-  toBs58() {
-    this.encode();
-    return bs58__default['default'].encode(this.encoded)
-  }
-
-  toHex() {
-    return this.encoded.toString('hex')
-  }
-
-  decode() {
-    const codec = varint__default['default'].decode(this.encoded);
-    this.fromCodec(codec);
-    this.name = this.getCodecName(codec);
-  }
-
-  encode() {
-    const codec = Buffer.from(varint__default['default'].encode(parseInt(Buffer.from(`${this.codec}`, 'hex').toString('hex'), 16)), 'hex');
-    this.encoded = codec;
-    return this.encoded
-  }
-}
-
-module.exports = PeernetCodec;
+module.exports = codec.PeernetCodec;

package/dist/commonjs/dht-response.js

@@ -5,7 +5,7 @@ require('bs32');
 var codecFormatInterface = require('./codec-format-interface.js');
 require('bs58');
 require('is-hex');
-require('./codec.js');
+require('./codec-73adfc0f.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('bs32');
 require('bs58');
 require('is-hex');
-require('./codec.js');
+require('./codec-73adfc0f.js');
 require('varint');
 require('./hash.js');
 require('keccak');

package/dist/commonjs/hash.js

@@ -5,7 +5,7 @@ var varint = require('varint');
 var bs32 = require('bs32');
 var bs58 = require('bs58');
 var isHex = require('is-hex');
-var codec = require('./codec.js');
+var codec = require('./codec-73adfc0f.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,7 +22,7 @@ class PeernetHash {
     if (options.codecs) this.codecs = options.codecs;
     if (buffer) {
       if (Buffer.isBuffer(buffer)) {
-        this.discoCodec = new codec(buffer, this.codecs);
+        this.discoCodec = new codec.PeernetCodec(buffer, this.codecs);
         const name = this.discoCodec.name;
 
         if (name) {
@@ -88,7 +88,7 @@ class PeernetHash {
   encode(buffer, name) {
     if (!this.name && name) this.name = name;
     if (!buffer) buffer = this.buffer;
-    this.discoCodec = new codec(this.name, this.codecs);
+    this.discoCodec = new codec.PeernetCodec(this.name, this.codecs);
     this.discoCodec.fromName(this.name);
     let hashAlg = this.discoCodec.hashAlg;
     if (hashAlg.includes('dbl')) {
@@ -128,7 +128,7 @@ class PeernetHash {
     this.hash = buffer;
     const codec$1 = varint__default['default'].decode(buffer);
 
-    this.discoCodec = new codec(codec$1, this.codecs);
+    this.discoCodec = new codec.PeernetCodec(codec$1, this.codecs);
     // TODO: validate codec
     buffer = buffer.slice(varint__default['default'].decode.bytes);
     this.size = varint__default['default'].decode(buffer);

package/dist/commonjs/peernet-message.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('bs32');
 require('bs58');
 require('is-hex');
-require('./codec.js');
+require('./codec-73adfc0f.js');
 require('varint');
 require('./hash.js');
 require('keccak');

package/dist/commonjs/peernet.js

@@ -14,7 +14,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 var request = require('./request.js');
 var response = require('./response.js');
 var fetch$1 = require('node-fetch');
-var codec = require('./codec.js');
+var codec = require('./codec-73adfc0f.js');
 var hash = require('./hash.js');
 var MultiWallet = require('@leofcoin/multi-wallet');
 require('bs32');
@@ -264,7 +264,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.9.3";
+var version = "0.9.6";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -1036,7 +1036,7 @@ const debug = (log) => {
 
 const protoFor = (data) => {
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
-  const codec$1 = new codec(data);
+  const codec$1 = new codec.PeernetCodec(data);
   if (!codec$1.name) throw new Error('proto not found')
   const Proto = globalThis.peernet.protos[codec$1.name];
   if (!Proto) throw (new Error(`No proto defined for ${codec$1.name}`))
@@ -1253,17 +1253,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;
   }
 
   /**
@@ -1435,11 +1431,11 @@ class Peernet {
   }
 
   addProto(name, proto) {
-    if (!globalThis.peernet.protos[name]) globalThis.peernet.protos[name] = proto;
+    if (!this.protos[name]) this.protos[name] = proto;
   }
 
-  addCodec(name, proto) {
-    if (!globalThis.peernet.codecs[name]) globalThis.peernet.codecs[name] = proto;
+  addCodec(name, codec) {
+    if (!this.codecs[name]) this.codecs[name] = codec;
   }
 
   async addStore(name, prefix, root, isPrivate = true) {
@@ -1523,7 +1519,9 @@ class Peernet {
       'peernet-ps': PsMessage,
       'chat-message': ChatMessage,
     };
+
     this.protos = globalThis.peernet.protos;
+    this.codecs = codec.codecs;
 
     this._messageHandler = new MessageHandler(this.network);
 

package/dist/commonjs/request.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('bs32');
 require('bs58');
 require('is-hex');
-require('./codec.js');
+require('./codec-73adfc0f.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('bs32');
 require('bs58');
 require('is-hex');
-require('./codec.js');
+require('./codec-73adfc0f.js');
 require('varint');
 require('./hash.js');
 require('keccak');