mirror of
https://github.com/tribufu/node-gamedig
synced 2026-06-01 09:42:41 +00:00
Upgrade syntax of everything to more modern javascript
This commit is contained in:
mmorrison
parent
f8d903b982
commit
69288baebc
43 changed files with 1499 additions and 1521 deletions
|
|
@ -1,19 +1,17 @@
|
|||
var async = require('async');
|
||||
const async = require('async');
|
||||
|
||||
module.exports = require('./core').extend({
|
||||
init: function() {
|
||||
this._super();
|
||||
class Battlefield extends require('./core') {
|
||||
constructor() {
|
||||
super();
|
||||
this.encoding = 'latin1';
|
||||
},
|
||||
run: function(state) {
|
||||
var self = this;
|
||||
var decoded;
|
||||
}
|
||||
|
||||
run(state) {
|
||||
async.series([
|
||||
function(c) {
|
||||
self.query(['serverInfo'], function(data) {
|
||||
if(self.debug) console.log(data);
|
||||
if(data.shift() != 'OK') return self.fatal('Missing OK');
|
||||
(c) => {
|
||||
this.query(['serverInfo'], (data) => {
|
||||
if(this.debug) console.log(data);
|
||||
if(data.shift() !== 'OK') return this.fatal('Missing OK');
|
||||
|
||||
state.raw.name = data.shift();
|
||||
state.raw.numplayers = parseInt(data.shift());
|
||||
|
|
@ -23,10 +21,10 @@ module.exports = require('./core').extend({
|
|||
state.raw.roundsplayed = parseInt(data.shift());
|
||||
state.raw.roundstotal = parseInt(data.shift());
|
||||
|
||||
var teamCount = data.shift();
|
||||
const teamCount = data.shift();
|
||||
state.raw.teams = [];
|
||||
for(var i = 0; i < teamCount; i++) {
|
||||
var tickets = parseFloat(data.shift());
|
||||
for(let i = 0; i < teamCount; i++) {
|
||||
const tickets = parseFloat(data.shift());
|
||||
state.raw.teams.push({
|
||||
tickets:tickets
|
||||
});
|
||||
|
|
@ -34,130 +32,129 @@ module.exports = require('./core').extend({
|
|||
|
||||
state.raw.targetscore = parseInt(data.shift());
|
||||
data.shift();
|
||||
state.raw.ranked = (data.shift() == 'true');
|
||||
state.raw.punkbuster = (data.shift() == 'true');
|
||||
state.password = (data.shift() == 'true');
|
||||
state.raw.ranked = (data.shift() === 'true');
|
||||
state.raw.punkbuster = (data.shift() === 'true');
|
||||
state.password = (data.shift() === 'true');
|
||||
state.raw.uptime = parseInt(data.shift());
|
||||
state.raw.roundtime = parseInt(data.shift());
|
||||
if(self.isBadCompany2) {
|
||||
if(this.isBadCompany2) {
|
||||
data.shift();
|
||||
data.shift();
|
||||
}
|
||||
state.raw.ip = data.shift();
|
||||
state.raw.punkbusterversion = data.shift();
|
||||
state.raw.joinqueue = (data.shift() == 'true');
|
||||
state.raw.joinqueue = (data.shift() === 'true');
|
||||
state.raw.region = data.shift();
|
||||
if(!self.isBadCompany2) {
|
||||
if(!this.isBadCompany2) {
|
||||
state.raw.pingsite = data.shift();
|
||||
state.raw.country = data.shift();
|
||||
state.raw.quickmatch = (data.shift() == 'true');
|
||||
state.raw.quickmatch = (data.shift() === 'true');
|
||||
}
|
||||
|
||||
c();
|
||||
});
|
||||
},
|
||||
function(c) {
|
||||
self.query(['version'], function(data) {
|
||||
if(self.debug) console.log(data);
|
||||
if(data[0] != 'OK') return self.fatal('Missing OK');
|
||||
(c) => {
|
||||
this.query(['version'], (data) => {
|
||||
if(this.debug) console.log(data);
|
||||
if(data[0] !== 'OK') return this.fatal('Missing OK');
|
||||
|
||||
state.raw.version = data[2];
|
||||
|
||||
c();
|
||||
});
|
||||
},
|
||||
function(c) {
|
||||
self.query(['listPlayers','all'], function(data) {
|
||||
if(self.debug) console.log(data);
|
||||
if(data.shift() != 'OK') return self.fatal('Missing OK');
|
||||
(c) => {
|
||||
this.query(['listPlayers','all'], (data) => {
|
||||
if(this.debug) console.log(data);
|
||||
if(data.shift() !== 'OK') return this.fatal('Missing OK');
|
||||
|
||||
var fieldCount = parseInt(data.shift());
|
||||
var fields = [];
|
||||
for(var i = 0; i < fieldCount; i++) {
|
||||
const fieldCount = parseInt(data.shift());
|
||||
const fields = [];
|
||||
for(let i = 0; i < fieldCount; i++) {
|
||||
fields.push(data.shift());
|
||||
}
|
||||
var numplayers = data.shift();
|
||||
for(var i = 0; i < numplayers; i++) {
|
||||
var player = {};
|
||||
fields.forEach(function(key) {
|
||||
var value = data.shift();
|
||||
const numplayers = data.shift();
|
||||
for(let i = 0; i < numplayers; i++) {
|
||||
const player = {};
|
||||
for (let key of fields) {
|
||||
let value = data.shift();
|
||||
|
||||
if(key == 'teamId') key = 'team';
|
||||
else if(key == 'squadId') key = 'squad';
|
||||
if(key === 'teamId') key = 'team';
|
||||
else if(key === 'squadId') key = 'squad';
|
||||
|
||||
if(
|
||||
key == 'kills'
|
||||
|| key == 'deaths'
|
||||
|| key == 'score'
|
||||
|| key == 'rank'
|
||||
|| key == 'team'
|
||||
|| key == 'squad'
|
||||
|| key == 'ping'
|
||||
|| key == 'type'
|
||||
key === 'kills'
|
||||
|| key === 'deaths'
|
||||
|| key === 'score'
|
||||
|| key === 'rank'
|
||||
|| key === 'team'
|
||||
|| key === 'squad'
|
||||
|| key === 'ping'
|
||||
|| key === 'type'
|
||||
) {
|
||||
value = parseInt(value);
|
||||
}
|
||||
|
||||
player[key] = value;
|
||||
});
|
||||
}
|
||||
state.players.push(player);
|
||||
}
|
||||
|
||||
self.finish(state);
|
||||
this.finish(state);
|
||||
});
|
||||
}
|
||||
]);
|
||||
},
|
||||
query: function(params,c) {
|
||||
var self = this;
|
||||
this.tcpSend(buildPacket(params), function(data) {
|
||||
var decoded = self.decodePacket(data);
|
||||
}
|
||||
query(params,c) {
|
||||
this.tcpSend(buildPacket(params), (data) => {
|
||||
const decoded = this.decodePacket(data);
|
||||
if(!decoded) return false;
|
||||
c(decoded);
|
||||
return true;
|
||||
});
|
||||
},
|
||||
decodePacket: function(buffer) {
|
||||
}
|
||||
decodePacket(buffer) {
|
||||
if(buffer.length < 8) return false;
|
||||
var reader = this.reader(buffer);
|
||||
var header = reader.uint(4);
|
||||
var totalLength = reader.uint(4);
|
||||
const reader = this.reader(buffer);
|
||||
const header = reader.uint(4);
|
||||
const totalLength = reader.uint(4);
|
||||
if(buffer.length < totalLength) return false;
|
||||
|
||||
var paramCount = reader.uint(4);
|
||||
var params = [];
|
||||
for(var i = 0; i < paramCount; i++) {
|
||||
var len = reader.uint(4);
|
||||
|
||||
const paramCount = reader.uint(4);
|
||||
const params = [];
|
||||
for(let i = 0; i < paramCount; i++) {
|
||||
const len = reader.uint(4);
|
||||
params.push(reader.string({length:len}));
|
||||
var strNull = reader.uint(1);
|
||||
const strNull = reader.uint(1);
|
||||
}
|
||||
return params;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function buildPacket(params) {
|
||||
var self = this;
|
||||
|
||||
var paramBuffers = [];
|
||||
params.forEach(function(param) {
|
||||
paramBuffers.push(new Buffer(param,'utf8'));
|
||||
});
|
||||
const paramBuffers = [];
|
||||
for (const param of params) {
|
||||
paramBuffers.push(Buffer.from(param,'utf8'));
|
||||
}
|
||||
|
||||
var totalLength = 12;
|
||||
paramBuffers.forEach(function(paramBuffer) {
|
||||
let totalLength = 12;
|
||||
for (const paramBuffer of paramBuffers) {
|
||||
totalLength += paramBuffer.length+1+4;
|
||||
});
|
||||
}
|
||||
|
||||
var b = new Buffer(totalLength);
|
||||
const b = Buffer.alloc(totalLength);
|
||||
b.writeUInt32LE(0,0);
|
||||
b.writeUInt32LE(totalLength,4);
|
||||
b.writeUInt32LE(params.length,8);
|
||||
var offset = 12;
|
||||
paramBuffers.forEach(function(paramBuffer) {
|
||||
let offset = 12;
|
||||
for (const paramBuffer of paramBuffers) {
|
||||
b.writeUInt32LE(paramBuffer.length, offset); offset += 4;
|
||||
paramBuffer.copy(b, offset); offset += paramBuffer.length;
|
||||
b.writeUInt8(0, offset); offset += 1;
|
||||
});
|
||||
}
|
||||
|
||||
return b;
|
||||
}
|
||||
|
||||
module.exports = Battlefield;
|
||||
Loading…
Add table
Add a link
Reference in a new issue