trac-peer 0.1.21 → 0.1.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "type": "module",
   "dependencies": {
     "assert": "npm:bare-node-assert",
@@ -36,7 +36,6 @@
     "brittle": "3.0.0",
     "buffer": "npm:bare-node-buffer",
     "child_process": "npm:bare-node-child-process",
-    "compact-encoding": "^2.16.0",
     "console": "npm:bare-node-console",
     "corestore": "7.1.0",
     "crypto": "npm:bare-node-crypto",
@@ -60,7 +59,6 @@
     "path": "npm:bare-node-path",
     "pear-interface": "1.0.0",
     "process": "npm:bare-node-process",
-    "protomux": "^3.10.1",
     "protomux-wakeup": "^2.2.1",
     "readline": "npm:bare-node-readline",
     "ready-resource": "^1.0.0",

package/src/functions.js

@@ -283,14 +283,18 @@ 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 });
+        if(peer.base.writable){
+            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 });
+        if(peer.base.writable){
+            await peer.base.append({ op : 'append_writer', type: 'addWriter', key: ''+parsed.key, value: signature, hash: hash, nonce : nonce });
+        }
     }
 }
 

package/src/index.js

@@ -22,9 +22,6 @@ export {default as Contract} from "./contract.js";
 export {default as Feature} from "./feature.js";
 export {default as Wallet} from "./wallet.js";
 
-import Protomux from 'protomux';
-import * as c from 'compact-encoding';
-
 export class Peer extends ReadyResource {
 
     constructor(options = {}) {
@@ -59,6 +56,7 @@ export class Peer extends ReadyResource {
         this.check = new Check();
         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.seen_auto_add = {};
 
         this.tx_observer();
         this.nodeListener();
@@ -486,12 +484,14 @@ export class Peer extends ReadyResource {
             }
         });
         this.updater();
+        this.seenAutoAdd();
         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', {
                 op : 'auto-add-writer',
                 type : 'autoAddWriter',
-                key : this.writerLocalKey
+                key : this.writerLocalKey,
+                id : Math.random() + new Date.now()
             });
         }
     }
@@ -586,41 +586,23 @@ export class Peer extends ReadyResource {
 
     async _replicate() {
         if (!this.swarm) {
-            const keyPair = await this.store.createKeyPair('hyperswarm');
+
+            const keyPair = {
+                publicKey: b4a.from(this.wallet.publicKey, 'hex'),
+                secretKey: b4a.from(this.wallet.secretKey, 'hex')
+            };
+
             this.swarm = new Hyperswarm({ keyPair, bootstrap: this.dhtBootstrap });
 
             console.log(`Writer key: ${this.writerLocalKey}`)
 
             this.swarm.on('connection', async (connection, peerInfo) => {
-
                 const peerName = b4a.toString(connection.remotePublicKey, 'hex');
                 this.connectedPeers.add(peerName);
                 wakeup.addStream(connection);
                 this.store.replicate(connection);
                 this.connectedNodes++;
 
-                const mux = new Protomux(connection);
-
-                const cool = mux.createChannel({
-                    protocol: 'cool-protocol',
-                    id: this.tx_channel,
-                    onopen () {
-                        console.log('the other side opened this protocol!')
-                    },
-                    onclose () {
-                        console.log('either side closed the protocol')
-                    }
-                });
-
-                const one = cool.addMessage({
-                    encoding: c.string,
-                    onmessage (m) {
-                        console.log('recv message (1)', m)
-                    }
-                })
-
-                cool.open()
-
                 connection.on('close', () => {
                     this.connectedNodes--;
                     this.connectedPeers.delete(peerName);
@@ -631,18 +613,26 @@ export class Peer extends ReadyResource {
                 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);
+                        if(msg.op && msg.op === 'auto-add-writer' && this.base.localWriter.isActive &&
+                            this.writerLocalKey !== msg.key &&
+                            false === this.base.activeWriters.has(b4a.from(msg.key, 'hex')) &&
+                            this.seen_auto_add[msg.id] === undefined) {
+                            if(this.base.writable){
+                                await this.base.append(msg);
+                            } else {
+                                this.seen_auto_add[msg.id] = new Date.now();
+                                this.emit('announce', {
+                                    op : 'auto-add-writer',
+                                    type : 'autoAddWriter',
+                                    key : msg.key,
+                                    id : msg.id
+                                });
+                            }
                         }
                     } catch(e){ }
                 });
 
                 this.on('announce', async function(msg){
-                    one.send(JSON.stringify(msg))
                     await connection.write(JSON.stringify(msg))
                 });
 
@@ -658,6 +648,19 @@ export class Peer extends ReadyResource {
         }
     }
 
+    async seenAutoAdd(){
+        while(true){
+            const ts = Date.now();
+            for(let seen in this.seen_auto_add){
+                if(ts - this.seen_auto_add[seen] > 30_000){
+                    console.log('Wiping last seen', seen);
+                    delete this.seen_auto_add[seen];
+                }
+            }
+            await this.sleep(1000);
+        }
+    }
+
     nodeListener() {
         this.on('readyNode', async () => {
             if (!this.isStreaming) {