Revert "Cleanup, fix .disconnect"

This reverts commit c2ad23996d.
This commit is contained in:
wltsmrz
2013-06-26 03:40:35 +09:00
parent 2a340d09a4
commit 84e79abbaa

View File

@@ -1,27 +1,33 @@
var EventEmitter = require('events').EventEmitter;
var util = require('util');
var WebSocket = require('ws');
var utils = require('./utils');
//------------------------------------------------------------------------------
/**
* Server
*
* @constructor
* @param {Object} remote
* @param {Object} opts
*/
Constructor
function Server(remote, opts) {
Keys for cfg:
url
@param remote The Remote object
@param cfg Configuration parameters.
*/
var Server = function (remote, cfg) {
EventEmitter.call(this);
if (typeof opts !== 'object' || typeof opts.url !== 'string') {
if (typeof cfg !== 'object' || typeof cfg.url !== 'string') {
throw new Error('Invalid server configuration.');
}
var self = this;
this._remote = remote;
this._opts = opts;
this._cfg = cfg;
this._ws = void(0);
this._connected = false;
@@ -42,27 +48,32 @@ function Server(remote, opts) {
});
};
//------------------------------------------------------------------------------
util.inherits(Server, EventEmitter);
function to_set(list) {
var result = { };
for (var i=0; i<list.length; i++) {
result[list[i]] = true;
}
return result;
}
/**
* Server states that we will treat as the server being online.
*
* Our requirements are that the server can process transactions and notify
* us of changes.
*/
Server.online_states = [
'syncing'
, 'tracking'
, 'proposing'
, 'validating'
, 'full'
];
Server.online_states = to_set([
'syncing',
'tracking',
'proposing',
'validating',
'full'
]);
Server.prototype.is_online = function(status) {
return Server.online_states.indexOf(status) !== -1;
};
Server.prototype.connect = function() {
Server.prototype.connect = function () {
var self = this;
// We don't connect if we believe we're already connected. This means we have
@@ -72,7 +83,7 @@ Server.prototype.connect = function() {
if (this._connected === true) return;
if (this._remote.trace) {
console.log('server: connect: %s', this._opts.url);
console.log('server: connect: %s', this._cfg.url);
}
// Ensure any existing socket is given the command to close first.
@@ -80,13 +91,13 @@ Server.prototype.connect = function() {
this._ws.close();
}
var ws = this._ws = new WebSocket(this._opts.url);
var ws = this._ws = new WebSocket(this._cfg.url);
this._should_connect = true;
self.emit('connecting');
ws.onopen = function() {
ws.onopen = function () {
// If we are no longer the active socket, simply ignore any event
if (ws !== self._ws) return;
@@ -97,7 +108,7 @@ Server.prototype.connect = function() {
self.request(request);
};
ws.onerror = function(e) {
ws.onerror = function (e) {
// If we are no longer the active socket, simply ignore any event
if (ws !== self._ws) return;
@@ -123,7 +134,7 @@ Server.prototype.connect = function() {
};
// Failure to open.
ws.onclose = function() {
ws.onclose = function () {
// If we are no longer the active socket, simply ignore any event
if (ws !== self._ws) return;
@@ -148,7 +159,7 @@ Server.prototype.connect = function() {
// Delay and retry.
self._retry += 1;
self._retry_timer = setTimeout(function retryTimeout() {
self._retry_timer = setTimeout(function () {
if (self._remote.trace) console.log('server: retry');
if (!self._should_connect) return;
self.connect();
@@ -161,29 +172,23 @@ Server.prototype.connect = function() {
: 30*1000); // Then: once every 30 seconds
};
ws.onmessage = function(msg) {
ws.onmessage = function (msg) {
self.emit('message', msg.data);
};
};
Server.prototype.disconnect = function() {
Server.prototype.disconnect = function () {
this._should_connect = false;
this._set_state('offline');
if (this._ws) {
this._ws.close();
}
};
Server.prototype.send = function(message) {
if (this._ws) {
this._ws.send(JSON.stringify(message));
if (this.ws) {
this.ws.close();
}
};
/**
* Submit a Request object to this server.
*/
Server.prototype.request = function(request) {
Server.prototype.request = function (request) {
var self = this;
// Only bother if we are still connected.
@@ -195,19 +200,20 @@ Server.prototype.request = function(request) {
// Advance message ID
self._id++;
if (self._connected || (request.message.command === 'subscribe'
&& self._ws.readyState === 1)) {
if (self._state === 'online' ||
(request.message.command === 'subscribe' && self._ws.readyState === 1)) {
if (self._remote.trace) {
utils.logObject('server: request: %s', request.message);
}
self.send(request.message);
self._ws.send(JSON.stringify(request.message));
} else {
// XXX There are many ways to make self smarter.
self.once('connect', function () {
if (self._remote.trace) {
utils.logObject('server: request: %s', request.message);
}
self.send(request.message);
self._ws.send(JSON.stringify(request.message));
});
}
} else {
@@ -217,7 +223,7 @@ Server.prototype.request = function(request) {
}
};
Server.prototype._set_state = function(state) {
Server.prototype._set_state = function (state) {
if (state !== this._state) {
this._state = state;
@@ -233,69 +239,46 @@ Server.prototype._set_state = function(state) {
}
};
Server.prototype._handle_message = function(json) {
var self = this;
var unexpected = false;
var message;
try { message = JSON.parse(json); } catch(exception) { }
Server.prototype._handle_message = function (json) {
var self = this;
var unexpected = typeof message !== 'object' || typeof message.type !== 'string';
var message = JSON.parse(json);
if (unexpected) {
// We received a malformed response from the server
}
if (message.type === 'response') {
// A response to a request.
var request = self._requests[message.id];
if (!unexpected) {
switch (message.type) {
case 'response':
// A response to a request.
var request = self._requests[message.id];
delete self._requests[message.id];
delete self._requests[message.id];
if (!request) {
if (self._remote.trace) utils.logObject('server: UNEXPECTED: %s', message);
} else if ('success' === message.status) {
if (self._remote.trace) utils.logObject('server: response: %s', message);
if (!request) {
if (self._remote.trace) {
utils.logObject('server: UNEXPECTED: %s', message);
}
} else if (message.status === 'success') {
if (self._remote.trace) {
utils.logObject('server: response: %s', message);
}
request.emit('success', message.result);
self.emit('response_'+request.message.command, message.result, request, message);
self._remote.emit('response_'+request.message.command, message.result, request, message);
} else if (message.error) {
if (self._remote.trace) utils.logObject('server: error: %s', message);
request.emit('success', message.result);
[ self, self._remote ].forEach(function(emitter) {
emitter.emit('response_' + request.message.command, message.result, request, message);
});
} else if (message.error) {
if (self._remote.trace) {
utils.logObject('server: error: %s', message);
}
request.emit('error', {
'error' : 'remoteError',
'error_message' : 'Remote reported an error.',
'remote' : message
});
}
break;
case 'serverStatus':
// This message is only received when online.
// As we are connected, it is the definitive final state.
self._set_state(self.is_online(message.server_status) ? 'online' : 'offline');
break;
request.emit('error', {
'error' : 'remoteError',
'error_message' : 'Remote reported an error.',
'remote' : message
});
}
} else if (message.type === 'serverStatus') {
// This message is only received when online. As we are connected, it is the definative final state.
self._set_state(Server.online_states[message.server_status] ? 'online' : 'offline');
}
};
Server.prototype._handle_response_subscribe = function(message) {
Server.prototype._handle_response_subscribe = function (message) {
var self = this;
self._server_status = message.server_status;
if (self.is_online(message.server_status)) {
if (Server.online_states[message.server_status]) {
self._set_state('online');
}
};