Support callback style

src/js/ripple/remote.js

@@ -37,23 +37,27 @@ var sjcl          = require('../../../build/sjcl');
 //  'remoteError'
 //  'remoteUnexpected'
 //  'remoteDisconnected'
-var Request = function (remote, command) {
+var Request = function(remote, command, callback) {
   EventEmitter.call(this);
 
   var self  = this;
 
   this.remote     = remote;
+
   this.requested  = false;
+
   this.message    = {
     'command':  command,
     'id':       void(0)
   };
+
+  this.callback(callback);
 };
 
 util.inherits(Request, EventEmitter);
 
 // Send the request to a remote.
-Request.prototype.request = function (remote) {
+Request.prototype.request = function(remote) {
   if (!this.requested) {
     this.requested  = true;
     this.remote.request(this);
@@ -61,7 +65,16 @@ Request.prototype.request = function (remote) {
   }
 };
 
-Request.prototype.build_path = function (build) {
+Request.prototype.callback = function(callback, successEvent) {
+  if (typeof callback === 'function') {
+    this.once('error', callback);
+    this.once(successEvent || 'success', callback.bind(this, null));
+    this.request();
+  }
+  return this;
+};
+
+Request.prototype.build_path = function(build) {
   if (build) {
     this.message.build_path = true;
   }
@@ -69,7 +82,7 @@ Request.prototype.build_path = function (build) {
   return this;
 };
 
-Request.prototype.ledger_choose = function (current) {
+Request.prototype.ledger_choose = function(current) {
   if (current) {
     this.message.ledger_index = this.remote._ledger_current_index;
   } else {
@@ -82,7 +95,7 @@ Request.prototype.ledger_choose = function (current) {
 // Set the ledger for a request.
 // - ledger_entry
 // - transaction_entry
-Request.prototype.ledger_hash = function (h) {
+Request.prototype.ledger_hash = function(h) {
   this.message.ledger_hash  = h;
 
   return this;
@@ -90,13 +103,13 @@ Request.prototype.ledger_hash = function (h) {
 
 // Set the ledger_index for a request.
 // - ledger_entry
-Request.prototype.ledger_index = function (ledger_index) {
+Request.prototype.ledger_index = function(ledger_index) {
   this.message.ledger_index  = ledger_index;
 
   return this;
 };
 
-Request.prototype.ledger_select = function (ledger_spec) {
+Request.prototype.ledger_select = function(ledger_spec) {
   switch (ledger_spec) {
     case 'current':
     case 'closed':
@@ -115,13 +128,13 @@ Request.prototype.ledger_select = function (ledger_spec) {
   return this;
 };
 
-Request.prototype.account_root = function (account) {
+Request.prototype.account_root = function(account) {
   this.message.account_root  = UInt160.json_rewrite(account);
 
   return this;
 };
 
-Request.prototype.index = function (hash) {
+Request.prototype.index = function(hash) {
   this.message.index  = hash;
 
   return this;
@@ -130,7 +143,7 @@ Request.prototype.index = function (hash) {
 // Provide the information id an offer.
 // --> account
 // --> seq : sequence number of transaction creating offer (integer)
-Request.prototype.offer_id = function (account, seq) {
+Request.prototype.offer_id = function(account, seq) {
   this.message.offer = {
     'account':  UInt160.json_rewrite(account),
     'seq':      seq
@@ -140,13 +153,13 @@ Request.prototype.offer_id = function (account, seq) {
 };
 
 // --> index : ledger entry index.
-Request.prototype.offer_index = function (index) {
+Request.prototype.offer_index = function(index) {
   this.message.offer  = index;
 
   return this;
 };
 
-Request.prototype.secret = function (s) {
+Request.prototype.secret = function(s) {
   if (s) {
     this.message.secret  = s;
   }
@@ -154,25 +167,25 @@ Request.prototype.secret = function (s) {
   return this;
 };
 
-Request.prototype.tx_hash = function (h) {
+Request.prototype.tx_hash = function(h) {
   this.message.tx_hash  = h;
 
   return this;
 };
 
-Request.prototype.tx_json = function (j) {
+Request.prototype.tx_json = function(j) {
   this.message.tx_json  = j;
 
   return this;
 };
 
-Request.prototype.tx_blob = function (j) {
+Request.prototype.tx_blob = function(j) {
   this.message.tx_blob  = j;
 
   return this;
 };
 
-Request.prototype.ripple_state = function (account, issuer, currency) {
+Request.prototype.ripple_state = function(account, issuer, currency) {
   this.message.ripple_state  = {
     'accounts' : [
       UInt160.json_rewrite(account),
@@ -184,7 +197,7 @@ Request.prototype.ripple_state = function (account, issuer, currency) {
   return this;
 };
 
-Request.prototype.accounts = function (accounts, realtime) {
+Request.prototype.accounts = function(accounts, realtime) {
   if (!Array.isArray(accounts)) {
     accounts = [ accounts ];
   }
@@ -203,11 +216,11 @@ Request.prototype.accounts = function (accounts, realtime) {
   return this;
 };
 
-Request.prototype.rt_accounts = function (accounts) {
+Request.prototype.rt_accounts = function(accounts) {
   return this.accounts(accounts, true);
 };
 
-Request.prototype.books = function (books, snapshot) {
+Request.prototype.books = function(books, snapshot) {
   var procBooks = [];
 
   for (var i = 0, l = books.length; i < l; i++) {
@@ -275,7 +288,7 @@ Request.prototype.books = function (books, snapshot) {
     @param trace
 */
 
-var Remote = function (opts, trace) {
+var Remote = function(opts, trace) {
   EventEmitter.call(this);
 
   var self  = this;
@@ -374,7 +387,7 @@ var Remote = function (opts, trace) {
     });
   }
 
-  this.on('newListener', function (type, listener) {
+  this.on('newListener', function(type, listener) {
     if ('transaction_all' === type) {
       if (!self._transaction_subs && self._online_state === 'open') {
         self.request_subscribe('transactions').request();
@@ -383,7 +396,7 @@ var Remote = function (opts, trace) {
     }
   });
 
-  this.on('removeListener', function (type, listener) {
+  this.on('removeListener', function(type, listener) {
     if ('transaction_all' === type) {
       self._transaction_subs -= 1;
       if (!self._transaction_subs && self._online_state === 'open') {
@@ -405,7 +418,7 @@ Remote.flags = {
   }
 };
 
-Remote.from_config = function (obj, trace) {
+Remote.from_config = function(obj, trace) {
   var serverConfig = typeof obj === 'string' ? config.servers[obj] : obj;
 
   var remote = new Remote(serverConfig, trace);
@@ -425,15 +438,15 @@ Remote.from_config = function (obj, trace) {
   return remote;
 };
 
-var isTemMalformed  = function (engine_result_code) {
+var isTemMalformed  = function(engine_result_code) {
   return (engine_result_code >= -299 && engine_result_code <  199);
 };
 
-var isTefFailure = function (engine_result_code) {
+var isTefFailure = function(engine_result_code) {
   return (engine_result_code >= -299 && engine_result_code <  199);
 };
 
-Remote.prototype.add_server = function (opts) {
+Remote.prototype.add_server = function(opts) {
   var self = this;
 
   var url    = (opts.secure || opts.websocket_ssl ? 'wss://' : 'ws://')
@@ -446,11 +459,11 @@ Remote.prototype.add_server = function (opts) {
     server.setMaxListeners(opts.maxListeners);
   }
 
-  server.on('message', function (data) {
+  server.on('message', function(data) {
     self._handle_message(data);
   });
 
-  server.on('connect', function () {
+  server.on('connect', function() {
     if (opts.primary || !self._primary_server) {
       self._set_primary_server(server);
     }
@@ -458,7 +471,7 @@ Remote.prototype.add_server = function (opts) {
     self._set_state('online');
   });
 
-  server.on('disconnect', function () {
+  server.on('disconnect', function() {
     self._connection_count--;
     if (!self._connection_count) {
       self._set_state('offline');
@@ -471,12 +484,12 @@ Remote.prototype.add_server = function (opts) {
 };
 
 // Inform remote that the remote server is not comming back.
-Remote.prototype.server_fatal = function () {
+Remote.prototype.server_fatal = function() {
   this._server_fatal = true;
 };
 
 // Set the emitted state: 'online' or 'offline'
-Remote.prototype._set_state = function (state) {
+Remote.prototype._set_state = function(state) {
   if (this.trace) console.log('remote: set_state: %s', state);
 
   if (this.state !== state) {
@@ -500,7 +513,7 @@ Remote.prototype._set_state = function (state) {
   }
 };
 
-Remote.prototype.set_trace = function (trace) {
+Remote.prototype.set_trace = function(trace) {
   this.trace  = undefined === trace || trace;
 
   return this;
@@ -509,28 +522,27 @@ Remote.prototype.set_trace = function (trace) {
 /**
  * Connect to the Ripple network.
  */
-Remote.prototype.connect = function (online) {
+Remote.prototype.connect = function(online) {
   // Downwards compatibility
   if (typeof online !== 'undefined' && !online) {
-    return this.disconnect();
-  }
-
-  if (!this._servers.length) {
-    throw new Error('No servers available.');
+    this.disconnect();
   } else {
-    for (var i = 0, l = this._servers.length; i < l; i++) {
-      this._servers[i].connect();
+    if (!this._servers.length) {
+      throw new Error('No servers available.');
+    } else {
+      for (var i=0, l=this._servers.length; i<l; i++) {
+        this._servers[i].connect();
+      }
     }
   }
-
   return this;
 };
 
 /**
  * Disconnect from the Ripple network.
  */
-Remote.prototype.disconnect = function (online) {
-  for (var i = 0, l = this._servers.length; i < l; i++) {
+Remote.prototype.disconnect = function(online) {
+  for (var i=0, l=this._servers.length; i<l; i++) {
     this._servers[i].disconnect();
   }
 
@@ -539,12 +551,12 @@ Remote.prototype.disconnect = function (online) {
   return this;
 };
 
-Remote.prototype.ledger_hash = function () {
+Remote.prototype.ledger_hash = function() {
   return this._ledger_hash;
 };
 
 // It is possible for messages to be dispatched after the connection is closed.
-Remote.prototype._handle_message = function (json) {
+Remote.prototype._handle_message = function(json) {
   var self        = this;
   var unexpected  = false;
   var request, message;
@@ -555,9 +567,11 @@ Remote.prototype._handle_message = function (json) {
     unexpected = true;
   }
 
-  if (typeof message !== 'object') {
+  if (typeof message !== 'object' || typeof message.type !== 'string') {
     unexpected  = true;
-  } else {
+  } 
+
+  if (!unexpected) {
     switch (message.type) {
       case 'response':
         // Handled by the server that sent the request
@@ -569,9 +583,9 @@ Remote.prototype._handle_message = function (json) {
         // XXX Be more defensive fields could be missing or of wrong type.
         // YYY Might want to do some cache management.
 
-        this._ledger_time           = message.ledger_time;
-        this._ledger_hash           = message.ledger_hash;
-        this._ledger_current_index  = message.ledger_index + 1;
+        this._ledger_time          = message.ledger_time;
+        this._ledger_hash          = message.ledger_hash;
+        this._ledger_current_index = message.ledger_index + 1;
 
         this.emit('ledger_closed', message);
         break;
@@ -593,14 +607,14 @@ Remote.prototype._handle_message = function (json) {
 
         // Pass the event on to any related Account objects
         var affected = message.mmeta.getAffectedAccounts();
-        for (var i = 0, l = affected.length; i < l; i++) {
+        for (var i=0, l=affected.length; i<l; i++) {
           var account = self._accounts[affected[i]];
           if (account) account.notifyTx(message);
         }
 
         // Pass the event on to any related OrderBooks
         affected = message.mmeta.getAffectedBooks();
-        for (i = 0, l = affected.length; i < l; i++) {
+        for (i=0, l=affected.length; i<l; i++) {
           var book = self._books[affected[i]];
           if (book) book.notifyTx(message);
         }
@@ -612,18 +626,24 @@ Remote.prototype._handle_message = function (json) {
       // XXX Should be tracked by the Server object
       case 'serverStatus':
         if ('load_base' in message && 'load_factor' in message &&
-            (message.load_base !== self._load_base || message.load_factor != self._load_factor))
+            (message.load_base !== self._load_base)  ||
+            (message.load_factor != self._load_factor))
         {
           self._load_base     = message.load_base;
           self._load_factor   = message.load_factor;
 
-          self.emit('load', { 'load_base' : self._load_base, 'load_factor' : self.load_factor });
+          self.emit('load', {
+            'load_base' :    self._load_base,
+            'load_factor' :  self.load_factor
+          });
         }
         break;
 
       // All other messages
       default:
-        if (this.trace) utils.logObject('remote: ' + message.type+': %s', message);
+        if (this.trace) {
+          utils.logObject('remote: ' + message.type+': %s', message);
+        }
         this.emit('net_' + message.type, message);
         break;
     }
@@ -640,7 +660,7 @@ Remote.prototype._handle_message = function (json) {
   }
 };
 
-Remote.prototype._set_primary_server = function (server) {
+Remote.prototype._set_primary_server = function(server) {
   if (this._primary_server) {
     this._primary_server._primary = false;
   }
@@ -648,11 +668,11 @@ Remote.prototype._set_primary_server = function (server) {
   this._primary_server._primary   = true;
 };
 
-Remote.prototype._server_is_available  = function (server) {
+Remote.prototype._server_is_available  = function(server) {
   return server && server._connected;
 };
 
-Remote.prototype._next_server = function () {
+Remote.prototype._next_server = function() {
   var result = null;
   for (var i=0; i<this._servers.length; i++) {
     var server = this._servers[i];
@@ -664,7 +684,7 @@ Remote.prototype._next_server = function () {
   return result;
 };
 
-Remote.prototype._get_server = function () {
+Remote.prototype._get_server = function() {
   if (this._server_is_available(this._primary_server)) {
     return this._primary_server;
   } else {
@@ -676,9 +696,9 @@ Remote.prototype._get_server = function () {
 
 // Send a request.
 // <-> request: what to send, consumed.
-Remote.prototype.request = function (request) {
+Remote.prototype.request = function(request) {
   if (!this._servers.length) {
-      request.emit('error', new Error('No servers availale'));
+      request.emit('error', new Error('No servers available'));
   } else {
     var server = this._get_server();
     if (server) {
@@ -689,15 +709,21 @@ Remote.prototype.request = function (request) {
   }
 };
 
-Remote.prototype.request_server_info = function () {
-  return new Request(this, 'server_info');
+Remote.prototype.server_info =
+Remote.prototype.request_server_info = function(callback) {
+  return new Request(this, 'server_info').callback(callback);
 };
 
 // XXX This is a bad command. Some varients don't scale.
 // XXX Require the server to be trusted.
-Remote.prototype.request_ledger = function (ledger, opts) {
+Remote.prototype.request_ledger = function(ledger, opts, callback) {
   //utils.assert(this.trusted);
 
+  if (typeof opts === 'function') {
+    callback = opts;
+    opts =  { };
+  }
+
   var request = new Request(this, 'ledger');
 
   if (ledger) {
@@ -706,7 +732,7 @@ Remote.prototype.request_ledger = function (ledger, opts) {
     request.message.ledger  = ledger;
   }
 
-  if ('object' == typeof opts) {
+  if (typeof opts === 'object') {
     if (opts.full)
       request.message.full          = true;
   
@@ -725,33 +751,33 @@ Remote.prototype.request_ledger = function (ledger, opts) {
     request.message.full    = true;
   }
 
-  return request;
+  return request.callback(callback);;
 };
 
 // Only for unit testing.
-Remote.prototype.request_ledger_hash = function () {
+Remote.prototype.request_ledger_hash = function(callback) {
   //utils.assert(this.trusted);   // If not trusted, need to check proof.
 
-  return new Request(this, 'ledger_closed');
+  return new Request(this, 'ledger_closed').callback(callback);
 };
 
 // .ledger()
 // .ledger_index()
-Remote.prototype.request_ledger_header = function () {
-  return new Request(this, 'ledger_header');
+Remote.prototype.request_ledger_header = function(callback) {
+  return new Request(this, 'ledger_header').callback(callback);
 };
 
 // Get the current proposed ledger entry.  May be closed (and revised) at any time (even before returning).
 // Only for unit testing.
-Remote.prototype.request_ledger_current = function () {
-  return new Request(this, 'ledger_current');
+Remote.prototype.request_ledger_current = function(callback) {
+  return new Request(this, 'ledger_current').callback(callback);
 };
 
 // --> type : the type of ledger entry.
 // .ledger()
 // .ledger_index()
 // .offer_id()
-Remote.prototype.request_ledger_entry = function (type) {
+Remote.prototype.request_ledger_entry = function(type, callback) {
   //utils.assert(this.trusted);   // If not trusted, need to check proof, maybe talk packet protocol.
 
   var self    = this;
@@ -764,7 +790,7 @@ Remote.prototype.request_ledger_entry = function (type) {
   if ('account_root' === type) {
     request.request_default = request.request;
 
-    request.request         = function () {                        // Intercept default request.
+    request.request         = function() {                        // Intercept default request.
       var bDefault  = true;
       // .self = Remote
       // this = Request
@@ -803,7 +829,7 @@ Remote.prototype.request_ledger_entry = function (type) {
           // XXX Only allow with trusted mode.  Must sync response with advance.
           switch (type) {
             case 'account_root':
-              request.on('success', function (message) {
+              request.on('success', function(message) {
                 // Cache node.
                 // console.log('request_ledger_entry: caching');
                 self.ledgers.current.account_root[message.node.Account] = message.node;
@@ -823,11 +849,11 @@ Remote.prototype.request_ledger_entry = function (type) {
     }
   };
 
-  return request;
+  return request.callback(callback);
 };
 
 // .accounts(accounts, realtime)
-Remote.prototype.request_subscribe = function (streams) {
+Remote.prototype.request_subscribe = function(streams, callback) {
   var request = new Request(this, 'subscribe');
 
   if (streams) {
@@ -837,10 +863,10 @@ Remote.prototype.request_subscribe = function (streams) {
     request.message.streams = streams;
   }
 
-  return request;
+  return request.callback(callback);
 };
 
-Remote.prototype.request_unsubscribe = function (streams) {
+Remote.prototype.request_unsubscribe = function(streams, callback) {
   var request = new Request(this, 'unsubscribe');
 
   if (streams) {
@@ -850,39 +876,39 @@ Remote.prototype.request_unsubscribe = function (streams) {
     request.message.streams = streams;
   }
 
-  return request;
+  return request.callback(callback);
 };
 
 // .ledger_choose()
 // .ledger_hash()
 // .ledger_index()
-Remote.prototype.request_transaction_entry = function (hash) {
+Remote.prototype.request_transaction_entry = function(hash, callback) {
   //utils.assert(this.trusted);   // If not trusted, need to check proof, maybe talk packet protocol.
 
-  return (new Request(this, 'transaction_entry')).tx_hash(hash);
+  return (new Request(this, 'transaction_entry', callback)).tx_hash(hash);
 };
 
 // DEPRECATED: use request_transaction_entry
-Remote.prototype.request_tx = function (hash) {
+Remote.prototype.request_tx = function(hash, callback) {
   var request = new Request(this, 'tx');
 
   request.message.transaction  = hash;
 
-  return request;
+  return request.callback(callback);
 };
 
-Remote.prototype.request_account_info = function (accountID) {
+Remote.prototype.request_account_info = function(accountID, callback) {
   var request = new Request(this, 'account_info');
 
   request.message.ident   = UInt160.json_rewrite(accountID);  // DEPRECATED
   request.message.account = UInt160.json_rewrite(accountID);
 
-  return request;
+  return request.callback(callback);
 };
 
 // --> account_index: sub_account index (optional)
 // --> current: true, for the current ledger.
-Remote.prototype.request_account_lines = function (accountID, account_index, current) {
+Remote.prototype.request_account_lines = function(accountID, account_index, current, callback) {
   // XXX Does this require the server to be trusted?
   //utils.assert(this.trusted);
 
@@ -894,12 +920,12 @@ Remote.prototype.request_account_lines = function (accountID, account_index, cur
     request.message.index   = account_index;
   }
 
-  return request.ledger_choose(current);
+  return request.ledger_choose(current).callback(callback);
 };
 
 // --> account_index: sub_account index (optional)
 // --> current: true, for the current ledger.
-Remote.prototype.request_account_offers = function (accountID, account_index, current) {
+Remote.prototype.request_account_offers = function(accountID, account_index, current, callback) {
   var request = new Request(this, 'account_offers');
 
   request.message.account = UInt160.json_rewrite(accountID);
@@ -908,7 +934,7 @@ Remote.prototype.request_account_offers = function (accountID, account_index, cu
     request.message.index   = account_index;
   }
 
-  return request.ledger_choose(current);
+  return request.ledger_choose(current).callback(callback);
 };
 
 
@@ -923,7 +949,7 @@ Remote.prototype.request_account_offers = function (accountID, account_index, cu
   limit: integer                  // optional
 */
 
-Remote.prototype.request_account_tx = function (obj) {
+Remote.prototype.request_account_tx = function(obj, callback) {
   // XXX Does this require the server to be trusted?
   //utils.assert(this.trusted);
 
@@ -944,10 +970,10 @@ Remote.prototype.request_account_tx = function (obj) {
     if ('undefined' !== typeof obj.limit)			{request.message.limit  = obj.limit;}
   }
 
-  return request;
+  return request.callback(callback);
 };
 
-Remote.prototype.request_book_offers = function (gets, pays, taker) {
+Remote.prototype.request_book_offers = function(gets, pays, taker, callback) {
   var request = new Request(this, 'book_offers');
 
   request.message.taker_gets = {
@@ -968,20 +994,20 @@ Remote.prototype.request_book_offers = function (gets, pays, taker) {
 
   request.message.taker = taker ? taker : UInt160.ACCOUNT_ONE;
 
-  return request;
+  return request.callback(callback);
 };
 
-Remote.prototype.request_wallet_accounts = function (seed) {
+Remote.prototype.request_wallet_accounts = function(seed, callback) {
   utils.assert(this.trusted);     // Don't send secrets.
 
   var request = new Request(this, 'wallet_accounts');
 
   request.message.seed = seed;
 
-  return request;
+  return request.callback(callback);
 };
 
-Remote.prototype.request_sign = function (secret, tx_json) {
+Remote.prototype.request_sign = function(secret, tx_json, callback) {
   utils.assert(this.trusted);     // Don't send secrets.
 
   var request = new Request(this, 'sign');
@@ -989,16 +1015,12 @@ Remote.prototype.request_sign = function (secret, tx_json) {
   request.message.secret = secret;
   request.message.tx_json = tx_json;
 
-  return request;
+  return request.callback(callback);
 };
 
 // Submit a transaction.
-Remote.prototype.request_submit = function () {
-  var self  = this;
-
-  var request = new Request(this, 'submit');
-
-  return request;
+Remote.prototype.request_submit = function(callback) {
+  return new Request(this, 'submit').callback(callback);
 };
 
 //
@@ -1013,16 +1035,16 @@ Remote.prototype.request_submit = function () {
  *
  * This function will create and return the request, but not submit it.
  */
-Remote.prototype._server_prepare_subscribe = function () {
+Remote.prototype._server_prepare_subscribe = function(callback) {
   var self  = this;
 
   var feeds = [ 'ledger', 'server' ];
 
   if (this._transaction_subs) feeds.push('transactions');
 
-  var req = this.request_subscribe(feeds);
+  var request = this.request_subscribe(feeds);
 
-  req.on('success', function (message) {
+  request.on('success', function(message) {
     self._stand_alone       = !!message.stand_alone;
     self._testnet           = !!message.testnet;
 
@@ -1055,70 +1077,87 @@ Remote.prototype._server_prepare_subscribe = function () {
     self.emit('subscribed');
   });
 
-  self.emit('prepare_subscribe', req);
+  self.emit('prepare_subscribe', request);
 
   // XXX Could give error events, maybe even time out.
 
-  return req;
+  return request.callback(callback);
 };
 
 // For unit testing: ask the remote to accept the current ledger.
 // - To be notified when the ledger is accepted, server_subscribe() then listen to 'ledger_hash' events.
 // A good way to be notified of the result of this is:
-//    remote.once('ledger_closed', function (ledger_closed, ledger_index) { ... } );
-Remote.prototype.ledger_accept = function () {
+//    remote.once('ledger_closed', function(ledger_closed, ledger_index) { ... } );
+Remote.prototype.ledger_accept = function(callback) {
   if (this._stand_alone || undefined === this._stand_alone) {
     var request = new Request(this, 'ledger_accept');
-    request.request();
+    request.callback(callback).request();
   } else {
-    this.emit('error', {
-      'error' : 'notStandAlone'
-    });
+    var err = { 'error' : 'notStandAlone' }
+    if (typeof callback === 'function') {
+      callback(err);
+    }
+    this.emit('error', err);
   }
 
   return this;
 };
 
 // Return a request to refresh the account balance.
-Remote.prototype.request_account_balance = function (account, current) {
+Remote.prototype.request_account_balance = function(account, current, callback) {
   var request = this.request_ledger_entry('account_root');
 
-  return request
-    .account_root(account)
+  request.account_root(account)
     .ledger_choose(current)
-    .on('success', function (message) {
+    .on('success', function(message) {
       // If the caller also waits for 'success', they might run before this.
       request.emit('account_balance', Amount.from_json(message.node.Balance));
     });
+
+  if (typeof callback === 'function') {
+    request.callback(callback, 'account_balance');
+  }
+
+  return request;
 };
 
 // Return a request to return the account flags.
-Remote.prototype.request_account_flags = function (account, current) {
+Remote.prototype.request_account_flags = function(account, current, callback) {
   var request = this.request_ledger_entry('account_root');
 
-  return request
-    .account_root(account)
+  request.account_root(account)
     .ledger_choose(current)
-    .on('success', function (message) {
+    .on('success', function(message) {
       // If the caller also waits for 'success', they might run before this.
       request.emit('account_flags', message.node.Flags);
     });
+
+  if (typeof callback === 'function') {
+    request.callback(callback, 'account_flags');
+  }
+
+  return request;
 };
 
 // Return a request to emit the owner count.
-Remote.prototype.request_owner_count = function (account, current) {
+Remote.prototype.request_owner_count = function(account, current, callback) {
   var request = this.request_ledger_entry('account_root');
 
-  return request
-    .account_root(account)
+  request.account_root(account)
     .ledger_choose(current)
-    .on('success', function (message) {
+    .on('success', function(message) {
       // If the caller also waits for 'success', they might run before this.
       request.emit('owner_count', message.node.OwnerCount);
     });
+
+  if (typeof callback === 'function') {
+    request.callback(callback, 'owner_count');
+  }
+
+  return request;
 };
 
-Remote.prototype.account = function (accountId) {
+Remote.prototype.account = function(accountId) {
   accountId = UInt160.json_rewrite(accountId);
 
   if (!this._accounts[accountId]) {
@@ -1132,7 +1171,7 @@ Remote.prototype.account = function (accountId) {
   return this._accounts[accountId];
 };
 
-Remote.prototype.book = function (currency_gets, issuer_gets, currency_pays, issuer_pays) {
+Remote.prototype.book = function(currency_gets, issuer_gets, currency_pays, issuer_pays) {
   var gets = currency_gets;
   if (gets !== 'XRP') gets += '/' + issuer_gets;
   var pays = currency_pays;
@@ -1153,7 +1192,7 @@ Remote.prototype.book = function (currency_gets, issuer_gets, currency_pays, iss
 
 // Return the next account sequence if possible.
 // <-- undefined or Sequence
-Remote.prototype.account_seq = function (account, advance) {
+Remote.prototype.account_seq = function(account, advance) {
   var account      = UInt160.json_rewrite(account);
   var account_info = this.accounts[account];
   var seq;
@@ -1172,7 +1211,7 @@ Remote.prototype.account_seq = function (account, advance) {
   return seq;
 };
 
-Remote.prototype.set_account_seq = function (account, seq) {
+Remote.prototype.set_account_seq = function(account, seq) {
   var account = UInt160.json_rewrite(account);
 
   if (!this.accounts[account]) {
@@ -1183,7 +1222,7 @@ Remote.prototype.set_account_seq = function (account, seq) {
 };
 
 // Return a request to refresh accounts[account].seq.
-Remote.prototype.account_seq_cache = function (account, current) {
+Remote.prototype.account_seq_cache = function(account, current, callback) {
   var self    = this;
   var request;
 
@@ -1197,7 +1236,7 @@ Remote.prototype.account_seq_cache = function (account, current) {
     request = self.request_ledger_entry('account_root')
       .account_root(account)
       .ledger_choose(current)
-      .on('success', function (message) {
+      .on('success', function(message) {
         delete account_info.caching_seq_request;
 
         var seq = message.node.Sequence;
@@ -1208,7 +1247,7 @@ Remote.prototype.account_seq_cache = function (account, current) {
         // If the caller also waits for 'success', they might run before this.
         request.emit('success_account_seq_cache', message);
       })
-      .on('error', function (message) {
+      .on('error', function(message) {
         // console.log('error: %s', account);
         delete account_info.caching_seq_request;
 
@@ -1218,18 +1257,22 @@ Remote.prototype.account_seq_cache = function (account, current) {
     account_info.caching_seq_request    = request;
   }
 
+  if (typeof callback === 'function') {
+    request.callback(callback, 'success_account_seq_cache');
+  }
+
   return request;
 };
 
 // Mark an account's root node as dirty.
-Remote.prototype.dirty_account_root = function (account) {
-  var account       = UInt160.json_rewrite(account);
+Remote.prototype.dirty_account_root = function(account) {
+  var account = UInt160.json_rewrite(account);
 
   delete this.ledgers.current.account_root[account];
 };
 
 // Store a secret - allows the Remote to automatically fill out auth information.
-Remote.prototype.set_secret = function (account, secret) {
+Remote.prototype.set_secret = function(account, secret) {
   this.secrets[account] = secret;
 };
 
@@ -1242,13 +1285,13 @@ Remote.prototype.set_secret = function (account, secret) {
 // --> current: bool : true = current ledger
 //
 // If does not exist: emit('error', 'error' : 'remoteError', 'remote' : { 'error' : 'entryNotFound' })
-Remote.prototype.request_ripple_balance = function (account, issuer, currency, current) {
+Remote.prototype.request_ripple_balance = function(account, issuer, currency, current, callback) {
   var request = this.request_ledger_entry('ripple_state');          // YYY Could be cached per ledger.
 
-  return request
+  request
     .ripple_state(account, issuer, currency)
     .ledger_choose(current)
-    .on('success', function (message) {
+    .on('success', function(message) {
       var node            = message.node;
 
       var lowLimit        = Amount.from_json(node.LowLimit);
@@ -1272,18 +1315,36 @@ Remote.prototype.request_ripple_balance = function (account, issuer, currency, c
         'peer_quality_out'    : (!accountHigh ? node.HighQualityOut : node.LowQualityOut),
       });
     });
+
+  if (typeof callback === 'function') {
+    request.callback(callback, 'ripple_state');
+  }
+
+  return request;
 };
 
-Remote.prototype.request_ripple_path_find = function (src_account, dst_account, dst_amount, source_currencies) {
+Remote.prototype.request_ripple_path_find = function(src_account, dst_account, dst_amount, src_currencies, callback) {
   var self    = this;
+
+  var opts = { };
+
+  if (typeof src_account === 'object') {
+    opts = src_account;
+  } else {
+    opts.src_account    = src_account;
+    opts.dst_account    = dst_account;
+    opts.dst_ammount    = dst_amount;
+    opts.src_currencies = src_currencies;
+  }
+
   var request = new Request(this, 'ripple_path_find');
 
-  request.message.source_account      = UInt160.json_rewrite(src_account);
-  request.message.destination_account = UInt160.json_rewrite(dst_account);
-  request.message.destination_amount  = Amount.json_rewrite(dst_amount);
+  request.message.source_account      = UInt160.json_rewrite(opts.src_account);
+  request.message.destination_account = UInt160.json_rewrite(opts.dst_account);
+  request.message.destination_amount  = Amount.json_rewrite(opts.dst_amount);
 
   if (source_currencies) {
-    request.message.source_currencies   = source_currencies.map(function (ci) {
+    request.message.source_currencies = opts.src_currencies.map(function(ci) {
       var ci_new  = {};
 
       if ('issuer' in ci) {
@@ -1297,39 +1358,45 @@ Remote.prototype.request_ripple_path_find = function (src_account, dst_account,
     });
   }
 
-  return request;
+  return request.callback(callback);
 };
 
-Remote.prototype.request_unl_list = function () {
-  return new Request(this, 'unl_list');
+Remote.prototype.request_unl_list = function(callback) {
+  return new Request(this, 'unl_list').callback(callback);
 };
 
-Remote.prototype.request_unl_add = function (addr, comment) {
+Remote.prototype.request_unl_add = function(addr, comment, callback) {
   var request = new Request(this, 'unl_add');
 
   request.message.node = addr;
 
-  if (typeof comment !== 'undefined') {
-    request.message.comment = note;
+  switch (typeof comment) {
+    case 'string':
+      request.message.comment = comment;
+      break;
+
+    case 'function':
+      callback = comment;
+      break;
   }
 
-  return request;
+  return request.callback(callback);
 };
 
 // --> node: <domain> | <public_key>
-Remote.prototype.request_unl_delete = function (node) {
+Remote.prototype.request_unl_delete = function(node) {
   var request = new Request(this, 'unl_delete');
 
   request.message.node = node;
 
-  return request;
+  return request.callback(callback);
 };
 
-Remote.prototype.request_peers = function () {
-  return new Request(this, 'peers');
+Remote.prototype.request_peers = function(callback) {
+  return new Request(this, 'peers', callback);
 };
 
-Remote.prototype.request_connect = function (ip, port) {
+Remote.prototype.request_connect = function(ip, port, callback) {
   var request = new Request(this, 'connect');
 
   request.message.ip = ip;
@@ -1338,10 +1405,10 @@ Remote.prototype.request_connect = function (ip, port) {
     request.message.port = port;
   }
 
-  return request;
+  return request.callback(callback);
 };
 
-Remote.prototype.transaction = function () {
+Remote.prototype.transaction = function() {
   return new Transaction(this);
 };