Robot
/
node-gamedig
mirror of https://github.com/gamedig/node-gamedig.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't clobber options, and allow callback as a seperate param

This commit is contained in:
Michael Morrison 2013-07-10 05:59:10 -05:00
parent 69be6d8017
commit 4c1c8be8f1
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
index.js
View File

@ -20,21 +20,25 @@ udpSocket.on('message', function(buffer, rinfo) {
module.exports = {
query: function(options) {
var type = (options.type || '').replace(/\W/g,'');
query: function(options,callback) {
if(callback) options.callback = callback;
var type = (options.type || '').replace(/\W/g,'');
var protocol = require('./protocols/'+type);
var query = new protocol();
query.udpSocket = udpSocket;
query.type = type;
query.options = options;
// copy over options
query.options = {};
for(var i in options) query.options[i] = options[i];
activeQueries.push(query);
query.on('finished',function(state) {
var i = activeQueries.indexOf(query);
if(i >= 0) activeQueries.splice(i, 1);
if(options.callback) options.callback(state);
});
process.nextTick(function() {

1
protocols/core.js
View File

@ -48,6 +48,7 @@ module.exports = Class.extend(EventEmitter,{
this.reset();
this.finished = true;
this.emit('finished',result);
if(this.options.callback) this.options.callback(result);
},
reset: function() {