@leofcoin/peernet 0.14.2 → 0.14.3

package/dist/browser/peernet.js

@@ -358,6 +358,7 @@ function _interopNamespace(e) {
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 
 const protoFor = (data) => {
+  console.log(data);
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
   const codec = new codecFormatInterface.Codec(data);
   if (!codec.name) throw new Error('proto not found')
@@ -708,10 +709,9 @@ class MessageHandler {
    * @param {Buffer} message.to peer id
    * @param {string} message.data Peernet message
    * (PeernetMessage excluded) encoded as a string
-   * @return signature
+   * @return message
    */
   async hashAndSignMessage(message) {
-    const hasher = new codecFormatInterface.CodecHash(message, {name: 'peernet-message'});
     let identity = await walletStore.get('identity');
     identity = JSON.parse(identity);
     if (!globalThis.MultiWallet) {
@@ -720,7 +720,8 @@ class MessageHandler {
     }
     const wallet = new MultiWallet(this.network);
     wallet.recover(identity.mnemonic);
-    return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
+    message.decoded.signature = wallet.sign(Buffer.from(await message.hash).slice(0, 32));
+    return message
   }
 
   /**
@@ -729,21 +730,12 @@ class MessageHandler {
    * @param {String|PeernetMessage} data - data encoded message string
    * or the messageNode itself
    */
-  async prepareMessage(from, to, data, id) {
-    if (data.encoded) data = data.encoded;
-
-    const message = {
-      from,
-      to,
-      data,
-    };
-    const signature = await this.hashAndSignMessage(message);
-    const node = await new globalThis.peernet.protos['peernet-message']({
-      ...message,
-      signature,
-    });
+  async prepareMessage(message) {    
+    if (message.keys.indexOf('signature') !== -1) {
+      message = await this.hashAndSignMessage(message);
+    }
 
-    return node
+    return message
   }
 }
 
@@ -751,8 +743,10 @@ const dataHandler = async message => {
   if (!message) return
 
   const {data, id} = message;
-
+  console.log({data});
   message = await protoFor(data);
+  console.log(message.decoded.data);
+  console.log({message});
   const proto = await protoFor(message.decoded.data);
   const from = message.decoded.from;
 
@@ -857,8 +851,8 @@ class Peernet {
   /**
    * @see MessageHandler
    */
-  prepareMessage(to, data) {
-    return this._messageHandler.prepareMessage(this.id, to, data)
+  prepareMessage(data) {
+    return this._messageHandler.prepareMessage(data)
   }
 
   /**
@@ -1054,7 +1048,7 @@ class Peernet {
           else has = await store.has(hash);
         }
         const data = await new globalThis.peernet.protos['peernet-dht-response']({hash, has});
-        const node = await this.prepareMessage(from, data.encoded);
+        const node = await this.prepareMessage(data);
 
         this.sendMessage(peer, id, node.encoded);
       } else if (proto.name === 'peernet-data') {
@@ -1071,7 +1065,7 @@ class Peernet {
           if (data) {
             data = await new globalThis.peernet.protos['peernet-data-response']({hash, data});
 
-            const node = await this.prepareMessage(from, data.encoded);
+            const node = await this.prepareMessage(data);
             this.sendMessage(peer, id, node.encoded);
           }
         }
@@ -1080,7 +1074,7 @@ class Peernet {
         const method = this.requestProtos[proto.decoded.request];
         if (method) {
           const data = await method();
-          const node = await this.prepareMessage(from, data.encoded);
+          const node = await this.prepareMessage(data);
           this.sendMessage(peer, id, node.encoded);
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
@@ -1099,7 +1093,7 @@ class Peernet {
     const data = await new globalThis.peernet.protos['peernet-dht']({hash});
     this.client.id;
     const walk = async peer => {
-      const node = await this.prepareMessage(peer.peerId, data.encoded);
+      const node = await this.prepareMessage(data);
       let result = await peer.request(node.encoded);
       result = new Uint8Array(Object.values(result));
       let proto = await protoFor(result);
@@ -1206,7 +1200,7 @@ class Peernet {
 
       let data = await new globalThis.peernet.protos['peernet-data']({hash, store: store?.name ? store?.name : store});
 
-      const node = await this.prepareMessage(id, data.encoded);
+      const node = await this.prepareMessage(data);
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
         closest = this.connections.filter((peer) => {
@@ -1332,6 +1326,8 @@ class Peernet {
     else data = await this.requestData(hash, 'data');
 
     const node = await new peernet.protos['peernet-file'](data);
+    await node.decode();
+    console.log(data);
     const paths = [];
     if (node.decoded?.links.length === 0) throw new Error(`${hash} is a file`)
     for (const {path, hash} of node.decoded.links) {
@@ -1423,7 +1419,7 @@ class Peernet {
     data = await new globalThis.peernet.protos['peernet-ps']({data, topic});
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
-        const node = await this.prepareMessage(peer.peerId, data.encoded);
+        const node = await this.prepareMessage(data);
         this.sendMessage(peer, id, node.encoded);
       }
       // TODO: if peer subscribed
@@ -1989,12 +1985,17 @@ class FormatInterface$1 extends BasicInterface$1 {
    * @return {Buffer}
    */
   async encode(decoded) {
+    let encoded;
     if (!decoded) decoded = this.decoded;
     const codec = new PeernetCodec(this.name);
-    const encoded = await this.protoEncode(typeof decoded === 'object' ? JSON.stringify(decoded) : decoded);
+
+    if (decoded instanceof Uint8Array) encoded = decoded;
+    else encoded = await this.protoEncode(typeof decoded === 'object' ? JSON.stringify(decoded) : decoded);
+
     const uint8Array = new Uint8Array(encoded.length + codec.codecBuffer.length);
     uint8Array.set(codec.codecBuffer);
     uint8Array.set(encoded, codec.codecBuffer.length);
+
     this.encoded = uint8Array;
     return this.encoded
   }

package/dist/commonjs/peernet.js

@@ -29,6 +29,7 @@ var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 
 const protoFor = (data) => {
+  console.log(data);
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
   const codec = new codecFormatInterface.Codec(data);
   if (!codec.name) throw new Error('proto not found')
@@ -379,10 +380,9 @@ class MessageHandler {
    * @param {Buffer} message.to peer id
    * @param {string} message.data Peernet message
    * (PeernetMessage excluded) encoded as a string
-   * @return signature
+   * @return message
    */
   async hashAndSignMessage(message) {
-    const hasher = new codecFormatInterface.CodecHash(message, {name: 'peernet-message'});
     let identity = await walletStore.get('identity');
     identity = JSON.parse(identity);
     if (!globalThis.MultiWallet) {
@@ -391,7 +391,8 @@ class MessageHandler {
     }
     const wallet = new MultiWallet(this.network);
     wallet.recover(identity.mnemonic);
-    return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
+    message.decoded.signature = wallet.sign(Buffer.from(await message.hash).slice(0, 32));
+    return message
   }
 
   /**
@@ -400,21 +401,12 @@ class MessageHandler {
    * @param {String|PeernetMessage} data - data encoded message string
    * or the messageNode itself
    */
-  async prepareMessage(from, to, data, id) {
-    if (data.encoded) data = data.encoded;
-
-    const message = {
-      from,
-      to,
-      data,
-    };
-    const signature = await this.hashAndSignMessage(message);
-    const node = await new globalThis.peernet.protos['peernet-message']({
-      ...message,
-      signature,
-    });
+  async prepareMessage(message) {    
+    if (message.keys.indexOf('signature') !== -1) {
+      message = await this.hashAndSignMessage(message);
+    }
 
-    return node
+    return message
   }
 }
 
@@ -422,8 +414,10 @@ const dataHandler = async message => {
   if (!message) return
 
   const {data, id} = message;
-
+  console.log({data});
   message = await protoFor(data);
+  console.log(message.decoded.data);
+  console.log({message});
   const proto = await protoFor(message.decoded.data);
   const from = message.decoded.from;
 
@@ -528,8 +522,8 @@ class Peernet {
   /**
    * @see MessageHandler
    */
-  prepareMessage(to, data) {
-    return this._messageHandler.prepareMessage(this.id, to, data)
+  prepareMessage(data) {
+    return this._messageHandler.prepareMessage(data)
   }
 
   /**
@@ -725,7 +719,7 @@ class Peernet {
           else has = await store.has(hash);
         }
         const data = await new globalThis.peernet.protos['peernet-dht-response']({hash, has});
-        const node = await this.prepareMessage(from, data.encoded);
+        const node = await this.prepareMessage(data);
 
         this.sendMessage(peer, id, node.encoded);
       } else if (proto.name === 'peernet-data') {
@@ -742,7 +736,7 @@ class Peernet {
           if (data) {
             data = await new globalThis.peernet.protos['peernet-data-response']({hash, data});
 
-            const node = await this.prepareMessage(from, data.encoded);
+            const node = await this.prepareMessage(data);
             this.sendMessage(peer, id, node.encoded);
           }
         }
@@ -751,7 +745,7 @@ class Peernet {
         const method = this.requestProtos[proto.decoded.request];
         if (method) {
           const data = await method();
-          const node = await this.prepareMessage(from, data.encoded);
+          const node = await this.prepareMessage(data);
           this.sendMessage(peer, id, node.encoded);
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
@@ -770,7 +764,7 @@ class Peernet {
     const data = await new globalThis.peernet.protos['peernet-dht']({hash});
     this.client.id;
     const walk = async peer => {
-      const node = await this.prepareMessage(peer.peerId, data.encoded);
+      const node = await this.prepareMessage(data);
       let result = await peer.request(node.encoded);
       result = new Uint8Array(Object.values(result));
       let proto = await protoFor(result);
@@ -877,7 +871,7 @@ class Peernet {
 
       let data = await new globalThis.peernet.protos['peernet-data']({hash, store: store?.name ? store?.name : store});
 
-      const node = await this.prepareMessage(id, data.encoded);
+      const node = await this.prepareMessage(data);
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
         closest = this.connections.filter((peer) => {
@@ -1003,6 +997,8 @@ class Peernet {
     else data = await this.requestData(hash, 'data');
 
     const node = await new peernet.protos['peernet-file'](data);
+    await node.decode();
+    console.log(data);
     const paths = [];
     if (node.decoded?.links.length === 0) throw new Error(`${hash} is a file`)
     for (const {path, hash} of node.decoded.links) {
@@ -1094,7 +1090,7 @@ class Peernet {
     data = await new globalThis.peernet.protos['peernet-ps']({data, topic});
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
-        const node = await this.prepareMessage(peer.peerId, data.encoded);
+        const node = await this.prepareMessage(data);
         this.sendMessage(peer, id, node.encoded);
       }
       // TODO: if peer subscribed

package/dist/module/peernet.js

@@ -27,6 +27,7 @@ function _interopNamespace(e) {
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 
 const protoFor = (data) => {
+  console.log(data);
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
   const codec = new codecFormatInterface.Codec(data);
   if (!codec.name) throw new Error('proto not found')
@@ -377,10 +378,9 @@ class MessageHandler {
    * @param {Buffer} message.to peer id
    * @param {string} message.data Peernet message
    * (PeernetMessage excluded) encoded as a string
-   * @return signature
+   * @return message
    */
   async hashAndSignMessage(message) {
-    const hasher = new codecFormatInterface.CodecHash(message, {name: 'peernet-message'});
     let identity = await walletStore.get('identity');
     identity = JSON.parse(identity);
     if (!globalThis.MultiWallet) {
@@ -389,7 +389,8 @@ class MessageHandler {
     }
     const wallet = new MultiWallet(this.network);
     wallet.recover(identity.mnemonic);
-    return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
+    message.decoded.signature = wallet.sign(Buffer.from(await message.hash).slice(0, 32));
+    return message
   }
 
   /**
@@ -398,21 +399,12 @@ class MessageHandler {
    * @param {String|PeernetMessage} data - data encoded message string
    * or the messageNode itself
    */
-  async prepareMessage(from, to, data, id) {
-    if (data.encoded) data = data.encoded;
-
-    const message = {
-      from,
-      to,
-      data,
-    };
-    const signature = await this.hashAndSignMessage(message);
-    const node = await new globalThis.peernet.protos['peernet-message']({
-      ...message,
-      signature,
-    });
+  async prepareMessage(message) {    
+    if (message.keys.indexOf('signature') !== -1) {
+      message = await this.hashAndSignMessage(message);
+    }
 
-    return node
+    return message
   }
 }
 
@@ -420,8 +412,10 @@ const dataHandler = async message => {
   if (!message) return
 
   const {data, id} = message;
-
+  console.log({data});
   message = await protoFor(data);
+  console.log(message.decoded.data);
+  console.log({message});
   const proto = await protoFor(message.decoded.data);
   const from = message.decoded.from;
 
@@ -526,8 +520,8 @@ class Peernet {
   /**
    * @see MessageHandler
    */
-  prepareMessage(to, data) {
-    return this._messageHandler.prepareMessage(this.id, to, data)
+  prepareMessage(data) {
+    return this._messageHandler.prepareMessage(data)
   }
 
   /**
@@ -723,7 +717,7 @@ class Peernet {
           else has = await store.has(hash);
         }
         const data = await new globalThis.peernet.protos['peernet-dht-response']({hash, has});
-        const node = await this.prepareMessage(from, data.encoded);
+        const node = await this.prepareMessage(data);
 
         this.sendMessage(peer, id, node.encoded);
       } else if (proto.name === 'peernet-data') {
@@ -740,7 +734,7 @@ class Peernet {
           if (data) {
             data = await new globalThis.peernet.protos['peernet-data-response']({hash, data});
 
-            const node = await this.prepareMessage(from, data.encoded);
+            const node = await this.prepareMessage(data);
             this.sendMessage(peer, id, node.encoded);
           }
         }
@@ -749,7 +743,7 @@ class Peernet {
         const method = this.requestProtos[proto.decoded.request];
         if (method) {
           const data = await method();
-          const node = await this.prepareMessage(from, data.encoded);
+          const node = await this.prepareMessage(data);
           this.sendMessage(peer, id, node.encoded);
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
@@ -768,7 +762,7 @@ class Peernet {
     const data = await new globalThis.peernet.protos['peernet-dht']({hash});
     this.client.id;
     const walk = async peer => {
-      const node = await this.prepareMessage(peer.peerId, data.encoded);
+      const node = await this.prepareMessage(data);
       let result = await peer.request(node.encoded);
       result = new Uint8Array(Object.values(result));
       let proto = await protoFor(result);
@@ -875,7 +869,7 @@ class Peernet {
 
       let data = await new globalThis.peernet.protos['peernet-data']({hash, store: store?.name ? store?.name : store});
 
-      const node = await this.prepareMessage(id, data.encoded);
+      const node = await this.prepareMessage(data);
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
         closest = this.connections.filter((peer) => {
@@ -1001,6 +995,8 @@ class Peernet {
     else data = await this.requestData(hash, 'data');
 
     const node = await new peernet.protos['peernet-file'](data);
+    await node.decode();
+    console.log(data);
     const paths = [];
     if (node.decoded?.links.length === 0) throw new Error(`${hash} is a file`)
     for (const {path, hash} of node.decoded.links) {
@@ -1092,7 +1088,7 @@ class Peernet {
     data = await new globalThis.peernet.protos['peernet-ps']({data, topic});
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
-        const node = await this.prepareMessage(peer.peerId, data.encoded);
+        const node = await this.prepareMessage(data);
         this.sendMessage(peer, id, node.encoded);
       }
       // TODO: if peer subscribed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "description": "",
   "source": "src/peernet.js",
   "main": "dist/commonjs/peernet.js",
@@ -28,7 +28,7 @@
   "license": "MIT",
   "browserslist": "> 5%, last 2 versions, not dead",
   "dependencies": {
-    "@leofcoin/codec-format-interface": "^1.2.5",
+    "@leofcoin/codec-format-interface": "^1.4.0",
     "@leofcoin/generate-account": "^1.0.4",
     "@leofcoin/multi-wallet": "^2.1.2",
     "@leofcoin/peernet-swarm": "^0.3.3",

package/src/handlers/data.js

@@ -4,8 +4,10 @@ const dataHandler = async message => {
   if (!message) return
 
   const {data, id} = message
-
+  console.log({data});
   message = await protoFor(data)
+  console.log(message.decoded.data);
+  console.log({message});
   const proto = await protoFor(message.decoded.data)
   const from = message.decoded.from
 

package/src/handlers/message.js

@@ -12,10 +12,9 @@ export default class MessageHandler {
    * @param {Buffer} message.to peer id
    * @param {string} message.data Peernet message
    * (PeernetMessage excluded) encoded as a string
-   * @return signature
+   * @return message
    */
   async hashAndSignMessage(message) {
-    const hasher = new CodecHash(message, {name: 'peernet-message'})
     let identity = await walletStore.get('identity')
     identity = JSON.parse(identity)
     if (!globalThis.MultiWallet) {
@@ -24,7 +23,8 @@ export default class MessageHandler {
     }
     const wallet = new MultiWallet(this.network)
     wallet.recover(identity.mnemonic)
-    return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
+    message.decoded.signature = wallet.sign(Buffer.from(await message.hash).slice(0, 32))
+    return message
   }
 
   /**
@@ -33,20 +33,11 @@ export default class MessageHandler {
    * @param {String|PeernetMessage} data - data encoded message string
    * or the messageNode itself
    */
-  async prepareMessage(from, to, data, id) {
-    if (data.encoded) data = data.encoded
-
-    const message = {
-      from,
-      to,
-      data,
+  async prepareMessage(message) {    
+    if (message.keys.indexOf('signature') !== -1) {
+      message = await this.hashAndSignMessage(message)
     }
-    const signature = await this.hashAndSignMessage(message)
-    const node = await new globalThis.peernet.protos['peernet-message']({
-      ...message,
-      signature,
-    })
 
-    return node
+    return message
   }
 }

package/src/peernet.js

@@ -94,8 +94,8 @@ export default class Peernet {
   /**
    * @see MessageHandler
    */
-  prepareMessage(to, data) {
-    return this._messageHandler.prepareMessage(this.id, to, data)
+  prepareMessage(data) {
+    return this._messageHandler.prepareMessage(data)
   }
 
   /**
@@ -293,7 +293,7 @@ export default class Peernet {
           else has = await store.has(hash)
         }
         const data = await new globalThis.peernet.protos['peernet-dht-response']({hash, has})
-        const node = await this.prepareMessage(from, data.encoded)
+        const node = await this.prepareMessage(data)
 
         this.sendMessage(peer, id, node.encoded)
       } else if (proto.name === 'peernet-data') {
@@ -310,7 +310,7 @@ export default class Peernet {
           if (data) {
             data = await new globalThis.peernet.protos['peernet-data-response']({hash, data});
 
-            const node = await this.prepareMessage(from, data.encoded)
+            const node = await this.prepareMessage(data)
             this.sendMessage(peer, id, node.encoded)
           }
         } else {
@@ -321,7 +321,7 @@ export default class Peernet {
         const method = this.requestProtos[proto.decoded.request]
         if (method) {
           const data = await method()
-          const node = await this.prepareMessage(from, data.encoded)
+          const node = await this.prepareMessage(data)
           this.sendMessage(peer, id, node.encoded)
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
@@ -340,7 +340,7 @@ export default class Peernet {
     const data = await new globalThis.peernet.protos['peernet-dht']({hash})
     const clientId = this.client.id
     const walk = async peer => {
-      const node = await this.prepareMessage(peer.peerId, data.encoded)
+      const node = await this.prepareMessage(data)
       let result = await peer.request(node.encoded)
       result = new Uint8Array(Object.values(result))
       let proto = await protoFor(result)
@@ -447,7 +447,7 @@ export default class Peernet {
 
       let data = await new globalThis.peernet.protos['peernet-data']({hash, store: store?.name ? store?.name : store});
 
-      const node = await this.prepareMessage(id, data.encoded)
+      const node = await this.prepareMessage(data)
       if (closest[0]) data = await closest[0].request(node.encoded)
       else {
         closest = this.connections.filter((peer) => {
@@ -573,6 +573,8 @@ export default class Peernet {
     else data = await this.requestData(hash, 'data')
 
     const node = await new peernet.protos['peernet-file'](data)
+    await node.decode()
+    console.log(data);
     const paths = []
     if (node.decoded?.links.length === 0) throw new Error(`${hash} is a file`)
     for (const {path, hash} of node.decoded.links) {
@@ -665,7 +667,7 @@ export default class Peernet {
     data = await new globalThis.peernet.protos['peernet-ps']({data, topic})
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
-        const node = await this.prepareMessage(peer.peerId, data.encoded)
+        const node = await this.prepareMessage(data)
         this.sendMessage(peer, id, node.encoded)
       }
       // TODO: if peer subscribed

package/src/utils/utils.js

@@ -18,6 +18,7 @@ export const expected = (expected, actual) => {
 }
 
 export const protoFor = (data) => {
+  console.log(data);
   if (!Buffer.isBuffer(data)) data = Buffer.from(data)
   const codec = new Codec(data)
   if (!codec.name) throw new Error('proto not found')

package/test.js

@@ -4,13 +4,13 @@ const Client = require('./dist/commonjs/peernet.js');
 (async () => {
   const client = await new Client({root: '.peernet/test'})
 
-  peernet.addFolder([{
-    path: 'assets/asset.png',
-    content: Buffer.from('png')
-  }, {
-    path: 'index.html',
-    content: Buffer.from('html')
-  }]).then(hash => peernet.ls(hash).then(paths => peernet.cat(paths[0].hash).then(content => console.log(content))))
+  // peernet.addFolder([{
+  //   path: 'assets/asset.png',
+  //   content: Buffer.from('png')
+  // }, {
+  //   path: 'index.html',
+  //   content: Buffer.from('html')
+  // }]).then(hash => peernet.ls(hash).then(paths => peernet.cat(paths[0].hash).then(content => console.log(content))))
 
   pubsub.subscribe('peer:connected', async peer => {
     chainStore.put('localBlock', '00000')
@@ -19,8 +19,8 @@ const Client = require('./dist/commonjs/peernet.js');
           })
     const to = peer.id
     await peernet.data.put('hello', 'hi')
-    console.log(request);
-    const node = await peernet.prepareMessage(to, request.encoded)
+    console.log({request});
+    const node = await peernet.prepareMessage(request)
     console.log({node});
     let response = await peer.request(node.encoded)
     console.log({response});
@@ -29,9 +29,9 @@ const Client = require('./dist/commonjs/peernet.js');
     for (const key of keys) {
       uint8Array[Number(key)] = response[key]
     }
-    const proto = await new globalThis.peernet.protos['peernet-message'](uint8Array)
-    console.log(proto.decoded.data);
-    response = await new globalThis.peernet.protos['peernet-response'](proto.decoded.data)
+    // const proto = await new globalThis.peernet.protos['peernet-message'](uint8Array)
+    // console.log(proto.decoded.data);
+    response = await new globalThis.peernet.protos['peernet-response'](uint8Array)
     console.log({response});
 
     const block = new TextDecoder().decode(response.decoded.response)