@leofcoin/peernet 0.11.1 → 0.11.2

package/dist/commonjs/{http-7bbac90a.js → http-4bc6caeb.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.0";
+var version = "0.11.1";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),

package/dist/commonjs/peernet-message.js

@@ -19,8 +19,8 @@ var proto = `
 message PeernetMessage {
   required bytes data = 1;
   required bytes signature = 2;
-  optional bytes from = 3;
-  optional bytes to = 4;
+  optional string from = 3;
+  optional string to = 4;
   optional string id = 5;
 }`;
 

package/dist/commonjs/peernet.js

@@ -1447,8 +1447,6 @@ class MessageHandler {
    * or the messageNode itself
    */
   async prepareMessage(from, to, data, id) {
-    if (!Buffer.isBuffer(from)) from = new Buffer.from(from);
-    if (!Buffer.isBuffer(to)) to = new Buffer.from(to);
     if (data.encoded) data = data.encoded;
 
     const message = {
@@ -1542,7 +1540,7 @@ class Peernet {
     if (this.hasDaemon) {
       Storage = LeofcoinStorageClient;
     } else {
-      Storage = LeofcoinStorage__default["default"];
+      Storage = globalThis.LeofcoinStorage?.default ? globalThis.LeofcoinStorage.default : LeofcoinStorage__default["default"];
     }
     globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
       await new Storage(`${prefix}-${name}`, root);
@@ -1630,7 +1628,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-7bbac90a.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-4bc6caeb.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -1681,7 +1679,7 @@ class Peernet {
       message = new peernetMessage(uint8Array);
       const proto = protoFor(message.decoded.data);
 
-      const from = new TextDecoder().decode(message.decoded.from);
+      const from = message.decoded.from;
       this._protoHandler({id, proto}, this.client.connections[from], from);
     });
 
@@ -1732,7 +1730,7 @@ class Peernet {
         const data = new dhtResponse({hash, has});
         const node = await this.prepareMessage(from, data.encoded);
 
-        peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
+        peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         this.bw.up += node.encoded.length;
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded;
@@ -1746,10 +1744,10 @@ class Peernet {
           data = await store.get(hash);
 
           if (data) {
-            data = new DataMessageResponse({hash, data: data.decoded ? Buffer.from(JSON.stringify(data)) : Buffer.from(data)});
+            data = new DataMessageResponse({hash, data: data.decoded ? new TextEncoder().encode(JSON.stringify(data.decoded)) : data});
 
             const node = await this.prepareMessage(from, data.encoded);
-            peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
+            peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
             this.bw.up += node.encoded.length;
           }
         }
@@ -1762,6 +1760,7 @@ class Peernet {
           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;
         }
       } else if (proto.name === 'peernet-ps' &&
@@ -1894,7 +1893,8 @@ class Peernet {
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
       if (data.data) {
-        let proto = protoFor(Buffer.from(data.data));
+        console.log(data.data);
+        let proto = protoFor(data.data);
         proto = protoFor(proto.decoded.data);
         return proto.decoded.data
       }
@@ -2025,15 +2025,15 @@ class Peernet {
    */
   async publish(topic, data) {
     // globalSub.publish(topic, data)
-    if (!Buffer.isBuffer(topic)) topic = Buffer.from(topic);
-    if (!Buffer.isBuffer(data)) data = Buffer.from(data);
+    if (topic instanceof Uint8Array === false) topic = new TextEncoder().encode(topic);
+    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()) {
           const node = await this.prepareMessage(peer.id, data.encoded);
-          peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
+          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }
       } else {
         this.removePeer(peer);

package/dist/module/peernet.js

@@ -621,8 +621,8 @@ var proto$a = `
 message PeernetMessage {
   required bytes data = 1;
   required bytes signature = 2;
-  optional bytes from = 3;
-  optional bytes to = 4;
+  optional string from = 3;
+  optional string to = 4;
   optional string id = 5;
 }`;
 
@@ -2025,8 +2025,6 @@ class MessageHandler {
    * or the messageNode itself
    */
   async prepareMessage(from, to, data, id) {
-    if (!Buffer.isBuffer(from)) from = new Buffer.from(from);
-    if (!Buffer.isBuffer(to)) to = new Buffer.from(to);
     if (data.encoded) data = data.encoded;
 
     const message = {
@@ -2120,7 +2118,7 @@ class Peernet {
     if (this.hasDaemon) {
       Storage = LeofcoinStorageClient;
     } else {
-      Storage = LeofcoinStorage;
+      Storage = globalThis.LeofcoinStorage?.default ? globalThis.LeofcoinStorage.default : LeofcoinStorage;
     }
     globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
       await new Storage(`${prefix}-${name}`, root);
@@ -2251,7 +2249,7 @@ class Peernet {
       message = new PeernetMessage(uint8Array);
       const proto = protoFor(message.decoded.data);
 
-      const from = new TextDecoder().decode(message.decoded.from);
+      const from = message.decoded.from;
       this._protoHandler({id, proto}, this.client.connections[from], from);
     });
 
@@ -2302,7 +2300,7 @@ class Peernet {
         const data = new DHTMessageResponse({hash, has});
         const node = await this.prepareMessage(from, data.encoded);
 
-        peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
+        peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         this.bw.up += node.encoded.length;
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded;
@@ -2316,10 +2314,10 @@ class Peernet {
           data = await store.get(hash);
 
           if (data) {
-            data = new DataMessageResponse({hash, data: data.decoded ? Buffer.from(JSON.stringify(data)) : Buffer.from(data)});
+            data = new DataMessageResponse({hash, data: data.decoded ? new TextEncoder().encode(JSON.stringify(data.decoded)) : data});
 
             const node = await this.prepareMessage(from, data.encoded);
-            peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
+            peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
             this.bw.up += node.encoded.length;
           }
         }
@@ -2332,6 +2330,7 @@ class Peernet {
           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;
         }
       } else if (proto.name === 'peernet-ps' &&
@@ -2464,7 +2463,8 @@ class Peernet {
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
       if (data.data) {
-        let proto = protoFor(Buffer.from(data.data));
+        console.log(data.data);
+        let proto = protoFor(data.data);
         proto = protoFor(proto.decoded.data);
         return proto.decoded.data
       }
@@ -2595,15 +2595,15 @@ class Peernet {
    */
   async publish(topic, data) {
     // globalSub.publish(topic, data)
-    if (!Buffer.isBuffer(topic)) topic = Buffer.from(topic);
-    if (!Buffer.isBuffer(data)) data = Buffer.from(data);
+    if (topic instanceof Uint8Array === false) topic = new TextEncoder().encode(topic);
+    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()) {
           const node = await this.prepareMessage(peer.id, data.encoded);
-          peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})));
+          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }
       } else {
         this.removePeer(peer);

package/index.html

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",
@@ -26,7 +26,7 @@
     "@leofcoin/generate-account": "^1.0.2",
     "@leofcoin/multi-wallet": "^2.1.1",
     "@leofcoin/peernet-swarm": "^0.1.9",
-    "@leofcoin/storage": "^2.1.2",
+    "@leofcoin/storage": "^2.2.0",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",
     "@vandeurenglenn/is-hex": "^1.0.0",

package/src/handlers/message.js

@@ -32,8 +32,6 @@ export default class MessageHandler {
    * or the messageNode itself
    */
   async prepareMessage(from, to, data, id) {
-    if (!Buffer.isBuffer(from)) from = new Buffer.from(from)
-    if (!Buffer.isBuffer(to)) to = new Buffer.from(to)
     if (data.encoded) data = data.encoded
 
     const message = {

package/src/peernet.js

@@ -85,7 +85,7 @@ export default class Peernet {
     if (this.hasDaemon) {
       Storage = LeofcoinStorageClient
     } else {
-      Storage = LeofcoinStorage
+      Storage = globalThis.LeofcoinStorage?.default ? globalThis.LeofcoinStorage.default : LeofcoinStorage
     }
     globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
       await new Storage(`${prefix}-${name}`, root)
@@ -216,7 +216,7 @@ export default class Peernet {
       message = new PeernetMessage(uint8Array)
       const proto = protoFor(message.decoded.data)
 
-      const from = new TextDecoder().decode(message.decoded.from)
+      const from = message.decoded.from
       this._protoHandler({id, proto}, this.client.connections[from], from)
     })
 
@@ -267,7 +267,7 @@ export default class Peernet {
         const data = new DHTMessageResponse({hash, has})
         const node = await this.prepareMessage(from, data.encoded)
 
-        peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})))
+        peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
         this.bw.up += node.encoded.length
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded
@@ -281,10 +281,10 @@ export default class Peernet {
           data = await store.get(hash)
 
           if (data) {
-            data = new DataMessageResponse({hash, data: data.decoded ? Buffer.from(JSON.stringify(data)) : Buffer.from(data)});
+            data = new DataMessageResponse({hash, data: data.decoded ? new TextEncoder().encode(JSON.stringify(data.decoded)) : data});
 
             const node = await this.prepareMessage(from, data.encoded)
-            peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})))
+            peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
             this.bw.up += node.encoded.length
           }
         } else {
@@ -299,6 +299,7 @@ export default class Peernet {
           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
         }
       } else if (proto.name === 'peernet-ps' &&
@@ -431,7 +432,8 @@ export default class Peernet {
         if (closest[0]) data = await closest[0].request(node.encoded)
       }
       if (data.data) {
-        let proto = protoFor(Buffer.from(data.data))
+        console.log(data.data);
+        let proto = protoFor(data.data)
         proto = protoFor(proto.decoded.data)
         return proto.decoded.data
       }
@@ -563,15 +565,15 @@ export default class Peernet {
    */
   async publish(topic, data) {
     // globalSub.publish(topic, data)
-    if (!Buffer.isBuffer(topic)) topic = Buffer.from(topic)
-    if (!Buffer.isBuffer(data)) data = Buffer.from(data)
+    if (topic instanceof Uint8Array === false) topic = new TextEncoder().encode(topic)
+    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()) {
           const node = await this.prepareMessage(peer.id, data.encoded)
-          peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})))
+          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
         }
       } else {
         this.removePeer(peer)

package/src/proto/peernet.proto.js

@@ -3,7 +3,7 @@ export default `
 message PeernetMessage {
   required bytes data = 1;
   required bytes signature = 2;
-  optional bytes from = 3;
-  optional bytes to = 4;
+  optional string from = 3;
+  optional string to = 4;
   optional string id = 5;
 }`

package/webpack.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 module.exports = {
-  entry: './dist/browser/peernet.js',
+  entry: './src/peernet.js',
   plugins: [
     // Work around for Buffer is undefined:
     // https://github.com/webpack/changelog-v5/issues/10
@@ -10,6 +10,10 @@ module.exports = {
     }),
     new webpack.ProvidePlugin({
         process: 'process/browser',
+  }),
+  new webpack.DefinePlugin({
+    HTTP_IMPORT: '',
+		"import fetch from 'node-fetch'": ''
   })
 ],
 optimization: {
@@ -18,6 +22,8 @@ optimization: {
 resolve: {
         extensions: [ '.ts', '.js' ],
         fallback: {
+          fs: false,
+          util: false,
           "stream": require.resolve("stream-browserify"),
           "buffer": require.resolve("buffer"),
           "path": require.resolve("path-browserify"),