RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Patrick Nagurny 2015-08-04 17:04:25 -04:00
parent e95d4c865f
commit 10843182c1
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/start.js
View File

@ -47,23 +47,25 @@ node.on('ready', function() {
}); });
socket.on('message', function(message, socketCallback) { socket.on('message', function(message, socketCallback) {
if (methodsMap[message.command]) { if (methodsMap[message.method]) {
var params = message.params; var params = message.params;
if(!params || !params.length) { if(!params || !params.length) {
params = []; params = [];
} }
if(params.length !== methodsMap[message.command].args) { if(params.length !== methodsMap[message.method].args) {
return socketCallback({ return socketCallback({
error: 'Expected ' + methodsMap[message.command].args + ' parameters' error: 'Expected ' + methodsMap[message.method].args + ' parameters'
}); });
} }
var callback = function(err, result) { var callback = function(err, result) {
var response = {}; var response = {};
if(err) { if(err) {
response.error = err; response.error = {
message: err.toString()
};
} }
if(result) { if(result) {
@ -78,7 +80,7 @@ node.on('ready', function() {
}; };
params = params.concat(callback); params = params.concat(callback);
methodsMap[message.command].fn.apply(this, params); methodsMap[message.method].fn.apply(this, params);
} else { } else {
socketCallback({ socketCallback({
error: 'Method Not Found' error: 'Method Not Found'

4
example/client.js
View File

@ -10,7 +10,7 @@ socket.on('disconnect', function(){
}); });
var message = { var message = {
command: 'getOutputs', method: 'getOutputs',
params: ['1HTxCVrXuthad6YW5895K98XmVsdMvvBSw', true] params: ['1HTxCVrXuthad6YW5895K98XmVsdMvvBSw', true]
}; };
@ -24,7 +24,7 @@ socket.send(message, function(response) {
}); });
var message2 = { var message2 = {
command: 'getTransaction', method: 'getTransaction',
params: ['4f793f67fc7465f14fa3a8d3727fa7d133cdb2f298234548b94a5f08b6f4103e', true] params: ['4f793f67fc7465f14fa3a8d3727fa7d133cdb2f298234548b94a5f08b6f4103e', true]
}; };

2
lib/modules/address.js
View File

@ -9,6 +9,7 @@ var levelup = chainlib.deps.levelup;
var errors = chainlib.errors; var errors = chainlib.errors;
var bitcore = require('bitcore'); var bitcore = require('bitcore');
var $ = bitcore.util.preconditions; var $ = bitcore.util.preconditions;
var _ = bitcore.deps._;
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var PublicKey = bitcore.PublicKey; var PublicKey = bitcore.PublicKey;
var Address = bitcore.Address; var Address = bitcore.Address;
@ -172,6 +173,7 @@ AddressModule.prototype.subscribe = function(name, emitter, addresses) {
AddressModule.prototype.unsubscribe = function(name, emitter, addresses) { AddressModule.prototype.unsubscribe = function(name, emitter, addresses) {
$.checkArgument(emitter instanceof EventEmitter, 'First argument is expected to be an EventEmitter'); $.checkArgument(emitter instanceof EventEmitter, 'First argument is expected to be an EventEmitter');
$.checkArgument(Array.isArray(addresses) || _.isUndefined(addresses), 'Second argument is expected to be an Array of addresses or undefined');
if(!addresses) { if(!addresses) {
return this.unsubscribeAll(name, emitter); return this.unsubscribeAll(name, emitter);

3
package.json
View File

@ -46,8 +46,7 @@
"memdown": "^1.0.0", "memdown": "^1.0.0",
"mkdirp": "0.5.0", "mkdirp": "0.5.0",
"nan": "1.3.0", "nan": "1.3.0",
"socket.io": "^1.3.6", "socket.io": "^1.3.6"
"tiny": "0.0.10"
}, },
"devDependencies": { "devDependencies": {
"benchmark": "1.0.0", "benchmark": "1.0.0",