@leofcoin/peernet 1.0.2 → 1.0.3

package/src/dht/dht.js

@@ -1,119 +1,119 @@
-/**
- * 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;
-  }
-}
+/**
+ * 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 = await 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 = await protoFor(response)
-    response = await 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 = await 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 = await 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 = await protoFor(response)
+    response = await 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 = await 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/data.js

@@ -1,12 +1,12 @@
-import { protoFor } from './../utils/utils.js'
-
-const dataHandler = async message => {
-  if (!message) return
-
-  const {data, id, from} = message
-  const proto = await protoFor(data)
-
-  peernet._protoHandler({id, proto}, peernet.client.connections[from], from)
-}
-
-export default dataHandler
+import { protoFor } from './../utils/utils.js'
+
+const dataHandler = async message => {
+  if (!message) return
+
+  const {data, id, from} = message
+  const proto = await protoFor(data)
+
+  peernet._protoHandler({id, proto}, peernet.client.connections[from], from)
+}
+
+export default dataHandler

package/src/handlers/message.js

@@ -1,34 +1,34 @@
-export default 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 message
-   */
-  async hashAndSignMessage(message) {
-    const hash = await message.peernetHash
-    message.decoded.signature = globalThis.identity.sign(hash.buffer)
-    return message
-  }
-
-  /**
-   * @param {String} from - peer id
-   * @param {String} to - peer id
-   * @param {String|PeernetMessage} data - data encoded message string
-   * or the messageNode itself
-   */
-  async prepareMessage(message) {    
-    if (message.keys.includes('signature')) {
-      message = await this.hashAndSignMessage(message)
-    }
-
-    return message
-  }
-}
+export default 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 message
+   */
+  async hashAndSignMessage(message) {
+    const hash = await message.peernetHash
+    message.decoded.signature = globalThis.identity.sign(hash.buffer)
+    return message
+  }
+
+  /**
+   * @param {String} from - peer id
+   * @param {String} to - peer id
+   * @param {String|PeernetMessage} data - data encoded message string
+   * or the messageNode itself
+   */
+  async prepareMessage(message) {    
+    if (message.keys.includes('signature')) {
+      message = await this.hashAndSignMessage(message)
+    }
+
+    return message
+  }
+}

package/src/identity.ts

@@ -1,81 +1,82 @@
-import MultiWallet from '@leofcoin/multi-wallet'
-
-export default class Identity {
-  #wallet: MultiWallet
-  network: MultiWallet.network
-  id: string
-
-  constructor(network: string) {
-    this.network = network
-  }
-
-  get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]> {
-    return this.getAccounts()
-  }
-
-  async getAccounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]> {
-    let accounts = await globalThis.walletStore.get('accounts')
-    accounts = new TextDecoder().decode(accounts)
-    return JSON.parse(accounts)
-  }
-
-  async load(password?: string): Promise<void> {    
-    if (!password) {
-      const importee: { default: () => Promise<string> } = await import('./prompts/password.js')
-      password = await importee.default()
-    }
-    
-    const accountExists = await globalThis.accountStore.has('public')
-    if (accountExists) {
-      const pub = await globalThis.accountStore.get('public')
-      this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
-      const selected = await globalThis.walletStore.get('selected-account')
-      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected)
-    } else {
-      const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')
-      const {identity, accounts} = await importee.default(password, this.network)
-      await globalThis.accountStore.put('public', JSON.stringify({walletId: identity.walletId}));
-      
-      await globalThis.walletStore.put('version', String(1))
-      await globalThis.walletStore.put('accounts', JSON.stringify(accounts))
-      await globalThis.walletStore.put('selected-account', accounts[0][1])
-      await globalThis.walletStore.put('identity', JSON.stringify(identity))
-
-      globalThis.peernet.selectedAccount = accounts[0][1]
-      this.id = identity.walletId
-    }
-    const identity = JSON.parse(new TextDecoder().decode(await globalThis.walletStore.get('identity')))
-    this.#wallet = new MultiWallet(this.network)
-    await this.#wallet.recover(identity.mnemonic, password, this.network)
-  }
-
-  sign(hash: Uint8Array) {
-    return this.#wallet.sign(hash.subarray(0, 32))
-  }
-
-  async export(password: string) {
-    if (!password) throw new Error('IdentityExportError: password required')
-    const identity = JSON.parse(new TextDecoder().decode(await globalThis.walletStore.get('identity')))
-    this.#wallet = new MultiWallet(this.network)
-    await this.#wallet.recover(identity.mnemonic, password, this.network)
-    return this.#wallet.toMultiWif()
-  }
-
-  async import(multiWIF: string) {
-    this.#wallet = new MultiWallet(this.network)
-    await this.#wallet.fromMultiWif(multiWIF)
-  }
-
-  async unlock({ key, iv, cipher }) {
-
-  }
-
-  /**
-   * Lock current wallet or import wallet using a MultiWIF and lock
-   * 
-   * @param password 
-   * @param multiWIF 
-   */
-  async lock(password: string, multiWIF?: string) {
-  }
+import MultiWallet from '@leofcoin/multi-wallet'
+import base58 from '@vandeurenglenn/base58'
+import {encrypt, decrypt} from '@leofcoin/identity-utils'
+import QrScanner from 'qr-scanner'
+import qrcode from 'qrcode'
+
+export default class Identity {
+  #wallet: MultiWallet
+  network: MultiWallet.network
+  id: string
+
+  constructor(network: string) {
+    this.network = network
+  }
+
+  get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]> {
+    return this.getAccounts()
+  }
+
+  async getAccounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]> {
+    let accounts = await globalThis.walletStore.get('accounts')
+    accounts = new TextDecoder().decode(accounts)
+    return JSON.parse(accounts)
+  }
+
+  async load(password?: string): Promise<void> {    
+    if (!password) {
+      const importee: { default: () => Promise<string> } = await import('./prompts/password.js')
+      password = await importee.default()
+    }
+    
+    const accountExists = await globalThis.accountStore.has('public')
+    if (accountExists) {
+      const pub = await globalThis.accountStore.get('public')
+      this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
+      const selected = await globalThis.walletStore.get('selected-account')
+      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected)
+    } else {
+      const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')
+      const {identity, accounts} = await importee.default(password, this.network)
+      await globalThis.accountStore.put('public', JSON.stringify({walletId: identity.walletId}));
+      
+      await globalThis.walletStore.put('version', String(1))
+      await globalThis.walletStore.put('accounts', JSON.stringify(accounts))
+      await globalThis.walletStore.put('selected-account', accounts[0][1])
+      await globalThis.walletStore.put('identity', JSON.stringify(identity))
+
+      globalThis.peernet.selectedAccount = accounts[0][1]
+      this.id = identity.walletId
+    }
+    const identity = JSON.parse(new TextDecoder().decode(await globalThis.walletStore.get('identity')))
+    this.#wallet = new MultiWallet(this.network)
+    const multiWIF = await decrypt(password, base58.decode(identity.multiWIF))
+    await this.#wallet.fromMultiWif(multiWIF)
+  }
+
+  sign(hash: Uint8Array) {
+    return this.#wallet.sign(hash.subarray(0, 32))
+  }
+
+  async export(password: string) {
+    const multiWIF =  this.#wallet.toMultiWif()
+    const encypted = await encrypt(password, multiWIF)
+    return base58.encode(encypted)
+  }
+
+  async import(password, encrypted: base58String) {
+    this.#wallet = new MultiWallet(this.network)
+    const decrypted = await decrypt(password, base58.decode(encrypted))
+    await this.#wallet.fromMultiWif(decrypted)
+  }
+
+  async exportQR(password: string) {
+    const exported = await this.export(password)
+    return globalThis.navigator ? await qrcode.toDataURL(exported) : await qrcode.toString(exported, {type: 'terminal'})
+  }
+
+  async importQR(image: File | Blob , password: string) {
+    const multiWIF = QrScanner.scanImage(image)
+    return this.import(password, multiWIF)
+  }
 }