@leofcoin/peernet 0.11.0 → 0.11.3

package/src/codec/codec.js

@@ -1,124 +1,124 @@
-import varint from 'varint';
-import bs32 from '@vandeurenglenn/base32';
-import bs58 from '@vandeurenglenn/base58';
-import isHex from 'is-hex';
-import codecs from './codecs'
-
-export default 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
-  }
-}
+import varint from 'varint';
+import bs32 from '@vandeurenglenn/base32';
+import bs58 from '@vandeurenglenn/base58';
+import isHex from '@vandeurenglenn/is-hex';
+import codecs from './codecs'
+
+export default 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
+  }
+}

package/src/dht/dht.js

@@ -1,121 +1,121 @@
-import fetch from 'node-fetch'
-
-/**
- * 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;
-}
-
-export default 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;
-  }
-}
+import fetch from 'node-fetch'
+
+/**
+ * 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;
+}
+
+export default 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;
+  }
+}

package/src/discovery/peer-discovery.js

@@ -1,75 +1,75 @@
-import { protoFor } from './../utils/utils.js'
-
-export default 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)
-        }
-      }
-    }
-  }
-}
+import { protoFor } from './../utils/utils.js'
+
+export default 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)
+        }
+      }
+    }
+  }
+}

package/src/handlers/message.js

@@ -18,8 +18,8 @@ export default class MessageHandler {
    */
   async hashAndSignMessage(message) {
     const hasher = new Hash(message, {name: 'peernet-message'})
-    const identity = await walletStore.get('identity')
-
+    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))
@@ -32,8 +32,6 @@ export default class MessageHandler {
    * or the messageNode itself
    */
   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
 
     const message = {