trac-peer 0.1.19 → 0.1.20

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "type": "module",
   "dependencies": {
     "assert": "npm:bare-node-assert",

package/src/functions.js

@@ -283,14 +283,14 @@ export async function addWriter(input, peer){
             msg: msg
         };
         const hash = peer.wallet.sign(JSON.stringify(msg) + nonce);
-        peer.emit('announce', { op : 'append_writer', type: 'addIndexer', key: parsed.key, value: signature, hash: hash, nonce: nonce });
+        await peer.base.append({ op : 'append_writer', type: 'addIndexer', key: parsed.key, value: signature, hash: hash, nonce: nonce });
     } else if(splitted[0] === '/add_writer') {
         const msg = { type: 'addWriter', key: ''+parsed.key }
         const signature = {
             msg: msg
         };
         const hash = peer.wallet.sign(JSON.stringify(msg) + nonce);
-        peer.emit('announce', { op : 'append_writer', type: 'addWriter', key: ''+parsed.key, value: signature, hash: hash, nonce : nonce });
+        await peer.base.append({ op : 'append_writer', type: 'addWriter', key: ''+parsed.key, value: signature, hash: hash, nonce : nonce });
     }
 }
 

package/src/index.js

@@ -54,7 +54,8 @@ export class Peer extends ReadyResource {
         this.connectedPeers = new Set();
         this.options = options;
         this.check = new Check();
-        this.dhtNode = new DHT();
+        this.dhtBootstrap = ['116.202.214.143:10001','116.202.214.149:10001', 'node1.hyperdht.org:49737', 'node2.hyperdht.org:49737', 'node3.hyperdht.org:49737'];
+        this.dhtNode = new DHT({ bootstrap: this.dhtBootstrap });
 
         this.tx_observer();
         this.nodeListener();
@@ -432,11 +433,11 @@ export class Peer extends ReadyResource {
         const stream = this.dhtNode.connect(b4a.from(_msg.wp, 'hex'))
         stream.on('connect', async function () {
             await stream.send(b4a.from(jsonStringify(_msg)));
+            await stream.destroy();
         });
         stream.on('open', function () { });
         stream.on('close', () => { });
         stream.on('error', (error) => { });
-        //await stream.destroy();
     }
 
     async getValidatorWriterKey(address){
@@ -462,7 +463,7 @@ export class Peer extends ReadyResource {
             await this.sleep(5);
             i += 1;
         }
-        //await stream.destroy();
+        await stream.destroy();
         return writer_key;
     }
 
@@ -484,7 +485,7 @@ export class Peer extends ReadyResource {
         this.updater();
         const auto_add_writers = await this.base.view.get('auto_add_writers');
         if(!this.base.writable && null !== auto_add_writers && auto_add_writers.value === 'on'){
-            this.emit('announce', {
+            await this.base.append({
                 op : 'auto-add-writer',
                 type : 'autoAddWriter',
                 key : this.writerLocalKey
@@ -583,7 +584,7 @@ export class Peer extends ReadyResource {
     async _replicate() {
         if (!this.swarm) {
             const keyPair = await this.store.createKeyPair('hyperswarm');
-            this.swarm = new Hyperswarm({ keyPair });
+            this.swarm = new Hyperswarm({ keyPair, bootstrap: this.dhtBootstrap });
 
             console.log(`Writer key: ${this.writerLocalKey}`)
 
@@ -601,23 +602,6 @@ export class Peer extends ReadyResource {
 
                 connection.on('error', (error) => { });
 
-                connection.on('data', async (msg) => {
-                    try{
-                        msg = JSON.parse(msg);
-                        if(msg.op && msg.op === 'append_writer' && this.base.localWriter.isActive &&
-                            this.writerLocalKey !== msg.key) {
-                            await this.base.append(msg);
-                        } else if(msg.op && msg.op === 'auto-add-writer' && this.base.localWriter.isActive &&
-                            this.writerLocalKey !== msg.key) {
-                            await this.base.append(msg);
-                        }
-                    } catch(e){ }
-                });
-
-                this.on('announce', async function(msg){
-                    await connection.write(JSON.stringify(msg))
-                });
-
                 if (!this.isStreaming) {
                     this.emit('readyNode');
                 }