@leofcoin/peernet 0.11.0 → 0.11.3

package/dist/module/peernet.js

@@ -2,7 +2,7 @@ import LeofcoinStorage from '@leofcoin/storage';
 import protons from 'protons';
 import bs32 from '@vandeurenglenn/base32';
 import bs58 from '@vandeurenglenn/base58';
-import isHex from 'is-hex';
+import isHex from '@vandeurenglenn/is-hex';
 import varint from 'varint';
 import createKeccakHash from 'keccak';
 import fetch from 'node-fetch';
@@ -621,8 +621,8 @@ var proto$a = `
 message PeernetMessage {
   required bytes data = 1;
   required bytes signature = 2;
-  optional bytes from = 3;
-  optional bytes to = 4;
+  optional string from = 3;
+  optional string to = 4;
   optional string id = 5;
 }`;
 
@@ -706,439 +706,439 @@ var codecs = {
   },
 };
 
-class PeernetCodec {
-  get codecs() {
-    return {...globalThis.peernet.codecs, ...codecs}
-  }
-  constructor(buffer) {
-    if (buffer) {
-      if (buffer instanceof Uint8Array) {
-        const codec = varint.decode(buffer);
-        const name = this.getCodecName(codec);
-        if (name) {
-          this.name = name;
-          this.encoded = buffer;
-          this.decode(buffer);
-        } else {
-          this.encode(buffer);
-        }
-      } else if (buffer instanceof ArrayBuffer) {
-        const encoded = new Uint8Array(buffer.byteLength);
-
-        for (let i = 0; i < buffer.byteLength; i++) {
-          encoded[i] = buffer[i];
-        }
-        this.encoded = encoded;
-        // this.encoded = new Uint8Array(buffer, buffer.byteOffset, buffer.byteLength)
-        this.decode(buffer);
-        return
-      }
-      if (typeof buffer === 'string') {
-        if (this.codecs[buffer]) this.fromName(buffer);
-        else if (isHex(buffer)) this.fromHex(buffer);
-        else if (bs32.isBase32(buffer)) this.fromBs32(buffer);
-        else if (bs58.isBase58(buffer)) this.fromBs58(buffer);
-        else throw new Error(`unsupported string ${buffer}`)
-      }
-      if (!isNaN(buffer)) if (this.codecs[this.getCodecName(buffer)]) this.fromCodec(buffer);
-    }
-  }
-
-  fromEncoded(encoded) {
-    const codec = varint.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.decode(input);
-    this.decode();
-  }
-
-  fromBs58(input) {
-    this.encoded = bs58.decode(input);
-    this.decode();
-  }
-
-  getCodec(name) {
-    return this.codecs[name].codec
-  }
-
-  getCodecName(codec) {
-    return Object.keys(this.codecs).reduce((p, c) => {
-      const item = this.codecs[c];
-      if (item.codec === 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 = varint.encode(codec);
-  }
-
-  fromName(name) {
-    const codec = this.getCodec(name);
-    this.name = name;
-    this.codec = codec;
-    this.hashAlg = this.getHashAlg(name);
-    this.codecBuffer = varint.encode(codec);
-  }
-
-  toBs32() {
-    this.encode();
-    return bs32.encode(this.encoded)
-  }
-
-  toBs58() {
-    this.encode();
-    return bs58.encode(this.encoded)
-  }
-
-  toHex() {
-    return this.encoded.toString('hex')
-  }
-
-  decode() {
-    const codec = varint.decode(this.encoded);
-    this.fromCodec(codec);
-  }
-
-  encode() {
-    const codec = varint.encode(this.decoded);
-    this.encoded = codec;
-    return this.encoded
-  }
+class PeernetCodec {
+  get codecs() {
+    return {...globalThis.peernet.codecs, ...codecs}
+  }
+  constructor(buffer) {
+    if (buffer) {
+      if (buffer instanceof Uint8Array) {
+        const codec = varint.decode(buffer);
+        const name = this.getCodecName(codec);
+        if (name) {
+          this.name = name;
+          this.encoded = buffer;
+          this.decode(buffer);
+        } else {
+          this.encode(buffer);
+        }
+      } else if (buffer instanceof ArrayBuffer) {
+        const encoded = new Uint8Array(buffer.byteLength);
+
+        for (let i = 0; i < buffer.byteLength; i++) {
+          encoded[i] = buffer[i];
+        }
+        this.encoded = encoded;
+        // this.encoded = new Uint8Array(buffer, buffer.byteOffset, buffer.byteLength)
+        this.decode(buffer);
+        return
+      }
+      if (typeof buffer === 'string') {
+        if (this.codecs[buffer]) this.fromName(buffer);
+        else if (isHex(buffer)) this.fromHex(buffer);
+        else if (bs32.isBase32(buffer)) this.fromBs32(buffer);
+        else if (bs58.isBase58(buffer)) this.fromBs58(buffer);
+        else throw new Error(`unsupported string ${buffer}`)
+      }
+      if (!isNaN(buffer)) if (this.codecs[this.getCodecName(buffer)]) this.fromCodec(buffer);
+    }
+  }
+
+  fromEncoded(encoded) {
+    const codec = varint.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.decode(input);
+    this.decode();
+  }
+
+  fromBs58(input) {
+    this.encoded = bs58.decode(input);
+    this.decode();
+  }
+
+  getCodec(name) {
+    return this.codecs[name].codec
+  }
+
+  getCodecName(codec) {
+    return Object.keys(this.codecs).reduce((p, c) => {
+      const item = this.codecs[c];
+      if (item.codec === 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 = varint.encode(codec);
+  }
+
+  fromName(name) {
+    const codec = this.getCodec(name);
+    this.name = name;
+    this.codec = codec;
+    this.hashAlg = this.getHashAlg(name);
+    this.codecBuffer = varint.encode(codec);
+  }
+
+  toBs32() {
+    this.encode();
+    return bs32.encode(this.encoded)
+  }
+
+  toBs58() {
+    this.encode();
+    return bs58.encode(this.encoded)
+  }
+
+  toHex() {
+    return this.encoded.toString('hex')
+  }
+
+  decode() {
+    const codec = varint.decode(this.encoded);
+    this.fromCodec(codec);
+  }
+
+  encode() {
+    const codec = varint.encode(this.decoded);
+    this.encoded = codec;
+    return this.encoded
+  }
 }
 
-class PeernetHash {
-  constructor(buffer, options = {}) {
-    if (options.name) this.name = options.name;
-    else this.name = 'disco-hash';
-    if (options.codecs) this.codecs = options.codecs;
-    if (buffer) {
-      if (Buffer.isBuffer(buffer)) {
-        this.discoCodec = new PeernetCodec(buffer, this.codecs);
-        const name = this.discoCodec.name;
-
-        if (name) {
-          this.name = name;
-          this.decode(buffer);
-        } else {
-          this.encode(buffer);
-        }
-      }
-
-      if (typeof buffer === 'string') {
-        if (isHex(buffer)) this.fromHex(buffer);
-        if (bs32.isBase32(buffer)) this.fromBs32(buffer);
-        else if (bs58.isBase58(buffer)) this.fromBs58(buffer);
-        else throw new Error(`unsupported string ${buffer}`)
-      } else if (typeof buffer === 'object') this.fromJSON(buffer);
-    }
-  }
-
-  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];
-    }
-
-    for (let i = uint8Array.length - 1; i < length.length; i++) {
-      uint8Array[i] = length[i];
-    }
-    return uint8Array
-  }
-
-  get length() {
-    return varint.encode(this.size)
-  }
-
-  get buffer() {
-    return this.hash
-  }
-
-  toHex() {
-    return this.hash.toString('hex')
-  }
-
-  fromHex(hex) {
-    return this.decode(Buffer.from(hex, 'hex'))
-  }
-
-  fromJSON(json) {
-    return this.encode(Buffer.from(JSON.stringify(json)))
-  }
-
-  toBs32() {
-    return bs32.encode(this.hash)
-  }
-
-  fromBs32(bs) {
-    return this.decode(bs32.decode(bs))
-  }
-
-  toBs58() {
-    return bs58.encode(this.hash)
-  }
-
-  fromBs58(bs) {
-    return this.decode(bs58.decode(bs))
-  }
-
-  toString(encoding = 'utf8') {
-    return this.hash.toString(encoding)
-  }
-
-  encode(buffer, name) {
-    if (!this.name && name) this.name = name;
-    if (!buffer) buffer = this.buffer;
-    this.discoCodec = new PeernetCodec(this.name, this.codecs);
-    this.discoCodec.fromName(this.name);
-    let hashAlg = this.discoCodec.hashAlg;
-    if (hashAlg.includes('dbl')) {
-      hashAlg = hashAlg.replace('dbl-', '');
-      buffer = createKeccakHash(hashAlg.replace('-', '')).update(buffer).digest();
-    }
-    this.digest = createKeccakHash(hashAlg.replace('-', '')).update(buffer).digest();
-    this.size = this.digest.length;
-
-    this.codec = this.discoCodec.encode();
-    this.codec = this.discoCodec.codecBuffer;
-    this.hash = Buffer.concat([
-      this.prefix,
-      this.digest,
-    ]);
-
-    return this.hash
-  }
-
-  validate(buffer) {
-    if (Buffer.isBuffer(buffer)) {
-      const codec = varint.decode(buffer);
-      if (this.codecs[codec]) {
-        this.decode(buffer);
-      } else {
-        this.encode(buffer);
-      }
-    }
-    if (typeof buffer === 'string') {
-      if (isHex(buffer)) this.fromHex(buffer);
-      if (bs32.test(buffer)) this.fromBs32(buffer);
-    }
-    if (typeof buffer === 'object') this.fromJSON(buffer);
-  }
-
-  decode(buffer) {
-    this.hash = buffer;
-    const codec = varint.decode(buffer);
-
-    this.discoCodec = new PeernetCodec(codec, this.codecs);
-    // TODO: validate codec
-    buffer = buffer.slice(varint.decode.bytes);
-    this.size = varint.decode(buffer);
-    this.digest = buffer.slice(varint.decode.bytes);
-    if (this.digest.length !== this.size) {
-      throw new Error(`hash length inconsistent: 0x${this.hash.toString('hex')}`)
-    }
-
-    // const discoCodec = new Codec(codec, this.codecs)
-
-    this.name = this.discoCodec.name;
-
-
-    this.size = this.digest.length;
-
-    return {
-      codec: this.codec,
-      name: this.name,
-      size: this.size,
-      length: this.length,
-      digest: this.digest,
-    }
-  }
+class PeernetHash {
+  constructor(buffer, options = {}) {
+    if (options.name) this.name = options.name;
+    else this.name = 'disco-hash';
+    if (options.codecs) this.codecs = options.codecs;
+    if (buffer) {
+      if (Buffer.isBuffer(buffer)) {
+        this.discoCodec = new PeernetCodec(buffer, this.codecs);
+        const name = this.discoCodec.name;
+
+        if (name) {
+          this.name = name;
+          this.decode(buffer);
+        } else {
+          this.encode(buffer);
+        }
+      }
+
+      if (typeof buffer === 'string') {
+        if (isHex(buffer)) this.fromHex(buffer);
+        if (bs32.isBase32(buffer)) this.fromBs32(buffer);
+        else if (bs58.isBase58(buffer)) this.fromBs58(buffer);
+        else throw new Error(`unsupported string ${buffer}`)
+      } else if (typeof buffer === 'object') this.fromJSON(buffer);
+    }
+  }
+
+  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];
+    }
+
+    for (let i = uint8Array.length - 1; i < length.length; i++) {
+      uint8Array[i] = length[i];
+    }
+    return uint8Array
+  }
+
+  get length() {
+    return varint.encode(this.size)
+  }
+
+  get buffer() {
+    return this.hash
+  }
+
+  toHex() {
+    return this.hash.toString('hex')
+  }
+
+  fromHex(hex) {
+    return this.decode(Buffer.from(hex, 'hex'))
+  }
+
+  fromJSON(json) {
+    return this.encode(Buffer.from(JSON.stringify(json)))
+  }
+
+  toBs32() {
+    return bs32.encode(this.hash)
+  }
+
+  fromBs32(bs) {
+    return this.decode(bs32.decode(bs))
+  }
+
+  toBs58() {
+    return bs58.encode(this.hash)
+  }
+
+  fromBs58(bs) {
+    return this.decode(bs58.decode(bs))
+  }
+
+  toString(encoding = 'utf8') {
+    return this.hash.toString(encoding)
+  }
+
+  encode(buffer, name) {
+    if (!this.name && name) this.name = name;
+    if (!buffer) buffer = this.buffer;
+    this.discoCodec = new PeernetCodec(this.name, this.codecs);
+    this.discoCodec.fromName(this.name);
+    let hashAlg = this.discoCodec.hashAlg;
+    if (hashAlg.includes('dbl')) {
+      hashAlg = hashAlg.replace('dbl-', '');
+      buffer = createKeccakHash(hashAlg.replace('-', '')).update(buffer).digest();
+    }
+    this.digest = createKeccakHash(hashAlg.replace('-', '')).update(buffer).digest();
+    this.size = this.digest.length;
+
+    this.codec = this.discoCodec.encode();
+    this.codec = this.discoCodec.codecBuffer;
+    this.hash = Buffer.concat([
+      this.prefix,
+      this.digest,
+    ]);
+
+    return this.hash
+  }
+
+  validate(buffer) {
+    if (Buffer.isBuffer(buffer)) {
+      const codec = varint.decode(buffer);
+      if (this.codecs[codec]) {
+        this.decode(buffer);
+      } else {
+        this.encode(buffer);
+      }
+    }
+    if (typeof buffer === 'string') {
+      if (isHex(buffer)) this.fromHex(buffer);
+      if (bs32.test(buffer)) this.fromBs32(buffer);
+    }
+    if (typeof buffer === 'object') this.fromJSON(buffer);
+  }
+
+  decode(buffer) {
+    this.hash = buffer;
+    const codec = varint.decode(buffer);
+
+    this.discoCodec = new PeernetCodec(codec, this.codecs);
+    // TODO: validate codec
+    buffer = buffer.slice(varint.decode.bytes);
+    this.size = varint.decode(buffer);
+    this.digest = buffer.slice(varint.decode.bytes);
+    if (this.digest.length !== this.size) {
+      throw new Error(`hash length inconsistent: 0x${this.hash.toString('hex')}`)
+    }
+
+    // const discoCodec = new Codec(codec, this.codecs)
+
+    this.name = this.discoCodec.name;
+
+
+    this.size = this.digest.length;
+
+    return {
+      codec: this.codec,
+      name: this.name,
+      size: this.size,
+      length: this.length,
+      digest: this.digest,
+    }
+  }
 }
 
-class FormatInterface {
-  /**
-   * @param {Buffer|String|Object} buffer - data - The data needed to create the desired message
-   * @param {Object} proto - {encode, decode}
-   * @param {Object} options - {hashFormat, name}
-   */
-  constructor(buffer, proto, options = {}) {
-    this.protoEncode = proto.encode;
-    this.protoDecode = proto.decode;
-    this.hashFormat = options.hashFormat || 'bs32';
-    if (options.name) this.name = options.name;
-    if (buffer instanceof Uint8Array) return this.fromUint8Array(buffer)
-    else if (buffer instanceof ArrayBuffer) return this.fromArrayBuffer(buffer)
-    else if (buffer.name === options.name) return buffer
-    else if (typeof buffer === 'string') {
-        if (isHex(buffer)) this.fromHex(buffer);
-        else if (bs32.isBase32(buffer)) this.fromBs32(buffer);
-        else if (bs58.isBase58(buffer)) this.fromBs58(buffer);
-        else throw new Error(`unsupported string ${buffer}`)
-    } else {
-      this.create(buffer);
-    }
-  }
-
-  /**
-   * @return {PeernetHash}
-   */
-  get peernetHash() {
-    return new PeernetHash(this.decoded, {name: this.name})
-  }
-
-  /**
-   * @return {peernetHash}
-   */
-  get hash() {
-    const upper = this.hashFormat.charAt(0).toUpperCase();
-    const format = `${upper}${this.hashFormat.substring(1, this.hashFormat.length)}`;
-    return this.peernetHash[`to${format}`]()
-  }
-
-  /**
-   * @return {Object}
-   */
-  decode() {
-    let encoded = this.encoded;
-    const discoCodec = new PeernetCodec(this.encoded);
-    encoded = encoded.slice(discoCodec.codecBuffer.length);
-    this.name = discoCodec.name;
-    this.decoded = this.protoDecode(encoded);
-    return this.decoded
-  }
-
-  /**
-   * @return {Buffer}
-   */
-  encode(decoded) {
-    if (!decoded) decoded = this.decoded;
-    const codec = new PeernetCodec(this.name);
-    const encoded = this.protoEncode(decoded);
-    const uint8Array = new Uint8Array(encoded.length + codec.codecBuffer.length);
-    uint8Array.set(codec.codecBuffer);
-    uint8Array.set(encoded, codec.codecBuffer.length);
-    this.encoded = uint8Array;
-    return this.encoded
-  }
-
-  hasCodec() {
-    if (!this.encoded) return false
-    const codec = new PeernetCodec(this.encoded);
-    if (codec.name) return true
-  }
-
-  fromUint8Array(buffer) {
-    this.encoded = buffer;
-    if (!this.hasCodec()) this.create(
-      JSON.parse(new TextDecoder().decode(this.encoded))
-    );
-    else this.decode();
-  }
-
-  fromArrayBuffer(buffer) {
-    this.encoded = new Uint8Array(buffer, buffer.byteOffset, buffer.byteLength);
-    if (!this.hasCodec()) this.create(
-      JSON.parse(new TextDecoder().decode(this.encoded))
-    );
-    else this.decode();
-  }
-
-  /**
-   * @param {Buffer} encoded
-   */
-  fromEncoded(encoded) {
-    this.encoded = encoded;
-    this.decode();
-  }
-
-  /**
-   * @param {String} encoded
-   */
-  fromHex(encoded) {
-    this.encoded = Buffer.from(encoded, 'hex');
-    this.decode();
-  }
-
-  /**
-   * @param {String} encoded
-   */
-  fromBs32(encoded) {
-    this.encoded = bs32.decode(encoded);
-    this.decode();
-  }
-
-  /**
-   * @param {String} encoded
-   */
-  fromBs58(encoded) {
-    this.encoded = bs58.decode(encoded);
-    this.decode();
-  }
-
-  /**
-   * @return {String} encoded
-   */
-  toHex() {
-    if (!this.encoded) this.encode();
-    return this.encoded.toString('hex')
-  }
-
-  /**
-   * @return {String} encoded
-   */
-  toBs32() {
-    if (!this.encoded) this.encode();
-    return bs32.encode(this.encoded)
-  }
-
-  /**
-   * @return {String} encoded
-   */
-  toBs58() {
-    if (!this.encoded) this.encode();
-    return bs58.encode(this.encoded)
-  }
-
-  /**
-   * @param {Object} data
-   */
-  create(data) {
-    const decoded = {};
-    if (this.keys?.length > 0) {
-      for (const key of this.keys) {
-        Object.defineProperties(decoded, {
-          [key]: {
-            enumerable: true,
-            configurable: true,
-            set: (val) => value = data[key],
-            get: () => data[key]
-          }
-        });
-      }
-
-      this.decoded = decoded;
-      this.encode();
-    }
-  }
+class FormatInterface {
+  /**
+   * @param {Buffer|String|Object} buffer - data - The data needed to create the desired message
+   * @param {Object} proto - {encode, decode}
+   * @param {Object} options - {hashFormat, name}
+   */
+  constructor(buffer, proto, options = {}) {
+    this.protoEncode = proto.encode;
+    this.protoDecode = proto.decode;
+    this.hashFormat = options.hashFormat || 'bs32';
+    if (options.name) this.name = options.name;
+    if (buffer instanceof Uint8Array) return this.fromUint8Array(buffer)
+    else if (buffer instanceof ArrayBuffer) return this.fromArrayBuffer(buffer)
+    else if (buffer.name === options.name) return buffer
+    else if (typeof buffer === 'string') {
+        if (isHex(buffer)) this.fromHex(buffer);
+        else if (bs32.isBase32(buffer)) this.fromBs32(buffer);
+        else if (bs58.isBase58(buffer)) this.fromBs58(buffer);
+        else throw new Error(`unsupported string ${buffer}`)
+    } else {
+      this.create(buffer);
+    }
+  }
+
+  /**
+   * @return {PeernetHash}
+   */
+  get peernetHash() {
+    return new PeernetHash(this.decoded, {name: this.name})
+  }
+
+  /**
+   * @return {peernetHash}
+   */
+  get hash() {
+    const upper = this.hashFormat.charAt(0).toUpperCase();
+    const format = `${upper}${this.hashFormat.substring(1, this.hashFormat.length)}`;
+    return this.peernetHash[`to${format}`]()
+  }
+
+  /**
+   * @return {Object}
+   */
+  decode() {
+    let encoded = this.encoded;
+    const discoCodec = new PeernetCodec(this.encoded);
+    encoded = encoded.slice(discoCodec.codecBuffer.length);
+    this.name = discoCodec.name;
+    this.decoded = this.protoDecode(encoded);
+    return this.decoded
+  }
+
+  /**
+   * @return {Buffer}
+   */
+  encode(decoded) {
+    if (!decoded) decoded = this.decoded;
+    const codec = new PeernetCodec(this.name);
+    const encoded = this.protoEncode(decoded);
+    const uint8Array = new Uint8Array(encoded.length + codec.codecBuffer.length);
+    uint8Array.set(codec.codecBuffer);
+    uint8Array.set(encoded, codec.codecBuffer.length);
+    this.encoded = uint8Array;
+    return this.encoded
+  }
+
+  hasCodec() {
+    if (!this.encoded) return false
+    const codec = new PeernetCodec(this.encoded);
+    if (codec.name) return true
+  }
+
+  fromUint8Array(buffer) {
+    this.encoded = buffer;
+    if (!this.hasCodec()) this.create(
+      JSON.parse(new TextDecoder().decode(this.encoded))
+    );
+    else this.decode();
+  }
+
+  fromArrayBuffer(buffer) {
+    this.encoded = new Uint8Array(buffer, buffer.byteOffset, buffer.byteLength);
+    if (!this.hasCodec()) this.create(
+      JSON.parse(new TextDecoder().decode(this.encoded))
+    );
+    else this.decode();
+  }
+
+  /**
+   * @param {Buffer} encoded
+   */
+  fromEncoded(encoded) {
+    this.encoded = encoded;
+    this.decode();
+  }
+
+  /**
+   * @param {String} encoded
+   */
+  fromHex(encoded) {
+    this.encoded = Buffer.from(encoded, 'hex');
+    this.decode();
+  }
+
+  /**
+   * @param {String} encoded
+   */
+  fromBs32(encoded) {
+    this.encoded = bs32.decode(encoded);
+    this.decode();
+  }
+
+  /**
+   * @param {String} encoded
+   */
+  fromBs58(encoded) {
+    this.encoded = bs58.decode(encoded);
+    this.decode();
+  }
+
+  /**
+   * @return {String} encoded
+   */
+  toHex() {
+    if (!this.encoded) this.encode();
+    return this.encoded.toString('hex')
+  }
+
+  /**
+   * @return {String} encoded
+   */
+  toBs32() {
+    if (!this.encoded) this.encode();
+    return bs32.encode(this.encoded)
+  }
+
+  /**
+   * @return {String} encoded
+   */
+  toBs58() {
+    if (!this.encoded) this.encode();
+    return bs58.encode(this.encoded)
+  }
+
+  /**
+   * @param {Object} data
+   */
+  create(data) {
+    const decoded = {};
+    if (this.keys?.length > 0) {
+      for (const key of this.keys) {
+        Object.defineProperties(decoded, {
+          [key]: {
+            enumerable: true,
+            configurable: true,
+            set: (val) => value = data[key],
+            get: () => data[key]
+          }
+        });
+      }
+
+      this.decoded = decoded;
+      this.encode();
+    }
+  }
 }
 
 class PeernetMessage extends FormatInterface {
@@ -1190,15 +1190,15 @@ message PeernetDHTMessageResponse {
 }
 `;
 
-class DHTMessageResponse extends FormatInterface {
-  get keys() {
-    return ['hash', 'has']
-  }
-
-  constructor(data) {
-    const name = 'peernet-dht-response';
-    super(data, protons(proto$8).PeernetDHTMessageResponse, {name});
-  }
+class DHTMessageResponse extends FormatInterface {
+  get keys() {
+    return ['hash', 'has']
+  }
+
+  constructor(data) {
+    const name = 'peernet-dht-response';
+    super(data, protons(proto$8).PeernetDHTMessageResponse, {name});
+  }
 }
 
 var proto$7 = `
@@ -1281,7 +1281,7 @@ class RequestMessage extends FormatInterface {
 var proto$3 = `
 // PeernetResponseMessage
 message PeernetResponseMessage {
-  required string response = 1;
+  required bytes response = 1;
 }
 `;
 
@@ -1333,12 +1333,12 @@ class DataMessageResponse extends FormatInterface {
   }
 }
 
-var proto = `
-message ChatMessage {
-  required string value = 1;
-  required string author = 2;
-  required uint64 timestamp = 3;
-  repeated string files = 4;
+var proto = `
+message ChatMessage {
+  required string value = 1;
+  required string author = 2;
+  required uint64 timestamp = 3;
+  repeated string files = 4;
 }`;
 
 class ChatMessage extends FormatInterface {
@@ -1352,259 +1352,259 @@ class ChatMessage extends FormatInterface {
   }
 }
 
-const debug = (log) => {
-  if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;');
-};
-
-const protoFor = (data) => {
-  if (!Buffer.isBuffer(data)) data = Buffer.from(data);
-  const codec = new PeernetCodec(data);
-  if (!codec.name) throw new Error('proto not found')
-  const Proto = globalThis.peernet.protos[codec.name];
-  if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
-  return new Proto(data)
-};
-
-/**
- * wether or not a peernet daemon is active
- * @return {Boolean}
- */
-const hasDaemon = async () => {
-  try {
-    let response = await fetch('http://127.0.0.1:1000/api/version');
-    response = await response.json();
-    return Boolean(response.client === '@peernet/api/http')
-  } catch (e) {
-    return false
-  }
-};
-
-const https = () => {
-  if (!globalThis.location) return false;
-  return Boolean(globalThis.location.protocol === 'https:')
-};
-
-/**
- * Get current environment
- * @return {String} current environment [node, electron, browser]
- */
-const environment = () => {
-  const _navigator = globalThis.navigator;
-  if (!_navigator) {
-    return 'node'
-  } else if (_navigator && /electron/i.test(_navigator.userAgent)) {
-    return 'electron'
-  } else {
-    return 'browser'
-  }
-};
-
-/**
- * * Get current environment
- * @return {Object} result
- * @property {Boolean} reult.daemon whether or not daemon is running
- * @property {Boolean} reult.environment Current environment
- */
-const target = async () => {
-  let daemon = false;
-  const env = await environment();
-  if (!https()) daemon = await hasDaemon();
-
-  return {daemon, environment: env}
+const debug = (log) => {
+  if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;');
+};
+
+const protoFor = (data) => {
+  if (!Buffer.isBuffer(data)) data = Buffer.from(data);
+  const codec = new PeernetCodec(data);
+  if (!codec.name) throw new Error('proto not found')
+  const Proto = globalThis.peernet.protos[codec.name];
+  if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
+  return new Proto(data)
+};
+
+/**
+ * wether or not a peernet daemon is active
+ * @return {Boolean}
+ */
+const hasDaemon = async () => {
+  try {
+    let response = await fetch('http://127.0.0.1:1000/api/version');
+    response = await response.json();
+    return Boolean(response.client === '@peernet/api/http')
+  } catch (e) {
+    return false
+  }
+};
+
+const https = () => {
+  if (!globalThis.location) return false;
+  return Boolean(globalThis.location.protocol === 'https:')
+};
+
+/**
+ * Get current environment
+ * @return {String} current environment [node, electron, browser]
+ */
+const environment = () => {
+  const _navigator = globalThis.navigator;
+  if (!_navigator) {
+    return 'node'
+  } else if (_navigator && /electron/i.test(_navigator.userAgent)) {
+    return 'electron'
+  } else {
+    return 'browser'
+  }
+};
+
+/**
+ * * Get current environment
+ * @return {Object} result
+ * @property {Boolean} reult.daemon whether or not daemon is running
+ * @property {Boolean} reult.environment Current environment
+ */
+const target = async () => {
+  let daemon = false;
+  const env = await environment();
+  if (!https()) daemon = await hasDaemon();
+
+  return {daemon, environment: env}
 };
 
-class PeerDiscovery {
-  constructor(id) {
-    this.id = id;
-  }
-
-  _getPeerId(id) {
-    if (!peernet.peerMap || peernet.peerMap && peernet.peerMap.size === 0) return false
-
-    for (const entry of [...peernet.peerMap.entries()]) {
-      for (const _id of entry[1]) {
-        if (_id === id) return entry[0]
-      }
-    }
-  }
-
-  async discover(peer) {
-    let id = this._getPeerId(peer.id);
-    if (id) return id
-    const data = new peernet.protos['peernet-peer']({id: this.id});
-    const node = await peernet.prepareMessage(peer.id, data.encoded);
-
-    let response = await peer.request(node.encoded);
-    response = protoFor(response);
-    response = new peernet.protos['peernet-peer-response'](response.decoded.data);
-
-    id = response.decoded.id;
-    if (id === this.id) return;
-
-    if (!peernet.peerMap.has(id)) peernet.peerMap.set(id, [peer.id]);
-    else {
-      const connections = peernet.peerMap.get(id);
-      if (connections.indexOf(peer.id) === -1) {
-        connections.push(peer.id);
-        peernet.peerMap.set(peer.id, connections);
-      }
-    }
-    return id
-  }
-
-  async discoverHandler(message, peer) {
-    const {id, proto} = message;
-    // if (typeof message.data === 'string') message.data = Buffer.from(message.data)
-    if (proto.name === 'peernet-peer') {
-      const from = proto.decoded.id;
-      if (from === this.id) return;
-
-      if (!peernet.peerMap.has(from)) peernet.peerMap.set(from, [peer.id]);
-      else {
-        const connections = peernet.peerMap.get(from);
-        if (connections.indexOf(peer.id) === -1) {
-          connections.push(peer.id);
-          peernet.peerMap.set(from, connections);
-        }
-      }
-      const data = new peernet.protos['peernet-peer-response']({id: this.id});
-      const node = await peernet.prepareMessage(from, data.encoded);
-
-      peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
-    } else if (proto.name === 'peernet-peer-response') {
-      const from = proto.decoded.id;
-      if (from === this.id) return;
-
-      if (!peernet.peerMap.has(from)) peernet.peerMap.set(from, [peer.id]);
-      else {
-        const connections = peernet.peerMap.get(from);
-        if (connections.indexOf(peer.id) === -1) {
-          connections.push(peer.id);
-          peernet.peerMap.set(from, connections);
-        }
-      }
-    }
-  }
+class PeerDiscovery {
+  constructor(id) {
+    this.id = id;
+  }
+
+  _getPeerId(id) {
+    if (!peernet.peerMap || peernet.peerMap && peernet.peerMap.size === 0) return false
+
+    for (const entry of [...peernet.peerMap.entries()]) {
+      for (const _id of entry[1]) {
+        if (_id === id) return entry[0]
+      }
+    }
+  }
+
+  async discover(peer) {
+    let id = this._getPeerId(peer.id);
+    if (id) return id
+    const data = new peernet.protos['peernet-peer']({id: this.id});
+    const node = await peernet.prepareMessage(peer.id, data.encoded);
+
+    let response = await peer.request(node.encoded);
+    response = protoFor(response);
+    response = new peernet.protos['peernet-peer-response'](response.decoded.data);
+
+    id = response.decoded.id;
+    if (id === this.id) return;
+
+    if (!peernet.peerMap.has(id)) peernet.peerMap.set(id, [peer.id]);
+    else {
+      const connections = peernet.peerMap.get(id);
+      if (connections.indexOf(peer.id) === -1) {
+        connections.push(peer.id);
+        peernet.peerMap.set(peer.id, connections);
+      }
+    }
+    return id
+  }
+
+  async discoverHandler(message, peer) {
+    const {id, proto} = message;
+    // if (typeof message.data === 'string') message.data = Buffer.from(message.data)
+    if (proto.name === 'peernet-peer') {
+      const from = proto.decoded.id;
+      if (from === this.id) return;
+
+      if (!peernet.peerMap.has(from)) peernet.peerMap.set(from, [peer.id]);
+      else {
+        const connections = peernet.peerMap.get(from);
+        if (connections.indexOf(peer.id) === -1) {
+          connections.push(peer.id);
+          peernet.peerMap.set(from, connections);
+        }
+      }
+      const data = new peernet.protos['peernet-peer-response']({id: this.id});
+      const node = await peernet.prepareMessage(from, data.encoded);
+
+      peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
+    } else if (proto.name === 'peernet-peer-response') {
+      const from = proto.decoded.id;
+      if (from === this.id) return;
+
+      if (!peernet.peerMap.has(from)) peernet.peerMap.set(from, [peer.id]);
+      else {
+        const connections = peernet.peerMap.get(from);
+        if (connections.indexOf(peer.id) === -1) {
+          connections.push(peer.id);
+          peernet.peerMap.set(from, connections);
+        }
+      }
+    }
+  }
 }
 
-/**
- * Keep history of fetched address and ptr
- * @property {Object} address
- * @property {Object} ptr
- */
-const lastFetched = {
-  address: {
-    value: undefined,
-    timestamp: 0,
-  },
-  ptr: {
-    value: undefined,
-    timestamp: 0,
-  },
-};
-
-const getAddress = async () => {
-  const {address} = lastFetched;
-  const now = Math.round(new Date().getTime() / 1000);
-  if (now - address.timestamp > 1200000) {
-    address.value = await fetch('https://icanhazip.com/');
-    address.value = await address.value.text();
-    address.timestamp = Math.round(new Date().getTime() / 1000);
-    lastFetched.address = address;
-  }
-
-  return address.value
-};
-
-const degreesToRadians = (degrees) => {
-  return degrees * Math.PI / 180;
-};
-
-const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
-  const earthRadiusKm = 6371;
-
-  const dLat = degreesToRadians(lat2-lat1);
-  const dLon = degreesToRadians(lon2-lon1);
-
-  lat1 = degreesToRadians(lat1);
-  lat2 = degreesToRadians(lat2);
-  const a = Math.sin(dLat/2) * Math.sin(dLat/2) +
-          Math.sin(dLon/2) * Math.sin(dLon/2) * Math.cos(lat1) * Math.cos(lat2);
-  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
-  return earthRadiusKm * c;
-};
-
-class DhtEarth {
-  /**
-   *
-   */
-  constructor() {
-    this.providerMap = new Map();
-  }
-
-  /**
-   * @param {Object} address
-   * @return {Object} {latitude: lat, longitude: lon}
-   */
-  async getCoordinates(address) {
-    // const {address} = parseAddress(provider)
-    const request = `https://whereis.leofcoin.org/?ip=${address}`;
-    let response = await fetch(request);
-    response = await response.json();
-    const {lat, lon} = response;
-    return {latitude: lat, longitude: lon}
-  }
-
-  /**
-   * @param {Object} peer
-   * @param {Object} provider
-   * @return {Object} {provider, distance}
-   */
-  async getDistance(peer, provider) {
-    const {latitude, longitude} = await this.getCoordinates(provider.address);
-    return {provider, distance: distanceInKmBetweenEarthCoordinates(peer.latitude, peer.longitude, latitude, longitude)}
-  }
-
-  /**
-   * @param {Array} providers
-   * @return {Object} closestPeer
-   */
-  async closestPeer(providers) {
-    let all = [];
-    const address = await getAddress();
-    const peerLoc = await this.getCoordinates(address);
-
-    for (const provider of providers) {
-      if (provider.address === '127.0.0.1') all.push({provider, distance: 0});
-      else all.push(this.getDistance(peerLoc, provider));
-    }
-
-    all = await Promise.all(all);
-    all = all.sort((previous, current) => previous.distance - current.distance);
-    return all[0].provider;
-  }
-
-  /**
-   * @param {String} hash
-   * @return {Array} providers
-   */
-  providersFor(hash) {
-    return this.providerMap.get(hash);
-  }
-
-  /**
-   * @param {String} address
-   * @param {String} hash
-   * @return {Array} providers
-   */
-  async addProvider(address, hash) {
-    let providers = [];
-    if (this.providerMap.has(hash)) providers = this.providerMap.get(hash);
-
-    providers = new Set([...providers, address]);
-    this.providerMap.set(hash, providers);
-    return providers;
-  }
+/**
+ * Keep history of fetched address and ptr
+ * @property {Object} address
+ * @property {Object} ptr
+ */
+const lastFetched = {
+  address: {
+    value: undefined,
+    timestamp: 0,
+  },
+  ptr: {
+    value: undefined,
+    timestamp: 0,
+  },
+};
+
+const getAddress = async () => {
+  const {address} = lastFetched;
+  const now = Math.round(new Date().getTime() / 1000);
+  if (now - address.timestamp > 1200000) {
+    address.value = await fetch('https://icanhazip.com/');
+    address.value = await address.value.text();
+    address.timestamp = Math.round(new Date().getTime() / 1000);
+    lastFetched.address = address;
+  }
+
+  return address.value
+};
+
+const degreesToRadians = (degrees) => {
+  return degrees * Math.PI / 180;
+};
+
+const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
+  const earthRadiusKm = 6371;
+
+  const dLat = degreesToRadians(lat2-lat1);
+  const dLon = degreesToRadians(lon2-lon1);
+
+  lat1 = degreesToRadians(lat1);
+  lat2 = degreesToRadians(lat2);
+  const a = Math.sin(dLat/2) * Math.sin(dLat/2) +
+          Math.sin(dLon/2) * Math.sin(dLon/2) * Math.cos(lat1) * Math.cos(lat2);
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+  return earthRadiusKm * c;
+};
+
+class DhtEarth {
+  /**
+   *
+   */
+  constructor() {
+    this.providerMap = new Map();
+  }
+
+  /**
+   * @param {Object} address
+   * @return {Object} {latitude: lat, longitude: lon}
+   */
+  async getCoordinates(address) {
+    // const {address} = parseAddress(provider)
+    const request = `https://whereis.leofcoin.org/?ip=${address}`;
+    let response = await fetch(request);
+    response = await response.json();
+    const {lat, lon} = response;
+    return {latitude: lat, longitude: lon}
+  }
+
+  /**
+   * @param {Object} peer
+   * @param {Object} provider
+   * @return {Object} {provider, distance}
+   */
+  async getDistance(peer, provider) {
+    const {latitude, longitude} = await this.getCoordinates(provider.address);
+    return {provider, distance: distanceInKmBetweenEarthCoordinates(peer.latitude, peer.longitude, latitude, longitude)}
+  }
+
+  /**
+   * @param {Array} providers
+   * @return {Object} closestPeer
+   */
+  async closestPeer(providers) {
+    let all = [];
+    const address = await getAddress();
+    const peerLoc = await this.getCoordinates(address);
+
+    for (const provider of providers) {
+      if (provider.address === '127.0.0.1') all.push({provider, distance: 0});
+      else all.push(this.getDistance(peerLoc, provider));
+    }
+
+    all = await Promise.all(all);
+    all = all.sort((previous, current) => previous.distance - current.distance);
+    return all[0].provider;
+  }
+
+  /**
+   * @param {String} hash
+   * @return {Array} providers
+   */
+  providersFor(hash) {
+    return this.providerMap.get(hash);
+  }
+
+  /**
+   * @param {String} address
+   * @param {String} hash
+   * @return {Array} providers
+   */
+  async addProvider(address, hash) {
+    let providers = [];
+    if (this.providerMap.has(hash)) providers = this.providerMap.get(hash);
+
+    providers = new Set([...providers, address]);
+    this.providerMap.set(hash, providers);
+    return providers;
+  }
 }
 
 var testnets = {
@@ -1799,10 +1799,10 @@ class HDWallet {
 		return network;
 	}
 
-	async generate(network) {
+	async generate(password, network) {
 		network = this.validateNetwork(network);
-		const mnemonic = generateMnemonic();
-		const seed = await mnemonicToSeed(mnemonic);
+		const mnemonic = generateMnemonic(256);
+		const seed = await mnemonicToSeed(mnemonic, password);
 		this.defineHDNode(bip32.fromSeed(seed, network));
 		return mnemonic; // userpw
 	}
@@ -1810,8 +1810,8 @@ class HDWallet {
 	/**
    * recover using mnemonic (recovery word list)
    */
-	async recover(mnemonic, network) {
-		network = this.validateNetwork(network);
+	async recover(mnemonic, password, network) {
+		network = this.validateNetwork(network, password);
 		const seed = await mnemonicToSeed(mnemonic);
 		this.defineHDNode(bip32.fromSeed(seed, network));
 	}
@@ -1950,788 +1950,695 @@ class MultiWallet extends HDWallet {
 		return encode(buffer);
 	}
 
-	decode(bs58) {
-		let buffer = decode(bs58);
-		const version = varint.decode(buffer);
-		buffer = buffer.slice(varint.decode.bytes);
-		const multiCodec = varint.decode(buffer);
-		buffer = buffer.slice(varint.decode.bytes);
-		bs58 = encode(buffer);
-		if (version !== this.version) throw TypeError('Invalid version');
-		if (this.multiCodec !== multiCodec) throw TypeError('Invalid multiCodec');
-		return { version, multiCodec, bs58 };
-	}
+	decode(bs58) {
+		let buffer = decode(bs58);
+		const version = varint.decode(buffer);
+		buffer = buffer.slice(varint.decode.bytes);
+		const multiCodec = varint.decode(buffer);
+		buffer = buffer.slice(varint.decode.bytes);
+		bs58 = encode(buffer);
+		if (version !== this.version) throw TypeError('Invalid version');
+		if (this.multiCodec !== multiCodec) throw TypeError('Invalid multiCodec');
+		return { version, multiCodec, bs58 };
+	}
+
+	sign(hash) {
+		return new MultiSignature(this.version, this.network.multiCodec)
+			.sign(hash, this.privateKeyBuffer);
+
+	}
+
+	verify(multiSignature, hash) {
+		return new MultiSignature(this.version, this.network.multiCodec)
+			.verify(multiSignature, hash, this.publicKeyBuffer)
+	}
+
+	/**
+	 * @param {number} account - account to return chain for
+	 * @return { internal(addressIndex), external(addressIndex) }
+	 */
+	account(index) {
+		return new HDAccount(new MultiWallet(this.network, this.hdnode), index);
+	}
+
+	/**
+	 * m / purpose' / coin_type' / account' / change / aadress_index
+	 *
+	 * see https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
+	 */
+	derivePath(path) {
+		return new MultiWallet(this.network, this.hdnode.derivePath(path))
+	}
+
+	derive(index) {
+		return new MultiWallet(this.network, this.hdnode.derive(index));
+	}
+}
+
+class MessageHandler {
+  constructor(network) {
+    this.network = network;
+  }
+  /**
+   * hash and sign message
+   *
+   * @param {object} message
+   * @param {Buffer} message.from peer id
+   * @param {Buffer} message.to peer id
+   * @param {string} message.data Peernet message
+   * (PeernetMessage excluded) encoded as a string
+   * @return signature
+   */
+  async hashAndSignMessage(message) {
+    const hasher = new PeernetHash(message, {name: 'peernet-message'});
+    let identity = await walletStore.get('identity');
+    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))
+  }
+
+  /**
+   * @param {String} from - peer id
+   * @param {String} to - peer id
+   * @param {String|PeernetMessage} data - data encoded message string
+   * or the messageNode itself
+   */
+  async prepareMessage(from, to, data, id) {
+    if (data.encoded) data = data.encoded;
+
+    const message = {
+      from,
+      to,
+      data,
+    };
+    const signature = await this.hashAndSignMessage(message);
+    const node = new PeernetMessage({
+      ...message,
+      signature,
+    });
+
+    return node
+  }
+}
+
+const encapsulatedError = () => {
+  return new Error('Nodes/Data should be send encapsulated by peernet-message')
+};
+
+const dhtError = (proto) => {
+  const text = `Received proto ${proto.name} expected peernet-dht-response`;
+  return new Error(`Routing error: ${text}`)
+};
+
+const nothingFoundError = (hash) => {
+  return new Error(`nothing found for ${hash}`)
+};
+
+globalThis.leofcoin = globalThis.leofcoin || {};
+globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true});
+
+/**
+ * @access public
+ * @example
+ * const peernet = new Peernet();
+ */
+class Peernet {
+  /**
+   * @access public
+   * @param {Object} options
+   * @param {String} options.network - desired network
+   * @param {String} options.root - path to root directory
+   * @param {String} options.storePrefix - prefix for datatores (lfc)
+   *
+   * @return {Promise} instance of Peernet
+   *
+   * @example
+   * const peernet = new Peernet({network: 'leofcoin', root: '.leofcoin'});
+   */
+  constructor(options = {}) {
+    this._discovered = [];
+    /**
+     * @property {String} network - current network
+     */
+    this.network = options.network || 'leofcoin';
+    const parts = this.network.split(':');
+
+    if (!options.storePrefix) options.storePrefix = 'lfc';
+    if (!options.port) options.port = 2000;
+    if (!options.root) {
+      if (parts[1]) options.root = `.${parts[0]}/peernet/${parts[1]}`;
+      else options.root = `.${this.network}/peernet`;
+    }
+    globalThis.peernet = this;
+    this.bw = {
+      up: 0,
+      down: 0,
+    };
+    return this._init(options)
+  }
+
+  get defaultStores() {
+    return ['account', 'wallet', 'block', 'transaction', 'chain', 'data', 'message']
+  }
+
+  addProto(name, proto) {
+    if (!this.protos[name]) this.protos[name] = proto;
+  }
+
+  addCodec(name, codec) {
+    if (!this.codecs[name]) this.codecs[name] = codec;
+  }
+
+  async addStore(name, prefix, root, isPrivate = true) {
+    if (name === 'block' || name === 'transaction' || name === 'chain' ||
+        name === 'data' || name === 'message') isPrivate = false;
+
+    let Storage;
+    if (this.hasDaemon) {
+      Storage = LeofcoinStorageClient;
+    } else {
+      Storage = globalThis.LeofcoinStorage?.default ? globalThis.LeofcoinStorage.default : LeofcoinStorage;
+    }
+    globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
+      await new Storage(`${prefix}-${name}`, root);
+
+    globalThis[`${name}Store`].private = isPrivate;
+    if (!isPrivate) this.stores.push(name);
+  }
+
+
+  /**
+   * @see MessageHandler
+   */
+  prepareMessage(to, data) {
+    return this._messageHandler.prepareMessage(this.id, to, data)
+  }
+
+  /**
+   * @access public
+   *
+   * @return {Array} peerId
+   */
+  get peers() {
+    return [...connections.values()]
+  }
+
+  /**
+   * @private
+   *
+   * @param {Object} options
+   * @param {String} options.root - path to root directory
+   *
+   * @return {Promise} instance of Peernet
+   */
+  async _init(options) {
+    // peernetDHT aka closesPeer by coordinates
+    /**
+     * @type {Object}
+     * @property {Object} peer Instance of Peer
+     */
+    this.dht = new DhtEarth();
+    /**
+     * @type {Map}
+     * @property {Object} peer Instance of Peer
+     */
+    this.peerMap = new Map();
+    this.stores = [];
+    this.requestProtos = {};
+    this.storePrefix = options.storePrefix;
+    this.root = options.root;
+
+    /**
+     * proto Object containing protos
+     * @type {Object}
+     * @property {PeernetMessage} protos[peernet-message] messageNode
+     * @property {DHTMessage} protos[peernet-dht] messageNode
+     * @property {DHTMessageResponse} protos[peernet-dht-response] messageNode
+     * @property {DataMessage} protos[peernet-data] messageNode
+     * @property {DataMessageResponse} protos[peernet-data-response] messageNode
+     */
+    globalThis.peernet.protos = {
+      'peernet-request': RequestMessage,
+      'peernet-response': ResponseMessage,
+      'peernet-peer': PeerMessage,
+      'peernet-peer-response': PeerMessageResponse,
+      'peernet-message': PeernetMessage,
+      'peernet-dht': DHTMessage,
+      'peernet-dht-response': DHTMessageResponse,
+      'peernet-data': DataMessage,
+      'peernet-data-response': DataMessageResponse,
+      'peernet-ps': PsMessage,
+      'chat-message': ChatMessage,
+    };
+
+    this.protos = globalThis.peernet.protos;
+    this.codecs = codecs;
+
+    this._messageHandler = new MessageHandler(this.network);
+
+    const {daemon, environment} = await target();
+    this.hasDaemon = daemon;
+
+    HTTP_IMPORT;
+
+    for (const store of this.defaultStores) {
+      await this.addStore(store, options.storePrefix, options.root);
+    }
+
+    try {
+      const pub = await accountStore.get('public');
+      this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
+    } catch (e) {
+      if (e.code === 'ERR_NOT_FOUND') {
+        const {identity, accounts, config} = await generateAccount(this.network);
+        walletStore.put('version', new TextEncoder().encode(1));
+        walletStore.put('accounts', new TextEncoder().encode(accounts));
+        walletStore.put('identity', new TextEncoder().encode(JSON.stringify(identity)));
+        await accountStore.put('config', new TextEncoder().encode(JSON.stringify(config)));
+        await accountStore.put('public', new TextEncoder().encode(JSON.stringify({walletId: identity.walletId})));
+
+        this.id = identity.walletId;
+      } else {
+        throw e
+      }
+    }
+    this._peerHandler = new PeerDiscovery(this.id);
+    this.peerId = this.id;
+
+    pubsub.subscribe('peer:connected', async (peer) => {
+      console.log(peer);
+      // console.log({connected: peer.id, as: this._getPeerId(peer.id) });
+      // peer.on('peernet.data', async (message) => {
+      //   const id = message.id
+      //   message = new PeernetMessage(Buffer.from(message.data.data))
+      //   const proto = protoFor(message.decoded.data)
+      //   this._protoHandler({id, proto}, peer)
+      // })
+    });
+
+    pubsub.subscribe('peer:data', async message => {
+      if (!message.data) return
+      const {id, data} = JSON.parse(new TextDecoder().decode(message.data));
+      const uint8Array = new Uint8Array(Object.keys(data).length);
+      for (var i = 0; i < Object.keys(data).length; i++) {
+        uint8Array[i] = data[i];
+      }
+      message = new PeernetMessage(uint8Array);
+      const proto = protoFor(message.decoded.data);
+
+      const from = message.decoded.from;
+      this._protoHandler({id, proto}, this.client.connections[from], from);
+    });
+
+    /**
+     * @access public
+     * @type {PeernetClient}
+     */
+    this.client = new Client(this.id);
+    if (globalThis.onbeforeunload) {
+      globalThis.addEventListener('beforeunload', async () => this.client.close());
+    }
+    return this
+  }
+
+  _getPeerId(id) {
+    for (const entry of [...this.peerMap.entries()]) {
+      for (const _id of entry[1]) {
+        if (_id === id) return entry[0]
+      }
+    }
+  }
+
+  addRequestHandler(name, method) {
+    this.requestProtos[name] = method;
+  }
+
+  /**
+   * @private
+   *
+   * @param {Buffer} message - peernet message
+   * @param {PeernetPeer} peer - peernet peer
+   */
+  async _protoHandler(message, peer, from) {
+    const {id, proto} = message;
+    this.bw.down += proto.encoded.length;
+
+      if (proto.name === 'peernet-dht') {
+        let { hash, store } = proto.decoded;
+        let has;
+
+        if (!store) {
+          has = await this.has(hash);
+        } else {
+          store = globalThis[`${store}Store`];
+          if (store.private) has = false;
+          else has = await store.has(hash);
+        }
+        const data = new DHTMessageResponse({hash, has});
+        const node = await this.prepareMessage(from, data.encoded);
+
+        peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
+        this.bw.up += node.encoded.length;
+      } else if (proto.name === 'peernet-data') {
+        let { hash, store } = proto.decoded;
+        let data;
+        if (!store) {
+          store = await this.whichStore([...this.stores], hash);
+        } else {
+          store = globalThis[`${store}Store`];
+        }
+        if (store && !store.private) {
+          data = await store.get(hash);
+
+          if (data) {
+            data = new DataMessageResponse({hash, data: data.decoded ? new TextEncoder().encode(JSON.stringify(data.decoded)) : data});
+
+            const node = await this.prepareMessage(from, data.encoded);
+            peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
+            this.bw.up += node.encoded.length;
+          }
+        }
+
+      } else if (proto.name === 'peernet-request') {
+        // TODO: make dynamic
+        // exposeddevapi[proto.decoded.request](proto.decoded.params)
+        const method = this.requestProtos[proto.decoded.request];
+        if (method) {
+          const data = await method();
+          const node = await this.prepareMessage(from, data.encoded);
+          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
+
+          this.bw.up += node.encoded.length;
+        }
+      } else if (proto.name === 'peernet-ps' &&
+                 this._getPeerId(peer.id) !== this.id.toString()) {
+        globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString());
+      }
+    // }
+  }
+
+  /**
+   * performs a walk and resolves first encounter
+   *
+   * @param {String} hash
+   */
+  async walk(hash) {
+    if (!hash) throw new Error('hash expected, received undefined')
+    const data = new DHTMessage({hash});
+    this.client.id;
+    for (const peer of this.peers) {
+      const node = await this.prepareMessage(peer.id, data.encoded);
+
+      const result = await peer.request(node.encoded);
+
+      let proto = protoFor(result.data);
+
+      if (proto.name !== 'peernet-message') throw encapsulatedError()
+      const from = proto.decoded.from;
+      proto = protoFor(proto.decoded.data);
+
+      if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
+
+      // TODO: give ip and port (just used for location)
+      if (!peer.connection.remoteAddress || !peer.connection.localAddress) {
+        peer.connection.remoteFamily = 'ipv4';
+        peer.connection.remoteAddress = '127.0.0.1';
+        peer.connection.remotePort = '0000';
+      }
+
+      const peerInfo = {
+        family: peer.connection.remoteFamily || peer.connection.localFamily,
+        address: peer.connection.remoteAddress || peer.connection.localAddress,
+        port: peer.connection.remotePort || peer.connection.localPort,
+        id: from,
+      };
+
+      if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash);
+    }
+    return
+  }
+
+  /**
+   * Override DHT behavior, try's finding the content three times
+   *
+   * @param {String} hash
+   */
+  async providersFor(hash) {
+    let providers = await this.dht.providersFor(hash);
+    // walk the network to find a provider
+    if (!providers || providers.length === 0) {
+      await this.walk(hash);
+      providers = await this.dht.providersFor(hash);
+      // second walk the network to find a provider
+      if (!providers || providers.length === 0) {
+        await this.walk(hash);
+        providers = await this.dht.providersFor(hash);
+      }
+      // last walk
+      if (!providers || providers.length === 0) {
+        await this.walk(hash);
+        providers = await this.dht.providersFor(hash);
+      }
+    }
+    // undefined if no providers given
+    return providers
+  }
+
+  get block() {
+    return {
+      get: async (hash) => {
+        const data = await blockStore.has(hash);
+        if (data) return await blockStore.get(hash)
+        return this.requestData(hash, 'block')
+      },
+      put: async (hash, data) => {
+        if (await blockStore.has(hash)) return
+        return await blockStore.put(hash, data)
+      },
+      has: async (hash) => await blockStore.has(hash, 'block'),
+    }
+  }
+
+  get transaction() {
+    return {
+      get: async (hash) => {
+        const data = await transactionStore.has(hash);
+        if (data) return await transactionStore.get(hash)
+        return this.requestData(hash, 'transaction')
+      },
+      put: async (hash, data) => {
+        if (await transactionStore.has(hash)) return
+        return await transactionStore.put(hash, data)
+      },
+      has: async (hash) => await transactionStore.has(hash),
+    }
+  }
+
+  async requestData(hash, store) {
+    const providers = await this.providersFor(hash);
+    if (!providers || providers.size === 0) throw nothingFoundError(hash)
+    debug(`found ${providers.size} provider(s) for ${hash}`);
+    // get closest peer on earth
+    const closestPeer = await this.dht.closestPeer(providers);
+    // get peer instance by id
+    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
+      });
+
+      let data = new DataMessage({hash, store: store.name ? store.name : store});
+
+      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
+        });
+        if (closest[0]) data = await closest[0].request(node.encoded);
+      }
+      if (data.data) {
+        console.log(data.data);
+        let proto = protoFor(data.data);
+        proto = protoFor(proto.decoded.data);
+        return proto.decoded.data
+      }
+
+      // this.put(hash, proto.decoded.data)
+    }
+    return null
+  }
+
 
-	sign(hash) {
-		return new MultiSignature(this.version, this.network.multiCodec)
-			.sign(hash, this.privateKeyBuffer);
+  get message() {
+    return {
+      /**
+       * Get content for given message hash
+       *
+       * @param {String} hash
+       */
+      get: async (hash) => {
+        debug(`get message ${hash}`);
+        const message = await messageStore.has(hash);
+        if (message) return await messageStore.get(hash)
+        return this.requestData(hash, 'message')
+      },
+      /**
+       * put message content
+       *
+       * @param {String} hash
+       * @param {Buffer} message
+       */
+      put: async (hash, message) => await messageStore.put(hash, message),
+      /**
+       * @param {String} hash
+       * @return {Boolean}
+       */
+      has: async (hash) => await messageStore.has(hash),
+    }
+  }
 
-	}
+  get data() {
+    return {
+      /**
+       * Get content for given data hash
+       *
+       * @param {String} hash
+       */
+      get: async (hash) => {
+        debug(`get data ${hash}`);
+        const data = await dataStore.has(hash);
+        if (data) return await dataStore.get(hash)
+        return this.requestData(hash, 'data')
+      },
+      /**
+       * put data content
+       *
+       * @param {String} hash
+       * @param {Buffer} data
+       */
+      put: async (hash, data) => await dataStore.put(hash, data),
+      /**
+       * @param {String} hash
+       * @return {Boolean}
+       */
+      has: async (hash) => await dataStore.has(hash),
+    }
+  }
 
-	verify(multiSignature, hash) {
-		return new MultiSignature(this.version, this.network.multiCodec)
-			.verify(multiSignature, hash, this.publicKeyBuffer)
-	}
+  /**
+   * goes trough given stores and tries to find data for given hash
+   * @param {Array} stores
+   * @param {string} hash
+   */
+  async whichStore(stores, hash) {
+    let store = stores.pop();
+    store = globalThis[`${store}Store`];
+    if (store) {
+      const has = await store.has(hash);
+      if (has) return store
+      if (stores.length > 0) return this.whichStore(stores, hash)
+    } else return null
+  }
 
-	/**
-	 * @param {number} account - account to return chain for
-	 * @return { internal(addressIndex), external(addressIndex) }
-	 */
-	account(index) {
-		return new HDAccount(new MultiWallet(this.network, this.hdnode), index);
-	}
+  /**
+   * Get content for given hash
+   *
+   * @param {String} hash - the hash of the wanted data
+   * @param {String} store - storeName to access
+   */
+  async get(hash, store) {
+    debug(`get ${hash}`);
+    let data;
+    if (store) store = globalThis[`${store}Store`];
+    if (!store) store = await this.whichStore([...this.stores], hash);
+    if (store && await store.has(hash)) data = await store.get(hash);
+    if (data) return data
+
+    return this.requestData(hash, store.name ? store.name : store)
+  }
 
-	/**
-	 * m / purpose' / coin_type' / account' / change / aadress_index
-	 *
-	 * see https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
-	 */
-	derivePath(path) {
-		return new MultiWallet(this.network, this.hdnode.derivePath(path))
-	}
+  /**
+   * put content
+   *
+   * @param {String} hash
+   * @param {Buffer} data
+   * @param {String} store - storeName to access
+   */
+  async put(hash, data, store = 'data') {
+    store = globalThis[`${store}Store`];
+    return store.put(hash, data)
+  }
 
-	derive(index) {
-		return new MultiWallet(this.network, this.hdnode.derive(index));
-	}
-}
-
-class MessageHandler {
-  constructor(network) {
-    this.network = network;
+  /**
+   * @param {String} hash
+   * @return {Boolean}
+   */
+  async has(hash) {
+    const store = await this.whichStore([...this.stores], hash);
+    if (store) {
+      if (store.private) return false
+      else return true
+    }
+    return false
   }
+
   /**
-   * hash and sign message
    *
-   * @param {object} message
-   * @param {Buffer} message.from peer id
-   * @param {Buffer} message.to peer id
-   * @param {string} message.data Peernet message
-   * (PeernetMessage excluded) encoded as a string
-   * @return signature
+   * @param {String} topic
+   * @param {String|Object|Array|Boolean|Buffer} data
    */
-  async hashAndSignMessage(message) {
-    const hasher = new PeernetHash(message, {name: 'peernet-message'});
-    const identity = await walletStore.get('identity');
+  async publish(topic, data) {
+    // globalSub.publish(topic, data)
+    if (topic instanceof Uint8Array === false) topic = new TextEncoder().encode(topic);
+    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()) {
+          const node = await this.prepareMessage(peer.id, data.encoded);
+          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
+        }
+      } else {
+        this.removePeer(peer);
+      }
+      // TODO: if peer subscribed
+    }
+  }
 
-    const wallet = new MultiWallet(this.network);
-    wallet.import(identity.multiWIF);
-    return wallet.sign(hasher.hash.slice(0, 32))
+  createHash(data, name) {
+    return new PeernetHash(data, {name})
   }
 
   /**
-   * @param {String} from - peer id
-   * @param {String} to - peer id
-   * @param {String|PeernetMessage} data - data encoded message string
-   * or the messageNode itself
+   *
+   * @param {String} topic
+   * @param {Method} cb
    */
-  async prepareMessage(from, to, data, id) {
-    if (!Buffer.isBuffer(from)) from = new Buffer.from(from);
-    if (!Buffer.isBuffer(to)) to = new Buffer.from(to);
-    if (data.encoded) data = data.encoded;
+  async subscribe(topic, cb) {
+    // TODO: if peer subscribed
+    globalSub.subscribe(topic, cb);
+  }
 
-    const message = {
-      from,
-      to,
-      data,
-    };
-    const signature = await this.hashAndSignMessage(message);
-    const node = new PeernetMessage({
-      ...message,
-      signature,
-    });
+  async removePeer(peer) {
+    connections.delete(peer.id);
+  }
 
-    return node
+  get Buffer() {
+    return Buffer
   }
-}
-
-const encapsulatedError = () => {
-  return new Error('Nodes/Data should be send encapsulated by peernet-message')
-};
-
-const dhtError = (proto) => {
-  const text = `Received proto ${proto.name} expected peernet-dht-response`;
-  return new Error(`Routing error: ${text}`)
-};
-
-const nothingFoundError = (hash) => {
-  return new Error(`nothing found for ${hash}`)
-};
-
-globalThis.leofcoin = globalThis.leofcoin || {};
-globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true});
-
-/**
- * @access public
- * @example
- * const peernet = new Peernet();
- */
-class Peernet {
-  /**
-   * @access public
-   * @param {Object} options
-   * @param {String} options.network - desired network
-   * @param {String} options.root - path to root directory
-   * @param {String} options.storePrefix - prefix for datatores (lfc)
-   *
-   * @return {Promise} instance of Peernet
-   *
-   * @example
-   * const peernet = new Peernet({network: 'leofcoin', root: '.leofcoin'});
-   */
-  constructor(options = {}) {
-    this._discovered = [];
-    /**
-     * @property {String} network - current network
-     */
-    this.network = options.network || 'leofcoin';
-    const parts = this.network.split(':');
-
-    if (!options.storePrefix) options.storePrefix = 'lfc';
-    if (!options.port) options.port = 2000;
-    if (!options.root) {
-      if (parts[1]) options.root = `.${parts[0]}/peernet/${parts[1]}`;
-      else options.root = `.${this.network}/peernet`;
-    }
-    globalThis.peernet = this;
-    this.bw = {
-      up: 0,
-      down: 0,
-    };
-    return this._init(options)
-  }
-
-  get defaultStores() {
-    return ['account', 'wallet', 'block', 'transaction', 'chain', 'data', 'message']
-  }
-
-  addProto(name, proto) {
-    if (!this.protos[name]) this.protos[name] = proto;
-  }
-
-  addCodec(name, codec) {
-    if (!this.codecs[name]) this.codecs[name] = codec;
-  }
-
-  async addStore(name, prefix, root, isPrivate = true) {
-    if (name === 'block' || name === 'transaction' || name === 'chain' ||
-        name === 'data' || name === 'message') isPrivate = false;
-
-    let Storage;
-    if (this.hasDaemon) {
-      Storage = LeofcoinStorageClient;
-    } else {
-      Storage = LeofcoinStorage;
-    }
-    globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
-      await new Storage(`${prefix}-${name}`, root);
-
-    globalThis[`${name}Store`].private = isPrivate;
-    if (!isPrivate) this.stores.push(name);
-  }
-
-
-  /**
-   * @see MessageHandler
-   */
-  prepareMessage(to, data) {
-    return this._messageHandler.prepareMessage(this.id, to, data)
-  }
-
-  /**
-   * @access public
-   *
-   * @return {Array} peerId
-   */
-  get peers() {
-    return [...connections.values()]
-  }
-
-  /**
-   * @private
-   *
-   * @param {Object} options
-   * @param {String} options.root - path to root directory
-   *
-   * @return {Promise} instance of Peernet
-   */
-  async _init(options) {
-    // peernetDHT aka closesPeer by coordinates
-    /**
-     * @type {Object}
-     * @property {Object} peer Instance of Peer
-     */
-    this.dht = new DhtEarth();
-    /**
-     * @type {Map}
-     * @property {Object} peer Instance of Peer
-     */
-    this.peerMap = new Map();
-    this.stores = [];
-    this.requestProtos = {};
-    this.storePrefix = options.storePrefix;
-    this.root = options.root;
-
-    /**
-     * proto Object containing protos
-     * @type {Object}
-     * @property {PeernetMessage} protos[peernet-message] messageNode
-     * @property {DHTMessage} protos[peernet-dht] messageNode
-     * @property {DHTMessageResponse} protos[peernet-dht-response] messageNode
-     * @property {DataMessage} protos[peernet-data] messageNode
-     * @property {DataMessageResponse} protos[peernet-data-response] messageNode
-     */
-    globalThis.peernet.protos = {
-      'peernet-request': RequestMessage,
-      'peernet-response': ResponseMessage,
-      'peernet-peer': PeerMessage,
-      'peernet-peer-response': PeerMessageResponse,
-      'peernet-message': PeernetMessage,
-      'peernet-dht': DHTMessage,
-      'peernet-dht-response': DHTMessageResponse,
-      'peernet-data': DataMessage,
-      'peernet-data-response': DataMessageResponse,
-      'peernet-ps': PsMessage,
-      'chat-message': ChatMessage,
-    };
-
-    this.protos = globalThis.peernet.protos;
-    this.codecs = codecs;
-
-    this._messageHandler = new MessageHandler(this.network);
-
-    const {daemon, environment} = await target();
-    this.hasDaemon = daemon;
-
-    HTTP_IMPORT;
-
-    for (const store of this.defaultStores) {
-      await this.addStore(store, options.storePrefix, options.root);
-    }
-
-    try {
-      const pub = await accountStore.get('public');
-      this.id = pub.walletId;
-    } catch (e) {
-      if (e.code === 'ERR_NOT_FOUND') {
-        const wallet = {};
-        const {identity, accounts, config} = await generateAccount(this.network);
-        wallet.identity = identity;
-        wallet.accounts = accounts;
-        wallet.version = 1;
-        walletStore.put(wallet);
-        await accountStore.put('config', config);
-        await accountStore.put('public', {walletId: wallet.identity.walletId});
-
-        this.id = wallet.identity.walletId;
-      } else {
-        throw e
-      }
-    }
-    this._peerHandler = new PeerDiscovery(this.id);
-    this.peerId = this.id;
-
-    // pubsub.subscribe('peer:discovered', async (peer) => {
-    //   peer.on('peernet.data', async (message) => {
-    //     const id = message.id;
-    //     message = new PeernetMessage(Buffer.from(message.data.data));
-    //     const proto = protoFor(message.decoded.data);
-    //     await this._protoHandler({id, proto}, peer);
-    //   });
-    //   await this._peerHandler.discover(peer);
-    //   const fulldId = this._getPeerId(peer.id);
-    //   if (fulldId && this._discovered.indexOf(peer.id) === -1) {
-    //     this._discovered.push(peer.id);
-    //     pubsub.publish('peer:connected', peer);
-    //   }
-    // });
-    // pubsub.subscribe('peer:disconnected', async (peer) => {
-    //   let index = this._discovered.indexOf(peer.id)
-    //   if (index !== -1) this._discovered.splice(index, 1)
-    //   const id = this._getPeerId(peer.id)
-    //   let peerIds = this.peerMap.get(id)
-    //
-    //   if (peerIds) {
-    //     index = peerIds.indexOf(peer.id)
-    //     if (index !== -1) peerIds.splice(index, 1)
-    //   } else {
-    //     peerIds = []
-    //   }
-    //
-    //   if (peerIds.length === 0) this.peerMap.delete(id)
-    //   else this.peerMap.set(id, peerIds)
-    // })
-    pubsub.subscribe('peer:connected', async (peer) => {
-      console.log(peer);
-      // console.log({connected: peer.id, as: this._getPeerId(peer.id) });
-      // peer.on('peernet.data', async (message) => {
-      //   const id = message.id
-      //   message = new PeernetMessage(Buffer.from(message.data.data))
-      //   const proto = protoFor(message.decoded.data)
-      //   this._protoHandler({id, proto}, peer)
-      // })
-    });
-
-    pubsub.subscribe('peer:data', async message => {
-      console.log({message});
-      if (!message.data) return
-      const {id, data} = JSON.parse(new TextDecoder().decode(message.data));
-      const uint8Array = new Uint8Array(Object.keys(data).length);
-      for (var i = 0; i < Object.keys(data).length; i++) {
-        uint8Array[i] = data[i];
-      }
-      message = new PeernetMessage(uint8Array);
-      const proto = protoFor(message.decoded.data);
-
-      console.log(message.decoded);
-      const from = new TextDecoder().decode(message.decoded.from);
-      this._protoHandler({id, proto}, this.client.connections[from], from);
-    });
-
-    /**
-     * @access public
-     * @type {PeernetClient}
-     */
-    this.client = new Client(this.id);
-    if (globalThis.onbeforeunload) {
-      globalThis.addEventListener('beforeunload', async () => this.client.close());
-    }
-    return this
-  }
-
-  _getPeerId(id) {
-    for (const entry of [...this.peerMap.entries()]) {
-      for (const _id of entry[1]) {
-        if (_id === id) return entry[0]
-      }
-    }
-  }
-
-  addRequestHandler(name, method) {
-    this.requestProtos[name] = method;
-  }
-
-  /**
-   * @private
-   *
-   * @param {Buffer} message - peernet message
-   * @param {PeernetPeer} peer - peernet peer
-   */
-  async _protoHandler(message, peer, from) {
-    const {id, proto} = message;
-    console.log(message);
-    this.bw.down += proto.encoded.length;
-    // if (proto.name === 'peernet-peer') {
-    //   const from = proto.decoded.id
-    //   if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-    //   else {
-    //     const connections = this.peerMap.get(from)
-    //     if (connections.indexOf(peer.id) === -1) {
-    //       connections.push(peer.id)
-    //       this.peerMap.set(from, connections)
-    //     }
-    //   }
-    //   const data = new PeerMessageResponse({id: this.id})
-    //   const node = await this.prepareMessage(from, data.encoded)
-    //
-    //   peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})))
-    //   this.bw.up += node.encoded.length
-    // } else if (proto.name === 'peernet-peer-response') {
-    //   const from = proto.decoded.id
-    //   if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-    //   else {
-    //     const connections = this.peerMap.get(from)
-    //     if (connections.indexOf(peer.id) === -1) {
-    //       connections.push(peer.id)
-    //       this.peerMap.set(from, connections)
-    //     }
-    //   }
-    // } else {
-    //   let from = this._getPeerId(peer.id)
-    //   if (!from) {
-    //     const data = new PeerMessage({id: this.id})
-    //     const node = await this.prepareMessage(peer.id, data.encoded)
-    //     this.bw.up += node.encoded.length
-    //     let response = await peer.request(node.encoded)
-    //     response = protoFor(response)
-    //
-    //     response = new PeerMessageResponse(response.decoded.data)
-    //
-    //     from = response.decoded.id
-    //     if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-    //     else {
-    //       const connections = this.peerMap.get(from)
-    //       if (connections.indexOf(peer.id) === -1) {
-    //         connections.push(peer.id)
-    //         this.peerMap.set(from, connections)
-    //       }
-    //     }
-    //   }
-      if (proto.name === 'peernet-dht') {
-        let { hash, store } = proto.decoded;
-        let has;
-
-        if (!store) {
-          has = await this.has(hash);
-        } else {
-          store = globalThis[`${store}Store`];
-          if (store.private) has = false;
-          else has = await store.has(hash);
-        }
-        const data = new DHTMessageResponse({hash, has});
-        const node = await this.prepareMessage(from, data.encoded);
-
-        peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
-        this.bw.up += node.encoded.length;
-      } else if (proto.name === 'peernet-data') {
-        let { hash, store } = proto.decoded;
-        let data;
-        if (!store) {
-          store = await this.whichStore([...this.stores], hash);
-        } else {
-          store = globalThis[`${store}Store`];
-        }
-        if (store && !store.private) {
-          data = await store.get(hash);
-
-          if (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.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
-            this.bw.up += node.encoded.length;
-          }
-        }
-
-      } else if (proto.name === 'peernet-peer') {
-        const from = proto.decoded.id;
-        if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id]);
-        else {
-          const connections = this.peerMap.get(from);
-          connections.push(peer.id);
-          this.peerMap.set(from, connections);
-        }
-        const data = new PeerMessage({id: this.id});
-        const node = await this.prepareMessage(from, data.encoded);
-
-        peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
-        this.bw.up += node.encoded.length;
-      } else if (proto.name === 'peernet-request') {
-        // TODO: make dynamic
-        // exposeddevapi[proto.decoded.request](proto.decoded.params)
-        const method = this.requestProtos[proto.decoded.request];
-        if (method) {
-          const data = await method();
-          const node = await this.prepareMessage(from, data.encoded);
-          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
-          this.bw.up += node.encoded.length;
-        }
-      } else if (proto.name === 'peernet-ps' &&
-                 this._getPeerId(peer.id) !== this.id.toString()) {
-        globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString());
-      }
-    // }
-  }
-
-  /**
-   * performs a walk and resolves first encounter
-   *
-   * @param {String} hash
-   */
-  async walk(hash) {
-    if (!hash) throw new Error('hash expected, received undefined')
-    const data = new DHTMessage({hash});
-    this.client.id;
-    for (const peer of this.peers) {
-      const node = await this.prepareMessage(peer.id, data.encoded);
-
-      const result = await peer.request(node.encoded);
-
-      let proto = protoFor(result.data);
-
-      if (proto.name !== 'peernet-message') throw encapsulatedError()
-      const from = proto.decoded.from;
-      proto = protoFor(proto.decoded.data);
-
-      if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
-
-      // TODO: give ip and port (just used for location)
-      if (!peer.connection.remoteAddress || !peer.connection.localAddress) {
-        peer.connection.remoteFamily = 'ipv4';
-        peer.connection.remoteAddress = '127.0.0.1';
-        peer.connection.remotePort = '0000';
-      }
-
-      const peerInfo = {
-        family: peer.connection.remoteFamily || peer.connection.localFamily,
-        address: peer.connection.remoteAddress || peer.connection.localAddress,
-        port: peer.connection.remotePort || peer.connection.localPort,
-        id: from,
-      };
-
-      if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash);
-    }
-    return
-  }
-
-  /**
-   * Override DHT behavior, try's finding the content three times
-   *
-   * @param {String} hash
-   */
-  async providersFor(hash) {
-    let providers = await this.dht.providersFor(hash);
-    // walk the network to find a provider
-    if (!providers || providers.length === 0) {
-      await this.walk(hash);
-      providers = await this.dht.providersFor(hash);
-      // second walk the network to find a provider
-      if (!providers || providers.length === 0) {
-        await this.walk(hash);
-        providers = await this.dht.providersFor(hash);
-      }
-      // last walk
-      if (!providers || providers.length === 0) {
-        await this.walk(hash);
-        providers = await this.dht.providersFor(hash);
-      }
-    }
-    // undefined if no providers given
-    return providers
-  }
-
-  get block() {
-    return {
-      get: async (hash) => {
-        const data = await blockStore.has(hash);
-        if (data) return await blockStore.get(hash)
-        return this.requestData(hash, 'block')
-      },
-      put: async (hash, data) => {
-        if (await blockStore.has(hash)) return
-        return await blockStore.put(hash, data)
-      },
-      has: async (hash) => await blockStore.has(hash, 'block'),
-    }
-  }
-
-  get transaction() {
-    return {
-      get: async (hash) => {
-        const data = await transactionStore.has(hash);
-        if (data) return await transactionStore.get(hash)
-        return this.requestData(hash, 'transaction')
-      },
-      put: async (hash, data) => {
-        if (await transactionStore.has(hash)) return
-        return await transactionStore.put(hash, data)
-      },
-      has: async (hash) => await transactionStore.has(hash),
-    }
-  }
-
-  async requestData(hash, store) {
-    const providers = await this.providersFor(hash);
-    if (!providers || providers.size === 0) throw nothingFoundError(hash)
-    debug(`found ${providers.size} provider(s) for ${hash}`);
-    // get closest peer on earth
-    const closestPeer = await this.dht.closestPeer(providers);
-    // get peer instance by id
-    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
-      });
-
-      let data = new DataMessage({hash, store: store.name ? store.name : store});
-
-      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
-        });
-        if (closest[0]) data = await closest[0].request(node.encoded);
-      }
-      if (data.data) {
-        let proto = protoFor(Buffer.from(data.data));
-        proto = protoFor(proto.decoded.data);
-        return proto.decoded.data
-      }
-
-      // this.put(hash, proto.decoded.data)
-    }
-    return null
-  }
-
-
-  get message() {
-    return {
-      /**
-       * Get content for given message hash
-       *
-       * @param {String} hash
-       */
-      get: async (hash) => {
-        debug(`get message ${hash}`);
-        const message = await messageStore.has(hash);
-        if (message) return await messageStore.get(hash)
-        return this.requestData(hash, 'message')
-      },
-      /**
-       * put message content
-       *
-       * @param {String} hash
-       * @param {Buffer} message
-       */
-      put: async (hash, message) => await messageStore.put(hash, message),
-      /**
-       * @param {String} hash
-       * @return {Boolean}
-       */
-      has: async (hash) => await messageStore.has(hash),
-    }
-  }
-
-  get data() {
-    return {
-      /**
-       * Get content for given data hash
-       *
-       * @param {String} hash
-       */
-      get: async (hash) => {
-        debug(`get data ${hash}`);
-        const data = await dataStore.has(hash);
-        if (data) return await dataStore.get(hash)
-        return this.requestData(hash, 'data')
-      },
-      /**
-       * put data content
-       *
-       * @param {String} hash
-       * @param {Buffer} data
-       */
-      put: async (hash, data) => await dataStore.put(hash, data),
-      /**
-       * @param {String} hash
-       * @return {Boolean}
-       */
-      has: async (hash) => await dataStore.has(hash),
-    }
-  }
-
-  /**
-   * goes trough given stores and tries to find data for given hash
-   * @param {Array} stores
-   * @param {string} hash
-   */
-  async whichStore(stores, hash) {
-    let store = stores.pop();
-    store = globalThis[`${store}Store`];
-    if (store) {
-      const has = await store.has(hash);
-      if (has) return store
-      if (stores.length > 0) return this.whichStore(stores, hash)
-    } else return null
-  }
-
-  /**
-   * Get content for given hash
-   *
-   * @param {String} hash - the hash of the wanted data
-   * @param {String} store - storeName to access
-   */
-  async get(hash, store) {
-    debug(`get ${hash}`);
-    let data;
-    if (store) store = globalThis[`${store}Store`];
-    if (!store) store = await this.whichStore([...this.stores], hash);
-    if (store && await store.has(hash)) data = await store.get(hash);
-    if (data) return data
-
-    return this.requestData(hash, store.name ? store.name : store)
-  }
-
-  /**
-   * put content
-   *
-   * @param {String} hash
-   * @param {Buffer} data
-   * @param {String} store - storeName to access
-   */
-  async put(hash, data, store = 'data') {
-    store = globalThis[`${store}Store`];
-    return store.put(hash, data)
-  }
-
-  /**
-   * @param {String} hash
-   * @return {Boolean}
-   */
-  async has(hash) {
-    const store = await this.whichStore([...this.stores], hash);
-    if (store) {
-      if (store.private) return false
-      else return true
-    }
-    return false
-  }
-
-  /**
-   *
-   * @param {String} topic
-   * @param {String|Object|Array|Boolean|Buffer} data
-   */
-  async publish(topic, data) {
-    // globalSub.publish(topic, data)
-    if (!Buffer.isBuffer(topic)) topic = Buffer.from(topic);
-    if (!Buffer.isBuffer(data)) data = Buffer.from(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()) {
-          const node = await this.prepareMessage(peer.id, data.encoded);
-          peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
-        }
-      } else {
-        this.removePeer(peer);
-      }
-      // TODO: if peer subscribed
-    }
-  }
-
-  createHash(data, name) {
-    return new PeernetHash(data, {name})
-  }
-
-  /**
-   *
-   * @param {String} topic
-   * @param {Method} cb
-   */
-  async subscribe(topic, cb) {
-    // TODO: if peer subscribed
-    globalSub.subscribe(topic, cb);
-  }
-
-  async removePeer(peer) {
-    connections.delete(peer.id);
-  }
-
-  get Buffer() {
-    return Buffer
-  }
-  // async block(index) {
-  //   const _values = []
-  //   for (const peer of this.peers) {
-  //     const value = await peer.request({type: 'block', index})
-  //     console.log(value);
-  //   }
-  //
-  // }
+  // async block(index) {
+  //   const _values = []
+  //   for (const peer of this.peers) {
+  //     const value = await peer.request({type: 'block', index})
+  //     console.log(value);
+  //   }
+  //
+  // }
 }
 
 export { Peernet as default };