Publish debugging tool, fix bugs in protojs

This commit is contained in:
roblabla 2015-02-22 22:13:22 +00:00
parent 04ebd393d6
commit 31f6d8380e
2 changed files with 85 additions and 2 deletions

84
examples/proxy.js Normal file
View File

@ -0,0 +1,84 @@
var mc = require('../');
var states = mc.protocol.states;
function print_help() {
console.log("usage: node proxy.js <target_srv> <user> [<password>]");
}
if (process.argv.length < 4) {
console.log("Too few arguments!");
print_help();
process.exit(1);
}
process.argv.forEach(function(val, index, array) {
if (val == "-h") {
print_help();
process.exit(0);
}
});
var host = process.argv[2];
var port = 25565;
var user = process.argv[3];
var passwd = process.argv[4];
if (host.indexOf(':') != -1) {
port = host.substring(host.indexOf(':')+1);
host = host.substring(0, host.indexOf(':'));
}
var srv = mc.createServer({
'online-mode': false,
port: 25566
});
srv.on('login', function (client) {
var addr = client.socket.remoteAddress;
console.log('Incoming connection', '('+addr+')');
var endedClient = false;
var endedTargetClient = false;
client.on('end', function() {
endedClient = true;
console.log('Connection closed by client', '('+addr+')');
if (!endedTargetClient)
targetClient.end("End");
});
client.on('error', function() {
endedClient = true;
console.log('Connection error by client', '('+addr+')');
if (!endedTargetClient)
targetClient.end("Error");
});
var targetClient = mc.createClient({
host: host,
port: port,
username: user,
password: passwd
});
client.on('packet', function(packet) {
if (targetClient.state == states.PLAY && packet.state == states.PLAY) {
console.log(`client->server: ${client.state}.${packet.id} : ${JSON.stringify(packet)}`);
if (!endedTargetClient)
targetClient.write(packet.id, packet);
}
});
targetClient.on('packet', function(packet) {
if (packet.state == states.PLAY && client.state == states.PLAY) {
console.log(`client<-server: ${targetClient.state}.${packet.id} : ${JSON.stringify(packet)}`);
if (!endedClient)
client.write(packet.id, packet);
}
});
targetClient.on('end', function() {
endedTargetClient = true;
console.log('Connection closed by server', '('+addr+')');
if (!endedClient)
client.end("End");
});
targetClient.on('error', function() {
endedTargetClient = true;
console.log('Connection error by server', '('+addr+')');
if (!endedClient)
client.end("Error");
});
});

View File

@ -491,7 +491,7 @@ var packets = {
{ name: "value", type: "ustring" },
{ name: "isSigned", type: "bool" },
{ name: "signature", type: "ustring", condition: function(field_values) {
return field_values["isSigned"];
return field_values["this"]["isSigned"];
}}
]}}},
{ name: "gamemode", type: "varint", condition: function(field_values) {
@ -668,7 +668,6 @@ var packets = {
]},
position: {id: 0x04, fields: [
{ name: "x", type: "double" },
{ name: "stance", type: "double" },
{ name: "y", type: "double" },
{ name: "z", type: "double" },
{ name: "onGround", type: "bool" }