@leofcoin/peernet 0.10.1 → 0.10.4

package/package.json

@@ -1,15 +1,13 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.10.1",
+  "version": "0.10.4",
   "description": "",
   "main": "dist/commonjs/peernet.js",
-  "module": "dist/module/peernet.js",
-  "browser": "dist/browser/peernet.js",
   "scripts": {
     "test": "node test/index.js",
     "server": "discovery-swarm-webrtc --port=4000",
     "demo": "jsproject --serve ./ --port 6868",
-    "doc": "./node_modules/.bin/esdoc",
+    "doc": "esdoc",
     "lint": "./node_modules/.bin/eslint src/**/**.js --fix",
     "coverage": "nyc --reporter=lcov npm run test",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
@@ -24,6 +22,7 @@
     "@leofcoin/generate-account": "^1.0.2",
     "@leofcoin/multi-wallet": "^2.0.6",
     "@leofcoin/storage": "^2.1.0",
+    "@vandeurenglenn/little-pubsub": "^1.3.1",
     "bs32": "^0.1.6",
     "bs58": "^4.0.1",
     "bs58check": "^2.1.2",

package/rollup.config.js

@@ -27,10 +27,13 @@ export default [{
 		modify({
 			"import fetch from 'node-fetch'": ''
 		}),
-		lint({
-		  fix: true,
-			exclude: ['package.json', "package-lock.json"]
-		})
+		cjs(),
+		// resolve(),
+		// lint({
+		//   fix: true,
+		// 	exclude: ['package.json', "package-lock.json"]
+		// })
+
 
 	]
 }, {

package/src/codec/codec-format-interface.js

@@ -6,7 +6,7 @@ import Hash from './../hash/hash'
 
 export default class FormatInterface {
   /**
-   * @param {Buffer|String|Object} buffer -
+   * @param {Buffer|String|Object} buffer - data - The data needed to create the desired message
    * @param {Object} proto - {encode, decode}
    * @param {Object} options - {hashFormat, name}
    */
@@ -15,7 +15,9 @@ export default class FormatInterface {
     this.protoDecode = proto.decode
     if (options.name) this.name = options.name
     this.hashFormat = options.hashFormat || 'bs32'
-    if (Buffer.isBuffer(buffer)) {
+    if (buffer.name === options.name) {
+      return buffer
+    } else if (Buffer.isBuffer(buffer)) {
       const codec = new Codec(buffer)
       if (codec.name) {
         this.fromEncoded(buffer)
@@ -133,7 +135,21 @@ export default class FormatInterface {
    * @param {Object} data
    */
   create(data) {
-    this.decoded = data
-    this.encode(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()
+    }
   }
 }

package/src/messages/data.js

@@ -2,13 +2,17 @@ import protons from 'protons'
 import proto from './../proto/data.proto.js'
 import CodecFormat from './../codec/codec-format-interface.js'
 
+/**
+ * @extends {CodecFormat}
+ */
 export default class DataMessage extends CodecFormat {
   get keys() {
     return ['hash', 'store']
   }
-
+  /**
+   * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
+   */
   constructor(data) {
-    const name = 'peernet-data'
-    super(data, protons(proto).PeernetDataMessage, {name})
+    super(data, protons(proto).PeernetDataMessage, {name: 'peernet-data'})
   }
 }

package/src/peernet.js

@@ -1,6 +1,6 @@
 import Pubsub from '@vandeurenglenn/little-pubsub'
 import Client from './client'
-import LeofcoinStorage from './../node_modules/@leofcoin/storage/src/level.js'
+import LeofcoinStorage from '@leofcoin/storage'
 import http from './http/http.js'
 import httpClient from './http/client/client.js'
 import LeofcoinStorageClient from './http/client/storage.js'
@@ -62,6 +62,10 @@ export default class Peernet {
       else options.root = `.${this.network}/peernet`
     }
     globalThis.peernet = this
+    this.bw = {
+      up: 0,
+      down: 0,
+    }
     return this._init(options)
   }
 
@@ -274,6 +278,7 @@ export default class Peernet {
    */
   async _protoHandler(message, peer) {
     const {id, proto} = 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])
@@ -288,6 +293,7 @@ export default class Peernet {
       const node = await this.prepareMessage(from, data.encoded)
 
       peer.write(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])
@@ -303,9 +309,10 @@ export default class Peernet {
       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
@@ -333,26 +340,28 @@ export default class Peernet {
         const node = await this.prepareMessage(from, data.encoded)
 
         peer.write(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) {
-          data = await this.get(hash)
-        } else {
-          store = globalThis[`${store}Store`]
-          if (store.private) {
-            // TODO: ban
-            return
-          } else data = await store.get(hash)
+          store = await this.whichStore([...this.stores], hash)
         }
+        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)});
+          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.write(Buffer.from(JSON.stringify({id, data: node.encoded})))
+            const node = await this.prepareMessage(from, data.encoded)
+            peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))
+            this.bw.up += node.encoded.length
+          }
+        } else {
+          // ban (trying to access private store)
         }
+
       } else if (proto.name === 'peernet-peer') {
         const from = proto.decoded.id
         if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
@@ -365,6 +374,7 @@ export default class Peernet {
         const node = await this.prepareMessage(from, data.encoded)
 
         peer.write(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)
@@ -373,6 +383,7 @@ export default class Peernet {
           const data = await method()
           const node = await this.prepareMessage(from, data.encoded)
           peer.write(Buffer.from(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()) {
@@ -453,7 +464,7 @@ export default class Peernet {
       get: async (hash) => {
         const data = await blockStore.has(hash)
         if (data) return await blockStore.get(hash)
-        return this.requestData(hash)
+        return this.requestData(hash, 'block')
       },
       put: async (hash, data) => {
         if (await blockStore.has(hash)) return
@@ -590,7 +601,8 @@ export default class Peernet {
   /**
    * Get content for given hash
    *
-   * @param {String} hash
+   * @param {String} hash - the hash of the wanted data
+   * @param {String} store - storeName to access
    */
   async get(hash, store) {
     debug(`get ${hash}`)
@@ -600,7 +612,7 @@ export default class Peernet {
     if (store && await store.has(hash)) data = await store.get(hash)
     if (data) return data
 
-    return this.requestData(hash, 'data')
+    return this.requestData(hash, store)
   }
 
   /**
@@ -608,10 +620,11 @@ export default class Peernet {
    *
    * @param {String} hash
    * @param {Buffer} data
+   * @param {String} store - storeName to access
    */
   async put(hash, data, store = 'data') {
     store = globalThis[`${store}Store`]
-    return await store.put(hash, data)
+    return store.put(hash, data)
   }
 
   /**