@leofcoin/peernet 0.14.3 → 0.14.4

package/dist/browser/peernet.js

@@ -357,14 +357,12 @@ 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);
+const protoFor = (message) => {
+  const codec = new codecFormatInterface.Codec(message);
   if (!codec.name) throw new Error('proto not found')
   const Proto = globalThis.peernet.protos[codec.name];
   if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
-  return new Proto(data)
+  return new Proto(message)
 };
 
 /**
@@ -742,21 +740,12 @@ class MessageHandler {
 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;
+  const {data, id, from} = message;
+  const proto = await protoFor(data);
 
   peernet._protoHandler({id, proto}, peernet.client.connections[from], from);
 };
 
-const encapsulatedError = () => {
-  return new Error('Nodes/Data should be send encapsulated by peernet-message')
-};
-
 const dhtError = (proto) => {
   const text = `Received proto ${proto.name} expected peernet-dht-response`;
   return new Error(`Routing error: ${text}`)
@@ -1095,11 +1084,9 @@ class Peernet {
     const walk = async peer => {
       const node = await this.prepareMessage(data);
       let result = await peer.request(node.encoded);
+      console.log({result});
       result = new Uint8Array(Object.values(result));
-      let proto = await protoFor(result);
-      if (proto.name !== 'peernet-message') throw encapsulatedError()
-      const from = proto.decoded.from;
-      proto = await protoFor(proto.decoded.data);
+      const proto = await protoFor(result);
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
       // TODO: give ip and port (just used for location)
@@ -1113,7 +1100,7 @@ class Peernet {
         family: peer.connection.remoteFamily || peer.connection.localFamily,
         address: peer.connection.remoteAddress || peer.connection.localAddress,
         port: peer.connection.remotePort || peer.connection.localPort,
-        id: from,
+        id: peerId,
       };
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash);
@@ -1208,9 +1195,9 @@ class Peernet {
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
+      console.log({data});
       data = new Uint8Array(Object.values(data));
-      let proto = await protoFor(data);
-      proto = await protoFor(proto.decoded.data);
+      proto = await protoFor(data);
       // TODO: store data automaticly or not
       return proto.decoded.data
 

package/dist/commonjs/peernet.js

@@ -28,14 +28,12 @@ function _interopNamespace(e) {
 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);
+const protoFor = (message) => {
+  const codec = new codecFormatInterface.Codec(message);
   if (!codec.name) throw new Error('proto not found')
   const Proto = globalThis.peernet.protos[codec.name];
   if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
-  return new Proto(data)
+  return new Proto(message)
 };
 
 /**
@@ -413,21 +411,12 @@ class MessageHandler {
 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;
+  const {data, id, from} = message;
+  const proto = await protoFor(data);
 
   peernet._protoHandler({id, proto}, peernet.client.connections[from], from);
 };
 
-const encapsulatedError = () => {
-  return new Error('Nodes/Data should be send encapsulated by peernet-message')
-};
-
 const dhtError = (proto) => {
   const text = `Received proto ${proto.name} expected peernet-dht-response`;
   return new Error(`Routing error: ${text}`)
@@ -766,11 +755,9 @@ class Peernet {
     const walk = async peer => {
       const node = await this.prepareMessage(data);
       let result = await peer.request(node.encoded);
+      console.log({result});
       result = new Uint8Array(Object.values(result));
-      let proto = await protoFor(result);
-      if (proto.name !== 'peernet-message') throw encapsulatedError()
-      const from = proto.decoded.from;
-      proto = await protoFor(proto.decoded.data);
+      const proto = await protoFor(result);
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
       // TODO: give ip and port (just used for location)
@@ -784,7 +771,7 @@ class Peernet {
         family: peer.connection.remoteFamily || peer.connection.localFamily,
         address: peer.connection.remoteAddress || peer.connection.localAddress,
         port: peer.connection.remotePort || peer.connection.localPort,
-        id: from,
+        id: peerId,
       };
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash);
@@ -879,9 +866,9 @@ class Peernet {
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
+      console.log({data});
       data = new Uint8Array(Object.values(data));
-      let proto = await protoFor(data);
-      proto = await protoFor(proto.decoded.data);
+      proto = await protoFor(data);
       // TODO: store data automaticly or not
       return proto.decoded.data
 

package/dist/module/peernet.js

@@ -26,14 +26,12 @@ 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);
+const protoFor = (message) => {
+  const codec = new codecFormatInterface.Codec(message);
   if (!codec.name) throw new Error('proto not found')
   const Proto = globalThis.peernet.protos[codec.name];
   if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
-  return new Proto(data)
+  return new Proto(message)
 };
 
 /**
@@ -411,21 +409,12 @@ class MessageHandler {
 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;
+  const {data, id, from} = message;
+  const proto = await protoFor(data);
 
   peernet._protoHandler({id, proto}, peernet.client.connections[from], from);
 };
 
-const encapsulatedError = () => {
-  return new Error('Nodes/Data should be send encapsulated by peernet-message')
-};
-
 const dhtError = (proto) => {
   const text = `Received proto ${proto.name} expected peernet-dht-response`;
   return new Error(`Routing error: ${text}`)
@@ -764,11 +753,9 @@ class Peernet {
     const walk = async peer => {
       const node = await this.prepareMessage(data);
       let result = await peer.request(node.encoded);
+      console.log({result});
       result = new Uint8Array(Object.values(result));
-      let proto = await protoFor(result);
-      if (proto.name !== 'peernet-message') throw encapsulatedError()
-      const from = proto.decoded.from;
-      proto = await protoFor(proto.decoded.data);
+      const proto = await protoFor(result);
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
       // TODO: give ip and port (just used for location)
@@ -782,7 +769,7 @@ class Peernet {
         family: peer.connection.remoteFamily || peer.connection.localFamily,
         address: peer.connection.remoteAddress || peer.connection.localAddress,
         port: peer.connection.remotePort || peer.connection.localPort,
-        id: from,
+        id: peerId,
       };
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash);
@@ -877,9 +864,9 @@ class Peernet {
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
+      console.log({data});
       data = new Uint8Array(Object.values(data));
-      let proto = await protoFor(data);
-      proto = await protoFor(proto.decoded.data);
+      proto = await protoFor(data);
       // TODO: store data automaticly or not
       return proto.decoded.data
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "",
   "source": "src/peernet.js",
   "main": "dist/commonjs/peernet.js",

package/src/handlers/data.js

@@ -3,13 +3,8 @@ import { protoFor } from './../utils/utils.js'
 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
+  const {data, id, from} = message
+  const proto = await protoFor(data)
 
   peernet._protoHandler({id, proto}, peernet.client.connections[from], from)
 }

package/src/peernet.js

@@ -342,11 +342,9 @@ export default class Peernet {
     const walk = async peer => {
       const node = await this.prepareMessage(data)
       let result = await peer.request(node.encoded)
+      console.log({result});
       result = new Uint8Array(Object.values(result))
-      let proto = await protoFor(result)
-      if (proto.name !== 'peernet-message') throw encapsulatedError()
-      const from = proto.decoded.from
-      proto = await protoFor(proto.decoded.data)
+      const proto = await protoFor(result)
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
       // TODO: give ip and port (just used for location)
@@ -360,7 +358,7 @@ export default class Peernet {
         family: peer.connection.remoteFamily || peer.connection.localFamily,
         address: peer.connection.remoteAddress || peer.connection.localAddress,
         port: peer.connection.remotePort || peer.connection.localPort,
-        id: from,
+        id: peerId,
       }
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash)
@@ -455,9 +453,9 @@ export default class Peernet {
         })
         if (closest[0]) data = await closest[0].request(node.encoded)
       }
+      console.log({data});
       data = new Uint8Array(Object.values(data))
-      let proto = await protoFor(data)
-      proto = await protoFor(proto.decoded.data)
+      proto = await protoFor(data)
       // TODO: store data automaticly or not
       return proto.decoded.data
 

package/src/utils/utils.js

@@ -17,14 +17,12 @@ export const expected = (expected, actual) => {
       ${entries.join('\n\t')}`;
 }
 
-export const protoFor = (data) => {
-  console.log(data);
-  if (!Buffer.isBuffer(data)) data = Buffer.from(data)
-  const codec = new Codec(data)
+export const protoFor = (message) => {
+  const codec = new Codec(message)
   if (!codec.name) throw new Error('proto not found')
   const Proto = globalThis.peernet.protos[codec.name]
   if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
-  return new Proto(data)
+  return new Proto(message)
 }
 
 /**