@leofcoin/peernet 0.10.3 → 0.10.4

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'
@@ -346,22 +346,22 @@ export default class Peernet {
         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})))
-          this.bw.up += node.encoded.length
+            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])
@@ -464,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
@@ -601,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}`)
@@ -611,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)
   }
 
   /**
@@ -619,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)
   }
 
   /**