@leofcoin/peernet 0.11.2 → 0.11.5

package/dist/browser/peernet.js.LICENSE.txt

@@ -0,0 +1,40 @@
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * assert.js - assertions for javascript
+ * Copyright (c) 2018, Christopher Jeffrey (MIT License).
+ * https://github.com/chjj/bsert
+ */
+
+/*!
+ * base32.js - base32 for bcrypto
+ * Copyright (c) 2014-2019, Christopher Jeffrey (MIT License).
+ * https://github.com/bcoin-org/bcrypto
+ *
+ * Parts of this software are based on bitcoin/bitcoin:
+ *   Copyright (c) 2009-2019, The Bitcoin Core Developers (MIT License).
+ *   Copyright (c) 2009-2019, The Bitcoin Developers (MIT License).
+ *   https://github.com/bitcoin/bitcoin
+ *
+ * Resources:
+ *   https://tools.ietf.org/html/rfc4648
+ *   https://github.com/bitcoin/bitcoin/blob/11d486d/src/utilstrencodings.cpp#L230
+ */
+
+/*! For license information please see browser.js.LICENSE.txt */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */

package/dist/commonjs/{http-4bc6caeb.js → http-ee1b2071.js}

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 var Koa__default = /*#__PURE__*/_interopDefaultLegacy(Koa);
 
-var version = "0.11.1";
+var version = "0.11.4";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),

package/dist/commonjs/peernet.js

@@ -1221,10 +1221,10 @@ class HDWallet {
 		return network;
 	}
 
-	async generate(network) {
+	async generate(password, network) {
 		network = this.validateNetwork(network);
-		const mnemonic = bip39.generateMnemonic();
-		const seed = await bip39.mnemonicToSeed(mnemonic);
+		const mnemonic = bip39.generateMnemonic(256);
+		const seed = await bip39.mnemonicToSeed(mnemonic, password);
 		this.defineHDNode(bip32__namespace.fromSeed(seed, network));
 		return mnemonic; // userpw
 	}
@@ -1232,8 +1232,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 bip39.mnemonicToSeed(mnemonic);
 		this.defineHDNode(bip32__namespace.fromSeed(seed, network));
 	}
@@ -1433,8 +1433,8 @@ 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))
@@ -1563,7 +1563,15 @@ class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return [...connections.values()]
+    return Object.keys(this.client.connections)
+  }
+
+  get connections() {
+    return Object.values(this.client.connections)
+  }
+
+  get peerEntries() {
+    return Object.entries(this.client.connections)
   }
 
   /**
@@ -1628,7 +1636,7 @@ class Peernet {
 					protocol: 'peernet-v0.1.0', host: '127.0.0.1', port: options.port
 				});
 			} else {
-				const http = await Promise.resolve().then(function () { return require('./http-4bc6caeb.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-ee1b2071.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -1638,19 +1646,17 @@ class Peernet {
 
     try {
       const pub = await accountStore.get('public');
-      this.id = pub.walletId;
+      this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
     } catch (e) {
       if (e.code === 'ERR_NOT_FOUND') {
-        const wallet = {};
         const {identity, accounts, config} = await generateAccount__default["default"](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;
+        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
       }
@@ -1779,7 +1785,7 @@ class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new dht({hash});
     this.client.id;
-    for (const peer of this.peers) {
+    for (const peer of this.connections) {
       const node = await this.prepareMessage(peer.id, data.encoded);
 
       const result = await peer.request(node.encoded);
@@ -1877,9 +1883,9 @@ class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
 
     const id = closestPeer.id.toString();
-    if (this.peers) {
-      let closest = this.peers.filter((peer) => {
-        if (this._getPeerId(peer.id) === id) return peer
+    if (this.connections) {
+      let closest = this.connections.filter((peer) => {
+        if (peer.id === id) return peer
       });
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -1887,8 +1893,8 @@ class Peernet {
       const node = await this.prepareMessage(id, data.encoded);
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
-        closest = this.peers.filter((peer) => {
-          if (peer.id.toString() === id) return peer
+        closest = this.connections.filter((peer) => {
+          if (peer.id === id) return peer
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
@@ -2029,9 +2035,9 @@ class Peernet {
     if (data instanceof Uint8Array === false) data = new TextEncoder().encode(JSON.stringify(data));
     const id = Math.random().toString(36).slice(-12);
     data = new PsMessage({data, topic});
-    for (const peer of this.peers) {
-      if (peer.connection._connected) {
-        if (peer.id.toString() !== this.peerId.toString()) {
+    for (const peer of this.connections) {
+      if (peer.connected) {
+        if (peer.id !== this.peerId) {
           const node = await this.prepareMessage(peer.id, data.encoded);
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }
@@ -2057,7 +2063,7 @@ class Peernet {
   }
 
   async removePeer(peer) {
-    connections.delete(peer.id);
+    delete this.client.connections[peer.id];
   }
 
   get Buffer() {

package/dist/commonjs/response.js

@@ -17,7 +17,7 @@ var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
 var proto = `
 // PeernetResponseMessage
 message PeernetResponseMessage {
-  required string response = 1;
+  required bytes response = 1;
 }
 `;
 

package/dist/module/peernet.js

@@ -1281,7 +1281,7 @@ class RequestMessage extends FormatInterface {
 var proto$3 = `
 // PeernetResponseMessage
 message PeernetResponseMessage {
-  required string response = 1;
+  required bytes response = 1;
 }
 `;
 
@@ -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));
 	}
@@ -2011,8 +2011,8 @@ class MessageHandler {
    */
   async hashAndSignMessage(message) {
     const hasher = new PeernetHash(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))
@@ -2141,7 +2141,15 @@ class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return [...connections.values()]
+    return Object.keys(this.client.connections)
+  }
+
+  get connections() {
+    return Object.values(this.client.connections)
+  }
+
+  get peerEntries() {
+    return Object.entries(this.client.connections)
   }
 
   /**
@@ -2208,19 +2216,17 @@ class Peernet {
 
     try {
       const pub = await accountStore.get('public');
-      this.id = pub.walletId;
+      this.id = JSON.parse(new TextDecoder().decode(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;
+        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
       }
@@ -2349,7 +2355,7 @@ class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new DHTMessage({hash});
     this.client.id;
-    for (const peer of this.peers) {
+    for (const peer of this.connections) {
       const node = await this.prepareMessage(peer.id, data.encoded);
 
       const result = await peer.request(node.encoded);
@@ -2447,9 +2453,9 @@ class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
 
     const id = closestPeer.id.toString();
-    if (this.peers) {
-      let closest = this.peers.filter((peer) => {
-        if (this._getPeerId(peer.id) === id) return peer
+    if (this.connections) {
+      let closest = this.connections.filter((peer) => {
+        if (peer.id === id) return peer
       });
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -2457,8 +2463,8 @@ class Peernet {
       const node = await this.prepareMessage(id, data.encoded);
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
-        closest = this.peers.filter((peer) => {
-          if (peer.id.toString() === id) return peer
+        closest = this.connections.filter((peer) => {
+          if (peer.id === id) return peer
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
@@ -2599,9 +2605,9 @@ class Peernet {
     if (data instanceof Uint8Array === false) data = new TextEncoder().encode(JSON.stringify(data));
     const id = Math.random().toString(36).slice(-12);
     data = new PsMessage({data, topic});
-    for (const peer of this.peers) {
-      if (peer.connection._connected) {
-        if (peer.id.toString() !== this.peerId.toString()) {
+    for (const peer of this.connections) {
+      if (peer.connected) {
+        if (peer.id !== this.peerId) {
           const node = await this.prepareMessage(peer.id, data.encoded);
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }
@@ -2627,7 +2633,7 @@ class Peernet {
   }
 
   async removePeer(peer) {
-    connections.delete(peer.id);
+    delete this.client.connections[peer.id];
   }
 
   get Buffer() {

package/index.html

@@ -12,7 +12,7 @@
 
       (async () => {
         const peernet = await new Peernet.default()
-        peernet.addRequestHandler('lastBlock', () => new peernet.protos['peernet-response']({response: 100}))
+        peernet.addRequestHandler('lastBlock', () => new peernet.protos['peernet-response']({response: new TextEncoder().encode(100)}))
       })()
     </script>
   </body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.2",
+  "version": "0.11.5",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",
@@ -24,9 +24,9 @@
   "browserslist": "> 0.5%, last 2 versions, not dead",
   "dependencies": {
     "@leofcoin/generate-account": "^1.0.2",
-    "@leofcoin/multi-wallet": "^2.1.1",
+    "@leofcoin/multi-wallet": "^2.1.2",
     "@leofcoin/peernet-swarm": "^0.1.9",
-    "@leofcoin/storage": "^2.2.0",
+    "@leofcoin/storage": "^2.3.0",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",
     "@vandeurenglenn/is-hex": "^1.0.0",
@@ -62,6 +62,7 @@
     "rollup-plugin-node-polyfills": "^0.2.1",
     "tape": "^5.2.2",
     "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2"
+    "webpack-cli": "^4.9.2",
+    "webpack-node-externals": "^3.0.0"
   }
 }

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))

package/src/peernet.js

@@ -108,7 +108,15 @@ export default class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return [...connections.values()]
+    return Object.keys(this.client.connections)
+  }
+
+  get connections() {
+    return Object.values(this.client.connections)
+  }
+
+  get peerEntries() {
+    return Object.entries(this.client.connections)
   }
 
   /**
@@ -175,19 +183,18 @@ export default class Peernet {
 
     try {
       const pub = await accountStore.get('public')
-      this.id = pub.walletId
+      this.id = JSON.parse(new TextDecoder().decode(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
+        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
       }
@@ -318,7 +325,7 @@ export default class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new DHTMessage({hash})
     const clientId = this.client.id
-    for (const peer of this.peers) {
+    for (const peer of this.connections) {
       const node = await this.prepareMessage(peer.id, data.encoded)
 
       const result = await peer.request(node.encoded)
@@ -416,9 +423,9 @@ export default class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
 
     const id = closestPeer.id.toString()
-    if (this.peers) {
-      let closest = this.peers.filter((peer) => {
-        if (this._getPeerId(peer.id) === id) return peer
+    if (this.connections) {
+      let closest = this.connections.filter((peer) => {
+        if (peer.id === id) return peer
       })
 
       let data = new DataMessage({hash, store: store.name ? store.name : store});
@@ -426,8 +433,8 @@ export default class Peernet {
       const node = await this.prepareMessage(id, data.encoded)
       if (closest[0]) data = await closest[0].request(node.encoded)
       else {
-        closest = this.peers.filter((peer) => {
-          if (peer.id.toString() === id) return peer
+        closest = this.connections.filter((peer) => {
+          if (peer.id === id) return peer
         })
         if (closest[0]) data = await closest[0].request(node.encoded)
       }
@@ -569,9 +576,9 @@ export default class Peernet {
     if (data instanceof Uint8Array === false) data = new TextEncoder().encode(JSON.stringify(data))
     const id = Math.random().toString(36).slice(-12)
     data = new PsMessage({data, topic})
-    for (const peer of this.peers) {
-      if (peer.connection._connected) {
-        if (peer.id.toString() !== this.peerId.toString()) {
+    for (const peer of this.connections) {
+      if (peer.connected) {
+        if (peer.id !== this.peerId) {
           const node = await this.prepareMessage(peer.id, data.encoded)
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
         }
@@ -597,7 +604,7 @@ export default class Peernet {
   }
 
   async removePeer(peer) {
-    connections.delete(peer.id)
+    delete this.client.connections[peer.id]
   }
 
   get Buffer() {

package/src/proto/response.proto.js

@@ -1,6 +1,6 @@
 export default `
 // PeernetResponseMessage
 message PeernetResponseMessage {
-  required string response = 1;
+  required bytes response = 1;
 }
 `

package/test.js

@@ -23,6 +23,6 @@ pubsub.subscribe('peer:connected', async peer => {
   response = new globalThis.peernet.protos['peernet-response'](proto.decoded.data)
   console.log({response});
 
-  const block = JSON.parse(response.decoded.response)
+  const block = new TextDecoder().decode(response.decoded.response)
   console.log(block);
 })

package/webpack.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const webpack = require('webpack');
-module.exports = {
+module.exports = [{
   entry: './src/peernet.js',
   plugins: [
     // Work around for Buffer is undefined:
@@ -17,7 +17,7 @@ module.exports = {
   })
 ],
 optimization: {
-  minimize: false
+  minimize: true
 },
 resolve: {
         extensions: [ '.ts', '.js' ],
@@ -38,4 +38,4 @@ resolve: {
     filename: 'peernet.js',
     path: path.resolve(__dirname, 'dist', 'browser'),
   },
-};
+}];