@leofcoin/peernet 0.9.1 → 0.9.4

package/README.md

@@ -5,6 +5,30 @@
 import discovery from 'socket-discovery'
 ```
 
+## API
+#### addRequestHandler
+
+examples
+```js
+peernet.addRequestHandler('lastBlock', () => {
+  let response;
+  const height = await chainStore.get('localIndex')
+  const hash = await chainStore.get('localBlock')
+  response = JSON.stringify({ height: height.toString(), hash: hash.toString() })
+  return new ResponseMessage({ response })
+  // or
+  return new peernet.protos['peernet-response']({ response })
+})
+```
+
+```js
+peernet.addRequestHandler('hello', () => {
+  return new ResponseMessage({ response: 'hi' })
+  // or
+  return new peernet.protos['peernet-response']({ response: 'hi' })
+})
+```
+
 ## Development
 ### watch
 ```sh
@@ -19,7 +43,7 @@ npm run c
 npm run demo
 ```
 
-`note: you need to install jsproject` 
+`note: you need to install jsproject`
 ```sh
 npm i -g @vandeurenglenn/project
-```
+```

package/dist/browser/peernet.js

@@ -261,7 +261,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.9.0";
+var version = "0.9.3";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -916,7 +916,7 @@ class LeofcoinStorageClient {
   }
 }
 
-var proto$9 = `
+var proto$a = `
 // PeernetMessage
 message PeernetMessage {
   required bytes data = 1;
@@ -1395,11 +1395,11 @@ class PeernetMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'peernet-message';
-    super(buffer, protons__default['default'](proto$9).PeernetMessage, {name});
+    super(buffer, protons__default['default'](proto$a).PeernetMessage, {name});
   }
 }
 
-var proto$8 = `
+var proto$9 = `
 // PeernetDHTMessage
 message PeernetDHTMessage {
   required string hash = 1;
@@ -1425,11 +1425,11 @@ class DHTMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-dht';
-    super(data, protons__default['default'](proto$8).PeernetDHTMessage, {name});
+    super(data, protons__default['default'](proto$9).PeernetDHTMessage, {name});
   }
 }
 
-var proto$7 = `
+var proto$8 = `
 // PeernetDHTMessageResponse
 message PeernetDHTMessageResponse {
   required string hash = 1;
@@ -1444,11 +1444,11 @@ class DHTMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-dht-response';
-    super(data, protons__default['default'](proto$7).PeernetDHTMessageResponse, {name});
+    super(data, protons__default['default'](proto$8).PeernetDHTMessageResponse, {name});
   }
 }
 
-var proto$6 = `
+var proto$7 = `
 // PeernetDataMessage
 message PeernetDataMessage {
   required string hash = 1;
@@ -1463,11 +1463,11 @@ class DataMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-data';
-    super(data, protons__default['default'](proto$6).PeernetDataMessage, {name});
+    super(data, protons__default['default'](proto$7).PeernetDataMessage, {name});
   }
 }
 
-var proto$5 = `
+var proto$6 = `
 // PsMessage
 message PsMessage {
   required bytes data = 1;
@@ -1481,11 +1481,11 @@ class PsMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'peernet-ps';
-    super(buffer, protons__default['default'](proto$5).PsMessage, {name});
+    super(buffer, protons__default['default'](proto$6).PsMessage, {name});
   }
 }
 
-var proto$4 = `
+var proto$5 = `
 // PeernetPeerMessage
 message PeernetPeerMessage {
   required string id = 1;
@@ -1499,11 +1499,11 @@ class PeerMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer';
-    super(data, protons__default['default'](proto$4).PeernetPeerMessage, {name});
+    super(data, protons__default['default'](proto$5).PeernetPeerMessage, {name});
   }
 }
 
-var proto$3 = `
+var proto$4 = `
 // PeernetRequestMessage
 message PeernetRequestMessage {
   required string request = 1;
@@ -1517,11 +1517,11 @@ class RequestMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-request';
-    super(data, protons__default['default'](proto$3).PeernetRequestMessage, {name});
+    super(data, protons__default['default'](proto$4).PeernetRequestMessage, {name});
   }
 }
 
-var proto$2 = `
+var proto$3 = `
 // PeernetResponseMessage
 message PeernetResponseMessage {
   required string response = 1;
@@ -1535,11 +1535,11 @@ class ResponseMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-response';
-    super(data, protons__default['default'](proto$2).PeernetResponseMessage, {name});
+    super(data, protons__default['default'](proto$3).PeernetResponseMessage, {name});
   }
 }
 
-var proto$1 = `
+var proto$2 = `
 // PeernetPeerMessageResponse
 message PeernetPeerMessageResponse {
   required string id = 1;
@@ -1553,11 +1553,11 @@ class PeerMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer-response';
-    super(data, protons__default['default'](proto$1).PeernetPeerMessageResponse, {name});
+    super(data, protons__default['default'](proto$2).PeernetPeerMessageResponse, {name});
   }
 }
 
-var proto = `
+var proto$1 = `
 // PeernetDataMessageResponse
 message PeernetDataMessageResponse {
   required string hash = 1;
@@ -1572,10 +1572,18 @@ class DataMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-data-response';
-    super(data, protons__default['default'](proto).PeernetDataMessageResponse, {name});
+    super(data, protons__default['default'](proto$1).PeernetDataMessageResponse, {name});
   }
 }
 
+var proto = `
+message ChatMessage {
+  required string value = 1;
+  required string author = 2;
+  required uint64 timestamp = 3;
+  repeated string files = 4;
+}`;
+
 class ChatMessage extends FormatInterface {
   get keys() {
     return ['author', 'value', 'timestamp', 'files']
@@ -1583,7 +1591,7 @@ class ChatMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'chat-message';
-    super(buffer, protons__default['default'](proto$9).ChatMessage, {name});
+    super(buffer, protons__default['default'](proto).ChatMessage, {name});
   }
 }
 
@@ -2054,6 +2062,7 @@ class Peernet {
      */
     this.peerMap = new Map();
     this.stores = [];
+    this.requestProtos = {};
     this.storePrefix = options.storePrefix;
     this.root = options.root;
 
@@ -2077,7 +2086,7 @@ class Peernet {
       'peernet-data': DataMessage,
       'peernet-data-response': DataMessageResponse,
       'peernet-ps': PsMessage,
-      'chat-message': ChatMessage
+      'chat-message': ChatMessage,
     };
     this.protos = globalThis.peernet.protos;
 
@@ -2178,6 +2187,10 @@ class Peernet {
     }
   }
 
+  addRequestHandler(name, method) {
+    this.requestProtos[name] = method;
+  }
+
   /**
    * @private
    *
@@ -2280,14 +2293,10 @@ class Peernet {
       } else if (proto.name === 'peernet-request') {
         // TODO: make dynamic
         // exposeddevapi[proto.decoded.request](proto.decoded.params)
-        let response;
-        if (proto.decoded.request === 'lastBlock') {
-          const height = await chainStore.get('localIndex');
-          const hash = await chainStore.get('localBlock');
-          response = JSON.stringify({ height: height.toString(), hash: hash.toString() });
-          const data = new ResponseMessage({ response });
+        const method = this.requestProtos[proto.decoded.request];
+        if (method) {
+          const data = await method();
           const node = await this.prepareMessage(from, data.encoded);
-
           peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
         }
       } else if (proto.name === 'peernet-ps' &&
@@ -2431,7 +2440,6 @@ class Peernet {
   }
 
 
-
   get message() {
     return {
       /**
@@ -2584,6 +2592,10 @@ class Peernet {
   async removePeer(peer) {
     connections.delete(peer.id);
   }
+
+  get Buffer() {
+    return Buffer
+  }
   // async block(index) {
   //   const _values = []
   //   for (const peer of this.peers) {

package/dist/commonjs/peernet-message.js

@@ -1,8 +1,7 @@
 'use strict';
 
-require('protons');
-var peernetMessage = require('./peernet-message-b6925673.js');
-require('./codec-format-interface.js');
+var protons = require('protons');
+var codecFormatInterface = require('./codec-format-interface.js');
 require('bs32');
 require('bs58');
 require('is-hex');
@@ -11,6 +10,29 @@ require('varint');
 require('./hash.js');
 require('keccak');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
 
-module.exports = peernetMessage.PeernetMessage;
+var proto = `
+// PeernetMessage
+message PeernetMessage {
+  required bytes data = 1;
+  required bytes signature = 2;
+  optional bytes from = 3;
+  optional bytes to = 4;
+  optional string id = 5;
+}`;
+
+class PeernetMessage extends codecFormatInterface {
+  get keys() {
+    return ['data', 'signature', 'from', 'to', 'id']
+  }
+
+  constructor(buffer) {
+    const name = 'peernet-message';
+    super(buffer, protons__default['default'](proto).PeernetMessage, {name});
+  }
+}
+
+module.exports = PeernetMessage;

package/dist/commonjs/peernet.js

@@ -6,7 +6,7 @@ var P2P = require('p2pt');
 var websocket = require('websocket');
 var http$1 = require('http');
 var Koa = require('koa');
-var peernetMessage = require('./peernet-message-b6925673.js');
+var peernetMessage = require('./peernet-message.js');
 var dht = require('./dht.js');
 var dhtResponse = require('./dht-response.js');
 var protons = require('protons');
@@ -264,7 +264,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.9.0";
+var version = "0.9.3";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -919,7 +919,7 @@ class LeofcoinStorageClient {
   }
 }
 
-var proto$4 = `
+var proto$5 = `
 // PeernetDataMessage
 message PeernetDataMessage {
   required string hash = 1;
@@ -934,11 +934,11 @@ class DataMessage extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-data';
-    super(data, protons__default['default'](proto$4).PeernetDataMessage, {name});
+    super(data, protons__default['default'](proto$5).PeernetDataMessage, {name});
   }
 }
 
-var proto$3 = `
+var proto$4 = `
 // PsMessage
 message PsMessage {
   required bytes data = 1;
@@ -952,11 +952,11 @@ class PsMessage extends codecFormatInterface {
 
   constructor(buffer) {
     const name = 'peernet-ps';
-    super(buffer, protons__default['default'](proto$3).PsMessage, {name});
+    super(buffer, protons__default['default'](proto$4).PsMessage, {name});
   }
 }
 
-var proto$2 = `
+var proto$3 = `
 // PeernetPeerMessage
 message PeernetPeerMessage {
   required string id = 1;
@@ -970,11 +970,11 @@ class PeerMessage extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer';
-    super(data, protons__default['default'](proto$2).PeernetPeerMessage, {name});
+    super(data, protons__default['default'](proto$3).PeernetPeerMessage, {name});
   }
 }
 
-var proto$1 = `
+var proto$2 = `
 // PeernetPeerMessageResponse
 message PeernetPeerMessageResponse {
   required string id = 1;
@@ -988,11 +988,11 @@ class PeerMessageResponse extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer-response';
-    super(data, protons__default['default'](proto$1).PeernetPeerMessageResponse, {name});
+    super(data, protons__default['default'](proto$2).PeernetPeerMessageResponse, {name});
   }
 }
 
-var proto = `
+var proto$1 = `
 // PeernetDataMessageResponse
 message PeernetDataMessageResponse {
   required string hash = 1;
@@ -1007,10 +1007,18 @@ class DataMessageResponse extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-data-response';
-    super(data, protons__default['default'](proto).PeernetDataMessageResponse, {name});
+    super(data, protons__default['default'](proto$1).PeernetDataMessageResponse, {name});
   }
 }
 
+var proto = `
+message ChatMessage {
+  required string value = 1;
+  required string author = 2;
+  required uint64 timestamp = 3;
+  repeated string files = 4;
+}`;
+
 class ChatMessage extends codecFormatInterface {
   get keys() {
     return ['author', 'value', 'timestamp', 'files']
@@ -1018,7 +1026,7 @@ class ChatMessage extends codecFormatInterface {
 
   constructor(buffer) {
     const name = 'chat-message';
-    super(buffer, protons__default['default'](peernetMessage.proto).ChatMessage, {name});
+    super(buffer, protons__default['default'](proto).ChatMessage, {name});
   }
 }
 
@@ -1361,7 +1369,7 @@ class MessageHandler {
       data,
     };
     const signature = await this.hashAndSignMessage(message);
-    const node = new peernetMessage.PeernetMessage({
+    const node = new peernetMessage({
       ...message,
       signature,
     });
@@ -1489,6 +1497,7 @@ class Peernet {
      */
     this.peerMap = new Map();
     this.stores = [];
+    this.requestProtos = {};
     this.storePrefix = options.storePrefix;
     this.root = options.root;
 
@@ -1506,13 +1515,13 @@ class Peernet {
       'peernet-response': response,
       'peernet-peer': PeerMessage,
       'peernet-peer-response': PeerMessageResponse,
-      'peernet-message': peernetMessage.PeernetMessage,
+      'peernet-message': peernetMessage,
       'peernet-dht': dht,
       'peernet-dht-response': dhtResponse,
       'peernet-data': DataMessage,
       'peernet-data-response': DataMessageResponse,
       'peernet-ps': PsMessage,
-      'chat-message': ChatMessage
+      'chat-message': ChatMessage,
     };
     this.protos = globalThis.peernet.protos;
 
@@ -1561,7 +1570,7 @@ class Peernet {
       this._peerHandler.discover(peer);
       peer.on('peernet.data', async (message) => {
         const id = message.id;
-        message = new peernetMessage.PeernetMessage(Buffer.from(message.data.data));
+        message = new peernetMessage(Buffer.from(message.data.data));
         const proto = protoFor(message.decoded.data);
         await this._protoHandler({id, proto}, peer);
         const fulldId = this._getPeerId(peer.id);
@@ -1613,6 +1622,10 @@ class Peernet {
     }
   }
 
+  addRequestHandler(name, method) {
+    this.requestProtos[name] = method;
+  }
+
   /**
    * @private
    *
@@ -1715,14 +1728,10 @@ class Peernet {
       } else if (proto.name === 'peernet-request') {
         // TODO: make dynamic
         // exposeddevapi[proto.decoded.request](proto.decoded.params)
-        let response$1;
-        if (proto.decoded.request === 'lastBlock') {
-          const height = await chainStore.get('localIndex');
-          const hash = await chainStore.get('localBlock');
-          response$1 = JSON.stringify({ height: height.toString(), hash: hash.toString() });
-          const data = new response({ response: response$1 });
+        const method = this.requestProtos[proto.decoded.request];
+        if (method) {
+          const data = await method();
           const node = await this.prepareMessage(from, data.encoded);
-
           peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
         }
       } else if (proto.name === 'peernet-ps' &&
@@ -1866,7 +1875,6 @@ class Peernet {
   }
 
 
-
   get message() {
     return {
       /**
@@ -2019,6 +2027,10 @@ class Peernet {
   async removePeer(peer) {
     connections.delete(peer.id);
   }
+
+  get Buffer() {
+    return Buffer
+  }
   // async block(index) {
   //   const _values = []
   //   for (const peer of this.peers) {

package/dist/module/peernet.js

@@ -244,7 +244,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.9.0";
+var version = "0.9.3";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -899,7 +899,7 @@ class LeofcoinStorageClient {
   }
 }
 
-var proto$9 = `
+var proto$a = `
 // PeernetMessage
 message PeernetMessage {
   required bytes data = 1;
@@ -1378,11 +1378,11 @@ class PeernetMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'peernet-message';
-    super(buffer, protons(proto$9).PeernetMessage, {name});
+    super(buffer, protons(proto$a).PeernetMessage, {name});
   }
 }
 
-var proto$8 = `
+var proto$9 = `
 // PeernetDHTMessage
 message PeernetDHTMessage {
   required string hash = 1;
@@ -1408,11 +1408,11 @@ class DHTMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-dht';
-    super(data, protons(proto$8).PeernetDHTMessage, {name});
+    super(data, protons(proto$9).PeernetDHTMessage, {name});
   }
 }
 
-var proto$7 = `
+var proto$8 = `
 // PeernetDHTMessageResponse
 message PeernetDHTMessageResponse {
   required string hash = 1;
@@ -1427,11 +1427,11 @@ class DHTMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-dht-response';
-    super(data, protons(proto$7).PeernetDHTMessageResponse, {name});
+    super(data, protons(proto$8).PeernetDHTMessageResponse, {name});
   }
 }
 
-var proto$6 = `
+var proto$7 = `
 // PeernetDataMessage
 message PeernetDataMessage {
   required string hash = 1;
@@ -1446,11 +1446,11 @@ class DataMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-data';
-    super(data, protons(proto$6).PeernetDataMessage, {name});
+    super(data, protons(proto$7).PeernetDataMessage, {name});
   }
 }
 
-var proto$5 = `
+var proto$6 = `
 // PsMessage
 message PsMessage {
   required bytes data = 1;
@@ -1464,11 +1464,11 @@ class PsMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'peernet-ps';
-    super(buffer, protons(proto$5).PsMessage, {name});
+    super(buffer, protons(proto$6).PsMessage, {name});
   }
 }
 
-var proto$4 = `
+var proto$5 = `
 // PeernetPeerMessage
 message PeernetPeerMessage {
   required string id = 1;
@@ -1482,11 +1482,11 @@ class PeerMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer';
-    super(data, protons(proto$4).PeernetPeerMessage, {name});
+    super(data, protons(proto$5).PeernetPeerMessage, {name});
   }
 }
 
-var proto$3 = `
+var proto$4 = `
 // PeernetRequestMessage
 message PeernetRequestMessage {
   required string request = 1;
@@ -1500,11 +1500,11 @@ class RequestMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-request';
-    super(data, protons(proto$3).PeernetRequestMessage, {name});
+    super(data, protons(proto$4).PeernetRequestMessage, {name});
   }
 }
 
-var proto$2 = `
+var proto$3 = `
 // PeernetResponseMessage
 message PeernetResponseMessage {
   required string response = 1;
@@ -1518,11 +1518,11 @@ class ResponseMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-response';
-    super(data, protons(proto$2).PeernetResponseMessage, {name});
+    super(data, protons(proto$3).PeernetResponseMessage, {name});
   }
 }
 
-var proto$1 = `
+var proto$2 = `
 // PeernetPeerMessageResponse
 message PeernetPeerMessageResponse {
   required string id = 1;
@@ -1536,11 +1536,11 @@ class PeerMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer-response';
-    super(data, protons(proto$1).PeernetPeerMessageResponse, {name});
+    super(data, protons(proto$2).PeernetPeerMessageResponse, {name});
   }
 }
 
-var proto = `
+var proto$1 = `
 // PeernetDataMessageResponse
 message PeernetDataMessageResponse {
   required string hash = 1;
@@ -1555,10 +1555,18 @@ class DataMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-data-response';
-    super(data, protons(proto).PeernetDataMessageResponse, {name});
+    super(data, protons(proto$1).PeernetDataMessageResponse, {name});
   }
 }
 
+var proto = `
+message ChatMessage {
+  required string value = 1;
+  required string author = 2;
+  required uint64 timestamp = 3;
+  repeated string files = 4;
+}`;
+
 class ChatMessage extends FormatInterface {
   get keys() {
     return ['author', 'value', 'timestamp', 'files']
@@ -1566,7 +1574,7 @@ class ChatMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'chat-message';
-    super(buffer, protons(proto$9).ChatMessage, {name});
+    super(buffer, protons(proto).ChatMessage, {name});
   }
 }
 
@@ -2037,6 +2045,7 @@ class Peernet {
      */
     this.peerMap = new Map();
     this.stores = [];
+    this.requestProtos = {};
     this.storePrefix = options.storePrefix;
     this.root = options.root;
 
@@ -2161,6 +2170,10 @@ class Peernet {
     }
   }
 
+  addRequestHandler(name, method) {
+    this.requestProtos[name] = method;
+  }
+
   /**
    * @private
    *
@@ -2263,14 +2276,10 @@ class Peernet {
       } else if (proto.name === 'peernet-request') {
         // TODO: make dynamic
         // exposeddevapi[proto.decoded.request](proto.decoded.params)
-        let response;
-        if (proto.decoded.request === 'lastBlock') {
-          const height = await chainStore.get('localIndex');
-          const hash = await chainStore.get('localBlock');
-          response = JSON.stringify({ height: height.toString(), hash: hash.toString() });
-          const data = new ResponseMessage({ response });
+        const method = this.requestProtos[proto.decoded.request];
+        if (method) {
+          const data = await method();
           const node = await this.prepareMessage(from, data.encoded);
-
           peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
         }
       } else if (proto.name === 'peernet-ps' &&
@@ -2566,6 +2575,10 @@ class Peernet {
   async removePeer(peer) {
     connections.delete(peer.id);
   }
+
+  get Buffer() {
+    return Buffer
+  }
   // async block(index) {
   //   const _values = []
   //   for (const peer of this.peers) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.9.1",
+  "version": "0.9.4",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",

package/test/lastBlock.js

@@ -0,0 +1,7 @@
+peernet.addRequestHandler('lastBlock', () => {
+  let response;
+  const height = await chainStore.get('localIndex')
+  const hash = await chainStore.get('localBlock')
+  response = JSON.stringify({ height: height.toString(), hash: hash.toString() })
+  return new peernet.protos['peernet-response']({ response })
+})