trac-peer 0.1.52 → 0.1.53

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "type": "module",
   "dependencies": {
     "assert": "npm:bare-node-assert",
@@ -69,7 +69,7 @@
     "stream": "npm:bare-node-stream",
     "timers": "npm:bare-node-timers",
     "tls": "npm:bare-node-tls",
-    "trac-wallet": "^0.0.42",
+    "trac-wallet": "^0.0.43",
     "tty": "npm:bare-node-tty",
     "url": "npm:bare-node-url",
     "util": "npm:bare-node-util",

package/src/index.js

@@ -59,6 +59,7 @@ export class Peer extends ReadyResource {
         this.validator = null;
         this.validator_stream = null;
         this.readline_instance = null;
+        this.myInvite = null;
         this.enable_interactive_mode = options.enable_interactive_mode !== false;
         if(this.enable_interactive_mode !== false){
             try{
@@ -585,35 +586,6 @@ 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'){
-            await this.pairBlind();
-        }
-    }
-
-    async pairBlind(){
-        const { invite, publicKey, discoveryKey } = BlindPairing.createInvite(b4a.from(this.writerLocalKey, 'hex'));
-        const _this = this;
-
-        const member = this.invite.addMember({
-            discoveryKey,
-            async onadd (candidate) {
-                candidate.open(publicKey)
-                candidate.confirm({ key: b4a.from(_this.writerLocalKey, 'hex') })
-                await _this.base.append({ type: 'autoAddWriter', key: _this.writerLocalKey });
-            }
-        })
-
-        await member.flushed();
-
-        const adding = this.invite.addCandidate({
-            invite: invite,
-            userData : b4a.from(_this.writerLocalKey, 'hex'),
-            async onadd (result) { }
-        })
-
-        await adding.pairing;
-        console.log('Writer added.');
     }
 
     async initContract(){
@@ -775,6 +747,8 @@ export class Peer extends ReadyResource {
     async _replicate() {
         if (!this.swarm) {
 
+            const _this = this;
+
             const keyPair = {
                 publicKey: b4a.from(this.wallet.publicKey, 'hex'),
                 secretKey: b4a.from(this.wallet.secretKey, 'hex')
@@ -787,15 +761,16 @@ export class Peer extends ReadyResource {
             console.log(`Writer key: ${this.writerLocalKey}`)
 
             this.swarm.on('connection', async (connection, peerInfo) => {
-                const peerName = b4a.toString(connection.remotePublicKey, 'hex');
-                this.connectedPeers.add(peerName);
+                const remotePublicKey = b4a.toString(connection.remotePublicKey, 'hex');
+
+                this.connectedPeers.add(remotePublicKey);
                 wakeup.addStream(connection);
                 this.store.replicate(connection);
                 this.connectedNodes++;
 
                 connection.on('close', () => {
                     this.connectedNodes--;
-                    this.connectedPeers.delete(peerName);
+                    this.connectedPeers.delete(remotePublicKey);
                 });
 
                 connection.on('error', (error) => { });
@@ -803,6 +778,60 @@ export class Peer extends ReadyResource {
                 if (!this.isStreaming) {
                     this.emit('readyNode');
                 }
+
+                if(this.base.writable){
+                    const auto_add_writers = await this.base.view.get('auto_add_writers');
+                    if(auto_add_writers.value === 'on'){
+                        try{
+                            const { invite, publicKey, discoveryKey } = BlindPairing.createInvite(b4a.from(this.writerLocalKey, 'hex'));
+                            connection.send(
+                                b4a.from(jsonStringify({
+                                    invite : b4a.toString(invite, 'hex'),
+                                    publicKey : b4a.toString(publicKey, 'hex'),
+                                    discoveryKey : b4a.toString(discoveryKey, 'hex')
+                                })));
+                        }catch(e){}
+                    }
+                }
+
+                connection.on('message', async (msg) => {
+                    try{
+                        const parsed = jsonParse(b4a.toString(msg));
+                        if(false === this.base.writable && this.myInvite === null && parsed.invite !== undefined){
+                            this.myInvite = parsed.invite
+                            connection.send(b4a.from(jsonStringify({
+                                inviteMyKey : this.writerLocalKey,
+                                publicKey : parsed.publicKey,
+                                discoveryKey : parsed.discoveryKey
+                            })));
+                            try{
+                                const adding = _this.invite.addCandidate({
+                                    invite: b4a.from(parsed.invite, 'hex'),
+                                    userData : b4a.from(_this.writerLocalKey, 'hex'),
+                                    async onadd (result) { }
+                                })
+                                await adding.pairing;
+                                this.myInvite = null
+                                console.log('paired')
+                            }catch(e){}
+                        } else if(true === this.base.writable && parsed.inviteMyKey !== undefined){
+                            const member = _this.invite.addMember({
+                                discoveryKey : b4a.from(parsed.discoveryKey, 'hex'),
+                                async onadd (candidate) {
+                                    try{
+                                        candidate.open(b4a.from(parsed.publicKey, 'hex'))
+                                        candidate.confirm({ key: b4a.from(parsed.inviteMyKey, 'hex') })
+                                        await _this.base.append({
+                                            type : 'autoAddWriter',
+                                            key : parsed.inviteMyKey
+                                        });
+                                    }catch(e){}
+                                }
+                            })
+                            await member.flushed();
+                        }
+                    }catch(e){}
+                });
             });
 
             this.swarm.join(this.channel, { server: true, client: true });