@leofcoin/peernet 0.11.12 → 0.11.15

package/src/peernet.js

@@ -89,7 +89,7 @@ export default class Peernet {
       Storage = globalThis.LeofcoinStorage?.default ? globalThis.LeofcoinStorage.default : LeofcoinStorage
     }
     globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
-      await new Storage(`${prefix}-${name}`, root)
+      await new Storage(name, root)
 
     globalThis[`${name}Store`].private = isPrivate
     if (!isPrivate) this.stores.push(name)
@@ -120,6 +120,13 @@ export default class Peernet {
     return Object.entries(this.client.connections)
   }
 
+  /**
+   * @return {String} id - peerId
+   */
+  getConnection(id) {
+    return this.client.connections[id]
+  }
+
   /**
    * @private
    *
@@ -242,6 +249,16 @@ export default class Peernet {
     this.requestProtos[name] = method
   }
 
+  sendMessage(peer, id, data) {
+    if (peer.readyState === 'open') {
+      peer.send(new TextEncoder().encode(JSON.stringify({id, data})))
+      this.bw.up += data.length
+    } else if (peer.readyState === 'closed') {
+      this.removePeer(peer)
+    }
+
+  }
+
   /**
    * @private
    *
@@ -266,8 +283,7 @@ export default class Peernet {
         const data = new DHTMessageResponse({hash, has})
         const node = await this.prepareMessage(from, data.encoded)
 
-        peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
-        this.bw.up += node.encoded.length
+        sendMessage(peer, id, node.encoded)
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded
         let data
@@ -280,26 +296,21 @@ export default class Peernet {
           data = await store.get(hash)
 
           if (data) {
-            data = new DataMessageResponse({hash, data: data.decoded ? new TextEncoder().encode(JSON.stringify(data.decoded)) : data});
+            data = new DataMessageResponse({hash, data});
 
             const node = await this.prepareMessage(from, data.encoded)
-            peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
-            this.bw.up += node.encoded.length
+            sendMessage(peer, id, node.encoded)
           }
         } else {
           // ban (trying to access private st)
         }
 
       } else if (proto.name === 'peernet-request') {
-        // TODO: make dynamic
-        // exposeddevapi[proto.decoded.request](proto.decoded.params)
         const method = this.requestProtos[proto.decoded.request]
         if (method) {
           const data = await method()
           const node = await this.prepareMessage(from, data.encoded)
-          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
-
-          this.bw.up += node.encoded.length
+          sendMessage(peer, id, node.encoded)
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(new TextDecoder().decode(proto.decoded.topic), proto.decoded.data)
@@ -570,13 +581,9 @@ export default class Peernet {
     const id = Math.random().toString(36).slice(-12)
     data = new PsMessage({data, topic})
     for (const peer of this.connections) {
-      if (peer.connected) {
-        if (peer.peerId !== this.peerId) {
-          const node = await this.prepareMessage(peer.peerId, data.encoded)
-          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
-        }
-      } else {
-        this.removePeer(peer)
+      if (peer.peerId !== this.peerId) {
+        const node = await this.prepareMessage(peer.peerId, data.encoded)
+        sendMessage(peer, id, node.encoded)
       }
       // TODO: if peer subscribed
     }
@@ -597,7 +604,7 @@ export default class Peernet {
   }
 
   async removePeer(peer) {
-    delete this.client.connections[peer.peerId]
+    return this.client.removePeer(peer)
   }
 
   get Buffer() {

package/webpack.config.js

@@ -2,6 +2,7 @@ const path = require('path');
 const webpack = require('webpack');
 module.exports = [{
   entry: './src/peernet.js',
+  mode: 'production',
   plugins: [
     // Work around for Buffer is undefined:
     // https://github.com/webpack/changelog-v5/issues/10
@@ -14,7 +15,13 @@ module.exports = [{
   new webpack.DefinePlugin({
     HTTP_IMPORT: '',
 		"import fetch from 'node-fetch'": ''
-  })
+  }),
+  new webpack.IgnorePlugin({
+    checkResource(resource, context) {
+      if (resource.includes('./wordlists') && !resource.includes('english')) return true
+      // console.log(resource, context);
+    }
+  }) // bi39 wordlist (mnemonic) only english
 ],
 optimization: {
   minimize: false
@@ -27,7 +34,9 @@ resolve: {
           "stream": require.resolve("stream-browserify"),
           "buffer": require.resolve("buffer"),
           "path": require.resolve("path-browserify"),
-          "os": require.resolve("os-browserify")
+          "os": require.resolve("os-browserify"),
+          "crypto": require.resolve("crypto-browserify"),
+          "vm": require.resolve("vm-browserify")
         }
     },
   output: {