cli: peer names

* peer: finish porting to new pripub API

lib/vock/cli/main.js

@@ -105,6 +105,7 @@ Cli.prototype.prompt = function _prompt(query, callback) {
     self.logger.resume();
     process.stdin.resume();
     process.stdin.setRawMode(true);
+
     listeners.forEach(function(listener) {
       process.stdin.addListener('keypress', listener);
     });
@@ -147,16 +148,34 @@ Cli.prototype.onServerAddr = function onServerAddr(address, port) {
   });
 
   this.instance.on('authorize', function(fingerprint, callback) {
-    var property = {
-      name: 'authorized',
-      message: 'Accept ' + fingerprint + '?',
-      validatior: /y[es]*|n[o]?/,
-      warning: 'Must respond yes or no',
-      default: 'no'
-    };
+    var name = nconf.get('peers:' + fingerprint),
+        property = {
+          name: 'authorized',
+          message: 'Accept ' + (name || 'unknown') + '(' + fingerprint + ')?',
+          validatior: /y[es]*|n[o]?/,
+          warning: 'Must respond yes or no',
+          default: 'no'
+        };
 
     self.prompt(property, function(result) {
-      callback(/y[es]*/.test(result.authorized));
+      var ok = /y[es]*/.test(result.authorized);
+
+      callback(ok);
+
+      // Skip one tick to restore all keyboard watchers
+      process.nextTick(function() {
+        // Ask for peer's name
+        if (ok && !name) {
+          var property = {
+            name: 'name',
+            message: 'Enter peer\'s name (' + fingerprint + '): '
+          };
+          self.prompt(property, function(result) {
+            nconf.set('peers:' + fingerprint, result.name);
+            nconf.save();
+          });
+        }
+      });
     });
   });
 
@@ -185,8 +204,10 @@ Cli.prototype.onServerAddr = function onServerAddr(address, port) {
   });
 
   this.instance.on('peer:text', function (fingerprint, text) {
-    self.notify(fingerprint + ': ' + text);
-    self.logger.write((fingerprint + ' says: ').green + text);
+    var name = nconf.get('peers:' + fingerprint) || fingerprint;
+
+    self.notify(name + ': ' + text);
+    self.logger.write((name + ' says: ').green + text);
   });
 
   this.instance.on('nat:traversal', function (how, port) {

lib/vock/instance.js

@@ -168,8 +168,8 @@ Instance.prototype.getPeer = function getPeer(info) {
 
   // Handle peer errors
   peer.on('error', function(e) {
-    self.emit(e);
-    peer.emit('close');
+    peer.emit('close', 'error');
+    self.emit('error', e);
   });
 
   peer.once('connect', function() {

lib/vock/peer.js

@@ -24,6 +24,8 @@ function Peer(options) {
 
   var self = this;
 
+  this.options = options;
+
   // Protocol configurations
   this.version = [0,1];
   this.seqs = {};
@@ -57,9 +59,14 @@ function Peer(options) {
   // Load private key
   this.state = 'init';
   this.pripub.init(function(err) {
-    if (err) throw err;
+    if (err) return self.emit('error', err);
+
     self.state = 'idle';
+    self._initQueue.forEach(function(callback) {
+      callback.call(self);
+    });
   });
+  this._initQueue = [];
 };
 util.inherits(Peer, EventEmitter);
 
@@ -282,16 +289,20 @@ Peer.prototype.handleHello = function handleHello(packet) {
 
     if (!ok) return;
 
-    self.fingerprint = fingerprint;
-    self.write('handshake', {
-      type: 'acpt',
-      dh: new Buffer(
-        pripub.create({ pub: packet.public }).encrypt(self.dh.getPublicKey()),
-        'binary'
-      )
-    });
+    pripub.create({
+      pub: packet.public,
+      password: self.options.password
+    }).init(function(err, p) {
+      if (err) return self.emit('error', err);
+
+      self.fingerprint = fingerprint;
+      self.write('handshake', {
+        type: 'acpt',
+        dh: new Buffer(p.encrypt(self.dh.getPublicKey()), 'binary')
+      });
 
-    if (!self.connecting) self.connect(self.roomId);
+      if (!self.connecting) self.connect(self.roomId);
+    });
   });
 
   var interval = setInterval(function() {
@@ -398,6 +409,12 @@ Peer.prototype.close = function close() {
 // Connect to opponent
 //
 Peer.prototype.connect = function connect(id, callback) {
+  if (this.state === 'init') {
+    this._initQueue.push(function() {
+      this.connect(id, callback);
+    });
+    return;
+  }
   if (this.connecting) return;
 
   var self = this,