status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

delayed connection try for isConnected(), fixed outputformatter check of methods

This commit is contained in:
Fabian Vogelsteller 2015-07-02 19:19:32 +02:00
parent bcb121e58e
commit b44390e48c
7 changed files with 151 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
dist/web3-light.js vendored
View File

@ -3417,7 +3417,7 @@ module.exports = ICAP;
var utils = require('../utils/utils');
var errors = require('./errors');
var errorTimeout = '{"jsonrpc": "2.0", "error": {"code": -32603, "message": "FRONTEND Request timed out for method \'__method__\'"}, "id": "__id__"}';
var errorTimeout = '{"jsonrpc": "2.0", "error": {"code": -32603, "message": "IPC Request timed out for method \'__method__\'"}, "id": "__id__"}';
var IpcProvider = function (path, net) {
@ -3430,45 +3430,74 @@ var IpcProvider = function (path, net) {
this.connection = net.connect({path: this.path});
this.connection.on('error', function(e){
console.error('IPC Connection error', e);
console.error('IPC Connection Error', e);
_this._timeout();
});
this.connection.on('end', function(e){
console.error('IPC Connection ended', e);
_this._timeout();
});
// LISTEN FOR CONNECTION RESPONSES
this.connection.on('data', function(result) {
result = result.toString();
this.connection.on('data', function(data) {
data = data.toString();
try {
result = JSON.parse(result);
// DE-CHUNKER
var dechunkedData = data
.replace(/\}\{/g,'}|--|{') // }{
.replace(/\}\]\[\{/g,'}]|--|[{') // }][{
.replace(/\}\[\{/g,'}|--|[{') // }[{
.replace(/\}\]\{/g,'}]|--|{') // }]{
.split('|--|');
} catch(e) {
throw errors.InvalidResponse(result);
for (var i = 0; i < dechunkedData.length; i++) {
data = dechunkedData[i];
// prepend the last chunk
if(_this.lastChunk)
data = _this.lastChunk + data;
var result = data,
id = null;
try {
result = JSON.parse(result);
} catch(e) {
_this.lastChunk = data;
// start timeout to cancel all requests
clearTimeout(_this.lastChunkTimeout);
_this.lastChunkTimeout = setTimeout(function(){
throw errors.InvalidResponse(result);
_this.timeout();
}, 1000 * 15);
return;
}
// cancel timeout and set chunk to null
clearTimeout(_this.lastChunkTimeout);
_this.lastChunk = null;
// get the id which matches the returned id
if(utils.isArray(result)) {
result.forEach(function(load){
if(_this.responseCallbacks[load.id])
id = load.id;
});
} else {
id = result.id;
}
// fire the callback
if(_this.responseCallbacks[id]) {
_this.responseCallbacks[id](null, result);
delete _this.responseCallbacks[id];
}
}
var id;
// get the id which matches the returned id
if(utils.isArray(result)) {
result.forEach(function(load){
if(_this.responseCallbacks[load.id])
id = load.id;
});
} else {
id = result.id;
}
// fire the callback
if(_this.responseCallbacks[id]) {
_this.responseCallbacks[id](null, result);
delete _this.responseCallbacks[id];
}
});
};
@ -3492,9 +3521,10 @@ Timeout all requests when the end/error event is fired
@method _timeout
*/
IpcProvider.prototype._timeout = function() {
for(key in this.responseCallbacks) {
if(this.responseCallback.hasOwnProperty(key)){
for(var key in this.responseCallbacks) {
if(this.responseCallbacks.hasOwnProperty(key)){
this.responseCallbacks[key](errorTimeout.replace('__id__', key).replace('__method__', this.responseCallbacks[key].method));
delete this.responseCallbacks[key];
}
}
};
@ -3506,9 +3536,13 @@ Check if the current connection is still valid.
@method isConnected
*/
IpcProvider.prototype.isConnected = function() {
var _this = this;
// try reconnect, when connection is gone
if(!this.connection.writable)
this.connection.connect({path: this.path});
setTimeout(function(){
if(!_this.connection.writable)
_this.connection.connect({path: _this.path});
}, 0);
return !!this.connection.writable;
};
@ -3739,7 +3773,7 @@ Method.prototype.formatInput = function (args) {
* @return {Object}
*/
Method.prototype.formatOutput = function (result) {
return this.outputFormatter && result !== null ? this.outputFormatter(result) : result;
return this.outputFormatter && result ? this.outputFormatter(result) : result;
};
/**

4
dist/web3-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

100
dist/web3.js vendored
View File

@ -3417,7 +3417,7 @@ module.exports = ICAP;
var utils = require('../utils/utils');
var errors = require('./errors');
var errorTimeout = '{"jsonrpc": "2.0", "error": {"code": -32603, "message": "FRONTEND Request timed out for method \'__method__\'"}, "id": "__id__"}';
var errorTimeout = '{"jsonrpc": "2.0", "error": {"code": -32603, "message": "IPC Request timed out for method \'__method__\'"}, "id": "__id__"}';
var IpcProvider = function (path, net) {
@ -3430,45 +3430,74 @@ var IpcProvider = function (path, net) {
this.connection = net.connect({path: this.path});
this.connection.on('error', function(e){
console.error('IPC Connection error', e);
console.error('IPC Connection Error', e);
_this._timeout();
});
this.connection.on('end', function(e){
console.error('IPC Connection ended', e);
_this._timeout();
});
// LISTEN FOR CONNECTION RESPONSES
this.connection.on('data', function(result) {
result = result.toString();
this.connection.on('data', function(data) {
data = data.toString();
try {
result = JSON.parse(result);
// DE-CHUNKER
var dechunkedData = data
.replace(/\}\{/g,'}|--|{') // }{
.replace(/\}\]\[\{/g,'}]|--|[{') // }][{
.replace(/\}\[\{/g,'}|--|[{') // }[{
.replace(/\}\]\{/g,'}]|--|{') // }]{
.split('|--|');
} catch(e) {
throw errors.InvalidResponse(result);
for (var i = 0; i < dechunkedData.length; i++) {
data = dechunkedData[i];
// prepend the last chunk
if(_this.lastChunk)
data = _this.lastChunk + data;
var result = data,
id = null;
try {
result = JSON.parse(result);
} catch(e) {
_this.lastChunk = data;
// start timeout to cancel all requests
clearTimeout(_this.lastChunkTimeout);
_this.lastChunkTimeout = setTimeout(function(){
throw errors.InvalidResponse(result);
_this.timeout();
}, 1000 * 15);
return;
}
// cancel timeout and set chunk to null
clearTimeout(_this.lastChunkTimeout);
_this.lastChunk = null;
// get the id which matches the returned id
if(utils.isArray(result)) {
result.forEach(function(load){
if(_this.responseCallbacks[load.id])
id = load.id;
});
} else {
id = result.id;
}
// fire the callback
if(_this.responseCallbacks[id]) {
_this.responseCallbacks[id](null, result);
delete _this.responseCallbacks[id];
}
}
var id;
// get the id which matches the returned id
if(utils.isArray(result)) {
result.forEach(function(load){
if(_this.responseCallbacks[load.id])
id = load.id;
});
} else {
id = result.id;
}
// fire the callback
if(_this.responseCallbacks[id]) {
_this.responseCallbacks[id](null, result);
delete _this.responseCallbacks[id];
}
});
};
@ -3492,9 +3521,10 @@ Timeout all requests when the end/error event is fired
@method _timeout
*/
IpcProvider.prototype._timeout = function() {
for(key in this.responseCallbacks) {
if(this.responseCallback.hasOwnProperty(key)){
for(var key in this.responseCallbacks) {
if(this.responseCallbacks.hasOwnProperty(key)){
this.responseCallbacks[key](errorTimeout.replace('__id__', key).replace('__method__', this.responseCallbacks[key].method));
delete this.responseCallbacks[key];
}
}
};
@ -3506,9 +3536,13 @@ Check if the current connection is still valid.
@method isConnected
*/
IpcProvider.prototype.isConnected = function() {
var _this = this;
// try reconnect, when connection is gone
if(!this.connection.writable)
this.connection.connect({path: this.path});
setTimeout(function(){
if(!_this.connection.writable)
_this.connection.connect({path: _this.path});
}, 0);
return !!this.connection.writable;
};
@ -3739,7 +3773,7 @@ Method.prototype.formatInput = function (args) {
* @return {Object}
*/
Method.prototype.formatOutput = function (result) {
return this.outputFormatter && result !== null ? this.outputFormatter(result) : result;
return this.outputFormatter && result ? this.outputFormatter(result) : result;
};
/**

7
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
lib/web3/ipcprovider.js
View File

@ -132,6 +132,7 @@ IpcProvider.prototype._timeout = function() {
for(var key in this.responseCallbacks) {
if(this.responseCallbacks.hasOwnProperty(key)){
this.responseCallbacks[key](errorTimeout.replace('__id__', key).replace('__method__', this.responseCallbacks[key].method));
delete this.responseCallbacks[key];
}
}
};
@ -143,9 +144,13 @@ Check if the current connection is still valid.
@method isConnected
*/
IpcProvider.prototype.isConnected = function() {
var _this = this;
// try reconnect, when connection is gone
if(!this.connection.writable)
this.connection.connect({path: this.path});
setTimeout(function(){
if(!_this.connection.writable)
_this.connection.connect({path: _this.path});
}, 0);
return !!this.connection.writable;
};

2
lib/web3/method.js
View File

@ -94,7 +94,7 @@ Method.prototype.formatInput = function (args) {
* @return {Object}
*/
Method.prototype.formatOutput = function (result) {
return this.outputFormatter && result !== null ? this.outputFormatter(result) : result;
return this.outputFormatter && result ? this.outputFormatter(result) : result;
};
/**

8
test/ipcprovider.js
View File

@ -13,9 +13,9 @@ describe('lib/web3/ipcprovider', function () {
describe('send', function () {
it('should send basic request', function () {
var provider = new IpcProvider();
var result = provider.send({});
var result = provider.send({id: 1, method: 'eth_test'});
assert.equal(typeof result, 'object');
assert.isObject(result);
});
});
@ -23,8 +23,8 @@ describe('lib/web3/ipcprovider', function () {
it('should send basic async request', function (done) {
var provider = new IpcProvider();
provider.sendAsync({id: 1}, function (err, result) {
assert.equal(typeof result, 'object');
provider.sendAsync({id: 1, method: 'eth_test'}, function (err, result) {
assert.isObject(result);
done();
});
});