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

Use pubkey_node as server identifier

Browse Source
This commit is contained in:
wltsmrz
2014-07-18 17:45:09 -07:00
parent ca2d137d52
commit 79c5428da2
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/js/ripple/server.js
View File

@@ -124,8 +124,9 @@ function Server(remote, opts) {
}); });
this.on('response_server_info', function(message) { this.on('response_server_info', function(message) {
if (message.info.hostid) { try {
self._hostid = message.info.hostid; self._hostid = '(' + message.info.pubkey_node + ')';
} catch (e) {
} }
}); });
@@ -180,7 +181,7 @@ Server.websocketConstructor = function() {
Server.prototype._setState = function(state) { Server.prototype._setState = function(state) {
if (state !== this._state) { if (state !== this._state) {
if (this._remote.trace) { if (this._remote.trace) {
log.info('set_state:', this._hostid, state); log.info('set_state:', this._opts.url, this._hostid, state);
} }
this._state = state; this._state = state;
@@ -368,7 +369,7 @@ Server.prototype.connect = function() {
} }
if (this._remote.trace) { if (this._remote.trace) {
log.info('connect:', this._hostid, this._opts.url); log.info('connect:', this._opts.url, this._hostid);
} }
var ws = this._ws = new WebSocket(this._opts.url); var ws = this._ws = new WebSocket(this._opts.url);
@@ -394,7 +395,7 @@ Server.prototype.connect = function() {
self.emit('socket_error'); self.emit('socket_error');
if (self._remote.trace) { if (self._remote.trace) {
log.info('onerror:', self._hostid, self._opts.url, e.data || e); log.info('onerror:', self._opts.url, self._hostid, e.data || e);
} }
// Most connection errors for WebSockets are conveyed as 'close' events with // Most connection errors for WebSockets are conveyed as 'close' events with
@@ -418,7 +419,7 @@ Server.prototype.connect = function() {
ws.onclose = function onClose() { ws.onclose = function onClose() {
if (ws === self._ws) { if (ws === self._ws) {
if (self._remote.trace) { if (self._remote.trace) {
log.info('onclose:', self._hostid, self._opts.url, ws.readyState); log.info('onclose:', self._opts.url, self._hostid, ws.readyState);
} }
self._handleClose(); self._handleClose();
} }
@@ -451,7 +452,7 @@ Server.prototype._retryConnect = function() {
function connectionRetry() { function connectionRetry() {
if (self._shouldConnect) { if (self._shouldConnect) {
if (self._remote.trace) { if (self._remote.trace) {
log.info('retry', self._hostid, self._opts.url); log.info('retry', self._opts.url, self._hostid);
} }
self.connect(); self.connect();
} }
@@ -557,14 +558,14 @@ Server.prototype._handleResponse = function(message) {
if (!request) { if (!request) {
if (this._remote.trace) { if (this._remote.trace) {
log.info('UNEXPECTED:', this._hostid, this._opts.url, message); log.info('UNEXPECTED:', this._opts.url, this._hostid, message);
} }
return; return;
} }
if (message.status === 'success') { if (message.status === 'success') {
if (this._remote.trace) { if (this._remote.trace) {
log.info('response:', this._hostid, this._opts.url, message); log.info('response:', this._opts.url, this._hostid, message);
} }
var command = request.message.command; var command = request.message.command;
@@ -578,7 +579,7 @@ Server.prototype._handleResponse = function(message) {
}); });
} else if (message.error) { } else if (message.error) {
if (this._remote.trace) { if (this._remote.trace) {
log.info('error:', this._hostid, this._opts.url, message); log.info('error:', this._opts.url, this._hostid, message);
} }
var error = { var error = {
@@ -593,7 +594,7 @@ Server.prototype._handleResponse = function(message) {
Server.prototype._handlePathFind = function(message) { Server.prototype._handlePathFind = function(message) {
if (this._remote.trace) { if (this._remote.trace) {
log.info('path_find:', this._hostid, this._opts.url, message); log.info('path_find:', this._opts.url, this._hostid, message);
} }
}; };
@@ -651,7 +652,7 @@ Server.isLoadStatus = function(message) {
Server.prototype._sendMessage = function(message) { Server.prototype._sendMessage = function(message) {
if (this._ws) { if (this._ws) {
if (this._remote.trace) { if (this._remote.trace) {
log.info('request:', this._hostid, this._opts.url, message); log.info('request:', this._opts.url, this._hostid, message);
} }
this._ws.send(JSON.stringify(message)); this._ws.send(JSON.stringify(message));
} }
@@ -673,7 +674,7 @@ Server.prototype._request = function(request) {
// Only bother if we are still connected. // Only bother if we are still connected.
if (!this._ws) { if (!this._ws) {
if (this._remote.trace) { if (this._remote.trace) {
log.info('request: DROPPING:', self._hostid, self._opts.url, request.message); log.info('request: DROPPING:', self._opts.url, self._hostid, request.message);
} }
return; return;
} }
@@ -691,9 +692,10 @@ Server.prototype._request = function(request) {
self._sendMessage(request.message); self._sendMessage(request.message);
}; };
var isSubscribeRequest = request && request.message.command === 'subscribe' && this._ws.readyState === 1; var isOpen = this._ws.readyState === 1;
var isSubscribeRequest = request && request.message.command === 'subscribe';
if (this.isConnected() || isSubscribeRequest) { if (this.isConnected() || (isOpen && isSubscribeRequest)) {
sendRequest(); sendRequest();
} else { } else {
this.once('connect', sendRequest); this.once('connect', sendRequest);