Parker2991/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/PrismarineJS/node-minecraft-protocol.git synced 2025-05-05 10:53:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

add connect option to createClient for multiple (ping + normal) connections for the proxy examples, use the normal options for pinging in autoVersion to have that option available and fix the proxy examples accordingly

Browse source
This commit is contained in:
Romain Beaumont 2017-07-19 18:39:25 +02:00
parent 6279ae9afe
commit 010362ef78
No known key found for this signature in database
GPG key ID: DB60E388B3BCF286
6 changed files with 82 additions and 75 deletions

3
doc/README.md
View file

@ -21,6 +21,9 @@ automatically logged in and validated against mojang's auth.
* customPackets (optional) : an object index by version/state/direction/name, see client_custom_packet for an example
* errorHandler : A way to override the default error handler for client errors. A function that takes a Client and an error.
The default kicks the client.
* stream : a stream to use as connection
* connect : a function taking the client as parameter and that should client.setSocket(socket)
and client.emit('connect') when appropriate (see the proxy examples for an example of use)
## mc.Server(version,[customPackets])

66
examples/client_http_proxy/client_http_proxy.js
View file

@ -9,39 +9,41 @@ if(process.argv.length < 6 || process.argv.length > 8) {
const proxyHost=process.argv[4];
const proxyPort=process.argv[5];
const req = Http.request({
host: proxyHost,
port: proxyPort,
method: 'CONNECT',
path: process.argv[2] + ":" + parseInt(process.argv[3])
});
req.end();
const client = mc.createClient({
connect:(client) => {
const req = Http.request({
host: proxyHost,
port: proxyPort,
method: 'CONNECT',
path: process.argv[2] + ":" + parseInt(process.argv[3])
});
req.end();
req.on("connect", function(res, stream) {
const client = mc.createClient({
stream: stream,
req.on("connect", function(res, stream) {
client.setSocket(stream);
client.emit('connect');
});
},
username: process.argv[6] ? process.argv[6] : "echo",
password: process.argv[7]
});
client.on('connect', function() {
console.info('connected');
});
client.on('disconnect', function(packet) {
console.log('disconnected: '+ packet.reason);
});
client.on('end', function(err) {
console.log('Connection lost');
});
client.on('chat', function(packet) {
const jsonMsg = JSON.parse(packet.message);
if(jsonMsg.translate === 'chat.type.announcement' || jsonMsg.translate === 'chat.type.text') {
const username = jsonMsg.with[0].text;
const msg = jsonMsg.with[1];
if(username === client.username) return;
client.write('chat', {message: msg});
}
});
password: process.argv[7]
});
client.on('connect', function() {
console.info('connected');
});
client.on('disconnect', function(packet) {
console.log('disconnected: '+ packet.reason);
});
client.on('end', function(err) {
console.log('Connection lost');
});
client.on('chat', function(packet) {
const jsonMsg = JSON.parse(packet.message);
if(jsonMsg.translate === 'chat.type.announcement' || jsonMsg.translate === 'chat.type.text') {
const username = jsonMsg.with[0].text;
const msg = jsonMsg.with[1];
if(username === client.username) return;
client.write('chat', {message: msg});
}
});

3
examples/client_http_proxy/package.json
View file

@ -2,7 +2,6 @@
"name": "node-minecraft-protocol-example",
"version": "0.0.0",
"private": true,
"dependencies": {
},
"dependencies": {},
"description": "A node-minecraft-protocol example"
}

79
examples/client_socks_proxy/client_socks_proxy.js
View file

@ -9,44 +9,47 @@ if(process.argv.length < 6 || process.argv.length > 8) {
const proxyHost=process.argv[4];
const proxyPort=process.argv[5];
socks.createConnection({
proxy: {
ipaddress: proxyHost,
port: proxyPort,
type: 5
},
target: {
host: process.argv[2],
port: parseInt(process.argv[3])
},
}, function(err, socket) {
if (err) {
console.log(err);
return;
}
const client = mc.createClient({
stream: socket,
username: process.argv[6] ? process.argv[6] : "echo",
password: process.argv[7]
});
const client = mc.createClient({
connect: client => {
socks.createConnection({
proxy: {
ipaddress: proxyHost,
port: proxyPort,
type: 5
},
target: {
host: process.argv[2],
port: parseInt(process.argv[3])
},
}, function(err, socket) {
if (err) {
console.log(err);
return;
}
client.on('connect', function() {
console.info('connected');
});
client.on('disconnect', function(packet) {
console.log('disconnected: '+ packet.reason);
});
client.on('end', function(err) {
console.log('Connection lost');
});
client.on('chat', function(packet) {
const jsonMsg = JSON.parse(packet.message);
if(jsonMsg.translate === 'chat.type.announcement' || jsonMsg.translate === 'chat.type.text') {
const username = jsonMsg.with[0].text;
const msg = jsonMsg.with[1];
if(username === client.username) return;
client.write('chat', {message: msg});
}
});
client.setSocket(socket);
client.emit('connect');
});
},
username: process.argv[6] ? process.argv[6] : "echo",
password: process.argv[7]
});
client.on('connect', function() {
console.info('connected');
});
client.on('disconnect', function(packet) {
console.log('disconnected: '+ packet.reason);
});
client.on('end', function(err) {
console.log('Connection lost');
});
client.on('chat', function(packet) {
const jsonMsg = JSON.parse(packet.message);
if(jsonMsg.translate === 'chat.type.announcement' || jsonMsg.translate === 'chat.type.text') {
const username = jsonMsg.with[0].text;
const msg = jsonMsg.with[1];
if(username === client.username) return;
client.write('chat', {message: msg});
}
});

3
src/client/autoVersion.js
View file

@ -9,9 +9,8 @@ const minecraft_data = require('minecraft-data');
module.exports = function(client, options) {
client.wait_connect = true; // don't let src/client/setProtocol proceed on socket 'connect' until 'connect_allowed'
debug('pinging',options.host);
const pingOptions = {host: options.host, port: options.port};
// TODO: use 0xfe ping instead for better compatibility/performance? https://github.com/deathcap/node-minecraft-ping
ping(pingOptions, function(err, response) {
ping(options, function(err, response) {
if (err) throw err; // hmm
debug('ping response',response);
// TODO: could also use ping pre-connect to save description, type, max players, etc.

3
src/client/tcp_dns.js
View file

@ -5,7 +5,8 @@ module.exports = function(client, options) {
options.port = options.port || 25565;
options.host = options.host || 'localhost';
options.connect = (client) => {
if(!options.connect)
options.connect = (client) => {
if (options.stream) {
client.setSocket(options.stream);
client.emit('connect');