@leofcoin/peernet 0.8.7 → 0.8.11

package/dist/commonjs/peernet.js

@@ -89,10 +89,11 @@ globalThis.pubsub = globalThis.pubsub || new PubSub__default['default']({verbose
 class PeernetClient {
   constructor(options = {}) {
     if (!options.id) options.id = Buffer.from('00000000000000000000000000000000');
-
+    if (!options.networkVersion) options.networkVersion = 'v0.1.0';
+    if (!options.networkName) options.networkName = 'peernet';
     this.id = options.id;
 
-    this.topic = Buffer.from(sha256__default['default']('peernet-v0.1.0').toString());
+    this.topic = Buffer.from(sha256__default['default'](`${options.networkName}-${options.networkVersion}`).toString());
 
     const trackers = [
       'wss://star.leofcoin.org:7575',
@@ -114,71 +115,6 @@ class PeernetClient {
 
     this.p2p.start();
 
-
-    // this.sw.join(this.topic.slice(0, 32))
-    //
-    // const arrayOfPeers = this.sw.getPeers()
-    //
-    // this.sw.on('connection', async (connection, info) => {
-    //   // connected
-    //   const id = info.id.toString()
-    //   if (id === this.id.toString()) return
-    //
-    //   const channel = connection.channelName
-    //   let channels = [channel]
-    //   let peer
-    //   if (connections.has(id)) {
-    //     const value = connections.get(id)
-    //     const _channels = value.channels
-    //     channels = [...channels, ..._channels]
-    //     peer = value.peer
-    //   } else {
-    //     peer = new PeernetPeer(id, connection)
-    //     pubsub.publish('peer:connected', peer)
-    //   }
-    //   connections.set(id, {channels, peer})
-    //   // connection.on('data', (data) => console.log({data}))
-    //   // connection.write('peerId')
-    // });
-    //
-    // this.sw.on('candidates-updated', async (channel, candidates) => {
-    //   // TODO: Channels ...
-    //   for (const candidate of candidates) {
-    //     const id = candidate.toString()
-    //     let channels = [channel]
-    //     if (id === this.id.toString()) return
-    //
-    //     if (!connections.has(id)) {
-    //       try {
-    //         const connection = await this.sw.connect(channel, candidate)
-    //         const peer = new PeernetPeer(id, connection)
-    //         connections.set(id, {channels, peer})
-    //         if (recentConnections.has(id)) {
-    //           setTimeout(() => {
-    //             pubsub.publish('peer:connected', peer)
-    //           }, 1000)
-    //         } else {
-    //           pubsub.publish('peer:connected', peer)
-    //         }
-    //       } catch (e) {
-    //         console.warn(e);
-    //       }
-    //     } else {
-    //       const value = connections.get(id)
-    //       const _channels = value.channels
-    //       channels = [...channels, ..._channels]
-    //       connections.set(id, {channels, peer: value.peer})
-    //     }
-    //   }
-    // })
-    //
-    // this.sw.on('connection-closed', (connection, info) => {
-    //   if (!recentConnections.has(info.id.toString())) {
-    //     recentConnections.set(info.id.toString(), new Date().getTime())
-    //   }
-    //   if (connections.has(info.id.toString())) connections.delete(info.id.toString())
-    // })
-    //
     if (globalThis.process) {
       process.on('SIGINT', async () => {
         console.log('Caught interrupt signal');
@@ -328,7 +264,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.8.6";
+var version = "0.8.10";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -1169,14 +1105,10 @@ class PeerDiscovery {
       const connections = peernet.peerMap.get(id);
       if (connections.indexOf(peer.id) === -1) {
         connections.push(peer.id);
-        peernet.peerMap.set(id, connections);
+        peernet.peerMap.set(from, connections);
       }
     }
-    return {peer, id}
-  }
-
-  async _cleanedUpIfNeeded() {
-
+    return id
   }
 
   async discoverHandler(message, peer) {
@@ -1535,8 +1467,14 @@ class Peernet {
      * @property {Object} peer Instance of Peer
      */
     this.dht = new DhtEarth();
+    /**
+     * @type {Map}
+     * @property {Object} peer Instance of Peer
+     */
     this.peerMap = new Map();
     this.stores = [];
+    this.storePrefix = options.storePrefix;
+    this.root = options.root;
 
     /**
      * proto Object containing protos
@@ -1563,7 +1501,6 @@ class Peernet {
 
     this._messageHandler = new MessageHandler(this.network);
 
-
     const {daemon, environment} = await target();
     this.hasDaemon = daemon;
 
@@ -1605,15 +1542,11 @@ class Peernet {
 
     pubsub.subscribe('peer:discovered', async (peer) => {
       this._peerHandler.discover(peer);
-
       peer.on('peernet.data', async (message) => {
         const id = message.id;
-        message = new peernet.protos['peernet-message'](Buffer.from(message.data.data));
-        console.log(message);
-        // message = new 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);
         if (fulldId && this._discovered.indexOf(peer.id) === -1) {
           this._discovered.push(peer.id);
@@ -1621,7 +1554,6 @@ class Peernet {
         }
       });
     });
-
     pubsub.subscribe('peer:disconnected', async (peer) => {
       let index = this._discovered.indexOf(peer.id);
       if (index !== -1) this._discovered.splice(index, 1);
@@ -1682,40 +1614,40 @@ class Peernet {
           this.peerMap.set(from, connections);
         }
       }
-      const data = new peernet.protos['peernet-peer-response']({id: this.id});
-      const node = await this.prepareMessage(peer.id, data.encoded);
+      const data = new PeerMessageResponse({id: this.id});
+      const node = await this.prepareMessage(from, data.encoded);
 
       peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
-    // } else if (proto.name === 'peernet-peer-response') {
-    //   const from = proto.decoded.id
-    //   if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-    //   else {
-    //     const connections = this.peerMap.get(from)
-    //     if (connections.indexOf(peer.id) === -1) {
-    //       connections.push(peer.id)
-    //       this.peerMap.set(from, connections)
-    //     }
-    //   }
+    } else if (proto.name === 'peernet-peer-response') {
+      const from = proto.decoded.id;
+      if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id]);
+      else {
+        const connections = this.peerMap.get(from);
+        if (connections.indexOf(peer.id) === -1) {
+          connections.push(peer.id);
+          this.peerMap.set(from, connections);
+        }
+      }
     } else {
-      const from = this._getPeerId(peer.id);
-      // if (!from) {
-      //   const data = new PeerMessage({id: this.id})
-      //   const node = await this.prepareMessage(peer.id, data.encoded)
-      //
-      //   let response = await peer.request(node.encoded)
-      //   response = protoFor(response)
-      //   response = new PeerMessageResponse(response.decoded.data)
-      //
-      //   from = response.decoded.id
-      //   if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-      //   else {
-      //     const connections = this.peerMap.get(from)
-      //     if (connections.indexOf(peer.id) === -1) {
-      //       connections.push(peer.id)
-      //       this.peerMap.set(from, connections)
-      //     }
-      //   }
-      // }
+      let from = this._getPeerId(peer.id);
+      if (!from) {
+        const data = new PeerMessage({id: this.id});
+        const node = await this.prepareMessage(peer.id, data.encoded);
+
+        let response = await peer.request(node.encoded);
+        response = protoFor(response);
+        response = new PeerMessageResponse(response.decoded.data);
+
+        from = response.decoded.id;
+        if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id]);
+        else {
+          const connections = this.peerMap.get(from);
+          if (connections.indexOf(peer.id) === -1) {
+            connections.push(peer.id);
+            this.peerMap.set(from, connections);
+          }
+        }
+      }
       if (proto.name === 'peernet-dht') {
         let { hash, store } = proto.decoded;
         let has;
@@ -1751,6 +1683,18 @@ class Peernet {
           const node = await this.prepareMessage(from, data.encoded);
           peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
         }
+      } else if (proto.name === 'peernet-peer') {
+        const from = proto.decoded.id;
+        if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id]);
+        else {
+          const connections = this.peerMap.get(from);
+          connections.push(peer.id);
+          this.peerMap.set(from, connections);
+        }
+        const data = new PeerMessage({id: this.id});
+        const node = await this.prepareMessage(from, data.encoded);
+
+        peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
       } else if (proto.name === 'peernet-request') {
         // TODO: make dynamic
         // exposeddevapi[proto.decoded.request](proto.decoded.params)

package/dist/module/peernet.js

@@ -69,10 +69,11 @@ globalThis.pubsub = globalThis.pubsub || new PubSub({verbose: false});
 class PeernetClient {
   constructor(options = {}) {
     if (!options.id) options.id = Buffer.from('00000000000000000000000000000000');
-
+    if (!options.networkVersion) options.networkVersion = 'v0.1.0';
+    if (!options.networkName) options.networkName = 'peernet';
     this.id = options.id;
 
-    this.topic = Buffer.from(sha256('peernet-v0.1.0').toString());
+    this.topic = Buffer.from(sha256(`${options.networkName}-${options.networkVersion}`).toString());
 
     const trackers = [
       'wss://star.leofcoin.org:7575',
@@ -94,71 +95,6 @@ class PeernetClient {
 
     this.p2p.start();
 
-
-    // this.sw.join(this.topic.slice(0, 32))
-    //
-    // const arrayOfPeers = this.sw.getPeers()
-    //
-    // this.sw.on('connection', async (connection, info) => {
-    //   // connected
-    //   const id = info.id.toString()
-    //   if (id === this.id.toString()) return
-    //
-    //   const channel = connection.channelName
-    //   let channels = [channel]
-    //   let peer
-    //   if (connections.has(id)) {
-    //     const value = connections.get(id)
-    //     const _channels = value.channels
-    //     channels = [...channels, ..._channels]
-    //     peer = value.peer
-    //   } else {
-    //     peer = new PeernetPeer(id, connection)
-    //     pubsub.publish('peer:connected', peer)
-    //   }
-    //   connections.set(id, {channels, peer})
-    //   // connection.on('data', (data) => console.log({data}))
-    //   // connection.write('peerId')
-    // });
-    //
-    // this.sw.on('candidates-updated', async (channel, candidates) => {
-    //   // TODO: Channels ...
-    //   for (const candidate of candidates) {
-    //     const id = candidate.toString()
-    //     let channels = [channel]
-    //     if (id === this.id.toString()) return
-    //
-    //     if (!connections.has(id)) {
-    //       try {
-    //         const connection = await this.sw.connect(channel, candidate)
-    //         const peer = new PeernetPeer(id, connection)
-    //         connections.set(id, {channels, peer})
-    //         if (recentConnections.has(id)) {
-    //           setTimeout(() => {
-    //             pubsub.publish('peer:connected', peer)
-    //           }, 1000)
-    //         } else {
-    //           pubsub.publish('peer:connected', peer)
-    //         }
-    //       } catch (e) {
-    //         console.warn(e);
-    //       }
-    //     } else {
-    //       const value = connections.get(id)
-    //       const _channels = value.channels
-    //       channels = [...channels, ..._channels]
-    //       connections.set(id, {channels, peer: value.peer})
-    //     }
-    //   }
-    // })
-    //
-    // this.sw.on('connection-closed', (connection, info) => {
-    //   if (!recentConnections.has(info.id.toString())) {
-    //     recentConnections.set(info.id.toString(), new Date().getTime())
-    //   }
-    //   if (connections.has(info.id.toString())) connections.delete(info.id.toString())
-    // })
-    //
     if (globalThis.process) {
       process.on('SIGINT', async () => {
         console.log('Caught interrupt signal');
@@ -308,7 +244,7 @@ class LeofcoinStorage$1 {
 
 }
 
-var version = "0.8.6";
+var version = "0.8.10";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -1712,14 +1648,10 @@ class PeerDiscovery {
       const connections = peernet.peerMap.get(id);
       if (connections.indexOf(peer.id) === -1) {
         connections.push(peer.id);
-        peernet.peerMap.set(id, connections);
+        peernet.peerMap.set(from, connections);
       }
     }
-    return {peer, id}
-  }
-
-  async _cleanedUpIfNeeded() {
-
+    return id
   }
 
   async discoverHandler(message, peer) {
@@ -2078,8 +2010,14 @@ class Peernet {
      * @property {Object} peer Instance of Peer
      */
     this.dht = new DhtEarth();
+    /**
+     * @type {Map}
+     * @property {Object} peer Instance of Peer
+     */
     this.peerMap = new Map();
     this.stores = [];
+    this.storePrefix = options.storePrefix;
+    this.root = options.root;
 
     /**
      * proto Object containing protos
@@ -2106,7 +2044,6 @@ class Peernet {
 
     this._messageHandler = new MessageHandler(this.network);
 
-
     const {daemon, environment} = await target();
     this.hasDaemon = daemon;
 
@@ -2148,15 +2085,11 @@ class Peernet {
 
     pubsub.subscribe('peer:discovered', async (peer) => {
       this._peerHandler.discover(peer);
-
       peer.on('peernet.data', async (message) => {
         const id = message.id;
-        message = new peernet.protos['peernet-message'](Buffer.from(message.data.data));
-        console.log(message);
-        // message = new 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);
         if (fulldId && this._discovered.indexOf(peer.id) === -1) {
           this._discovered.push(peer.id);
@@ -2164,7 +2097,6 @@ class Peernet {
         }
       });
     });
-
     pubsub.subscribe('peer:disconnected', async (peer) => {
       let index = this._discovered.indexOf(peer.id);
       if (index !== -1) this._discovered.splice(index, 1);
@@ -2225,40 +2157,40 @@ class Peernet {
           this.peerMap.set(from, connections);
         }
       }
-      const data = new peernet.protos['peernet-peer-response']({id: this.id});
-      const node = await this.prepareMessage(peer.id, data.encoded);
+      const data = new PeerMessageResponse({id: this.id});
+      const node = await this.prepareMessage(from, data.encoded);
 
       peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
-    // } else if (proto.name === 'peernet-peer-response') {
-    //   const from = proto.decoded.id
-    //   if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-    //   else {
-    //     const connections = this.peerMap.get(from)
-    //     if (connections.indexOf(peer.id) === -1) {
-    //       connections.push(peer.id)
-    //       this.peerMap.set(from, connections)
-    //     }
-    //   }
+    } else if (proto.name === 'peernet-peer-response') {
+      const from = proto.decoded.id;
+      if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id]);
+      else {
+        const connections = this.peerMap.get(from);
+        if (connections.indexOf(peer.id) === -1) {
+          connections.push(peer.id);
+          this.peerMap.set(from, connections);
+        }
+      }
     } else {
-      const from = this._getPeerId(peer.id);
-      // if (!from) {
-      //   const data = new PeerMessage({id: this.id})
-      //   const node = await this.prepareMessage(peer.id, data.encoded)
-      //
-      //   let response = await peer.request(node.encoded)
-      //   response = protoFor(response)
-      //   response = new PeerMessageResponse(response.decoded.data)
-      //
-      //   from = response.decoded.id
-      //   if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-      //   else {
-      //     const connections = this.peerMap.get(from)
-      //     if (connections.indexOf(peer.id) === -1) {
-      //       connections.push(peer.id)
-      //       this.peerMap.set(from, connections)
-      //     }
-      //   }
-      // }
+      let from = this._getPeerId(peer.id);
+      if (!from) {
+        const data = new PeerMessage({id: this.id});
+        const node = await this.prepareMessage(peer.id, data.encoded);
+
+        let response = await peer.request(node.encoded);
+        response = protoFor(response);
+        response = new PeerMessageResponse(response.decoded.data);
+
+        from = response.decoded.id;
+        if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id]);
+        else {
+          const connections = this.peerMap.get(from);
+          if (connections.indexOf(peer.id) === -1) {
+            connections.push(peer.id);
+            this.peerMap.set(from, connections);
+          }
+        }
+      }
       if (proto.name === 'peernet-dht') {
         let { hash, store } = proto.decoded;
         let has;
@@ -2294,6 +2226,18 @@ class Peernet {
           const node = await this.prepareMessage(from, data.encoded);
           peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
         }
+      } else if (proto.name === 'peernet-peer') {
+        const from = proto.decoded.id;
+        if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id]);
+        else {
+          const connections = this.peerMap.get(from);
+          connections.push(peer.id);
+          this.peerMap.set(from, connections);
+        }
+        const data = new PeerMessage({id: this.id});
+        const node = await this.prepareMessage(from, data.encoded);
+
+        peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
       } else if (proto.name === 'peernet-request') {
         // TODO: make dynamic
         // exposeddevapi[proto.decoded.request](proto.decoded.params)

package/package.json

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

package/test/index.js

@@ -1,4 +1,4 @@
 require('./messages')
 require('./codec')
-require('./peernet')
+// require('./peernet')
 // require('./hash')