ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-20 20:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored WSConnection and RPCHandler to have one layer of commands.

Browse Source 
Evented RPC commands are now on the same level as all other RPC
commands and are handled by the RPCHandler class.
This commit is contained in:
Stefan Thomas
2012-11-08 20:26:09 -08:00
parent 7412fe043b
commit 0ee49b42de
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/js/remote.js
View File

@@ -429,10 +429,10 @@ Remote.prototype._connect_message = function (ws, json) {
if (!request) { if (!request) {
unexpected = true; unexpected = true;
} }
else if ('success' === message.result) { else if ('success' === message.status) {
if (this.trace) console.log("message: %s", json); if (this.trace) console.log("message: %s", json);
request.emit('success', message); request.emit('success', message.result);
} }
else if (message.error) { else if (message.error) {
if (this.trace) console.log("message: %s", json); if (this.trace) console.log("message: %s", json);
@@ -515,7 +515,7 @@ Remote.prototype.request_ledger_hash = function () {
var request = new Request(this, 'rpc'); var request = new Request(this, 'rpc');
request.message.rpc_command = 'ledger_closed'; request.message.command = 'ledger_closed';
return request; return request;
}; };
@@ -525,7 +525,7 @@ Remote.prototype.request_ledger_hash = function () {
Remote.prototype.request_ledger_current = function () { Remote.prototype.request_ledger_current = function () {
var request = new Request(this, 'rpc'); var request = new Request(this, 'rpc');
request.message.rpc_command = 'ledger_current'; request.message.command = 'ledger_current';
return request; return request;
}; };
@@ -540,7 +540,7 @@ Remote.prototype.request_ledger_entry = function (type) {
var self = this; var self = this;
var request = new Request(this, 'rpc'); var request = new Request(this, 'rpc');
request.message.rpc_command = 'ledger_entry'; request.message.command = 'ledger_entry';
if (type) if (type)
this.type = type; this.type = type;
@@ -593,10 +593,28 @@ Remote.prototype.request_ledger_entry = function (type) {
return request; return request;
}; };
Remote.prototype.request_subscribe = function () { Remote.prototype.request_subscribe = function (streams) {
var request = new Request(this, 'subscribe'); var request = new Request(this, 'subscribe');
request.message.streams = [ 'ledger', 'server' ]; if (streams) {
if ("object" !== typeof streams) {
streams = [streams];
}
request.message.streams = streams;
}
return request;
};
Remote.prototype.request_unsubscribe = function (streams) {
var request = new Request(this, 'unsubscribe');
if (streams) {
if ("object" !== typeof streams) {
streams = [streams];
}
request.message.streams = streams;
}
return request; return request;
}; };
@@ -606,7 +624,7 @@ Remote.prototype.request_transaction_entry = function (hash) {
var request = new Request(this, 'rpc'); var request = new Request(this, 'rpc');
request.message.rpc_command = 'transaction_entry'; request.message.command = 'transaction_entry';
return request return request
.tx_hash(hash); .tx_hash(hash);
@@ -658,7 +676,7 @@ Remote.prototype.submit = function (transaction) {
else { else {
var submit_request = new Request(this, 'rpc'); var submit_request = new Request(this, 'rpc');
submit_request.message.rpc_command = 'submit_json'; submit_request.message.command = 'submit_json';
submit_request.tx_json(transaction.tx_json); submit_request.tx_json(transaction.tx_json);
submit_request.secret(transaction.secret); submit_request.secret(transaction.secret);
@@ -685,7 +703,7 @@ Remote.prototype.submit = function (transaction) {
Remote.prototype._server_subscribe = function () { Remote.prototype._server_subscribe = function () {
var self = this; var self = this;
this.request_subscribe() this.request_subscribe([ 'ledger', 'server' ])
.on('success', function (message) { .on('success', function (message) {
self.stand_alone = !!message.stand_alone; self.stand_alone = !!message.stand_alone;
@@ -715,7 +733,7 @@ Remote.prototype.ledger_accept = function () {
{ {
var request = new Request(this, 'rpc'); var request = new Request(this, 'rpc');
request.message.rpc_command = 'ledger_accept'; request.message.command = 'ledger_accept';
request request
.request(); .request();
@@ -806,7 +824,7 @@ Remote.prototype.account_seq_cache = function (account, current) {
account_info.caching_seq_request = request; account_info.caching_seq_request = request;
} }
return request return request;
}; };
// Mark an account's root node as dirty. // Mark an account's root node as dirty.