@leofcoin/peernet 0.8.7 → 0.8.11

package/coverage/lcov.info

@@ -0,0 +1,459 @@
+TN:
+SF:dist\commonjs\codec-format-interface.js
+FN:11,_interopDefaultLegacy
+FN:23,(anonymous_1)
+FN:49,(anonymous_2)
+FN:56,(anonymous_3)
+FN:65,(anonymous_4)
+FN:77,(anonymous_5)
+FN:87,(anonymous_6)
+FN:97,(anonymous_7)
+FN:105,(anonymous_8)
+FN:113,(anonymous_9)
+FN:121,(anonymous_10)
+FN:129,(anonymous_11)
+FN:137,(anonymous_12)
+FN:145,(anonymous_13)
+FNF:14
+FNH:9
+FNDA:3,_interopDefaultLegacy
+FNDA:3,(anonymous_1)
+FNDA:5,(anonymous_2)
+FNDA:5,(anonymous_3)
+FNDA:2,(anonymous_4)
+FNDA:1,(anonymous_5)
+FNDA:1,(anonymous_6)
+FNDA:0,(anonymous_7)
+FNDA:1,(anonymous_8)
+FNDA:0,(anonymous_9)
+FNDA:0,(anonymous_10)
+FNDA:0,(anonymous_11)
+FNDA:0,(anonymous_12)
+FNDA:1,(anonymous_13)
+DA:3,1
+DA:4,1
+DA:5,1
+DA:6,1
+DA:7,1
+DA:8,1
+DA:9,1
+DA:11,3
+DA:13,1
+DA:14,1
+DA:15,1
+DA:24,3
+DA:25,3
+DA:26,3
+DA:27,3
+DA:28,3
+DA:29,1
+DA:30,1
+DA:31,1
+DA:33,0
+DA:36,2
+DA:37,1
+DA:38,1
+DA:39,0
+DA:40,1
+DA:41,1
+DA:50,5
+DA:57,5
+DA:58,5
+DA:59,5
+DA:66,2
+DA:67,2
+DA:68,2
+DA:69,2
+DA:70,2
+DA:71,2
+DA:78,1
+DA:79,1
+DA:80,1
+DA:81,1
+DA:88,1
+DA:89,1
+DA:90,1
+DA:91,1
+DA:98,0
+DA:99,0
+DA:106,1
+DA:107,1
+DA:114,0
+DA:115,0
+DA:122,0
+DA:123,0
+DA:130,0
+DA:131,0
+DA:138,0
+DA:139,0
+DA:146,1
+DA:147,1
+DA:151,1
+LF:59
+LH:47
+BRDA:11,0,0,0
+BRDA:11,0,1,3
+BRDA:11,1,0,3
+BRDA:11,1,1,3
+BRDA:11,1,2,2
+BRDA:23,2,0,0
+BRDA:26,3,0,3
+BRDA:26,3,1,0
+BRDA:27,4,0,3
+BRDA:27,4,1,3
+BRDA:28,5,0,1
+BRDA:28,5,1,2
+BRDA:30,6,0,1
+BRDA:30,6,1,0
+BRDA:36,7,0,1
+BRDA:36,7,1,1
+BRDA:37,8,0,0
+BRDA:37,8,1,1
+BRDA:38,9,0,1
+BRDA:38,9,1,0
+BRDA:40,10,0,1
+BRDA:40,10,1,0
+BRDA:40,11,0,1
+BRDA:40,11,1,1
+BRDA:78,12,0,0
+BRDA:78,12,1,1
+BRDA:122,13,0,0
+BRDA:122,13,1,0
+BRDA:130,14,0,0
+BRDA:130,14,1,0
+BRDA:138,15,0,0
+BRDA:138,15,1,0
+BRF:32
+BRH:18
+end_of_record
+TN:
+SF:dist\commonjs\codec.js
+FN:8,_interopDefaultLegacy
+FN:91,(anonymous_1)
+FN:94,(anonymous_2)
+FN:118,(anonymous_3)
+FN:126,(anonymous_4)
+FN:131,(anonymous_5)
+FN:136,(anonymous_6)
+FN:141,(anonymous_7)
+FN:145,(anonymous_8)
+FN:146,(anonymous_9)
+FN:152,(anonymous_10)
+FN:156,(anonymous_11)
+FN:164,(anonymous_12)
+FN:172,(anonymous_13)
+FN:177,(anonymous_14)
+FN:182,(anonymous_15)
+FN:186,(anonymous_16)
+FN:192,(anonymous_17)
+FNF:18
+FNH:13
+FNDA:4,_interopDefaultLegacy
+FNDA:623,(anonymous_1)
+FNDA:20,(anonymous_2)
+FNDA:0,(anonymous_3)
+FNDA:2,(anonymous_4)
+FNDA:5,(anonymous_5)
+FNDA:0,(anonymous_6)
+FNDA:550,(anonymous_7)
+FNDA:35,(anonymous_8)
+FNDA:525,(anonymous_9)
+FNDA:25,(anonymous_10)
+FNDA:14,(anonymous_11)
+FNDA:11,(anonymous_12)
+FNDA:0,(anonymous_13)
+FNDA:0,(anonymous_14)
+FNDA:0,(anonymous_15)
+FNDA:14,(anonymous_16)
+FNDA:5,(anonymous_17)
+DA:3,1
+DA:4,1
+DA:5,1
+DA:6,1
+DA:8,4
+DA:10,1
+DA:11,1
+DA:12,1
+DA:13,1
+DA:15,1
+DA:92,623
+DA:95,20
+DA:96,20
+DA:97,7
+DA:98,7
+DA:100,7
+DA:101,7
+DA:102,7
+DA:103,7
+DA:105,0
+DA:108,20
+DA:109,13
+DA:110,7
+DA:111,5
+DA:112,0
+DA:114,20
+DA:119,0
+DA:120,0
+DA:121,0
+DA:122,0
+DA:123,0
+DA:127,2
+DA:128,2
+DA:132,5
+DA:133,5
+DA:137,0
+DA:138,0
+DA:142,550
+DA:146,35
+DA:147,525
+DA:148,490
+DA:153,25
+DA:157,14
+DA:158,14
+DA:160,14
+DA:161,14
+DA:165,11
+DA:166,11
+DA:167,11
+DA:168,11
+DA:169,11
+DA:173,0
+DA:174,0
+DA:178,0
+DA:179,0
+DA:183,0
+DA:187,14
+DA:188,14
+DA:189,14
+DA:193,5
+DA:194,5
+DA:195,5
+DA:199,1
+LF:63
+LH:49
+BRDA:8,0,0,0
+BRDA:8,0,1,4
+BRDA:8,1,0,4
+BRDA:8,1,1,4
+BRDA:8,1,2,3
+BRDA:95,2,0,20
+BRDA:95,2,1,0
+BRDA:96,3,0,7
+BRDA:96,3,1,13
+BRDA:100,4,0,7
+BRDA:100,4,1,0
+BRDA:108,5,0,13
+BRDA:108,5,1,7
+BRDA:109,6,0,6
+BRDA:109,6,1,7
+BRDA:110,7,0,2
+BRDA:110,7,1,5
+BRDA:111,8,0,5
+BRDA:111,8,1,0
+BRDA:114,9,0,0
+BRDA:114,9,1,20
+BRDA:114,10,0,0
+BRDA:114,10,1,0
+BRDA:147,11,0,35
+BRDA:147,11,1,490
+BRF:25
+BRH:18
+end_of_record
+TN:
+SF:dist\commonjs\dht-response.js
+FN:13,_interopDefaultLegacy
+FN:26,(anonymous_1)
+FN:30,(anonymous_2)
+FNF:3
+FNH:2
+FNDA:1,_interopDefaultLegacy
+FNDA:0,(anonymous_1)
+FNDA:3,(anonymous_2)
+DA:3,1
+DA:4,1
+DA:5,1
+DA:6,1
+DA:7,1
+DA:8,1
+DA:9,1
+DA:10,1
+DA:11,1
+DA:13,1
+DA:15,1
+DA:17,1
+DA:27,0
+DA:31,3
+DA:32,3
+DA:36,1
+LF:16
+LH:15
+BRDA:13,0,0,0
+BRDA:13,0,1,1
+BRDA:13,1,0,1
+BRDA:13,1,1,1
+BRDA:13,1,2,0
+BRF:5
+BRH:3
+end_of_record
+TN:
+SF:dist\commonjs\hash.js
+FN:10,_interopDefaultLegacy
+FN:19,(anonymous_1)
+FN:44,(anonymous_2)
+FN:48,(anonymous_3)
+FN:52,(anonymous_4)
+FN:56,(anonymous_5)
+FN:60,(anonymous_6)
+FN:64,(anonymous_7)
+FN:68,(anonymous_8)
+FN:72,(anonymous_9)
+FN:76,(anonymous_10)
+FN:80,(anonymous_11)
+FN:84,(anonymous_12)
+FN:88,(anonymous_13)
+FN:111,(anonymous_14)
+FN:127,(anonymous_15)
+FNF:16
+FNH:7
+FNDA:5,_interopDefaultLegacy
+FNDA:5,(anonymous_1)
+FNDA:5,(anonymous_2)
+FNDA:5,(anonymous_3)
+FNDA:0,(anonymous_4)
+FNDA:0,(anonymous_5)
+FNDA:0,(anonymous_6)
+FNDA:5,(anonymous_7)
+FNDA:5,(anonymous_8)
+FNDA:0,(anonymous_9)
+FNDA:0,(anonymous_10)
+FNDA:0,(anonymous_11)
+FNDA:0,(anonymous_12)
+FNDA:5,(anonymous_13)
+FNDA:0,(anonymous_14)
+FNDA:0,(anonymous_15)
+DA:3,1
+DA:4,1
+DA:5,1
+DA:6,1
+DA:7,1
+DA:8,1
+DA:10,5
+DA:12,1
+DA:13,1
+DA:14,1
+DA:15,1
+DA:16,1
+DA:20,5
+DA:21,0
+DA:22,5
+DA:23,5
+DA:24,5
+DA:25,0
+DA:26,0
+DA:28,0
+DA:29,0
+DA:30,0
+DA:32,0
+DA:36,5
+DA:37,0
+DA:38,0
+DA:39,0
+DA:40,5
+DA:45,5
+DA:49,5
+DA:53,0
+DA:57,0
+DA:61,0
+DA:65,5
+DA:69,5
+DA:73,0
+DA:77,0
+DA:81,0
+DA:85,0
+DA:89,5
+DA:90,5
+DA:91,5
+DA:92,5
+DA:93,5
+DA:94,5
+DA:95,0
+DA:96,0
+DA:98,5
+DA:99,5
+DA:101,5
+DA:102,5
+DA:103,5
+DA:108,5
+DA:112,0
+DA:113,0
+DA:114,0
+DA:115,0
+DA:117,0
+DA:120,0
+DA:121,0
+DA:122,0
+DA:124,0
+DA:128,0
+DA:129,0
+DA:131,0
+DA:133,0
+DA:134,0
+DA:135,0
+DA:136,0
+DA:137,0
+DA:142,0
+DA:145,0
+DA:147,0
+DA:157,1
+LF:74
+LH:35
+BRDA:10,0,0,0
+BRDA:10,0,1,5
+BRDA:10,1,0,5
+BRDA:10,1,1,5
+BRDA:10,1,2,3
+BRDA:19,2,0,0
+BRDA:20,3,0,5
+BRDA:20,3,1,0
+BRDA:22,4,0,0
+BRDA:22,4,1,5
+BRDA:23,5,0,5
+BRDA:23,5,1,0
+BRDA:24,6,0,0
+BRDA:24,6,1,5
+BRDA:28,7,0,0
+BRDA:28,7,1,0
+BRDA:36,8,0,0
+BRDA:36,8,1,5
+BRDA:37,9,0,0
+BRDA:37,9,1,0
+BRDA:38,10,0,0
+BRDA:38,10,1,0
+BRDA:40,11,0,5
+BRDA:40,11,1,0
+BRDA:84,12,0,0
+BRDA:89,13,0,0
+BRDA:89,13,1,5
+BRDA:89,14,0,5
+BRDA:89,14,1,0
+BRDA:90,15,0,0
+BRDA:90,15,1,5
+BRDA:94,16,0,0
+BRDA:94,16,1,5
+BRDA:112,17,0,0
+BRDA:112,17,1,0
+BRDA:114,18,0,0
+BRDA:114,18,1,0
+BRDA:120,19,0,0
+BRDA:120,19,1,0
+BRDA:121,20,0,0
+BRDA:121,20,1,0
+BRDA:122,21,0,0
+BRDA:122,21,1,0
+BRDA:124,22,0,0
+BRDA:124,22,1,0
+BRDA:136,23,0,0
+BRDA:136,23,1,0
+BRF:47
+BRH:14
+end_of_record

package/dist/browser/peernet.js

@@ -86,10 +86,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',
@@ -111,71 +112,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');
@@ -325,7 +261,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}),
@@ -1729,14 +1665,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) {
@@ -2095,8 +2027,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
@@ -2123,7 +2061,6 @@ class Peernet {
 
     this._messageHandler = new MessageHandler(this.network);
 
-
     const {daemon, environment} = await target();
     this.hasDaemon = daemon;
 
@@ -2165,15 +2102,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);
@@ -2181,7 +2114,6 @@ class Peernet {
         }
       });
     });
-
     pubsub.subscribe('peer:disconnected', async (peer) => {
       let index = this._discovered.indexOf(peer.id);
       if (index !== -1) this._discovered.splice(index, 1);
@@ -2242,40 +2174,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;
@@ -2311,6 +2243,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)